X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fstructure.c;h=1f3c743319de029d342bbdbaa9bce1ec920047cb;hb=f23577a2c5659be8d42d87da85a6a62beb80cd3c;hp=2dc98d1c77a1590e0ae8d91e78eed19d4cbf90d0;hpb=49e1be1a94ba3dc9d951056ebec2784286d3e928;p=ypp-sc-tools.main.git

diff --git a/pctb/structure.c b/pctb/structure.c
index 2dc98d1..1f3c743 100644
--- a/pctb/structure.c
+++ b/pctb/structure.c
@@ -92,10 +92,16 @@ const CanonColourInfo canoncolourinfos[]= {
 
 static void mustfail1(const char *file, int line, const char *what) {
   fprintf(stderr,
-	  "\n\n"
-	  "Unable to figure out contents of YPP client display.\n"
-	  " Check that your client is logged in has the correct display.\n"
-	  " If that isn't the problem, please report this as a fault.\n\n"
+ "\n\n"
+ "Unable to figure out contents of YPP client display.\n"
+ "Please check the following:\n"
+ "   * YPP client is showing commodity listing screen\n"
+ "   * YPP client has antialiased text turned off (Ye / Options / General)\n"
+ "   * YPP client window is on top (we try to raise it but your window\n"
+ "      manager might have prevented that from succeeding)\n"
+ "   * Your X display is 24bpp (NB some VNC servers use 16bpp by default)\n"
+ "\n"
+ "If all of these are true, please report this as a fault.\n\n"
 	  "Technical details:"
 	  " %s:%d: requirement failed:\n"
 	  " %s\n",
@@ -127,20 +133,23 @@ static void mustfail2(void) {
 #define REQUIRE_RECTANGLE(tlx,tly,brx,bry,ok) \
  require_rectangle(tlx, tly, brx, bry, ok, __LINE__);
 
-static void require_rectangle(int tlx, int tly, int brx, int bry,
-			      const char *ok, int lineno) {
+#define FOR_P_RECT(p,rect)				\
+  for ((p).x=(rr).tl.x; (p).x<=(rr).br.x; (p).x++)	\
+    for ((p).y=(rr).tl.y; (p).y<=(rr).br.y; (p).y++)
+
+static void require_rectangle_r(Rect rr, const char *ok, int lineno) {
   Point p;
-  for (p.x=tlx; p.x<=brx; p.x++)
-    for (p.y=tly; p.y<=bry; p.y++) {
-      int c= get_p(p);
-      MUST( strchr(ok,c), ({
-	     Rect rm={{tlx,tly},{brx,bry}};
-	     MI(lineno),MR(rm);MP(p);MS(ok);
-      }));
-    }
+  FOR_P_RECT(p,rr) {
+    int c= get_p(p);
+    MUST( strchr(ok,c), ({
+      MI(lineno),MR(rr);MP(p);MS(ok);
+    }));
+  }
 }
-static void require_rectangle_r(Rect rr, const char *ok, int lineno) {
-  require_rectangle(rr.tl.x,rr.tl.y, rr.br.x,rr.br.y, ok, lineno);
+static void require_rectangle(int tlx, int tly, int brx, int bry,
+			      const char *ok, int lineno) {
+  Rect rr= {{tlx,tly},{brx,bry}};
+  require_rectangle_r(rr, ok, lineno);
 }
 
 static void debug_rect(const char *what, int whati, Rect rr) {
@@ -369,7 +378,6 @@ static void file_read_image_ppm(FILE *f) {
   struct pam inpam;
   unsigned char rgb_buf[3];
   CanonImage *im;
-  RgbImage *ri=0;
 
   pnm_readpaminit(f, &inpam, sizeof(inpam));
   if (!(inpam.maxval == 255 &&
@@ -377,9 +385,6 @@ static void file_read_image_ppm(FILE *f) {
 	inpam.format == RPPM_FORMAT))
     fatal("PNM screenshot(s) file must be 8bpp 1 byte per sample RGB");
 
-  if (!npages)
-    page0_rgbimage= ri= alloc_rgb_image(inpam.width, inpam.height);
-
   CANONICALISE_IMAGE(im, inpam.width, inpam.height, {
     int r= fread(&rgb_buf,1,3,f);
     sysassert(!ferror(f));
@@ -390,8 +395,6 @@ static void file_read_image_ppm(FILE *f) {
 	((unsigned long)rgb_buf[1]<<8) |
 	               (rgb_buf[2]);
 
-    if (ri)
-      CANONIMG_ALSO_STORERGB(ri);
   });
 
   sysassert(!ferror(screenshot_file));
@@ -547,12 +550,14 @@ Rect find_sunshine_widget(void) {
 }
 
 void find_islandname(RgbImage *ri) {
+  find_structure(page_images[0], 0);
+
   Rect sunshiner= find_sunshine_widget();
   char sunshine[MAXIMGIDENT], archisland[MAXIMGIDENT];
 
   const unsigned char *srcp;
   unsigned char *destp, *endp;
-  for (srcp=page0_rgbimage->data, destp=ri->data,
+  for (srcp=page_images[0]->rgb->data, destp=ri->data,
 	 endp= ri->data + 3 * ri->w * ri->h;
        destp < endp;
        srcp++, destp++) {
@@ -628,6 +633,7 @@ void find_islandname(RgbImage *ri) {
     Point p;
     int nspaces=1, might_be_colon=0;
     uint32_t colon_pattern= 0;
+    p.y=-1;
 
     for (p.x=islandnamer.br.x; p.x>islandnamer.tl.x; p.x--) {
       colondebugf("structcolon: x=%4d nsp=%2d mbc=%d cp=%08"PRIx32" ",
@@ -679,13 +685,11 @@ void find_islandname(RgbImage *ri) {
     islandnamer.br.x= p.x;
 
     identify_rgbimage(ri, islandnamer, archisland, "island");
-
-    assert(!"not vessel");
   }
 
   char *delim= strstr(archisland," - ");
   assert(delim);
-  archipelago= masprintf("%.*s", delim-archisland, archisland);
+  archipelago= masprintf("%.*s", (int)(delim-archisland), archisland);
   island= masprintf("%s", delim+3);
 
   free(ri);