diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2007-03-04 20:16:41 +0000 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2007-03-04 20:16:41 +0000 |
| commit | e06e69b9045972efc19faba443e9cee8c7cc81ef (patch) | |
| tree | 091725a5f17f68be67da1b5254a914fffde3cd68 /openbox | |
| parent | e979b388d83a48e45a6a36869f2bc87161e8a720 (diff) | |
use integers instead of atoms for the actual control action
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/event.c | 4 | ||||
| -rw-r--r-- | openbox/openbox.c | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/openbox/event.c b/openbox/event.c index daf87f54..1e228eff 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -597,9 +597,9 @@ static void event_handle_root(XEvent *e) } else if (msgtype == prop_atoms.net_showing_desktop) { screen_show_desktop(e->xclient.data.l[0] != 0); } 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); - 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); } break; diff --git a/openbox/openbox.c b/openbox/openbox.c index a8b445d8..2a8f422f 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -87,7 +87,7 @@ static Cursor cursors[OB_NUM_CURSORS]; static KeyCode keys[OB_NUM_KEYS]; static gint exitcode = 0; static gboolean message_and_exit = FALSE; -static Atom *message; +static guint message = 0; static gboolean being_replaced = FALSE; static void signal_handler(gint signal, gpointer data); @@ -132,9 +132,11 @@ gint main(gint argc, gchar **argv) if (message_and_exit) { prop_startup(); - /* Send client message telling the OB process to reconfigure */ - prop_message(RootWindow(ob_display, ob_screen), prop_atoms.ob_control, - *message, 0, 0, 0, SubstructureNotifyMask); + /* Send client message telling the OB process to: + * message = 1 -> reconfigure + * message = 2 -> restart */ + PROP_MSG(RootWindow(ob_display, ob_screen), + ob_control, message, 0, 0, 0); XCloseDisplay(ob_display); exit(0); } @@ -433,10 +435,10 @@ static void parse_args(gint argc, gchar **argv) ob_debug_show_output(TRUE); } else if (!strcmp(argv[i], "--reconfigure")) { message_and_exit = TRUE; - message = &prop_atoms.ob_reconfigure; + message = 1; } else if (!strcmp(argv[i], "--restart")) { message_and_exit = TRUE; - message = &prop_atoms.ob_restart; + message = 2; } } } |