X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/bd0443bb8799b908cefd0b11c86db6115180850d..77394d40d90fe4ba150444c0160654c608ef227d:/src/xdisp.c?ds=sidebyside

diff --git a/src/xdisp.c b/src/xdisp.c
index 36f7f1e503..d5def06593 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -512,10 +512,6 @@ int update_mode_lines;
 
 int windows_or_buffers_changed;
 
-/* Nonzero means a frame's cursor type has been changed.  */
-
-static int cursor_type_changed;
-
 /* Nonzero after display_mode_line if %l was used and it displayed a
    line number.  */
 
@@ -6670,17 +6666,59 @@ lookup_glyphless_char_display (int c, struct it *it)
   return glyphless_method;
 }
 
-/* Load IT's display element fields with information about the next
-   display element from the current position of IT.  Value is zero if
-   end of buffer (or C string) is reached.  */
+/* Merge escape glyph face and cache the result.  */
 
 static struct frame *last_escape_glyph_frame = NULL;
 static int last_escape_glyph_face_id = (1 << FACE_ID_BITS);
 static int last_escape_glyph_merged_face_id = 0;
 
-struct frame *last_glyphless_glyph_frame = NULL;
-int last_glyphless_glyph_face_id = (1 << FACE_ID_BITS);
-int last_glyphless_glyph_merged_face_id = 0;
+static int
+merge_escape_glyph_face (struct it *it)
+{
+  int face_id;
+
+  if (it->f == last_escape_glyph_frame
+      && it->face_id == last_escape_glyph_face_id)
+    face_id = last_escape_glyph_merged_face_id;
+  else
+    {
+      /* Merge the `escape-glyph' face into the current face.  */
+      face_id = merge_faces (it->f, Qescape_glyph, 0, it->face_id);
+      last_escape_glyph_frame = it->f;
+      last_escape_glyph_face_id = it->face_id;
+      last_escape_glyph_merged_face_id = face_id;
+    }
+  return face_id;
+}
+
+/* Likewise for glyphless glyph face.  */
+
+static struct frame *last_glyphless_glyph_frame = NULL;
+static int last_glyphless_glyph_face_id = (1 << FACE_ID_BITS);
+static int last_glyphless_glyph_merged_face_id = 0;
+
+int
+merge_glyphless_glyph_face (struct it *it)
+{
+  int face_id;
+
+  if (it->f == last_glyphless_glyph_frame
+      && it->face_id == last_glyphless_glyph_face_id)
+    face_id = last_glyphless_glyph_merged_face_id;
+  else
+    {
+      /* Merge the `glyphless-char' face into the current face.  */
+      face_id = merge_faces (it->f, Qglyphless_char, 0, it->face_id);
+      last_glyphless_glyph_frame = it->f;
+      last_glyphless_glyph_face_id = it->face_id;
+      last_glyphless_glyph_merged_face_id = face_id;
+    }
+  return face_id;
+}
+
+/* Load IT's display element fields with information about the next
+   display element from the current position of IT.  Value is zero if
+   end of buffer (or C string) is reached.  */
 
 static int
 get_next_display_element (struct it *it)
@@ -6828,24 +6866,10 @@ get_next_display_element (struct it *it)
 		      g = GLYPH_CODE_CHAR (gc);
 		      lface_id = GLYPH_CODE_FACE (gc);
 		    }
-		  if (lface_id)
-		    {
-		      face_id = merge_faces (it->f, Qt, lface_id, it->face_id);
-		    }
-		  else if (it->f == last_escape_glyph_frame
-			   && it->face_id == last_escape_glyph_face_id)
-		    {
-		      face_id = last_escape_glyph_merged_face_id;
-		    }
-		  else
-		    {
-		      /* Merge the escape-glyph face into the current face.  */
-		      face_id = merge_faces (it->f, Qescape_glyph, 0,
-					     it->face_id);
-		      last_escape_glyph_frame = it->f;
-		      last_escape_glyph_face_id = it->face_id;
-		      last_escape_glyph_merged_face_id = face_id;
-		    }
+
+		  face_id = (lface_id
+			     ? merge_faces (it->f, Qt, lface_id, it->face_id)
+			     : merge_escape_glyph_face (it));
 
 		  XSETINT (it->ctl_chars[0], g);
 		  XSETINT (it->ctl_chars[1], c ^ 0100);
@@ -6877,27 +6901,10 @@ get_next_display_element (struct it *it)
 		  escape_glyph = GLYPH_CODE_CHAR (gc);
 		  lface_id = GLYPH_CODE_FACE (gc);
 		}
-	      if (lface_id)
-		{
-		  /* The display table specified a face.
-		     Merge it into face_id and also into escape_glyph.  */
-		  face_id = merge_faces (it->f, Qt, lface_id,
-					 it->face_id);
-		}
-	      else if (it->f == last_escape_glyph_frame
-		       && it->face_id == last_escape_glyph_face_id)
-		{
-		  face_id = last_escape_glyph_merged_face_id;
-		}
-	      else
-		{
-		  /* Merge the escape-glyph face into the current face.  */
-		  face_id = merge_faces (it->f, Qescape_glyph, 0,
-					 it->face_id);
-		  last_escape_glyph_frame = it->f;
-		  last_escape_glyph_face_id = it->face_id;
-		  last_escape_glyph_merged_face_id = face_id;
-		}
+
+	      face_id = (lface_id
+			 ? merge_faces (it->f, Qt, lface_id, it->face_id)
+			 : merge_escape_glyph_face (it));
 
 	      /* Draw non-ASCII hyphen with just highlighting: */
 
@@ -13010,6 +13017,10 @@ redisplay_internal (void)
 	      adjust_frame_glyphs (f);
 	      f->fonts_changed = 0;
 	    }
+	  /* If cursor type has been changed on the frame
+	     other than selected, consider all frames.  */
+	  if (f != sf && f->cursor_type_changed)
+	    update_mode_lines++;
 	}
       clear_desired_matrices (f);
     }
@@ -13059,8 +13070,7 @@ redisplay_internal (void)
     }
 
   consider_all_windows_p = (update_mode_lines
-			    || buffer_shared_and_changed ()
-			    || cursor_type_changed);
+			    || buffer_shared_and_changed ());
 
   /* If specs for an arrow have changed, do thorough redisplay
      to ensure we remove any arrow that should no longer exist.  */
@@ -13151,6 +13161,7 @@ redisplay_internal (void)
       && !current_buffer->prevent_redisplay_optimizations_p
       && FRAME_VISIBLE_P (XFRAME (w->frame))
       && !FRAME_OBSCURED_P (XFRAME (w->frame))
+      && !XFRAME (w->frame)->cursor_type_changed
       /* Make sure recorded data applies to current buffer, etc.  */
       && this_line_buffer == current_buffer
       && match_p
@@ -13419,6 +13430,7 @@ redisplay_internal (void)
 		  /* Update the display.  */
 		  set_window_update_flags (XWINDOW (f->root_window), 1);
 		  pending |= update_frame (f, 0, 0);
+		  f->cursor_type_changed = 0;
 		  f->updated_p = 1;
 		}
 	    }
@@ -13480,6 +13492,7 @@ redisplay_internal (void)
 
 	  XWINDOW (selected_window)->must_be_updated_p = 1;
 	  pending = update_frame (sf, 0, 0);
+	  sf->cursor_type_changed = 0;
 	}
 
       /* We may have called echo_area_display at the top of this
@@ -13494,6 +13507,7 @@ redisplay_internal (void)
 	{
 	  XWINDOW (mini_window)->must_be_updated_p = 1;
 	  pending |= update_frame (mini_frame, 0, 0);
+	  mini_frame->cursor_type_changed = 0;
 	  if (!pending && hscroll_windows (mini_window))
 	    goto retry;
 	}
@@ -13534,7 +13548,6 @@ redisplay_internal (void)
 
       update_mode_lines = 0;
       windows_or_buffers_changed = 0;
-      cursor_type_changed = 0;
     }
 
   /* Start SIGIO interrupts coming again.  Having them off during the
@@ -14976,7 +14989,7 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste
 	 cases.  */
       && !update_mode_lines
       && !windows_or_buffers_changed
-      && !cursor_type_changed
+      && !f->cursor_type_changed
       /* Can't use this case if highlighting a region.  When a
          region exists, cursor movement has to do more than just
          set the cursor.  */
@@ -15972,7 +15985,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
   /* Redisplay the window.  */
   if (!current_matrix_up_to_date_p
       || windows_or_buffers_changed
-      || cursor_type_changed
+      || f->cursor_type_changed
       /* Don't use try_window_reusing_current_matrix in this case
 	 because it can have changed the buffer.  */
       || !NILP (Vwindow_scroll_functions)
@@ -16351,7 +16364,7 @@ try_window_reusing_current_matrix (struct window *w)
       /* Don't try to reuse the display if windows have been split
 	 or such.  */
       || windows_or_buffers_changed
-      || cursor_type_changed)
+      || f->cursor_type_changed)
     return 0;
 
   /* Can't do this if region may have changed.  */
@@ -17122,7 +17135,7 @@ try_window_id (struct window *w)
     GIVE_UP (1);
 
   /* This flag is used to prevent redisplay optimizations.  */
-  if (windows_or_buffers_changed || cursor_type_changed)
+  if (windows_or_buffers_changed || f->cursor_type_changed)
     GIVE_UP (2);
 
   /* Verify that narrowing has not changed.
@@ -24893,21 +24906,7 @@ produce_glyphless_glyph (struct it *it, int for_no_font, Lisp_Object acronym)
   base_height = it->ascent + it->descent;
   base_width = font->average_width;
 
-  /* Get a face ID for the glyph by utilizing a cache (the same way as
-     done for `escape-glyph' in get_next_display_element).  */
-  if (it->f == last_glyphless_glyph_frame
-      && it->face_id == last_glyphless_glyph_face_id)
-    {
-      face_id = last_glyphless_glyph_merged_face_id;
-    }
-  else
-    {
-      /* Merge the `glyphless-char' face into the current face.  */
-      face_id = merge_faces (it->f, Qglyphless_char, 0, it->face_id);
-      last_glyphless_glyph_frame = it->f;
-      last_glyphless_glyph_face_id = it->face_id;
-      last_glyphless_glyph_merged_face_id = face_id;
-    }
+  face_id = merge_glyphless_glyph_face (it);
 
   if (it->glyphless_method == GLYPHLESS_DISPLAY_THIN_SPACE)
     {
@@ -25948,7 +25947,7 @@ set_frame_cursor_types (struct frame *f, Lisp_Object arg)
     FRAME_BLINK_OFF_CURSOR (f) = DEFAULT_CURSOR;
 
   /* Make sure the cursor gets redrawn.  */
-  cursor_type_changed = 1;
+  f->cursor_type_changed = 1;
 }