.SH NAME
xshutdown \- asks for user confirmation before waking an xwait process
.SH SYNOPSIS
+.ll +5i
.B xshutdown
.RB [ \-\-display
.IR display ]
.IR atom ]
.RB [ \-m
.IR message ]
+.if n \{\
+.br
+\h'1i'
+..
.RB [ \-t
.IR title ]
+.RI [ \c
+.IB atom : msg , msg \c
+\&...]
+.ll -5i
.SH DESCRIPTION
The
.B xshutdown
.B xshutdown
to to set the property named
.IR atom .
-The default property to set is
-.BR XWAIT_PROPERTY .
+This option is deprecated.
.TP 5
.BI "\-m, \-\-msg " message
Sets
.B xshutdown
to set the given property to
.IR message .
-The default message to set is
-.BR XWAIT_MESSAGE .
+This option is deprecated.
.TP 5
.BI "\-p, \-\-prompt " prompt
Sets the prompt in the confirmation box to
.BI "\-t, \-\-title " title
Sets the window title to be
.IR title .
+.PP
+The
+.B \-a
+and
+.B \-m
+options are deprecated, though retained for compatibility reasons. It's
+recommended that you use the non-option specification instead.
+.PP
+The argument specifies an atom name and a message string to set. The
+default, if no atom or message is given, is to set
+.B XWAIT_PROPERTY
+to the value
+.BR XWAIT_MESSAGE .
.SH AUTHOR
Mark Wooding (mdw@nsict.org).
.SH BUGS
/* -*-c-*-
*
- * $Id: xshutdown.c,v 1.6 1998/12/11 09:51:51 mdw Exp $
+ * $Id: xshutdown.c,v 1.7 1999/08/20 07:29:19 mdw Exp $
*
* Pretty GTK interface to waking up an xwait
*
/*----- 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.
*
#include <mLib/mdwopt.h>
#include <mLib/quis.h>
+#include <mLib/report.h>
#include <mgLib/msg.h>
+#include "xatom.h"
#include "xwait.h"
-/*----- Static variables --------------------------------------------------*/
-
-static char *atom = XWAIT_DIE;
-static char *xmsg = XWAIT_DIE_MSG;
-
-static Atom xwait_die;
-
/*----- Main code ---------------------------------------------------------*/
/* --- @version@ --- */
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@ --- *
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]);
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;
"-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);
}
}
- 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)) {
- msg("!:~OK", "no xwait listening for `%s'", atom);
- 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 --- */
- if (msg("!:OK,~Cancel", "%s", prompt) == 0) {
- XTextProperty prop;
- XStringListToTextProperty(&xmsg, 1, &prop);
- XSetTextProperty(gdk_display, DefaultRootWindow(gdk_display),
- &prop, xwait_die);
- }
+ if (msg("!:OK,~Cancel", "%s", prompt) == 0)
+ xatom_set(gdk_display, DefaultRootWindow(gdk_display), xa, xm);
return (0);
}
.SH NAME
xtell \- prods a waiting xwait process
.SH SYNOPSIS
+.ll +5i
.B xtell
.RB [ \-d
.IR display ]
.IR atom ]
.RB [ \-m
.IR message ]
+.RI [ \c
+.IB atom : msg , msg \c
+\&...]
+.ll -5i
.SH DESCRIPTION
The
.B xtell
.B xtell
to to set the property named
.IR atom .
-The default property to set to is
-.BR XWAIT_PROPERTY .
+Use of this option is deprecated.
.TP 5
.BI "\-m, \-\-msg " message
Sets
.B xtell
to set the given property to
.IR message .
-The default message to set is
+Use of this option is deprecated.
+.PP
+The
+.B \-a
+and
+.B \-m
+options are deprecated, though retained for compatibility reasons. It's
+recommended that you use the non-option specification instead.
+.PP
+The argument specifies an atom name and a message string to set. The
+default, if no atom or message is given, is to set
+.B XWAIT_PROPERTY
+to the value
.BR XWAIT_MESSAGE .
.SH AUTHOR
Mark Wooding (mdw@nsict.org).
/* -*-c-*-
*
- * $Id: xtell.c,v 1.4 1998/12/11 09:50:06 mdw Exp $
+ * $Id: xtell.c,v 1.5 1999/08/20 07:29:19 mdw Exp $
*
* Wake up a waiting xwait process
*
/*----- Revision history --------------------------------------------------*
*
* $Log: xtell.c,v $
+ * Revision 1.5 1999/08/20 07:29:19 mdw
+ * New command line syntax, and new atom protocol.
+ *
* Revision 1.4 1998/12/11 09:50:06 mdw
* Minor modifications to work with mLib and mgLib.
*
#include <mLib/mdwopt.h>
#include <mLib/quis.h>
+#include <mLib/report.h>
+#include "xatom.h"
#include "xwait.h"
/*----- Main code ---------------------------------------------------------*/
static void usage(FILE *fp)
{
- fprintf(fp, "Usage: %s [-d DISPLAY] [-a ATOM] [-m MSG]\n", QUIS);
+ fprintf(fp, "Usage: %s [-d DISPLAY] [ATOM:MSG]\n", QUIS);
}
int main(int argc, char *argv[])
{
char *display = 0;
Display *dpy;
- Atom xwait_die;
+ Atom a, m;
char *atom = XWAIT_DIE;
char *msg = XWAIT_DIE_MSG;
for (;;) {
static struct option opt[] = {
- { "help", 0, 0, 'h' },
- { "usage", 0, 0, 'u' },
- { "version", 0, 0, 'v' },
- { "display", required_argument, 0, 'd' },
- { "atom", required_argument, 0, 'a' },
- { "msg", required_argument, 0, 'm' },
- { 0, 0, 0, 0 }
+ { "help", 0, 0, 'h' },
+ { "usage", 0, 0, 'u' },
+ { "version", 0, 0, 'v' },
+ { "display", OPTF_ARGREQ, 0, 'd' },
+ { "atom", OPTF_ARGREQ, 0, 'a' },
+ { "msg", OPTF_ARGREQ, 0, 'm' },
+ { 0, 0, 0, 0 }
};
- int i = getopt_long(argc, argv, "d:a:m:", opt, 0);
+ int i = mdwopt(argc, argv, "d:a:m:", opt, 0, 0, 0);
if (i < 0)
break;
switch (i) {
"-v, --version Display the program's version number\n"
"\n"
"-d, --display=DISPLAY Choose X display to connect to\n"
-"-a, --atom=ATOM\t Choose property name to set\n"
-"-m, --msg=MSG Choose value of property to set\n",
+"-a, --atom=ATOM\t Choose property name to set [deprecated]\n"
+"-m, --msg=MSG Choose value of property to set [deprecated]\n",
stdout);
exit(0);
break;
msg = optarg;
break;
default:
- fprintf(stderr, "Usage: xtell [-d DISPLAY] [-a ATOM] [-m MSG]\n");
+ usage(stderr);
exit(EXIT_FAILURE);
break;
}
}
- /* --- Connect to the display --- */
+ if (optind < argc) {
+ char *p;
+ if ((atom = strtok(argv[optind++], ":")) == 0)
+ die(EXIT_FAILURE, "missing atom name");
+ if ((p = strtok(0, ",")) != 0)
+ msg = p;
+ }
- dpy = XOpenDisplay(display);
- if (!dpy) {
- fprintf(stderr, "xtell: couldn't open display\n");
+ if (optind < argc) {
+ usage(stderr);
exit(EXIT_FAILURE);
}
- /* --- Find the right atom --- */
-
- xwait_die = XInternAtom(dpy, atom, False);
+ /* --- Set the property value and exit --- */
- /* --- Set the property value --- */
-
- {
- XTextProperty prop;
- if (!XGetTextProperty(dpy, DefaultRootWindow(dpy), &prop, xwait_die)) {
- fprintf(stderr, "xtell: no xwait listening for `%s'\n", atom);
- exit(EXIT_FAILURE);
- }
- XStringListToTextProperty(&msg, 1, &prop);
- XSetTextProperty(dpy, DefaultRootWindow(dpy), &prop, xwait_die);
- }
+ if ((dpy = XOpenDisplay(display)) == 0)
+ die(EXIT_FAILURE, "couldn't open display");
- /* --- Done --- */
+ a = XInternAtom(dpy, atom, False);
+ m = XInternAtom(dpy, msg, False);
+ xatom_set(dpy, DefaultRootWindow(dpy), a, m);
XCloseDisplay(dpy);
return (0);
~mdw / xtoys / commitdiff