X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.cpp;h=c7a2657005426ecc0f20eff1de7c9f8cb18a0e86;hb=c72566cd7f8252eb386c753ceeafa8a324d1120b;hp=9fc48e00aac234aecca5f3e6e1ac1e5b0b7c09db;hpb=75a16eae9eb2714f8112d46fa5b8f7908b6d2487;p=libs%2Fgltk.git diff --git a/source/root.cpp b/source/root.cpp index 9fc48e0..c7a2657 100644 --- a/source/root.cpp +++ b/source/root.cpp @@ -79,21 +79,31 @@ void Root::tick() } } -void Root::button_press_event(int x, int y, unsigned btn, unsigned) +void Root::button_press_event(int x, int y, unsigned btn, unsigned mod) { if(visible) { + Widget *old_focus=pointer_focus; + translate_coords(x, y); button_press(x, y, btn); + + if(!pointer_focus && !old_focus) + signal_button_press.emit(x, geom.h-1-y, btn, mod); } } -void Root::button_release_event(int x, int y, unsigned btn, unsigned) +void Root::button_release_event(int x, int y, unsigned btn, unsigned mod) { if(visible) { + Widget *old_focus=pointer_focus; + translate_coords(x, y); button_release(x, y, btn); + + if(!pointer_focus && !old_focus) + signal_button_release.emit(x, geom.h-1-y, btn, mod); } } @@ -116,19 +126,36 @@ void Root::pointer_motion_event(int x, int y) lbl_tooltip->set_visible(false); tooltip_target=0; } + + if(!pointer_focus) + signal_pointer_motion.emit(x, geom.h-1-y); } } void Root::key_press_event(unsigned key, unsigned mod, wchar_t ch) { if(visible) + { + Widget *old_focus=input_focus; + key_press(Input::key_from_sys(key), mod, ch); + + if(!input_focus && !old_focus) + signal_key_press.emit(key, mod, ch); + } } void Root::key_release_event(unsigned key, unsigned mod) { if(visible) + { + Widget *old_focus=input_focus; + key_release(Input::key_from_sys(key), mod); + + if(!input_focus && !old_focus) + signal_key_release.emit(key, mod); + } } void Root::translate_coords(int &x, int &y)