diff options
| author | Keith Packard <keithp@keithp.com> | 2010-04-26 17:22:21 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-06-05 19:23:03 -0700 |
| commit | faeebead7bfcc78535757ca7acc1faf7554c03b7 (patch) | |
| tree | 1a8f13a3b1ae968011efb9679bc3ed79a29020be /xkb | |
| parent | c865a24401f06bcf1347d8b41f736a066ab25693 (diff) | |
Change the devPrivates API to require dixRegisterPrivateKey
This patch only changes the API, not the implementation of the
devPrivates infrastructure. This will permit a new devPrivates
implementation to be layed into the server without requiring
simultaneous changes in every devPrivates user.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Diffstat (limited to 'xkb')
| -rw-r--r-- | xkb/xkb.c | 3 | ||||
| -rw-r--r-- | xkb/xkbActions.c | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -6707,6 +6707,9 @@ XkbExtensionInit(void) if (!RT_XKBCLIENT) return; + if (!dixRegisterPrivateKey(&xkbDevicePrivateKeyRec, PRIVATE_DEVICE, 0)) + return; + if ((extEntry = AddExtension(XkbName, XkbNumberEvents, XkbNumberErrors, ProcXkbDispatch, SProcXkbDispatch, NULL, StandardMinorOpcode))) { diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index 0a1a873d1..3f0b766db 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -43,8 +43,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "mi.h" #define EXTENSION_EVENT_BASE 64 -static int xkbDevicePrivateKeyIndex; -DevPrivateKey xkbDevicePrivateKey = &xkbDevicePrivateKeyIndex; +DevPrivateKeyRec xkbDevicePrivateKeyRec; static void XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button); static void XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y); |