diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-19 10:47:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-19 10:47:23 +0100 |
| commit | b3e1e62c45f525cdd332073aaa34d8452cb23374 (patch) | |
| tree | 221ee6420074033279921fadc971d30d63d6847b /xorg-server/Xi | |
| parent | b142593315b909b9e202f0f4585b96bf2e74b9db (diff) | |
| download | vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.tar.gz vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.tar.bz2 vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.zip | |
git update 19 nov 2012
fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d
libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e
mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe
pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7
xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea
xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50
Diffstat (limited to 'xorg-server/Xi')
| -rw-r--r-- | xorg-server/Xi/xipassivegrab.c | 8 | ||||
| -rw-r--r-- | xorg-server/Xi/xiquerypointer.c | 17 |
2 files changed, 12 insertions, 13 deletions
diff --git a/xorg-server/Xi/xipassivegrab.c b/xorg-server/Xi/xipassivegrab.c index ddab53dec..62a3a469f 100644 --- a/xorg-server/Xi/xipassivegrab.c +++ b/xorg-server/Xi/xipassivegrab.c @@ -50,7 +50,7 @@ int SProcXIPassiveGrabDevice(ClientPtr client) { int i; - xXIModifierInfo *mods; + uint32_t *mods; REQUEST(xXIPassiveGrabDeviceReq); @@ -63,12 +63,10 @@ SProcXIPassiveGrabDevice(ClientPtr client) swaps(&stuff->mask_len); swaps(&stuff->num_modifiers); - mods = (xXIModifierInfo *) &stuff[1]; + mods = (uint32_t *) &stuff[1]; for (i = 0; i < stuff->num_modifiers; i++, mods++) { - swapl(&mods->base_mods); - swapl(&mods->latched_mods); - swapl(&mods->locked_mods); + swapl(mods); } return ProcXIPassiveGrabDevice(client); diff --git a/xorg-server/Xi/xiquerypointer.c b/xorg-server/Xi/xiquerypointer.c index 7e6852dd0..e9bdd428d 100644 --- a/xorg-server/Xi/xiquerypointer.c +++ b/xorg-server/Xi/xiquerypointer.c @@ -50,6 +50,7 @@ #include "panoramiXsrv.h" #endif +#include "inpututils.h" #include "xiquerypointer.h" /*********************************************************************** @@ -127,8 +128,8 @@ ProcXIQueryPointer(ClientPtr client) .sequenceNumber = client->sequence, .length = 6, .root = (GetCurrentRootWindow(pDev))->drawable.id, - .root_x = FP1616(pSprite->hot.x, 0), - .root_y = FP1616(pSprite->hot.y, 0), + .root_x = double_to_fp1616(pSprite->hot.x), + .root_y = double_to_fp1616(pSprite->hot.y), .child = None }; @@ -166,8 +167,8 @@ ProcXIQueryPointer(ClientPtr client) if (pSprite->hot.pScreen == pWin->drawable.pScreen) { rep.same_screen = xTrue; - rep.win_x = FP1616(pSprite->hot.x - pWin->drawable.x, 0); - rep.win_y = FP1616(pSprite->hot.y - pWin->drawable.y, 0); + rep.win_x = double_to_fp1616(pSprite->hot.x - pWin->drawable.x); + rep.win_y = double_to_fp1616(pSprite->hot.y - pWin->drawable.y); for (t = pSprite->win; t; t = t->parent) if (t->parent == pWin) { rep.child = t->drawable.id; @@ -182,11 +183,11 @@ ProcXIQueryPointer(ClientPtr client) #ifdef PANORAMIX if (!noPanoramiXExtension) { - rep.root_x += FP1616(screenInfo.screens[0]->x, 0); - rep.root_y += FP1616(screenInfo.screens[0]->y, 0); + rep.root_x += double_to_fp1616(screenInfo.screens[0]->x); + rep.root_y += double_to_fp1616(screenInfo.screens[0]->y); if (stuff->win == rep.root) { - rep.win_x += FP1616(screenInfo.screens[0]->x, 0); - rep.win_y += FP1616(screenInfo.screens[0]->y, 0); + rep.win_x += double_to_fp1616(screenInfo.screens[0]->x); + rep.win_y += double_to_fp1616(screenInfo.screens[0]->y); } } #endif |