834bcc25da
patch.linux-mouse can be applied to current CVS
patch.linux-mouse-for-1.1.2 is what Robb sent originally, which can
be applied to version 1.1.2 (bugfix3)
197 lines
6.5 KiB
Plaintext
197 lines
6.5 KiB
Plaintext
Index: gui/x.cc
|
|
===================================================================
|
|
RCS file: /cvsroot/bochs/bochs/gui/x.cc,v
|
|
retrieving revision 1.9
|
|
diff -u -r1.9 x.cc
|
|
--- gui/x.cc 2001/05/30 18:56:01 1.9
|
|
+++ gui/x.cc 2001/06/01 18:51:21
|
|
@@ -60,7 +60,7 @@
|
|
static unsigned imDepth, imWide, imBPP;
|
|
|
|
// current cursor coordinates
|
|
-static int prev_x=-1, prev_y=-1;
|
|
+static int emulation_x=-1, emulation_y=-1;
|
|
static int current_x=-1, current_y=-1;
|
|
static unsigned mouse_button_state = 0;
|
|
|
|
@@ -589,8 +589,6 @@
|
|
send_keyboard_mouse_status();
|
|
mouse_update = 0;
|
|
}
|
|
- prev_x = current_x = -1;
|
|
- prev_y = current_y = -1;
|
|
headerbar_click(button_event->x, button_event->y);
|
|
break;
|
|
}
|
|
@@ -611,16 +609,16 @@
|
|
// (mch) Hack for easier mouse handling (toggle mouse enable)
|
|
mouse_handler();
|
|
if (bx_options.mouse_enabled) {
|
|
- BX_INFO(("[x] Mouse on"));
|
|
- mouse_enable_x = current_x;
|
|
- mouse_enable_y = current_y;
|
|
+ BX_INFO(("[x] Mouse enabled"));
|
|
+// mouse_enable_x = current_x;
|
|
+// mouse_enable_y = current_y;
|
|
disable_cursor();
|
|
// Move the cursor to a 'safe' place
|
|
- warp_cursor(warp_home_x-current_x, warp_home_y-current_y);
|
|
+// warp_cursor(warp_home_x-current_x, warp_home_y-current_y);
|
|
} else {
|
|
BX_INFO(("[x] Mouse off"));
|
|
enable_cursor();
|
|
- warp_cursor(mouse_enable_x-current_x, mouse_enable_y-current_y);
|
|
+// warp_cursor(mouse_enable_x-current_x, mouse_enable_y-current_y);
|
|
}
|
|
|
|
//mouse_button_state |= ;
|
|
@@ -646,8 +644,6 @@
|
|
send_keyboard_mouse_status();
|
|
mouse_update = 0;
|
|
}
|
|
- prev_x = current_x = -1;
|
|
- prev_y = current_y = -1;
|
|
// ignore, in headerbar area
|
|
break;
|
|
}
|
|
@@ -691,23 +687,47 @@
|
|
|
|
case MotionNotify:
|
|
pointer_event = (XPointerMovedEvent *) &report;
|
|
- current_x = pointer_event->x;
|
|
- current_y = pointer_event->y;
|
|
- mouse_update = 1;
|
|
+ if (pointer_event->y >= BX_HEADER_BAR_Y) {
|
|
+ current_x = pointer_event->x;
|
|
+ current_y = pointer_event->y;
|
|
+ mouse_update = 1;
|
|
//BX_INFO(("xxx: motionNotify x,y=(%d,%d)", current_x, current_y));
|
|
+ }
|
|
break;
|
|
|
|
case EnterNotify:
|
|
enter_event = (XEnterWindowEvent *) &report;
|
|
- prev_x = current_x = enter_event->x;
|
|
- prev_y = current_y = enter_event->y;
|
|
+ current_x = enter_event->x;
|
|
+ current_y = enter_event->y - BX_HEADER_BAR_Y;
|
|
+/*
|
|
+ Hardware-level BIOS interface only provides mouse movements as deltas
|
|
+ - never absolute positions. This causes a problem when the mouse pointer
|
|
+ leaves the screen (in an emulated environment), then re-enters the screen.
|
|
+ Code in "send_keyboard_mouse_status(void)" below attempts to address
|
|
+ this by calculating the delta of the exit point and the entry point, and
|
|
+ feeding the appropriate delta move via the BIOS interface, which would
|
|
+ work, except:
|
|
+
|
|
+ - There is still no way to synchronize the _absolute_ pointer locations
|
|
+ in emulated and host environment; and
|
|
+ - modern mouse drivers have "balistic" movements, so any "large, rapid"
|
|
+ delta is magnified, perpetuating any skew between the host and emulation
|
|
+ pointers.
|
|
+
|
|
+ What we really need is a function like:
|
|
+ bx_devices.keyboard->mouse_moveto(current_x,current_y);
|
|
+ , which could resolve to the equivalent of (DOS) INT 33, function 4, which
|
|
+ sets an absolute pointer position. Unfortunately, this would be OS
|
|
+ dependant.
|
|
+*/
|
|
+
|
|
//BX_INFO(("xxx: enterNotify x,y=(%d,%d)", current_x, current_y));
|
|
break;
|
|
|
|
case LeaveNotify:
|
|
leave_event = (XLeaveWindowEvent *) &report;
|
|
- prev_x = current_x = -1;
|
|
- prev_y = current_y = -1;
|
|
+ current_x = leave_event->x;
|
|
+ current_y = leave_event->y - BX_HEADER_BAR_Y;
|
|
//BX_INFO(("xxx: LeaveNotify x,y set to -1"));
|
|
break;
|
|
|
|
@@ -729,7 +749,7 @@
|
|
} /* end while */
|
|
|
|
if (mouse_update) {
|
|
- BX_DEBUG(("XXX: bottom, send status"));
|
|
+ // BX_DEBUG(("xxx: bottom, send status"));
|
|
send_keyboard_mouse_status();
|
|
}
|
|
}
|
|
@@ -738,38 +758,45 @@
|
|
void
|
|
send_keyboard_mouse_status(void)
|
|
{
|
|
- BX_DEBUG(("XXX: prev=(%d,%d) curr=(%d,%d)",
|
|
- prev_x, prev_y, current_x, current_y));
|
|
-
|
|
- if ( (prev_x!=-1) && (current_x!=-1) && (prev_y!=-1) && (current_y!=-1)) {
|
|
- int dx, dy;
|
|
-
|
|
- // (mch) consider warping here
|
|
- dx = current_x - prev_x - warp_dx;
|
|
- dy = -(current_y - prev_y - warp_dy);
|
|
- warp_cursor(warp_home_x-current_x, warp_home_y-current_y);
|
|
-
|
|
-//BX_INFO(("xxx: MOUSE_MOTION: dx=%d, dy=%d", (int) dx, (int) dy));
|
|
- bx_devices.keyboard->mouse_motion( dx, dy, mouse_button_state);
|
|
- //if (warped) {
|
|
- // prev_x = current_x = -1;
|
|
- // prev_y = current_y = -1;
|
|
- // }
|
|
- //else {
|
|
- prev_x = current_x;
|
|
- prev_y = current_y;
|
|
- // }
|
|
+//BX_DEBUG(("xxx: prev=(%d,%d) curr=(%d,%d)",
|
|
+// emulation_x, emulation_y, current_x, current_y));
|
|
+ int dx, dy;
|
|
+
|
|
+ do {
|
|
+ // Continue to calculate deltas until the emulation pointer coincides
|
|
+ // with the XWindows pointer...
|
|
+ dx = (current_x - emulation_x);
|
|
+ dy = -(current_y - emulation_y);
|
|
+
|
|
+ // limit individual delta increments - up to max supported (255).
|
|
+ // Increasing these values will provide more rapid tracking,
|
|
+ // but if the value is too large, the OS-specific mouse driver
|
|
+ // may switch to "balistic" mode, in which a large delta causes
|
|
+ // a larger-than-normal motion of the pointer. This will cause a
|
|
+ // offset between the emulation pointer location and the host pointer
|
|
+ // location.
|
|
+
|
|
+#define LIMIT_DX 30 // Must be less than 255
|
|
+#define LIMIT_DY 30 // Must be less than 255
|
|
+
|
|
+ if (dx > LIMIT_DX) {
|
|
+ dx = LIMIT_DX;
|
|
+ } else if (dx < -LIMIT_DX) {
|
|
+ dx = -LIMIT_DX;
|
|
}
|
|
- else {
|
|
- if ( (current_x!=-1) && (current_y!=-1)) {
|
|
- prev_x = current_x;
|
|
- prev_y = current_y;
|
|
- }
|
|
- else {
|
|
- prev_x = current_x = -1;
|
|
- prev_y = current_y = -1;
|
|
- }
|
|
+ if (dy > LIMIT_DY) {
|
|
+ dy = LIMIT_DY;
|
|
+ } else if (dy < -LIMIT_DY) {
|
|
+ dy = -LIMIT_DY;
|
|
}
|
|
+
|
|
+BX_INFO(("xxx: MOUSE_MOTION: emx=%d, cux=%d, dx=%d", emulation_x, current_x, (int) dx));
|
|
+BX_INFO(("xxx: MOUSE_MOTION: emy=%d, cuy=%d, dy=%d", emulation_y, current_y, (int) dy));
|
|
+ // Do at least one mouse_motion call, to handle button_state updates
|
|
+ bx_devices.keyboard->mouse_motion( dx, dy, mouse_button_state);
|
|
+ emulation_x += dx;
|
|
+ emulation_y -= dy;
|
|
+ } while ( (emulation_x != current_x) || (emulation_y != current_y) );
|
|
}
|
|
|
|
void
|