#include "Workspace.h"
#include "Workspacemenu.h"
+#include <string>
+#include <algorithm>
+
#ifdef HAVE_STDIO_H
# include <stdio.h>
#endif // HAVE_STDIO_H
} else {
rc_file = bstrdup(rc);
}
+ symlink_rc(rc_file);
+ config.setFile(rc_file);
no_focus = False;
menuTimestamps = new LinkedList<MenuTimestamp>;
- XrmInitialize();
load_rc();
#ifdef HAVE_GETPID
}
} else if (e->xbutton.button == 4) {
if ((screen->getCurrentWorkspaceID()-1)<0)
- screen->changeWorkspaceID(screen->getCount()-1);
+ screen->changeWorkspaceID(screen->getWorkspaceCount()-1);
else
screen->changeWorkspaceID(screen->getCurrentWorkspaceID()-1);
} else if (e->xbutton.button == 5) {
- if ((screen->getCurrentWorkspaceID()+1)>screen->getCount()-1)
+ if ((screen->getCurrentWorkspaceID()+1)>screen->getWorkspaceCount()-1)
screen->changeWorkspaceID(0);
else
screen->changeWorkspaceID(screen->getCurrentWorkspaceID()+1);
BScreen *screen = searchScreen(e->xclient.window);
if (screen && e->xclient.data.l[0] >= 0 &&
- e->xclient.data.l[0] < screen->getCount())
+ e->xclient.data.l[0] < screen->getWorkspaceCount())
screen->changeWorkspaceID(e->xclient.data.l[0]);
} else if (e->xclient.message_type == getOpenboxChangeWindowFocusAtom()) {
OpenboxWindow *win = searchWindow(e->xclient.window);
void Openbox::save_rc(void) {
- XrmDatabase new_openboxrc = (XrmDatabase) 0;
- char rc_string[1024];
-
- load_rc();
-
- sprintf(rc_string, "session.menuFile: %s", resource.menu_file);
- XrmPutLineResource(&new_openboxrc, rc_string);
-
- sprintf(rc_string, "session.colorsPerChannel: %d",
- resource.colors_per_channel);
- XrmPutLineResource(&new_openboxrc, rc_string);
-
- sprintf(rc_string, "session.titlebarLayout: %s",
- resource.titlebar_layout);
- XrmPutLineResource(&new_openboxrc, rc_string);
-
- sprintf(rc_string, "session.doubleClickInterval: %lu",
- resource.double_click_interval);
- XrmPutLineResource(&new_openboxrc, rc_string);
-
- sprintf(rc_string, "session.autoRaiseDelay: %lu",
+ config.setAutoSave(false);
+
+ config.setValue("session.menuFile", getMenuFilename());
+ config.setValue("session.colorsPerChannel",
+ resource.colors_per_channel);
+ config.setValue("session.doubleClickInterval",
+ (long)resource.double_click_interval);
+ config.setValue("session.autoRaiseDelay",
((resource.auto_raise_delay.tv_sec * 1000) +
(resource.auto_raise_delay.tv_usec / 1000)));
- XrmPutLineResource(&new_openboxrc, rc_string);
-
- sprintf(rc_string, "session.cacheLife: %lu", resource.cache_life / 60000);
- XrmPutLineResource(&new_openboxrc, rc_string);
-
- sprintf(rc_string, "session.cacheMax: %lu", resource.cache_max);
- XrmPutLineResource(&new_openboxrc, rc_string);
+ config.setValue("session.cacheLife", (long)resource.cache_life / 60000);
+ config.setValue("session.cacheMax", (long)resource.cache_max);
LinkedListIterator<BScreen> it(screenList);
for (BScreen *screen = it.current(); screen; it++, screen = it.current()) {
- int screen_number = screen->getScreenNumber();
+// ScreenList::iterator it = screenList.begin();
+// for (; it != screenList.end(); ++it) {
+// BScreen *screen = *it;
+ char rc_string[1024];
+ const int screen_number = screen->getScreenNumber();
-#ifdef SLIT
- char *slit_placement = (char *) 0;
+ char *placement = (char *) 0;
switch (screen->getSlitPlacement()) {
- case Slit::TopLeft: slit_placement = "TopLeft"; break;
- case Slit::CenterLeft: slit_placement = "CenterLeft"; break;
- case Slit::BottomLeft: slit_placement = "BottomLeft"; break;
- case Slit::TopCenter: slit_placement = "TopCenter"; break;
- case Slit::BottomCenter: slit_placement = "BottomCenter"; break;
- case Slit::TopRight: slit_placement = "TopRight"; break;
- case Slit::BottomRight: slit_placement = "BottomRight"; break;
- case Slit::CenterRight: default: slit_placement = "CenterRight"; break;
- }
-
- sprintf(rc_string, "session.screen%d.slit.placement: %s", screen_number,
- slit_placement);
- XrmPutLineResource(&new_openboxrc, rc_string);
-
- sprintf(rc_string, "session.screen%d.slit.direction: %s", screen_number,
- ((screen->getSlitDirection() == Slit::Horizontal) ? "Horizontal" :
- "Vertical"));
- XrmPutLineResource(&new_openboxrc, rc_string);
-
- const char *rootcmd;
- if ((rootcmd = screen->getRootCommand()) != NULL) {
- sprintf(rc_string, "session.screen%d.rootCommand: %s", screen_number,
- rootcmd);
- XrmPutLineResource(&new_openboxrc, rc_string);
+ 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.onTop: %s", screen_number,
- ((screen->getSlit()->isOnTop()) ? "True" : "False"));
- XrmPutLineResource(&new_openboxrc, rc_string);
+ 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.autoHide: %s", screen_number,
- ((screen->getSlit()->doAutoHide()) ? "True" : "False"));
- XrmPutLineResource(&new_openboxrc, rc_string);
-#endif // SLIT
+ sprintf(rc_string, "session.screen%d.slit.onTop", screen_number);
+ config.setValue(rc_string, screen->getSlit()->isOnTop() ? "True" : "False");
- sprintf(rc_string, "session.opaqueMove: %s",
- ((screen->doOpaqueMove()) ? "True" : "False"));
- XrmPutLineResource(&new_openboxrc, rc_string);
+ sprintf(rc_string, "session.screen%d.slit.autoHide", screen_number);
+ config.setValue(rc_string, screen->getSlit()->doAutoHide() ?
+ "True" : "False");
- sprintf(rc_string, "session.imageDither: %s",
- ((screen->getImageControl()->doDither()) ? "True" : "False"));
- XrmPutLineResource(&new_openboxrc, rc_string);
+ config.setValue("session.opaqueMove",
+ (screen->doOpaqueMove()) ? "True" : "False");
+ config.setValue("session.imageDither",
+ (screen->getImageControl()->doDither()) ? "True" : "False");
- sprintf(rc_string, "session.screen%d.fullMaximization: %s", screen_number,
- ((screen->doFullMax()) ? "True" : "False"));
- XrmPutLineResource(&new_openboxrc, rc_string);
+ sprintf(rc_string, "session.screen%d.fullMaximization", screen_number);
+ config.setValue(rc_string, screen->doFullMax() ? "True" : "False");
- sprintf(rc_string, "session.screen%d.focusNewWindows: %s", screen_number,
- ((screen->doFocusNew()) ? "True" : "False"));
- XrmPutLineResource(&new_openboxrc, rc_string);
+ sprintf(rc_string, "session.screen%d.focusNewWindows", screen_number);
+ config.setValue(rc_string, screen->doFocusNew() ? "True" : "False");
- sprintf(rc_string, "session.screen%d.focusLastWindow: %s", screen_number,
- ((screen->doFocusLast()) ? "True" : "False"));
- XrmPutLineResource(&new_openboxrc, rc_string);
+ sprintf(rc_string, "session.screen%d.focusLastWindow", screen_number);
+ config.setValue(rc_string, screen->doFocusLast() ? "True" : "False");
- sprintf(rc_string, "session.screen%d.rowPlacementDirection: %s",
- screen_number,
- ((screen->getRowPlacementDirection() == BScreen::LeftRight) ?
- "LeftToRight" : "RightToLeft"));
- XrmPutLineResource(&new_openboxrc, rc_string);
+ 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: %s",
- screen_number,
- ((screen->getColPlacementDirection() == BScreen::TopBottom) ?
- "TopToBottom" : "BottomToTop"));
- XrmPutLineResource(&new_openboxrc, rc_string);
+ sprintf(rc_string, "session.screen%d.colPlacementDirection", screen_number);
+ config.setValue(rc_string,
+ screen->getColPlacementDirection() == BScreen::TopBottom ?
+ "TopToBottom" : "BottomToTop");
- char *placement = (char *) 0;
switch (screen->getPlacementPolicy()) {
- case BScreen::CascadePlacement:
- placement = "CascadePlacement";
- break;
-
- case BScreen::ColSmartPlacement:
- placement = "ColSmartPlacement";
- break;
-
- case BScreen::RowSmartPlacement:
+ case BScreen::CascadePlacement: placement = "CascadePlacement"; break;
+ case BScreen::BestFitPlacement: placement = "BestFitPlacement"; break;
+ case BScreen::ColSmartPlacement: placement = "ColSmartPlacement"; break;
default:
- placement = "RowSmartPlacement";
- break;
+ case BScreen::RowSmartPlacement: placement = "RowSmartPlacement"; break;
}
- sprintf(rc_string, "session.screen%d.windowPlacement: %s", screen_number,
- placement);
- XrmPutLineResource(&new_openboxrc, rc_string);
-
- sprintf(rc_string, "session.screen%d.windowZones: %i", screen_number,
- screen->getWindowZones());
- XrmPutLineResource(&new_openboxrc, rc_string);
-
- sprintf(rc_string, "session.screen%d.focusModel: %s", screen_number,
- ((screen->isSloppyFocus()) ?
- ((screen->doAutoRaise()) ? "AutoRaiseSloppyFocus" :
- "SloppyFocus") :
- "ClickToFocus"));
- XrmPutLineResource(&new_openboxrc, rc_string);
+ sprintf(rc_string, "session.screen%d.windowPlacement", screen_number);
+ config.setValue(rc_string, placement);
- sprintf(rc_string, "session.screen%d.workspaces: %d", screen_number,
- screen->getCount());
- XrmPutLineResource(&new_openboxrc, rc_string);
+ 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.toolbar.onTop: %s", screen_number,
- ((screen->getToolbar()->isOnTop()) ? "True" : "False"));
- XrmPutLineResource(&new_openboxrc, rc_string);
+ sprintf(rc_string, "session.screen%d.workspaces", screen_number);
+ config.setValue(rc_string, screen->getWorkspaceCount());
- sprintf(rc_string, "session.screen%d.toolbar.autoHide: %s", screen_number,
- ((screen->getToolbar()->doAutoHide()) ? "True" : "False"));
- XrmPutLineResource(&new_openboxrc, rc_string);
+ sprintf(rc_string, "session.screen%d.toolbar.onTop", screen_number);
+ config.setValue(rc_string, screen->getToolbar()->isOnTop() ?
+ "True" : "False");
- char *toolbar_placement = (char *) 0;
+ 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: toolbar_placement = "TopLeft"; break;
- case Toolbar::BottomLeft: toolbar_placement = "BottomLeft"; break;
- case Toolbar::TopCenter: toolbar_placement = "TopCenter"; break;
- case Toolbar::TopRight: toolbar_placement = "TopRight"; break;
- case Toolbar::BottomRight: toolbar_placement = "BottomRight"; break;
- case Toolbar::BottomCenter: default:
- toolbar_placement = "BottomCenter"; break;
+ 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: %s", screen_number,
- toolbar_placement);
- XrmPutLineResource(&new_openboxrc, rc_string);
-
- load_rc(screen);
-
- // these are static, but may not be saved in the users .openbox/rc,
- // writing these resources will allow the user to edit them at a later
- // time... but loading the defaults before saving allows us to rewrite the
- // users changes...
+ 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: %s", screen_number,
- screen->getStrftimeFormat());
- XrmPutLineResource(&new_openboxrc, rc_string);
+ 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: %s", screen_number,
- ((screen->getDateFormat() == B_EuropeanDate) ?
- "European" : "American"));
- XrmPutLineResource(&new_openboxrc, rc_string);
-
- sprintf(rc_string, "session.screen%d.clockFormat: %d", screen_number,
- ((screen->isClock24Hour()) ? 24 : 12));
- XrmPutLineResource(&new_openboxrc, rc_string);
+ 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: %d", screen_number,
- screen->getEdgeSnapThreshold());
- XrmPutLineResource(&new_openboxrc, rc_string);
+ sprintf(rc_string, "session.screen%d.edgeSnapThreshold", screen_number);
+ config.setValue(rc_string, screen->getEdgeSnapThreshold());
- sprintf(rc_string, "session.screen%d.toolbar.widthPercent: %d",
- screen_number, screen->getToolbarWidthPercent());
- XrmPutLineResource(&new_openboxrc, rc_string);
+ sprintf(rc_string, "session.screen%d.toolbar.widthPercent", screen_number);
+ config.setValue(rc_string, screen->getToolbarWidthPercent());
- // write out the users workspace names
+ // write out the user's workspace names
int i, len = 0;
- for (i = 0; i < screen->getCount(); i++)
+ for (i = 0; i < screen->getWorkspaceCount(); i++)
len += strlen((screen->getWorkspace(i)->getName()) ?
- screen->getWorkspace(i)->getName() : "Null") + 1;
+ 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->getCount(); 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++) = ',';
+ 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: %s",
- screen_number, save_string);
- XrmPutLineResource(&new_openboxrc, resource_string);
+ 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();
+ }
- XrmDatabase old_openboxrc = XrmGetFileDatabase(rc_file);
+ char *resource_string = new char[save_string.length() + 48];
+ sprintf(resource_string, "session.screen%d.workspaceNames", screen_number);
+ config.setValue(rc_string, save_string);
- XrmMergeDatabases(new_openboxrc, &old_openboxrc);
- XrmPutFileDatabase(old_openboxrc, rc_file);
- XrmDestroyDatabase(old_openboxrc);
-}
+ delete [] resource_string;*/
+ }
+ config.setAutoSave(true);
+ config.save();
+}
void Openbox::load_rc(void) {
- XrmDatabase database = (XrmDatabase) 0;
-
- database = XrmGetFileDatabase(rc_file);
-
- XrmValue value;
- char *value_type;
+ if (!config.load())
+ return;
+ std::string s;
+ long l;
+
if (resource.menu_file)
delete [] resource.menu_file;
-
- if (XrmGetResource(database, "session.menuFile", "Session.MenuFile",
- &value_type, &value))
- resource.menu_file = bstrdup(value.addr);
+ if (config.getValue("session.menuFile", "Session.MenuFile", s))
+ resource.menu_file = bstrdup(s.c_str());
else
resource.menu_file = bstrdup(DEFAULTMENU);
- if (XrmGetResource(database, "session.colorsPerChannel",
- "Session.ColorsPerChannel", &value_type, &value)) {
- if (sscanf(value.addr, "%d", &resource.colors_per_channel) != 1) {
- resource.colors_per_channel = 4;
- } else {
- if (resource.colors_per_channel < 2) resource.colors_per_channel = 2;
- if (resource.colors_per_channel > 6) resource.colors_per_channel = 6;
- }
- } else {
+ if (config.getValue("session.colorsPerChannel", "Session.ColorsPerChannel",
+ l))
+ resource.colors_per_channel = (l < 2 ? 2 : (l > 6 ? 6 : l)); // >= 2, <= 6
+ else
resource.colors_per_channel = 4;
- }
if (resource.style_file)
delete [] resource.style_file;
-
- if (XrmGetResource(database, "session.styleFile", "Session.StyleFile",
- &value_type, &value))
- resource.style_file = bstrdup(value.addr);
+ if (config.getValue("session.styleFile", "Session.StyleFile", s))
+ resource.style_file = bstrdup(s.c_str());
else
resource.style_file = bstrdup(DEFAULTSTYLE);
- if (XrmGetResource(database, "session.titlebarLayout",
- "Session.TitlebarLayout", &value_type, &value)) {
- resource.titlebar_layout = bstrdup(value.addr == NULL ? "ILMC" :
- value.addr);
- } else {
+ if (resource.titlebar_layout)
+ delete [] resource.titlebar_layout;
+ if (config.getValue("session.titlebarLayout", "Session.TitlebarLayout", s))
+ resource.titlebar_layout = bstrdup(s.c_str());
+ else
resource.titlebar_layout = bstrdup("ILMC");
- }
- if (XrmGetResource(database, "session.doubleClickInterval",
- "Session.DoubleClickInterval", &value_type, &value)) {
- if (sscanf(value.addr, "%lu", &resource.double_click_interval) != 1)
- resource.double_click_interval = 250;
- } else {
+ if (config.getValue("session.doubleClickInterval",
+ "Session.DoubleClickInterval", l))
+ resource.double_click_interval = l;
+ else
resource.double_click_interval = 250;
- }
- if (XrmGetResource(database, "session.autoRaiseDelay",
- "Session.AutoRaiseDelay", &value_type, &value)) {
- if (sscanf(value.addr, "%ld", &resource.auto_raise_delay.tv_usec) != 1)
- resource.auto_raise_delay.tv_usec = 400;
- } else {
+ if (!config.getValue("session.autoRaiseDelay", "Session.AutoRaiseDelay", l))
+ resource.auto_raise_delay.tv_usec = l;
+ else
resource.auto_raise_delay.tv_usec = 400;
- }
-
resource.auto_raise_delay.tv_sec = resource.auto_raise_delay.tv_usec / 1000;
resource.auto_raise_delay.tv_usec -=
(resource.auto_raise_delay.tv_sec * 1000);
resource.auto_raise_delay.tv_usec *= 1000;
- if (XrmGetResource(database, "session.cacheLife", "Session.CacheLife",
- &value_type, &value)) {
- if (sscanf(value.addr, "%lu", &resource.cache_life) != 1)
- resource.cache_life = 5l;
- } else {
- resource.cache_life = 5l;
- }
-
+ if (config.getValue("session.cacheLife", "Session.CacheLife", l))
+ resource.cache_life = l;
+ else
+ resource.cache_life = 51;
resource.cache_life *= 60000;
- if (XrmGetResource(database, "session.cacheMax", "Session.CacheMax",
- &value_type, &value)) {
- if (sscanf(value.addr, "%lu", &resource.cache_max) != 1)
- resource.cache_max = 200;
- } else {
+ if (config.getValue("session.cacheMax", "Session.CacheMax", l))
+ resource.cache_max = l;
+ else
resource.cache_max = 200;
- }
}
void Openbox::load_rc(BScreen *screen) {
- XrmDatabase database = (XrmDatabase) 0;
+ assert (screen != NULL);
+ const int screen_number = screen->getScreenNumber();
+ assert (screen_number >= 0);
- database = XrmGetFileDatabase(rc_file);
-
- XrmValue value;
- char *value_type, name_lookup[1024], class_lookup[1024];
- int screen_number = screen->getScreenNumber();
+ 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 (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- if (! strncasecmp(value.addr, "true", value.size))
- screen->saveFullMax(True);
- else
- screen->saveFullMax(False);
- } else {
+ 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 (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- if (! strncasecmp(value.addr, "true", value.size))
- screen->saveFocusNew(True);
- else
- screen->saveFocusNew(False);
- } else {
+ 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 (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- if (! strncasecmp(value.addr, "true", value.size))
- screen->saveFocusLast(True);
- else
- screen->saveFocusLast(False);
- } else {
+ 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);
+ screen_number);
sprintf(class_lookup, "Session.Screen%d.RowPlacementDirection",
screen_number);
- if (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- if (! strncasecmp(value.addr, "righttoleft", value.size))
+ 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 {
+ } else
screen->saveRowPlacementDirection(BScreen::LeftRight);
- }
+
sprintf(name_lookup, "session.screen%d.colPlacementDirection",
screen_number);
sprintf(class_lookup, "Session.Screen%d.ColPlacementDirection",
screen_number);
- if (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- if (! strncasecmp(value.addr, "bottomtotop", value.size))
+ 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 {
+ } else
screen->saveColPlacementDirection(BScreen::TopBottom);
- }
+
sprintf(name_lookup, "session.screen%d.workspaces", screen_number);
sprintf(class_lookup, "Session.Screen%d.Workspaces", screen_number);
- if (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- int i;
- if (sscanf(value.addr, "%d", &i) != 1) i = 1;
- screen->saveWorkspaces(i);
- } else {
+ 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 (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- int i;
- if (sscanf(value.addr, "%d", &i) != 1) i = 66;
-
- if (i <= 0 || i > 100)
- i = 66;
-
- screen->saveToolbarWidthPercent(i);
- } else {
+ 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 (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- if (! strncasecmp(value.addr, "TopLeft", value.size))
+ if (config.getValue(name_lookup, class_lookup, s)) {
+ if (0 == strncasecmp(s.c_str(), "TopLeft", s.length()))
screen->saveToolbarPlacement(Toolbar::TopLeft);
- else if (! strncasecmp(value.addr, "BottomLeft", value.size))
+ else if (0 == strncasecmp(s.c_str(), "BottomLeft", s.length()))
screen->saveToolbarPlacement(Toolbar::BottomLeft);
- else if (! strncasecmp(value.addr, "TopCenter", value.size))
+ else if (0 == strncasecmp(s.c_str(), "TopCenter", s.length()))
screen->saveToolbarPlacement(Toolbar::TopCenter);
- else if (! strncasecmp(value.addr, "TopRight", value.size))
+ else if (0 == strncasecmp(s.c_str(), "TopRight", s.length()))
screen->saveToolbarPlacement(Toolbar::TopRight);
- else if (! strncasecmp(value.addr, "BottomRight", value.size))
+ else if ( 0 == strncasecmp(s.c_str(), "BottomRight", s.length()))
screen->saveToolbarPlacement(Toolbar::BottomRight);
else
screen->saveToolbarPlacement(Toolbar::BottomCenter);
- } else {
+ } else
screen->saveToolbarPlacement(Toolbar::BottomCenter);
- }
- screen->removeWorkspaceNames();
+ screen->removeWorkspaceNames();
sprintf(name_lookup, "session.screen%d.workspaceNames", screen_number);
sprintf(class_lookup, "Session.Screen%d.WorkspaceNames", screen_number);
- if (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- char *search = bstrdup(value.addr);
-
- for (int i = 0; i < screen->getNumberOfWorkspaces(); i++) {
- char *nn;
-
- if (! i) nn = strtok(search, ",");
- else nn = strtok(NULL, ",");
-
- if (nn) screen->addWorkspaceName(nn);
- else break;
+ 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;
}
-
- delete [] search;
}
sprintf(name_lookup, "session.screen%d.toolbar.onTop", screen_number);
sprintf(class_lookup, "Session.Screen%d.Toolbar.OnTop", screen_number);
- if (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- if (! strncasecmp(value.addr, "true", value.size))
- screen->saveToolbarOnTop(True);
- else
- screen->saveToolbarOnTop(False);
- } else {
+ 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 (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- if (! strncasecmp(value.addr, "true", value.size))
- screen->saveToolbarAutoHide(True);
- else
- screen->saveToolbarAutoHide(False);
- } else {
+ 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 (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- if (! strncasecmp(value.addr, "clicktofocus", value.size)) {
+ if (config.getValue(name_lookup, class_lookup, s)) {
+ if (0 == strncasecmp(s.c_str(), "clicktofocus", s.length())) {
screen->saveAutoRaise(False);
screen->saveSloppyFocus(False);
- } else if (! strncasecmp(value.addr, "autoraisesloppyfocus", value.size)) {
+ } else if (0 == strncasecmp(s.c_str(), "autoraisesloppyfocus",
+ s.length())) {
screen->saveSloppyFocus(True);
screen->saveAutoRaise(True);
} else {
sprintf(name_lookup, "session.screen%d.windowZones", screen_number);
sprintf(class_lookup, "Session.Screen%d.WindowZones", screen_number);
- if (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- int i = atoi(value.addr);
- screen->saveWindowZones((i == 1 || i == 2 || i == 4) ? i : 1);
- } else {
+ 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 (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- if (! strncasecmp(value.addr, "RowSmartPlacement", value.size))
+ if (config.getValue(name_lookup, class_lookup, s)) {
+ if (0 == strncasecmp(s.c_str(), "RowSmartPlacement", s.length()))
screen->savePlacementPolicy(BScreen::RowSmartPlacement);
- else if (! strncasecmp(value.addr, "ColSmartPlacement", value.size))
+ 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 {
+ } 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 (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- if (! strncasecmp(value.addr, "TopLeft", value.size))
+ if (config.getValue(name_lookup, class_lookup, s)) {
+ if (0 == strncasecmp(s.c_str(), "TopLeft", s.length()))
screen->saveSlitPlacement(Slit::TopLeft);
- else if (! strncasecmp(value.addr, "CenterLeft", value.size))
+ else if (0 == strncasecmp(s.c_str(), "CenterLeft", s.length()))
screen->saveSlitPlacement(Slit::CenterLeft);
- else if (! strncasecmp(value.addr, "BottomLeft", value.size))
+ else if (0 == strncasecmp(s.c_str(), "BottomLeft", s.length()))
screen->saveSlitPlacement(Slit::BottomLeft);
- else if (! strncasecmp(value.addr, "TopCenter", value.size))
+ else if (0 == strncasecmp(s.c_str(), "TopCenter", s.length()))
screen->saveSlitPlacement(Slit::TopCenter);
- else if (! strncasecmp(value.addr, "BottomCenter", value.size))
+ else if (0 == strncasecmp(s.c_str(), "BottomCenter", s.length()))
screen->saveSlitPlacement(Slit::BottomCenter);
- else if (! strncasecmp(value.addr, "TopRight", value.size))
+ else if (0 == strncasecmp(s.c_str(), "TopRight", s.length()))
screen->saveSlitPlacement(Slit::TopRight);
- else if (! strncasecmp(value.addr, "BottomRight", value.size))
+ else if (0 == strncasecmp(s.c_str(), "BottomRight", s.length()))
screen->saveSlitPlacement(Slit::BottomRight);
else
screen->saveSlitPlacement(Slit::CenterRight);
- } else {
+ } 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 (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- if (! strncasecmp(value.addr, "Horizontal", value.size))
+ 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 {
+ } 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 (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- if (! strncasecmp(value.addr, "True", value.size))
- screen->saveSlitOnTop(True);
- else
- screen->saveSlitOnTop(False);
- } else {
+ 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 (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- if (! strncasecmp(value.addr, "True", value.size))
- screen->saveSlitAutoHide(True);
- else
- screen->saveSlitAutoHide(False);
- } else {
+ 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 (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- screen->saveStrftimeFormat(value.addr);
- } else {
+ 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 (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- if (strncasecmp(value.addr, "european", value.size))
+ 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 {
+ } else
screen->saveDateFormat(B_AmericanDate);
- }
+
sprintf(name_lookup, "session.screen%d.clockFormat", screen_number);
sprintf(class_lookup, "Session.Screen%d.ClockFormat", screen_number);
- if (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- int clock;
- if (sscanf(value.addr, "%d", &clock) != 1) screen->saveClock24Hour(False);
- else if (clock == 24) screen->saveClock24Hour(True);
- else screen->saveClock24Hour(False);
- } else {
+ 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 (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- int threshold;
- if (sscanf(value.addr, "%d", &threshold) != 1)
- screen->saveEdgeSnapThreshold(0);
- else
- screen->saveEdgeSnapThreshold(threshold);
- } else {
- screen->saveEdgeSnapThreshold(0);
- }
+ 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 (XrmGetResource(database, "session.imageDither", "Session.ImageDither",
- &value_type, &value)) {
- if (! strncasecmp("true", value.addr, value.size))
- screen->saveImageDither(True);
- else
- screen->saveImageDither(False);
- } else {
+ 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 (XrmGetResource(database, name_lookup, class_lookup, &value_type,
- &value)) {
- screen->saveRootCommand(value.addr);
- } else
+ if (config.getValue(name_lookup, class_lookup, s))
+ screen->saveRootCommand(s.c_str());
+ else
screen->saveRootCommand(NULL);
- if (XrmGetResource(database, "session.opaqueMove", "Session.OpaqueMove",
- &value_type, &value)) {
- if (! strncasecmp("true", value.addr, value.size))
- screen->saveOpaqueMove(True);
- else
- screen->saveOpaqueMove(False);
- } else {
+ if (config.getValue("session.opaqueMove", "Session.OpaqueMove", b))
+ screen->saveOpaqueMove((Bool)b);
+ else
screen->saveOpaqueMove(False);
- }
- XrmDestroyDatabase(database);
}
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);
if (old_screen && old_screen != screen)
old_screen->updateNetizenWindowFocus();
}
+
+#warning TODO: wrap in appropriate #ifdefs.
+
+void Openbox::symlink_rc(const char*rcfile)const{
+ char *homedir = getenv("HOME");
+
+ char *link_file = new char[strlen(homedir) + strlen("/.blackoxrc") + 1];
+ sprintf(link_file, "%s/.blackboxrc", homedir);
+ if(symlink(rcfile, link_file) == -1){
+ perror("Cannot create symlink");
+ }
+}
projects / chaz / openbox / blobdiff