rip out the VIDMODE extension stuff. this was only used to size fullscreen windows...

diff --git a/Makefile.am b/Makefile.am
index 7f40f68307b0a7aa33177050160afbfea00aeae8..dcfaccd9b7ea0bf0c406f49643e3099acd29e7a1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,7 +121,6 @@ openbox_openbox_LDADD = \
        $(XINERAMA_LIBS) \
        $(XKB_LIBS) \
        $(XRANDR_LIBS) \
-       $(VIDMODE_LIBS) \
        $(XSHAPE_LIBS) \
        $(GLIB_LIBS) \
        $(X_LIBS) \

diff --git a/configure.ac b/configure.ac
index 26b98897df705d17b64928d022bb6b3a4239606c..cc84622754babfe8f16ca393c00f26462e854bc6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -140,7 +140,6 @@ AC_SUBST(EFENCE_LIBS)
 dnl Check for X11 extensions
 X11_EXT_XKB
 X11_EXT_XRANDR
-X11_EXT_VIDMODE
 X11_EXT_SHAPE
 X11_EXT_XINERAMA
 

diff --git a/m4/x11.m4 b/m4/x11.m4
index e57efa390b06643b5d31e2c6a4a855f0423a0a0f..54d22226f73a1f68062fefd1a8b4fda6657b6df4 100644 (file)
--- a/m4/x11.m4
+++ b/m4/x11.m4
@@ -397,62 +397,6 @@ AC_DEFUN([X11_EXT_XINERAMA],
   fi
 ])
 
-# VIDMODE()
-#
-# Check for the presence of the "VidMode" X Window System extension.
-# Defines "VIDMODE" and sets the $(VIDMODE) variable to "yes" if the extension
-# is present.
-AC_DEFUN([X11_EXT_VIDMODE],
-[
-  AC_REQUIRE([X11_DEVEL])
-
-  # Store these
-  OLDLIBS=$LIBS
-  OLDCPPFLAGS=$CPPFLAGS
-     
-  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-  LIBS="$LIBS $X_LIBS -lXext -lXxf86vm"
-
-  AC_CHECK_LIB([Xxf86vm], [XF86VidModeGetViewPort],
-    AC_MSG_CHECKING([for X11/extensions/xf86vmode.h])
-    AC_TRY_LINK(
-    [
-      #include <X11/Xlib.h>
-      #include <X11/extensions/xf86vmode.h>
-    ],
-    [
-      Display *d;
-      int i;
-      XF86VidModeQueryExtension(d, &i, &i);
-      XF86VidModeGetViewPort(d, i, &i, &i);
-    ],
-    [
-      AC_MSG_RESULT([yes])
-      VIDMODE="yes"
-      AC_DEFINE([VIDMODE], [1], [Found the VidMode extension])
-
-      VIDMODE_CFLAGS=""
-      VIDMODE_LIBS="-lXext -lXxf86vm"
-      AC_SUBST(VIDMODE_CFLAGS)
-      AC_SUBST(VIDMODE_LIBS)
-    ],
-    [ 
-      AC_MSG_RESULT([no])
-      VIDMODE="no"
-    ])
-  )
-
-  LIBS=$OLDLIBS
-  CPPFLAGS=$OLDCPPFLAGS
-
-  AC_MSG_CHECKING([for the VidMode extension])
-  if test "$VIDMODE" = "yes"; then
-    AC_MSG_RESULT([yes])
-  else
-    AC_MSG_RESULT([no])
-  fi
-])
-
 # X11_SM()
 #
 # Check for the presence of SMlib for session management.

diff --git a/openbox/client.c b/openbox/client.c
index abb82723fcc7b0ec2b662a1cf555fd9be99cf1d9..839bbae8489b2459f4d4039742bf92cc994c33c4 100644 (file)
--- 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 f2c8cf45489df34e833267bb2610ac7dd4705f19..a38a331fce77b3a16001d92284acf81268eb8516 100644 (file)
--- 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 4679f9390148319e48d605f747ede9cc2f2dfd12..79e40c37fb131e6d353542973f65564bdf919c27 100644 (file)
--- 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 f430e80cbaa676a4e635394b4c826af092437258..f65cc292faef8b6f353751fa839925a61df6a64d 100644 (file)
--- 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);