andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

requestingClient is an xprintism, hide it for other servers.

Browse Source 
(cherry picked from commit 7c0709a736)
This commit is contained in:
Adam Jackson 2008-02-01 14:59:58 +11:00 committed by Jeremy Huddleston
parent 83d7a8b2ad
commit 1f69f2d037
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

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

5
dix/dixfonts.c
View File

@ -1918,12 +1918,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;

2
dix/globals.c
View File

@ -144,7 +144,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;

2
hw/xnest/Font.c
View File

@ -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;

2
include/dix.h
View File

@ -129,7 +129,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;