nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rework focus event handling. does it basically like ob2 did now. and it seems to work too :>

Browse source
This commit is contained in:
Dana Jansens 2003-01-08 07:41:17 +00:00
parent 3b4d453f90
commit bd748f7402
3 changed files with 111 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

162
otk/eventdispatcher.cc
View file

@ -11,7 +11,7 @@
namespace otk { namespace otk {
OtkEventDispatcher::OtkEventDispatcher() OtkEventDispatcher::OtkEventDispatcher()
: _fallback(0), _master(0) : _fallback(0), _master(0), _focus(None)
{ {
} }
@ -45,67 +45,119 @@ void OtkEventDispatcher::dispatchEvents(void)
printf("Event %d window %lx\n", e.type, e.xany.window); printf("Event %d window %lx\n", e.type, e.xany.window);
#endif #endif
Window win; if (e.type == FocusIn || e.type == FocusOut) {
// focus events are a beast all their own.. yuk, hate, etc.
dispatchFocus(e);
} else {
Window win;
// pick a window // pick a window
switch (e.type) { switch (e.type) {
case UnmapNotify: case UnmapNotify:
win = e.xunmap.window; win = e.xunmap.window;
break; break;
case DestroyNotify: case DestroyNotify:
win = e.xdestroywindow.window; win = e.xdestroywindow.window;
break; break;
case ConfigureRequest: case ConfigureRequest:
win = e.xconfigurerequest.window; win = e.xconfigurerequest.window;
break; break;
default: default:
win = e.xany.window; win = e.xany.window;
} }
// grab the lasttime and hack up the modifiers // grab the lasttime and hack up the modifiers
switch (e.type) { switch (e.type) {
case ButtonPress: case ButtonPress:
case ButtonRelease: case ButtonRelease:
_lasttime = e.xbutton.time; _lasttime = e.xbutton.time;
e.xbutton.state &= ~(LockMask | OBDisplay::numLockMask() | e.xbutton.state &= ~(LockMask | OBDisplay::numLockMask() |
OBDisplay::scrollLockMask()); OBDisplay::scrollLockMask());
break; break;
case KeyPress: case KeyPress:
e.xkey.state &= ~(LockMask | OBDisplay::numLockMask() | e.xkey.state &= ~(LockMask | OBDisplay::numLockMask() |
OBDisplay::scrollLockMask()); OBDisplay::scrollLockMask());
break; break;
case MotionNotify: case MotionNotify:
_lasttime = e.xmotion.time; _lasttime = e.xmotion.time;
e.xmotion.state &= ~(LockMask | OBDisplay::numLockMask() | e.xmotion.state &= ~(LockMask | OBDisplay::numLockMask() |
OBDisplay::scrollLockMask()); OBDisplay::scrollLockMask());
break; break;
case PropertyNotify: case PropertyNotify:
_lasttime = e.xproperty.time; _lasttime = e.xproperty.time;
break; break;
case EnterNotify: case EnterNotify:
case LeaveNotify: case LeaveNotify:
_lasttime = e.xcrossing.time; _lasttime = e.xcrossing.time;
break; break;
}
dispatch(win, e);
} }
}
}
if (e.type == FocusIn || e.type == FocusOut) void OtkEventDispatcher::dispatchFocus(const XEvent &e)
// any other types are not ones we're interested in {
if (e.xfocus.detail != NotifyNonlinear) Window newfocus = None;
continue;
// any other types are not ones we're interested in
if (e.xfocus.detail != NotifyNonlinear)
return;
if (e.type == FocusIn) {
printf("---\n");
printf("Got FocusIn!\n");
printf("Using FocusIn\n");
newfocus = e.xfocus.window;
if (e.type == FocusOut) { if (newfocus != _focus) {
XEvent fi; // send a FocusIn to whatever was just focused
// send a FocusIn first if one exists dispatch(newfocus, e);
while (XCheckTypedEvent(OBDisplay::display, FocusIn, &fi)) { printf("Sent FocusIn 0x%lx\n", newfocus);
// any other types are not ones we're interested in
if (fi.xfocus.detail == NotifyNonlinear) { // send a FocusOut to whatever used to be focused
dispatch(fi.xfocus.window, fi); if (_focus) {
break; XEvent ev;
} ev.xfocus = e.xfocus;
ev.xfocus.window = _focus;
ev.type = FocusOut;
dispatch(_focus, ev);
printf("Sent FocusOut 0x%lx\n", _focus);
}
// store the new focused window
_focus = newfocus;
}
} else if (e.type == FocusOut) {
bool focused = false; // found a new focus target?
printf("---\n");
printf("Got FocusOut!\n");
// FocusOut events just make us look for FocusIn events. They are ignored
// otherwise.
XEvent fi;
while (XCheckTypedEvent(OBDisplay::display, FocusIn, &fi)) {
if (e.xfocus.detail == NotifyNonlinear) {
printf("Found FocusIn\n");
dispatchFocus(fi);
focused = true;
break;
} }
} }
if (!focused) {
dispatch(win, e); // send a FocusOut to whatever used to be focused
if (_focus) {
XEvent ev;
ev.xfocus = e.xfocus;
ev.xfocus.window = _focus;
dispatch(_focus, ev);
printf("Sent FocusOut 0x%lx\n", _focus);
}
// store that no window has focus anymore
_focus = None;
}
} }
} }

2
otk/eventdispatcher.hh
View file

@ -38,11 +38,13 @@ private:
OtkEventMap _map; OtkEventMap _map;
OtkEventHandler *_fallback; OtkEventHandler *_fallback;
OtkEventHandler *_master; OtkEventHandler *_master;
Window _focus;
//! The time at which the last XEvent with a time was received //! The time at which the last XEvent with a time was received
Time _lasttime; Time _lasttime;
void dispatch(Window win, const XEvent &e); void dispatch(Window win, const XEvent &e);
void dispatchFocus(const XEvent &e);
}; };
} }

10
src/openbox_wrap.cc
View file

@ -1604,19 +1604,13 @@ static PyObject *_wrap_OBScreen_unmanageWindow(PyObject *self, PyObject *args) {
PyObject *resultobj; PyObject *resultobj;
ob::OBScreen *arg1 = (ob::OBScreen *) 0 ; ob::OBScreen *arg1 = (ob::OBScreen *) 0 ;
ob::OBClient *arg2 = (ob::OBClient *) 0 ; ob::OBClient *arg2 = (ob::OBClient *) 0 ;
bool arg3 = (bool) false ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"OO|O:OBScreen_unmanageWindow",&obj0,&obj1,&obj2)) goto fail; if(!PyArg_ParseTuple(args,(char *)"OO:OBScreen_unmanageWindow",&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__OBScreen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_ob__OBClient,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (obj2) { (arg1)->unmanageWindow(arg2);
arg3 = (bool) PyInt_AsLong(obj2);
if (PyErr_Occurred()) SWIG_fail;
}
(arg1)->unmanageWindow(arg2,arg3);
Py_INCREF(Py_None); resultobj = Py_None; Py_INCREF(Py_None); resultobj = Py_None;
return resultobj; return resultobj;