After consideration, and some testing, I propose a minimal patch to get
the imps2 wheel operating again.
The essence of this patch is just a bug fix to one line in gpm.c that was
causing some wheel events to be suppressed:
- if (!event->dx && !event->dy && (event->buttons==oldB))
+ /* rodney 13/mar/2008 wheel movement similar to mouse movement
+ * must also be excluded from time (click) processing */
+ if (!event->dx && !event->dy
+ && !event->wdx && !event->wdy
+ && (event->buttons==oldB) )
Full patch is attached. Mainly added some comments here and there.
---------------------------
My next point may be controversial, but I suggest to rename the 5 patches
in patches/todo/imwheel as patches/historical/imwheel
My reasoning is that:
1. the patches are too complicated. For example, who would need emulation
of the wheel on non-wheel mice?
2. the patches overlook the fact that there is already support for 2
wheels in the Gpm_Event, in the fields wdy and wdx. I don't see the need
to add more fields to the Gpm_Event.
3. there is some code about the wheel generating button events: I can't
understand why this was needed. I think the original idea, that the wheel
is a movement event, similar to the x/y movement of the mouse, makes a lot
of sense, and this is enough.
Comments most welcome,
Rodney,
Australia.
diff -aurp gpm-1.20.3pre3-original/src/daemon/gpm.c gpm-1.20.3pre3/src/daemon/gpm.c
--- gpm-1.20.3pre3-original/src/daemon/gpm.c 2008-02-17 01:14:40.000000000 +1100
+++ gpm-1.20.3pre3/src/daemon/gpm.c 2008-03-13 20:38:19.000000000 +1100
@@ -479,7 +479,11 @@ static inline int processMouse(int fd, G
/* up and down, up and down, ... who does a do..while(0) loop ???
and then makes a break into it... argh ! */
- if (!event->dx && !event->dy && (event->buttons==oldB))
+ /* rodney 13/mar/2008 wheel movement similar to mouse movement
+ * must also be excluded from time (click) processing */
+ if (!event->dx && !event->dy
+ && !event->wdx && !event->wdy
+ && (event->buttons==oldB) )
do { /* so to break */
static long awaketime;
/*
diff -aurp gpm-1.20.3pre3-original/src/headers/gpm.h gpm-1.20.3pre3/src/headers/gpm.h
--- gpm-1.20.3pre3-original/src/headers/gpm.h 2008-02-17 01:14:40.000000000 +1100
+++ gpm-1.20.3pre3/src/headers/gpm.h 2008-03-13 21:19:33.000000000 +1100
@@ -72,6 +72,17 @@ extern "C" {
#define GPM_NODE_FIFO _PATH_DEV "gpmdata"
/*....................................... Cfg buttons */
+/* Each button has one bit in the 16 bit buttons field.
+ * Mouse movement and wheel movement are not associated with a button
+ * i.e. buttons=GPM_B_NONE in these cases
+ * (except for ms3 mouse, for reasons unknown?)
+ * The middle button if pressed down (or clicked) is independent of
+ * the wheel "device" which it happens to be associated with
+ * The use of GPM_B_UP/DOWN with ms3 is unclear. Maybe the wheel
+ * could be rolled forward then backward
+ * and this would generate a 'click' event on 'button 5' GPM_B_UP,
+ * but really the expected behaviour of wheel is movement, typically
+ * used for jump scrolling or for jumping between fields on a form. */
#define GPM_B_DOWN 32
#define GPM_B_UP 16
@@ -119,10 +130,17 @@ enum Gpm_Margin {GPM_TOP=1, GPM_BOT=2, G
typedef struct Gpm_Event {
unsigned char buttons, modifiers; /* try to be a multiple of 4 */
unsigned short vc;
- short dx, dy, x, y;
+ short dx, dy, x, y; /* displacement x,y for this event, and absolute x,y */
enum Gpm_Etype type;
+ /* clicks e.g. double click are determined by time-based processing */
int clicks;
enum Gpm_Margin margin;
+ /* wdx/y: displacement of wheels in this event. Absolute values are not
+ * required, because wheel movement is typically used for scrolling
+ * or selecting fields, not for cursor positioning. The application
+ * can determine when the end of file or form is reached, and not
+ * go any further.
+ * A single mouse will use wdy, "vertical scroll" wheel. */
short wdx, wdy;
} Gpm_Event;
diff -aurp gpm-1.20.3pre3-original/src/headers/gpmInt.h gpm-1.20.3pre3/src/headers/gpmInt.h
--- gpm-1.20.3pre3-original/src/headers/gpmInt.h 2008-02-17 01:14:40.000000000 +1100
+++ gpm-1.20.3pre3/src/headers/gpmInt.h 2008-03-13 21:20:50.000000000 +1100
@@ -124,7 +124,9 @@ typedef struct Gpm_Type {
char *name;
char *desc; /* a descriptive line */
char *synonyms; /* extra names (the XFree name etc) as a list */
+ /* mouse specific event handler: */
int (*fun)(Gpm_Event *state, unsigned char *data);
+ /* mouse specific initialisation function: */
struct Gpm_Type *(*init)(int fd, unsigned short flags,
struct Gpm_Type *type, int argc, char **argv);
unsigned short flags;
@@ -134,6 +136,8 @@ typedef struct Gpm_Type {
int getextra; /* does it get an extra byte? (only mouseman) */
int absolute; /* flag indicating absolute pointing device */
+ /* function to do the reverse of (*fun): puts the bytes back into the
+ * fd to forward the original message bytes */
int (*repeat_fun)(Gpm_Event *state, int fd); /* repeat this event into fd */
/* itz Mon Jan 11 23:27:54 PST 1999 */
} Gpm_Type;
diff -aurp gpm-1.20.3pre3-original/src/mice.c gpm-1.20.3pre3/src/mice.c
--- gpm-1.20.3pre3-original/src/mice.c 2008-02-17 01:14:40.000000000 +1100
+++ gpm-1.20.3pre3/src/mice.c 2008-03-13 21:14:26.000000000 +1100
@@ -552,12 +552,12 @@ static int R_imps2(Gpm_Event *state, int
(dy > 0 ? 0x20 : 0);
buffer[1] = dx & 0xFF;
buffer[2] = (-dy) & 0xFF;
- buffer[3] =
- (state->buttons & GPM_B_UP ? -1 : 0) +
- (state->buttons & GPM_B_DOWN ? 1 : 0);
+ if (state->wdy > 0) buffer[3] = 0x0f;
+ if (state->wdy < 0) buffer[3] = 0x01;
+ if (state->wdx > 0) buffer[3] = 0x0e;
+ if (state->wdx < 0) buffer[3] = 0x02;
return write(fd,buffer,4);
-
}
static int M_logimsc(Gpm_Event *state, unsigned char *data) /* same as msc */
@@ -650,21 +650,27 @@ static int M_imps2(Gpm_Event *state, un
state->dx = (data[0] & 0x10) ? data[1] - 256 : data[1];
state->dy = (data[0] & 0x20) ? -(data[2] - 256) : -data[2];
- /* The wheels.. */
- switch (data[3] & 0x0f) {
- case 0x0e: state->wdx = +1; break;
- case 0x02: state->wdx = -1; break;
- case 0x0f: state->wdy = +1; break;
- case 0x01: state->wdy = -1; break;
+ /* The wheels..*/
+ unsigned char wheel = data[3] & 0x0f;
+ if (wheel > 0) {
+ // use the event type GPM_MOVE rather than GPM_DOWN for wheel movement
+ // to avoid single/double/triple click processing:
+ // state->type = GPM_MOVE;
+ switch (data[3] & 0x0f) {
+ /* rodney 13/mar/2008
+ * The use of GPM_B_UP / GPM_B_DOWN is very unclear;
+ * only mouse type ms3 uses these
+ * For this mouse, we only support the relative movement
+ * i.e. no button is set (same as mouse movement), wdy changes +/-
+ * according to wheel movement (+ for rolling away from user)
+ * wdx (horizontal scroll) is for a second wheel. They do exist! */
+ case 0x0f: state->wdy = +1; break;
+ case 0x01: state->wdy = -1; break;
+ case 0x0e: state->wdx = +1; break;
+ case 0x02: state->wdx = -1; break;
+ }
}
- /* old code:
- - did it signed:
- state->buttons |= (data[3]<0) * GPM_B_UP + (data[3]>0) * GPM_B_DOWN;
- - and unsigned:
- state->buttons |= (data[3]>127) * GPM_B_UP + (data[3]<127) * GPM_B_DOWN;
- */
-
return 0;
}_______________________________________________
gpm mailing list
gpm@xxxxxxxxxxxxxx
http://lists.linux.it/listinfo/gpm