6 files changed, 116 insertions, 31 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d8c93e96754..30db0548172 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,41 @@
+2005-10-14  Kim F. Storm  <storm@cua.dk>
+
+        * xterm.c (note_mouse_movement): Return 1 if mouse moved; 0 otherwise.
+        (handle_one_xevent): Only clear help_echo_string; restore it if
+        note_mouse_movement didn't record any mouse movement.
+
+        * xdisp.c (pos_visible_p): Convert w->hscroll to pixels before use.
+        (remember_mouse_glyph): Clear RECT if mouse is over an image glyph.
+
+        * keyboard.c (make_lispy_position): Adjust wx for left margin if ON_TEXT.
+        (Fposn_at_x_y): Fix calculation of x coordinate.
+        (Fposn_at_point): Return nil if point is hscrolled out of view.
+
+2005-10-13  Andreas Schwab  <schwab@suse.de>
+
+        * sysdep.c (request_sigio, unrequest_sigio): Do nothing in
+        non-interactive mode.
+
+2005-10-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * xterm.c, w32term.c, macterm.c (note_mouse_movement): Undo last change.
+
+2005-10-12  Kim F. Storm  <storm@cua.dk>
+
+        * xterm.c (handle_one_xevent): Clear last_mouse_glyph on mouse up/down.
+
+2005-10-12  Romain Francoise  <romain@orebokech.com>
+
+        * buffer.c (init_buffer): Rename `rc' to `len' for clarity.
+
+2005-10-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * xdisp.c (remember_mouse_glyph): Use MATRIX_BOTTOM_TEXT_ROW to
+        get end of text rows.  Obtain header-line/mode-line rows directly.
+
+        * xterm.c, w32term.c, macterm.c (note_mouse_movement): Restore
+        help_echo_string if mouse is moved inside last_mouse_glyph.
+
 2005-10-12  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (remember_mouse_glyph): New generic version based on
diff --git a/src/buffer.c b/src/buffer.c
index fb1ff1c22e9..c173136961e 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5114,7 +5114,7 @@ init_buffer ()
   char *pwd;
   struct stat dotstat, pwdstat;
   Lisp_Object temp;
-  int rc;
+  int len;
 
 #ifdef USE_MMAP_FOR_BUFFERS
  {
@@ -5141,13 +5141,13 @@ init_buffer ()
 #ifndef VMS
   /* Maybe this should really use some standard subroutine
      whose definition is filename syntax dependent.  */
-  rc = strlen (pwd);
-  if (!(IS_DIRECTORY_SEP (pwd[rc - 1])))
+  len = strlen (pwd);
+  if (!(IS_DIRECTORY_SEP (pwd[len - 1])))
     {
       /* Grow buffer to add directory separator and '\0'.  */
-      pwd = (char *) xrealloc (pwd, rc + 2);
-      pwd[rc] = DIRECTORY_SEP;
-      pwd[rc + 1] = '\0';
+      pwd = (char *) xrealloc (pwd, len + 2);
+      pwd[len] = DIRECTORY_SEP;
+      pwd[len + 1] = '\0';
     }
 #endif /* not VMS */
 
diff --git a/src/keyboard.c b/src/keyboard.c
index 4937cc445bd..814ef5dc6c9 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5108,7 +5108,11 @@ make_lispy_position (f, x, y, time)
       XSETINT (*x, wx);
       XSETINT (*y, wy);
 
-      if (part == ON_MODE_LINE || part == ON_HEADER_LINE)
+      if (part == ON_TEXT)
+        {
+          wx += WINDOW_LEFT_MARGIN_WIDTH (w);
+        }
+      else if (part == ON_MODE_LINE || part == ON_HEADER_LINE)
         {
           /* Mode line or header line.  Look for a string under
              the mouse that may have a `local-map' property.  */
@@ -10779,11 +10783,11 @@ The `posn-' functions access elements of such lists.  */)
       CHECK_LIVE_WINDOW (frame_or_window);
 
       w = XWINDOW (frame_or_window);
-      XSETINT (x, (WINDOW_TO_FRAME_PIXEL_X (w, XINT (x))
+      XSETINT (x, (XINT (x)
+                   + WINDOW_LEFT_EDGE_X (w)
                    + (NILP (whole)
                       ? window_box_left_offset (w, TEXT_AREA)
-                      : - (WINDOW_LEFT_SCROLL_BAR_COLS (w)
-                           * WINDOW_FRAME_COLUMN_WIDTH (w)))));
+                      : 0)));
       XSETINT (y, WINDOW_TO_FRAME_PIXEL_Y (w, XINT (y)));
       frame_or_window = w->frame;
     }
@@ -10809,9 +10813,21 @@ The `posn-' functions access elements of such lists.  */)
 {
   Lisp_Object tem;
 
+  if (NILP (window))
+    window = selected_window;
+
   tem = Fpos_visible_in_window_p (pos, window, Qt);
   if (!NILP (tem))
-    tem = Fposn_at_x_y (XCAR (tem), XCAR (XCDR (tem)), window, Qnil);
+    {
+      Lisp_Object x = XCAR (tem);
+      Lisp_Object y = XCAR (XCDR (tem));
+
+      /* Point invisible due to hscrolling?  */
+      if (XINT (x) < 0)
+        return Qnil;
+      tem = Fposn_at_x_y (x, y, window, Qnil);
+    }
+
   return tem;
 }
 
diff --git a/src/sysdep.c b/src/sysdep.c
index c9464cd111f..0cf6ecb1f36 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1032,6 +1032,7 @@ reset_sigio (fd)
 
 #ifdef FASYNC           /* F_SETFL does not imply existence of FASYNC */
 /* XXX Uhm, FASYNC is not used anymore here. */
+/* XXX Yeah, but you need it for SIGIO, don't you? */
 
 void
 request_sigio ()
@@ -1039,7 +1040,7 @@ request_sigio ()
   /* XXX read_socket_hook is not global anymore.  Is blocking SIGIO
      bad under X? */
 #if 0
-  if (read_socket_hook)
+  if (noninteractive || read_socket_hook)
     return;
 #endif
 
@@ -1057,7 +1058,7 @@ unrequest_sigio (void)
   /* XXX read_socket_hook is not global anymore.  Is blocking SIGIO
      bad under X? */
 #if 0
-  if (read_socket_hook)
+  if (noninteractive || read_socket_hook)
     return;
 #endif
   
@@ -1076,7 +1077,7 @@ request_sigio ()
 {
   int on = 1;
 
-  if (read_socket_hook)
+  if (noninteractive || read_socket_hook)
     return;
 
   /* XXX CURTTY() is bogus here. */
@@ -1089,7 +1090,7 @@ unrequest_sigio ()
 {
   int off = 0;
 
-  if (read_socket_hook)
+  if (noninteractive || read_socket_hook)
     return;
 
   /* XXX CURTTY() is bogus here. */
@@ -1109,7 +1110,7 @@ request_sigio ()
   int on = 1;
   sigset_t st;
 
-  if (read_socket_hook)
+  if (noninteractive || read_socket_hook)
     return;
 
   sigemptyset (&st);
@@ -1124,7 +1125,7 @@ unrequest_sigio ()
 {
   int off = 0;
 
-  if (read_socket_hook)
+  if (noninteractive || read_socket_hook)
     return;
 
   ioctl (0, FIOASYNC, &off);  /* XXX This fails for multiple ttys. */
@@ -1137,7 +1138,7 @@ unrequest_sigio ()
 void
 request_sigio ()
 {
-  if (read_socket_hook)
+  if (noninteractive || read_socket_hook)
     return;
 
   croak ("request_sigio");
@@ -1146,7 +1147,7 @@ request_sigio ()
 void
 unrequest_sigio ()
 {
-  if (read_socket_hook)
+  if (noninteractive || read_socket_hook)
     return;
 
   croak ("unrequest_sigio");
@@ -2335,12 +2336,16 @@ reset_sigio (fd)
 void
 request_sigio ()
 {
+  if (noninteractive)
+    return;
   croak ("request sigio");
 }
 
 void
 unrequest_sigio ()
 {
+  if (noninteractive)
+    return;
   croak ("unrequest sigio");
 }
 
@@ -2884,6 +2889,8 @@ reset_sigio (fd)
 void
 request_sigio ()
 {
+  if (noninteractive)
+    return;
   sigrelse (SIGTINT);
 
   interrupts_deferred = 0;
@@ -2892,6 +2899,8 @@ request_sigio ()
 void
 unrequest_sigio ()
 {
+  if (noninteractive)
+    return;
   sighold (SIGTINT);
 
   interrupts_deferred = 1;
diff --git a/src/xdisp.c b/src/xdisp.c
index 013d3955c6f..ff3d9f2ca0c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1335,7 +1335,7 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, exact_mode_line_heights_p)
   current_header_line_height = current_mode_line_height = -1;
 
   if (visible_p && XFASTINT (w->hscroll) > 0)
-    *x -= XFASTINT (w->hscroll);
+    *x -= XFASTINT (w->hscroll) * WINDOW_FRAME_COLUMN_WIDTH (w);
 
   return visible_p;
 }
@@ -2047,7 +2047,7 @@ remember_mouse_glyph (f, gx, gy, rect)
   height = WINDOW_FRAME_LINE_HEIGHT (w);
 
   r = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
-  end_row = r + w->current_matrix->nrows - 1;
+  end_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w);
 
   if (w->pseudo_window_p)
     {
@@ -2066,20 +2066,28 @@ remember_mouse_glyph (f, gx, gy, rect)
       area = RIGHT_MARGIN_AREA;
       goto text_glyph;
 
-    case ON_TEXT:
-    case ON_MODE_LINE:
     case ON_HEADER_LINE:
+    case ON_MODE_LINE:
+      gr = (part == ON_HEADER_LINE
+            ? MATRIX_HEADER_LINE_ROW (w->current_matrix)
+            : MATRIX_MODE_LINE_ROW (w->current_matrix));
+      gy = gr->y;
+      area = TEXT_AREA;
+      goto text_glyph_row_found;
+
+    case ON_TEXT:
       area = TEXT_AREA;
 
     text_glyph:
       gr = 0; gy = 0;
-      for (; r < end_row && r->enabled_p; ++r)
+      for (; r <= end_row && r->enabled_p; ++r)
         if (r->y + r->height > y)
           {
             gr = r; gy = r->y;
             break;
           }
 
+    text_glyph_row_found:
       if (gr && gy <= y)
         {
           struct glyph *g = gr->glyphs[area];
@@ -2091,7 +2099,16 @@ remember_mouse_glyph (f, gx, gy, rect)
               break;
 
           if (g < end)
-            width = g->pixel_width;
+            {
+              if (g->type == IMAGE_GLYPH)
+                {
+                  /* Don't remember when mouse is over image, as
+                     image may have hot-spots.  */
+                  STORE_NATIVE_RECT (*rect, 0, 0, 0, 0);
+                  return;
+                }
+              width = g->pixel_width;
+            }
           else
             {
               /* Use nominal char spacing at end of line.  */
@@ -2136,7 +2153,7 @@ remember_mouse_glyph (f, gx, gy, rect)
 
     row_glyph:
       gr = 0, gy = 0;
-      for (; r < end_row && r->enabled_p; ++r)
+      for (; r <= end_row && r->enabled_p; ++r)
         if (r->y + r->height > y)
           {
             gr = r; gy = r->y;
diff --git a/src/xterm.c b/src/xterm.c
index 30a43995a57..ef40c8b790d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3588,7 +3588,7 @@ construct_mouse_click (result, event, f)
 static XMotionEvent last_mouse_motion_event;
 static Lisp_Object last_mouse_motion_frame;
 
-static void
+static int
 note_mouse_movement (frame, event)
      FRAME_PTR frame;
      XMotionEvent *event;
@@ -3602,10 +3602,11 @@ note_mouse_movement (frame, event)
       frame->mouse_moved = 1;
       last_mouse_scroll_bar = Qnil;
       note_mouse_highlight (frame, -1, -1);
+      return 1;
     }
 
   /* Has the mouse moved off the glyph it was on at the last sighting?  */
-  else if (event->x < last_mouse_glyph.x
+  if (event->x < last_mouse_glyph.x
            || event->x >= last_mouse_glyph.x + last_mouse_glyph.width
            || event->y < last_mouse_glyph.y
            || event->y >= last_mouse_glyph.y + last_mouse_glyph.height)
@@ -3615,7 +3616,10 @@ note_mouse_movement (frame, event)
       note_mouse_highlight (frame, event->x, event->y);
       /* Remember which glyph we're now on.  */
       remember_mouse_glyph (frame, event->x, event->y, &last_mouse_glyph);
+      return 1;
     }
+
+  return 0;
 }
 
 
@@ -6496,8 +6500,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
     case MotionNotify:
       {
         previous_help_echo_string = help_echo_string;
-        help_echo_string = help_echo_object = help_echo_window = Qnil;
-        help_echo_pos = -1;
+        help_echo_string = Qnil;
 
         if (dpyinfo->grabbed && last_mouse_frame
             && FRAME_LIVE_P (last_mouse_frame))
@@ -6536,7 +6539,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
 
                 last_window=window;
               }
-            note_mouse_movement (f, &event.xmotion);
+            if (!note_mouse_movement (f, &event.xmotion))
+              help_echo_string = previous_help_echo_string;
           }
         else
           {
@@ -6645,6 +6649,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
         int tool_bar_p = 0;
 
         bzero (&compose_status, sizeof (compose_status));
+        bzero (&last_mouse_glyph, sizeof (last_mouse_glyph));
 
         if (dpyinfo->grabbed
             && last_mouse_frame