X-Git-Url: http://git.mutantstargoat.com?p=winnie;a=blobdiff_plain;f=src%2Fsdl%2Fmouse.cc;h=c5663f6d1bdaae987d343bc69ab869cf5f330617;hp=51cceb37a1966392c5f42b4d0ba07e1d0829825b;hb=d02747c88b1df856c5531cdc4b7af5b3ac8a0dc3;hpb=65eda3d5a8e4ad8d28bda12cace044628c1a69be diff --git a/src/sdl/mouse.cc b/src/sdl/mouse.cc index 51cceb3..c5663f6 100644 --- a/src/sdl/mouse.cc +++ b/src/sdl/mouse.cc @@ -34,11 +34,11 @@ void process_mouse_event() MouseMotionFuncType motion_callback = 0; MouseButtonFuncType button_callback = 0; - Window *top; - if(!(top = wm->get_grab_window())) { - top = wm->get_window_at_pos(pointer_x, pointer_y); - if(top) { - wm->set_focused_window(top); + Window *win; + if(!(win = wm->get_grab_window())) { + win = wm->get_window_at_pos(pointer_x, pointer_y); + if(win) { + wm->set_focused_window(win); } else { wm->set_focused_window(0); @@ -49,9 +49,9 @@ void process_mouse_event() 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); + if(win && (motion_callback = win->get_mouse_motion_callback())) { + Rect rect = win->get_absolute_rect(); + motion_callback(win, pointer_x - rect.x, pointer_y - rect.y); } break; @@ -64,9 +64,9 @@ void process_mouse_event() else { bnstate &= ~(1 << bn); } - if(top && (button_callback = top->get_mouse_button_callback())) { - Rect rect = top->get_absolute_rect(); - button_callback(top, bn, sdl_event.button.state, pointer_x - rect.x, pointer_y - rect.y); + if(win && (button_callback = win->get_mouse_button_callback())) { + Rect rect = win->get_absolute_rect(); + button_callback(win, bn, sdl_event.button.state, pointer_x - rect.x, pointer_y - rect.y); } } }