/[emacs]/emacs/src/xfns.c
ViewVC logotype

Diff of /emacs/src/xfns.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.554 by raeburn, Tue Jul 16 15:50:04 2002 UTC revision 1.555 by rms, Tue Aug 27 18:45:01 2002 UTC
# Line 183  Lisp_Object Vx_bitmap_file_path; Line 183  Lisp_Object Vx_bitmap_file_path;
183    
184  Lisp_Object Vx_pixel_size_width_font_regexp;  Lisp_Object Vx_pixel_size_width_font_regexp;
185    
186    /* How to blink the cursor off.  */
187    Lisp_Object Vblink_cursor_alist;
188    
189  Lisp_Object Qauto_raise;  Lisp_Object Qauto_raise;
190  Lisp_Object Qauto_lower;  Lisp_Object Qauto_lower;
191  Lisp_Object Qbar, Qhbar;  Lisp_Object Qbar, Qhbar, Qbox, Qhollow;
192  Lisp_Object Qborder_color;  Lisp_Object Qborder_color;
193  Lisp_Object Qborder_width;  Lisp_Object Qborder_width;
194  Lisp_Object Qbox;  Lisp_Object Qbox;
# Line 1873  x_specified_cursor_type (arg, width) Line 1876  x_specified_cursor_type (arg, width)
1876      }      }
1877    else if (NILP (arg))    else if (NILP (arg))
1878      type = NO_CURSOR;      type = NO_CURSOR;
1879      else if (EQ (arg, Qbox))
1880        type = FILLED_BOX_CURSOR;
1881    else    else
1882      /* Treat anything unknown as "box cursor".      /* Treat anything unknown as "hollow box cursor".
1883         It was bad to signal an error; people have trouble fixing         It was bad to signal an error; people have trouble fixing
1884         .Xdefaults with Emacs, when it has something bad in it.  */         .Xdefaults with Emacs, when it has something bad in it.  */
1885      type = FILLED_BOX_CURSOR;      type = HOLLOW_BOX_CURSOR;
1886    
1887    return type;    return type;
1888  }  }
# Line 1888  x_set_cursor_type (f, arg, oldval) Line 1893  x_set_cursor_type (f, arg, oldval)
1893       Lisp_Object arg, oldval;       Lisp_Object arg, oldval;
1894  {  {
1895    int width;    int width;
1896      Lisp_Object tem;
1897        
1898    FRAME_DESIRED_CURSOR (f) = x_specified_cursor_type (arg, &width);    FRAME_DESIRED_CURSOR (f) = x_specified_cursor_type (arg, &width);
1899    f->output_data.x->cursor_width = width;    f->output_data.x->cursor_width = width;
1900    
1901    /* Make sure the cursor gets redrawn.  */    /* Make sure the cursor gets redrawn.  */
1902    cursor_type_changed = 1;    cursor_type_changed = 1;
1903    
1904      /* By default, set up the blink-off state depending on the on-state.  */
1905    
1906      if (FRAME_DESIRED_CURSOR (f) == FILLED_BOX_CURSOR)
1907        FRAME_BLINK_OFF_CURSOR (f) = HOLLOW_BOX_CURSOR;
1908      else if (FRAME_DESIRED_CURSOR (f) == BAR_CURSOR && FRAME_CURSOR_WIDTH (f) > 1)
1909        {
1910          FRAME_BLINK_OFF_CURSOR (f) = BAR_CURSOR;
1911          FRAME_BLINK_OFF_CURSOR_WIDTH (f) = 1;
1912        }
1913      else
1914        FRAME_BLINK_OFF_CURSOR (f) = NO_CURSOR;
1915    
1916      tem = Fassoc (arg, Vblink_cursor_alist);
1917      if (!NILP (tem))
1918        {
1919          FRAME_BLINK_OFF_CURSOR (f)
1920            = x_specified_cursor_type (XCDR (tem), &width);
1921          f->output_data.x->blink_off_cursor_width = width;
1922        }
1923  }  }
1924    
1925  void  void
# Line 11844  syms_of_xfns () Line 11870  syms_of_xfns ()
11870    staticpro (&Qbar);    staticpro (&Qbar);
11871    Qhbar = intern ("hbar");    Qhbar = intern ("hbar");
11872    staticpro (&Qhbar);    staticpro (&Qhbar);
11873      Qbox = intern ("box");
11874      staticpro (&Qbox);
11875      Qhollow = intern ("hollow");
11876      staticpro (&Qhollow);
11877    Qborder_color = intern ("border-color");    Qborder_color = intern ("border-color");
11878    staticpro (&Qborder_color);    staticpro (&Qborder_color);
11879    Qborder_width = intern ("border-width");    Qborder_width = intern ("border-width");
# Line 11954  syms_of_xfns () Line 11984  syms_of_xfns ()
11984    
11985    init_x_parm_symbols ();    init_x_parm_symbols ();
11986    
11987      DEFVAR_LISP ("blink-cursor-alist", &Vblink_cursor_alist,
11988        doc: /* Alist specifying how to blink the cursor off.
11989    Each element has the form (ON-STATE . OFF-STATE).  Whenever the
11990    `cursor-type' frame-parameter or variable equals ON-STATE,
11991    comparing using `equal', Emacs uses OFF-STATE to specify
11992    how to blink it off.  */);
11993      Vblink_cursor_alist = Qnil;
11994    
11995    DEFVAR_BOOL ("cross-disabled-images", &cross_disabled_images,    DEFVAR_BOOL ("cross-disabled-images", &cross_disabled_images,
11996      doc: /* Non-nil means always draw a cross over disabled images.      doc: /* Non-nil means always draw a cross over disabled images.
11997  Disabled images are those having an `:conversion disabled' property.  Disabled images are those having an `:conversion disabled' property.

Legend:
Removed from v.1.554  
changed lines
  Added in v.1.555

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26