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
Fix to make example2 work
[ypp-sc-tools.db-test.git]
/
pctb
/
pages.c
diff --git
a/pctb/pages.c
b/pctb/pages.c
index 04847107dde3f599473befe8f18c20ca0999d520..ab3a2b0b118125fcbe13e816d607c3ac834459ca 100644
(file)
--- a/
pctb/pages.c
+++ b/
pctb/pages.c
@@
-47,6
+47,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
+147,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
+203,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,
@@
-387,7
+407,8
@@
void take_screenshots(void) {
raise_and_get_details();
wait_for_stability(¤t,0,0, "checking current YPP client screen...");
test= convert_page(current);
raise_and_get_details();
wait_for_stability(¤t,0,0, "checking current YPP client screen...");
test= convert_page(current);
- find_structure(test);
+ find_structure(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 */
@@
-421,6
+442,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);
}