chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
show shm details
[ypp-sc-tools.main.git]
/
pctb
/
pages.c
diff --git
a/pctb/pages.c
b/pctb/pages.c
index ca2428d874d9a7b87ee0f3b231fc8f37bb7594c8..008116197046760211651d4b09af889631ac7f8e 100644
(file)
--- a/
pctb/pages.c
+++ b/
pctb/pages.c
@@
-243,6
+243,7
@@
static void snapshot(Snapshot **output) {
double begin= timestamp();
if (shmim) {
double begin= timestamp();
if (shmim) {
+ rtimestamp(&begin, "XShmGetImage before");
xassert( XShmGetImage(disp,id,shmim, 0,0, AllPlanes) );
rtimestamp(&begin, "XShmGetImage");
xassert( XShmGetImage(disp,id,shmim, 0,0, AllPlanes) );
rtimestamp(&begin, "XShmGetImage");
@@
-253,6
+254,7
@@
static void snapshot(Snapshot **output) {
memcpy(im_free->data, shmim->data, dsz);
rtimestamp(&begin, "mmalloc/memcpy");
} else {
memcpy(im_free->data, shmim->data, dsz);
rtimestamp(&begin, "mmalloc/memcpy");
} else {
+ rtimestamp(&begin, "XGetImage before");
xassert( im_use= im_free=
XGetImage(disp,id, 0,0, wwidth,wheight, AllPlanes, ZPixmap) );
rtimestamp(&begin, "XGetImage");
xassert( im_use= im_free=
XGetImage(disp,id, 0,0, wwidth,wheight, AllPlanes, ZPixmap) );
rtimestamp(&begin, "XGetImage");
@@
-322,7
+324,8
@@
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 */
- char *doing= masprintf(fmt,al);
+ char *doing;
+ sysassert( vasprintf(&doing,fmt,al) >=0 );
progress("%s",doing);
debugf("PAGING wait_for_stability"
progress("%s",doing);
debugf("PAGING wait_for_stability"
@@
-400,8
+403,10
@@
static void raise_and_get_details(void) {
check_client_window_all_on_screen();
check_client_window_all_on_screen();
- int shm= XShmQueryExtension(disp);
- shm=0;
+ Bool shmpixmaps=0;
+ int major=0,minor=0;
+ int shm= XShmQueryVersion(disp, &major,&minor,&shmpixmaps);
+ debugf("PAGING shm=%d %d.%d pixmaps=%d\n",shm,major,minor,shmpixmaps);
if (shm) {
xassert( shmim= XShmCreateImage(disp, attr.visual, attr.depth, ZPixmap,
0,&shminfo, wwidth,wheight) );
if (shm) {
xassert( shmim= XShmCreateImage(disp, attr.visual, attr.depth, ZPixmap,
0,&shminfo, wwidth,wheight) );
@@
-512,28
+517,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 0
-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();
@@
-543,6
+538,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) {
@@
-694,7
+694,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));
@@
-712,8
+712,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",