| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Events.c: In function 'nxagentDumpInputDevicesState':
Events.c:4662:58: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'DeviceIntPtr {aka struct _DeviceIntRec *}' [-Wformat=]
fprintf(stderr, "\nKeyboard device state: \n\tdevice [%p]\n\tlast grab time [%lu]"
^
Events.c:4662:82: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'CARD32 {aka unsigned int}' [-Wformat=]
fprintf(stderr, "\nKeyboard device state: \n\tdevice [%p]\n\tlast grab time [%lu]"
^
Events.c:4662:19: warning: format '%p' expects argument of type 'void *', but argument 7 has type 'GrabPtr {aka struct _GrabRec *}' [-Wformat=]
fprintf(stderr, "\nKeyboard device state: \n\tdevice [%p]\n\tlast grab time [%lu]"
^
Events.c:4675:66: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'WindowPtr {aka struct _Window *}' [-Wformat=]
fprintf(stderr, "\nKeyboard grab state: \n\twindow pointer [%p]"
^
Events.c:4689:59: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'DeviceIntPtr {aka struct _DeviceIntRec *}' [-Wformat=]
fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]"
^
Events.c:4689:23: warning: format '%lx' expects argument of type 'long unsigned int', but argument 10 has type 'Mask {aka unsigned int}' [-Wformat=]
fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]"
^
Events.c:4722:57: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'DeviceIntPtr {aka struct _DeviceIntRec *}' [-Wformat=]
fprintf(stderr, "\nPointer device state: \n\tdevice [%p]\n\tlast grab time [%lu]"
^
Events.c:4722:81: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'CARD32 {aka unsigned int}' [-Wformat=]
fprintf(stderr, "\nPointer device state: \n\tdevice [%p]\n\tlast grab time [%lu]"
^
Events.c:4722:19: warning: format '%p' expects argument of type 'void *', but argument 7 has type 'GrabPtr {aka struct _GrabRec *}' [-Wformat=]
fprintf(stderr, "\nPointer device state: \n\tdevice [%p]\n\tlast grab time [%lu]"
^
Events.c:4735:65: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'WindowPtr {aka struct _Window *}' [-Wformat=]
fprintf(stderr, "\nPointer grab state: \n\twindow pointer [%p]"
^
Events.c:4750:61: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'DeviceIntPtr {aka struct _DeviceIntRec *}' [-Wformat=]
fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]"
^
Events.c:4750:25: warning: format '%lx' expects argument of type 'long unsigned int', but argument 10 has type 'Mask {aka unsigned int}' [-Wformat=]
fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]"
^
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
NXxvdisp.c: In function 'ProcXvDispatch':
NXxvdisp.c:96:9: warning: this 'else' clause does not guard... [-Wmisleading-indentation]
else
^~~~
NXxvdisp.c:99:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
break;
^~~~~
NXxvdisp.c:104:9: warning: this 'else' clause does not guard... [-Wmisleading-indentation]
else
^~~~
NXxvdisp.c:107:10: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
break;
^~~~~
NXxvdisp.c:118:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation]
else
^~~~
NXxvdisp.c:121:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
break;
^~~~~
NXxvdisp.c:126:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation]
else
^~~~
NXxvdisp.c:129:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
break;
^~~~~
NXxvdisp.c:137:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation]
else
^~~~
NXxvdisp.c:140:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
break;
^~~~~
NXxvdisp.c:146:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation]
else
^~~~
NXxvdisp.c:149:6: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
break;
^~~~~
|
|
|
|
|
|
|
|
|
|
| |
NXdispatch.c: In function 'Dispatch':
NXdispatch.c:309:3: warning: this 'if' clause does not guard... [-Wmisleading-indentation]
if (!(dispatchException & DE_TERMINATE))
^~
NXdispatch.c:312:5: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if'
while (!dispatchException)
^~~~~
|
|
|
|
|
|
|
|
|
|
| |
chgfctl.c: In function 'ChangeKbdFeedback':
chgfctl.c:359:6: warning: this 'else' clause does not guard... [-Wmisleading-indentation]
else
^~~~
chgfctl.c:361:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else'
kctrl.autoRepeats[inx] =
^~~~~
|
| |
|
|
|
|
|
| |
nxagentInitKeyboardState -> nxagentInitXkbKeyboardState
nxagentHandleKeyboardEvent -> nxagentHandleXkbKeyboardStateEvent
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
If xorg upstream xkb gets extended one day the previous code would not
block new xkb calls even if they would change keyboard settings. So
only act on the currently known calls and throw an error for all
unknown calls.
|
| |
|
|
|
|
| |
Fixes ArcticaProject/nx-libs#257
|
|
|
|
| |
This helps understanding the intention of the following code.
|
| |
|
| |
|
| |
|
|
|
|
| |
this ensures that randr updates its private structures
|
|
|
|
|
| |
If -rrxinerama was specified xrandr handling was broken. Adding/using
a custom resolution via xrandr was not working anymore.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use stock implementation instead.
* Reason from NoMachine's NX CHANGELOG for having its own implementation
of Xvasprintf() (from around nxagent 3.3.0):
- Fixed TR06G02225. The implementation of Xvprintf() has been reviewed
to work on more platforms. Previous implementation caused a failure
in the build of keyboard map on some platform like Solaris 8 and 9.
- Fixed TR03G02198. Reimplemented Xvprintf() in Xserver/os to handle
the case in which vsnprintf returned -1.
* Reason for removing it again:
- Fixes segfaults in SetDefaultFontPath when launching nxagent.
- All locations in Xserver/** using the code check for return value
of -1.
- Solaris 8 and 9 are beyond of our support scope.
- Keep more in sync with X.org.
- Good moment to drop more GPL-2 code from Xserver's code base.
|
|
|
|
|
|
|
| |
function, add missing header includes.
Fix up for 1e3a97482840401af9ffcf73db6008ebfe6c1d52, which has been
faulty in this regard.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.org:
commit 5c2e2a164d615ab06be28a663734e782614b5cc7
Author: Daniel Kurtz <djkurtz@chromium.org>
Date: Wed Apr 18 09:51:51 2012 +0000
os/xprintf: add Xvscnprintf and Xscnprintf
Normal snprintf() usually returns the number of bytes that would have been
written into a buffer had the buffer been long enough.
The scnprintf() variants return the actual number of bytes written,
excluding the trailing '\0'.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.org:
commit 1324b0ca9f8a7fdaf03b374c75eb3c9df407c2f1
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Dec 10 00:08:24 2010 +0000
Typo in xserver Xvasprintf()
I needed this patch in the wrapper around vsnprintf() in os/xprintf.c
(MinGW for Windows build) to correct various crashes.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.org:
commit c95c1d338fdb62dbe3dba934b97324fa778b7fce
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 18:43:12 2010 -0800
Add asprintf() implementation for platforms without it
Provides a portable implementation of this common allocating sprintf()
API found in many, but not yet all, of the platforms we support.
If the platform provides vasprintf() we simply wrap it, otherwise we
implement it - either way callers can use it regardless of platform.
Since not all platforms guarantee to NULL out the return pointer on
failure, we don't either, and require callers to check the return
value for -1.
The old Xprintf() API is deprecated, but left for compatibility for now.
The new API is added in a new header so that it can be used in parts of
the server such as hw/xfree86/parser that don't include all the server
headers.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Includes re-indentation changes from
9838b7032ea9792bec21af424c53c07078636d21.
Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de>
|
|
|
|
|
|
| |
nxagent will abort if it encounters an unknown command line option. As
we want 3.6 to be a drop-in replacement for 3.5 we cannot simply drop old
options but must accept them as no-op.
|
|
|
|
| |
It is called only if DEBUG_TREE is defined.
|
|
|
|
| |
Fixes ArcticaProject/nx-libs#585
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.org:
commit 512bac25ec0e980968b93a2ebe88bd89bf99b697
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Nov 6 14:52:03 2007 +0000
DIX: XKB: Set xkbInfo to NULL as well as freeing it (bug # 10639)
XkbRemoveResourceClient wants to access xkbInfo if it exists, so make
sure we NULL it after freeing it. It doesn't make much sense to move
the RemoveResourceClient call first, as there's not much point in
notifying clients while we're shutting the server down anyway.
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.Org:
commit 1cfa9f647e0241f4b9e56556b128d7bfd987eaca
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Feb 28 16:55:26 2006 +0000
Bug # 5216: Allow options to appear with other components.
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.Org:
commit 0693083335185ce05ee64546151f3fc43ce98575
Author: Lars Knoll <lars@trolltech.com>
Date: Mon Mar 6 21:00:09 2006 +0000
render/picture.c Correctly initialize devPrivates variable in source only
pictures to 0
miext/cw/cw.h Don't try to access devPrivates of source only pictures
Backported-from-NX-by: Ulrich Sibiller <uli42@gmx.de>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.org:
Commit 6bb2dc02a7cffd6ed7dd28e88d584920a4150749
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:01:47 2006 +0000
Coverity # 337: Remove useless NULL check.
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.org:
commit 72cc6307257fcbb800267464487bf918ee674328
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:32:05 2006 +0000
Coverity # 491: Check version number correctly.
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.org:
commit 152090ce442e94de1ae920208a92931af6493c8c
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:33:12 2006 +0000
Coverity # 487: Check version number correctly.
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Fixes ArcticaProject/nx-libs#542
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.org:
commit 5e106a71b9f8077216d41619402952b0005dd8a4
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:49:04 2006 +0000
Coverity # 807: Fix a memory leak in XFixesExpandRegion.
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Fixes ArcticaProject/nx-libs#541
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.org:
commit fc7fb5bbe1c8f787e53500b9a2ca4af815f310d1
Author: Giuseppe Bilotta giuseppe.bilotta@gmail.com
Date: Thu Nov 9 10:21:21 2017 +0100
randr: free crtc->outputs on destroy
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Fixes ArcticaProject/nx-libs#558
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backported from X.org:
commit 16381d186e7c791031392ed8afcfd33009854e9e
Author: Giuseppe Bilotta giuseppe.bilotta@gmail.com
Date: Thu Nov 9 10:21:20 2017 +0100
randr: always realloc crtcs and outputs
When the last crtc (resp. output) is destroyed, the rrScrPriv crtcs
(resp. outputs) fields do not get cleared, which can lead to a situation
where the private's numCrtcs (resp. numOutputs) field is zero, but the
associated memory is still allocated. Just checking if numCrtcs (resp.
numOutputs) is zero is thus not a good criteria to determine whetehr to
use a realloc or a malloc.
Since crtcs (resp. outputs) are NULL-initialized anyway, relying on
numCrtcs (resp. numOutputs) is actually unnecessary, because
reallocation of a NULL ptr is equivalent to a malloc anyway.
Therefore, just use realloc() unconditionally, and ensure that the
fields are properly initialized.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Fixes ArcticaProject/nx-libs#558
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Adds a new option called "keyconv" to control keycode conversion.
Before commit 2f2ade61a8823bad012737b2b388dcc168cccbbf keycode
conversion was activated if the client was Linux and client side rules
and/or model was "evdev". The only (and undocumented) way to disable
that was providing a value different from "linux" for the "client"
option (which had no other effect). The mentioned commit removed the
dependency on Linux and so there was no way anymore to disable keycode
conversion.
|
| |
|
|
|
|
|
|
| |
nxagentGetClientsPath() allocated and returned a string that was never
used anywhere because it also fills the global variable with the same
value.
|
|
|
|
| |
free() can handle NULL so there's no need to check this ourselves
|
| |
|
| |
|
|
|
|
|
|
| |
Commit 3f7b3001988bf921e6cd860f03a6256b1451ee3d was incomplete: the
options parameter was not parsed as a string on reconnect. It was
always assumed to be a filename.
|
| |
|