X-Git-Url: https://eleni.mutantstargoat.com/git/?p=winnie;a=blobdiff_plain;f=src%2Fsdl%2Fmouse.cc;h=546f3bfafdb0fc211013784349fb4f0c145448a5;hp=55317079fead0e7ee27de42354c5c6cfe8d7d1fb;hb=e4076629a736e957739c31cd20bbbbb70327023b;hpb=6dc42c0e7292d6d94de640ddd7de3ee5c808e9c2

diff --git a/src/sdl/mouse.cc b/src/sdl/mouse.cc
index 5531707..546f3bf 100644
--- a/src/sdl/mouse.cc
+++ b/src/sdl/mouse.cc
@@ -2,21 +2,31 @@
 #include <SDL/SDL.h>
 
 #include "mouse.h"
+#include "shalloc.h"
 #include "window.h"
 #include "wm.h"
 
 extern SDL_Event sdl_event;
 
-static int pointer_x, pointer_y;
-static int bnstate;
+struct Mouse {
+	int pointer_x;
+	int pointer_y;
+	int bnstate;
+};
+
+static Mouse *mouse;
 
 bool init_mouse()
 {
+	if(!(mouse = (Mouse*)sh_malloc(sizeof *mouse))) {
+		return false;
+	}
 	return true;
 }
 
 void destroy_mouse()
 {
+	sh_free(mouse);
 }
 
 void set_mouse_bounds(const Rect &rect)
@@ -34,22 +44,24 @@ void process_mouse_event()
 	MouseMotionFuncType motion_callback = 0;
 	MouseButtonFuncType button_callback = 0;
 
-	Window *top = wm->get_window_at_pos(pointer_x, pointer_y);
-
-	if(top) {
-		wm->set_focused_window(top);
-	}
-	else {
-		wm->set_focused_window(0);
+	Window *win;
+	if(!(win = wm->get_grab_window())) {
+		win = wm->get_window_at_pos(mouse->pointer_x, mouse->pointer_y);
+		if(win) {
+			wm->set_focused_window(win);
+		}
+		else {
+			wm->set_focused_window(0);
+		}
 	}
 
 	switch(sdl_event.type) {
 	case SDL_MOUSEMOTION:
-		pointer_x = sdl_event.motion.x;
-		pointer_y = sdl_event.motion.y;
-		if(top && (motion_callback = top->get_mouse_motion_callback())) {
-			Rect rect = top->get_absolute_rect();
-			motion_callback(top, pointer_x - rect.x, pointer_y - rect.y);
+		mouse->pointer_x = sdl_event.motion.x;
+		mouse->pointer_y = sdl_event.motion.y;
+		if(win && (motion_callback = win->get_mouse_motion_callback())) {
+			Rect rect = win->get_absolute_rect();
+			motion_callback(win, mouse->pointer_x - rect.x, mouse->pointer_y - rect.y);
 		}
 		break;
 
@@ -57,26 +69,27 @@ void process_mouse_event()
 	case SDL_MOUSEBUTTONDOWN:
 		bn = sdl_event.button.button - SDL_BUTTON_LEFT;
 		if(sdl_event.button.state == SDL_PRESSED) {
-			bnstate |= 1 << bn;
+			mouse->bnstate |= 1 << bn;
 		}
 		else {
-			bnstate &= ~(1 << bn);
+			mouse->bnstate &= ~(1 << bn);
 		}
-		if(top && (button_callback = top->get_mouse_button_callback())) {
-			button_callback(top, bn, sdl_event.button.state);
+		if(win && (button_callback = win->get_mouse_button_callback())) {
+			Rect rect = win->get_absolute_rect();
+			button_callback(win, bn, sdl_event.button.state, mouse->pointer_x - rect.x, mouse->pointer_y - rect.y);
 		}
 	}
 }
 
 void get_pointer_pos(int *x, int *y)
 {
-	*x = pointer_x;
-	*y = pointer_y;
+	*x = mouse->pointer_x;
+	*y = mouse->pointer_y;
 }
 
 int get_button_state()
 {
-	return bnstate;
+	return mouse->bnstate;
 }
 
 int get_button(int bn)
@@ -84,6 +97,6 @@ int get_button(int bn)
 	if(bn < 0 || bn >= 3) {
 		return 0;
 	}
-	return (bnstate & (1 << bn)) != 0;
+	return (mouse->bnstate & (1 << bn)) != 0;
 }
 #endif // WINNIE_SDL