From e0aa54a8912e34e94d42872dba95ade0fda7fdca Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@comhem.se>
Date: Sun, 11 Jun 2006 09:47:53 +0000
Subject: rip out the VIDMODE extension stuff. this was only used to size
 fullscreen windows to the viewport, i doubt anyone is actually using it and
 it interacts very badly with xinerama.

---
 openbox/client.c     | 33 ++++-----------------------------
 openbox/event.c      |  5 -----
 openbox/extensions.c |  8 --------
 openbox/extensions.h |  8 --------
 4 files changed, 4 insertions(+), 50 deletions(-)

(limited to 'openbox')

diff --git a/openbox/client.c b/openbox/client.c
index abb82723..839bbae8 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2035,35 +2035,16 @@ void client_configure_full(ObClient *self, ObCorner anchor,
 
     /* set the size and position if fullscreen */
     if (self->fullscreen) {
-#ifdef VIDMODE
-        gint dot;
-        XF86VidModeModeLine mode;
-#endif
         Rect *a;
         guint i;
 
         i = client_monitor(self);
         a = screen_physical_area_monitor(i);
 
-#ifdef VIDMODE
-        if (i == 0 && /* primary head */
-            extensions_vidmode &&
-            XF86VidModeGetViewPort(ob_display, ob_screen, &x, &y) &&
-            /* get the mode last so the mode.privsize isnt freed incorrectly */
-            XF86VidModeGetModeLine(ob_display, ob_screen, &dot, &mode)) {
-            x += a->x;
-            y += a->y;
-            w = mode.hdisplay;
-            h = mode.vdisplay;
-            if (mode.privsize) XFree(mode.private);
-        } else
-#endif
-        {
-            x = a->x;
-            y = a->y;
-            w = a->width;
-            h = a->height;
-        }
+        x = a->x;
+        y = a->y;
+        w = a->width;
+        h = a->height;
 
         user = FALSE; /* ignore that increment etc shit when in fullscreen */
     } else {
@@ -2347,12 +2328,6 @@ static void client_iconify_recursive(ObClient *self,
             focus_order_remove(self);
             focus_order_add_new(self);
 
-            /* this is here cuz with the VIDMODE extension, the viewport can
-               change while a fullscreen window is iconic, and when it
-               uniconifies, it would be nice if it did so to the new position
-               of the viewport */
-            client_reconfigure(self);
-
             changed = TRUE;
         }
     }
diff --git a/openbox/event.c b/openbox/event.c
index f2c8cf45..a38a331f 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -600,11 +600,6 @@ static void event_handle_root(XEvent *e)
         break;
     default:
         ;
-#ifdef VIDMODE
-        if (extensions_vidmode && e->type == extensions_vidmode_event_basep) {
-            ob_debug("VIDMODE EVENT\n");
-        }
-#endif
     }
 }
 
diff --git a/openbox/extensions.c b/openbox/extensions.c
index 4679f939..79e40c37 100644
--- a/openbox/extensions.c
+++ b/openbox/extensions.c
@@ -29,8 +29,6 @@ gboolean extensions_xinerama  = FALSE;
 gint     extensions_xinerama_event_basep;
 gboolean extensions_randr     = FALSE;
 gint     extensions_randr_event_basep;
-gboolean extensions_vidmode   = FALSE;
-gint     extensions_vidmode_event_basep;
 
 void extensions_query_all()
 {
@@ -60,12 +58,6 @@ void extensions_query_all()
         XRRQueryExtension(ob_display, &extensions_randr_event_basep,
                           &junk);
 #endif
-
-#ifdef VIDMODE
-    extensions_vidmode =
-        XF86VidModeQueryExtension(ob_display, &extensions_vidmode_event_basep,
-                                  &junk);
-#endif
 }
 
 void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
diff --git a/openbox/extensions.h b/openbox/extensions.h
index f430e80c..f65cc292 100644
--- a/openbox/extensions.h
+++ b/openbox/extensions.h
@@ -35,9 +35,6 @@
 #ifdef    XRANDR
 #include <X11/extensions/Xrandr.h>
 #endif
-#ifdef    VIDMODE
-#include <X11/extensions/xf86vmode.h>
-#endif
 
 #include <glib.h>
 
@@ -61,11 +58,6 @@ extern gboolean extensions_randr;
 /*! Base for events for the Randr extension */
 extern gint extensions_randr_event_basep;
 
-/*! Does the display have the VidMode extension? */
-extern gboolean extensions_vidmode;
-/*! Base for events for the VidMode extension */
-extern gint extensions_vidmode_event_basep;
-
 void extensions_query_all();
 
 void extensions_xinerama_screens(Rect **areas, guint *nxin);
-- 
cgit v1.2.3