Changeset 3036

Timestamp:

03/04/03 21:52:18 (6 years ago)

Author:

miyoshi

Message:

(mw32_draw_glyphs): Notice when the text cursor of window W has
been completely overwritten by a drawing operation.
(mw32_draw_phys_cursor_glyph): Keep w->phys_cursor_on_p and
restore it after mw32_draw_glyphs().

Files:

• work/cvs2svn/src/ChangeLog.Meadow (modified) (1 diff)
• work/cvs2svn/src/mw32term.c (modified) (2 diffs)

work/cvs2svn/src/ChangeLog.Meadow

@@ -4 +4 @@
-        reserved for scroll bars on the frame. These codes were imported
-        from Emacs-21.2.
+        (mw32_draw_glyphs): Notice when the text cursor of window W has
+        been completely overwritten by a drawing operation.
+        (mw32_draw_phys_cursor_glyph): Keep w->phys_cursor_on_p and
+        restore it after mw32_draw_glyphs().
-
-2003-03-02  MIYASHITA Hisashi  <himi@meadowy.org>

work/cvs2svn/src/mw32term.c

@@ -4974 +4974 @@
-    }
-
+  if (area == TEXT_AREA
+      && !row->full_width_p
+      /* When drawing overlapping rows, only the glyph strings'
+         foreground is drawn, which doesn't erase a cursor
+         completely. */
+      && !overlaps_p)
+    {
+      int x0 = head ? head->x : x;
+      int x1 = tail ? tail->x + tail->background_width : x;
+      
+      x0 = FRAME_TO_WINDOW_PIXEL_X (w, x0);
+      x1 = FRAME_TO_WINDOW_PIXEL_X (w, x1);
+      
+      if (XFASTINT (w->left_margin_width) != 0)
+        {
+          int left_area_width = window_box_width (w, LEFT_MARGIN_AREA);
+          x0 -= left_area_width;
+          x1 -= left_area_width;
+        }
+      if (updated_area == TEXT_AREA
+          && w->phys_cursor_on_p
+          && output_cursor.vpos == w->phys_cursor.vpos
+          && x0 <= w->phys_cursor.x
+          && (x1 < 0 || x1 > w->phys_cursor.x))
+        w->phys_cursor_on_p = 0;
+    }
+  
-  /* Value is the x-position up to which drawn, relative to AREA of W.
-     This doesn't include parts drawn because of overhangs.  */
@@ -9170 +9197 @@
-  if (w->phys_cursor.hpos < row->used[TEXT_AREA])
-    {
+      int on_p = w->phys_cursor_on_p;
+      
-      mw32_draw_glyphs (w, w->phys_cursor.x, row, TEXT_AREA,
-                        w->phys_cursor.hpos, w->phys_cursor.hpos + 1,
-
-
+
+
+
-      /* When we erase the cursor, and ROW is overlapped by other
-         rows, make sure that these overlapping parts of other rows