diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-02-01 14:59:58 +1100 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-02-14 07:11:52 +1100 |
| commit | 7c0709a736c0f3aa011de67dd2c2962585ab146e (patch) | |
| tree | 7cca66a5b1494289a92352d34dfa5c4fdf79a776 | |
| parent | 62cfe8863823c0994f20555cb35ee3bacb9e5225 (diff) | |
| download | xserver-7c0709a736c0f3aa011de67dd2c2962585ab146e.tar.gz | |
requestingClient is an xprintism, hide it for other servers.
| -rw-r--r-- | dix/dispatch.c | 4 | ||||
| -rw-r--r-- | dix/dixfonts.c | 5 | ||||
| -rw-r--r-- | dix/globals.c | 2 | ||||
| -rw-r--r-- | hw/xnest/Font.c | 2 | ||||
| -rw-r--r-- | include/dix.h | 2 |
5 files changed, 14 insertions, 1 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c index 32efff782..e8e650a91 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -417,7 +417,9 @@ Dispatch(void) } isItTimeToYield = FALSE; +#ifdef XPRINT requestingClient = client; +#endif #ifdef SMART_SCHEDULE start_tick = SmartScheduleTime; #endif @@ -489,7 +491,9 @@ Dispatch(void) if (client) client->smart_stop_tick = SmartScheduleTime; #endif +#ifdef XPRINT requestingClient = NULL; +#endif } dispatchException &= ~DE_PRIORITYCHANGE; } diff --git a/dix/dixfonts.c b/dix/dixfonts.c index 04f1f1b30..8def6ee21 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1934,12 +1934,15 @@ GetDefaultPointSize () FontResolutionPtr GetClientResolutions (int *num) { +#ifdef XPRINT if (requestingClient && requestingClient->fontResFunc != NULL && !requestingClient->clientGone) { return (*requestingClient->fontResFunc)(requestingClient, num); } - else { + else +#endif + { static struct _FontResolution res; ScreenPtr pScreen; diff --git a/dix/globals.c b/dix/globals.c index d76b604da..7f95eabd5 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -143,7 +143,9 @@ Bool loadableFonts = FALSE; CursorPtr rootCursor; Bool blackRoot=FALSE; Bool whiteRoot=FALSE; +#ifdef XPRINT ClientPtr requestingClient; /* XXX this should be obsolete now, remove? */ +#endif _X_EXPORT TimeStamp currentTime; _X_EXPORT TimeStamp lastDeviceEventTime; diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c index 72edcee9a..9f30085b1 100644 --- a/hw/xnest/Font.c +++ b/hw/xnest/Font.c @@ -44,8 +44,10 @@ xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont) FontSetPrivate(pFont, xnestFontPrivateIndex, NULL); +#ifdef XPRINT if (requestingClient && XpClientIsPrintClient(requestingClient, NULL)) return True; +#endif name_atom = MakeAtom("FONT", 4, True); value_atom = 0L; diff --git a/include/dix.h b/include/dix.h index ec9806aef..52212e7e7 100644 --- a/include/dix.h +++ b/include/dix.h @@ -116,7 +116,9 @@ typedef struct _Client *ClientPtr; /* also in misc.h */ typedef struct _WorkQueue *WorkQueuePtr; +#ifdef XPRINT extern ClientPtr requestingClient; +#endif extern ClientPtr *clients; extern ClientPtr serverClient; extern int currentMaxClients; |