X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=641235213bc865dedba9fb8665fab05de966444b;hb=29fff5f56f4dce2296af459a69080e4d8147d069;hp=2f41fcbb89a346cd75327f5da20e224354799e1d;hpb=8d3c97389f23271c7b44a726111c97d34bc2ced2;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index 2f41fcbb..64123521 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 @@ -197,7 +201,6 @@ Openbox::Openbox(int m_argc, char **m_argv, char *dpy_name, char *rc) menuTimestamps = new LinkedList; - XrmInitialize(); load_rc(); #ifdef HAVE_GETPID @@ -206,7 +209,7 @@ Openbox::Openbox(int m_argc, char **m_argv, char *dpy_name, char *rc) screenList = new LinkedList; for (int i = 0; i < getNumberOfScreens(); i++) { - BScreen *screen = new BScreen(this, i); + BScreen *screen = new BScreen(*this, i); if (! screen->isScreenManaged()) { delete screen; @@ -228,7 +231,7 @@ Openbox::Openbox(int m_argc, char **m_argv, char *dpy_name, char *rc) reconfigure_wait = reread_menu_wait = False; - timer = new BTimer(this, this); + timer = new BTimer(*this, *this); timer->setTimeout(0); timer->fireOnce(True); @@ -337,14 +340,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(); @@ -363,13 +366,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(); @@ -380,15 +383,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); } } } @@ -467,7 +471,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); @@ -1043,6 +1047,7 @@ void Openbox::save_rc(void) { switch (screen->getPlacementPolicy()) { case BScreen::CascadePlacement: placement = "CascadePlacement"; break; + case BScreen::BestFitPlacement: placement = "BestFitPlacement"; break; case BScreen::ColSmartPlacement: placement = "ColSmartPlacement"; break; default: case BScreen::RowSmartPlacement: placement = "RowSmartPlacement"; break; @@ -1067,6 +1072,11 @@ void Openbox::save_rc(void) { config.setValue(rc_string, screen->getToolbar()->doAutoHide() ? "True" : "False"); + sprintf(rc_string, "session.screen%d.toolbar.hide", screen_number); + config.setValue(rc_string, screen->doToolbarHide() ? + "True" : "False"); + + switch (screen->getToolbarPlacement()) { case Toolbar::TopLeft: placement = "TopLeft"; break; case Toolbar::BottomLeft: placement = "BottomLeft"; break; @@ -1208,9 +1218,9 @@ void Openbox::load_rc(void) { void Openbox::load_rc(BScreen *screen) { - assert (screen != NULL); + ASSERT (screen != NULL); const int screen_number = screen->getScreenNumber(); - assert (screen_number >= 0); + ASSERT (screen_number >= 0); if (!config.load()) return; @@ -1323,6 +1333,13 @@ void Openbox::load_rc(BScreen *screen) { else screen->saveToolbarOnTop(False); + sprintf(name_lookup, "session.screen%d.toolbar.hide", screen_number); + sprintf(class_lookup, "Session.Screen%d.Toolbar.Hide", screen_number); + if (config.getValue(name_lookup, class_lookup, b)) + screen->saveToolbarHide((Bool)b); + else + screen->saveToolbarHide(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)) @@ -1333,7 +1350,6 @@ void Openbox::load_rc(BScreen *screen) { 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); @@ -1364,6 +1380,8 @@ void Openbox::load_rc(BScreen *screen) { screen->savePlacementPolicy(BScreen::RowSmartPlacement); else if (0 == strncasecmp(s.c_str(), "ColSmartPlacement", s.length())) screen->savePlacementPolicy(BScreen::ColSmartPlacement); + else if (0 == strncasecmp(s.c_str(), "BestFitPlacement", s.length())) + screen->savePlacementPolicy(BScreen::BestFitPlacement); else screen->savePlacementPolicy(BScreen::CascadePlacement); } else @@ -1491,18 +1509,9 @@ void Openbox::reconfigure(void) { void Openbox::real_reconfigure(void) { grab(); - XrmDatabase new_openboxrc = (XrmDatabase) 0; - char style[MAXPATHLEN + 64]; - - sprintf(style, "session.styleFile: %s", resource.style_file); - XrmPutLineResource(&new_openboxrc, style); - - XrmDatabase old_openboxrc = XrmGetFileDatabase(rc_file); - - XrmMergeDatabases(new_openboxrc, &old_openboxrc); - XrmPutFileDatabase(old_openboxrc, rc_file); - if (old_openboxrc) XrmDestroyDatabase(old_openboxrc); - + config.load(); + config.setValue("session.styleFile", resource.style_file); // autosave's + for (int i = 0, n = menuTimestamps->count(); i < n; i++) { MenuTimestamp *ts = menuTimestamps->remove(0);