X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=pctb%2Fpages.c;h=361ea0ea9926b4cf576d1cdaedfafa5e00370477;hp=9b05fcd046ae5989f25f1c9695837b66e910e619;hb=0826bbc65e59d47c270f05af419f24fdfc3c349c;hpb=cd124e1675276f26b594f23367da63637673698f

diff --git a/pctb/pages.c b/pctb/pages.c
index 9b05fcd..361ea0e 100644
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -1,7 +1,7 @@
 /*
   */
 
-#include "ocr.h"
+#include "structure.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/XTest.h>
@@ -22,54 +22,16 @@ static KeyCode keycode(KeySym sym) {
   return XKeysymToKeycode(disp,sym);
 }
 
-#if 0
-static void check_exitstatus(int st) {
-  eassert(WIFEXITED(st));
-  eassert(!WEXITSTATUS(st));
-}
-
-static void check_pclose(FILE *f, char *cmd) {
-  int r;
-  eassert(!ferror(f));
-  r= fgetc(f);  eassert(r==EOF);  eassert(feof(f));
-  r= pclose(f);  eassert(r>=0);  check_exitstatus(r);
-  free(cmd);
-}
-
-static CanonImage *screenshot_now(void) {
-  char *cmd;
-  CanonImage *ci;
-  int r;
-  
-  r= asprintf(&cmd, "xwd -silent -id 0x%lx | xwdtopnm", (unsigned long)id);
-  eassert(r>=0);
-  FILE *f= popen(cmd,"r");  eassert(f);
-  ci= file_read_image(f);
-  check_pclose(f, cmd);
-  return ci;
-}
-#endif
-
-static void screenshot_startup(void) {
+void screenshot_startup(void) {
   int r;
   disp= XOpenDisplay(0);  eassert(disp);
   r= gettimeofday(&tv_startup,0);  eassert(!r);
 }
 
-#if 0
-static CanonImage *single_page(void) {
-  int r;
-  r= XRaiseWindow(disp, id);  eassert(r);
-  r= XSync(disp, False);  eassert(r);
-  return screenshot_now();
-}
-#endif
-
 /*---------- pager ----------*/
 
 typedef XImage Snapshot;
 
-//static size_t snapshot_alloc= 1024;
 static double last_input;
 static const double min_update_allowance= 0.25;
 
@@ -224,24 +186,20 @@ static void set_focus(void) {
   fprintf(stderr,"PAGING raise_and_set_focus done.\n");
 }
 
+#define SAMPLEMASK 0xfful
+
 typedef struct {
-  unsigned long mask;
   int lshift, rshift;
 } ShMask;
 
-static void compute_shift_mask(ShMask *sm, int targshift,
-			       unsigned long ximage_mask) {
-  unsigned long below;
-  
+static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) {
   sm->lshift= 0;
   sm->rshift= 0;
-  sm->mask= 0xfful << targshift;
-  below= ~0ul << targshift;
   
   for (;;) {
-    if (ximage_mask < sm->mask) {
+    if (ximage_mask <= (SAMPLEMASK>>1)) {
       sm->lshift++;  ximage_mask <<= 1;
-    } else if ((ximage_mask & ~below) > sm->mask) {
+    } else if (ximage_mask > SAMPLEMASK) {
       sm->rshift++;  ximage_mask >>= 1;
     } else {
       break;
@@ -256,25 +214,36 @@ static CanonImage *convert_page(Snapshot *sn) {
   ShMask shiftmasks[3];
   CanonImage *im;
 
-#define COMPUTE_SHIFT_MASK(ix, targshift, rgb) \
-  compute_shift_mask(&shiftmasks[ix], targshift, sn->rgb##_mask)
-  COMPUTE_SHIFT_MASK(0, 16, red);
-  COMPUTE_SHIFT_MASK(1, 8,  green);
-  COMPUTE_SHIFT_MASK(2, 0,  blue);
+  fprintf(screenshots_file,
+	  "P6\n"
+	  "%d %d\n"
+	  "255\n", sn->width, sn->height);
+
+#define COMPUTE_SHIFT_MASK(ix, rgb) \
+  compute_shift_mask(&shiftmasks[ix], sn->rgb##_mask)
+  COMPUTE_SHIFT_MASK(0, red);
+  COMPUTE_SHIFT_MASK(1, green);
+  COMPUTE_SHIFT_MASK(2, blue);
 
   CANONICALISE_IMAGE(im, sn->width, sn->height, {
     long xrgb= XGetPixel(sn, x, y);
     int i;
     rgb= 0;
-    for (i=0; i<3; i++)
-      rgb |= ((xrgb << shiftmasks[i].lshift)
-	      >> shiftmasks[i].rshift) & shiftmasks[i].mask;
+    for (i=0; i<3; i++, rgb <<= 8) {
+      unsigned long sample=
+	((xrgb << shiftmasks[i].lshift)
+	      >> shiftmasks[i].rshift) & SAMPLEMASK;
+      rgb |= sample;
+      fputc(sample, screenshots_file);
+    }
   });
 
+  eassert(!fflush(screenshots_file));
+
   return im;
 }
 
-static void read_pages(void) {
+void take_screenshots(void) {
   Snapshot *current=0, *last=0;
   CanonImage *test;
 
@@ -312,12 +281,21 @@ static void read_pages(void) {
   fprintf(stderr,"PAGING all done.\n");
 }    
 
-int main(int argc, char **argv) {
-  screenshot_startup();
-
-  id= strtoul(*++argv,0,0);
+void take_one_screenshot(void) {
+  Snapshot *current=0;
+  
+  raise_and_get_details();
+  sync_after_input();
+  snapshot(&current);
+  page_images[0]= convert_page(current);
+  npages= 1;
+}
 
-  read_pages();
-  return 0;
+void set_yppclient_window(unsigned long wul) {
+  id= wul;
 }
 
+void find_yppclient_window(void) {
+  if (id) return;
+  eassert(!"finding client window NYI");
+}