nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add --restart

Browse source
This commit is contained in:
Mikael Magnusson 2007-05-20 15:23:08 +00:00
parent 64d812c6d7
commit 559ab9c922
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/openbox.1.sgml
View file

@ -40,6 +40,7 @@ manpage.1: manpage.sgml
<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>
@ -127,6 +128,14 @@ manpage.1: manpage.sgml
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>
<term><option>--sm-disable</option></term>
<listitem>

3
openbox/openbox.c
View file

@ -477,6 +477,7 @@ static void print_help()
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 @@ static void parse_args(gint *argc, gchar **argv)
}
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 */