X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=cm.c;h=b9b2050266fced91e61fc8854426ee3cedd87fbc;hb=ad83dd5c4803f74a7ba386323b8bfcad1d4ff0da;hp=cce8c273e4fa6e735761e33a9296cd2f7d09c6bd;hpb=44dd379c34397c469c587ea622c5e34d9b46fa30;p=checkmail.git diff --git a/cm.c b/cm.c index cce8c27..b9b2050 100644 --- a/cm.c +++ b/cm.c @@ -1,9 +1,11 @@ /* * Incoming Mail Checker * - * (c) 2005--2007 Martin Mares + * (c) 2005--2010 Martin Mares */ +#define _GNU_SOURCE + #include #include #include @@ -16,14 +18,23 @@ #include #include #include +#include +#include + +#ifdef CONFIG_WIDE_CURSES +#include +#else #include +#endif #include "util.h" #include "clists.h" +#include "charset.h" static int check_interval = 30; static int force_refresh; static int allow_bells = 1; +static int allow_osd = 1; static int minimum_priority; static time_t last_scan_time; static char *run_cmd = "mutt -f %s"; @@ -36,6 +47,11 @@ struct options { int beep; int snippets; int show_flagged; + int sender_personal; + int sender_mbox; + int hotkey; + int led; + int osd; }; struct option_node { @@ -51,7 +67,9 @@ struct pattern_node { }; static clist options, patterns; -static struct options global_options; +static struct options global_options = { + .sender_personal = 1 +}; struct mbox { cnode n; @@ -64,7 +82,7 @@ struct mbox { time_t last_time; int last_size, last_pos; int total, new, flagged; - int last_total, last_new; + int last_total, last_new, last_flagged; int last_beep_new; int force_refresh; int snippet_is_new; @@ -75,6 +93,14 @@ static clist mboxes; static struct mbox **mbox_array; static int num_mboxes, mbox_array_size; +struct osd_opt_node { + cnode n; + char *val; + char key[1]; +}; + +static clist osd_opts; + static void redraw_line(int i); static void rethink_display(void); @@ -114,6 +140,11 @@ init_options(struct options *o) o->highlight = -1; o->snippets = -1; o->show_flagged = -1; + o->sender_personal = -1; + o->sender_mbox = -1; + o->hotkey = -1; + o->led = -1; + o->osd = -1; } static void @@ -132,9 +163,26 @@ setup_options(struct mbox *b) MERGE(beep); MERGE(snippets); MERGE(show_flagged); + MERGE(sender_personal); + MERGE(sender_mbox); + MERGE(hotkey); + MERGE(led); + MERGE(osd); } } +static void +add_osd_opt(char *arg) +{ + struct osd_opt_node *n = xmalloc(sizeof(*n) + strlen(arg)); + strcpy(n->key, arg); + n->val = strchr(n->key, '='); + if (!n->val) + die("Malformed OSD option"); + *n->val++ = 0; + clist_add_tail(&osd_opts, &n->n); +} + static char * mbox_name(char *path) { @@ -203,35 +251,6 @@ mbox_visible_p(struct mbox *b) return 1; } -static void -add_snippet(char **ppos, char *term, unsigned char *add) -{ - char *pos = *ppos; - int space = 1; - while (*add && pos < term) - { - if (*add <= ' ') - { - if (!space) - *pos++ = ' '; - space = 1; - } - else if (*add >= 0x7f) - { - *pos++ = '?'; - space = 0; - } - else - { - *pos++ = *add; - space = 0; - } - add++; - } - *ppos = pos; - *pos = 0; -} - static void prepare_snippet(struct mbox *b, char *sender, char *subject) { @@ -242,13 +261,13 @@ prepare_snippet(struct mbox *b, char *sender, char *subject) char *pos = b->snippet; char *term = b->snippet + sizeof(b->snippet) - 1; - if (sender[0]) + if (sender[0] && (b->o.sender_mbox || b->o.sender_personal)) { - add_snippet(&pos, term, sender); + add_addr_snippet(&pos, term, sender, b->o.sender_mbox, b->o.sender_personal); add_snippet(&pos, term, ": "); } if (subject[0]) - add_snippet(&pos, term, subject); + add_subject_snippet(&pos, term, subject); else add_snippet(&pos, term, "No subject"); } @@ -323,28 +342,58 @@ scan_mbox(struct mbox *b, struct stat *st) { char buf[1024], sender[1024], subject[1024]; int c; + int compressed = 0; const char from[] = "\nFrom "; if (!st->st_size) { - b->total = b->new = 0; + b->total = b->new = b->flagged = 0; b->last_pos = 0; return; } - /* FIXME: Locking! */ + /* FIXME: Should we do some locking? */ mb_fd = open(b->path, O_RDONLY); if (mb_fd < 0) { debug("[open failed: %m] "); - b->total = b->new = -1; + b->total = b->new = b->flagged = -1; return; } + + char signature[2]; + c = read(mb_fd, signature, 2); + lseek(mb_fd, 0, SEEK_SET); + + if (c == 2 && !memcmp(signature, "\037\213", 2)) //gzip + { + debug("[decompressing] "); + int fds[2]; + if (pipe(fds)) + die("pipe failed: %m"); + int pid = fork(); + if (pid < 0) + die("fork failed: %m"); + if (!pid) + { + if (dup2(mb_fd, 0) < 0 || dup2(fds[1], 1) < 0) + die("dup2 failed: %m"); + close(fds[0]); + close(fds[1]); + close(mb_fd); + execlp("gzip", "gzip", "-cd", NULL); + die("Cannot execute gzip: %m"); + } + close(fds[1]); + close(mb_fd); + mb_fd = fds[0]; + compressed = 1; + } mb_reset(0); int incremental = 0; - if (b->last_size && b->last_pos && st->st_size > b->last_size && !b->force_refresh) + if (b->last_size && b->last_pos && st->st_size > b->last_size && !b->force_refresh && !compressed) { mb_seek(b->last_pos); if (mb_check(from, 6)) @@ -363,17 +412,18 @@ scan_mbox(struct mbox *b, struct stat *st) if (!mb_check(from+1, 5)) { debug("[inconsistent] "); - b->total = b->new = -1; + b->total = b->new = b->flagged = -1; goto done; } - b->total = b->new = 0; - b->last_total = b->last_new = 0; + b->total = b->new = b->flagged = 0; + b->last_total = b->last_new = b->last_flagged = 0; b->snippet_is_new = 0; } else { b->total = b->last_total; b->new = b->last_new; + b->flagged = b->last_flagged; } for(;;) @@ -383,6 +433,7 @@ scan_mbox(struct mbox *b, struct stat *st) b->last_pos--; // last_pos should be the previous \n character b->last_total = b->total; b->last_new = b->new; + b->last_flagged = b->flagged; while ((c = mb_get()) >= 0 && c != '\n') ; @@ -457,6 +508,12 @@ scan_mbox(struct mbox *b, struct stat *st) done: close(mb_fd); + if (compressed) + { + int status; + if (wait(&status) < 0 || !WIFEXITED(status) || WEXITSTATUS(status)) + b->total = b->new = b->flagged = -1; + } } static void @@ -515,7 +572,7 @@ scan(void) b->force_refresh = 1; if (stat(b->path, &st) < 0) { - b->total = b->new = -1; + b->total = b->new = b->flagged = -1; debug("%m\n"); } else if (!b->last_time || st.st_mtime != b->last_time || st.st_size != b->last_size || b->force_refresh) @@ -527,7 +584,7 @@ scan(void) scan_mbox(b, &st); b->last_time = st.st_mtime; b->last_size = st.st_size; - debug("%d %d (stopped at %d of %d)\n", b->total, b->new, b->last_pos, b->last_size); + debug("%d %d %d (stopped at %d of %d)\n", b->total, b->new, b->flagged, b->last_pos, b->last_size); b->scanning = 0; redraw_line(b->index); @@ -544,6 +601,146 @@ scan(void) rethink_display(); } +#ifdef CONFIG_X11 + +#include +#include + +static Display *x11_dpy; +static unsigned leds_care, leds_have, leds_want; +static unsigned osd_care, osd_have, osd_want; +static Atom osd_pty; + +static void +x11_init(void) +{ + leds_care = (global_options.led >= 0 ? (1 << global_options.led) : 0); + osd_care = (global_options.osd >= 0); + CLIST_FOR_EACH(struct option_node *, o, options) + { + if (o->o.led > 0) + leds_care |= (1 << o->o.led); + if (o->o.osd > 0) + osd_care = 1; + } + + if (!leds_care && !osd_care) + { + debug("X11: No mailbox wants LEDs or OSD\n"); + return; + } + if (!getenv("DISPLAY")) + { + debug("X11: Do not have X display\n"); + return; + } + if (!(x11_dpy = XOpenDisplay(NULL))) + die("Cannot open X display, although the DISPLAY variable is set"); + + if (osd_care) + { + osd_pty = XInternAtom(x11_dpy, "OSD_QUEUE", False); + if (!osd_pty) + die("Cannot intern OSD_QUEUE atom"); + + // If OSD options contain no message, add one + int seen_msg = 0; + CLIST_FOR_EACH(struct osd_opt_node *, n, osd_opts) + if (!n->key[0]) + seen_msg = 1; + if (!seen_msg) + add_osd_opt("=You have new mail"); + } + + leds_have = ~0U; + debug("X11: Initialized\n"); +} + +static void +sync_leds(void) +{ + if (leds_want == leds_have) + return; + + debug("LEDS: have %02x, want %02x, care %02x\n", leds_have, leds_want, leds_care); + for (int i=1; i<10; i++) + if (leds_care & (leds_have ^ leds_want) & (1 << i)) + { + XKeyboardControl cc; + cc.led = i; + cc.led_mode = (leds_want & (1 << i)) ? LedModeOn : LedModeOff; + XChangeKeyboardControl(x11_dpy, KBLed | KBLedMode, &cc); + } + XFlush(x11_dpy); + leds_have = leds_want; +} + +static void +sync_osd(void) +{ + if (!osd_want || !allow_osd) + { + osd_have = 0; + return; + } + if (osd_have) + return; + debug("OSD: Displaying\n"); + + char msg[1024]; + unsigned pos = 0; + CLIST_FOR_EACH(struct osd_opt_node *, n, osd_opts) + { + pos += snprintf(msg+pos, sizeof(msg)-pos-1, "%s:%s\n", n->key, n->val); + if (pos > sizeof(msg)-1) + { + pos = sprintf(msg, "OSD message too long!\n"); + break; + } + } + msg[pos++] = '\n'; + + XChangeProperty(x11_dpy, DefaultRootWindow(x11_dpy), osd_pty, XA_STRING, 8, PropModeAppend, (unsigned char *) msg, pos); + XFlush(x11_dpy); +} + +static void +rethink_leds(void) +{ + if (!x11_dpy) + return; + + leds_want = 0; + osd_want = 0; + CLIST_FOR_EACH(struct mbox *, b, mboxes) + { + if (b->o.led > 0 && b->new) + leds_want |= (1 << b->o.led); + if (b->o.osd > 0 && b->new) + osd_want = 1; + } + sync_leds(); + sync_osd(); +} + +static void +x11_cleanup(void) +{ + if (!x11_dpy) + return; + + leds_want = 0; + sync_leds(); +} + +#else + +static void x11_init(void) { } +static void rethink_leds(void) { } +static void x11_cleanup(void) { } + +#endif + static int cursor_at, cursor_max; enum { @@ -567,13 +764,15 @@ redraw_line(int i) int hi = b->o.highlight; attrset(attrs[cc][hi][M_IDLE]); - if (cc) + if (b->o.hotkey) + printw("%c ", b->o.hotkey); + else if (cc) printw("> "); else printw(" "); if (b->new) attrset(attrs[cc][hi][M_NEW]); - else if (b->flagged) + else if (b->flagged && b->o.show_flagged) attrset(attrs[cc][hi][M_FLAG]); printw("%-20s ", b->name); if (b->scanning < 0) @@ -609,13 +808,14 @@ redraw_line(int i) printw(" "); snip = 1; } - else if (b->flagged) + else if (b->flagged && b->o.show_flagged) { attrset(attrs[cc][hi][M_FLAG]); printw("%6d ", b->flagged); attrset(attrs[cc][hi][M_IDLE]); printw(" "); - snip = b->o.show_flagged; + attrset(attrs[cc][0][M_FLAG]); /* We avoid the highlight intentionally */ + snip = 1; } if (snip && b->o.snippets && b->snippet[0]) { @@ -623,7 +823,16 @@ redraw_line(int i) getyx(stdscr, yy, xx); int remains = COLS-1-xx; if (remains > 2) - printw("%-.*s", remains, b->snippet); + { +#ifdef CONFIG_WIDE_CURSES + size_t len = strlen(b->snippet)+1; + wchar_t snip[len]; + mbstowcs(snip, b->snippet, len); + addnwstr(snip, remains); +#else + printw("%-.*s", remains, b->snippet); +#endif + } } } } @@ -688,6 +897,7 @@ rethink_display(void) redraw_all(); refresh(); } + rethink_leds(); if (beeeep && allow_bells) beep(); } @@ -798,6 +1008,20 @@ next_active(int since, int step) move_cursor(besti); } +static void +mbox_run(struct mbox *b) +{ + char cmd[strlen(run_cmd) + strlen(b->path) + 16]; + sprintf(cmd, run_cmd, b->path); + term_cleanup(); + system(cmd); + term_init(); + redraw_all(); + refresh(); + b->force_refresh = 1; + scan_and_redraw(); +} + #define STR2(c) #c #define STR(c) STR2(c) @@ -814,15 +1038,21 @@ Options:\n\ -o =\tSet mailbox options\n\ -o \t\tSet default options for all mailboxes\n\ -p \t\tSet minimum priority to show\n\ +-s =\t\tSet on-screen display options (consult OSDD docs)\n\ \n\ Mailbox options (set with `-o', use upper case to negate):\n\ 0-9\t\t\tSet mailbox priority (0=default)\n\ b\t\t\tBeep when a message arrives\n\ +d\t\t\tSend an on-screen-display message (requires OSDD)\n\ e\t\t\tHide from display if empty\n\ f\t\t\tShow flagged messages if there are no new ones\n\ h\t\t\tHide from display\n\ +l\t\t\tLight a keyboard led (1-9) if running on X display\n\ +m\t\t\tShow mailbox name of the sender\n\ +p\t\t\tShow personal info (full name) of the sender\n\ s\t\t\tShow message snippets\n\ t\t\t\tHighlight the entry\n\ +!\t\t\tSet hot key\n\ \n\ CheckMail " STR(VERSION) ", (c) " STR(YEAR) " Martin Mares \n\ It can be freely distributed and used according to the GNU GPL v2.\n\ @@ -852,6 +1082,10 @@ parse_options(char *c) while (x = *c++) if (x >= '0' && x <= '9') o->priority = x - '0'; + else if (x == '!' && *c) + o->hotkey = *c++; + else if (x == 'l' && *c >= '1' && *c <= '9') + o->led = *c++ - '0'; else { int value = !!islower(x); @@ -860,6 +1094,9 @@ parse_options(char *c) case 'b': o->beep = value; break; + case 'd': + o->osd = value; + break; case 'e': o->hide_if_empty = value; break; @@ -869,6 +1106,12 @@ parse_options(char *c) case 'h': o->hide = value; break; + case 'm': + o->sender_mbox = value; + break; + case 'p': + o->sender_personal = value; + break; case 's': o->snippets = value; break; @@ -888,9 +1131,10 @@ main(int argc, char **argv) clist_init(&mboxes); clist_init(&options); clist_init(&patterns); + clist_init(&osd_opts); int c; - while ((c = getopt(argc, argv, "c:dim:o:p:")) >= 0) + while ((c = getopt(argc, argv, "c:dim:o:p:s:")) >= 0) switch (c) { case 'c': @@ -913,17 +1157,23 @@ main(int argc, char **argv) case 'p': minimum_priority = atol(optarg); break; + case 's': + add_osd_opt(optarg); + break; default: usage(); } while (optind < argc) add_pattern(argv[optind++]); + charset_init(); term_init(); + x11_init(); scan_and_redraw(); next_active(0, 1); int should_exit = 0; +restart: while (!should_exit) { time_t now = time(NULL); @@ -935,6 +1185,14 @@ main(int argc, char **argv) remains *= 10; halfdelay((remains > 255) ? 255 : remains); int ch = getch(); + for (int i=0; io.hotkey) + { + if (i < cursor_max) + cursor_at = i; + mbox_run(mbox_array[i]); + goto restart; + } switch (ch) { case 'q': @@ -967,18 +1225,7 @@ main(int argc, char **argv) case '\r': case '\n': if (cursor_at < cursor_max) - { - struct mbox *b = mbox_array[cursor_at]; - char cmd[strlen(run_cmd) + strlen(b->path) + 16]; - sprintf(cmd, run_cmd, b->path); - term_cleanup(); - system(cmd); - term_init(); - redraw_all(); - refresh(); - b->force_refresh = 1; - scan_and_redraw(); - } + mbox_run(mbox_array[cursor_at]); break; case 'l' & 0x1f: clearok(stdscr, TRUE); @@ -996,6 +1243,14 @@ main(int argc, char **argv) allow_bells = 0; print_status("Bells and whistles are now disabled. Pssst!"); break; + case 'd': + allow_osd = 1; + print_status("On-screen display is now enabled."); + break; + case 'D': + allow_osd = 0; + print_status("On-screen display is now disabled. Watch your step."); + break; default: if (ch >= '0' && ch <= '9') { @@ -1009,6 +1264,7 @@ main(int argc, char **argv) } } + x11_cleanup(); term_cleanup(); return 0; }