commit ce23e9b3c8f8ab1c6e2cf6860e9ead3a53805acd
author Ove Kaaven <ovek@arcticnet.no> Tue May 23 21:13:52 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue May 23 21:13:52 2000 +0000
tree d2be5d639a13132ecad61ac447b33e095ca5328d
parent 76ba037559bda5d1f938429b3acffcfa07667db6

Scale mouse coordinates to default width 640.

msdos/int33.c

diff --git a/msdos/int33.c b/msdos/int33.c
index 6c6dbf0..a73fd35 100644
--- a/msdos/int33.c
+++ b/msdos/int33.c
@@ -8,6 +8,7 @@
 #include "winuser.h"
 #include "miscemu.h"
 #include "dosexe.h"
+#include "vga.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(int)
@@ -41,7 +42,10 @@
     CX_reg(context) = sys->x;
     DX_reg(context) = sys->y;
     break;
-  case 0x0C: /* Define interrupt subroutine */
+  case 0x04:
+    FIXME("Position mouse cursor\n");
+    break;
+  case 0x0C:
     TRACE("Define mouse interrupt subroutine\n");
     sys->callmask = CX_reg(context);
     sys->callback = (FARPROC16)PTR_SEG_OFF_TO_SEGPTR(ES_reg(context), DX_reg(context));
@@ -77,10 +81,16 @@
 {
   MOUSESYSTEM *sys = (MOUSESYSTEM *)DOSVM_GetSystemData(0x33);
   WORD mask = 0;
+  unsigned Height, Width, SX=1, SY=1;
 
   if (!sys) return;
-  sys->x = LOWORD(lParam);
-  sys->y = HIWORD(lParam);
+  if (!VGA_GetMode(&Height,&Width,NULL)) {
+    /* may need to do some coordinate scaling */
+    SX = 640/Width;
+    if (!SX) SX=1;
+  }
+  sys->x = LOWORD(lParam) * SX;
+  sys->y = HIWORD(lParam) * SY;
   switch (message) {
   case WM_MOUSEMOVE:
     mask |= 0x01;