do not show unicode data for island pixmaps

[ypp-sc-tools.web-live.git] / pctb / pages.c

diff --git a/pctb/pages.c b/pctb/pages.c
index 58cb306b436f9c3d76937396e763e81fd50aa07f..32e429ab39df1be1220b2bedbe083a1be7ccf17d 100644 (file)
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -45,7 +45,7 @@ CanonImage *page_images[MAX_PAGES];
 int npages;
 RgbImage *page0_rgbimage;
 
-char *ocean, *pirate;
+const char *ocean, *pirate;
 
 static XWindowAttributes attr;
 static Window id;
@@ -271,8 +271,8 @@ static void snapshot(Snapshot **output) {
 
   int x,y,i;
   unsigned char *op= (*output)->data;
-  for (y=0; y<wwidth; y++) {
-    for (x=0; x<wheight; x++) {
+  for (y=0; y<wheight; y++) {
+    for (x=0; x<wwidth; x++) {
       long xrgb= XGetPixel(im_use,x,y);
       for (i=0; i<3; i++) {
        unsigned long sample=
@@ -694,11 +694,13 @@ void find_yppclient_window(void) {
        REQUIRE( !memcmp(title + len - S(suffix), suffix, S(suffix))  );
        REQUIRE( !memcmp(spc1,                    onthe,  S(onthe))  );
 
-#define ASSIGN(what, start, end) do {                                  \
-       sysassert( asprintf(&what, "%.*s", (end)-(start), start) >0 );  \
-     }while(0)
-       ASSIGN(pirate, title + S(prefix),  spc1);
+#define ASSIGN(what, start, end)                               \
+       what= masprintf("%.*s", (end)-(start), start);          \
+       if (o_##what) REQUIRE( !strcmp(o_##what, what) );       \
+       else
+
        ASSIGN(ocean,  spc1 + S(onthe),   (title + len) - S(suffix));
+       ASSIGN(pirate, title + S(prefix),  spc1);
 
        debugfind(" YES!\n");
        id= w2;
@@ -712,9 +714,10 @@ void find_yppclient_window(void) {
     if (children1) XFree(children1);
   }
   if (nfound>1)
-    fatal("Found several YPP clients."
+    fatal("Found several possible YPP clients."
          " Close one, or specify the windowid with --window-id.\n");
   if (nfound<1)
-    fatal("Did not find YPP client."
-         " Use --window-id and/or report this as a fault.\n");
+    fatal("Did not find %sYPP client."
+         " Use --window-id and/or report this as a fault.\n",
+         o_ocean || o_pirate ? "matching ": "");
 }