X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=pctb%2Fstructure.c;h=de7d3ce6939844ad39644ff307b42657d666068f;hp=66a669e5ae5d6ba30332c68676c2d6ba8a33a956;hb=fcb77d1400e798c5154251b44aabdecfc37bf839;hpb=a0695472f2c33e386f5591e1b3c49e2f3b772828 diff --git a/pctb/structure.c b/pctb/structure.c index 66a669e..de7d3ce 100644 --- a/pctb/structure.c +++ b/pctb/structure.c @@ -58,6 +58,8 @@ const CanonColourInfo canoncolourinfos[]= { { 0x6B828C, '*' }, /* background of ship status meter area */ { 0x934405, '*' }, /* border of ship meter area */ { 0x7D9094, '+' }, /* interbox */ + { 0x022158, 'O' }, /* ahoy /w output foreground */ + { 0xB5B686, 'H' }, /* ahoy /w output heading background */ { 0xBDC5BF, ' ' }, /* background - pale Sugar cane, etc. */ { 0xADB5AF, ' ' }, /* background - dark */ @@ -90,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", @@ -521,23 +529,11 @@ void analyse(FILE *tsv_output) { //static Rect islandnamer; -void find_islandname(void) { - Rect sunshiner; - char sunshine[MAXIMGIDENT], archisland[MAXIMGIDENT]; +DEBUG_DEFINE_SOME_DEBUGF(structcolon,colondebugf) - RgbImage *ri= alloc_rgb_image(page0_rgbimage->w, page0_rgbimage->h); - const unsigned char *srcp; - unsigned char *destp, *endp; - for (srcp=page0_rgbimage->data, destp=ri->data, - endp= ri->data + 3 * ri->w * ri->h; - destp < endp; - srcp++, destp++) { - unsigned char c= *srcp & 0xf0; - *destp= c | (c>>4); - } +Rect find_sunshine_widget(void) { + Rect sunshiner; - cim= page_images[0]; - sunshiner.tl.x= cim->w - 1034 + 885; sunshiner.br.x= cim->w - 1034 + 1020; sunshiner.tl.y= 227; @@ -553,6 +549,22 @@ void find_islandname(void) { ADJUST_BOX(sunshiner,"o",20, (cim->w - 1034 + 700), MUST, tl,x,-1); ADJUST_BOX(sunshiner,"o",20, cim->w, MUST, br,x,+1); debug_rect("sunshiner",1, sunshiner); + return sunshiner; +} + +void find_islandname(RgbImage *ri) { + 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, + endp= ri->data + 3 * ri->w * ri->h; + destp < endp; + srcp++, destp++) { + unsigned char c= *srcp & 0xf0; + *destp= c | (c>>4); + } identify_rgbimage(ri, sunshiner, sunshine, "sunshine widget"); @@ -589,6 +601,92 @@ void find_islandname(void) { identify_rgbimage(ri, islandnamer, archisland, "island"); } else { + Rect islandnamer; + + islandnamer.tl.x= (sunshiner.tl.x + sunshiner.br.x) / 2; + islandnamer.tl.y= sunshiner.tl.y + 100; + islandnamer.br= islandnamer.tl; + debug_rect("islandnamer",__LINE__, islandnamer); + + WALK_UNTIL_MUST(islandnamer.tl,y, -1, sunshiner.br.y, 'H'); + WALK_UNTIL_MUST(islandnamer.tl,x, -1, 0, 'o'); + WALK_UNTIL_MUST(islandnamer.br,x, +1, cim->w, 'o'); + debug_rect("islandnamer",__LINE__, islandnamer); + + require_rectangle_r(islandnamer, "O*", __LINE__); + + int rw= RECT_W(islandnamer); + ADJUST_BOX(islandnamer,"O",rw-4, cim->h, MUST,br,y,+1); + debug_rect("islandnamer",__LINE__, islandnamer); + + islandnamer.br.y += 2; + ADJUST_BOX(islandnamer,"O",1, cim->h, MUST,br,y,+1); + debug_rect("islandnamer",__LINE__, islandnamer); + + islandnamer.tl.y= islandnamer.br.y-1; + islandnamer.br.y= islandnamer.br.y+1; + ADJUST_BOX(islandnamer,"*",rw, cim->h, MUST,br,y,+1); + ADJUST_BOX(islandnamer,"O",1, cim->w, MUST,tl,x,+1); + debug_rect("islandnamer",__LINE__, islandnamer); + + MUST( RECT_H(islandnamer) <= 31, MR(islandnamer)); + + 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" ", + p.x, nspaces, might_be_colon, colon_pattern); + + uint32_t pattern=0; + int runs[32], nruns=0; + runs[0]=0; runs[1]=0; + + for (p.y=islandnamer.tl.y; p.y<=islandnamer.br.y; p.y++) { + pattern <<= 1; + switch (get_p(p)) { + case 'O': runs[nruns]++; pattern |= 1u; break; + case '*': if (runs[nruns]) { nruns++; runs[nruns]=0; } break; + default: abort(); + } + } + + colondebugf(" pat=%08"PRIx32" nruns=%d runs[]={%d,%d..} ", + pattern, nruns, runs[0],runs[1]); + + if (!pattern) { + if (might_be_colon) + /* omg it _is_ a colon */ + goto colon_found; + nspaces++; + might_be_colon=0; + } else { + if (nruns==2 && runs[1]==runs[0]) { + if (!nspaces) { + if (pattern==colon_pattern) + goto ok_might_be_colon; + } else if (nspaces>=2) { + colon_pattern= pattern; + might_be_colon=1; + goto ok_might_be_colon; + } + } + might_be_colon=0; + ok_might_be_colon: + nspaces= 0; + } + colondebugf(" nsp=%2d mbc=%d\n", nspaces, might_be_colon); + } + MUST(!"colon found", MP(p);MR(islandnamer) ); + + colon_found: + colondebugf(" found\n"); + islandnamer.br.x= p.x; + + identify_rgbimage(ri, islandnamer, archisland, "island"); + assert(!"not vessel"); }