Blackbox *blackbox;
-Blackbox::Blackbox(char **m_argv, char *dpy_name, char *rc)
+Blackbox::Blackbox(char **m_argv, char *dpy_name, char *rc, char *menu)
: BaseDisplay(m_argv[0], dpy_name) {
if (! XSupportsLocale())
fprintf(stderr, "X server does not support locale\n");
::blackbox = this;
argv = m_argv;
- if (! rc) rc = "~/.blackboxrc";
+ if (! rc) rc = "~/.openbox/rc";
rc_file = expandTilde(rc);
+ if (! menu) menu = "~/.openbox/menu";
+ menu_file = expandTilde(menu);
no_focus = False;
load_rc();
- sprintf(rc_string, "session.menuFile: %s", getMenuFilename());
- XrmPutLineResource(&new_blackboxrc, rc_string);
-
sprintf(rc_string, "session.colorsPerChannel: %d",
resource.colors_per_channel);
XrmPutLineResource(&new_blackboxrc, rc_string);
int int_value;
unsigned long long_value;
- if (XrmGetResource(database, "session.menuFile", "Session.MenuFile",
- &value_type, &value)) {
- resource.menu_file = expandTilde(value.addr);
- } else {
- resource.menu_file = DEFAULTMENU;
- }
-
resource.colors_per_channel = 4;
if (XrmGetResource(database, "session.colorsPerChannel",
"Session.ColorsPerChannel", &value_type, &value) &&
}
-void Blackbox::saveMenuFilename(const string& filename) {
+void Blackbox::addMenuTimestamp(const string& filename) {
assert(! filename.empty());
bool found = False;