add --restart
Mikael Magnusson mikachu@comhem.se
2 files changed,
10 insertions(+),
2 deletions(-)
M
doc/openbox.1.sgml
→
doc/openbox.1.sgml
@@ -40,6 +40,7 @@ <arg><option>--help</option></arg>
<arg><option>--version</option></arg> <arg><option>--replace</option></arg> <arg><option>--reconfigure</option></arg> + <arg><option>--restart</option></arg> <arg><option>--sm-disable</option></arg> <arg><option>--sync</option></arg> <arg><option>--debug</option></arg>@@ -125,6 +126,14 @@ <term><option>--reconfigure</option></term>
<listitem> <para>If Openbox is already running on the display, tell it to reload its configuration.</para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>--restart</option></term> + <listitem> + <para>If Openbox is already running on the display, tell it to + restart. This is useful if you have upgraded Openbox and don't + want to restart X.</para> </listitem> </varlistentry> <varlistentry>
M
openbox/openbox.c
→
openbox/openbox.c
@@ -477,6 +477,7 @@ g_print(_(" --replace Replace the currently running window manager\n"));
g_print(_(" --sm-disable Disable connection to the session manager\n")); g_print(_("\nPassing messages to a running Openbox instance:\n")); g_print(_(" --reconfigure Reload Openbox's configuration\n")); + g_print(_(" --restart Restart Openbox\n")); g_print(_("\nDebugging options:\n")); g_print(_(" --sync Run in synchronous mode\n")); g_print(_(" --debug Display debugging output\n"));@@ -542,10 +543,8 @@ ob_debug_xinerama = TRUE;
} else if (!strcmp(argv[i], "--reconfigure")) { remote_control = 1; -/* don't make this do anything if it's not in --help .. } else if (!strcmp(argv[i], "--restart")) { remote_control = 2; -*/ } else if (!strcmp(argv[i], "--sm-save-file")) { if (i == *argc - 1) /* no args left */