From f3856e9c750f82ae86dcf2e398926b6a1a7df66f Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 19 Jan 2020 15:34:38 +0100 Subject: (NX)property.c: harmonize function name Use the "xorg_" prefix as everywhere else, not "Xorg_". --- nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXproperty.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index dc2f5b07f..fb751ed28 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -229,7 +229,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, } } - return Xorg_ChangeWindowProperty(pWin, property, type, format, mode, len, value, sendevent); + return xorg_ChangeWindowProperty(pWin, property, type, format, mode, len, value, sendevent); } /***************** -- cgit v1.2.3 From 7a8eea1f187aa806d1f7df64ccaa5039f1b9140f Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 25 Jan 2020 23:30:50 +0100 Subject: NXproperty.c: fix implicit declaration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix warning with NX_DEBUG_INPUT: NXproperty.c: In function ‘ProcChangeProperty’: NXproperty.c:210:7: warning: implicit declaration of function ‘nxagentGuessDumpInputInfo’; did you mean ‘nxagentGuessClientHint’? [-Wimplicit-function-declaration] nxagentGuessDumpInputInfo(client, stuff->property, (char *) &stuff[1]); ^~~~~~~~~~~~~~~~~~~~~~~~~ nxagentGuessClientHint --- nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXproperty.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index fb751ed28..24772119e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -101,6 +101,10 @@ extern WindowPtr nxagentGetClipboardWindow(Atom); extern Atom mcop_local_atom; #endif +#ifdef NX_DEBUG_INPUT +extern void nxagentGuessDumpInputInfo(ClientPtr client, Atom property, char *data); +#endif + int ProcChangeProperty(ClientPtr client) { -- cgit v1.2.3 From fba279d351740656f1cbf610405a802aebe5b7a9 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 29 Jan 2020 22:47:21 +0100 Subject: NXproperty.c: fix comment/formatting --- nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXproperty.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index 24772119e..b55392690 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -451,7 +451,7 @@ ProcGetProperty(ClientPtr client) #ifdef NXAGENT_CLIPBOARD /* GetWindowProperty clipboard use only */ -/* FIXME: that's wrong, it is also called in Window.c and Events. */ +/* FIXME: that's wrong, it is also called in Window.c and Events.c */ /* FIXME: should be moved to a different file, is not derived from dix */ int @@ -506,7 +506,6 @@ GetWindowProperty(pWin, property, longOffset, longLength, delete, pProp = pProp->next; } - if (!pProp) { #ifdef DEBUG -- cgit v1.2.3 From fad1b5f0c9a819b500b1c7a82dc0a87c6a296e2f Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 14 Feb 2020 00:13:08 +0100 Subject: Clipboard.{c,h}: cleanup prototypes --- nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXproperty.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index b55392690..11e66720f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -76,6 +76,7 @@ SOFTWARE. #include "Rootless.h" #include "Client.h" #include "Windows.h" +#include "Clipboard.h" extern Atom clientCutProperty; @@ -93,10 +94,6 @@ nxagentWMStateRec; #undef TEST #undef DEBUG -#ifdef NXAGENT_CLIPBOARD -extern WindowPtr nxagentGetClipboardWindow(Atom); -#endif - #ifdef NXAGENT_ARTSD extern Atom mcop_local_atom; #endif -- cgit v1.2.3