+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+extensions.c for the Openbox window manager
+Copyright (c) 2003 Ben 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.
+*/
+
#include "openbox.h"
#include "geom.h"
#include "extensions.h"
#include "screen.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;
-gboolean extensions_xinerama_active = FALSE;
+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;
void extensions_query_all()
{
- 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);
#endif
#ifdef SHAPE
extensions_shape =
- XShapeQueryExtension(ob_display, &extensions_shape_event_basep,
- &junk);
+ XShapeQueryExtension(ob_display, &extensions_shape_event_basep,
+ &junk);
#endif
#ifdef XINERAMA
extensions_xinerama =
- XineramaQueryExtension(ob_display, &extensions_xinerama_event_basep,
- &junk);
- extensions_xinerama_active = XineramaIsActive(ob_display);
+ XineramaQueryExtension(ob_display, &extensions_xinerama_event_basep,
+ &junk) && XineramaIsActive(ob_display);
#endif
#ifdef XRANDR
extensions_randr =
- XRRQueryExtension(ob_display, &extensions_randr_event_basep,
+ 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)
guint i;
gint l, r, t, b;
#ifdef XINERAMA
- if (extensions_xinerama_active) {
+ if (extensions_xinerama) {
guint i;
gint n;
XineramaScreenInfo *info = XineramaQueryScreens(ob_display, &n);
*nxin = 1;
*xin_areas = g_new(Rect, *nxin + 1);
RECT_SET((*xin_areas)[0], 0, 0,
- screen_physical_size.width, screen_physical_size.height);
+ WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen)),
+ HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen)));
}
/* returns one extra with the total area in it */