From 59c99dae55f98dd70d972a4365464589ed0f7517 Mon Sep 17 00:00:00 2001 From: billh Date: Thu, 23 May 2002 12:37:37 +0000 Subject: [PATCH 1/1] Tweaks to screen-review-test, and changed at-spi-registryd installation to use the libexec directory rather than the 'bin' directory. git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@303 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- ChangeLog | 25 ++++++++++++++++++++++ configure.in | 2 +- ...rver.in => Accessibility_Registry.server.in.in} | 2 +- registryd/Makefile.am | 5 +++++ test/screen-review-test.c | 14 +++++++----- 5 files changed, 41 insertions(+), 7 deletions(-) rename registryd/{Accessibility_Registry.server.in => Accessibility_Registry.server.in.in} (85%) diff --git a/ChangeLog b/ChangeLog index 5bf9d99..b78b804 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2002-05-23 Bill Haneman + + * test/screen-review-test.c: + (review_buffer_get_text_chunk): + We now pull "name" from labels if they do not implement + AccessibleText (i.e. for Java labels). + (get_screen_review_line_at): + Added #ifdef guards CHUNK_LIST_DEBUG for diagnostics. + + * configure.in: + Replaceded AC_OUTPUT target + registryd/Accessibility_Registry.server with + registryd/Accessibility_Registry.server.in. + + * registryd/Accessibility_Registry.server.in: + Removed (this is now a Makefile target). + + * registryd/Accessibility_Registry.server.in.in: + Added (source for target above). We now use $(libexecdir) as + prefix for the executable at-spi-registryd. + + * registry/Makefile.am: + Now install at-spi-registryd into $(libexecdir), and build .server + file with path (see above). + 2002-05-22 Bill Haneman * test/screen-review-test.c: diff --git a/configure.in b/configure.in index aa14b1b..1a7159a 100644 --- a/configure.in +++ b/configure.in @@ -185,7 +185,7 @@ docs/reference/cspi/Makefile idl/Makefile libspi/Makefile registryd/Makefile -registryd/Accessibility_Registry.server +registryd/Accessibility_Registry.server.in atk-bridge/Makefile test/Makefile cspi/Makefile diff --git a/registryd/Accessibility_Registry.server.in b/registryd/Accessibility_Registry.server.in.in similarity index 85% rename from registryd/Accessibility_Registry.server.in rename to registryd/Accessibility_Registry.server.in.in index 3d5e5da..b5e70fe 100644 --- a/registryd/Accessibility_Registry.server.in +++ b/registryd/Accessibility_Registry.server.in.in @@ -1,6 +1,6 @@ + type="exe" location="@REGISTRYD_PATH@/at-spi-registryd"> diff --git a/registryd/Makefile.am b/registryd/Makefile.am index 76c733e..71dbbf7 100644 --- a/registryd/Makefile.am +++ b/registryd/Makefile.am @@ -1,3 +1,8 @@ +server_dot_in = Accessibility_Registry.server.in + +$(server_dot_in): $(server_dot_in).in + sed -e "s|\@REGISTRYD_PATH\@|$(libexecdir)|" $< > $@ + libexec_PROGRAMS = at-spi-registryd INCLUDES = -I$(top_srcdir) \ diff --git a/test/screen-review-test.c b/test/screen-review-test.c index 70d42ac..9588212 100644 --- a/test/screen-review-test.c +++ b/test/screen-review-test.c @@ -31,28 +31,31 @@ * Issues: * * * bounds now fail to include window border decoration - * (which we can't really know about). + * (which we can't really know about yet). * * * brute-force algorithm uses no client-side cache; performance mediocre. * * * we don't have good ordering information for the toplevel windows, * and our current heuristic is not guaranteed if - * the active window is not always on top. + * the active window is not always on top (i.e. autoraise is + * not enabled). * * * text-bearing objects that don't implement AccessibleText (such as buttons) * don't get their text clipped since we don't know the character * bounding boxes. + * * * can't know about "inaccessible" objects that may be obscuring the * accessible windows (inherent to API-based approach). * * * this implementation doesn't worry about text column-alignment, it generates * review lines of more-or-less arbitrary length. The x-coordinate * info is preserved in the reviewBuffers list structures, but the - * "buffer-to-string" algorithm ignores it. + * "buffer-to-string" algorithm (currently) ignores it. * * * (others). */ +#undef CHUNK_LIST_DEBUG /* define to get list of text chunks before clip */ #define BOUNDS_CONTAIN_X_BOUNDS(b, p) ( ((p).x>=(b).x) &&\ (((p).x + (p).width) <= \ @@ -139,7 +142,7 @@ main (int argc, char **argv) SPI_registerGlobalEventListener (mouseclick_listener, "Gtk:GtkWidget:button-press-event"); -#undef JAVA_TEST_HACK +#define JAVA_TEST_HACK #ifdef JAVA_TEST_HACK /* Only use this to test Java apps */ SPI_registerGlobalEventListener (mouseclick_listener, "object:text-caret-moved"); @@ -558,6 +561,7 @@ review_buffer_get_text_chunk (ScreenReviewBuffer *reviewBuffer, } else { if (role == SPI_ROLE_PUSH_BUTTON || role == SPI_ROLE_CHECK_BOX || + role == SPI_ROLE_LABEL || role == SPI_ROLE_MENU || role == SPI_ROLE_MENU_ITEM) { /* don't like this special casing :-( */ @@ -928,7 +932,7 @@ get_screen_review_line_at (int x, int y) } clip_into_buffers (toplevel, clip_bounds, reviewBuffers, x, y); -#ifdef CLIP_DEBUG +#ifdef CHUNK_LIST_DEBUG fprintf (stderr, "toplevel clip done\n"); debug_chunk_list (reviewBuffers[SPI_LAYER_WIDGET]->text_chunks); #endif -- 2.7.4