xserver: Branch 'server-1.4-branch' - 3 commits
Daniel Stone
daniels at kemper.freedesktop.org
Wed Dec 5 10:31:38 PST 2007
Xext/panoramiXSwap.c | 4 ++++
Xi/exevents.c | 4 ++--
config/hal.c | 5 +++--
3 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 25d26b55e74b50a2fd0632329cb0bdca017fe8e6
Author: Kanru Chen <koster at debian.org.tw>
Date: Mon Dec 3 12:46:45 2007 +0000
Config: HAL: Fix XKB option parsing
Actually combine the XKB options into a string, rather than just repeatedly
writing a comma.
(cherry picked from commit da893908feb2dcf7c22420b3426ab3ac65c7ca99)
diff --git a/config/hal.c b/config/hal.c
index 6bb449d..4427deb 100644
--- a/config/hal.c
+++ b/config/hal.c
@@ -134,10 +134,11 @@ get_prop_string_array(LibHalContext *hal_ctx, const char *udi, const char *prop)
str = ret;
for (i = 0; props[i]; i++) {
- str = strcpy(str, props[i]);
+ strcpy(str, props[i]);
+ str += strlen(props[i]);
*str++ = ',';
}
- *str = '\0';
+ *(str-1) = '\0';
libhal_free_string_array(props);
}
commit b037e4a5abb878ad89e7f27c2b6c23004625f6c3
Author: Peter Harris <peter.harris at hummingbird.com>
Date: Mon Oct 29 18:05:19 2007 -0400
Add missing swaps in panoramiXSwap.c
(cherry picked from commit cb67a10b7f6f564e0345de19316934361ea28720)
diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c
index da445ff..0487471 100644
--- a/Xext/panoramiXSwap.c
+++ b/Xext/panoramiXSwap.c
@@ -70,6 +70,7 @@ SProcPanoramiXGetState(ClientPtr client)
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
+ swapl (&stuff->window, n);
return ProcPanoramiXGetState(client);
}
@@ -81,6 +82,7 @@ SProcPanoramiXGetScreenCount(ClientPtr client)
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
+ swapl (&stuff->window, n);
return ProcPanoramiXGetScreenCount(client);
}
@@ -92,6 +94,8 @@ SProcPanoramiXGetScreenSize(ClientPtr client)
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
+ swapl (&stuff->window, n);
+ swapl (&stuff->screen, n);
return ProcPanoramiXGetScreenSize(client);
}
commit 3e0993fcf38e47dd42c27a2dcb5dde7d23222ca8
Author: Daniel Stone <daniel at fooishbar.org>
Date: Fri Nov 30 20:35:26 2007 +0200
ProcessOtherEvent: Don't do double translation of button events
We already deal with the button mapping in GetPointerEvents, so don't
do the remapping again in ProcessOtherEvent.
(cherry picked from commit 7ff002fe3e229330216d7f2ff16cdabe63014bcd)
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 377311e..7cf0c50 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -244,7 +244,7 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr other, int count)
other->valuator->motionHintWindow = NullWindow;
b->buttonsDown++;
b->motionMask = DeviceButtonMotionMask;
- xE->u.u.detail = b->map[key];
+ xE->u.u.detail = key;
if (xE->u.u.detail == 0)
return;
if (xE->u.u.detail <= 5)
@@ -266,7 +266,7 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr other, int count)
other->valuator->motionHintWindow = NullWindow;
if (b->buttonsDown >= 1 && !--b->buttonsDown)
b->motionMask = 0;
- xE->u.u.detail = b->map[key];
+ xE->u.u.detail = key;
if (xE->u.u.detail == 0)
return;
if (xE->u.u.detail <= 5)
More information about the xorg-commit
mailing list