1 files changed, 9 insertions, 82 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 26f297f1024..30a43995a57 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1310,7 +1310,7 @@ x_draw_glyph_string_foreground (s)
          XDrawImageString is usually faster than XDrawString.)  Always
          use XDrawImageString when drawing the cursor so that there is
          no chance that characters under a box cursor are invisible.  */
-      if (s->for_overlaps_p
+      if (s->for_overlaps
           || (s->background_filled_p && s->hl != DRAW_CURSOR))
         {
           /* Draw characters with 16-bit or 8-bit functions.  */
@@ -2616,7 +2616,7 @@ x_draw_glyph_string (s)
   /* If S draws into the background of its successor, draw the
      background of the successor first so that S can draw into it.
      This makes S->next use XDrawString instead of XDrawImageString.  */
-  if (s->next && s->right_overhang && !s->for_overlaps_p)
+  if (s->next && s->right_overhang && !s->for_overlaps)
     {
       xassert (s->next->img == NULL);
       x_set_glyph_string_gc (s->next);
@@ -2629,7 +2629,7 @@ x_draw_glyph_string (s)
 
   /* Draw relief (if any) in advance for char/composition so that the
      glyph string can be drawn over it.  */
-  if (!s->for_overlaps_p
+  if (!s->for_overlaps
       && s->face->box != FACE_NO_BOX
       && (s->first_glyph->type == CHAR_GLYPH
           || s->first_glyph->type == COMPOSITE_GLYPH))
@@ -2655,7 +2655,7 @@ x_draw_glyph_string (s)
       break;
 
     case CHAR_GLYPH:
-      if (s->for_overlaps_p)
+      if (s->for_overlaps)
         s->background_filled_p = 1;
       else
         x_draw_glyph_string_background (s, 0);
@@ -2663,7 +2663,7 @@ x_draw_glyph_string (s)
       break;
 
     case COMPOSITE_GLYPH:
-      if (s->for_overlaps_p || s->gidx > 0)
+      if (s->for_overlaps || s->gidx > 0)
         s->background_filled_p = 1;
       else
         x_draw_glyph_string_background (s, 1);
@@ -2674,7 +2674,7 @@ x_draw_glyph_string (s)
       abort ();
     }
 
-  if (!s->for_overlaps_p)
+  if (!s->for_overlaps)
     {
       /* Draw underline.  */
       if (s->face->underline_p)
@@ -3613,6 +3613,8 @@ note_mouse_movement (frame, event)
       frame->mouse_moved = 1;
       last_mouse_scroll_bar = Qnil;
       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);
     }
 }
 
@@ -3632,56 +3634,6 @@ redo_mouse_highlight ()
 }
 
 
-static int glyph_rect P_ ((struct frame *f, int, int, XRectangle *));
-
-
-/* Try to determine frame pixel position and size of the glyph under
-   frame pixel coordinates X/Y on frame F .  Return the position and
-   size in *RECT.  Value is non-zero if we could compute these
-   values.  */
-
-static int
-glyph_rect (f, x, y, rect)
-     struct frame *f;
-     int x, y;
-     XRectangle *rect;
-{
-  Lisp_Object window;
-  struct window *w;
-  struct glyph_row *r, *end_row;
-
-  window = window_from_coordinates (f, x, y, 0, &x, &y, 0);
-  if (NILP (window))
-    return 0;
-
-  w = XWINDOW (window);
-  r = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
-  end_row = r + w->current_matrix->nrows - 1;
-
-  for (; r < end_row && r->enabled_p; ++r)
-    {
-      if (r->y >= y)
-        {
-          struct glyph *g = r->glyphs[TEXT_AREA];
-          struct glyph *end = g + r->used[TEXT_AREA];
-          int gx = r->x;
-          while (g < end && gx < x)
-            gx += g->pixel_width, ++g;
-          if (g < end)
-            {
-              rect->width = g->pixel_width;
-              rect->height = r->height;
-              rect->x = WINDOW_TO_FRAME_PIXEL_X (w, gx);
-              rect->y = WINDOW_TO_FRAME_PIXEL_Y (w, r->y);
-              return 1;
-            }
-          break;
-        }
-    }
-
-  return 0;
-}
-
 
 /* Return the current position of the mouse.
    *FP should be a frame which indicates which display to ask about.
@@ -3870,32 +3822,7 @@ XTmouse_position (fp, insist, bar_window, part, x, y, time)
                on it, i.e. into the same rectangles that matrices on
                the frame are divided into.  */
 
-            int width, height, gx, gy;
-            XRectangle rect;
-
-            if (glyph_rect (f1, win_x, win_y, &rect))
-              last_mouse_glyph = rect;
-            else
-              {
-                width = FRAME_SMALLEST_CHAR_WIDTH (f1);
-                height = FRAME_SMALLEST_FONT_HEIGHT (f1);
-                gx = win_x;
-                gy = win_y;
-
-                /* Arrange for the division in FRAME_PIXEL_X_TO_COL etc. to
-                   round down even for negative values.  */
-                if (gx < 0)
-                  gx -= width - 1;
-                if (gy < 0)
-                  gy -= height - 1;
-                gx = (gx + width - 1) / width * width;
-                gy = (gy + height - 1) / height * height;
-
-                last_mouse_glyph.width  = width;
-                last_mouse_glyph.height = height;
-                last_mouse_glyph.x = gx;
-                last_mouse_glyph.y = gy;
-              }
+            remember_mouse_glyph (f1, win_x, win_y, &last_mouse_glyph);
 
             *bar_window = Qnil;
             *part = 0;