From 2208f4f9ecf967579a364021f0847b3ad1d7777c Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Sun, 13 Nov 2011 09:53:12 +0100 Subject: Imported nxcompshad-3.4.0-1.tar.gz Summary: Imported nxcompshad-3.4.0-1.tar.gz Keywords: Imported nxcompshad-3.4.0-1.tar.gz into Git repository --- nxcompshad/X11.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'nxcompshad/X11.cpp') diff --git a/nxcompshad/X11.cpp b/nxcompshad/X11.cpp index 99333b0ec..837efad71 100644 --- a/nxcompshad/X11.cpp +++ b/nxcompshad/X11.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -1305,17 +1305,19 @@ void Poller::randrInit(void) int randrEventBase; int randrErrorBase; - randrExtension_ = 0; - - XRRSelectInput(display_, DefaultRootWindow(display_), RRScreenChangeNotifyMask); - if (XRRQueryExtension(display_, &randrEventBase, &randrErrorBase) == 0) { - #ifdef PANIC - fprintf(stderr, "nxagentShadowInit: Randr extension not supported on this display.\n"); - #endif + logWarning("Poller::randrInit", "Randr extension not supported on this " + "display."); + + randrExtension_ = 0; + + return; } + XRRSelectInput(display_, DefaultRootWindow(display_), + RRScreenChangeNotifyMask); + randrEventBase_ = randrEventBase; randrExtension_ = 1; @@ -1412,7 +1414,7 @@ void Poller::getEvents(void) { if (randrExtension_ == 1 && (X.type == randrEventBase_ + RRScreenChangeNotify || X.type == ConfigureNotify)) { - XRRUpdateConfiguration (&X); + XRRUpdateConfiguration(&X); handleRRScreenChangeNotify(&X); -- cgit v1.2.3