#include "xeventhandler.hh"
#include "client.hh"
-#include "frame.hh"
#include "openbox.hh"
+#include "screen.hh"
+#include "frame.hh"
#include "otk/display.hh"
#include "otk/rect.hh"
-// XXX: REMOVE THIS SOON!!#!
-#include "blackbox.hh"
-#include "screen.hh"
-
extern "C" {
#include <X11/Xlib.h>
#include <X11/Xutil.h>
}
-// XXX: put this into the OBScreen or OBClient class!
-void OBXEventHandler::manageWindow(int screen, Window window)
-{
- OBClient *client = 0;
- XWMHints *wmhint;
- XSetWindowAttributes attrib_set;
-
- // XXX: manage the window, i.e. grab events n shit
-
- // 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!
- XFree(wmhint);
- return;
- }
- XFree(wmhint);
- }
-
- // choose the events we want to receive on the CLIENT window
- attrib_set.event_mask = OBClient::event_mask;
- attrib_set.do_not_propagate_mask = ButtonPressMask | ButtonReleaseMask |
- ButtonMotionMask;
- XChangeWindowAttributes(otk::OBDisplay::display, window,
- CWEventMask|CWDontPropagate, &attrib_set);
-
- // create the OBClient class, which gets all of the hints on the window
- Openbox::instance->addClient(window, client = new OBClient(screen, window));
-
- // we dont want a border on the client
- XSetWindowBorderWidth(otk::OBDisplay::display, window, 0);
-
- // specify that if we exit, the window should not be destroyed and should be
- // reparented back to root automatically
- XChangeSaveSet(otk::OBDisplay::display, window, SetModeInsert);
-
- if (!client->positionRequested()) {
- // XXX: position the window intelligenty
- }
-
- // XXX: store a style somewheres cooler!!
- otk::Style *style = ((Blackbox*)Openbox::instance)->
- searchScreen(RootWindow(otk::OBDisplay::display, screen))->
- getWindowStyle();
- client->frame = new OBFrame(client, style);
-
- // XXX: if on the current desktop..
- XMapWindow(otk::OBDisplay::display, client->frame->window());
-
- // XXX: handle any requested states such as shaded/maximized
-}
-
-// XXX: move this to the OBScreen or OBClient class!
-void OBXEventHandler::unmanageWindow(OBClient *client)
-{
- OBFrame *frame = client->frame;
-
- // XXX: pass around focus if this window was focused
-
- // remove the window from our save set
- XChangeSaveSet(otk::OBDisplay::display, client->window(), SetModeDelete);
-
- // we dont want events no more
- XSelectInput(otk::OBDisplay::display, client->window(), NoEventMask);
-
- XUnmapWindow(otk::OBDisplay::display, frame->window());
-
- // we dont want a border on the client
- XSetWindowBorderWidth(otk::OBDisplay::display, client->window(),
- client->borderWidth());
-
- // remove the client class from the search list
- Openbox::instance->removeClient(client->window());
-
- delete client->frame;
- client->frame = 0;
-
- delete client;
-}
-
void OBXEventHandler::mapRequest(const XMapRequestEvent &e)
{
#ifdef DEBUG
assert(screen < ScreenCount(otk::OBDisplay::display));
- manageWindow(screen, e.window);
+ Openbox::instance->screen(screen)->manageWindow(e.window);
}
/*
{
OBClient *client = Openbox::instance->findClient(e.window);
if (!client) return;
-
- unmanageWindow(client);
+
+ if (client->ignore_unmaps == 0)
+ Openbox::instance->screen(client->screen())->unmanageWindow(client);
+ else
+ client->ignore_unmaps--;
}
OBClient *client = Openbox::instance->findClient(e.window);
if (!client) return;
- unmanageWindow(client);
+ Openbox::instance->screen(client->screen())->unmanageWindow(client);
}
if (!client) return;
client->update(e);
- client->frame->shape();
+ client->frame->update();
}
#endif // SHAPE
// These types of XEvent's can be bound to actions by the user, and so end
// up getting passed off to the OBBindingMapper class at some point
+ // IOW: THESE WILL HAVE GUILE HOOKS
case ButtonPress:
buttonPress(e.xbutton);
break;