gfxlib2: sf.net # 569: gfxlib2: GetMouse/SetMouse scaling problem in QB modes Screen 2 & 8

- Adjust GETMOUSE and SETMOUSE by scanline size (screen modes 2 and 8)
- internally, gfxlib2 uses single scan lines in memory for modes 2 and 8 and then blits to the device doubling the scan lines
- adjust the GetMouse 'y' return value by dividing by number of scanlines
- adjust the SetMouse 'y' parameter by multiplying by number of scanlines

Author: jayrm

changelog.txt

@@ -128,6 +128,7 @@ Version 1.10.0
 - fbc: #cmdline "-c ..." needs to restart parser since code generation is affected.  The implicit main was being emitted even when '-c' was give in #cmdline and was working differently than when '-c' given on the actual command line. 
 - fbc: extend lifetime of temporary variables in WITH TYPE(...) expressions to the END WITH statement
 - fbc: #cmdline "-r -rr -R -RR -o objfile ..." needs to restart the parser and handle changes in keeping the ASM file.  In the case of '-o objfile' a major restart is needed since some initialization of filenames is done before parsing starts.  By default the temporary ASM file was being kept even if #cmdline options indicate to keep it.
+- sf.net #569: gfxlib2: GetMouse/SetMouse scaling problem in QB modes Screen 2 & 8 - adjust GetMouse/SetMouse by internal scanline_size
 
 
 Version 1.09.0

src/gfxlib2/dos/gfx_dos.c

@@ -354,6 +354,13 @@ static int fb_dos_timer_handler(unsigned irq)
 
 	mouse_x = fb_dos_mouse_x;
 	mouse_y = fb_dos_mouse_y;
+
+	if ( fb_dos.mouse_ok ) {
+		if( __fb_gfx->scanline_size != 1 ) {
+			mouse_y /= __fb_gfx->scanline_size;
+		}
+	}
+
 	if ( fb_dos.mouse_ok && fb_dos.mouse_cursor ) {
 		fb_hSoftCursorPut(mouse_x, mouse_y);
 	}
@@ -367,7 +374,7 @@ static int fb_dos_timer_handler(unsigned irq)
 
 	e.type = 0;
 
-	if ( fb_dos.mouse_ok ) {	
+	if ( fb_dos.mouse_ok ) {
 
 		if ( (fb_dos.mouse_x_old != mouse_x) || (fb_dos.mouse_y_old != mouse_y) ) {
 			e.type = EVENT_MOUSE_MOVE;

src/gfxlib2/gfx_getmouse.c

@@ -11,6 +11,9 @@ int fb_GfxGetMouse(int *x, int *y, int *z, int *buttons, int *clip)
 	if ((__fb_gfx) && (__fb_gfx->driver->get_mouse)) {
 		DRIVER_LOCK();
 		failure = __fb_gfx->driver->get_mouse(x, y, z, buttons, clip);
+		if( y && !failure && (__fb_gfx->scanline_size != 1) ) {
+			*y /= __fb_gfx->scanline_size;
+		}
 		DRIVER_UNLOCK();
 	}
 

src/gfxlib2/gfx_setmouse.c

@@ -12,6 +12,9 @@ int fb_GfxSetMouse(int x, int y, int cursor, int clip)
 	}
 
 	DRIVER_LOCK();
+	if( __fb_gfx->scanline_size != 1 ) {
+		y *= __fb_gfx->scanline_size;
+	}
 	__fb_gfx->driver->set_mouse(x, y, cursor, clip);
 	DRIVER_UNLOCK();
 

src/gfxlib2/js/gfx_events.c

@@ -27,6 +27,10 @@ void fb_js_events_check(void)
                     .dx = event.motion.xrel,
                     .dy = event.motion.yrel,
                 };
+                if( __fb_gfx->scanline_size != 1 ) {
+                    e.y /= __fb_gfx->scanline_size;
+                    e.dy /= __fb_gfx->scanline_size;
+                } 
 
                 fb_hPostEvent(&e);
                 break;

src/gfxlib2/linux/gfx_driver_fbdev.c

@@ -226,6 +226,10 @@ static void *driver_thread(void *arg)
 							mouse_y += e.dy;
 							e.x = mouse_x = MID(0, mouse_x, __fb_gfx->w - 1);
 							e.y = mouse_y = MID(0, mouse_y, __fb_gfx->h - 1);
+							if( __fb_gfx->scanline_size != 1 ) {
+								e.y /= __fb_gfx->scanline_size;
+								e.dy /= __fb_gfx->scanline_size;
+							}
 							if (e.dx || e.dy) {
 								e.type = EVENT_MOUSE_MOVE;
 								fb_hPostEvent(&e);

src/gfxlib2/unix/gfx_x11.c

@@ -181,11 +181,15 @@ static void *window_thread(void *arg)
 					mouse_y_root = event.xmotion.y_root;
 					mouse_x = event.xmotion.x;
 					mouse_y = event.xmotion.y - fb_x11.display_offset;
-                    mouse_on = ((mouse_x >= 0) && (mouse_x < fb_x11.w) && (mouse_y >= 0) && (mouse_y < fb_x11.h));
+					mouse_on = ((mouse_x >= 0) && (mouse_x < fb_x11.w) && (mouse_y >= 0) && (mouse_y < fb_x11.h));
 					if (has_focus) {
 						e.type = EVENT_MOUSE_MOVE;
 						e.x = mouse_x;
 						e.y = mouse_y;
+						if( __fb_gfx->scanline_size != 1 ) {
+							e.y /= __fb_gfx->scanline_size;
+							e.dy /= __fb_gfx->scanline_size;
+						}
 					}
 					break;
 

src/gfxlib2/win32/gfx_win32.c

@@ -231,9 +231,14 @@ LRESULT CALLBACK fb_hWin32WinProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
 				e.dx = mouse_pos.x - last_mouse_pos.x;
 				e.dy = mouse_pos.y - last_mouse_pos.y;
 			}
+			if( __fb_gfx->scanline_size != 1 ) {
+				e.y /= __fb_gfx->scanline_size;
+				e.dy /= __fb_gfx->scanline_size;
+			}
 			last_mouse_pos = mouse_pos;
-			if (((!e.dx) && (!e.dy)) || (!fb_win32.is_active))
+			if (((!e.dx) && (!e.dy)) || (!fb_win32.is_active)) {
 				e.type = 0;
+			}
 			break;
 
 		case WM_MOUSELEAVE: