diff options
Diffstat (limited to 'x11-drivers/xf86-input-mouse/files/patch-src_mouse.c')
| -rw-r--r-- | x11-drivers/xf86-input-mouse/files/patch-src_mouse.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c index 27118de48943..d4884b7ad585 100644 --- a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c +++ b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c @@ -1,6 +1,6 @@ ---- src/mouse.c.orig 2012-10-08 03:40:07.000000000 +0200 -+++ src/mouse.c 2013-07-03 01:04:45.398343993 +0200 -@@ -280,13 +280,39 @@ +--- src/mouse.c.orig 2014-08-12 06:36:34 UTC ++++ src/mouse.c +@@ -293,13 +293,39 @@ MouseCommonOptions(InputInfoPtr pInfo) pMse = pInfo->private; @@ -41,7 +41,7 @@ pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options, "Emulate3Buttons", FALSE); if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) { -@@ -298,6 +324,8 @@ +@@ -311,6 +337,8 @@ MouseCommonOptions(InputInfoPtr pInfo) "Emulate3Timeout", 50); if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) { MessageType from = X_CONFIG; @@ -50,7 +50,7 @@ if (pMse->emulate3ButtonsSoft) from = X_DEFAULT; xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n", -@@ -305,6 +333,8 @@ +@@ -318,6 +346,8 @@ MouseCommonOptions(InputInfoPtr pInfo) } pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE); @@ -59,7 +59,7 @@ pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE); if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) { pMse->invX = -1; -@@ -315,7 +345,7 @@ +@@ -328,7 +358,7 @@ MouseCommonOptions(InputInfoPtr pInfo) } else pMse->invY = 1; pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0); @@ -68,7 +68,7 @@ if (pMse->pDragLock) free(pMse->pDragLock); -@@ -425,14 +455,17 @@ +@@ -438,14 +468,17 @@ MouseCommonOptions(InputInfoPtr pInfo) free(s); } @@ -88,7 +88,7 @@ pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX; msg = xstrdup("X axis"); } else if (!xf86NameCmp(s, "y")) { -@@ -568,29 +601,6 @@ +@@ -594,29 +627,6 @@ MouseCommonOptions(InputInfoPtr pInfo) pInfo->name, wheelButton, pMse->wheelInertia, pMse->wheelButtonTimeout); } @@ -118,7 +118,7 @@ if (origButtons != pMse->buttons) buttons_from = X_CONFIG; xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons); -@@ -668,7 +678,6 @@ +@@ -698,7 +708,6 @@ MouseHWOptions(InputInfoPtr pInfo) } pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0); pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0); @@ -126,7 +126,7 @@ } static void -@@ -959,6 +968,8 @@ +@@ -986,6 +995,8 @@ MousePreInit(InputDriverPtr drv, InputIn /* Default Mapping: 1 2 3 8 9 10 11 ... */ for (i = 0; i < MSE_MAXBUTTONS; i++) pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i); @@ -135,7 +135,7 @@ protocol = MousePickProtocol(pInfo, device, protocol, &protocolID); -@@ -2136,7 +2147,7 @@ +@@ -2181,7 +2192,7 @@ MouseDoPostEvent(InputInfoPtr pInfo, int if (pMse->emulateWheel) { /* Emulate wheel button handling */ @@ -144,7 +144,7 @@ wheelButtonMask = 0; else wheelButtonMask = 1 << (pMse->wheelButton - 1); -@@ -2220,6 +2231,9 @@ +@@ -2271,6 +2282,9 @@ MouseDoPostEvent(InputInfoPtr pInfo, int } } } @@ -154,7 +154,7 @@ } /* Absorb the mouse movement while the wheel button is pressed. */ -@@ -2237,7 +2251,7 @@ +@@ -2288,7 +2302,7 @@ MouseDoPostEvent(InputInfoPtr pInfo, int if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy)) buttonTimer(pInfo); @@ -163,7 +163,7 @@ xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy); if (change) { -@@ -2349,12 +2363,10 @@ +@@ -2401,12 +2415,10 @@ MousePostEvent(InputInfoPtr pInfo, int t int dx, int dy, int dz, int dw) { MouseDevPtr pMse; @@ -176,7 +176,7 @@ if (pMse->protocolID == PROT_MMHIT) b = reverseBits(hitachMap, truebuttons); -@@ -2447,11 +2459,11 @@ +@@ -2499,11 +2511,11 @@ MousePostEvent(InputInfoPtr pInfo, int t /* Accumulate the scaled dx, dy in the private variables fracdx,fracdy and return the integer number part */ |