#include "openbox.h"
#include "session.h"
#include "dock.h"
+#include "modkeys.h"
#include "event.h"
#include "menu.h"
#include "client.h"
g_set_prgname(argv[0]);
if (chdir(g_get_home_dir()) == -1)
- g_message(_("Unable to change to home directory (%s): %s"),
+ g_message(_("Unable to change to home directory '%s': %s"),
g_get_home_dir(), g_strerror(errno));
/* parse out command line args */
* remote_control = 1 -> reconfigure
* remote_control = 2 -> restart */
PROP_MSG(RootWindow(ob_display, ob_screen),
- ob_control, remote_control, 0, 0, 0);
+ openbox_control, remote_control, 0, 0, 0);
XCloseDisplay(ob_display);
exit(EXIT_SUCCESS);
}
xmlDocPtr doc;
xmlNodePtr node;
+ modkeys_startup(reconfigure);
+
/* startup the parsing so everything can register sections
of the rc */
i = parse_startup();
openbox_rc, config_file);
parse_tree(i, doc, node->xmlChildrenNode);
} else {
- g_message(_("Unable to find a valid config file, using "
- "some simple defaults"));
+ g_message(_("Unable to find a valid config file, using some simple defaults"));
PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_rc);
}
/* we're done with parsing now, kill it */
config_font_activewindow,
config_font_inactivewindow,
config_font_menutitle,
- config_font_menuitem)))
+ config_font_menuitem,
+ config_font_osd)))
{
RrThemeFree(ob_rr_theme);
ob_rr_theme = theme;
window_shutdown(reconfigure);
event_shutdown(reconfigure);
config_shutdown();
+ modkeys_shutdown(reconfigure);
} while (reconfigure);
}
execvp(argvp[0], argvp);
g_strfreev(argvp);
} else {
- g_message(_("Restart failed to execute new executable "
- "'%s': %s"), restart_path, err->message);
+ g_message(
+ _("Restart failed to execute new executable '%s': %s"),
+ restart_path, err->message);
g_error_free(err);
}
}
static void print_help()
{
- g_print(_("Syntax: openbox [options]\n\n"));
- g_print(_("Options:\n\n"));
- g_print(_(" --reconfigure Tell the currently running instance of "
- "Openbox to\n"
- " reconfigure (and then exit "
- "immediately)\n"));
- g_print(_(" --config-file FILE Specify the file to load for the config "
- "file\n"));
+ g_print(_("Syntax: openbox [options]\n"));
+ g_print(_("\nOptions:\n\n"));
+ g_print(_(" --config-file FILE Specify the file to load for the config file\n"));
#ifdef USE_SM
- g_print(_(" --sm-disable Disable connection to session "
- "manager\n"));
+ g_print(_(" --sm-disable Disable connection to session manager\n"));
g_print(_(" --sm-client-id ID Specify session management ID\n"));
- g_print(_(" --sm-save-file FILE Specify file to load a saved session"
- "from\n"));
+ g_print(_(" --sm-save-file FILE Specify file to load a saved session from\n"));
#endif
- g_print(_(" --replace Replace the currently running window "
- "manager\n"));
+ g_print(_(" --replace Replace the currently running window manager\n"));
g_print(_(" --help Display this help and exit\n"));
g_print(_(" --version Display the version and exit\n"));
- g_print(_(" --sync Run in synchronous mode (this is slow and"
- " meant for\n"
- " debugging X routines)\n"));
+ g_print(_("\nPassing messages to a running Openbox instance:\n\n"));
+ g_print(_(" --reconfigure Reload Openbox's configuration\n"));
+ g_print(_("\nDebugging options:\n\n"));
+ g_print(_(" --sync Run in synchronous mode\n"));
g_print(_(" --debug Display debugging output\n"));
- g_print(_(" --debug-focus Display debugging output\n"));
+ g_print(_(" --debug-focus Display debugging output for focus handling\n"));
g_print(_("\nPlease report bugs at %s\n\n"), PACKAGE_BUGREPORT);
}
xsync = TRUE;
} else if (!strcmp(argv[i], "--debug")) {
ob_debug_show_output(TRUE);
+ ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
} else if (!strcmp(argv[i], "--debug-focus")) {
ob_debug_show_output(TRUE);
+ ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
ob_debug_enable(OB_DEBUG_FOCUS, TRUE);
} else if (!strcmp(argv[i], "--reconfigure")) {
remote_control = 1;