diff options
author | Michael Jennings <mej@kainx.org> | 2009-11-13 06:11:52 +0000 |
---|---|---|
committer | Michael Jennings <mej@kainx.org> | 2009-11-13 06:11:52 +0000 |
commit | d9da90c06dd1eaf9423928fa927c68407b571fd5 (patch) | |
tree | 69d774498dc051afe46de9dd20931d5fd45b7bb8 | |
parent | 7415528f522ef00934f7a61cda2ce303a992ff9e (diff) | |
download | eterm-d9da90c06dd1eaf9423928fa927c68407b571fd5.tar.gz |
Thu Nov 12 22:11:49 2009 Michael Jennings (mej)
Additional debugging and proper bracing.
----------------------------------------------------------------------
SVN revision: 43652
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | src/command.h | 2 | ||||
-rw-r--r-- | src/libscream.c | 19 |
3 files changed, 19 insertions, 6 deletions
@@ -5638,3 +5638,7 @@ Thu Nov 12 16:23:46 2009 Michael Jennings (mej) Gearing up for 0.9.6 release. ---------------------------------------------------------------------- +Thu Nov 12 22:11:49 2009 Michael Jennings (mej) + +Additional debugging and proper bracing. +---------------------------------------------------------------------- diff --git a/src/command.h b/src/command.h index 4b40713..f7d91e3 100644 --- a/src/command.h +++ b/src/command.h @@ -269,7 +269,7 @@ if (test) PrivateModes |= (bit); else PrivateModes &= ~(bit);} while (0) #define CHARS_READ() (cmdbuf_ptr < cmdbuf_endp) #define CHARS_BUFFERED() (count != CMD_BUF_SIZE) #define RETURN_CHAR() do { \ - char c = *cmdbuf_ptr++; \ + unsigned char c = *cmdbuf_ptr++; \ refreshed = 0; \ if (c < 32) D_VT(("RETURN_CHAR(): \'%s\' (%d 0x%02x %03o)\n", get_ctrl_char_name(c), c, c, c)); \ else D_VT(("RETURN_CHAR(): \'%c\' (%d 0x%02x %03o)\n", c, c, c, c)); \ diff --git a/src/libscream.c b/src/libscream.c index 85096e3..0bed826 100644 --- a/src/libscream.c +++ b/src/libscream.c @@ -1489,6 +1489,7 @@ ns_attach_by_URL(char *url, char *hop, _ns_efuns ** ef, int *err, void *xd) #warning compiling in libscream #ifdef NS_HAVE_SCREEN if (!strcmp(sess->proto, "screen")) { + D_ESCREEN(("Using session protocol \"%s\"\n", sess->proto)); sess->backend = NS_MODE_SCREEN; } else #warning compiling in support for GNU screen @@ -1498,6 +1499,7 @@ ns_attach_by_URL(char *url, char *hop, _ns_efuns ** ef, int *err, void *xd) if (!strcmp(sess->proto, "twin")) { char *twd = getenv("TWDISPLAY"); + D_ESCREEN(("Using session protocol \"%s\"\n", sess->proto)); sess->backend = NS_MODE_TWIN; /* fall back on TWDISPLAY env var only if host not set yet */ @@ -1524,6 +1526,7 @@ ns_attach_by_URL(char *url, char *hop, _ns_efuns ** ef, int *err, void *xd) } else #endif if (!strcmp(sess->proto, "scream")) { + D_ESCREEN(("Using session protocol \"%s\"\n", sess->proto)); sess->backend = NS_MODE_SCREAM; } else { *err = NS_UNKNOWN_PROTO; @@ -1531,6 +1534,8 @@ ns_attach_by_URL(char *url, char *hop, _ns_efuns ** ef, int *err, void *xd) fprintf(stderr, "protocol \"%s\" not known...\n", sess->proto); goto fail; } + } else { + D_ESCREEN(("No session protocol specified.\n")); } if ((sess->disp < 0) || (sess->disp > NS_MAX_PORT)) @@ -3130,9 +3135,10 @@ ns_parse_screen_msg(_ns_sess * screen, char *p) } else if (!strcmp(p, "New screen...") || !strncmp(p, "msgwait", strlen("msgwait")) || !strncmp(p, "msgminwait", strlen("msgminwait")) || - !strcmp(p, "Press ^@ to destroy or ^@ to resurrect window") || !strcmp(p, "Aborted because of window size change.")) + !strcmp(p, "Press ^@ to destroy or ^@ to resurrect window") + || !strcmp(p, "Aborted because of window size change.")) { p = NULL; - else if ((screen->flags & NS_SESS_NO_MON_MSG) && + } else if ((screen->flags & NS_SESS_NO_MON_MSG) && ((sscanf(p, "Window %d (%s) is now being monitored for all activity.", &n, win) == 2) || (sscanf(p, "Window %d (%s) is no longer being monitored for activity.", &n, win) == 2))) { D_ESCREEN(("activity toggled quietly for window %d-%s\n", n, win)); @@ -3163,16 +3169,17 @@ ns_parse_screen_msg(_ns_sess * screen, char *p) p = NULL; D_ESCREEN(("ns_parse_screen_msg: scre%s %d.%2d.%2d %s a/o %s -> mode %d\n", vtype, ma, mi, mu, vrem, vdate, screen->backend)); - } else if (!strcmp(p, NS_SCREEN_NO_DEBUG)) + } else if (!strcmp(p, NS_SCREEN_NO_DEBUG)) { p = "debug info was not compiled into \"screen\"..."; - else if (!strncmp(p, NS_SCREEN_DK_CMD_T, strlen(NS_SCREEN_DK_CMD_T))) { + } else if (!strncmp(p, NS_SCREEN_DK_CMD_T, strlen(NS_SCREEN_DK_CMD_T))) { p[strlen(p) - 1] = '\0'; p2 = &p[strlen(NS_SCREEN_DK_CMD_T)]; p = "unknown screen statement ignored"; } if (p) { /* status. send to status-line or dialog or whatever */ - if (NS_EFUN_EXISTS(efuns, screen, NULL, err_msg)) + if (NS_EFUN_EXISTS(efuns, screen, NULL, err_msg)) { ret = efuns->err_msg(NULL, type, p); + } } return ret; } @@ -3220,6 +3227,8 @@ ns_parse_screen(_ns_sess * screen, int force, int width, char *p) if (!force && screen->timestamp) return NS_SUCC; + D_ESCREEN(("ns_parse_screen(0x%08x, %d, %d, \"%s\")\n", screen, force, width, + safe_print_string(p, width))); if ((p = STRDUP(p))) { _ns_parse pd[NS_MAX_DISPS]; |