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

save the config type in the session command line arguments

Browse source
This commit is contained in:
Dana Jansens 2007-05-13 22:57:42 +00:00
parent 6171dbf970
commit 5c96972bff
5 changed files with 55 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
doc/openbox.1.in
View file

@ -41,10 +41,17 @@ above ~/.xsession file.
You can use the \fBobconf\fR tool to configure Openbox
easily with a graphical interface, however more in-depth configuration
is possible by editing the configuration files by hand. The default
configuration file is installed in @configdir@/openbox/rc.xml, and the
user configuration is placed in ~/.config/openbox/rc.xml. You can copy
configuration files are installed in @configdir@/openbox/, and the
user configuration is placed in ~/.config/openbox/. You can copy
the default configuration to ~/.config/openbox and edit it to your
liking.
.PP
There are 3 default configuration files, \fBrc.xml\fP \fBrc-gnome.xml\fP, and \fBrc-kde.xml\fP. The
rc-gnome.xml is used when you run \fBopenbox-gnome-session
\fR and the rc-kde.xml is used when you run
\fBopenbox-kde-session\fR.
.SH "OPTIONS"
.PP
These are the possible options that \fBopenbox\fR accepts:
@ -75,4 +82,4 @@ The program's full documentation is available on the website:
.PP
Please report bugs to: \fBhttp://bugzilla.icculus.org/
\fP
.\" created by instant / docbook-to-man, Sun 13 May 2007, 18:47
.\" created by instant / docbook-to-man, Sun 13 May 2007, 18:59

10
doc/openbox.1.sgml
View file

@ -80,11 +80,17 @@ manpage.1: manpage.sgml
<para>You can use the <command>obconf</command> tool to configure Openbox
easily with a graphical interface, however more in-depth configuration
is possible by editing the configuration files by hand. The default
configuration file is installed in @configdir@/openbox/rc.xml, and the
user configuration is placed in ~/.config/openbox/rc.xml. You can copy
configuration files are installed in @configdir@/openbox/, and the
user configuration is placed in ~/.config/openbox/. You can copy
the default configuration to ~/.config/openbox and edit it to your
liking.</para>
<para>There are 3 default configuration files, <literal>rc.xml</literaL,
<literal>rc-gnome.xml</literal>, and <literal>rc-kde.xml</literal>. The
rc-gnome.xml is used when you run <command>openbox-gnome-session
</command> and the rc-kde.xml is used when you run
<command>openbox-kde-session</command>.
</refsect1>
<refsect1>
<title>OPTIONS</title>

28
openbox/openbox.c
View file

@ -89,6 +89,7 @@ gboolean ob_replace_wm = FALSE;
gboolean ob_sm_use = TRUE;
gchar *ob_sm_id = NULL;
gchar *ob_sm_save_file = NULL;
gchar *ob_config_type = NULL;
static ObState state;
static gboolean xsync = FALSE;
@ -100,7 +101,6 @@ static KeyCode keys[OB_NUM_KEYS];
static gint exitcode = 0;
static guint remote_control = 0;
static gboolean being_replaced = FALSE;
static gchar *config_type = NULL;
static void signal_handler(gint signal, gpointer data);
static void remove_args(gint *argc, gchar **argv, gint index, gint num);
@ -237,15 +237,15 @@ gint main(gint argc, gchar **argv)
config_startup(i);
/* parse/load user options */
if (parse_load_rc(config_type, &doc, &node)) {
if (parse_load_rc(ob_config_type, &doc, &node)) {
parse_tree(i, doc, node->xmlChildrenNode);
parse_close(doc);
} else
g_message(_("Unable to find a valid config file, using some simple defaults"));
if (config_type != NULL)
if (ob_config_type != NULL)
PROP_SETS(RootWindow(ob_display, ob_screen),
ob_config, config_type);
ob_config, ob_config_type);
/* we're done with parsing now, kill it */
parse_shutdown(i);
@ -409,8 +409,8 @@ gint main(gint argc, gchar **argv)
}
/* we also remove some environment variables, so put them back */
if (config_type)
setenv("OPENBOX_CONFIG_NAMESPACE", config_type, 1);
if (ob_config_type)
setenv("OPENBOX_CONFIG_NAMESPACE", ob_config_type, 1);
/* re-run me */
execvp(argv[0], argv); /* try how we were run */
@ -420,7 +420,7 @@ gint main(gint argc, gchar **argv)
/* free stuff passed in from the command line or environment */
g_free(ob_sm_save_file);
g_free(ob_sm_id);
g_free(config_type);
g_free(ob_config_type);
g_free(program_name);
return exitcode;
@ -494,7 +494,7 @@ static void parse_env()
unsetenv("DESKTOP_STARTUP_ID");
if (getenv("OPENBOX_CONFIG_NAMESPACE")) {
config_type = g_strdup(getenv("OPENBOX_CONFIG_NAMESPACE"));
ob_config_type = g_strdup(getenv("OPENBOX_CONFIG_NAMESPACE"));
/* don't pass it on except if we restart */
unsetenv("OPENBOX_CONFIG_NAMESPACE");
}
@ -542,6 +542,18 @@ static void parse_args(gint *argc, gchar **argv)
remote_control = 2;
*/
}
else if (!strcmp(argv[i], "--config-namespace")) {
if (i == *argc - 1) /* no args left */
/* not translated cuz it's sekret */
g_printerr("--config-namespace requires an argument\n");
else {
ob_config_type = g_strdup(argv[i+1]);
remove_args(argc, argv, i, 2);
--i; /* this arg was removed so go back */
ob_debug_type(OB_DEBUG_SM, "--config-namespace %s\n",
ob_sm_save_file);
}
}
else if (!strcmp(argv[i], "--sm-save-file")) {
if (i == *argc - 1) /* no args left */
/* not translated cuz it's sekret */

1
openbox/openbox.h
View file

@ -46,6 +46,7 @@ extern gchar *ob_sm_id;
make a new file every time, yay. */
extern gchar *ob_sm_save_file;
extern gboolean ob_replace_wm;
extern gchar *ob_config_type;
/* The state of execution of the window manager */
ObState ob_state();

18
openbox/session.c
View file

@ -319,12 +319,15 @@ static void session_setup_clone_command()
static void session_setup_restart_command()
{
gint i;
gint num = 4;
SmPropValue *vals = g_new(SmPropValue, sm_argc + 4);
if (ob_config_type) num += 2;
SmPropValue *vals = g_new(SmPropValue, sm_argc + num);
SmProp prop = {
.name = g_strdup(SmRestartCommand),
.type = g_strdup(SmLISTofARRAY8),
.num_vals = sm_argc + 4,
.num_vals = sm_argc + num,
.vals = vals
};
SmProp *list = &prop;
@ -350,11 +353,22 @@ static void session_setup_restart_command()
ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i+2].value);
ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i+3].value);
if (ob_config_type) {
vals[i+4].value = g_strdup("--config-namespace");
vals[i+4].length = strlen("--config-namespace") + 1;
vals[i+5].value = ob_config_type;
vals[i+5].length = strlen(ob_config_type) + 1;
ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i+4].value);
ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i+5].value);
}
SmcSetProperties(sm_conn, 1, &list);
g_free(prop.name);
g_free(prop.type);
g_free(vals[i].value);
g_free(vals[i+2].value);
if (ob_config_type)
g_free(vals[i+4].value);
g_free(vals);
}