X-Git-Url: https://git.distorted.org.uk/~mdw/xtoys/blobdiff_plain/87dabe6f706aab4cfe1d96ccff80cf73fe397032..e571b0f1645bf296026f09b2c43854b178bc4e31:/xshutdown.c diff --git a/xshutdown.c b/xshutdown.c index d2a1750..499ff7c 100644 --- a/xshutdown.c +++ b/xshutdown.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: xshutdown.c,v 1.5 1998/12/03 01:00:19 mdw Exp $ + * $Id: xshutdown.c,v 1.7 1999/08/20 07:29:19 mdw Exp $ * * Pretty GTK interface to waking up an xwait * @@ -29,6 +29,12 @@ /*----- Revision history --------------------------------------------------* * * $Log: xshutdown.c,v $ + * Revision 1.7 1999/08/20 07:29:19 mdw + * New command line syntax, and new atom protocol. + * + * Revision 1.6 1998/12/11 09:51:51 mdw + * Use mgLib's `msg' box rather than doing things the hard way. + * * Revision 1.5 1998/12/03 01:00:19 mdw * Honour escape presses in the dialogue boxes. * @@ -60,67 +66,17 @@ #include #include -#include "mdwfocus.h" -#include "mdwopt.h" -#include "quis.h" -#include "xwait.h" - -/*----- Static variables --------------------------------------------------*/ +#include +#include +#include -static char *atom = XWAIT_DIE; -static char *msg = XWAIT_DIE_MSG; +#include -static Atom xwait_die; +#include "xatom.h" +#include "xwait.h" /*----- Main code ---------------------------------------------------------*/ -/* --- @check_escape@ --- * - * - * Arguments: @GtkWidget *w@ = widget raising the signal - * @GdkEventKey *ev@ = pointer to event data - * @gpointer *p@ = widget to activate in response - * - * Returns: --- - * - * Use: Activates a widget when an escape keypress is detected. - */ - -static gboolean check_escape(GtkWidget *w, GdkEventKey *ev, gpointer *p) -{ - if (ev->keyval == GDK_Escape) { - if (p) - gtk_widget_activate(GTK_WIDGET(p)); - else - gtk_object_destroy(GTK_OBJECT(w)); - return (1); - } - return (0); -} - -/* --- @cancel@ --- * - * - * Just end the main loop. - */ - -static void cancel(GtkWidget *w, gpointer *p) -{ - gtk_main_quit(); -} - -/* --- @ok@ --- * - * - * Send the xwait process a message. - */ - -static void ok(GtkWidget *w, gpointer *p) -{ - XTextProperty prop; - XStringListToTextProperty(&msg, 1, &prop); - XSetTextProperty(gdk_display, DefaultRootWindow(gdk_display), - &prop, xwait_die); - gtk_main_quit(); -} - /* --- @version@ --- */ static void version(FILE *fp) @@ -132,7 +88,7 @@ static void version(FILE *fp) static void usage(FILE *fp) { - fprintf(fp, "Usage: %s [-a ATOM] [-m MSG] [-p PROMPT] [-t TITLE]\n", QUIS); + fprintf(fp, "Usage: %s [-p PROMPT] [-t TITLE] [ATOM:MSG]\n", QUIS); } /* --- @main@ --- * @@ -142,6 +98,10 @@ static void usage(FILE *fp) int main(int argc, char *argv[]) { + char *atom = XWAIT_DIE; + char *xmsg = XWAIT_DIE_MSG; + Atom xa, xm; + char *prompt = "Are you sure you want to shut down this session?"; char *title = "xshutdown"; ego(argv[0]); @@ -151,14 +111,14 @@ int main(int argc, char *argv[]) for (;;) { static struct option opt[] = { - { "help", 0, 0, 'h' }, - { "usage", 0, 0, 'u' }, - { "version", 0, 0, 'v' }, - { "atom", required_argument, 0, 'a' }, - { "msg", required_argument, 0, 'm' }, - { "prompt", required_argument, 0, 'p' }, - { "title", required_argument, 0, 't' }, - { 0, 0, 0, 0 } + { "help", 0, 0, 'h' }, + { "usage", 0, 0, 'u' }, + { "version", 0, 0, 'v' }, + { "atom", OPTF_ARGREQ, 0, 'a' }, + { "msg", OPTF_ARGREQ, 0, 'm' }, + { "prompt", OPTF_ARGREQ, 0, 'p' }, + { "title", OPTF_ARGREQ, 0, 't' }, + { 0, 0, 0, 0 } }; int i; @@ -182,8 +142,8 @@ int main(int argc, char *argv[]) "-u, --usage Display a short usage summary\n" "-v, --version Display the program's version number\n" "\n" -"-a, --atom=ATOM\t Select the atom that `xwait' is waiting for\n" -"-m, --msg=MSG Select the message to send to `xwait'\n" +"-a, --atom=ATOM\t Select the property name atom [deprecated]\n" +"-m, --msg=MSG Select the message to send [deprecated]\n" "-p, --prompt=PROMPT Select the prompt string in the confirmation box\n" "-t, --title=TITLE Select the title string in the confirmation box\n", stdout); @@ -202,7 +162,7 @@ int main(int argc, char *argv[]) atom = optarg; break; case 'm': - msg = optarg; + xmsg = optarg; break; case 'p': prompt = optarg; @@ -216,111 +176,37 @@ int main(int argc, char *argv[]) } } - xwait_die = XInternAtom(gdk_display, atom, False); + if (optind < argc) { + char *p; + if ((atom = strtok(argv[optind++], ":")) == 0) + die(EXIT_FAILURE, "missing atom name"); + if ((p = strtok(0, ",")) != 0) + xmsg = p; + } + + if (optind < argc) { + usage(stderr); + exit(EXIT_FAILURE); + } + + xa = XInternAtom(gdk_display, atom, False); + xm = XInternAtom(gdk_display, xmsg, False); /* --- Decide whether there's an xwait listening --- * * * If not, pop up an error box and quit. */ - { - XTextProperty prop; - - if (!XGetTextProperty(gdk_display, DefaultRootWindow(gdk_display), - &prop, xwait_die)) { - char buf[64]; - GtkWidget *win = gtk_dialog_new(); - GtkWidget *w; - - /* --- Make the main window --- */ - - gtk_window_set_title(GTK_WINDOW(win), "xshutdown"); - gtk_signal_connect(GTK_OBJECT(win), "destroy", - GTK_SIGNAL_FUNC(cancel), 0); - gtk_signal_connect(GTK_OBJECT(win), "key_press_event", - GTK_SIGNAL_FUNC(check_escape), 0); - - gtk_box_set_homogeneous(GTK_BOX(GTK_DIALOG(win)->action_area), 0); - - /* --- Make the label --- */ - - sprintf(buf, "no xwait listening for `%s'\n", atom); - w = gtk_label_new(buf); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(win)->vbox), w, 1, 1, 0); - gtk_misc_set_padding(GTK_MISC(w), 8, 8); - gtk_widget_show(w); - - /* --- Make the little button --- */ - - w = gtk_button_new_with_label("OK"); - gtk_box_pack_end(GTK_BOX(GTK_DIALOG(win)->action_area), w, 0, 0, 0); - GTK_WIDGET_SET_FLAGS(w, GTK_CAN_DEFAULT); - gtk_widget_grab_default(w); - gtk_signal_connect(GTK_OBJECT(w), "clicked", - GTK_SIGNAL_FUNC(cancel), 0); - gtk_widget_show(w); - - /* --- Make everything work --- */ - - gtk_widget_realize(win); - mdwfocus(win); - gtk_widget_show(win); - gtk_main(); - exit(EXIT_FAILURE); - } + if (xatom_get(gdk_display, DefaultRootWindow(gdk_display), xa) == None) { + msg("!:~OK", "no xwait listening for `%s'", atom); + exit(EXIT_FAILURE); } /* --- Main code --- */ - { - GtkWidget *win; - GtkWidget *w; - - /* --- Make the main dialogue box --- */ - - win = gtk_dialog_new(); - gtk_window_set_title(GTK_WINDOW(win), title); - gtk_signal_connect(GTK_OBJECT(win), "destroy", - GTK_SIGNAL_FUNC(cancel), 0); - - gtk_box_set_homogeneous(GTK_BOX(GTK_DIALOG(win)->action_area), 0); - - /* --- Make the prompt label --- */ - - w = gtk_label_new(prompt); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(win)->vbox), w, 1, 1, 0); - gtk_misc_set_padding(GTK_MISC(w), 8, 8); - gtk_widget_show(w); - - /* --- Make the OK button --- */ - - w = gtk_button_new_with_label("OK"); - gtk_box_pack_end(GTK_BOX(GTK_DIALOG(win)->action_area), w, 0, 0, 0); - gtk_signal_connect(GTK_OBJECT(w), "clicked", GTK_SIGNAL_FUNC(ok), 0); - GTK_WIDGET_SET_FLAGS(w, GTK_CAN_DEFAULT); - gtk_widget_show(w); - gtk_widget_grab_default(w); - - /* --- And the cancel button --- */ - - w = gtk_button_new_with_label("Cancel"); - gtk_box_pack_end(GTK_BOX(GTK_DIALOG(win)->action_area), w, 0, 0, 0); - gtk_signal_connect(GTK_OBJECT(w), "clicked", GTK_SIGNAL_FUNC(cancel), 0); - GTK_WIDGET_SET_FLAGS(w, GTK_CAN_DEFAULT); - gtk_widget_show(w); - - /* --- Show the completed window --- */ - - gtk_signal_connect(GTK_OBJECT(win), "key_press_event", - GTK_SIGNAL_FUNC(check_escape), 0); - gtk_widget_realize(win); - mdwfocus(win); - gtk_widget_show(win); - } - - /* --- Let rip --- */ + if (msg("!:OK,~Cancel", "%s", prompt) == 0) + xatom_set(gdk_display, DefaultRootWindow(gdk_display), xa, xm); - gtk_main(); return (0); }