From: Mark Wooding Date: Sun, 10 Jan 2016 12:54:45 +0000 (+0000) Subject: A slew of whitespace cleanups. X-Git-Tag: 1.5.0~5 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/xtoys/commitdiff_plain/c1c9f4d2f03061ab9de1563a66f9ee7b816ce8a4 A slew of whitespace cleanups. --- diff --git a/Makefile.am b/Makefile.am index 1ad895a..ff82510 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,12 +13,12 @@ ### it under the terms of the GNU General Public License as published by ### the Free Software Foundation; either version 2 of the License, or ### (at your option) any later version. -### +### ### X tools is distributed in the hope that it will be useful, ### but WITHOUT ANY WARRANTY; without even the implied warranty of ### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ### GNU General Public License for more details. -### +### ### You should have received a copy of the GNU General Public License ### along with X tools; if not, write to the Free Software Foundation, ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/README b/README index 705c58c..02c4d4a 100644 --- a/README +++ b/README @@ -79,4 +79,3 @@ Notes and things If anyone wants to do an Xaw version of the GTK bits then I'll include that in the distribution; people using Motif or Qt need not apply. - diff --git a/configure.ac b/configure.ac index e338570..8fee120 100644 --- a/configure.ac +++ b/configure.ac @@ -13,12 +13,12 @@ dnl X tools is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; either version 2 of the License, or dnl (at your option) any later version. -dnl +dnl dnl X tools is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with X tools; if not, write to the Free Software Foundation, dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/debian/changelog b/debian/changelog index 960db9f..a3c9e93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,7 @@ xtoys (1.4.1) experimental; urgency=low xtoys (1.4.0) experimental; urgency=low - * GTK-based tools now written in Python, and use GTK 2. + * GTK-based tools now written in Python, and use GTK 2. * xtell and xwait replaced by single xatom program. * Internal: new build system. diff --git a/debian/control b/debian/control index 139b25a..e46350d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xtoys Section: x11 Priority: extra Build-Depends: - libx11-dev, mlib-dev (>= 2.0.4), debhelper (>= 5), + libx11-dev, mlib-dev (>= 2.0.4), debhelper (>= 5), python-central, python (>= 2.4), python-gtk2 Maintainer: Mark Wooding XS-Python-Version: >= 2.4 @@ -25,7 +25,7 @@ Description: A collection of small X11 tools We have: xcatch -- run a program, displaying its output in a scrolling window if there is any - xgetline -- pops up a dialogue, reads a line of text, and reports the + xgetline -- pops up a dialogue, reads a line of text, and reports the entered line on stdout; can do passwords, history with optional size limit, or simple selection from a list xmsg -- pop up a dialogue showing a message and a bunch of buttons, and diff --git a/libxatom.c b/libxatom.c index 3bca18f..5dea9ef 100644 --- a/libxatom.c +++ b/libxatom.c @@ -82,7 +82,7 @@ Atom xatom_get(Display *d, Window w, Atom p) &type, &fmt, /* Actual type and format */ &n, &left, /* Amount read, and bytes left */ &buf) /* Where to put the buffer */ - != Success || + != Success || type != XA_ATOM || n < 1 || fmt < 32) return (None); diff --git a/xatom.c b/xatom.c index 826085c..e030021 100644 --- a/xatom.c +++ b/xatom.c @@ -235,12 +235,12 @@ const struct cmd *findcmd(const char *name) for (c = cmds; c->name; c++) { if (strncmp(name, c->name, sz) == 0) { if (c->name[sz] == 0) { - chosen = c; - break; + chosen = c; + break; } else if (chosen) - die(EXIT_FAILURE, "ambiguous command name `%s'", name); + die(EXIT_FAILURE, "ambiguous command name `%s'", name); else - chosen = c; + chosen = c; } } if (!chosen) @@ -308,10 +308,10 @@ int main(int argc, char *argv[]) for (;;) { static struct option opt[] = { - { "help", 0, 0, 'h' }, - { "usage", 0, 0, 'u' }, - { "version", 0, 0, 'v' }, - { "display", OPTF_ARGREQ, 0, 'd' }, + { "help", 0, 0, 'h' }, + { "usage", 0, 0, 'u' }, + { "version", 0, 0, 'v' }, + { "display", OPTF_ARGREQ, 0, 'd' }, { "window", OPTF_ARGREQ, 0, 'w' }, { 0, 0, 0, 0 } }; diff --git a/xcatch.1 b/xcatch.1 index 5c20670..c7ae65f 100644 --- a/xcatch.1 +++ b/xcatch.1 @@ -30,7 +30,7 @@ reads from its own standard input. .PP It is better to write .IP -.B xcatch +.B xcatch .I command args .PP than @@ -49,7 +49,7 @@ to put the command line in its title bar. .SS Options .TP .BI "\-F, \-\-font " font -Display output text in +Display output text in .I font rather than GTK's default. .TP diff --git a/xmsg.1 b/xmsg.1 index e5c21b4..debc926 100644 --- a/xmsg.1 +++ b/xmsg.1 @@ -41,7 +41,7 @@ is .RB ` ! ' then that character is removed. (Hence, if you really wanted to show the message -.RB ` \- ', +.RB ` \- ', you need to pass .RB ` !\- '.) Conscientious script authors will prefix strings appropriately. @@ -58,7 +58,7 @@ argument has the form .IR label . The .I label -is either a text string, or a GTK stock-id (e.g., +is either a text string, or a GTK stock-id (e.g., .BR gtk-ok ). Mnemonic characters in button labels may be marked by prefixing them with underscores. Write two underscores if you really want a literal diff --git a/xscsize.c b/xscsize.c index dcdbbd1..15abcc0 100644 --- a/xscsize.c +++ b/xscsize.c @@ -86,10 +86,10 @@ int main(int argc, char *argv[]) for (;;) { static struct option opt[] = { - { "help", 0, 0, 'h' }, - { "usage", 0, 0, 'u' }, - { "version", 0, 0, 'v' }, - { "display", OPTF_ARGREQ, 0, 'd' }, + { "help", 0, 0, 'h' }, + { "usage", 0, 0, 'u' }, + { "version", 0, 0, 'v' }, + { "display", OPTF_ARGREQ, 0, 'd' }, { "bourne-shell", 0, 0, 'b' }, { "c-shell", 0, 0, 'c' }, { "export", 0, 0, 'x' },