frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

requestingClient is an xprintism, hide it for other servers.

This commit is contained in:
Adam Jackson 2008-02-01 14:59:58 +11:00
parent 62cfe88638
commit 7c0709a736
5 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dix/dispatch.c
View File

@ -417,7 +417,9 @@ Dispatch(void)
} }
isItTimeToYield = FALSE; isItTimeToYield = FALSE;
#ifdef XPRINT
requestingClient = client; requestingClient = client;
#endif
#ifdef SMART_SCHEDULE #ifdef SMART_SCHEDULE
start_tick = SmartScheduleTime; start_tick = SmartScheduleTime;
#endif #endif
@ -489,7 +491,9 @@ Dispatch(void)
if (client) if (client)
client->smart_stop_tick = SmartScheduleTime; client->smart_stop_tick = SmartScheduleTime;
#endif #endif
#ifdef XPRINT
requestingClient = NULL; requestingClient = NULL;
#endif
} }
dispatchException &= ~DE_PRIORITYCHANGE; dispatchException &= ~DE_PRIORITYCHANGE;
} }

5
dix/dixfonts.c
View File

@ -1934,12 +1934,15 @@ GetDefaultPointSize ()
FontResolutionPtr FontResolutionPtr
GetClientResolutions (int *num) GetClientResolutions (int *num)
{ {
#ifdef XPRINT
if (requestingClient && requestingClient->fontResFunc != NULL && if (requestingClient && requestingClient->fontResFunc != NULL &&
!requestingClient->clientGone) !requestingClient->clientGone)
{ {
return (*requestingClient->fontResFunc)(requestingClient, num); return (*requestingClient->fontResFunc)(requestingClient, num);
} }
else { else
#endif
{
static struct _FontResolution res; static struct _FontResolution res;
ScreenPtr pScreen; ScreenPtr pScreen;

2
dix/globals.c
View File

@ -143,7 +143,9 @@ Bool loadableFonts = FALSE;
CursorPtr rootCursor; CursorPtr rootCursor;
Bool blackRoot=FALSE; Bool blackRoot=FALSE;
Bool whiteRoot=FALSE; Bool whiteRoot=FALSE;
#ifdef XPRINT
ClientPtr requestingClient; /* XXX this should be obsolete now, remove? */ ClientPtr requestingClient; /* XXX this should be obsolete now, remove? */
#endif
_X_EXPORT TimeStamp currentTime; _X_EXPORT TimeStamp currentTime;
_X_EXPORT TimeStamp lastDeviceEventTime; _X_EXPORT TimeStamp lastDeviceEventTime;

2
hw/xnest/Font.c
View File

@ -44,8 +44,10 @@ xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont)
FontSetPrivate(pFont, xnestFontPrivateIndex, NULL); FontSetPrivate(pFont, xnestFontPrivateIndex, NULL);
#ifdef XPRINT
if (requestingClient && XpClientIsPrintClient(requestingClient, NULL)) if (requestingClient && XpClientIsPrintClient(requestingClient, NULL))
return True; return True;
#endif
name_atom = MakeAtom("FONT", 4, True); name_atom = MakeAtom("FONT", 4, True);
value_atom = 0L; value_atom = 0L;

2
include/dix.h
View File

@ -116,7 +116,9 @@ typedef struct _Client *ClientPtr; /* also in misc.h */
typedef struct _WorkQueue *WorkQueuePtr; typedef struct _WorkQueue *WorkQueuePtr;
#ifdef XPRINT
extern ClientPtr requestingClient; extern ClientPtr requestingClient;
#endif
extern ClientPtr *clients; extern ClientPtr *clients;
extern ClientPtr serverClient; extern ClientPtr serverClient;
extern int currentMaxClients; extern int currentMaxClients;