X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=pctb%2Fconvert.c;h=cd9c6521976385498e72311d84631432a5d10bbf;hp=95e75b3e613b55813df459168da9c55bd939a171;hb=a628ba6e81f90a4ebc632731bc5e39ca5daae7fb;hpb=f9c00eb882d1758e95422d8f40ef5606422cffa3 diff --git a/pctb/convert.c b/pctb/convert.c index 95e75b3..cd9c652 100644 --- a/pctb/convert.c +++ b/pctb/convert.c @@ -1,164 +1,139 @@ -#include -#include -#include -#include -#include -#define eassert assert -#define debug stdout +#include "convert.h" -typedef struct { - unsigned long rgb; /* on screen */ - char c; /* canonical */ -} CanonColourInfo; -static int height, width; -static char *image; - -static void debug_flush(void) { +void debug_flush(void) { eassert(!fflush(debug)); eassert(!ferror(debug)); } -typedef struct { - int x, y; -} Point; - -typedef struct { /* both inclusive */ - Point tl; - Point br; -} Rect; - -static inline char get(int x, int y) { return image[y * width + x]; } -static inline char get_p(Point p) { return get(p.x,p.y); } - - -static const CanonColourInfo canoncolourinfos[]= { - { 0x475A5E, '*' }, /* edge */ - { 0x2C5F7A, '*' }, /* edge just under box heading shadow */ - { 0x7D9094, '+' }, /* interbox */ - { 0xBDC5BF, ' ' }, /* background - pale */ - { 0xADB5AF, ' ' }, /* background - dark */ - { 0x000000, 'o' }, /* foreground */ - { 0xD4B356, ' ' }, /* background (cursor) */ - { 0xFFFFFF, 'o' }, /* foreground (cursor) */ - { 0,0 } -}; - -#define START_MAIN {200,200} - -static void require_rectangle(int tlx, int tly, int brx, int bry, char c) { - int x,y; - for (x=tlx; x<=brx; x++) - for (y=tly; y<=bry; y++) - eassert(get(x,y) == c); -} -static void require_rectangle_r(Rect rr, char c) { - require_rectangle(rr.tl.x,rr.tl.y, rr.br.x,rr.br.y, c); -} -static void debug_rect(const char *what, int whati, Rect rr) { - int y,r,w; - fprintf(debug, "%s %d: %d,%d..%d,%d:\n", what, whati, - rr.tl.x,rr.tl.y, rr.br.x,rr.br.y); - w= rr.br.x - rr.tl.x + 1; - for (y=rr.tl.y; y<=rr.br.y; y++) { - fprintf(debug, "%4d %4d ",y,y-rr.tl.y); - r= fwrite(image + y*width + rr.tl.x, 1, w, debug); - eassert(r==w); - fputc('|',debug); - fputc('\n',debug); +const char *get_vardir(void) { return "."; } + +static enum { + mf_findwindow= 01, + mf_screenshot= 02, + mf_analyse= 04, + + mode_findwindow= 01, + mode_screenshot= 03, + mode_analyse= 04, + + mode_all= 07, +} o_mode= mode_all; + +static char *o_screenshots_fn; +static int o_single_page, o_quiet; + +FILE *screenshots_file; + +int main(int argc, char **argv) { + const char *arg; + int r; + + while ((arg=*++argv)) { + if (!strcmp(arg,"--find-window-only")) + o_mode= mode_findwindow; + else if (!strcmp(arg,"--screenshot-only")) + o_mode= mode_screenshot; + else if (!strcmp(arg,"--analyse-only")) + o_mode= mode_analyse; + else if (!strcmp(arg,"--single-page")) + o_single_page= 1; + else if (!strcmp(arg,"--quiet")) + o_quiet= 1; + else if (!strcmp(arg,"--screenshots-file")) + eassert( o_screenshots_fn= *++argv ); +#define DF(f) \ + else if (!strcmp(arg,"-D" #f)) \ + debug_flags |= dbg_##f; + DEBUG_FLAG_LIST +#undef DF + else if (!strcmp(arg,"--window-id")) { + char *ep; + eassert((arg=*++argv)); + unsigned long windowid= strtoul(arg,&ep,0); + eassert(!*ep); + set_yppclient_window(windowid); + } else + eassert(!"bad option"); + } + + if (!o_screenshots_fn) { + r= asprintf(&o_screenshots_fn,"%s/#pages#.ppm",get_vardir()); + eassert(r>=0); eassert(o_screenshots_fn); + } + + if (o_mode & mf_findwindow) { + screenshot_startup(); + find_yppclient_window(); + } + if (o_mode & mf_screenshot) { + screenshots_file= fopen(o_screenshots_fn, "w"); eassert(screenshots_file); + if (o_single_page) take_one_screenshot(); + else take_screenshots(); + } else { + screenshots_file= fopen(o_screenshots_fn, "r"); eassert(screenshots_file); + if (o_single_page) read_one_screenshot(); + else read_screenshots(); + } + if (o_mode & mf_analyse) { + analyse(); + //output_tsv(); } - debug_flush(); + return 0; } -static void find_main_rectangle(void) { - Rect whole = { {0,0}, {width-1,height-1} }; - Rect mainr = { START_MAIN,START_MAIN }; -#define WALK_UNTIL(point,coord,increm,stop,edge) \ - for (;;) { \ - if (get_p((point)) == (edge)) { (point).coord -= (increm); break; } \ - eassert((point).coord != (stop)); \ - (point).coord += (increm); \ + + +DEFINE_VWRAPPERF(, progress) +DEFINE_VWRAPPERF(, progress_log) +DEFINE_VWRAPPERF(, progress_spinner) + +static int last_progress_len; + +static void vprogress_core(int spinner, const char *fmt, va_list al) { + int r; + + if (o_quiet) return; + if (!isatty(2)) return; + + if (last_progress_len) + putc('\r',stderr); + + r= vfprintf(stderr,fmt,al); + eassert(r>=0); + + if (spinner) { + putc(spinner,stderr); + r++; } - WALK_UNTIL(mainr.tl, x,-1, whole.tl.x, '*'); - WALK_UNTIL(mainr.tl, y,-1, whole.tl.y, '*'); - WALK_UNTIL(mainr.br, x,+1, whole.br.x, '*'); - WALK_UNTIL(mainr.br, y,+1, whole.br.y, '*'); - - require_rectangle(mainr.tl.x-1, mainr.tl.y, mainr.tl.x-1, mainr.br.y, '*'); - require_rectangle(mainr.br.x+1, mainr.tl.y, mainr.br.x+1, mainr.br.y, '*'); - require_rectangle(mainr.tl.x, mainr.tl.y-1, mainr.br.x, mainr.tl.y-1, '*'); - require_rectangle(mainr.tl.x, mainr.br.y+1, mainr.br.x, mainr.br.y+1, '*'); - -#define CHECK_STRIP_BORDER(tlbr,xy,increm) \ - do { \ - Point csb_p; \ - Rect csb_r; \ - csb_p= mainr.tl; \ - csb_p.xy= mainr.tlbr.xy; \ - if (get_p(csb_p)=='+') { \ - csb_r= mainr; \ - csb_r.tl.xy= csb_p.xy; \ - csb_r.br.xy= csb_p.xy; \ - require_rectangle_r(csb_r, '+'); \ - mainr.tlbr.xy += increm; \ - } \ - } while(0) - - debug_rect("mainr",0, mainr); - - CHECK_STRIP_BORDER(tl,x,+1); - CHECK_STRIP_BORDER(tl,y,+1); - CHECK_STRIP_BORDER(br,x,-1); - CHECK_STRIP_BORDER(br,y,-1); - - debug_rect("mainr",1, mainr); -} - -static void load_image_and_canonify(void) { - struct pam inpam; - unsigned char rgb[3]; - int x,y,r; - const CanonColourInfo *cci; - - pnm_readpaminit(stdin, &inpam, sizeof(inpam)); - height= inpam.height; - width= inpam.width; - eassert(inpam.maxval == 255); - eassert(inpam.bytes_per_sample == 1); - - image= malloc(width*height); - eassert(image); - memset(image,'?',width*height); - - for (y=0; yc; cci++) - if (cci->rgb == rgb_l) { - image[y*width + x]= cci->c; - break; - } - } - fprintf(debug, "%4d ",y); - r= fwrite(image + y*width, 1,width, debug); eassert(r==width); - fputc('\n',debug); + if (r < last_progress_len) { + fprintf(stderr,"%*s", last_progress_len - r, ""); + if (!r) putc('\r', stderr); + else while (last_progress_len-- > r) putc('\b',stderr); } - debug_flush(); + last_progress_len= r; + fflush(stderr); +} + +void vprogress(const char *fmt, va_list al) { vprogress_core(0,fmt,al); } +void vprogress_spinner(const char *fmt, va_list al) { + static const char spinchars[]="/-\\"; + static int spinner; + + vprogress_core(spinchars[spinner],fmt,al); + spinner++; + spinner %= (sizeof(spinchars)-1); } -int main(void) { - load_image_and_canonify(); - find_main_rectangle(); - /* - repeatedly_find_top_thing(); - */ - return 0; +void vprogress_log(const char *fmt, va_list al) { + if (o_quiet) return; + + progress(""); + vfprintf(stderr,fmt,al); + putc('\n',stderr); + fflush(stderr); }