/*----- from structure.c -----*/
-void find_structure(CanonImage *im, int *max_relevant_y_r);
+void find_structure(CanonImage *im, int *max_relevant_y_r,
+ Point *commod_focus_point_r);
Rect find_sunshine_widget(void);
void canon_colour_prepare(void);
static struct timeval tv_startup;
static unsigned wwidth, wheight;
static int max_relevant_y= -1;
+static Point commod_focus_point;
static XImage *shmim;
static XShmSegmentInfo shminfo;
debugf("PAGING set_focus\n");
- mouse_1_updown(160,160);
+ mouse_1_updown(commod_focus_point.x, commod_focus_point.y);
sync_after_input();
delay(0.5);
wait_for_stability(¤t,0,0, "checking current YPP client screen...");
test= convert_page(current);
- find_structure(test, &max_relevant_y);
+ find_structure(test, &max_relevant_y, &commod_focus_point);
check_correct_commodities();
Rect sunshine= find_sunshine_widget();
(search).TLBR.XY += increm; \
}
-void find_structure(CanonImage *im, int *max_relevant_y_r) {
+void find_structure(CanonImage *im, int *max_relevant_y_r,
+ Point *commod_focus_point_r) {
cim= im;
Rect whole = { {0,0}, {cim->w-1,cim->h-1} };
if (max_relevant_y_r)
SET_ONCE(*max_relevant_y_r, mainr.br.y + 10);
+ if (commod_focus_point_r) {
+ *commod_focus_point_r= mainr.tl;
+ commod_focus_point_r->x += 10;
+ commod_focus_point_r->y += comminty/3;
+ }
+
MUST( text_h <= OCR_MAX_H, MI(text_h) );
}
int page, tryrect, colno;
for (page=0; page<npages; page++) {
- find_structure(page_images[page], 0);
+ find_structure(page_images[page], 0, 0);
if (!page)
check_correct_commodities();
}
void find_islandname(void) {
- find_structure(page_images[0], 0);
+ find_structure(page_images[0], 0, 0);
RgbImage *ri= alloc_rgb_image(page_images[0]->rgb->w,
page_images[0]->rgb->h);