Notice and explicitly fail of display is <24bpp

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

diff --git a/pctb/pages.c b/pctb/pages.c
index 482c959c24261cf541ca0ea4e99b63ddf7e51e4e..fcee3d5845eaae1c47f97aa2d965bf623b820ca0 100644 (file)
--- a/pctb/pages.c
+++ b/pctb/pages.c
@@ -43,7 +43,6 @@
 
 CanonImage *page_images[MAX_PAGES];
 int npages;
-RgbImage *page0_rgbimage;
 
 const char *ocean, *pirate;
 
@@ -349,7 +348,7 @@ static void wait_for_stability(Snapshot **output,
       last=*output; *output=0;
     } else if (!identical(*output,last)) {
       debugf("PAGING  wait_for_stability changed...\n");
-      free(last); last=*output; *output=0;
+      free_snapshot(&last); last=*output; *output=0;
       nidentical=0;
       if (!with_keypress) {
        min_interval *= 3.0;
@@ -413,6 +412,9 @@ static void raise_and_get_details(void) {
   if (!(wwidth >= 320 && wheight >= 320))
     fatal("YPP client window is implausibly small?");
 
+  if (attr.depth < 24)
+    fatal("Display is not 24bpp.");
+
   check_client_window_all_on_screen();
 
   Bool shmpixmaps=0;
@@ -494,11 +496,10 @@ static void set_focus_commodity(void) {
   debugf("PAGING raise_and_set_focus done.\n");
 }
 
-static CanonImage *convert_page(Snapshot *sn, RgbImage *ri) {
+static CanonImage *convert_page(Snapshot *sn) {
   CanonImage *im;
 
   fwrite_ppmraw(screenshot_file, sn);
-  if (ri) memcpy(ri->data, sn->data, ri->h * ri->w * 3);
 
   unsigned char *pixel= sn->data;
   CANONICALISE_IMAGE(im, sn->w, sn->h, {
@@ -523,7 +524,7 @@ static void prepare_ypp_client(void) {
   raise_and_get_details();
   wait_for_stability(&current,0,0, "checking current YPP client screen...");
 
-  test= convert_page(current, 0);
+  test= convert_page(current);
   find_structure(test, &max_relevant_y);
   check_correct_commodities();
   Rect sunshine= find_sunshine_widget();
@@ -553,7 +554,6 @@ static void prepare_ypp_client(void) {
 
 void take_screenshots(void) {
   Snapshot *current=0, *last=0;
-  RgbImage *page0_store;
 
   prepare_ypp_client();
   
@@ -562,8 +562,6 @@ void take_screenshots(void) {
   wait_for_stability(&current,0, send_pgup_many,
                     "paging up to top of commodity list...");
 
-  page0_rgbimage= page0_store= alloc_rgb_image(current->w, current->h);
-
   /* now to actually page down */
   for (;;) {
     debugf("paging page %d\n",npages);
@@ -572,8 +570,8 @@ void take_screenshots(void) {
       fatal("Paging down seems to generate too many pages - max is %d.",
            MAX_PAGES);
     
-    page_images[npages]= convert_page(current, page0_store);
-    free_snapshot(&last); last=current; current=0; page0_store=0;
+    page_images[npages]= convert_page(current);
+    free_snapshot(&last); last=current; current=0;
 
     debugf("PAGING page %d converted\n",npages);
 
@@ -595,7 +593,6 @@ void take_screenshots(void) {
 
   debugf("PAGING all done.\n");
   progress_log("collected %d screenshots.",npages);
-  assert(!page0_store);
 }    
 
 void take_one_screenshot(void) {
@@ -603,8 +600,7 @@ void take_one_screenshot(void) {
 
   prepare_ypp_client();
   wait_for_stability(&current,0,0, "taking screenshot...");
-  page0_rgbimage= alloc_rgb_image(current->w, current->h);
-  page_images[0]= convert_page(current, page0_rgbimage);
+  page_images[0]= convert_page(current);
   npages= 1;
   progress_log("collected single screenshot.");
 }
@@ -628,7 +624,7 @@ static void findypp_recurse(int depth, int targetdepth, Window w) {
   static const char prefix[]= "Puzzle Pirates - ";
   static const char onthe[]= " on the ";
   static const char suffix[]= " ocean";
-#define S(x) (sizeof((x))-1)
+#define S(x) ((int)sizeof((x))-1)
 
   debugfind("FINDYPP %d/%d screen %d  %*s %lx",
            depth,targetdepth,screen,
@@ -691,7 +687,7 @@ static void findypp_recurse(int depth, int targetdepth, Window w) {
   REQUIRE( !memcmp(spc1,                    onthe,  S(onthe))  );
 
 #define ASSIGN(what, start, end)                       \
-  what= masprintf("%.*s", (end)-(start), start);       \
+  what= masprintf("%.*s", (int)((end)-(start)), start);        \
   if (o_##what) REQUIRE( !strcasecmp(o_##what, what) );        \
   else