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=80bc894559656714c48e6c90b2c193a44309d57a;hb=a628ba6e81f90a4ebc632731bc5e39ca5daae7fb;hpb=0051984495aa2a5ed61224a7618f5bbd04311f7a

diff --git a/pctb/convert.c b/pctb/convert.c
index 80bc894..cd9c652 100644
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -1,75 +1,139 @@
-#include <pam.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <assert.h>
-#include <string.h>
-
-#define eassert assert
-
-typedef struct {
-  unsigned long rgb; /* on screen */
-  char c; /* canonical */
-} CanonColourInfo;
-
-static const CanonColourInfo canoncolourinfos[]= {
-  { 0x475A5E, '*' }, /* edge */
-  { 0x7D9094, '+' }, /* interbox */
-  { 0xBDC5BF, ' ' }, /* background - pale */
-  { 0xADB5AF, ' ' }, /* background - dark */
-  { 0x000000, 'o' }, /* foreground */
-  { 0xD4B356, ' ' }, /* background (cursor) */
-  { 0xFFFFFF, 'o' }, /* foreground (cursor) */
-  { 0,0 }
-};
-
-static int height, width;
-static char *image;
-
-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; y<height; y++) {
-    for (x=0; x<width; x++) {
-      r= fread(&rgb,1,3,stdin);  eassert(r==3);
-      unsigned long rgb_l=
-	((unsigned long)rgb[0]<<16) |
-	((unsigned long)rgb[1]<<8) |
-	               (rgb[2]);
-      for (cci=canoncolourinfos; cci->c; cci++)
-	if (cci->rgb == rgb_l) {
-	  image[y*width + x]= cci->c;
-	  break;
-	}
-      if (y==234 && x==82) {
-	printf("y=%d/%d x=%d/%d rgb=%d,%d,%d rgb_l=%lx c=%c\n",
-	       y,height,x,width, rgb[0],rgb[1],rgb[2], rgb_l, image[y*width+x]);
-      }
-    }
-    r= fwrite(image + y*width, 1,width, stdout);  eassert(r==width);
-    putchar('\n');
-  }
-  eassert(!fflush(stdout));
-  eassert(!ferror(stdout));
+
+#include "convert.h"
+
+
+void debug_flush(void) {
+  eassert(!fflush(debug));
+  eassert(!ferror(debug));
 }
- 
-int main(void) {
-  load_image_and_canonify();
-  /*
-  find_main_rectangle();
-  repeatedly_find_top_thing();
-  */
+
+
+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();
+  }
   return 0;
 }
+
+
+
+
+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++;
+  }
+
+  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);
+  }
+  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);
+}
+
+void vprogress_log(const char *fmt, va_list al) {
+  if (o_quiet) return;
+  
+  progress("");
+  vfprintf(stderr,fmt,al);
+  putc('\n',stderr);
+  fflush(stderr);
+}