From 8558e321f8cc27a7ecb0bc9db2ec87feed3cf877 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 18 Jan 2020 13:57:24 +0100 Subject: dix: also compile ffs.c File was missing in Imakefile. We are not using the ffs function, but nevertheless it's a part of dix. --- nx-X11/programs/Xserver/dix/Imakefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'nx-X11/programs/Xserver/dix') diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile index d153805df..f141719f7 100644 --- a/nx-X11/programs/Xserver/dix/Imakefile +++ b/nx-X11/programs/Xserver/dix/Imakefile @@ -36,6 +36,7 @@ SRCS = \ devices.c \ dixutils.c \ extension.c \ + ffs.c \ gc.c \ globals.c \ grabs.c \ @@ -58,6 +59,7 @@ OBJS = \ devices.o \ dixutils.o \ extension.o \ + ffs.o \ gc.o \ globals.o \ grabs.o \ -- cgit v1.2.3 From c135bbcfea95d7468c18a672266c98dffde8597f Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 19 Jan 2020 12:42:31 +0100 Subject: NXdixfonts.c: call dix version of SetDefaultFontPath --- nx-X11/programs/Xserver/dix/dixfonts.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/dix') diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c index f1fa53f69..e3e90b163 100644 --- a/nx-X11/programs/Xserver/dix/dixfonts.c +++ b/nx-X11/programs/Xserver/dix/dixfonts.c @@ -1958,9 +1958,12 @@ SetFontPath(ClientPtr client, int npaths, unsigned char *paths) return err; } -#ifndef NXAGENT_SERVER int +#ifdef NXAGENT_SERVER +xorg_SetDefaultFontPath(char *path) +#else SetDefaultFontPath(char *path) +#endif { char *temp_path, *start, @@ -2027,7 +2030,6 @@ SetDefaultFontPath(char *path) return err; } -#endif /* NXAGENT_SERVER */ unsigned char * GetFontPath(int *count, int *length) -- cgit v1.2.3 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/dix/property.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/dix') diff --git a/nx-X11/programs/Xserver/dix/property.c b/nx-X11/programs/Xserver/dix/property.c index f46b53f7c..f0bfe1e65 100644 --- a/nx-X11/programs/Xserver/dix/property.c +++ b/nx-X11/programs/Xserver/dix/property.c @@ -257,7 +257,7 @@ ProcChangeProperty(ClientPtr client) int #ifdef NXAGENT_SERVER -Xorg_ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, +xorg_ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, int mode, unsigned long len, void * value, Bool sendevent) #else -- cgit v1.2.3 From f38ecc6ffef14de748ea56ea2a5df32e04eb0e0d Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 17 Feb 2020 23:21:06 +0100 Subject: dix/dispatch.c: fix buggy callback invocation Looks like a copy'n'paste error. --- nx-X11/programs/Xserver/dix/dispatch.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'nx-X11/programs/Xserver/dix') diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index 6d0d61a15..57806f99d 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -3960,7 +3960,12 @@ DeleteClientFromAnySelections(ClientPtr client) SelectionInfoRec info; info.selection = &CurrentSelections[i]; +#ifdef NXAGENT_SERVER + /* bugfix missing in upstream before introduction of selection.c */ + info.kind = SelectionClientClose; +#else info.kind = SelectionWindowDestroy; +#endif CallCallbacks(&SelectionCallback, &info); } CurrentSelections[i].pWin = (WindowPtr)NULL; -- cgit v1.2.3 From c73ddd3118f37449155fdd30128f6f1d67f70c7e Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Tue, 18 Feb 2020 22:07:37 +0100 Subject: dix/dispatch.c: Fix copy/paste error from before git history in UpdateCurrentTimeIf() Backport from this commit: commit 8dfd98245d2c44a1eb4c8b7c275e6cfc10fe40f1 Author: Chase Douglas Date: Wed Apr 11 11:14:51 2012 -0700 Fix copy/paste error from before git history in UpdateCurrentTimeIf() See UpdateCurrentTime() for reference. I don't know what bug this might trigger, but it wouldn't hurt to fix this. Signed-off-by: Chase Douglas Reviewed-by: Peter Hutterer --- nx-X11/programs/Xserver/dix/dispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/dix') diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index 57806f99d..cd832319d 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -209,7 +209,7 @@ UpdateCurrentTimeIf() systime.milliseconds = GetTimeInMillis(); if (systime.milliseconds < currentTime.milliseconds) systime.months++; - if (*checkForInput[0] == *checkForInput[1]) + if (CompareTimeStamps(systime, currentTime) == LATER) currentTime = systime; } -- cgit v1.2.3 From 067031a3b3036670ccc858be732264215a7d14ba Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 15 Feb 2020 23:50:03 +0100 Subject: nxagent: use Xorg's callback mechanism for init/free of client privates --- nx-X11/programs/Xserver/dix/dispatch.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'nx-X11/programs/Xserver/dix') diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index cd832319d..ac5d07281 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -3642,11 +3642,7 @@ void InitClient(ClientPtr client, int i, void * ospriv) } int -#ifdef NXAGENT_SERVER -xorg_InitClientPrivates(ClientPtr client) -#else InitClientPrivates(ClientPtr client) -#endif { register char *ptr; DevUnion *ppriv; -- cgit v1.2.3