qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for precision scrolling.

Browse Source
This commit is contained in:
bru 2019-03-24 17:59:19 +00:00
parent be0e9688f3
commit c43f5dfdc8
2 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
driver/xf86-input-ws/src/ws.c
View File

@ -13,7 +13,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $OpenBSD: ws.c,v 1.63 2017/12/31 23:31:41 guenther Exp $ */ /* $OpenBSD: ws.c,v 1.64 2019/03/24 17:59:19 bru Exp $ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
@ -363,6 +363,10 @@ wsDeviceInit(DeviceIntPtr pWS)
axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X); axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y); axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
} }
axes_labels[HSCROLL_AXIS] =
XIGetKnownProperty(AXIS_LABEL_PROP_REL_HSCROLL);
axes_labels[VSCROLL_AXIS] =
XIGetKnownProperty(AXIS_LABEL_PROP_REL_VSCROLL);
if (!InitValuatorClassDeviceStruct(pWS, if (!InitValuatorClassDeviceStruct(pWS,
NAXES, axes_labels, GetMotionHistorySize(), NAXES, axes_labels, GetMotionHistorySize(),
priv->type == WSMOUSE_TYPE_TPANEL ? Absolute : Relative)) priv->type == WSMOUSE_TYPE_TPANEL ? Absolute : Relative))
@ -382,6 +386,25 @@ wsDeviceInit(DeviceIntPtr pWS)
priv->type == WSMOUSE_TYPE_TPANEL ? Absolute : Relative); priv->type == WSMOUSE_TYPE_TPANEL ? Absolute : Relative);
xf86InitValuatorDefaults(pWS, 1); xf86InitValuatorDefaults(pWS, 1);
xf86InitValuatorAxisStruct(pWS, HSCROLL_AXIS,
axes_labels[HSCROLL_AXIS], 0, -1, 0, 0, 0, Relative);
xf86InitValuatorAxisStruct(pWS, VSCROLL_AXIS,
axes_labels[VSCROLL_AXIS], 0, -1, 0, 0, 0, Relative);
priv->scroll_mask = valuator_mask_new(MAX_VALUATORS);
if (!priv->scroll_mask) {
free(axes_labels);
return !Success;
}
/*
* The value of an HSCROLL or VSCROLL event is the fraction
* motion_delta / scroll_distance
* in [*.12] fixed-point format. The 'increment' attribute of the
* scroll axes is constant:
*/
SetScrollValuator(pWS, HSCROLL_AXIS, SCROLL_TYPE_HORIZONTAL, 4096, 0);
SetScrollValuator(pWS, VSCROLL_AXIS, SCROLL_TYPE_VERTICAL, 4096, 0);
pWS->public.on = FALSE; pWS->public.on = FALSE;
if (wsOpen(pInfo) != Success) { if (wsOpen(pInfo) != Success) {
return !Success; return !Success;
@ -579,6 +602,14 @@ wsReadHwState(InputInfoPtr pInfo, wsHwState *hw)
case WSCONS_EVENT_SYNC: case WSCONS_EVENT_SYNC:
DBG(4, ErrorF("Sync\n")); DBG(4, ErrorF("Sync\n"));
return TRUE; return TRUE;
case WSCONS_EVENT_HSCROLL:
hw->hscroll = event->value;
DBG(4, ErrorF("Horiz. Scrolling %d\n", event->value));
return TRUE;
case WSCONS_EVENT_VSCROLL:
hw->vscroll = event->value;
DBG(4, ErrorF("Vert. Scrolling %d\n", event->value));
return TRUE;
default: default:
xf86IDrvMsg(pInfo, X_WARNING, xf86IDrvMsg(pInfo, X_WARNING,
"bad wsmouse event type=%d\n", event->type); "bad wsmouse event type=%d\n", event->type);
@ -624,6 +655,14 @@ wsReadInput(InputInfoPtr pInfo)
DBG(4, ErrorF("W -> button %d (%d)\n", wbutton, abs(hw.dw))); DBG(4, ErrorF("W -> button %d (%d)\n", wbutton, abs(hw.dw)));
wsButtonClicks(pInfo, wbutton, abs(hw.dw)); wsButtonClicks(pInfo, wbutton, abs(hw.dw));
} }
if (hw.hscroll || hw.vscroll) {
valuator_mask_zero(priv->scroll_mask);
valuator_mask_set_double(priv->scroll_mask,
HSCROLL_AXIS, (double) hw.hscroll);
valuator_mask_set_double(priv->scroll_mask,
VSCROLL_AXIS, (double) hw.vscroll);
xf86PostMotionEventM(pInfo->dev, FALSE, priv->scroll_mask);
}
if (priv->lastButtons != hw.buttons) { if (priv->lastButtons != hw.buttons) {
/* button event */ /* button event */
wsSendButtons(pInfo, hw.buttons); wsSendButtons(pInfo, hw.buttons);

8
driver/xf86-input-ws/src/ws.h
View File

@ -26,7 +26,10 @@ extern int ws_debug_level;
# define DBG(lvl, f) # define DBG(lvl, f)
#endif #endif
#define NAXES 2 /* X and Y axes only */ #define NAXES 4 /* X, Y, horizontal and vertical scrolling */
#define HSCROLL_AXIS 2
#define VSCROLL_AXIS 3
#define NBUTTONS 32 /* max theoretical buttons */ #define NBUTTONS 32 /* max theoretical buttons */
#define DFLTBUTTONS 3 /* default number of buttons */ #define DFLTBUTTONS 3 /* default number of buttons */
@ -45,6 +48,7 @@ typedef struct {
unsigned int buttons; unsigned int buttons;
int dx, dy, dz, dw; int dx, dy, dz, dw;
int ax, ay; int ax, ay;
int hscroll, vscroll;
} wsHwState; } wsHwState;
typedef struct WSDevice { typedef struct WSDevice {
@ -87,6 +91,8 @@ typedef struct WSDevice {
Time timeout; Time timeout;
} emulateWheel; } emulateWheel;
ValuatorMask *scroll_mask;
OsTimerPtr remove_timer; /* Callback for removal on EIO */ OsTimerPtr remove_timer; /* Callback for removal on EIO */
struct wscons_event events[NWSEVENTS]; struct wscons_event events[NWSEVENTS];