Summary: | Assert in xf86-input-mouse on Solaris 10 | ||||||
---|---|---|---|---|---|---|---|
Product: | xorg | Reporter: | Pat Kane <pekane52> | ||||
Component: | Input/Mouse | Assignee: | Xorg Project Team <xorg-team> | ||||
Status: | RESOLVED FIXED | QA Contact: | Xorg Project Team <xorg-team> | ||||
Severity: | major | ||||||
Priority: | medium | CC: | pekane52 | ||||
Version: | git | ||||||
Hardware: | x86 (IA32) | ||||||
OS: | Solaris | ||||||
Whiteboard: | |||||||
i915 platform: | i915 features: | ||||||
Attachments: |
|
Description
Pat Kane
2010-07-13 14:08:46 UTC
Here is a patch for the bug. diff --git a/src/sun_mouse.c b/src/sun_mouse.c index f6e8dbb..80e1111 100644 --- a/src/sun_mouse.c +++ b/src/sun_mouse.c @@ -116,13 +116,21 @@ static void vuidMouseSendScreenSize(ScreenPtr pScreen, VuidMsePtr pVuidMse); static void vuidMouseAdjustFrame(int index, int x, int y, int flags); static int vuidMouseGeneration = 0; -static int vuidMouseScreenIndex; +DevPrivateKeyRec vuidDevicePrivateKeyRec; +#define vuidDevicePrivateKey (&vuidDevicePrivateKeyRec) + #define vuidMouseGetScreenPrivate(s) ( \ - dixLookupPrivate(&(s)->devPrivates, &vuidMouseScreenIndex)) + dixLookupPrivate(&(s)->devPrivates, vuidDevicePrivateKey)) #define vuidMouseSetScreenPrivate(s,p) \ - dixSetPrivate(&(s)->devPrivates, &vuidMouseScreenIndex, (void *) p) + dixSetPrivate(&(s)->devPrivates, vuidDevicePrivateKey, (void *) p) #endif /* HAVE_ABSOLUTE_MOUSE_SCALING */ +static Bool +VuidInitPrivates(void) +{ + return dixRegisterPrivateKey(vuidDevicePrivateKey, PRIVATE_SCREEN, 0); +} + static inline VuidMsePtr getVuidMsePriv(InputInfoPtr pInfo) { @@ -542,6 +550,7 @@ vuidMouseProc(DeviceIntPtr pPointer, int what) case DEVICE_INIT: #ifdef HAVE_ABSOLUTE_MOUSE_SCALING + VuidInitPrivates(); if (vuidMouseGeneration != serverGeneration) { for (i = 0; i < screenInfo.numScreens; i++) { ScreenPtr pScreen = screenInfo.screens[i]; Created attachment 37002 [details] [review] A patch for the bug Sent patch to xorg-devel mailing list: http://lists.x.org/archives/xorg-devel/2010-July/011253.html |
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.