Changeset 3057

Timestamp:

03/11/03 00:17:50 (6 years ago)

Author:

miyoshi

Message:

(mw32_draw_glyphs): Change the condition to correct
the row position. Sync up with Emacs-21.3.50.
(mw32_draw_glyphs): Call notice_overwritten_cursor().
(mw32i_write_glyphs): Invalidate old phys cursor if the glyph at
its hpos is redrawn. Sync up with Emacs-21.3.50.
(mw32i_insert_glyphs): Don't call notice_overwritten_cursor().
(notice_overwritten_cursor): Sync up with Emacs-21.3.50.
(mw32_erase_phys_cursor): If row is completely invisible, don't

attempt to delete a cursor which isn't there. Sync up with
Emacs-21.3.50.

Files:

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

work/cvs2svn/src/ChangeLog.Meadow

@@ +1 @@
+2003-03-11  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
+
+        * mw32term.c (mw32_draw_glyphs): Change the condition to correct
+        the row position. Sync up with Emacs-21.3.50.
+        (mw32_draw_glyphs): Call notice_overwritten_cursor().
+        (mw32i_write_glyphs): Invalidate old phys cursor if the glyph at
+        its hpos is redrawn. Sync up with Emacs-21.3.50.
+        (mw32i_insert_glyphs): Don't call notice_overwritten_cursor().
+        (notice_overwritten_cursor): Sync up with Emacs-21.3.50.
+        (mw32_erase_phys_cursor): If row is completely invisible, don't
+         attempt to delete a cursor which isn't there. Sync up with
+         Emacs-21.3.50.
+
-2003-03-09  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
-

work/cvs2svn/src/mw32term.c

@@ -419 +419 @@
-static void note_mouse_highlight P_ ((struct frame *, int, int));
-static void note_tool_bar_highlight P_ ((struct frame *f, int, int));
-
+
+
+
-static void show_mouse_face P_ ((struct mw32_display_info *,
-                                 enum draw_glyphs_face));
@@ -4983 +4985 @@
-      x1 = FRAME_TO_WINDOW_PIXEL_X (w, x1);
-      
-
+!row->full_width_p && 
-        {
-          int left_area_width = window_box_width (w, LEFT_MARGIN_AREA);
@@ -4989 +4991 @@
-          x1 -= left_area_width;
-        }
-
-
-
-
-
-
+
+
+
-    }
-  
@@ -5085 +5084 @@
-                        &real_start, &real_end, 0);
-
-
-
-
+
+
+
+
+
+
+
+
-  /* If we should require GdiFlush(),
-     insert here.  */
@@ -5143 +5147 @@
-  mw32_draw_glyphs (w, output_cursor.x, row, updated_area, hpos, hpos + len,
-                    DRAW_NORMAL_TEXT, &real_start, &real_end, 0);
-  notice_overwritten_cursor (w, real_start, real_end - real_start);
-  
-  /* Advance the output cursor.  */
@@ -5206 +5209 @@
-  /* Notice if the cursor will be cleared by this operation.  */
-  if (!updated_row->full_width_p)
-
+
+
+
+
-
-  from_x = output_cursor.x;
@@ -8993 +8999 @@
- ***********************************************************************/
-
-if the text cursor of window W has been overwritten by a
-drawing operation that outputs N glyphs starting at HPOS in the
-line given by output_cursor.vpos.
-
-N < 0 means all the rest of the line after HPOS has been
-written
+when the text cursor of window W has been completely
+overwritten by a drawing operation that outputs glyphs in AREA
+starting at X0 and ending at X1 in the line starting at Y0 and
+
+the rest of the line after X0 has been written.  Y coordinates
+are window-relative
-
-static void
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            w->phys_cursor_on_p = 0;
-        }
@@ -9220 +9237 @@
-    {
-      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,
-                        hl, 0, 0, 0);
-      w->phys_cursor_on_p = on_p;
-
+
-      /* When we erase the cursor, and ROW is overlapped by other
-         rows, make sure that these overlapping parts of other rows
@@ -9274 +9291 @@
-    goto mark_cursor_off;
-  
+  /* If row is completely invisible, don't attempt to delete a cursor which
+     isn't there.  This may happen if cursor is at top of window, and
+     we switch to a buffer with a header line in that window.  */
+  if (cursor_row->visible_height <= 0)
+    goto mark_cursor_off;
+
-  /* This can happen when the new row is shorter than the old one.
-     In this case, either x_draw_glyphs or clear_end_of_line