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

use integers instead of atoms for the actual control action

Browse source
This commit is contained in:
Mikael Magnusson 2007-03-04 20:16:41 +00:00
parent e979b388d8
commit e06e69b904
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
openbox/event.c
View file

@ -597,9 +597,9 @@ static void event_handle_root(XEvent *e)
} else if (msgtype == prop_atoms.net_showing_desktop) { } else if (msgtype == prop_atoms.net_showing_desktop) {
screen_show_desktop(e->xclient.data.l[0] != 0); screen_show_desktop(e->xclient.data.l[0] != 0);
} else if (msgtype == prop_atoms.ob_control) { } else if (msgtype == prop_atoms.ob_control) {
if ((Atom)e->xclient.data.l[0] == prop_atoms.ob_reconfigure) if ((Atom)e->xclient.data.l[0] == 1)
action_run_string("reconfigure", NULL); action_run_string("reconfigure", NULL);
else if ((Atom)e->xclient.data.l[0] == prop_atoms.ob_restart) else if ((Atom)e->xclient.data.l[0] == 2)
action_run_string("restart", NULL); action_run_string("restart", NULL);
} }
break; break;

14
openbox/openbox.c
View file

@ -87,7 +87,7 @@ static Cursor cursors[OB_NUM_CURSORS];
static KeyCode keys[OB_NUM_KEYS]; static KeyCode keys[OB_NUM_KEYS];
static gint exitcode = 0; static gint exitcode = 0;
static gboolean message_and_exit = FALSE; static gboolean message_and_exit = FALSE;
static Atom *message; static guint message = 0;
static gboolean being_replaced = FALSE; static gboolean being_replaced = FALSE;
static void signal_handler(gint signal, gpointer data); static void signal_handler(gint signal, gpointer data);
@ -132,9 +132,11 @@ gint main(gint argc, gchar **argv)
if (message_and_exit) { if (message_and_exit) {
prop_startup(); prop_startup();
/* Send client message telling the OB process to reconfigure */ /* Send client message telling the OB process to:
prop_message(RootWindow(ob_display, ob_screen), prop_atoms.ob_control, * message = 1 -> reconfigure
*message, 0, 0, 0, SubstructureNotifyMask); * message = 2 -> restart */
PROP_MSG(RootWindow(ob_display, ob_screen),
ob_control, message, 0, 0, 0);
XCloseDisplay(ob_display); XCloseDisplay(ob_display);
exit(0); exit(0);
} }
@ -433,10 +435,10 @@ static void parse_args(gint argc, gchar **argv)
ob_debug_show_output(TRUE); ob_debug_show_output(TRUE);
} else if (!strcmp(argv[i], "--reconfigure")) { } else if (!strcmp(argv[i], "--reconfigure")) {
message_and_exit = TRUE; message_and_exit = TRUE;
message = &prop_atoms.ob_reconfigure; message = 1;
} else if (!strcmp(argv[i], "--restart")) { } else if (!strcmp(argv[i], "--restart")) {
message_and_exit = TRUE; message_and_exit = TRUE;
message = &prop_atoms.ob_restart; message = 2;
} }
} }
} }