chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WIP island determination; before work on lookup_rgbrect
[ypp-sc-tools.db-test.git]
/
pctb
/
pages.c
diff --git
a/pctb/pages.c
b/pctb/pages.c
index 04847107dde3f599473befe8f18c20ca0999d520..8a837595435d8181e7735ee00873fb80a7af7ada 100644
(file)
--- a/
pctb/pages.c
+++ b/
pctb/pages.c
@@
-39,6
+39,7
@@
CanonImage *page_images[MAX_PAGES];
int npages;
CanonImage *page_images[MAX_PAGES];
int npages;
+RawImage *page0_rawimage;
char *ocean, *pirate;
char *ocean, *pirate;
@@
-47,6
+48,7
@@
static Window id;
static Display *disp;
static struct timeval tv_startup;
static unsigned wwidth, wheight;
static Display *disp;
static struct timeval tv_startup;
static unsigned wwidth, wheight;
+static int max_relevant_y= -1;
DEBUG_DEFINE_DEBUGF(pages)
DEBUG_DEFINE_DEBUGF(pages)
@@
-146,22
+148,36
@@
static void check_not_disturbed(void) {
}
static void send_key(KeySym sym) {
}
static void send_key(KeySym sym) {
+ check_not_disturbed();
XTestFakeKeyEvent(disp, keycode(sym),1, 10);
XTestFakeKeyEvent(disp, keycode(sym),0, 10);
}
XTestFakeKeyEvent(disp, keycode(sym),1, 10);
XTestFakeKeyEvent(disp, keycode(sym),0, 10);
}
+static int pgupdown;
+
static void send_pgup_many(void) {
int i;
static void send_pgup_many(void) {
int i;
- for (i=0; i<25; i++)
+ for (i=0; i<25; i++)
{
send_key(XK_Prior);
send_key(XK_Prior);
+ pgupdown--;
+ }
debugf("PAGING PageUp x %d\n",i);
sync_after_input();
}
static void send_pgdown(void) {
send_key(XK_Next);
debugf("PAGING PageUp x %d\n",i);
sync_after_input();
}
static void send_pgdown(void) {
send_key(XK_Next);
+ pgupdown++;
debugf("PAGING PageDown\n");
sync_after_input();
}
debugf("PAGING PageDown\n");
sync_after_input();
}
+static void send_pgdown_torestore(void) {
+ debugf("PAGING PageDown x %d\n", -pgupdown);
+ while (pgupdown < 0) {
+ send_key(XK_Next);
+ pgupdown++;
+ }
+ sync_after_input();
+}
static void free_snapshot(Snapshot **io) {
if (*io) XDestroyImage(*io);
static void free_snapshot(Snapshot **io) {
if (*io) XDestroyImage(*io);
@@
-188,7
+204,12
@@
static int identical(const Snapshot *a, const Snapshot *b) {
a->bytes_per_line == b->bytes_per_line &&
a->format == b->format))
return 0;
a->bytes_per_line == b->bytes_per_line &&
a->format == b->format))
return 0;
- return !memcmp(a->data, b->data, a->bytes_per_line * a->height);
+
+ int compare_to= a->height;
+ if (max_relevant_y && compare_to > max_relevant_y)
+ compare_to= max_relevant_y;
+
+ return !memcmp(a->data, b->data, a->bytes_per_line * compare_to);
}
static void wait_for_stability(Snapshot **output,
}
static void wait_for_stability(Snapshot **output,
@@
-344,7
+365,7
@@
static void compute_shift_mask(ShMask *sm, unsigned long ximage_mask) {
assert(sm->rshift < LONG_BIT);
}
assert(sm->rshift < LONG_BIT);
}
-static CanonImage *convert_page(Snapshot *sn) {
+static CanonImage *convert_page(Snapshot *sn
, RawImage *ri
) {
ShMask shiftmasks[3];
CanonImage *im;
ShMask shiftmasks[3];
CanonImage *im;
@@
-371,6
+392,8
@@
static CanonImage *convert_page(Snapshot *sn) {
rgb |= sample;
fputc(sample, screenshot_file);
}
rgb |= sample;
fputc(sample, screenshot_file);
}
+ if (ri)
+ CANONIMG_ALSO_STORERAW(ri);
});
sysassert(!ferror(screenshot_file));
});
sysassert(!ferror(screenshot_file));
@@
-386,8
+409,9
@@
void take_screenshots(void) {
/* find the window and check it's on the right kind of screen */
raise_and_get_details();
wait_for_stability(¤t,0,0, "checking current YPP client screen...");
/* find the window and check it's on the right kind of screen */
raise_and_get_details();
wait_for_stability(¤t,0,0, "checking current YPP client screen...");
- test= convert_page(current);
- find_structure(test);
+ test= convert_page(current, 0);
+ find_structure_commod(test, &max_relevant_y);
+ check_correct_commodities();
free(test);
/* page to the top - keep pressing page up until the image stops changing */
free(test);
/* page to the top - keep pressing page up until the image stops changing */
@@
-403,7
+427,7
@@
void take_screenshots(void) {
fatal("Paging down seems to generate too many pages - max is %d.",
MAX_PAGES);
fatal("Paging down seems to generate too many pages - max is %d.",
MAX_PAGES);
- page_images[npages]= convert_page(current);
+ page_images[npages]= convert_page(current
, 0
);
free_snapshot(&last); last=current; current=0;
debugf("PAGING page %d converted\n",npages);
free_snapshot(&last); last=current; current=0;
debugf("PAGING page %d converted\n",npages);
@@
-421,6
+445,9
@@
void take_screenshots(void) {
send_pgdown();
npages++;
}
send_pgdown();
npages++;
}
+ progress("finishing with the YPP client...");
+ send_pgdown_torestore();
+
debugf("PAGING all done.\n");
progress_log("collected %d screenshots.",npages);
}
debugf("PAGING all done.\n");
progress_log("collected %d screenshots.",npages);
}
@@
-431,7
+458,8
@@
void take_one_screenshot(void) {
raise_and_get_details();
sync_after_input();
wait_for_stability(¤t,0,0, "taking screenshot...");
raise_and_get_details();
sync_after_input();
wait_for_stability(¤t,0,0, "taking screenshot...");
- page_images[0]= convert_page(current);
+ //page0_rawimage= alloc_raw_image(sn->width, sn->height);
+ page_images[0]= convert_page(current, 0);
npages= 1;
progress_log("collected single screenshot.");
}
npages= 1;
progress_log("collected single screenshot.");
}