X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fextensions.c;h=d1088361452a2bbdcdfc077fcd36a2dac86c965a;hb=df73dfa049b9d0bb81e09b27ecf678dce9b46301;hp=b7d8e73aa9ea53f148e36e1c81f29890254067c2;hpb=a3e7dc19f09edf17f0701059be1927ebea5bcab6;p=chaz%2Fopenbox diff --git a/openbox/extensions.c b/openbox/extensions.c index b7d8e73a..d1088361 100644 --- a/openbox/extensions.c +++ b/openbox/extensions.c @@ -3,17 +3,17 @@ extensions.c for the Openbox window manager 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 the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + See the COPYING file for a copy of the GNU General Public License. */ @@ -34,11 +34,11 @@ gint extensions_randr_event_basep; gboolean extensions_sync = FALSE; gint extensions_sync_event_basep; -void extensions_query_all() +void extensions_query_all(void) { gint junk; (void)junk; - + #ifdef XKB extensions_xkb = XkbQueryExtension(ob_display, &junk, &extensions_xkb_event_basep, @@ -86,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; @@ -97,17 +107,10 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin) RECT_SET((*xin_areas)[i], info[i].x_org, info[i].y_org, info[i].width, info[i].height); XFree(info); - } else -#endif - if (ob_debug_xinerama) { - 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 { + else +#endif + { *nxin = 1; *xin_areas = g_new(Rect, *nxin + 1); RECT_SET((*xin_areas)[0], 0, 0,