#endif // HAVE_LIBGEN_H
}
+#include <assert.h>
+
#include <algorithm>
#include <string>
using std::string;
#include "Window.hh"
#include "Workspace.hh"
#include "Workspacemenu.hh"
-
+#include "XAtom.hh"
// X event scanner for enter/leave notifies - adapted from twm
struct scanargs {
::blackbox = this;
argv = m_argv;
+
+ // try to make sure the ~/.openbox directory exists
+ mkdir(expandTilde("~/.openbox").c_str(), S_IREAD | S_IWRITE | S_IEXEC |
+ S_IRGRP | S_IWGRP | S_IXGRP |
+ S_IROTH | S_IWOTH | S_IXOTH);
+
if (! rc) rc = "~/.openbox/rc";
rc_file = expandTilde(rc);
config.setFile(rc_file);
resource.auto_raise_delay.tv_sec = resource.auto_raise_delay.tv_usec = 0;
active_screen = 0;
- focused_window = (BlackboxWindow *) 0;
+ focused_window = changing_window = (BlackboxWindow *) 0;
- XrmInitialize();
load_rc();
- init_icccm();
+ xatom = new XAtom(getXDisplay());
cursor.session = XCreateFontCursor(getXDisplay(), XC_left_ptr);
cursor.move = XCreateFontCursor(getXDisplay(), XC_fleur);
cursor.ll_angle = XCreateFontCursor(getXDisplay(), XC_ll_angle);
cursor.lr_angle = XCreateFontCursor(getXDisplay(), XC_lr_angle);
+ cursor.ul_angle = XCreateFontCursor(getXDisplay(), XC_ul_angle);
+ cursor.ur_angle = XCreateFontCursor(getXDisplay(), XC_ur_angle);
for (unsigned int i = 0; i < getNumberOfScreens(); i++) {
BScreen *screen = new BScreen(this, i);
std::for_each(menuTimestamps.begin(), menuTimestamps.end(),
PointerAssassin());
+ delete xatom;
+
delete timer;
}
BlackboxWindow *win = searchWindow(e->xmaprequest.window);
- if (! win) {
+ if (win) {
+ bool focus = False;
+ if (win->isIconic()) {
+ win->deiconify();
+ focus = True;
+ }
+ if (win->isShaded()) {
+ win->shade();
+ focus = True;
+ }
+
+ if (focus && (win->isTransient() || win->getScreen()->doFocusNew()))
+ win->setInputFocus();
+ } else {
BScreen *screen = searchScreen(e->xmaprequest.parent);
if (! screen) {
case UnmapNotify: {
BlackboxWindow *win = (BlackboxWindow *) 0;
Slit *slit = (Slit *) 0;
+ BScreen *screen = (BScreen *) 0;
if ((win = searchWindow(e->xunmap.window))) {
win->unmapNotifyEvent(&e->xunmap);
} else if ((slit = searchSlit(e->xunmap.window))) {
slit->unmapNotifyEvent(&e->xunmap);
+ } else if ((screen = searchSystrayWindow(e->xunmap.window))) {
+ screen->removeSystrayWindow(e->xunmap.window);
+ } else if ((screen = searchDesktopWindow(e->xunmap.window))) {
+ screen->removeDesktopWindow(e->xunmap.window);
}
break;
case DestroyNotify: {
BlackboxWindow *win = (BlackboxWindow *) 0;
Slit *slit = (Slit *) 0;
+ BScreen *screen = (BScreen *) 0;
BWindowGroup *group = (BWindowGroup *) 0;
if ((win = searchWindow(e->xdestroywindow.window))) {
slit->removeClient(e->xdestroywindow.window, False);
} else if ((group = searchGroup(e->xdestroywindow.window))) {
delete group;
+ } else if ((screen = searchSystrayWindow(e->xunmap.window))) {
+ screen->removeSystrayWindow(e->xunmap.window);
+ } else if ((screen = searchDesktopWindow(e->xunmap.window))) {
+ screen->removeDesktopWindow(e->xunmap.window);
}
break;
case PropertyNotify: {
last_time = e->xproperty.time;
- if (e->xproperty.state != PropertyDelete) {
- BlackboxWindow *win = searchWindow(e->xproperty.window);
-
- if (win)
- win->propertyNotifyEvent(e->xproperty.atom);
- }
+ BlackboxWindow *win = (BlackboxWindow *) 0;
+ BScreen *screen = (BScreen *) 0;
+ if ((win = searchWindow(e->xproperty.window)))
+ win->propertyNotifyEvent(&e->xproperty);
+ else if ((screen = searchScreen(e->xproperty.window)))
+ screen->propertyNotifyEvent(&e->xproperty);
break;
}
}
case FocusIn: {
- if (e->xfocus.detail != NotifyNonlinear) {
+ if (e->xfocus.detail != NotifyNonlinear &&
+ e->xfocus.detail != NotifyAncestor) {
/*
don't process FocusIns when:
1. the new focus window isn't an ancestor or inferior of the old
focus window (NotifyNonlinear)
+ make sure to allow the FocusIn when the old focus window was an
+ ancestor but didn't have a parent, such as root (NotifyAncestor)
*/
break;
}
case ClientMessage: {
if (e->xclient.format == 32) {
- if (e->xclient.message_type == getWMChangeStateAtom()) {
+ if (e->xclient.message_type == xatom->getAtom(XAtom::wm_change_state)) {
+ // WM_CHANGE_STATE message
BlackboxWindow *win = searchWindow(e->xclient.window);
if (! win || ! win->validateClient()) return;
win->iconify();
if (e->xclient.data.l[0] == NormalState)
win->deiconify();
- } else if(e->xclient.message_type == getBlackboxChangeWorkspaceAtom()) {
+ } else if (e->xclient.message_type ==
+ xatom->getAtom(XAtom::blackbox_change_workspace) ||
+ e->xclient.message_type ==
+ xatom->getAtom(XAtom::net_current_desktop)) {
+ // NET_CURRENT_DESKTOP message
BScreen *screen = searchScreen(e->xclient.window);
- if (screen && e->xclient.data.l[0] >= 0 &&
- e->xclient.data.l[0] <
- static_cast<signed>(screen->getWorkspaceCount()))
- screen->changeWorkspaceID(e->xclient.data.l[0]);
- } else if (e->xclient.message_type == getBlackboxChangeWindowFocusAtom()) {
+ unsigned int workspace = e->xclient.data.l[0];
+ if (screen && workspace < screen->getWorkspaceCount())
+ screen->changeWorkspaceID(workspace);
+ } else if (e->xclient.message_type ==
+ xatom->getAtom(XAtom::blackbox_change_window_focus)) {
+ // TEMP HACK TO KEEP BBKEYS WORKING
BlackboxWindow *win = searchWindow(e->xclient.window);
if (win && win->isVisible() && win->setInputFocus())
win->installColormap(True);
- } else if (e->xclient.message_type == getBlackboxCycleWindowFocusAtom()) {
+ } else if (e->xclient.message_type ==
+ xatom->getAtom(XAtom::net_active_window)) {
+ // NET_ACTIVE_WINDOW
+ BlackboxWindow *win = searchWindow(e->xclient.window);
+
+ if (win) {
+ BScreen *screen = win->getScreen();
+
+ if (win->isIconic())
+ win->deiconify(False, True);
+ if (win->isShaded())
+ win->shade();
+ if (win->getWorkspaceNumber() != screen->getCurrentWorkspaceID())
+ screen->changeWorkspaceID(win->getWorkspaceNumber());
+ if (win->isVisible() && win->setInputFocus()) {
+ win->getScreen()->getWorkspace(win->getWorkspaceNumber())->
+ raiseWindow(win);
+ win->installColormap(True);
+ }
+ }
+ } else if (e->xclient.message_type ==
+ xatom->getAtom(XAtom::blackbox_cycle_window_focus)) {
+ // BLACKBOX_CYCLE_WINDOW_FOCUS
BScreen *screen = searchScreen(e->xclient.window);
if (screen) {
else
screen->nextFocus();
}
- } else if (e->xclient.message_type == getBlackboxChangeAttributesAtom()) {
+ } else if (e->xclient.message_type ==
+ xatom->getAtom(XAtom::net_wm_desktop)) {
+ // NET_WM_DESKTOP
+ BlackboxWindow *win = searchWindow(e->xclient.window);
+
+ if (win) {
+ BScreen *screen = win->getScreen();
+ unsigned long wksp = (unsigned) e->xclient.data.l[0];
+ if (wksp < screen->getWorkspaceCount()) {
+ if (win->isIconic()) win->deiconify(False, True);
+ if (win->isStuck()) win->stick();
+ if (wksp != screen->getCurrentWorkspaceID())
+ win->withdraw();
+ else
+ win->show();
+ screen->reassociateWindow(win, wksp, True);
+ } else if (wksp == 0xfffffffe) { // XXX: BUG, BUT DOING THIS SO KDE WORKS FOR NOW!!
+ if (win->isIconic()) win->deiconify(False, True);
+ if (! win->isStuck()) win->stick();
+ if (! win->isVisible()) win->show();
+ }
+ }
+ } else if (e->xclient.message_type ==
+ xatom->getAtom(XAtom::blackbox_change_attributes)) {
+ // BLACKBOX_CHANGE_ATTRIBUTES
BlackboxWindow *win = searchWindow(e->xclient.window);
if (win && win->validateClient()) {
win->changeBlackboxHints(&net);
}
+ } else if (e->xclient.message_type ==
+ xatom->getAtom(XAtom::net_number_of_desktops)) {
+ // NET_NUMBER_OF_DESKTOPS
+ BScreen *screen = searchScreen(e->xclient.window);
+
+ if (e->xclient.data.l[0] > 0) {
+ if ((unsigned) e->xclient.data.l[0] < screen->getWorkspaceCount()) {
+ // shrink
+ for (int i = screen->getWorkspaceCount();
+ i > e->xclient.data.l[0]; --i)
+ screen->removeLastWorkspace();
+ // removeLast already sets the current workspace to the
+ // last available one.
+ } else if ((unsigned) e->xclient.data.l[0] >
+ screen->getWorkspaceCount()) {
+ // grow
+ for(int i = screen->getWorkspaceCount();
+ i < e->xclient.data.l[0]; ++i)
+ screen->addWorkspace();
+ }
+ }
+ } else if (e->xclient.message_type ==
+ xatom->getAtom(XAtom::net_close_window)) {
+ // NET_CLOSE_WINDOW
+ BlackboxWindow *win = searchWindow(e->xclient.window);
+ if (win && win->validateClient())
+ win->close(); // could this be smarter?
+ } else if (e->xclient.message_type ==
+ xatom->getAtom(XAtom::net_wm_moveresize)) {
+ // NET_WM_MOVERESIZE
+ BlackboxWindow *win = searchWindow(e->xclient.window);
+ if (win && win->validateClient()) {
+ int x_root = e->xclient.data.l[0],
+ y_root = e->xclient.data.l[1];
+ if ((Atom) e->xclient.data.l[2] ==
+ xatom->getAtom(XAtom::net_wm_moveresize_move)) {
+ win->beginMove(x_root, y_root);
+ } else {
+ if ((Atom) e->xclient.data.l[2] ==
+ xatom->getAtom(XAtom::net_wm_moveresize_size_topleft))
+ win->beginResize(x_root, y_root, BlackboxWindow::TopLeft);
+ else if ((Atom) e->xclient.data.l[2] ==
+ xatom->getAtom(XAtom::net_wm_moveresize_size_topright))
+ win->beginResize(x_root, y_root, BlackboxWindow::TopRight);
+ else if ((Atom) e->xclient.data.l[2] ==
+ xatom->getAtom(XAtom::net_wm_moveresize_size_bottomleft))
+ win->beginResize(x_root, y_root, BlackboxWindow::BottomLeft);
+ else if ((Atom) e->xclient.data.l[2] ==
+ xatom->getAtom(XAtom::net_wm_moveresize_size_bottomright))
+ win->beginResize(x_root, y_root, BlackboxWindow::BottomRight);
+ }
+ }
+ } else if (e->xclient.message_type ==
+ xatom->getAtom(XAtom::net_wm_state)) {
+ // NET_WM_STATE
+ BlackboxWindow *win = searchWindow(e->xclient.window);
+ if (win && win->validateClient()) {
+ const Atom action = (Atom) e->xclient.data.l[0];
+ const Atom state[] = { (Atom) e->xclient.data.l[1],
+ (Atom) e->xclient.data.l[2] };
+
+ for (int i = 0; i < 2; ++i) {
+ if (! state[i])
+ continue;
+
+ if ((Atom) e->xclient.data.l[0] == 1) {
+ // ADD
+ if (state[i] == xatom->getAtom(XAtom::net_wm_state_modal)) {
+ win->setModal(True);
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_maximized_vert)) {
+ if (win->isMaximizedHoriz()) {
+ win->maximize(0); // unmaximize
+ win->maximize(1); // full
+ } else if (! win->isMaximized()) {
+ win->maximize(2); // vert
+ }
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_maximized_horz)) {
+ if (win->isMaximizedVert()) {
+ win->maximize(0); // unmaximize
+ win->maximize(1); // full
+ } else if (! win->isMaximized()) {
+ win->maximize(3); // horiz
+ }
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_shaded)) {
+ if (! win->isShaded())
+ win->shade();
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_skip_taskbar)) {
+ win->setSkipTaskbar(True);
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_skip_pager)) {
+ win->setSkipPager(True);
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_fullscreen)) {
+ win->setFullscreen(True);
+ }
+ } else if (action == 0) {
+ // REMOVE
+ if (state[i] == xatom->getAtom(XAtom::net_wm_state_modal)) {
+ win->setModal(False);
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_maximized_vert)) {
+ if (win->isMaximizedFull()) {
+ win->maximize(0); // unmaximize
+ win->maximize(3); // horiz
+ } else if (win->isMaximizedVert()) {
+ win->maximize(0); // unmaximize
+ }
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_maximized_horz)) {
+ if (win->isMaximizedFull()) {
+ win->maximize(0); // unmaximize
+ win->maximize(2); // vert
+ } else if (win->isMaximizedHoriz()) {
+ win->maximize(0); // unmaximize
+ }
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_shaded)) {
+ if (win->isShaded())
+ win->shade();
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_skip_taskbar)) {
+ win->setSkipTaskbar(False);
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_skip_pager)) {
+ win->setSkipPager(False);
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_fullscreen)) {
+ win->setFullscreen(False);
+ }
+ } else if (action == 2) {
+ // TOGGLE
+ if (state[i] == xatom->getAtom(XAtom::net_wm_state_modal)) {
+ win->setModal(! win->isModal());
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_maximized_vert)) {
+ if (win->isMaximizedFull()) {
+ win->maximize(0); // unmaximize
+ win->maximize(3); // horiz
+ } else if (win->isMaximizedVert()) {
+ win->maximize(0); // unmaximize
+ } else if (win->isMaximizedHoriz()) {
+ win->maximize(0); // unmaximize
+ win->maximize(1); // full
+ } else {
+ win->maximize(2); // vert
+ }
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_maximized_horz)) {
+ if (win->isMaximizedFull()) {
+ win->maximize(0); // unmaximize
+ win->maximize(2); // vert
+ } else if (win->isMaximizedHoriz()) {
+ win->maximize(0); // unmaximize
+ } else if (win->isMaximizedVert()) {
+ win->maximize(0); // unmaximize
+ win->maximize(1); // full
+ } else {
+ win->maximize(3); // horiz
+ }
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_shaded)) {
+ win->shade();
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_skip_taskbar)) {
+ win->setSkipTaskbar(! win->skipTaskbar());
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_skip_pager)) {
+ win->setSkipPager(! win->skipPager());
+ } else if (state[i] ==
+ xatom->getAtom(XAtom::net_wm_state_fullscreen)) {
+ win->setFullscreen(! win->isFullscreen());
+ }
+ }
+ }
+ }
}
}
bool Blackbox::handleSignal(int sig) {
switch (sig) {
case SIGHUP:
+ restart();
+ break;
+
case SIGUSR1:
reconfigure();
break;
}
-void Blackbox::init_icccm(void) {
- xa_wm_colormap_windows =
- XInternAtom(getXDisplay(), "WM_COLORMAP_WINDOWS", False);
- xa_wm_protocols = XInternAtom(getXDisplay(), "WM_PROTOCOLS", False);
- xa_wm_state = XInternAtom(getXDisplay(), "WM_STATE", False);
- xa_wm_change_state = XInternAtom(getXDisplay(), "WM_CHANGE_STATE", False);
- xa_wm_delete_window = XInternAtom(getXDisplay(), "WM_DELETE_WINDOW", False);
- xa_wm_take_focus = XInternAtom(getXDisplay(), "WM_TAKE_FOCUS", False);
- motif_wm_hints = XInternAtom(getXDisplay(), "_MOTIF_WM_HINTS", False);
-
- blackbox_hints = XInternAtom(getXDisplay(), "_BLACKBOX_HINTS", False);
- blackbox_attributes =
- XInternAtom(getXDisplay(), "_BLACKBOX_ATTRIBUTES", False);
- blackbox_change_attributes =
- XInternAtom(getXDisplay(), "_BLACKBOX_CHANGE_ATTRIBUTES", False);
- blackbox_structure_messages =
- XInternAtom(getXDisplay(), "_BLACKBOX_STRUCTURE_MESSAGES", False);
- blackbox_notify_startup =
- XInternAtom(getXDisplay(), "_BLACKBOX_NOTIFY_STARTUP", False);
- blackbox_notify_window_add =
- XInternAtom(getXDisplay(), "_BLACKBOX_NOTIFY_WINDOW_ADD", False);
- blackbox_notify_window_del =
- XInternAtom(getXDisplay(), "_BLACKBOX_NOTIFY_WINDOW_DEL", False);
- blackbox_notify_current_workspace =
- XInternAtom(getXDisplay(), "_BLACKBOX_NOTIFY_CURRENT_WORKSPACE", False);
- blackbox_notify_workspace_count =
- XInternAtom(getXDisplay(), "_BLACKBOX_NOTIFY_WORKSPACE_COUNT", False);
- blackbox_notify_window_focus =
- XInternAtom(getXDisplay(), "_BLACKBOX_NOTIFY_WINDOW_FOCUS", False);
- blackbox_notify_window_raise =
- XInternAtom(getXDisplay(), "_BLACKBOX_NOTIFY_WINDOW_RAISE", False);
- blackbox_notify_window_lower =
- XInternAtom(getXDisplay(), "_BLACKBOX_NOTIFY_WINDOW_LOWER", False);
- blackbox_change_workspace =
- XInternAtom(getXDisplay(), "_BLACKBOX_CHANGE_WORKSPACE", False);
- blackbox_change_window_focus =
- XInternAtom(getXDisplay(), "_BLACKBOX_CHANGE_WINDOW_FOCUS", False);
- blackbox_cycle_window_focus =
- XInternAtom(getXDisplay(), "_BLACKBOX_CYCLE_WINDOW_FOCUS", False);
-
-#ifdef NEWWMSPEC
- net_supported = XInternAtom(getXDisplay(), "_NET_SUPPORTED", False);
- net_client_list = XInternAtom(getXDisplay(), "_NET_CLIENT_LIST", False);
- net_client_list_stacking =
- XInternAtom(getXDisplay(), "_NET_CLIENT_LIST_STACKING", False);
- net_number_of_desktops =
- XInternAtom(getXDisplay(), "_NET_NUMBER_OF_DESKTOPS", False);
- net_desktop_geometry =
- XInternAtom(getXDisplay(), "_NET_DESKTOP_GEOMETRY", False);
- net_desktop_viewport =
- XInternAtom(getXDisplay(), "_NET_DESKTOP_VIEWPORT", False);
- net_current_desktop =
- XInternAtom(getXDisplay(), "_NET_CURRENT_DESKTOP", False);
- net_desktop_names = XInternAtom(getXDisplay(), "_NET_DESKTOP_NAMES", False);
- net_active_window = XInternAtom(getXDisplay(), "_NET_ACTIVE_WINDOW", False);
- net_workarea = XInternAtom(getXDisplay(), "_NET_WORKAREA", False);
- net_supporting_wm_check =
- XInternAtom(getXDisplay(), "_NET_SUPPORTING_WM_CHECK", False);
- net_virtual_roots = XInternAtom(getXDisplay(), "_NET_VIRTUAL_ROOTS", False);
- net_close_window = XInternAtom(getXDisplay(), "_NET_CLOSE_WINDOW", False);
- net_wm_moveresize = XInternAtom(getXDisplay(), "_NET_WM_MOVERESIZE", False);
- net_properties = XInternAtom(getXDisplay(), "_NET_PROPERTIES", False);
- net_wm_name = XInternAtom(getXDisplay(), "_NET_WM_NAME", False);
- net_wm_desktop = XInternAtom(getXDisplay(), "_NET_WM_DESKTOP", False);
- net_wm_window_type =
- XInternAtom(getXDisplay(), "_NET_WM_WINDOW_TYPE", False);
- net_wm_state = XInternAtom(getXDisplay(), "_NET_WM_STATE", False);
- net_wm_strut = XInternAtom(getXDisplay(), "_NET_WM_STRUT", False);
- net_wm_icon_geometry =
- XInternAtom(getXDisplay(), "_NET_WM_ICON_GEOMETRY", False);
- net_wm_icon = XInternAtom(getXDisplay(), "_NET_WM_ICON", False);
- net_wm_pid = XInternAtom(getXDisplay(), "_NET_WM_PID", False);
- net_wm_handled_icons =
- XInternAtom(getXDisplay(), "_NET_WM_HANDLED_ICONS", False);
- net_wm_ping = XInternAtom(getXDisplay(), "_NET_WM_PING", False);
-#endif // NEWWMSPEC
-
-#ifdef HAVE_GETPID
- blackbox_pid = XInternAtom(getXDisplay(), "_BLACKBOX_PID", False);
-#endif // HAVE_GETPID
-}
-
-
bool Blackbox::validateWindow(Window window) {
XEvent event;
if (XCheckTypedWindowEvent(getXDisplay(), window, DestroyNotify, &event)) {
}
+BScreen *Blackbox::searchDesktopWindow(Window window) {
+ WindowScreenLookup::iterator it = desktopSearchList.find(window);
+ if (it != desktopSearchList.end())
+ return it->second;
+
+ return (BScreen*) 0;
+}
+
+
+BScreen *Blackbox::searchSystrayWindow(Window window) {
+ WindowScreenLookup::iterator it = systraySearchList.find(window);
+ if (it != systraySearchList.end())
+ return it->second;
+
+ return (BScreen*) 0;
+}
+
+
BlackboxWindow *Blackbox::searchWindow(Window window) {
WindowLookup::iterator it = windowSearchList.find(window);
if (it != windowSearchList.end())
}
+void Blackbox::saveDesktopWindowSearch(Window window, BScreen *screen) {
+ desktopSearchList.insert(WindowScreenLookupPair(window, screen));
+}
+
+
+void Blackbox::saveSystrayWindowSearch(Window window, BScreen *screen) {
+ systraySearchList.insert(WindowScreenLookupPair(window, screen));
+}
+
+
void Blackbox::saveWindowSearch(Window window, BlackboxWindow *data) {
windowSearchList.insert(WindowLookupPair(window, data));
}
}
+void Blackbox::removeDesktopWindowSearch(Window window) {
+ desktopSearchList.erase(window);
+}
+
+
+void Blackbox::removeSystrayWindowSearch(Window window) {
+ systraySearchList.erase(window);
+}
+
+
void Blackbox::removeWindowSearch(Window window) {
windowSearchList.erase(window);
}
shutdown();
if (prog) {
+ putenv(const_cast<char *>(screenList.front()->displayString().c_str()));
execlp(prog, prog, NULL);
perror(prog);
}
void Blackbox::load_rc(void) {
if (! config.load())
- config.create();
+ config.create();
string s;
}
+void Blackbox::setChangingWindow(BlackboxWindow *win) {
+ // make sure one of the two is null and the other isn't
+ assert((! changing_window && win) || (! win && changing_window));
+ changing_window = win;
+}
+
+
void Blackbox::setFocusedWindow(BlackboxWindow *win) {
if (focused_window && focused_window == win) // nothing to do
return;
if (active_screen) {
// set input focus to the toolbar of the screen with mouse
XSetInputFocus(getXDisplay(),
- active_screen->getToolbar()->getWindowID(),
+ active_screen->getRootWindow(),
RevertToPointerRoot, CurrentTime);
} else {
// set input focus to the toolbar of the first managed screen
XSetInputFocus(getXDisplay(),
- screenList.front()->getToolbar()->getWindowID(),
+ screenList.front()->getRootWindow(),
RevertToPointerRoot, CurrentTime);
}
} else {
// set input focus to the toolbar of the last screen
- XSetInputFocus(getXDisplay(), old_screen->getToolbar()->getWindowID(),
+ XSetInputFocus(getXDisplay(), old_screen->getRootWindow(),
RevertToPointerRoot, CurrentTime);
}
}
projects / chaz / openbox / blobdiff