diff options
| -rw-r--r-- | nxcompshad/CHANGELOG | 10 | ||||
| -rw-r--r-- | nxcompshad/LICENSE | 2 | ||||
| -rw-r--r-- | nxcompshad/Shadow.cpp | 6 | ||||
| -rw-r--r-- | nxcompshad/VERSION | 2 | ||||
| -rw-r--r-- | nxcompshad/X11.cpp | 20 |
5 files changed, 26 insertions, 14 deletions
diff --git a/nxcompshad/CHANGELOG b/nxcompshad/CHANGELOG index 8678d2159..27bc0aca1 100644 --- a/nxcompshad/CHANGELOG +++ b/nxcompshad/CHANGELOG @@ -1,5 +1,15 @@ ChangeLog: +nxcompshad-3.4.0-1 + +- Opened the 3.4.0 branch based on nxcompshad-3.3.0-3. + +- Updated version number. + +- Updated copyright to year 2009. + +- Improved error messages logging in case of initialization failures. + nxcompshad-3.3.0-3 - Fixed TR01G02158. Keymap initialization could be incorrect because diff --git a/nxcompshad/LICENSE b/nxcompshad/LICENSE index 0631b9dfb..bf103c899 100644 --- a/nxcompshad/LICENSE +++ b/nxcompshad/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2007 NoMachine - http://www.nomachine.com/. +Copyright (c) 2001, 2009 NoMachine - http://www.nomachine.com/. NXCOMPSHAD and NX extensions to X are copyright of NoMachine. diff --git a/nxcompshad/Shadow.cpp b/nxcompshad/Shadow.cpp index f9154aa25..e336ca679 100644 --- a/nxcompshad/Shadow.cpp +++ b/nxcompshad/Shadow.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 */ @@ -152,7 +152,7 @@ static int NXCreatePoller(Display *display, Display **shadowDisplay) if (poller -> init() == -1) { - logTest("NXCreatePoller", "Failed to initialize poller."); + logWarning("NXCreatePoller", "Failed to initialize poller."); return -1; } @@ -270,7 +270,7 @@ int NXShadowCreate(void *dpy, char *keymap, char* shadowDisplayName, void **shad if (NXCreatePoller(display, shadowDisplay) != 1) { - logTest("NXShadowCreate", "NXCreatePoller failed."); + logWarning("NXShadowCreate", "NXCreatePoller failed."); return -1; } diff --git a/nxcompshad/VERSION b/nxcompshad/VERSION index 15a279981..18091983f 100644 --- a/nxcompshad/VERSION +++ b/nxcompshad/VERSION @@ -1 +1 @@ -3.3.0 +3.4.0 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); |