void OtkEventDispatcher::dispatchEvents(void)
{
- OtkEventMap::iterator it;
XEvent e;
Window focus = None, unfocus = None;
Window enter = None, leave = None;
while (XPending(OBDisplay::display)) {
XNextEvent(OBDisplay::display, &e);
-#if 0
+#if 0//defined(DEBUG)
printf("Event %d window %lx\n", e.type, e.xany.window);
#endif
+ Window win;
+
+ // pick a window
+ switch (e.type) {
+ case UnmapNotify:
+ win = e.xunmap.window;
+ break;
+ case DestroyNotify:
+ win = e.xdestroywindow.window;
+ break;
+ case ConfigureRequest:
+ win = e.xconfigurerequest.window;
+ break;
+ default:
+ win = e.xany.window;
+ }
+
// grab the lasttime and hack up the modifiers
switch (e.type) {
case ButtonPress:
OBDisplay::scrollLockMask());
break;
case PropertyNotify:
- _lasttime = e.xproperty.time; break;
+ _lasttime = e.xproperty.time;
+ break;
case EnterNotify:
case LeaveNotify:
- _lasttime = e.xcrossing.time; break;
+ _lasttime = e.xcrossing.time;
+ break;
}
- // these ConfigureRequests require some special attention
- if (e.type == ConfigureRequest) {
- // find the actual window! e.xany.window is the parent window
- it = _map.find(e.xconfigurerequest.window);
-
- if (_master)
- _master->handle(e);
-
- if (it != _map.end())
- it->second->handle(e);
- else {
- // unhandled configure requests must be used to configure the window
- // directly
- XWindowChanges xwc;
-
- xwc.x = e.xconfigurerequest.x;
- xwc.y = e.xconfigurerequest.y;
- xwc.width = e.xconfigurerequest.width;
- xwc.height = e.xconfigurerequest.height;
- xwc.border_width = e.xconfigurerequest.border_width;
- xwc.sibling = e.xconfigurerequest.above;
- xwc.stack_mode = e.xconfigurerequest.detail;
-
- XConfigureWindow(otk::OBDisplay::display, e.xconfigurerequest.window,
- e.xconfigurerequest.value_mask, &xwc);
- }
// madly compress all focus events
- } else if (e.type == FocusIn) {
+ if (e.type == FocusIn) {
// any other types are not ones we're interested in
if (e.xfocus.detail == NotifyNonlinear) {
focus = e.xfocus.window;
}
} else {
// normal events
- dispatch(e);
+ dispatch(win, e);
}
}
//printf("UNFOCUSING: %lx\n", unfocus);
_focus_e.xfocus.type = FocusOut;
_focus_e.xfocus.window = unfocus;
- dispatch(_focus_e);
+ dispatch(_focus_e.xfocus.window, _focus_e);
_focus = None;
} else if (focus != None && focus != _focus) {
//printf("FOCUSING: %lx\n", focus);
_focus_e.xfocus.type = FocusIn;
_focus_e.xfocus.window = focus;
- dispatch(_focus_e);
+ dispatch(_focus_e.xfocus.window, _focus_e);
if (_focus != None) {
//printf("UNFOCUSING: %lx\n", _focus);
_focus_e.xfocus.type = FocusOut;
_focus_e.xfocus.window = _focus;
- dispatch(_focus_e);
+ dispatch(_focus_e.xfocus.window, _focus_e);
}
_focus = focus;
_crossing_e.xcrossing.type = LeaveNotify;
_crossing_e.xcrossing.window = leave;
_crossing_e.xcrossing.root = leave_root;
- dispatch(_crossing_e);
+ dispatch(_crossing_e.xcrossing.window, _crossing_e);
}
if (enter != None) {
_crossing_e.xcrossing.type = EnterNotify;
_crossing_e.xcrossing.window = enter;
_crossing_e.xcrossing.root = enter_root;
- dispatch(_crossing_e);
+ dispatch(_crossing_e.xcrossing.window, _crossing_e);
}
}
-void OtkEventDispatcher::dispatch(const XEvent &e) {
- OtkEventHandler *handler;
+void OtkEventDispatcher::dispatch(Window win, const XEvent &e) {
+ OtkEventHandler *handler = 0;
OtkEventMap::iterator it;
if (_master)
_master->handle(e);
- it = _map.find(e.xany.window);
+ it = _map.find(win);
if (it != _map.end())
handler = it->second;
- else
+ // these ConfigureRequests require some special attention
+ else if (e.type == ConfigureRequest) {
+ // unhandled configure requests must be used to configure the window
+ // directly
+ XWindowChanges xwc;
+
+ xwc.x = e.xconfigurerequest.x;
+ xwc.y = e.xconfigurerequest.y;
+ xwc.width = e.xconfigurerequest.width;
+ xwc.height = e.xconfigurerequest.height;
+ xwc.border_width = e.xconfigurerequest.border_width;
+ xwc.sibling = e.xconfigurerequest.above;
+ xwc.stack_mode = e.xconfigurerequest.detail;
+
+ XConfigureWindow(otk::OBDisplay::display, e.xconfigurerequest.window,
+ e.xconfigurerequest.value_mask, &xwc);
+ } else
handler = _fallback;
if (handler)
OBFrame::~OBFrame()
{
- releaseClient(false);
+ releaseClient();
}
void OBFrame::grabClient()
{
-
// reparent the client to the frame
XReparentWindow(otk::OBDisplay::display, _client->window(),
_plate.window(), 0, 0);
- _client->ignore_unmaps++;
+ // this generates 2 unmap's that we catch, one to the window and one to root,
+ // but both have .window set to this window, so both need to be ignored
+ _client->ignore_unmaps+=2;
// select the event mask on the client's parent (to receive config req's)
XSelectInput(otk::OBDisplay::display, _plate.window(),
}
-void OBFrame::releaseClient(bool remap)
+void OBFrame::releaseClient()
{
// check if the app has already reparented its window to the root window
XEvent ev;
if (XCheckTypedWindowEvent(otk::OBDisplay::display, _client->window(),
ReparentNotify, &ev)) {
- remap = true; // XXX: why do we remap the window if they already
- // reparented to root?
+ // XXX: ob2/bb didn't do this.. look up this process in other wm's!
+ XPutBackEvent(otk::OBDisplay::display, &ev);
} else {
// according to the ICCCM - if the client doesn't reparent to
// root, then we have to do it for them
_client->area().x(), _client->area().y());
}
- // if we want to remap the window, do so now
- if (remap)
- XMapWindow(otk::OBDisplay::display, _client->window());
+ // do an extra map here .. ? XXX
+ XMapWindow(otk::OBDisplay::display, _client->window());
}
XWMHints *wmhint;
XSetWindowAttributes attrib_set;
+ otk::OBDisplay::grab();
+
// is the window a docking app
if ((wmhint = XGetWMHints(otk::OBDisplay::display, window))) {
if ((wmhint->flags & StateHint) &&
wmhint->initial_state == WithdrawnState) {
//slit->addClient(w); // XXX: make dock apps work!
+ otk::OBDisplay::ungrab();
+
XFree(wmhint);
return;
}
XFree(wmhint);
}
- otk::OBDisplay::grab();
-
// choose the events we want to receive on the CLIENT window
attrib_set.event_mask = OBClient::event_mask;
attrib_set.do_not_propagate_mask = OBClient::no_propagate_mask;
Openbox::instance->addClient(client->frame->grip_left(), client);
Openbox::instance->addClient(client->frame->grip_right(), client);
- bool shown = false;
-
// if on the current desktop.. (or all desktops)
if (client->desktop() == _desktop ||
client->desktop() == (signed)0xffffffff) {
- shown = true;
client->frame->show();
}