From 1b981a5d166590176f6bff12fe483602e7b86d2a Mon Sep 17 00:00:00 2001 From: okan Date: Wed, 18 Jul 2012 21:53:22 +0000 Subject: Further simplify Xinerama init and re-init on XRR events. While testing for Xinerama during setup was done display-wide, each time XineramaQueryScreens() is called either in start-up or due to an XRR event, the library re-tests for the Xinerama extension anyway before moving on; so the initial test is redundant and allows another global to go away with one other change: always fill in sc->xinerama (and _no), regardless of the success of malloc in XineramaQueryScreens(), and use it to see if Xinerama dimensions exist when asked by client and/or menu code. --- calmwm.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'calmwm.c') diff --git a/calmwm.c b/calmwm.c index 53f1896..73526ba 100644 --- a/calmwm.c +++ b/calmwm.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: calmwm.c,v 1.63 2012/07/06 14:18:00 okan Exp $ + * $OpenBSD: calmwm.c,v 1.64 2012/07/18 21:53:22 okan Exp $ */ #include @@ -44,7 +44,7 @@ Cursor Cursor_resize; struct screen_ctx_q Screenq = TAILQ_HEAD_INITIALIZER(Screenq); struct client_ctx_q Clientq = TAILQ_HEAD_INITIALIZER(Clientq); -int HasXinerama, HasRandr, Randr_ev; +int HasRandr, Randr_ev; struct conf Conf; static void sigchld_cb(int); @@ -97,7 +97,7 @@ main(int argc, char **argv) static void dpy_init(const char *dpyname) { - int i, fake; + int i; XSetErrorHandler(x_errorhandler); @@ -110,9 +110,6 @@ dpy_init(const char *dpyname) XSync(X_Dpy, False); XSetErrorHandler(x_errorhandler); - if (XineramaQueryExtension(X_Dpy, &fake, &fake) == 1 && - ((HasXinerama = XineramaIsActive(X_Dpy)) == 1)) - HasXinerama = 1; HasRandr = XRRQueryExtension(X_Dpy, &Randr_ev, &i); } -- cgit v1.2.3-2-gb3c3