From abae46cd0e399d6778fc23f8c719547c16bf2535 Mon Sep 17 00:00:00 2001 From: Eleni Maria Stea Date: Mon, 25 Feb 2013 02:01:33 +0200 Subject: [PATCH] fixed mouse events in fb version too -------------- Ths line and the following will be ignored -------------- modified: Makefile src/fbdev/mouse.cc unknown: tags winnie winnie_fix_abs_mouse.patch src/pixmap.d src/wm.cc.rej src/fbdev/event.d src/fbdev/gfx.d src/fbdev/keyboard.d src/fbdev/mouse.d src/sdl/event.d src/sdl/gfx.d src/sdl/keyboard.d src/sdl/mouse.d --- Makefile | 2 +- src/fbdev/mouse.cc | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index a894e52..ad3fd6c 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ dbg = -g opt = -O0 inc = -Isrc -backend = SDL +#backend = SDL ifeq ($(backend), SDL) def = -DWINNIE_SDL diff --git a/src/fbdev/mouse.cc b/src/fbdev/mouse.cc index 62271ab..61c5406 100644 --- a/src/fbdev/mouse.cc +++ b/src/fbdev/mouse.cc @@ -71,12 +71,15 @@ void process_mouse_event() return; } - 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 *top; + if(!(top = wm->get_grab_window())) { + top = wm->get_window_at_pos(pointer_x, pointer_y); + if(top) { + wm->set_focused_window(top); + } + else { + wm->set_focused_window(0); + } } /* - send each pointer move and button press/release to the topmost window -- 1.7.10.4