// -*- mode: C++; indent-tabs-mode: nil; -*-
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
#include "xeventhandler.hh"
#include "client.hh"
+#include "frame.hh"
#include "openbox.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 class!
-static void manageWindow(Window window)
+// XXX: put this into the OBScreen or OBClient class!
+void OBXEventHandler::manageWindow(int screen, Window window)
{
OBClient *client = 0;
XWMHints *wmhint;
}
// choose the events we want to receive on the CLIENT window
- attrib_set.event_mask = PropertyChangeMask | FocusChangeMask |
- StructureNotifyMask;
+ 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(window));
+ Openbox::instance->addClient(window, client = new OBClient(screen, window));
// we dont want a border on the client
XSetWindowBorderWidth(otk::OBDisplay::display, window, 0);
if (!client->positionRequested()) {
// XXX: position the window intelligenty
}
-
- // XXX: grab server, reparent client to the frame, ungrab server
-
- // XXX: if shaped, shape the frame..
+ // XXX: store a style somewheres cooler!!
+ otk::Style *style = ((Blackbox*)Openbox::instance)->
+ searchScreen(RootWindow(otk::OBDisplay::display, screen))->
+ getWindowStyle();
+ // create the decoration frame for the client window
+ client->frame = new OBFrame(client, style);
+
+ // add all the client's decoration windows as event handlers for the client
+ Openbox::instance->addClient(client->frame->window(), client);
+ Openbox::instance->addClient(client->frame->titlebar(), client);
+ Openbox::instance->addClient(client->frame->buttonIconify(), client);
+ Openbox::instance->addClient(client->frame->buttonMax(), client);
+ Openbox::instance->addClient(client->frame->buttonStick(), client);
+ Openbox::instance->addClient(client->frame->buttonClose(), client);
+ Openbox::instance->addClient(client->frame->label(), client);
+ Openbox::instance->addClient(client->frame->handle(), client);
+ Openbox::instance->addClient(client->frame->gripLeft(), client);
+ Openbox::instance->addClient(client->frame->gripRight(), client);
+
// XXX: if on the current desktop..
- /// XMapSubwindows(otk::OBDisplay::display, FRAMEWINDOW);
- XMapWindow(otk::OBDisplay::display, window);
+ XMapWindow(otk::OBDisplay::display, client->frame->window());
- // handle any requested states such as shaded/maximized
+ // XXX: handle any requested states such as shaded/maximized
}
-static void unmanageWindow(OBClient *client)
+// XXX: move this to the OBScreen or OBClient class!
+void OBXEventHandler::unmanageWindow(OBClient *client)
{
- bool remap = false; // remap the window when we're done?
-
- Window window = client->window();
+ OBFrame *frame = client->frame;
// XXX: pass around focus if this window was focused
// remove the window from our save set
- XChangeSaveSet(otk::OBDisplay::display, window, SetModeDelete);
+ XChangeSaveSet(otk::OBDisplay::display, client->window(), SetModeDelete);
// we dont want events no more
- XSelectInput(otk::OBDisplay::display, window, NoEventMask);
+ XSelectInput(otk::OBDisplay::display, client->window(), NoEventMask);
- // XXX: XUnmapWindow(otk::OBDisplay::display, FRAME);
- XUnmapWindow(otk::OBDisplay::display, window);
+ XUnmapWindow(otk::OBDisplay::display, frame->window());
// we dont want a border on the client
- XSetWindowBorderWidth(otk::OBDisplay::display, window,client->borderWidth());
+ XSetWindowBorderWidth(otk::OBDisplay::display, client->window(),
+ client->borderWidth());
// remove the client class from the search list
- Openbox::instance->removeClient(window);
-
- // check if the app has already reparented its window to the root window
- XEvent ev;
- if (XCheckTypedWindowEvent(otk::OBDisplay::display, window, ReparentNotify,
- &ev)) {
- remap = true; // XXX: why do we remap the window if they already
- // reparented to root?
- } else {
- // according to the ICCCM - if the client doesn't reparent to
- // root, then we have to do it for them
- XReparentWindow(otk::OBDisplay::display, window,
- RootWindow(otk::OBDisplay::display,
- DefaultScreen(otk::OBDisplay::display)),
- // XXX: screen->getRootWindow(),
- client->area().x(), client->area().y());
- }
-
- // if we want to remap the window, do so now
- if (remap)
- XMapWindow(otk::OBDisplay::display, window);
+ Openbox::instance->removeClient(client->window());
+ // remove the frame's decor elements as event handlers for the client
+ Openbox::instance->removeClient(frame->window());
+ Openbox::instance->removeClient(frame->titlebar());
+ Openbox::instance->removeClient(frame->buttonIconify());
+ Openbox::instance->removeClient(frame->buttonMax());
+ Openbox::instance->removeClient(frame->buttonStick());
+ Openbox::instance->removeClient(frame->buttonClose());
+ Openbox::instance->removeClient(frame->label());
+ Openbox::instance->removeClient(frame->handle());
+ Openbox::instance->removeClient(frame->gripLeft());
+ Openbox::instance->removeClient(frame->gripRight());
+
+ delete client->frame;
+ client->frame = 0;
delete client;
}
if (client) {
// XXX: uniconify and/or unshade the window
} else {
- manageWindow(e.window);
+ int screen = INT_MAX;
+
+ for (int i = 0; i < ScreenCount(otk::OBDisplay::display); ++i)
+ if (otk::OBDisplay::screenInfo(i)->getRootWindow() == e.parent) {
+ screen = i;
+ break;
+ }
+
+ if (screen >= ScreenCount(otk::OBDisplay::display)) {
+ /*
+ we got a map request for a window who's parent isn't root. this
+ can happen in only one circumstance:
+
+ a client window unmapped a managed window, and then remapped it
+ somewhere between unmapping the client window and reparenting it
+ to root.
+
+ regardless of how it happens, we need to find the screen that
+ the window is on
+ */
+ XWindowAttributes wattrib;
+ if (! XGetWindowAttributes(otk::OBDisplay::display, e.window,
+ &wattrib)) {
+ // failed to get the window attributes, perhaps the window has
+ // now been destroyed?
+ return;
+ }
+
+ for (int i = 0; i < ScreenCount(otk::OBDisplay::display); ++i)
+ if (otk::OBDisplay::screenInfo(i)->getRootWindow() == wattrib.root) {
+ screen = i;
+ break;
+ }
+ }
+
+ assert(screen < ScreenCount(otk::OBDisplay::display));
+
+ manageWindow(screen, e.window);
}
/*
#ifdef SHAPE
void OBXEventHandler::shapeEvent(const XShapeEvent &e)
{
- XShapeEvent *shape_event = (XShapeEvent *) e;
- BlackboxWindow *win = searchWindow(e->xany.window);
+ printf("ShapeEvent\n");
+ if (e.kind != ShapeBounding) return;
- if (win && shape_event->kind == ShapeBounding)
- win->shapeEvent(shape_event);
+ OBClient *client = Openbox::instance->findClient(e.window);
+ if (!client) return;
+
+ client->update(e);
+ 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;
default:
#ifdef SHAPE
if (e.type == otk::OBDisplay::shapeEventBase())
- shapeEvent(e);
+ shapeEvent((*(XShapeEvent*)&e));
#endif // SHAPE
break;
projects / chaz / openbox / blobdiff