chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly wait for /w output to appear
[ypp-sc-tools.db-live.git]
/
pctb
/
pages.c
diff --git
a/pctb/pages.c
b/pctb/pages.c
index 32e429ab39df1be1220b2bedbe083a1be7ccf17d..a87b0214753316fe293be0e52712a4a14cf0a9a9 100644
(file)
--- a/
pctb/pages.c
+++ b/
pctb/pages.c
@@
-322,15
+322,14
@@
static void wait_for_stability(Snapshot **output,
/* waits longer if we're going to return an image identical to previously
* if previously==0, all images are considered identical to it */
/* waits longer if we're going to return an image identical to previously
* if previously==0, all images are considered identical to it */
- debugf("PAGING wait_for_stability"
- " last_input=%f previously=%p\n",
- last_input, previously);
-
char *doing;
char *doing;
- sysassert( vasprintf(&doing,fmt,al) >=0);
-
+ sysassert( vasprintf(&doing,fmt,al) >=0 );
progress("%s",doing);
progress("%s",doing);
+ debugf("PAGING wait_for_stability"
+ " last_input=%f previously=%p `%s'\n",
+ last_input, previously, doing);
+
for (;;) {
double at_snapshot= timestamp();
double need_sleep= min_update_allowance - (at_snapshot - last_input);
for (;;) {
double at_snapshot= timestamp();
double need_sleep= min_update_allowance - (at_snapshot - last_input);
@@
-514,28
+513,18
@@
static void prepare_ypp_client(void) {
raise_and_get_details();
wait_for_stability(¤t,0,0, "checking current YPP client screen...");
raise_and_get_details();
wait_for_stability(¤t,0,0, "checking current YPP client screen...");
-#if 1
-timestamp();
-snapshot(¤t);
-snapshot(¤t);
-snapshot(¤t);
-snapshot(¤t);
-snapshot(¤t);
-snapshot(¤t);
-snapshot(¤t);
-snapshot(¤t);
-snapshot(¤t);
-snapshot(¤t);
-timestamp();
-#endif
-
test= convert_page(current, 0);
find_structure(test, &max_relevant_y);
check_correct_commodities();
test= convert_page(current, 0);
find_structure(test, &max_relevant_y);
check_correct_commodities();
+ Rect sunshine= find_sunshine_widget();
+
+ progress("poking client...");
+ mouse_1_updown((sunshine.tl.x + sunshine.br.x) / 2,
+ (sunshine.tl.y*9 + sunshine.br.y) / 10);
+
free(test);
free(test);
- free_snapshot(¤t);
-
progress("requesting status informatio
n...");
+
wait_for_stability(¤t,0,0, "checking basic YPP client scree
n...");
mouse_1_updown(250, wheight-10);
mouse_1_updown_here();
mouse_1_updown_here();
mouse_1_updown(250, wheight-10);
mouse_1_updown_here();
mouse_1_updown_here();
@@
-545,6
+534,11
@@
timestamp();
send_key(XK_w);
send_key(XK_Return);
sync_after_input();
send_key(XK_w);
send_key(XK_Return);
sync_after_input();
+
+ Snapshot *status=0;
+ wait_for_stability(&status,current,0, "awaiting status information...");
+ free_snapshot(¤t);
+ free_snapshot(&status);
}
void take_screenshots(void) {
}
void take_screenshots(void) {
@@
-596,7
+590,7
@@
void take_one_screenshot(void) {
prepare_ypp_client();
wait_for_stability(¤t,0,0, "taking screenshot...");
page0_rgbimage= alloc_rgb_image(current->w, current->h);
prepare_ypp_client();
wait_for_stability(¤t,0,0, "taking screenshot...");
page0_rgbimage= alloc_rgb_image(current->w, current->h);
- page_images[0]= convert_page(current,
0
);
+ page_images[0]= convert_page(current,
page0_rgbimage
);
npages= 1;
progress_log("collected single screenshot.");
}
npages= 1;
progress_log("collected single screenshot.");
}
@@
-696,7
+690,7
@@
void find_yppclient_window(void) {
#define ASSIGN(what, start, end) \
what= masprintf("%.*s", (end)-(start), start); \
#define ASSIGN(what, start, end) \
what= masprintf("%.*s", (end)-(start), start); \
- if (o_##what) REQUIRE( !strc
mp(o_##what, what) );
\
+ if (o_##what) REQUIRE( !strc
asecmp(o_##what, what) );
\
else
ASSIGN(ocean, spc1 + S(onthe), (title + len) - S(suffix));
else
ASSIGN(ocean, spc1 + S(onthe), (title + len) - S(suffix));
@@
-714,8
+708,9
@@
void find_yppclient_window(void) {
if (children1) XFree(children1);
}
if (nfound>1)
if (children1) XFree(children1);
}
if (nfound>1)
- fatal("Found several possible YPP clients."
- " Close one, or specify the windowid with --window-id.\n");
+ fatal("Found several possible YPP clients. Close one,\n"
+ " disambiguate with --pirate or --ocean,"
+ " or specify --window-id.\n");
if (nfound<1)
fatal("Did not find %sYPP client."
" Use --window-id and/or report this as a fault.\n",
if (nfound<1)
fatal("Did not find %sYPP client."
" Use --window-id and/or report this as a fault.\n",