X-Git-Url: https://git.distorted.org.uk/~mdw/xtoys/blobdiff_plain/f3b35b6bbd646fb0e676ef3d64c91b38ff9f9162..63351ac66772542ebe1f4b38936f7ed9fd43e9b9:/xshutdown.c diff --git a/xshutdown.c b/xshutdown.c index d65a9bd..c669871 100644 --- a/xshutdown.c +++ b/xshutdown.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: xshutdown.c,v 1.2 1998/11/21 22:30:23 mdw Exp $ + * $Id: xshutdown.c,v 1.6 1998/12/11 09:51:51 mdw Exp $ * * Pretty GTK interface to waking up an xwait * @@ -29,6 +29,18 @@ /*----- Revision history --------------------------------------------------* * * $Log: xshutdown.c,v $ + * 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. + * + * Revision 1.4 1998/12/03 00:39:45 mdw + * Force focus when starting up. + * + * Revision 1.3 1998/11/30 22:36:49 mdw + * Tidy up tabbing in help texts very slightly. + * * Revision 1.2 1998/11/21 22:30:23 mdw * Support GNU-style long options throughout, and introduce proper help * text to all programs. Update manual pages to match. @@ -49,44 +61,24 @@ #include #include +#include + +#include +#include + +#include -#include "mdwopt.h" -#include "quis.h" #include "xwait.h" /*----- Static variables --------------------------------------------------*/ static char *atom = XWAIT_DIE; -static char *msg = XWAIT_DIE_MSG; +static char *xmsg = XWAIT_DIE_MSG; static Atom xwait_die; /*----- Main code ---------------------------------------------------------*/ -/* --- @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) @@ -148,7 +140,7 @@ 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 Select the atom that `xwait' is waiting for\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" "-p, --prompt=PROMPT Select the prompt string in the confirmation box\n" "-t, --title=TITLE Select the title string in the confirmation box\n", @@ -168,7 +160,7 @@ int main(int argc, char *argv[]) atom = optarg; break; case 'm': - msg = optarg; + xmsg = optarg; break; case 'p': prompt = optarg; @@ -194,91 +186,20 @@ int main(int argc, char *argv[]) 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_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_show(win); - gtk_main(); + 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_widget_show(win); + if (msg("!:OK,~Cancel", "%s", prompt) == 0) { + XTextProperty prop; + XStringListToTextProperty(&xmsg, 1, &prop); + XSetTextProperty(gdk_display, DefaultRootWindow(gdk_display), + &prop, xwait_die); } - /* --- Let rip --- */ - - gtk_main(); return (0); }