X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=4329dadeff6e5bb32e054ab8dcae0182d3222a79;hb=e6739af2825ab9fe872c2860a8eac31b742c66d5;hp=35a530b76cde50f3cc8a78507eda115133efbe9b;hpb=9befe65a657c2f36f4ba6a2b94a180c55abf8f26;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 35a530b7..4329dade 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -42,13 +42,17 @@ # include #endif +#ifdef USE_SM #include -#include +#endif -#define SM_ERR_LEN 1024 +#include +#ifdef USE_SM SmcConn ob_sm_conn; gchar *ob_sm_id = NULL; +#endif + RrInstance *ob_rr_inst = NULL; RrTheme *ob_rr_theme = NULL; Display *ob_display = NULL; @@ -65,11 +69,17 @@ char *ob_rc_path = NULL; static void signal_handler(const ObEvent *e, void *data); static void parse_args(int argc, char **argv); + +static void sm_startup(int argc, char **argv); +static void sm_shutdown(); + +#ifdef USE_SM static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type, Bool shutdown, int interact_style, Bool fast); static void sm_die(SmcConn conn, SmPointer data); static void sm_save_complete(SmcConn conn, SmPointer data); static void sm_shutdown_cancelled(SmcConn conn, SmPointer data); +#endif static void exit_with_error(gchar *msg); int main(int argc, char **argv) @@ -79,8 +89,6 @@ int main(int argc, char **argv) char *path; xmlDocPtr doc; xmlNodePtr node; - SmcCallbacks cb; - char sm_err[SM_ERR_LEN]; ob_state = State_Starting; @@ -128,67 +136,7 @@ int main(int argc, char **argv) if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1) exit_with_error("Failed to set display as close-on-exec."); - cb.save_yourself.callback = sm_save_yourself; - cb.save_yourself.client_data = NULL; - - cb.die.callback = sm_die; - cb.die.client_data = NULL; - - cb.save_complete.callback = sm_save_complete; - cb.save_complete.client_data = NULL; - - cb.shutdown_cancelled.callback = sm_shutdown_cancelled; - cb.shutdown_cancelled.client_data = NULL; - - ob_sm_conn = SmcOpenConnection(NULL, NULL, 1, 0, - SmcSaveYourselfProcMask | - SmcDieProcMask | - SmcSaveCompleteProcMask | - SmcShutdownCancelledProcMask, - &cb, ob_sm_id, &ob_sm_id, - SM_ERR_LEN, sm_err); - if (ob_sm_conn == NULL) - g_warning("Failed to connect to session manager: %s", sm_err); - else { - SmPropValue val_cmd; - SmPropValue val_res; - SmPropValue val_prog; - SmPropValue val_uid; - SmProp prop_cmd = { SmCloneCommand, "SmLISTofARRAY8", 1, }; - SmProp prop_res = { SmRestartCommand, "SmLISTofARRAY8", 1, }; - SmProp prop_prog = { SmProgram, "SmARRAY8", 1, }; - SmProp prop_uid = { SmUserID, "SmARRAY8", 1, }; - SmProp *props[4]; - gchar *user; - - val_cmd.value = argv[0]; - val_cmd.length = strlen(argv[0]); - val_res.value = argv[0]; - val_res.length = strlen(argv[0]); /* XXX -id foo */ - val_prog.value = argv[0]; - val_prog.length = strlen(argv[0]); - - user = g_strdup_printf("%ld", (long)getuid()); - val_uid.value = user; - val_uid.length = strlen(user); - - prop_cmd.vals = &val_cmd; - prop_res.vals = &val_res; - prop_prog.vals = &val_prog; - prop_uid.vals = &val_uid; - - props[0] = &prop_cmd; - props[1] = &prop_res; - props[2] = &prop_prog; - props[3] = &prop_uid; - - SmcSetProperties(ob_sm_conn, 3, props); - - g_free(user); - - g_message("Connected to session manager with id %s", ob_sm_id); - } - g_free (ob_sm_id); + sm_startup(argc, argv); #ifdef USE_LIBSN ob_sn_display = sn_display_new(ob_display, NULL, NULL); @@ -307,8 +255,8 @@ int main(int argc, char **argv) RrThemeFree(ob_rr_theme); RrInstanceFree(ob_rr_inst); - if (ob_sm_conn) - SmcCloseConnection(ob_sm_conn, 0, NULL); + sm_shutdown(); + XCloseDisplay(ob_display); if (ob_restart) { @@ -335,6 +283,153 @@ int main(int argc, char **argv) return 0; } +static void sm_startup(int argc, char **argv) +{ +#ifdef USE_SM + +#define SM_ERR_LEN 1024 + + SmcCallbacks cb; + char sm_err[SM_ERR_LEN]; + + cb.save_yourself.callback = sm_save_yourself; + cb.save_yourself.client_data = NULL; + + cb.die.callback = sm_die; + cb.die.client_data = NULL; + + cb.save_complete.callback = sm_save_complete; + cb.save_complete.client_data = NULL; + + cb.shutdown_cancelled.callback = sm_shutdown_cancelled; + cb.shutdown_cancelled.client_data = NULL; + + ob_sm_conn = SmcOpenConnection(NULL, NULL, 1, 0, + SmcSaveYourselfProcMask | + SmcDieProcMask | + SmcSaveCompleteProcMask | + SmcShutdownCancelledProcMask, + &cb, ob_sm_id, &ob_sm_id, + SM_ERR_LEN, sm_err); + if (ob_sm_conn == NULL) + g_warning("Failed to connect to session manager: %s", sm_err); + else { + SmPropValue val_prog; + SmPropValue val_uid; + SmPropValue val_hint; + SmPropValue val_pri; + SmPropValue val_pid; + SmProp prop_cmd = { SmCloneCommand, SmLISTofARRAY8, 1, }; + SmProp prop_res = { SmRestartCommand, SmLISTofARRAY8, }; + SmProp prop_prog = { SmProgram, SmARRAY8, 1, }; + SmProp prop_uid = { SmUserID, SmARRAY8, 1, }; + SmProp prop_hint = { SmRestartStyleHint, SmCARD8, 1, }; + SmProp prop_pid = { SmProcessID, SmARRAY8, 1, }; + SmProp prop_pri = { "_GSM_Priority", SmCARD8, 1, }; + SmProp *props[7]; + gulong hint, pri; + gchar pid[32]; + gint i; + gboolean has_id; + + for (i = 1; i < argc - 1; ++i) + if (strcmp(argv[i], "-sm-client-id") == 0) + break; + has_id = (i < argc - 1); + + prop_cmd.vals = g_new(SmPropValue, (has_id ? argc-2 : argc)); + prop_cmd.num_vals = (has_id ? argc-2 : argc); + for (i = 0; i < argc; ++i) { + if (strcmp (argv[i], "-sm-client-id") == 0) { + ++i; /* skip the next as well */ + } else { + prop_cmd.vals[i].value = argv[i]; + prop_cmd.vals[i].length = strlen(argv[i]); + } + } + + prop_res.vals = g_new(SmPropValue, (has_id ? argc : argc+2)); + prop_res.num_vals = (has_id ? argc : argc+2); + for (i = 0; i < argc; ++i) { + prop_res.vals[i].value = argv[i]; + prop_res.vals[i].length = strlen(argv[i]); + } + if (!has_id) { + prop_res.vals[i].value = "-sm-client-id"; + prop_res.vals[i++].length = strlen("-sm-client-id"); + prop_res.vals[i].value = ob_sm_id; + prop_res.vals[i++].length = strlen(ob_sm_id); + } + + val_prog.value = argv[0]; + val_prog.length = strlen(argv[0]); + + val_uid.value = g_get_user_name(); + val_uid.length = strlen(val_uid.value); + + hint = SmRestartImmediately; + val_hint.value = &hint; + val_hint.length = 1; + + sprintf(pid, "%ld", (long)getpid()); + val_pid.value = pid; + val_pid.length = strlen(pid); + + /* priority with gnome-session-manager, low to run before other apps */ + pri = 20; + val_pri.value = &pri; + val_pri.length = 1; + + prop_prog.vals = &val_prog; + prop_uid.vals = &val_uid; + prop_hint.vals = &val_hint; + prop_pid.vals = &val_pid; + prop_pri.vals = &val_pri; + + props[0] = &prop_prog; + props[1] = &prop_cmd; + props[2] = &prop_res; + props[3] = &prop_uid; + props[4] = &prop_hint; + props[5] = &prop_pid; + props[6] = &prop_pri; + + SmcSetProperties(ob_sm_conn, 7, props); + + g_free(prop_cmd.vals); + g_free(prop_res.vals); + + g_message("Connected to session manager with id %s", ob_sm_id); + } + g_free (ob_sm_id); +#endif +} + +static void sm_shutdown() +{ +#ifdef USE_SM + if (ob_sm_conn) { + SmPropValue val_hint; + SmProp prop_hint = { SmRestartStyleHint, SmCARD8, 1, }; + SmProp *props[1]; + gulong hint; + + /* when we exit, we want to reset this to a more friendly state */ + hint = SmRestartIfRunning; + val_hint.value = &hint; + val_hint.length = 1; + + prop_hint.vals = &val_hint; + + props[0] = &prop_hint; + + SmcSetProperties(ob_sm_conn, 1, props); + + SmcCloseConnection(ob_sm_conn, 0, NULL); + } +#endif +} + static void signal_handler(const ObEvent *e, void *data) { int s; @@ -374,11 +469,12 @@ static void print_help() print_version(); g_print("Syntax: %s [options]\n\n", BINARY); g_print("Options:\n\n"); - g_print(" -rc PATH Specify the path to the rc file to use\n"); - g_print(" -help Display this help and exit\n"); - g_print(" -version Display the version and exit\n"); - g_print(" -sync Run in synchronous mode (this is slow and meant\n" - " for debugging X routines)\n"); + g_print(" -rc PATH Specify the path to the rc file to use\n"); + g_print(" -sm-client-id ID Specify the session manager ID\n"); + g_print(" -help Display this help and exit\n"); + g_print(" -version Display the version and exit\n"); + g_print(" -sync Run in synchronous mode (this is slow and\n" + " meant for debugging X routines)\n"); g_print("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT); } @@ -397,9 +493,16 @@ static void parse_args(int argc, char **argv) ob_sync = TRUE; } else if (!strcmp(argv[i], "-rc")) { if (i == argc - 1) /* no args left */ - g_printerr("-rc requires an argument\n"); + g_printerr(_("-rc requires an argument\n")); else ob_rc_path = argv[++i]; +#ifdef USE_SM + } else if (!strcmp(argv[i], "-sm-client-id")) { + if (i == argc - 1) /* no args left */ + g_printerr(_("-sm-client-id requires an argument\n")); + else + ob_sm_id = argv[++i]; +#endif } else { g_printerr("Invalid option: '%s'\n\n", argv[i]); print_help(); @@ -417,6 +520,7 @@ gboolean ob_pointer_pos(int *x, int *y) return !!XQueryPointer(ob_display, ob_root, &w, &w, x, y, &i, &i, &u); } +#ifdef USE_SM static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type, Bool shutdown, int interact_style, Bool fast) { @@ -439,11 +543,11 @@ static void sm_shutdown_cancelled(SmcConn conn, SmPointer data) { g_message("got SHUTDOWN CANCELLED from session manager"); } +#endif static void exit_with_error(gchar *msg) { g_critical(msg); - if (ob_sm_conn) - SmcCloseConnection(ob_sm_conn, 1, &msg); + sm_shutdown(); exit(EXIT_FAILURE); }