diff options
| author | Michael Jennings <mej@kainx.org> | 2002-06-03 00:24:22 +0000 |
|---|---|---|
| committer | Michael Jennings <mej@kainx.org> | 2002-06-03 00:24:22 +0000 |
| commit | 981b29c8950aa25559cca3f65dcbc293bae94e4f (patch) | |
| tree | 6713b67d2300583467acca78bf17315223c22030 /utils | |
| parent | 6df3396a5d8b8d5426693a789ebd2042688dd7a0 (diff) | |
| download | eterm-981b29c8950aa25559cca3f65dcbc293bae94e4f.tar.gz | |
Sun Jun 2 20:23:07 2002 Michael Jennings (mej)
Latest Escreen patch along with twin support from Azundris.
SVN revision: 6297
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/Esetroot.c | 15 | ||||
| -rw-r--r-- | utils/Ettable.c | 8 |
2 files changed, 9 insertions, 14 deletions
diff --git a/utils/Esetroot.c b/utils/Esetroot.c index 00acb7c..6f5ac12 100644 --- a/utils/Esetroot.c +++ b/utils/Esetroot.c @@ -55,8 +55,7 @@ set_pixmap_property(Pixmap p) if (prop_root != None && prop_esetroot != None) { XGetWindowProperty(Xdisplay, Xroot, prop_root, 0L, 1L, False, AnyPropertyType, &type, &format, &length, &after, &data_root); if (type == XA_PIXMAP) { - XGetWindowProperty(Xdisplay, Xroot, prop_esetroot, 0L, 1L, False, AnyPropertyType, - &type, &format, &length, &after, &data_esetroot); + XGetWindowProperty(Xdisplay, Xroot, prop_esetroot, 0L, 1L, False, AnyPropertyType, &type, &format, &length, &after, &data_esetroot); if (data_root && data_esetroot) { if (debug) { fprintf(stderr, "%s:%d: set_pixmap_property(0x%08x): data_root == 0x%08x, data_esetroot == 0x%08x\n", __FILE__, @@ -64,8 +63,7 @@ set_pixmap_property(Pixmap p) } if (type == XA_PIXMAP && *((Pixmap *) data_root) == *((Pixmap *) data_esetroot)) { if (debug) { - fprintf(stderr, "%s:%d: set_pixmap_property(0x%08x): XKillClient() is being called.\n", __FILE__, __LINE__, - (unsigned int) p); + fprintf(stderr, "%s:%d: set_pixmap_property(0x%08x): XKillClient() is being called.\n", __FILE__, __LINE__, (unsigned int) p); } XKillClient(Xdisplay, *((Pixmap *) data_root)); } @@ -84,8 +82,7 @@ set_pixmap_property(Pixmap p) XChangeProperty(Xdisplay, Xroot, prop_root, XA_PIXMAP, 32, PropModeReplace, (unsigned char *) &p, 1); XChangeProperty(Xdisplay, Xroot, prop_esetroot, XA_PIXMAP, 32, PropModeReplace, (unsigned char *) &p, 1); if (debug) { - fprintf(stderr, "%s:%d: set_pixmap_property(0x%08x): _XROOTPMAP_ID and ESETROOT_PMAP_ID set to 0x%08x.\n", __FILE__, __LINE__, - (unsigned int) p, (unsigned int) p); + fprintf(stderr, "%s:%d: set_pixmap_property(0x%08x): _XROOTPMAP_ID and ESETROOT_PMAP_ID set to 0x%08x.\n", __FILE__, __LINE__, (unsigned int) p, (unsigned int) p); } XSetCloseDownMode(Xdisplay, RetainPermanent); XFlush(Xdisplay); @@ -147,15 +144,13 @@ main(int argc, char *argv[]) if (debug) { fprintf(stderr, "%s:%d: Display name is \"%s\"\n", __FILE__, __LINE__, displayname ? displayname : "(nil)"); fprintf(stderr, "%s:%d: Background color name is \"%s\"\n", __FILE__, __LINE__, bgcolor ? bgcolor : "(nil)"); - fprintf(stderr, "%s:%d: Image will be %s\n", __FILE__, __LINE__, - scale ? "scaled" : (center ? "centered" : (fit ? "fit" : "tiled"))); + fprintf(stderr, "%s:%d: Image will be %s\n", __FILE__, __LINE__, scale ? "scaled" : (center ? "centered" : (fit ? "fit" : "tiled"))); fprintf(stderr, "%s:%d: Image file is %s\n", __FILE__, __LINE__, fname ? fname : "(nil)"); } if (!displayname) { displayname = getenv("DISPLAY"); if (debug) { - fprintf(stderr, "%s:%d: Display name set to %s via getenv(\"DISPLAY\")\n", __FILE__, __LINE__, - displayname ? displayname : "(nil)"); + fprintf(stderr, "%s:%d: Display name set to %s via getenv(\"DISPLAY\")\n", __FILE__, __LINE__, displayname ? displayname : "(nil)"); } } if (!displayname) { diff --git a/utils/Ettable.c b/utils/Ettable.c index 354bc2c..f4a36db 100644 --- a/utils/Ettable.c +++ b/utils/Ettable.c @@ -27,10 +27,10 @@ static const char cvs_ident[] = "$Id$"; #include <stdio.h> const char *lookup[] = { - "NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL", /* 0-7 */ - "BS", "HT", "LF", "VT", "FF", "CR", "SO", "SI", /* 8-15 */ - "DLE", "DC1", "DC2", "DC3", "DC4", "NAK", "SYN", "ETB", /* 16-23 */ - "CAN", "EM", "SUB", "ESC", "FS", "GS", "RS", "US" /* 24-31 */ + "NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL", /* 0-7 */ + "BS", "HT", "LF", "VT", "FF", "CR", "SO", "SI", /* 8-15 */ + "DLE", "DC1", "DC2", "DC3", "DC4", "NAK", "SYN", "ETB", /* 16-23 */ + "CAN", "EM", "SUB", "ESC", "FS", "GS", "RS", "US" /* 24-31 */ }; int |