diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2018-01-23 00:47:38 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 05:07:49 +0100 |
| commit | 485d626769c53c7d72ffad2f4e8623d6ce897662 (patch) | |
| tree | ece8a3df05c586f6782d871fe5a5c9c4617d70f1 /nx-X11/programs/Xserver/dix/dispatch.c | |
| parent | 2853ab292345ef5d1c690289f9d55a0ccdf32450 (diff) | |
| download | nx-libs-485d626769c53c7d72ffad2f4e8623d6ce897662.tar.gz nx-libs-485d626769c53c7d72ffad2f4e8623d6ce897662.tar.bz2 nx-libs-485d626769c53c7d72ffad2f4e8623d6ce897662.zip | |
Lift dix to xorg-xserver-1.3.0.0 state
Diffstat (limited to 'nx-X11/programs/Xserver/dix/dispatch.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/dispatch.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index 6f32f51f3..3c791465e 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -2453,7 +2453,7 @@ ProcCreateColormap(register ClientPtr client) return(result); } client->errorValue = stuff->visual; - return(BadValue); + return(BadMatch); } int @@ -3608,6 +3608,10 @@ CloseDownRetainedResources() } } +extern int clientPrivateLen; +extern unsigned *clientPrivateSizes; +extern unsigned totalClientSize; + void InitClient(ClientPtr client, int i, void * ospriv) { client->index = i; @@ -3648,10 +3652,6 @@ void InitClient(ClientPtr client, int i, void * ospriv) client->clientIds = NULL; } -extern int clientPrivateLen; -extern unsigned *clientPrivateSizes; -extern unsigned totalClientSize; - #ifndef NXAGENT_SERVER int InitClientPrivates(ClientPtr client) @@ -3685,6 +3685,17 @@ InitClientPrivates(ClientPtr client) else ppriv->ptr = (void *)NULL; } + + /* Allow registrants to initialize the serverClient devPrivates */ + if (!client->index && ClientStateCallback) + { + NewClientInfoRec clientinfo; + + clientinfo.client = client; + clientinfo.prefix = (xConnSetupPrefix *)NULL; + clientinfo.setup = (xConnSetup *) NULL; + CallCallbacks((&ClientStateCallback), (void *)&clientinfo); + } return 1; } #endif /* NXAGENT_SERVER */ |