[Emacs-diffs] Changes to emacs/src/xfns.c

[Kim F. Storm]

Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.556 emacs/src/xfns.c:1.557
*** emacs/src/xfns.c:1.556      Wed Aug 28 11:12:00 2002
--- emacs/src/xfns.c    Fri Aug 30 08:04:18 2002
***************
*** 183,194 ****
  
  Lisp_Object Vx_pixel_size_width_font_regexp;
  
- /* How to blink the cursor off.  */
- Lisp_Object Vblink_cursor_alist;
- 
  Lisp_Object Qauto_raise;
  Lisp_Object Qauto_lower;
- Lisp_Object Qbar, Qhbar, Qbox, Qhollow;
  Lisp_Object Qborder_color;
  Lisp_Object Qborder_width;
  Lisp_Object Qbox;
--- 183,190 ----
***************
*** 1837,1925 ****
  }
  
  
- /* Value is the internal representation of the specified cursor type
-    ARG.  If type is BAR_CURSOR, return in *WIDTH the specified width
-    of the bar cursor.  */
- 
- enum text_cursor_kinds
- x_specified_cursor_type (arg, width)
-      Lisp_Object arg;
-      int *width;
- {
-   enum text_cursor_kinds type;
-   
-   if (EQ (arg, Qbar))
-     {
-       type = BAR_CURSOR;
-       *width = 2;
-     }
-   else if (CONSP (arg)
-          && EQ (XCAR (arg), Qbar)
-          && INTEGERP (XCDR (arg))
-          && XINT (XCDR (arg)) >= 0)
-     {
-       type = BAR_CURSOR;
-       *width = XINT (XCDR (arg));
-     }
-   else if (EQ (arg, Qhbar))
-     {
-       type = HBAR_CURSOR;
-       *width = 2;
-     }
-   else if (CONSP (arg)
-          && EQ (XCAR (arg), Qhbar)
-          && INTEGERP (XCDR (arg))
-          && XINT (XCDR (arg)) >= 0)
-     {
-       type = HBAR_CURSOR;
-       *width = XINT (XCDR (arg));
-     }
-   else if (NILP (arg))
-     type = NO_CURSOR;
-   else if (EQ (arg, Qbox))
-     type = FILLED_BOX_CURSOR;
-   else
-     /* Treat anything unknown as "hollow box cursor".
-        It was bad to signal an error; people have trouble fixing
-        .Xdefaults with Emacs, when it has something bad in it.  */
-     type = HOLLOW_BOX_CURSOR;
- 
-   return type;
- }
  
  void
  x_set_cursor_type (f, arg, oldval)
       FRAME_PTR f;
       Lisp_Object arg, oldval;
  {
!   int width;
!   Lisp_Object tem;
!   
!   FRAME_DESIRED_CURSOR (f) = x_specified_cursor_type (arg, &width);
!   f->output_data.x->cursor_width = width;
  
    /* Make sure the cursor gets redrawn.  */
    cursor_type_changed = 1;
- 
-   /* By default, set up the blink-off state depending on the on-state.  */
- 
-   if (FRAME_DESIRED_CURSOR (f) == FILLED_BOX_CURSOR)
-     FRAME_BLINK_OFF_CURSOR (f) = HOLLOW_BOX_CURSOR;
-   else if (FRAME_DESIRED_CURSOR (f) == BAR_CURSOR && FRAME_CURSOR_WIDTH (f) > 
1)
-     {
-       FRAME_BLINK_OFF_CURSOR (f) = BAR_CURSOR;
-       FRAME_BLINK_OFF_CURSOR_WIDTH (f) = 1;
-     }
-   else
-     FRAME_BLINK_OFF_CURSOR (f) = NO_CURSOR;
- 
-   tem = Fassoc (arg, Vblink_cursor_alist);
-   if (!NILP (tem))
-     {
-       FRAME_BLINK_OFF_CURSOR (f)
-       = x_specified_cursor_type (XCDR (tem), &width);
-       f->output_data.x->blink_off_cursor_width = width;
-     }
  }
  
  void
--- 1833,1848 ----
  }
  
  
  
  void
  x_set_cursor_type (f, arg, oldval)
       FRAME_PTR f;
       Lisp_Object arg, oldval;
  {
!   set_frame_cursor_types (f, arg);
  
    /* Make sure the cursor gets redrawn.  */
    cursor_type_changed = 1;
  }
  
  void
***************
*** 11867,11886 ****
    staticpro (&Qauto_raise);
    Qauto_lower = intern ("auto-lower");
    staticpro (&Qauto_lower);
-   Qbar = intern ("bar");
-   staticpro (&Qbar);
-   Qhbar = intern ("hbar");
-   staticpro (&Qhbar);
-   Qbox = intern ("box");
-   staticpro (&Qbox);
-   Qhollow = intern ("hollow");
-   staticpro (&Qhollow);
    Qborder_color = intern ("border-color");
    staticpro (&Qborder_color);
    Qborder_width = intern ("border-width");
    staticpro (&Qborder_width);
-   Qbox = intern ("box");
-   staticpro (&Qbox);
    Qcursor_color = intern ("cursor-color");
    staticpro (&Qcursor_color);
    Qcursor_type = intern ("cursor-type");
--- 11790,11799 ----
***************
*** 11984,11997 ****
        build_string ("Undefined color"));
  
    init_x_parm_symbols ();
- 
-   DEFVAR_LISP ("blink-cursor-alist", &Vblink_cursor_alist,
-     doc: /* Alist specifying how to blink the cursor off.
- Each element has the form (ON-STATE . OFF-STATE).  Whenever the
- `cursor-type' frame-parameter or variable equals ON-STATE,
- comparing using `equal', Emacs uses OFF-STATE to specify
- how to blink it off.  */);
-   Vblink_cursor_alist = Qnil;
  
    DEFVAR_BOOL ("cross-disabled-images", &cross_disabled_images,
      doc: /* Non-nil means always draw a cross over disabled images.
--- 11897,11902 ----