X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=4b5495bb58e87d3f0b1f2f82c6f6d02fa980122d;hb=90e7db977fc94e4a3c1ae5689f1998d9723d4c71;hp=55c07acd9272f535810fc20d124a8ed1923b0877;hpb=456cf2d5065b6939516194c896ccc6f443c08a8c;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index 55c07acd..4b5495bb 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -55,6 +55,7 @@ #include "Window.h" #include "Workspace.h" #include "Workspacemenu.h" +#include "Util.h" #include #include @@ -63,10 +64,13 @@ # include #endif // HAVE_STDIO_H -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include +#endif // HAVE_STDLIB_H + +#ifdef HAVE_STRING_H # include -#endif // STDC_HEADERS +#endif // HAVE_STRING_H #ifdef HAVE_UNISTD_H # include @@ -147,8 +151,8 @@ static Bool queueScanner(Display *, XEvent *e, char *args) { Openbox *openbox; -Openbox::Openbox(int m_argc, char **m_argv, char *dpy_name, char *rc) - : BaseDisplay(m_argv[0], dpy_name) { +Openbox::Openbox(int m_argc, char **m_argv, char *dpy_name, char *rc, + char *menu) : BaseDisplay(m_argv[0], dpy_name) { grab(); if (! XSupportsLocale()) @@ -160,124 +164,110 @@ Openbox::Openbox(int m_argc, char **m_argv, char *dpy_name, char *rc) ::openbox = this; argc = m_argc; argv = m_argv; - if (rc == NULL) { + if (rc == NULL || menu == NULL) { char *homedir = getenv("HOME"); - - rc_file = new char[strlen(homedir) + strlen("/.openbox/rc") + 1]; - sprintf(rc_file, "%s/.openbox", homedir); - + char *configdir = new char[strlen(homedir) + strlen("/.openbox") + 1]; + sprintf(configdir, "%s/.openbox", homedir); // try to make sure the ~/.openbox directory exists - mkdir(rc_file, S_IREAD | S_IWRITE | S_IEXEC | S_IRGRP | S_IWGRP | S_IXGRP | + mkdir(configdir, S_IREAD | S_IWRITE | S_IEXEC | + S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH); - sprintf(rc_file, "%s/.openbox/rc", homedir); - } else { - rc_file = bstrdup(rc); + + if (rc == NULL) { + rc_file = new char[strlen(configdir) + strlen("/rc") + 1]; + sprintf(rc_file, "%s/rc", configdir); + } else + rc_file = bstrdup(rc); + + if (menu == NULL) { + menu_file = new char[strlen(configdir) + strlen("/menu") + 1]; + sprintf(menu_file, "%s/menu", configdir); + } else + menu_file = bstrdup(menu); + + delete [] configdir; } config.setFile(rc_file); - + no_focus = False; - resource.menu_file = resource.style_file = (char *) 0; - resource.titlebar_layout = (char *) NULL; + resource.style_file = NULL; + resource.titlebar_layout = NULL; resource.auto_raise_delay.tv_sec = resource.auto_raise_delay.tv_usec = 0; - focused_window = masked_window = (OpenboxWindow *) 0; + current_screen = (BScreen *) 0; + masked_window = (OpenboxWindow *) 0; masked = None; - windowSearchList = new LinkedList; - menuSearchList = new LinkedList; - -#ifdef SLIT - slitSearchList = new LinkedList; -#endif // SLIT - - toolbarSearchList = new LinkedList; - groupSearchList = new LinkedList; - - menuTimestamps = new LinkedList; - - load_rc(); + load(); #ifdef HAVE_GETPID openbox_pid = XInternAtom(getXDisplay(), "_BLACKBOX_PID", False); #endif // HAVE_GETPID - screenList = new LinkedList; - for (int i = 0; i < getNumberOfScreens(); i++) { - BScreen *screen = new BScreen(this, i); + for (unsigned int s = 0; s < numberOfScreens(); s++) { + BScreen *screen = new BScreen(*this, s, config); if (! screen->isScreenManaged()) { delete screen; continue; } - screenList->insert(screen); + screenList.push_back(screen); } - if (! screenList->count()) { + if (screenList.empty()) { fprintf(stderr, i18n->getMessage(openboxSet, openboxNoManagableScreens, "Openbox::Openbox: no managable screens found, aborting.\n")); ::exit(3); } + current_screen = screenList.front(); + // save current settings and default values + save(); + XSynchronize(getXDisplay(), False); XSync(getXDisplay(), False); reconfigure_wait = reread_menu_wait = False; - timer = new BTimer(this, this); + timer = new BTimer(*this, *this); timer->setTimeout(0); timer->fireOnce(True); ungrab(); -} - -Openbox::~Openbox(void) { - while (screenList->count()) - delete screenList->remove(0); - - while (menuTimestamps->count()) { - MenuTimestamp *ts = menuTimestamps->remove(0); + focusWindow(0); +} - if (ts->filename) - delete [] ts->filename; - delete ts; - } +Openbox::~Openbox() { + for_each(screenList.begin(), screenList.end(), + PointerAssassin()); - if (resource.menu_file) - delete [] resource.menu_file; + for_each(menuTimestamps.begin(), menuTimestamps.end(), + PointerAssassin()); if (resource.style_file) delete [] resource.style_file; - delete timer; - - delete screenList; - delete menuTimestamps; + if (resource.titlebar_layout) + delete [] resource.titlebar_layout; - delete windowSearchList; - delete menuSearchList; - delete toolbarSearchList; - delete groupSearchList; + delete timer; delete [] rc_file; - -#ifdef SLIT - delete slitSearchList; -#endif // SLIT + delete [] menu_file; } void Openbox::process_event(XEvent *e) { - if ((masked == e->xany.window) && masked_window && + if ((masked == e->xany.window && masked_window) && (e->type == MotionNotify)) { last_time = e->xmotion.time; masked_window->motionNotifyEvent(&e->xmotion); - return; } @@ -313,9 +303,9 @@ void Openbox::process_event(XEvent *e) { } else if ((tbar = searchToolbar(e->xbutton.window))) { tbar->buttonPressEvent(&e->xbutton); } else { - LinkedListIterator it(screenList); - BScreen *screen = it.current(); - for (; screen; it++, screen = it.current()) { + ScreenList::iterator it; + for (it = screenList.begin(); it != screenList.end(); ++it) { + BScreen *screen = *it; if (e->xbutton.window == screen->getRootWindow()) { if (e->xbutton.button == 1) { if (! screen->isRootColormapInstalled()) @@ -336,14 +326,14 @@ void Openbox::process_event(XEvent *e) { if (my < 0) my = 0; if (mx + screen->getWorkspacemenu()->getWidth() > - screen->getWidth()) - mx = screen->getWidth() - + screen->size().w()) + mx = screen->size().w() - screen->getWorkspacemenu()->getWidth() - screen->getBorderWidth(); if (my + screen->getWorkspacemenu()->getHeight() > - screen->getHeight()) - my = screen->getHeight() - + screen->size().h()) + my = screen->size().h() - screen->getWorkspacemenu()->getHeight() - screen->getBorderWidth(); @@ -362,13 +352,13 @@ void Openbox::process_event(XEvent *e) { if (mx < 0) mx = 0; if (my < 0) my = 0; - if (mx + screen->getRootmenu()->getWidth() > screen->getWidth()) - mx = screen->getWidth() - + if (mx + screen->getRootmenu()->getWidth() > screen->size().w()) + mx = screen->size().w() - screen->getRootmenu()->getWidth() - screen->getBorderWidth(); - if (my + screen->getRootmenu()->getHeight() > screen->getHeight()) - my = screen->getHeight() - + if (my + screen->getRootmenu()->getHeight() > screen->size().h()) + my = screen->size().h() - screen->getRootmenu()->getHeight() - screen->getBorderWidth(); @@ -379,15 +369,16 @@ void Openbox::process_event(XEvent *e) { screen->getRootmenu()->show(); } } else if (e->xbutton.button == 4) { - if ((screen->getCurrentWorkspaceID()-1)<0) - screen->changeWorkspaceID(screen->getWorkspaceCount()-1); + if ((screen->getCurrentWorkspaceID() + 1) > + screen->getWorkspaceCount() - 1) + screen->changeWorkspaceID(0); else - screen->changeWorkspaceID(screen->getCurrentWorkspaceID()-1); + screen->changeWorkspaceID(screen->getCurrentWorkspaceID() + 1); } else if (e->xbutton.button == 5) { - if ((screen->getCurrentWorkspaceID()+1)>screen->getWorkspaceCount()-1) - screen->changeWorkspaceID(0); + if ((screen->getCurrentWorkspaceID() - 1) < 0) + screen->changeWorkspaceID(screen->getWorkspaceCount() - 1); else - screen->changeWorkspaceID(screen->getCurrentWorkspaceID()+1); + screen->changeWorkspaceID(screen->getCurrentWorkspaceID() - 1); } } } @@ -466,7 +457,7 @@ void Openbox::process_event(XEvent *e) { OpenboxWindow *win = searchWindow(e->xmaprequest.window); if (! win) - win = new OpenboxWindow(this, e->xmaprequest.window); + win = new OpenboxWindow(*this, e->xmaprequest.window); if ((win = searchWindow(e->xmaprequest.window))) win->mapRequestEvent(&e->xmaprequest); @@ -492,8 +483,6 @@ void Openbox::process_event(XEvent *e) { if ((win = searchWindow(e->xunmap.window))) { win->unmapNotifyEvent(&e->xunmap); - if (focused_window == win) - focused_window = (OpenboxWindow *) 0; #ifdef SLIT } else if ((slit = searchSlit(e->xunmap.window))) { slit->removeClient(e->xunmap.window); @@ -513,8 +502,6 @@ void Openbox::process_event(XEvent *e) { if ((win = searchWindow(e->xdestroywindow.window))) { win->destroyNotifyEvent(&e->xdestroywindow); - if (focused_window == win) - focused_window = (OpenboxWindow *) 0; #ifdef SLIT } else if ((slit = searchSlit(e->xdestroywindow.window))) { slit->removeClient(e->xdestroywindow.window, False); @@ -578,7 +565,7 @@ void Openbox::process_event(XEvent *e) { (screen = searchScreen(e->xcrossing.window))) { screen->getImageControl()->installRootColormap(); } else if ((win = searchWindow(e->xcrossing.window))) { - if (win->getScreen()->isSloppyFocus() && + if (win->getScreen()->sloppyFocus() && (! win->isFocused()) && (! no_focus)) { grab(); @@ -664,8 +651,8 @@ void Openbox::process_event(XEvent *e) { break; OpenboxWindow *win = searchWindow(e->xfocus.window); - if (win && ! win->isFocused()) - setFocusedWindow(win); + if (win && !win->isFocused()) + focusWindow(win); break; } @@ -743,11 +730,8 @@ void Openbox::process_event(XEvent *e) { Bool Openbox::handleSignal(int sig) { switch (sig) { case SIGHUP: - reconfigure(); - break; - case SIGUSR1: - reload_rc(); + reconfigure(); break; case SIGUSR2: @@ -770,170 +754,107 @@ Bool Openbox::handleSignal(int sig) { BScreen *Openbox::searchScreen(Window window) { - LinkedListIterator it(screenList); - - for (BScreen *curr = it.current(); curr; it++, curr = it.current()) { - if (curr->getRootWindow() == window) { - return curr; - } - } - + ScreenList::iterator it; + for (it = screenList.begin(); it != screenList.end(); ++it) + if ((*it)->getRootWindow() == window) + return *it; return (BScreen *) 0; } OpenboxWindow *Openbox::searchWindow(Window window) { - LinkedListIterator it(windowSearchList); - - for (WindowSearch *tmp = it.current(); tmp; it++, tmp = it.current()) { - if (tmp->getWindow() == window) { - return tmp->getData(); - } - } - - return (OpenboxWindow *) 0; + WindowLookup::iterator it = windowSearchList.find(window); + if (it == windowSearchList.end()) + return (OpenboxWindow *) 0; + return it->second; } OpenboxWindow *Openbox::searchGroup(Window window, OpenboxWindow *win) { - OpenboxWindow *w = (OpenboxWindow *) 0; - LinkedListIterator it(groupSearchList); - - for (WindowSearch *tmp = it.current(); tmp; it++, tmp = it.current()) { - if (tmp->getWindow() == window) { - w = tmp->getData(); - if (w->getClientWindow() != win->getClientWindow()) - return win; - } - } - + WindowLookup::iterator it = groupSearchList.find(window); + if (it != groupSearchList.end()) + if (it->second->getClientWindow() != win->getClientWindow()) + return win; return (OpenboxWindow *) 0; } Basemenu *Openbox::searchMenu(Window window) { - LinkedListIterator it(menuSearchList); - - for (MenuSearch *tmp = it.current(); tmp; it++, tmp = it.current()) { - if (tmp->getWindow() == window) - return tmp->getData(); - } - - return (Basemenu *) 0; + MenuLookup::iterator it = menuSearchList.find(window); + if (it == menuSearchList.end()) + return (Basemenu *) 0; + return it->second; } Toolbar *Openbox::searchToolbar(Window window) { - LinkedListIterator it(toolbarSearchList); - - for (ToolbarSearch *tmp = it.current(); tmp; it++, tmp = it.current()) { - if (tmp->getWindow() == window) - return tmp->getData(); - } - - return (Toolbar *) 0; + ToolbarLookup::iterator it = toolbarSearchList.find(window); + if (it == toolbarSearchList.end()) + return (Toolbar *) 0; + return it->second; } #ifdef SLIT Slit *Openbox::searchSlit(Window window) { - LinkedListIterator it(slitSearchList); - - for (SlitSearch *tmp = it.current(); tmp; it++, tmp = it.current()) { - if (tmp->getWindow() == window) - return tmp->getData(); - } - - return (Slit *) 0; + SlitLookup::iterator it = slitSearchList.find(window); + if (it == slitSearchList.end()) + return (Slit *) 0; + return it->second; } #endif // SLIT void Openbox::saveWindowSearch(Window window, OpenboxWindow *data) { - windowSearchList->insert(new WindowSearch(window, data)); + windowSearchList.insert(WindowLookupPair(window, data)); } void Openbox::saveGroupSearch(Window window, OpenboxWindow *data) { - groupSearchList->insert(new WindowSearch(window, data)); + groupSearchList.insert(WindowLookupPair(window, data)); } void Openbox::saveMenuSearch(Window window, Basemenu *data) { - menuSearchList->insert(new MenuSearch(window, data)); + menuSearchList.insert(MenuLookupPair(window, data)); } void Openbox::saveToolbarSearch(Window window, Toolbar *data) { - toolbarSearchList->insert(new ToolbarSearch(window, data)); + toolbarSearchList.insert(ToolbarLookupPair(window, data)); } #ifdef SLIT void Openbox::saveSlitSearch(Window window, Slit *data) { - slitSearchList->insert(new SlitSearch(window, data)); + slitSearchList.insert(SlitLookupPair(window, data)); } #endif // SLIT void Openbox::removeWindowSearch(Window window) { - LinkedListIterator it(windowSearchList); - for (WindowSearch *tmp = it.current(); tmp; it++, tmp = it.current()) { - if (tmp->getWindow() == window) { - windowSearchList->remove(tmp); - delete tmp; - break; - } - } + windowSearchList.erase(window); } void Openbox::removeGroupSearch(Window window) { - LinkedListIterator it(groupSearchList); - for (WindowSearch *tmp = it.current(); tmp; it++, tmp = it.current()) { - if (tmp->getWindow() == window) { - groupSearchList->remove(tmp); - delete tmp; - break; - } - } + groupSearchList.erase(window); } void Openbox::removeMenuSearch(Window window) { - LinkedListIterator it(menuSearchList); - for (MenuSearch *tmp = it.current(); tmp; it++, tmp = it.current()) { - if (tmp->getWindow() == window) { - menuSearchList->remove(tmp); - delete tmp; - break; - } - } + menuSearchList.erase(window); } void Openbox::removeToolbarSearch(Window window) { - LinkedListIterator it(toolbarSearchList); - for (ToolbarSearch *tmp = it.current(); tmp; it++, tmp = it.current()) { - if (tmp->getWindow() == window) { - toolbarSearchList->remove(tmp); - delete tmp; - break; - } - } + toolbarSearchList.erase(window); } #ifdef SLIT void Openbox::removeSlitSearch(Window window) { - LinkedListIterator it(slitSearchList); - for (SlitSearch *tmp = it.current(); tmp; it++, tmp = it.current()) { - if (tmp->getWindow() == window) { - slitSearchList->remove(tmp); - delete tmp; - break; - } - } + slitSearchList.erase(window); } #endif // SLIT @@ -952,27 +873,28 @@ void Openbox::restart(const char *prog) { } -void Openbox::shutdown(void) { +void Openbox::shutdown() { BaseDisplay::shutdown(); - XSetInputFocus(getXDisplay(), PointerRoot, None, CurrentTime); - - LinkedListIterator it(screenList); - for (BScreen *s = it.current(); s; it++, s = it.current()) - s->shutdown(); + std::for_each(screenList.begin(), screenList.end(), + std::mem_fun(&BScreen::shutdown)); + focusWindow(0); + XSync(getXDisplay(), False); - - save_rc(); } -void Openbox::save_rc(void) { +void Openbox::save() { config.setAutoSave(false); - config.setValue("session.menuFile", getMenuFilename()); + // save all values as they are so that the defaults will be written to the rc + // file + config.setValue("session.colorsPerChannel", resource.colors_per_channel); + config.setValue("session.styleFile", resource.style_file); + config.setValue("session.titlebarLayout", resource.titlebar_layout); config.setValue("session.doubleClickInterval", (long)resource.double_click_interval); config.setValue("session.autoRaiseDelay", @@ -981,183 +903,20 @@ void Openbox::save_rc(void) { config.setValue("session.cacheLife", (long)resource.cache_life / 60000); config.setValue("session.cacheMax", (long)resource.cache_max); - LinkedListIterator it(screenList); - for (BScreen *screen = it.current(); screen; it++, screen = it.current()) { -// ScreenList::iterator it = screenList.begin(); -// for (; it != screenList.end(); ++it) { -// BScreen *screen = *it; - char rc_string[1024]; - const int screen_number = screen->getScreenNumber(); - - char *placement = (char *) 0; - - switch (screen->getSlitPlacement()) { - case Slit::TopLeft: placement = "TopLeft"; break; - case Slit::CenterLeft: placement = "CenterLeft"; break; - case Slit::BottomLeft: placement = "BottomLeft"; break; - case Slit::TopCenter: placement = "TopCenter"; break; - case Slit::BottomCenter: placement = "BottomCenter"; break; - case Slit::TopRight: placement = "TopRight"; break; - case Slit::BottomRight: placement = "BottomRight"; break; - case Slit::CenterRight: default: placement = "CenterRight"; break; - } - sprintf(rc_string, "session.screen%d.slit.placement", screen_number); - config.setValue(rc_string, placement); - - sprintf(rc_string, "session.screen%d.slit.direction", screen_number); - config.setValue(rc_string, - screen->getSlitDirection() == Slit::Horizontal ? - "Horizontal" : "Vertical"); - - sprintf(rc_string, "session.screen%d.slit.onTop", screen_number); - config.setValue(rc_string, screen->getSlit()->isOnTop() ? "True" : "False"); - - sprintf(rc_string, "session.screen%d.slit.autoHide", screen_number); - config.setValue(rc_string, screen->getSlit()->doAutoHide() ? - "True" : "False"); - - config.setValue("session.opaqueMove", - (screen->doOpaqueMove()) ? "True" : "False"); - config.setValue("session.imageDither", - (screen->getImageControl()->doDither()) ? "True" : "False"); - - sprintf(rc_string, "session.screen%d.fullMaximization", screen_number); - config.setValue(rc_string, screen->doFullMax() ? "True" : "False"); - - sprintf(rc_string, "session.screen%d.focusNewWindows", screen_number); - config.setValue(rc_string, screen->doFocusNew() ? "True" : "False"); - - sprintf(rc_string, "session.screen%d.focusLastWindow", screen_number); - config.setValue(rc_string, screen->doFocusLast() ? "True" : "False"); - - sprintf(rc_string, "session.screen%d.rowPlacementDirection", screen_number); - config.setValue(rc_string, - screen->getRowPlacementDirection() == BScreen::LeftRight ? - "LeftToRight" : "RightToLeft"); - - sprintf(rc_string, "session.screen%d.colPlacementDirection", screen_number); - config.setValue(rc_string, - screen->getColPlacementDirection() == BScreen::TopBottom ? - "TopToBottom" : "BottomToTop"); - - switch (screen->getPlacementPolicy()) { - case BScreen::CascadePlacement: placement = "CascadePlacement"; break; - case BScreen::ColSmartPlacement: placement = "ColSmartPlacement"; break; - default: - case BScreen::RowSmartPlacement: placement = "RowSmartPlacement"; break; - } - sprintf(rc_string, "session.screen%d.windowPlacement", screen_number); - config.setValue(rc_string, placement); - - sprintf(rc_string, "session.screen%d.focusModel", screen_number); - config.setValue(rc_string, - (screen->isSloppyFocus() ? - (screen->doAutoRaise() ? "AutoRaiseSloppyFocus" : - "SloppyFocus") : "ClickToFocus")); - - sprintf(rc_string, "session.screen%d.workspaces", screen_number); - config.setValue(rc_string, screen->getWorkspaceCount()); - - sprintf(rc_string, "session.screen%d.toolbar.onTop", screen_number); - config.setValue(rc_string, screen->getToolbar()->isOnTop() ? - "True" : "False"); - - sprintf(rc_string, "session.screen%d.toolbar.autoHide", screen_number); - config.setValue(rc_string, screen->getToolbar()->doAutoHide() ? - "True" : "False"); - - switch (screen->getToolbarPlacement()) { - case Toolbar::TopLeft: placement = "TopLeft"; break; - case Toolbar::BottomLeft: placement = "BottomLeft"; break; - case Toolbar::TopCenter: placement = "TopCenter"; break; - case Toolbar::TopRight: placement = "TopRight"; break; - case Toolbar::BottomRight: placement = "BottomRight"; break; - default: - case Toolbar::BottomCenter: placement = "BottomCenter"; break; - } - - sprintf(rc_string, "session.screen%d.toolbar.placement", screen_number); - config.setValue(rc_string, placement); - -#ifdef HAVE_STRFTIME - sprintf(rc_string, "session.screen%d.strftimeFormat", screen_number); - config.setValue(rc_string, screen->getStrftimeFormat()); -#else // !HAVE_STRFTIME - sprintf(rc_string, "session.screen%d.dateFormat", screen_number); - config.setValue(rc_string, screen->getDateFormat() == B_EuropeanDate ? - "European" : "American"); - - sprintf(rc_string, "session.screen%d.clockFormat", screen_number); - config.setValue(rc_string, screen->isClock24Hour() ? 24 : 12); -#endif // HAVE_STRFTIME - - sprintf(rc_string, "session.screen%d.edgeSnapThreshold", screen_number); - config.setValue(rc_string, screen->getEdgeSnapThreshold()); - - sprintf(rc_string, "session.screen%d.toolbar.widthPercent", screen_number); - config.setValue(rc_string, screen->getToolbarWidthPercent()); - - // write out the user's workspace names - int i, len = 0; - for (i = 0; i < screen->getWorkspaceCount(); i++) - len += strlen((screen->getWorkspace(i)->getName()) ? - screen->getWorkspace(i)->getName() : "Null") + 1; - - char *resource_string = new char[len + 1024], - *save_string = new char[len], *save_string_pos = save_string, - *name_string_pos; - if (save_string) { - for (i = 0; i < screen->getWorkspaceCount(); i++) { - len = strlen((screen->getWorkspace(i)->getName()) ? - screen->getWorkspace(i)->getName() : "Null") + 1; - name_string_pos = - (char *) ((screen->getWorkspace(i)->getName()) ? - screen->getWorkspace(i)->getName() : "Null"); - - while (--len) *(save_string_pos++) = *(name_string_pos++); - *(save_string_pos++) = ','; - } - } - - *(--save_string_pos) = '\0'; - - sprintf(resource_string, "session.screen%d.workspaceNames", screen_number); - config.setValue(resource_string, save_string); - - delete [] resource_string; - delete [] save_string; -/* - std::string save_string = screen->getWorkspace(0)->getName(); - for (unsigned int i = 1; i < screen->getWorkspaceCount(); ++i) { - save_string += ','; - save_string += screen->getWorkspace(i)->getName(); - } - - char *resource_string = new char[save_string.length() + 48]; - sprintf(resource_string, "session.screen%d.workspaceNames", screen_number); - config.setValue(rc_string, save_string); - - delete [] resource_string;*/ - } + std::for_each(screenList.begin(), screenList.end(), + std::mem_fun(&BScreen::save)); config.setAutoSave(true); config.save(); } -void Openbox::load_rc(void) { +void Openbox::load() { if (!config.load()) - return; + config.create(); std::string s; long l; - if (resource.menu_file) - delete [] resource.menu_file; - if (config.getValue("session.menuFile", "Session.MenuFile", s)) - resource.menu_file = bstrdup(s.c_str()); - else - resource.menu_file = bstrdup(DEFAULTMENU); - if (config.getValue("session.colorsPerChannel", "Session.ColorsPerChannel", l)) resource.colors_per_channel = (l < 2 ? 2 : (l > 6 ? 6 : l)); // >= 2, <= 6 @@ -1206,389 +965,92 @@ void Openbox::load_rc(void) { } -void Openbox::load_rc(BScreen *screen) { - assert (screen != NULL); - const int screen_number = screen->getScreenNumber(); - assert (screen_number >= 0); - - if (!config.load()) - return; - - std::string s; - long l; - bool b; - char name_lookup[1024], class_lookup[1024]; - - sprintf(name_lookup, "session.screen%d.fullMaximization", screen_number); - sprintf(class_lookup, "Session.Screen%d.FullMaximization", screen_number); - if (config.getValue(name_lookup, class_lookup, b)) - screen->saveFullMax((Bool)b); - else - screen->saveFullMax(False); - - sprintf(name_lookup, "session.screen%d.focusNewWindows", screen_number); - sprintf(class_lookup, "Session.Screen%d.FocusNewWindows", screen_number); - if (config.getValue(name_lookup, class_lookup, b)) - screen->saveFocusNew((Bool)b); - else - screen->saveFocusNew(False); - - sprintf(name_lookup, "session.screen%d.focusLastWindow", screen_number); - sprintf(class_lookup, "Session.Screen%d.focusLastWindow", screen_number); - if (config.getValue(name_lookup, class_lookup, b)) - screen->saveFocusLast((Bool)b); - else - screen->saveFocusLast(False); - - sprintf(name_lookup, "session.screen%d.rowPlacementDirection", - screen_number); - sprintf(class_lookup, "Session.Screen%d.RowPlacementDirection", - screen_number); - if (config.getValue(name_lookup, class_lookup, s)) { - if (0 == strncasecmp(s.c_str(), "righttoleft", s.length())) - screen->saveRowPlacementDirection(BScreen::RightLeft); - else - screen->saveRowPlacementDirection(BScreen::LeftRight); - } else - screen->saveRowPlacementDirection(BScreen::LeftRight); - - sprintf(name_lookup, "session.screen%d.colPlacementDirection", - screen_number); - sprintf(class_lookup, "Session.Screen%d.ColPlacementDirection", - screen_number); - if (config.getValue(name_lookup, class_lookup, s)) { - if (0 == strncasecmp(s.c_str(), "bottomtotop", s.length())) - screen->saveColPlacementDirection(BScreen::BottomTop); - else - screen->saveColPlacementDirection(BScreen::TopBottom); - } else - screen->saveColPlacementDirection(BScreen::TopBottom); - - sprintf(name_lookup, "session.screen%d.workspaces", screen_number); - sprintf(class_lookup, "Session.Screen%d.Workspaces", screen_number); - if (config.getValue(name_lookup, class_lookup, l)) - screen->saveWorkspaces(l); - else - screen->saveWorkspaces(1); - - sprintf(name_lookup, "session.screen%d.toolbar.widthPercent", - screen_number); - sprintf(class_lookup, "Session.Screen%d.Toolbar.WidthPercent", - screen_number); - if (config.getValue(name_lookup, class_lookup, l) && (l > 0 && l <= 100)) - screen->saveToolbarWidthPercent(l); - else - screen->saveToolbarWidthPercent(66); - - sprintf(name_lookup, "session.screen%d.toolbar.placement", screen_number); - sprintf(class_lookup, "Session.Screen%d.Toolbar.Placement", screen_number); - if (config.getValue(name_lookup, class_lookup, s)) { - if (0 == strncasecmp(s.c_str(), "TopLeft", s.length())) - screen->saveToolbarPlacement(Toolbar::TopLeft); - else if (0 == strncasecmp(s.c_str(), "BottomLeft", s.length())) - screen->saveToolbarPlacement(Toolbar::BottomLeft); - else if (0 == strncasecmp(s.c_str(), "TopCenter", s.length())) - screen->saveToolbarPlacement(Toolbar::TopCenter); - else if (0 == strncasecmp(s.c_str(), "TopRight", s.length())) - screen->saveToolbarPlacement(Toolbar::TopRight); - else if ( 0 == strncasecmp(s.c_str(), "BottomRight", s.length())) - screen->saveToolbarPlacement(Toolbar::BottomRight); - else - screen->saveToolbarPlacement(Toolbar::BottomCenter); - } else - screen->saveToolbarPlacement(Toolbar::BottomCenter); - - screen->removeWorkspaceNames(); - sprintf(name_lookup, "session.screen%d.workspaceNames", screen_number); - sprintf(class_lookup, "Session.Screen%d.WorkspaceNames", screen_number); - if (config.getValue(name_lookup, class_lookup, s)) { - // for (int i = 0; i < screen->getNumberOfWorkspaces(); i++) { - std::string::const_iterator it = s.begin(), end = s.end(); - while(1) { - std::string::const_iterator tmp = it;// current string.begin() - it = std::find(tmp, end, ','); // look for comma between tmp and end - std::string name(tmp, it); // name = s[tmp:it] - screen->addWorkspaceName(name.c_str()); - if (it == end) - break; - ++it; - } - } - - sprintf(name_lookup, "session.screen%d.toolbar.onTop", screen_number); - sprintf(class_lookup, "Session.Screen%d.Toolbar.OnTop", screen_number); - if (config.getValue(name_lookup, class_lookup, b)) - screen->saveToolbarOnTop((Bool)b); - else - screen->saveToolbarOnTop(False); - - sprintf(name_lookup, "session.screen%d.toolbar.autoHide", screen_number); - sprintf(class_lookup, "Session.Screen%d.Toolbar.autoHide", screen_number); - if (config.getValue(name_lookup, class_lookup, b)) - screen->saveToolbarAutoHide((Bool)b); - else - screen->saveToolbarAutoHide(False); - - sprintf(name_lookup, "session.screen%d.focusModel", screen_number); - sprintf(class_lookup, "Session.Screen%d.FocusModel", screen_number); - if (config.getValue(name_lookup, class_lookup, s)) { - cout << s << endl; - if (0 == strncasecmp(s.c_str(), "clicktofocus", s.length())) { - screen->saveAutoRaise(False); - screen->saveSloppyFocus(False); - } else if (0 == strncasecmp(s.c_str(), "autoraisesloppyfocus", - s.length())) { - screen->saveSloppyFocus(True); - screen->saveAutoRaise(True); - } else { - screen->saveSloppyFocus(True); - screen->saveAutoRaise(False); - } - } else { - screen->saveSloppyFocus(True); - screen->saveAutoRaise(False); - } - - sprintf(name_lookup, "session.screen%d.windowZones", screen_number); - sprintf(class_lookup, "Session.Screen%d.WindowZones", screen_number); - if (config.getValue(name_lookup, class_lookup, l)) - screen->saveWindowZones((l == 1 || l == 2 || l == 4) ? l : 1); - else - screen->saveWindowZones(1); - - sprintf(name_lookup, "session.screen%d.windowPlacement", screen_number); - sprintf(class_lookup, "Session.Screen%d.WindowPlacement", screen_number); - if (config.getValue(name_lookup, class_lookup, s)) { - if (0 == strncasecmp(s.c_str(), "RowSmartPlacement", s.length())) - screen->savePlacementPolicy(BScreen::RowSmartPlacement); - else if (0 == strncasecmp(s.c_str(), "ColSmartPlacement", s.length())) - screen->savePlacementPolicy(BScreen::ColSmartPlacement); - else - screen->savePlacementPolicy(BScreen::CascadePlacement); - } else - screen->savePlacementPolicy(BScreen::RowSmartPlacement); - -#ifdef SLIT - sprintf(name_lookup, "session.screen%d.slit.placement", screen_number); - sprintf(class_lookup, "Session.Screen%d.Slit.Placement", screen_number); - if (config.getValue(name_lookup, class_lookup, s)) { - if (0 == strncasecmp(s.c_str(), "TopLeft", s.length())) - screen->saveSlitPlacement(Slit::TopLeft); - else if (0 == strncasecmp(s.c_str(), "CenterLeft", s.length())) - screen->saveSlitPlacement(Slit::CenterLeft); - else if (0 == strncasecmp(s.c_str(), "BottomLeft", s.length())) - screen->saveSlitPlacement(Slit::BottomLeft); - else if (0 == strncasecmp(s.c_str(), "TopCenter", s.length())) - screen->saveSlitPlacement(Slit::TopCenter); - else if (0 == strncasecmp(s.c_str(), "BottomCenter", s.length())) - screen->saveSlitPlacement(Slit::BottomCenter); - else if (0 == strncasecmp(s.c_str(), "TopRight", s.length())) - screen->saveSlitPlacement(Slit::TopRight); - else if (0 == strncasecmp(s.c_str(), "BottomRight", s.length())) - screen->saveSlitPlacement(Slit::BottomRight); - else - screen->saveSlitPlacement(Slit::CenterRight); - } else - screen->saveSlitPlacement(Slit::CenterRight); - - sprintf(name_lookup, "session.screen%d.slit.direction", screen_number); - sprintf(class_lookup, "Session.Screen%d.Slit.Direction", screen_number); - if (config.getValue(name_lookup, class_lookup, s)) { - if (0 == strncasecmp(s.c_str(), "Horizontal", s.length())) - screen->saveSlitDirection(Slit::Horizontal); - else - screen->saveSlitDirection(Slit::Vertical); - } else - screen->saveSlitDirection(Slit::Vertical); - - sprintf(name_lookup, "session.screen%d.slit.onTop", screen_number); - sprintf(class_lookup, "Session.Screen%d.Slit.OnTop", screen_number); - if (config.getValue(name_lookup, class_lookup, b)) - screen->saveSlitOnTop((Bool)b); - else - screen->saveSlitOnTop(False); - - sprintf(name_lookup, "session.screen%d.slit.autoHide", screen_number); - sprintf(class_lookup, "Session.Screen%d.Slit.AutoHide", screen_number); - if (config.getValue(name_lookup, class_lookup, b)) - screen->saveSlitAutoHide((Bool)b); - else - screen->saveSlitAutoHide(False); -#endif // SLIT - -#ifdef HAVE_STRFTIME - sprintf(name_lookup, "session.screen%d.strftimeFormat", screen_number); - sprintf(class_lookup, "Session.Screen%d.StrftimeFormat", screen_number); - if (config.getValue(name_lookup, class_lookup, s)) - screen->saveStrftimeFormat(s.c_str()); - else - screen->saveStrftimeFormat("%I:%M %p"); - -#else // HAVE_STRFTIME - sprintf(name_lookup, "session.screen%d.dateFormat", screen_number); - sprintf(class_lookup, "Session.Screen%d.DateFormat", screen_number); - if (config.getValue(name_lookup, class_lookup, s)) { - if (strncasecmp(s.c_str(), "european", s.length())) - screen->saveDateFormat(B_AmericanDate); - else - screen->saveDateFormat(B_EuropeanDate); - } else - screen->saveDateFormat(B_AmericanDate); - - sprintf(name_lookup, "session.screen%d.clockFormat", screen_number); - sprintf(class_lookup, "Session.Screen%d.ClockFormat", screen_number); - if (config.getValue(name_lookup, class_lookup, l)) { - if (clock == 24) - screen->saveClock24Hour(True); - else - screen->saveClock24Hour(False); - } else - screen->saveClock24Hour(False); -#endif // HAVE_STRFTIME - - sprintf(name_lookup, "session.screen%d.edgeSnapThreshold", screen_number); - sprintf(class_lookup, "Session.Screen%d.EdgeSnapThreshold", screen_number); - if (config.getValue(name_lookup, class_lookup, l)) - screen->saveEdgeSnapThreshold(l); - else - screen->saveEdgeSnapThreshold(4); - - sprintf(name_lookup, "session.screen%d.imageDither", screen_number); - sprintf(class_lookup, "Session.Screen%d.ImageDither", screen_number); - if (config.getValue("session.imageDither", "Session.ImageDither", b)) - screen->saveImageDither((Bool)b); - else - screen->saveImageDither(True); - - sprintf(name_lookup, "session.screen%d.rootCommand", screen_number); - sprintf(class_lookup, "Session.Screen%d.RootCommand", screen_number); - if (config.getValue(name_lookup, class_lookup, s)) - screen->saveRootCommand(s.c_str()); - else - screen->saveRootCommand(NULL); - - if (config.getValue("session.opaqueMove", "Session.OpaqueMove", b)) - screen->saveOpaqueMove((Bool)b); - else - screen->saveOpaqueMove(False); -} - - -void Openbox::reload_rc(void) { - load_rc(); - reconfigure(); -} - - -void Openbox::reconfigure(void) { +void Openbox::reconfigure() { reconfigure_wait = True; if (! timer->isTiming()) timer->start(); } -void Openbox::real_reconfigure(void) { +void Openbox::real_reconfigure() { grab(); - config.load(); - config.setValue("session.styleFile", resource.style_file); // autosave's + load(); - for (int i = 0, n = menuTimestamps->count(); i < n; i++) { - MenuTimestamp *ts = menuTimestamps->remove(0); + for_each(menuTimestamps.begin(), menuTimestamps.end(), + PointerAssassin()); + menuTimestamps.clear(); - if (ts) { - if (ts->filename) - delete [] ts->filename; - - delete ts; - } - } - - LinkedListIterator it(screenList); - for (BScreen *screen = it.current(); screen; it++, screen = it.current()) { - screen->reconfigure(); - } + std::for_each(screenList.begin(), screenList.end(), + std::mem_fun(&BScreen::reconfigure)); ungrab(); } -void Openbox::checkMenu(void) { - Bool reread = False; - LinkedListIterator it(menuTimestamps); - for (MenuTimestamp *tmp = it.current(); tmp && (! reread); - it++, tmp = it.current()) { +void Openbox::checkMenu() { + MenuTimestampList::iterator it; + for (it = menuTimestamps.begin(); it != menuTimestamps.end(); ++it) { struct stat buf; - if (! stat(tmp->filename, &buf)) { - if (tmp->timestamp != buf.st_ctime) - reread = True; - } else { - reread = True; + if (stat((*it)->filename, &buf) || (*it)->timestamp != buf.st_ctime) { + rereadMenu(); + return; } } - - if (reread) rereadMenu(); } -void Openbox::rereadMenu(void) { - reread_menu_wait = True; - - if (! timer->isTiming()) timer->start(); -} +void Openbox::addMenuTimestamp(const char *filename) { + bool found = false; + MenuTimestampList::iterator it; + for (it = menuTimestamps.begin(); it != menuTimestamps.end(); ++it) + if (! strcmp((*it)->filename, filename)) { + found = true; + break; + } + if (!found) { + struct stat buf; -void Openbox::real_rereadMenu(void) { - for (int i = 0, n = menuTimestamps->count(); i < n; i++) { - MenuTimestamp *ts = menuTimestamps->remove(0); + if (! stat(filename, &buf)) { + MenuTimestamp *ts = new MenuTimestamp; - if (ts) { - if (ts->filename) - delete [] ts->filename; + ts->filename = bstrdup(filename); + ts->timestamp = buf.st_ctime; - delete ts; + menuTimestamps.push_back(ts); } } - - LinkedListIterator it(screenList); - for (BScreen *screen = it.current(); screen; it++, screen = it.current()) - screen->rereadMenu(); } +void Openbox::rereadMenu() { + reread_menu_wait = True; -void Openbox::saveStyleFilename(const char *filename) { - if (resource.style_file) - delete [] resource.style_file; - - resource.style_file = bstrdup(filename); + if (! timer->isTiming()) timer->start(); } -void Openbox::saveMenuFilename(const char *filename) { - Bool found = False; +void Openbox::real_rereadMenu() { + std::for_each(menuTimestamps.begin(), menuTimestamps.end(), + PointerAssassin()); + menuTimestamps.clear(); - LinkedListIterator it(menuTimestamps); - for (MenuTimestamp *tmp = it.current(); tmp && (! found); - it++, tmp = it.current()) { - if (! strcmp(tmp->filename, filename)) found = True; - } - if (! found) { - struct stat buf; + std::for_each(screenList.begin(), screenList.end(), + std::mem_fun(&BScreen::rereadMenu)); +} - if (! stat(filename, &buf)) { - MenuTimestamp *ts = new MenuTimestamp; - ts->filename = bstrdup(filename); - ts->timestamp = buf.st_ctime; +void Openbox::setStyleFilename(const char *filename) { + if (resource.style_file) + delete [] resource.style_file; - menuTimestamps->insert(ts); - } - } + resource.style_file = bstrdup(filename); + config.setValue("session.styleFile", resource.style_file); } -void Openbox::timeout(void) { +void Openbox::timeout() { if (reconfigure_wait) real_reconfigure(); @@ -1599,42 +1061,46 @@ void Openbox::timeout(void) { } -void Openbox::setFocusedWindow(OpenboxWindow *win) { - BScreen *old_screen = (BScreen *) 0, *screen = (BScreen *) 0; - OpenboxWindow *old_win = (OpenboxWindow *) 0; +OpenboxWindow *Openbox::focusedWindow() { + Workspace *w; + if (current_screen) + if ((w = current_screen->getCurrentWorkspace())) + return w->focusedWindow(); + return (OpenboxWindow *) 0; +} + + +void Openbox::focusWindow(OpenboxWindow *win) { + BScreen *old_screen = (BScreen *) 0; Toolbar *old_tbar = (Toolbar *) 0, *tbar = (Toolbar *) 0; Workspace *old_wkspc = (Workspace *) 0, *wkspc = (Workspace *) 0; - if (focused_window) { - old_win = focused_window; + OpenboxWindow *old_win = focusedWindow(); + if (old_win != (OpenboxWindow *) 0) { old_screen = old_win->getScreen(); - old_tbar = old_screen->getToolbar(); old_wkspc = old_screen->getWorkspace(old_win->getWorkspaceNumber()); + old_tbar = old_screen->getToolbar(); - old_win->setFocusFlag(False); - old_wkspc->getMenu()->setItemSelected(old_win->getWindowNumber(), False); + old_win->setFocusFlag(false); + old_wkspc->focusWindow((OpenboxWindow *) 0); } - if (win && ! win->isIconic()) { - screen = win->getScreen(); - tbar = screen->getToolbar(); - wkspc = screen->getWorkspace(win->getWorkspaceNumber()); - - focused_window = win; - - win->setFocusFlag(True); - wkspc->getMenu()->setItemSelected(win->getWindowNumber(), True); + if (win && !win->isIconic()) { + current_screen = win->getScreen(); + tbar = current_screen->getToolbar(); + wkspc = current_screen->getWorkspace(win->getWorkspaceNumber()); + win->setFocusFlag(true); + wkspc->focusWindow(win); + + if (tbar) + tbar->redrawWindowLabel(true); + current_screen->updateNetizenWindowFocus(); } else { - focused_window = (OpenboxWindow *) 0; + XSetInputFocus(getXDisplay(), PointerRoot, None, CurrentTime); } - if (tbar) - tbar->redrawWindowLabel(True); - if (screen) - screen->updateNetizenWindowFocus(); - if (old_tbar && old_tbar != tbar) - old_tbar->redrawWindowLabel(True); - if (old_screen && old_screen != screen) + old_tbar->redrawWindowLabel(true); + if (old_screen && old_screen != current_screen) old_screen->updateNetizenWindowFocus(); }