Module Name: xsrc
Committed By: mrg
Date: Mon Nov 9 04:55:33 UTC 2009
Modified Files:
xsrc/external/mit/xorg-server/dist/Xext: sync.c
xsrc/external/mit/xorg-server/dist/dix: devices.c getevents.c window.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Config.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes: xf86Cursors.c
Log Message:
merge xorg-server 1.6.5
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/Xext/sync.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/dix/devices.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/dix/getevents.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/dix/window.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Cursors.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/Xext/sync.c
diff -u xsrc/external/mit/xorg-server/dist/Xext/sync.c:1.4 xsrc/external/mit/xorg-server/dist/Xext/sync.c:1.5
--- xsrc/external/mit/xorg-server/dist/Xext/sync.c:1.4 Sat Aug 22 01:39:01 2009
+++ xsrc/external/mit/xorg-server/dist/Xext/sync.c Mon Nov 9 04:55:32 2009
@@ -1168,28 +1168,24 @@
pnewltval = &psci->bracket_less;
}
}
- else if ( (pTrigger->test_type == XSyncPositiveTransition &&
+ else if (pTrigger->test_type == XSyncNegativeTransition &&
ct != XSyncCounterNeverIncreases)
- ||
- (pTrigger->test_type == XSyncNegativeTransition &&
+ {
+ if (XSyncValueGreaterThan(pCounter->value, pTrigger->test_value) &&
+ XSyncValueGreaterThan(pTrigger->test_value, psci->bracket_less))
+ {
+ psci->bracket_less = pTrigger->test_value;
+ pnewltval = &psci->bracket_less;
+ }
+ }
+ else if (pTrigger->test_type == XSyncPositiveTransition &&
ct != XSyncCounterNeverDecreases)
- )
{
- if (XSyncValueLessThan(pCounter->value, pTrigger->test_value))
+ if (XSyncValueLessThan(pCounter->value, pTrigger->test_value) &&
+ XSyncValueLessThan(pTrigger->test_value, psci->bracket_greater))
{
- if (XSyncValueLessThan(pTrigger->test_value,
- psci->bracket_greater))
- {
- psci->bracket_greater = pTrigger->test_value;
- pnewgtval = &psci->bracket_greater;
- }
- else
- if (XSyncValueGreaterThan(pTrigger->test_value,
- psci->bracket_less))
- {
- psci->bracket_less = pTrigger->test_value;
- pnewltval = &psci->bracket_less;
- }
+ psci->bracket_greater = pTrigger->test_value;
+ pnewgtval = &psci->bracket_greater;
}
}
} /* end for each trigger */
Index: xsrc/external/mit/xorg-server/dist/dix/devices.c
diff -u xsrc/external/mit/xorg-server/dist/dix/devices.c:1.4 xsrc/external/mit/xorg-server/dist/dix/devices.c:1.5
--- xsrc/external/mit/xorg-server/dist/dix/devices.c:1.4 Thu Jul 9 07:08:06 2009
+++ xsrc/external/mit/xorg-server/dist/dix/devices.c Mon Nov 9 04:55:32 2009
@@ -530,7 +530,6 @@
#ifdef XKB
if (!noXkbExtension) {
bzero(&names, sizeof(names));
- //XkbSetRulesDflts("xorg", "pc105", "us", NULL, NULL);
XkbInitKeyboardDeviceStruct(pDev, &names, &keySyms, modMap,
CoreKeyboardBell, CoreKeyboardCtl);
}
Index: xsrc/external/mit/xorg-server/dist/dix/getevents.c
diff -u xsrc/external/mit/xorg-server/dist/dix/getevents.c:1.2 xsrc/external/mit/xorg-server/dist/dix/getevents.c:1.3
--- xsrc/external/mit/xorg-server/dist/dix/getevents.c:1.2 Mon Nov 9 04:32:07 2009
+++ xsrc/external/mit/xorg-server/dist/dix/getevents.c Mon Nov 9 04:55:32 2009
@@ -545,7 +545,7 @@
updateFromMaster(EventListPtr events, DeviceIntPtr dev, int *num_events)
{
DeviceIntPtr master = dev->u.master;
- if (master && master->u.lastSlave != dev)
+ if (master && master->u.lastSlave != dev && dev->coreEvents)
{
updateSlaveDeviceCoords(master, dev);
master->u.lastSlave = dev;
@@ -683,7 +683,7 @@
* to the current screen. */
miPointerSetPosition(dev, &dev->last.valuators[0], &dev->last.valuators[1]);
- if (dev->u.master) {
+ if (dev->u.master && dev->coreEvents) {
dev->u.master->last.valuators[0] = dev->last.valuators[0];
dev->u.master->last.valuators[1] = dev->last.valuators[1];
}
Index: xsrc/external/mit/xorg-server/dist/dix/window.c
diff -u xsrc/external/mit/xorg-server/dist/dix/window.c:1.5 xsrc/external/mit/xorg-server/dist/dix/window.c:1.6
--- xsrc/external/mit/xorg-server/dist/dix/window.c:1.5 Sat Aug 22 01:39:01 2009
+++ xsrc/external/mit/xorg-server/dist/dix/window.c Mon Nov 9 04:55:32 2009
@@ -3169,8 +3169,6 @@
if (on == SCREEN_SAVER_FORCER)
{
- UpdateCurrentTimeIf();
- lastDeviceEventTime = currentTime;
if (mode == ScreenSaverReset)
what = SCREEN_SAVER_OFF;
else
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.4 Thu Jul 9 07:08:06 2009
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c Mon Nov 9 04:55:32 2009
@@ -612,22 +612,6 @@
pathFrom = X_DEFAULT;
temp_path = defaultFontPath ? defaultFontPath : "";
- /* ensure defaultFontPath contains "built-ins" */
- start = strstr(temp_path, "built-ins");
- end = start + strlen("built-ins");
- if (start == NULL ||
- !((start == temp_path || start[-1] == ',') && (!*end || *end == ','))) {
- defaultFontPath = Xprintf("%s%sbuilt-ins",
- temp_path, *temp_path ? "," : "");
- if (must_copy == TRUE) {
- if (defaultFontPath != NULL) {
- must_copy = FALSE;
- }
- } else {
- /* already made a copy of the font path */
- xfree(temp_path);
- }
- }
/* xf86ValidateFontPath modifies its argument, but returns a copy of it. */
temp_path = must_copy ? XNFstrdup(defaultFontPath) : defaultFontPath;
defaultFontPath = xf86ValidateFontPath(temp_path);
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Cursors.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Cursors.c:1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Cursors.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Cursors.c:1.2 Fri Sep 25 06:00:11 2009
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Cursors.c Mon Nov 9 04:55:33 2009
@@ -640,9 +640,11 @@
(*cursor_info->LoadCursorARGB) (scrn, cursor);
else if (src)
#endif
- (*cursor_info->LoadCursorImage)(cursor_info->pScrn, src);
+ (*cursor_info->LoadCursorImage)(scrn, src);
- (*cursor_info->SetCursorPosition)(cursor_info->pScrn, x, y);
+ x += scrn->frameX0 + cursor_screen_priv->HotX;
+ y += scrn->frameY0 + cursor_screen_priv->HotY;
+ (*cursor_info->SetCursorPosition)(scrn, x, y);
}
}
