SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into mpx

Browse Source 
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.

Conflicts:

	Xi/opendev.c
	dix/devices.c
	dix/dixfonts.c
	dix/getevents.c
	dix/resource.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	mi/mipointer.c
	xkb/ddxBeep.c
	xkb/ddxCtrls.c
	xkb/ddxKeyClick.c
	xkb/ddxList.c
	xkb/ddxLoad.c
	xkb/xkb.c
	xkb/xkbAccessX.c
	xkb/xkbEvents.c
	xkb/xkbInit.c
	xkb/xkbPrKeyEv.c
	xkb/xkbUtils.c
This commit is contained in:
Peter Hutterer
2008-03-04 18:11:10 +10:30
parent 23ae68a4c7 453661a9e1
commit 4f2cd0ed96
170 changed files with 8242 additions and 19606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
dix/dispatch.c
View File

@@ -417,17 +417,18 @@ Dispatch(void)
}
isItTimeToYield = FALSE;
#ifdef XPRINT
requestingClient = client;
#endif
#ifdef SMART_SCHEDULE
start_tick = SmartScheduleTime;
#endif
while (!isItTimeToYield)
{
if (*icheck[0] != *icheck[1])
{
ProcessInputEvents();
FlushIfCriticalOutputPending();
}
FlushIfCriticalOutputPending();
#ifdef SMART_SCHEDULE
if (!SmartScheduleDisable &&
(SmartScheduleTime - start_tick) >= SmartScheduleSlice)
@@ -483,9 +484,6 @@ Dispatch(void)
client->errorValue, result);
break;
}
#ifdef DAMAGEEXT
FlushIfCriticalOutputPending ();
#endif
}
FlushAllOutput();
#ifdef SMART_SCHEDULE
@@ -493,7 +491,9 @@ Dispatch(void)
if (client)
client->smart_stop_tick = SmartScheduleTime;
#endif
#ifdef XPRINT
requestingClient = NULL;
#endif
}
dispatchException &= ~DE_PRIORITYCHANGE;
}
@@ -995,8 +995,8 @@ ProcSetSelectionOwner(ClientPtr client)
{
int i = 0;
rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->selection,
DixSetAttrAccess);
rc = XaceHookSelectionAccess(client, stuff->selection,
DixSetAttrAccess);
if (rc != Success)
return rc;
@@ -1082,8 +1082,7 @@ ProcGetSelectionOwner(ClientPtr client)
int rc, i;
xGetSelectionOwnerReply reply;
rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->id,
DixGetAttrAccess);
rc = XaceHookSelectionAccess(client, stuff->id, DixGetAttrAccess);
if (rc != Success)
return rc;
@@ -1128,8 +1127,7 @@ ProcConvertSelection(ClientPtr client)
rc = dixLookupWindow(&pWin, stuff->requestor, client, DixSetAttrAccess);
if (rc != Success)
return rc;
rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->selection,
DixReadAccess);
rc = XaceHookSelectionAccess(client, stuff->selection, DixReadAccess);
if (rc != Success)
return rc;
@@ -2538,7 +2536,7 @@ ProcFreeColormap(ClientPtr client)
else
{
client->errorValue = stuff->id;
return rc;
return (rc == BadValue) ? BadColor : rc;
}
}
@@ -2567,7 +2565,7 @@ ProcCopyColormapAndFree(ClientPtr client)
else
{
client->errorValue = stuff->srcCmap;
return rc;
return (rc == BadValue) ? BadColor : rc;
}
}
@@ -2659,7 +2657,7 @@ ProcListInstalledColormaps(ClientPtr client)
xfree(preply);
rc = client->noClientException;
out:
return (rc == BadValue) ? BadColor : rc;
return rc;
}
int