add G_BEGIN/END_DECLS to the mainloop header

[dana/openbox.git] / openbox / extensions.c

diff --git a/openbox/extensions.c b/openbox/extensions.c
index d6fa1c1..d108836 100644 (file)
--- a/openbox/extensions.c
+++ b/openbox/extensions.c
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    extensions.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,51 +21,64 @@
 #include "geom.h"
 #include "extensions.h"
 #include "screen.h"
+#include "debug.h"
 
 gboolean extensions_xkb       = FALSE;
-int      extensions_xkb_event_basep;
+gint     extensions_xkb_event_basep;
 gboolean extensions_shape     = FALSE;
-int      extensions_shape_event_basep;
+gint     extensions_shape_event_basep;
 gboolean extensions_xinerama  = FALSE;
-int      extensions_xinerama_event_basep;
+gint     extensions_xinerama_event_basep;
 gboolean extensions_randr     = FALSE;
-int      extensions_randr_event_basep;
-gboolean extensions_vidmode   = FALSE;
-int      extensions_vidmode_event_basep;
+gint     extensions_randr_event_basep;
+gboolean extensions_sync      = FALSE;
+gint     extensions_sync_event_basep;
 
-void extensions_query_all()
+void extensions_query_all(void)
 {
-    int junk;
+    gint junk;
     (void)junk;
-     
+
 #ifdef XKB
     extensions_xkb =
-       XkbQueryExtension(ob_display, &junk, &extensions_xkb_event_basep,
-                         &junk, NULL, NULL);
+        XkbQueryExtension(ob_display, &junk, &extensions_xkb_event_basep,
+                          &junk, NULL, NULL);
+    if (!extensions_xkb)
+        ob_debug("XKB extension is not present on the server\n");
 #endif
 
 #ifdef SHAPE
     extensions_shape =
-       XShapeQueryExtension(ob_display, &extensions_shape_event_basep,
-                            &junk);
+        XShapeQueryExtension(ob_display, &extensions_shape_event_basep,
+                             &junk);
+    if (!extensions_shape)
+        ob_debug("X Shape extension is not present on the server\n");
 #endif
 
 #ifdef XINERAMA
     extensions_xinerama =
-       XineramaQueryExtension(ob_display, &extensions_xinerama_event_basep,
-                              &junk) && XineramaIsActive(ob_display);
+        XineramaQueryExtension(ob_display, &extensions_xinerama_event_basep,
+                               &junk) && XineramaIsActive(ob_display);
+    if (!extensions_xinerama)
+        ob_debug("Xinerama extension is not present on the server\n");
 #endif
 
 #ifdef XRANDR
     extensions_randr =
-       XRRQueryExtension(ob_display, &extensions_randr_event_basep,
+        XRRQueryExtension(ob_display, &extensions_randr_event_basep,
                           &junk);
+    if (!extensions_randr)
+        ob_debug("XRandR extension is not present on the server\n");
 #endif
 
-#ifdef VIDMODE
-    extensions_vidmode =
-       XF86VidModeQueryExtension(ob_display, &extensions_vidmode_event_basep,
-                                  &junk);
+#ifdef SYNC
+    extensions_sync =
+        XSyncQueryExtension(ob_display, &extensions_sync_event_basep,
+                            &junk) &&
+        XSyncInitialize(ob_display, &junk, &junk);
+    if (!extensions_sync)
+        ob_debug("X Sync extension is not present on the server or is an "
+                 "incompatible version\n");
 #endif
 }
 
@@ -72,6 +86,16 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
 {
     guint i;
     gint l, r, t, b;
+    if (ob_debug_xinerama) {
+        g_print("Using fake xinerama !\n");
+        gint w = WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen));
+        gint h = HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen));
+        *nxin = 2;
+        *xin_areas = g_new(Rect, *nxin + 1);
+        RECT_SET((*xin_areas)[0], 0, 0, w/2, h);
+        RECT_SET((*xin_areas)[1], w/2, 0, w-(w/2), h);
+    }
+    else
 #ifdef XINERAMA
     if (extensions_xinerama) {
         guint i;
@@ -82,7 +106,9 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
         for (i = 0; i < *nxin; ++i)
             RECT_SET((*xin_areas)[i], info[i].x_org, info[i].y_org,
                      info[i].width, info[i].height);
-    } else
+        XFree(info);
+    }
+    else
 #endif
     {
         *nxin = 1;