From: Dana Jansens Date: Thu, 26 Dec 2002 19:55:55 +0000 (+0000) Subject: some focus improvements.. X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=e9ec2ce0ebccf3b139ebf4fccf093e8ee0366c76;p=chaz%2Fopenbox some focus improvements.. --- diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc index c80f3857..d28a7426 100644 --- a/otk/eventdispatcher.cc +++ b/otk/eventdispatcher.cc @@ -13,8 +13,13 @@ namespace otk { OtkEventDispatcher::OtkEventDispatcher() : _fallback(0), _master(0), _focus(None) { + _focus_e.xfocus.display = OBDisplay::display; _focus_e.xfocus.mode = NotifyNormal; _focus_e.xfocus.detail = NotifyNonlinear; + + _crossing_e.xcrossing.display = OBDisplay::display; + _crossing_e.xcrossing.mode = NotifyNormal; + _crossing_e.xcrossing.detail = NotifyNonlinear; } OtkEventDispatcher::~OtkEventDispatcher() @@ -40,8 +45,9 @@ void OtkEventDispatcher::dispatchEvents(void) { OtkEventMap::iterator it; XEvent e; - Window focus = _focus; - Window unfocus = None; + Window focus = None, unfocus = None; + Window enter = None, leave = None; + Window enter_root = None, leave_root = None; while (XPending(OBDisplay::display)) { XNextEvent(OBDisplay::display, &e); @@ -77,38 +83,75 @@ void OtkEventDispatcher::dispatchEvents(void) } else if (e.type == FocusIn) { // any other types are not ones we're interested in if (e.xfocus.detail == NotifyNonlinear) { - if (e.xfocus.window != focus) { - if (focus) - unfocus = focus; - focus = e.xfocus.window; - printf("FocusIn focus=%lx unfocus=%lx\n", focus, unfocus); - } + focus = e.xfocus.window; + unfocus = None; + printf("FocusIn focus=%lx unfocus=%lx\n", focus, unfocus); } } else if (e.type == FocusOut) { // any other types are not ones we're interested in if (e.xfocus.detail == NotifyNonlinear) { - if (e.xfocus.window == focus) { - unfocus = focus; - focus = None; - printf("FocusIn focus=%lx unfocus=%lx\n", focus, unfocus); - } + unfocus = e.xfocus.window; + focus = None; + printf("FocusOut focus=%lx unfocus=%lx\n", focus, unfocus); + } +/* // madly compress all crossing events + } else if (e.type == EnterNotify) { + // any other types are not ones we're interested in + if (e.xcrossing.mode == NotifyNormal) { + // any other types are not ones we're interested in + enter = e.xcrossing.window; + enter_root = e.xcrossing.root; + printf("Enter enter=%lx leave=%lx\n", enter, leave); } + } else if (e.type == LeaveNotify) { + // any other types are not ones we're interested in + if (e.xcrossing.mode == NotifyNormal) { + leave = e.xcrossing.window; + leave_root = e.xcrossing.root; + printf("Leave enter=%lx leave=%lx\n", enter, leave); + }*/ } else { // normal events dispatch(e); } } - if (focus != _focus) { + if (unfocus != None) { + // the last focus event was an FocusOut, so where the hell is the focus at? + printf("UNFOCUSING: %lx\n", unfocus); + _focus_e.xfocus.type = FocusOut; + _focus_e.xfocus.window = unfocus; + dispatch(_focus_e); + + _focus = None; + } else if (focus != None) { + // the last focus event was a FocusIn, so unfocus what used to be focus and + // focus this new target + if (_focus != None) { + printf("UNFOCUSING: %lx\n", _focus); + _focus_e.xfocus.type = FocusOut; + _focus_e.xfocus.window = _focus; + dispatch(_focus_e); + } + printf("FOCUSING: %lx\n", focus); _focus_e.xfocus.type = FocusIn; _focus_e.xfocus.window = focus; dispatch(_focus_e); + _focus = focus; } - if (unfocus != None) { - _focus_e.xfocus.type = FocusOut; - _focus_e.xfocus.window = unfocus; - dispatch(_focus_e); + + if (leave != None) { + _crossing_e.xcrossing.type = LeaveNotify; + _crossing_e.xcrossing.window = leave; + _crossing_e.xcrossing.root = leave_root; + dispatch(_crossing_e); + } + if (enter != None) { + _crossing_e.xcrossing.type = EnterNotify; + _crossing_e.xcrossing.window = enter; + _crossing_e.xcrossing.root = enter_root; + dispatch(_crossing_e); } } diff --git a/otk/eventdispatcher.hh b/otk/eventdispatcher.hh index f0e23c8f..a55b5b82 100644 --- a/otk/eventdispatcher.hh +++ b/otk/eventdispatcher.hh @@ -38,6 +38,7 @@ private: OtkEventHandler *_master; Window _focus; XEvent _focus_e; + XEvent _crossing_e; //! The time at which the last XEvent with a time was received Time _lasttime; // XXX: store this! also provide an accessor! diff --git a/scripts/clicks.py b/scripts/clicks.py index 217fa289..8a59df70 100644 --- a/scripts/clicks.py +++ b/scripts/clicks.py @@ -51,7 +51,7 @@ def def_doubleclick_client(action, win, type, modifiers, button, time): print "OBClient_toggleshade(client)" -preregister(Action_ButtonPress, def_press_model) +#preregister(Action_ButtonPress, def_press_model) register(Action_Click, def_click_client) register(Action_Click, def_click_root) register(Action_DoubleClick, def_doubleclick_client) diff --git a/src/client.cc b/src/client.cc index 74783eed..df9ad8a6 100644 --- a/src/client.cc +++ b/src/client.cc @@ -895,9 +895,6 @@ void OBClient::unfocusHandler(const XFocusChangeEvent &) { frame->unfocus(); _focused = false; - - if (Openbox::instance->focusedClient() == this) - Openbox::instance->setFocusedClient(0); }