[Emacs-diffs] emacs-24 r117033: Place hardware TTY cursor at the active menu item when displaying a menu.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117033
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-04-29 18:33:37 +0300
message:
  Place hardware TTY cursor at the active menu item when displaying a menu.
  
   src/term.c (tty_menu_display): Move the cursor to the active menu
   item.
   (tty_menu_activate): Return the cursor to the active menu item
   after displaying the menu and after displaying help-echo.  See
   http://lists.gnu.org/archive/html/emacs-devel/2014-04/msg00402.html
   for the details of why this is needed by screen readers and
   Braille displays.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/term.c                     term.c-20091113204419-o5vbwnq5f7feedwu-220

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-04-29 15:12:36 +0000
+++ b/src/ChangeLog     2014-04-29 15:33:37 +0000
@@ -1,3 +1,13 @@
+2014-04-29  Eli Zaretskii  <address@hidden>
+
+       * term.c (tty_menu_display): Move the cursor to the active menu
+       item.
+       (tty_menu_activate): Return the cursor to the active menu item
+       after displaying the menu and after displaying help-echo.  See
+       http://lists.gnu.org/archive/html/emacs-devel/2014-04/msg00402.html
+       for the details of why this is needed by screen readers and
+       Braille displays.
+
 2014-04-29  Glenn Morris  <address@hidden>
 
        * process.c (handle_child_signal):

=== modified file 'src/term.c'
--- a/src/term.c        2014-04-16 13:27:28 +0000
+++ b/src/term.c        2014-04-29 15:33:37 +0000
@@ -2897,6 +2897,13 @@
          menu_help_paneno = pn - 1;
          menu_help_itemno = j;
        }
+      /* Take note of the coordinates of the active menu item, to
+        display the cursor there.  */
+      if (mousehere)
+       {
+         row = y + i;
+         col = x;
+       }
       display_tty_menu_item (menu->text[j], max_width, face, x, y + i,
                             menu->submenu[j] != NULL);
     }
@@ -3177,6 +3184,7 @@
   bool first_time;
   Lisp_Object selectface;
   int first_item = 0;
+  int col, row;
 
   /* Don't allow non-positive x0 and y0, lest the menu will wrap
      around the display.  */
@@ -3364,6 +3372,11 @@
                            faces, x, y, first_item, 1);
          tty_hide_cursor (tty);
          fflush (tty->output);
+         /* The call to display help-echo below will move the cursor,
+            so remember its current position as computed by
+            tty_menu_display.  */
+         col = cursorX (tty);
+         row = cursorY (tty);
        }
 
       /* Display the help-echo message for the currently-selected menu
@@ -3373,6 +3386,10 @@
        {
          help_callback (menu_help_message,
                         menu_help_paneno, menu_help_itemno);
+         /* Move the cursor to the beginning of the current menu
+            item, so that screen readers and other accessibility aids
+            know where the active region is.  */
+         cursor_to (sf, row, col);
          tty_hide_cursor (tty);
          fflush (tty->output);
          prev_menu_help_message = menu_help_message;