diff src/nsterm.h @ 98458:5db459c2e438

* nsterm.h (ns_cursor_types, ns_output.desired_cursor_color)(ns_output.current_cursor, ns_output.desired_cursor) (ns_output.last_inactive, FRAME_CURSOR, FRAME_NEW_CURSOR) (FRAME_NEW_CURSOR_COLOR,): Remove. * nsfns.m (ns_set_cursor_color): Use FRAME_CURSOR_COLOR. (ns_lisp_to_cursor_type, ns_cursor_type_to_lisp): Use core emacs enumeration (HOLLOW_BOX_CURSOR, etc.). * nsterm.m (ns_frame_rehighlight): Remove commented code. (draw_window_cursor): Simplify code. (EmacsView-windowDidBecomeKey:,-windowDidResignKey:): Don't change cursor type. In latter, call rehighlight instead of doing updates manually. (EmacsPrefsController-setPanelFromValues,-setValuesFromPanel): Use core emacs cursor types. * xdisp.c (draw_glyphs): Don't call notice_overwritten_cursor() under NS.

--- a/src/nsterm.h	Thu Oct 02 08:04:54 2008 +0000
+++ b/src/nsterm.h	Thu Oct 02 13:57:39 2008 +0000
@@ -383,16 +383,6 @@
 
    ========================================================================== */
 
-enum ns_cursor_types
-{
-   no_highlight =0,
-   filled_box,
-   hollow_box,
-   underscore,
-   bar
-};
-
-
 /* could use list to store these, but rest of emacs has a big infrastructure
    for managing a table of bitmap "records" */
 struct ns_bitmap_record
@@ -560,16 +550,14 @@
 #ifdef __OBJC__
   EmacsView *view;
   id miniimage;
-  NSColor *current_cursor_color;
-  NSColor *desired_cursor_color;
+  NSColor *cursor_color;
   NSColor *foreground_color;
   NSColor *background_color;
   EmacsToolbar *toolbar;
 #else
   void *view;
   void *miniimage;
-  void *current_cursor_color;
-  void *desired_cursor_color;
+  void *cursor_color;
   void *foreground_color;
   void *background_color;
   void *toolbar;
@@ -599,8 +587,6 @@
 
   Lisp_Object icon_top;
   Lisp_Object icon_left;
-  enum ns_cursor_types current_cursor, desired_cursor;
-  unsigned char last_inactive;
 
   /* The size of the extra width currently allotted for vertical
      scroll bars, in pixels.  */
@@ -656,12 +642,8 @@
 #define FRAME_DEFAULT_FACE(f) FACE_FROM_ID (f, DEFAULT_FACE_ID)
 
 #define FRAME_NS_VIEW(f) ((f)->output_data.ns->view)
-#define FRAME_CURSOR(f)  ((f)->output_data.ns->current_cursor)
-#define FRAME_CURSOR_COLOR(f) ((f)->output_data.ns->current_cursor_color)
-#define FRAME_NEW_CURSOR_COLOR(f) ((f)->output_data.ns->desired_cursor_color)
-#define FRAME_NEW_CURSOR(f)  ((f)->output_data.ns->desired_cursor)
+#define FRAME_CURSOR_COLOR(f) ((f)->output_data.ns->cursor_color)
 #define FRAME_POINTER_TYPE(f) ((f)->output_data.ns->current_pointer)
-#define FRAME_LAST_INACTIVE(f) ((f)->output_data.ns->last_inactive)
 
 #define FRAME_FONT(f) ((f)->output_data.ns->font)