diff options
author | marha <marha@users.sourceforge.net> | 2012-07-10 14:56:29 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-07-10 14:56:29 +0200 |
commit | d137057fd13e83ec15ab416c7fe774741da06047 (patch) | |
tree | f4b38caa4f3ecb983f00e84f4f4d8d66699ecbc5 /xorg-server/Xi/grabdevk.c | |
parent | c29d91cfd8df084f16d0d2dfa82c3a86f7719a73 (diff) | |
download | vcxsrv-d137057fd13e83ec15ab416c7fe774741da06047.tar.gz vcxsrv-d137057fd13e83ec15ab416c7fe774741da06047.tar.bz2 vcxsrv-d137057fd13e83ec15ab416c7fe774741da06047.zip |
fontconfig mesa xserver git update 10 Jul 2012
Diffstat (limited to 'xorg-server/Xi/grabdevk.c')
-rw-r--r-- | xorg-server/Xi/grabdevk.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/xorg-server/Xi/grabdevk.c b/xorg-server/Xi/grabdevk.c index b75518211..8694f9e6d 100644 --- a/xorg-server/Xi/grabdevk.c +++ b/xorg-server/Xi/grabdevk.c @@ -135,13 +135,14 @@ ProcXGrabDeviceKey(ClientPtr client) X_GrabDeviceKey)) != Success) return ret; - memset(¶m, 0, sizeof(param)); - param.grabtype = XI; - param.ownerEvents = stuff->ownerEvents; - param.this_device_mode = stuff->this_device_mode; - param.other_devices_mode = stuff->other_devices_mode; - param.grabWindow = stuff->grabWindow; - param.modifiers = stuff->modifiers; + param = (GrabParameters) { + .grabtype = XI, + .ownerEvents = stuff->ownerEvents, + .this_device_mode = stuff->this_device_mode, + .other_devices_mode = stuff->other_devices_mode, + .grabWindow = stuff->grabWindow, + .modifiers = stuff->modifiers + }; mask.xi = tmp[stuff->grabbed_device].mask; ret = GrabKey(client, dev, mdev, stuff->key, ¶m, XI, &mask); |