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

Diff of /emacs/src/w32fns.c

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

revision 1.180 by raeburn, Tue Jul 16 15:49:59 2002 UTC revision 1.181 by rms, Thu Aug 29 14:37:33 2002 UTC
# Line 202  Lisp_Object Vw32_charset_info_alist; Line 202  Lisp_Object Vw32_charset_info_alist;
202  #define VIETNAMESE_CHARSET 163  #define VIETNAMESE_CHARSET 163
203  #endif  #endif
204    
205    /* How to blink the cursor off.  */
206    Lisp_Object Vblink_cursor_alist;
207    
208  Lisp_Object Qauto_raise;  Lisp_Object Qauto_raise;
209  Lisp_Object Qauto_lower;  Lisp_Object Qauto_lower;
210  Lisp_Object Qbar, Qhbar;  Lisp_Object Qbar, Qhbar, Qbox, Qhollow;
211  Lisp_Object Qborder_color;  Lisp_Object Qborder_color;
212  Lisp_Object Qborder_width;  Lisp_Object Qborder_width;
213  Lisp_Object Qbox;  Lisp_Object Qbox;
# Line 2386  x_specified_cursor_type (arg, width) Line 2389  x_specified_cursor_type (arg, width)
2389      }      }
2390    else if (NILP (arg))    else if (NILP (arg))
2391      type = NO_CURSOR;      type = NO_CURSOR;
2392      else if (EQ (arg, Qbox))
2393        type = FILLED_BOX_CURSOR;
2394    else    else
2395      /* Treat anything unknown as "box cursor".      /* Treat anything unknown as "hollow box cursor".
2396         It was bad to signal an error; people have trouble fixing         It was bad to signal an error; people have trouble fixing
2397         .Xdefaults with Emacs, when it has something bad in it.  */         .Xdefaults with Emacs, when it has something bad in it.  */
2398      type = FILLED_BOX_CURSOR;      type = HOLLOW_BOX_CURSOR;
2399    
2400    return type;    return type;
2401  }  }
# Line 2401  x_set_cursor_type (f, arg, oldval) Line 2406  x_set_cursor_type (f, arg, oldval)
2406       Lisp_Object arg, oldval;       Lisp_Object arg, oldval;
2407  {  {
2408    int width;    int width;
2409        Lisp_Object tem;
2410    
2411    FRAME_DESIRED_CURSOR (f) = x_specified_cursor_type (arg, &width);    FRAME_DESIRED_CURSOR (f) = x_specified_cursor_type (arg, &width);
2412    f->output_data.w32->cursor_width = width;    f->output_data.w32->cursor_width = width;
2413    
2414    /* Make sure the cursor gets redrawn.  This is overkill, but how    /* Make sure the cursor gets redrawn.  This is overkill, but how
2415       often do people change cursor types?  */       often do people change cursor types?  */
2416    update_mode_lines++;    update_mode_lines++;
2417    
2418      /* By default, set up the blink-off state depending on the on-state.  */
2419    
2420      if (FRAME_DESIRED_CURSOR (f) == FILLED_BOX_CURSOR)
2421        FRAME_BLINK_OFF_CURSOR (f) = HOLLOW_BOX_CURSOR;
2422      else if (FRAME_DESIRED_CURSOR (f) == BAR_CURSOR && FRAME_CURSOR_WIDTH (f) > 1)
2423        {
2424          FRAME_BLINK_OFF_CURSOR (f) = BAR_CURSOR;
2425          FRAME_BLINK_OFF_CURSOR_WIDTH (f) = 1;
2426        }
2427      else
2428        FRAME_BLINK_OFF_CURSOR (f) = NO_CURSOR;
2429    
2430      tem = Fassoc (arg, Vblink_cursor_alist);
2431      if (!NILP (tem))
2432        {
2433          FRAME_BLINK_OFF_CURSOR (f)
2434            = x_specified_cursor_type (XCDR (tem), &width);
2435          f->output_data.w32->blink_off_cursor_width = width;
2436        }
2437  }  }
2438    
2439  void  void
# Line 14870  syms_of_w32fns () Line 14896  syms_of_w32fns ()
14896    staticpro (&Qbar);    staticpro (&Qbar);
14897    Qhbar = intern ("hbar");    Qhbar = intern ("hbar");
14898    staticpro (&Qhbar);    staticpro (&Qhbar);
14899      Qbox = intern ("box");
14900      staticpro (&Qbox);
14901      Qhollow = intern ("hollow");
14902      staticpro (&Qhollow);
14903    Qborder_color = intern ("border-color");    Qborder_color = intern ("border-color");
14904    staticpro (&Qborder_color);    staticpro (&Qborder_color);
14905    Qborder_width = intern ("border-width");    Qborder_width = intern ("border-width");
# Line 15110  system to handle them.  */); Line 15140  system to handle them.  */);
15140    
15141    init_x_parm_symbols ();    init_x_parm_symbols ();
15142    
15143      DEFVAR_LISP ("blink-cursor-alist", &Vblink_cursor_alist,
15144        doc: /* Alist specifying how to blink the cursor off.
15145    Each element has the form (ON-STATE . OFF-STATE).  Whenever the
15146    `cursor-type' frame-parameter or variable equals ON-STATE,
15147    comparing using `equal', Emacs uses OFF-STATE to specify
15148    how to blink it off.  */);
15149      Vblink_cursor_alist = Qnil;
15150    
15151    DEFVAR_LISP ("x-bitmap-file-path", &Vx_bitmap_file_path,    DEFVAR_LISP ("x-bitmap-file-path", &Vx_bitmap_file_path,
15152                 doc: /* List of directories to search for bitmap files for w32.  */);                 doc: /* List of directories to search for bitmap files for w32.  */);
15153    Vx_bitmap_file_path = decode_env_path ((char *) 0, "PATH");    Vx_bitmap_file_path = decode_env_path ((char *) 0, "PATH");

Legend:
Removed from v.1.180  
changed lines
  Added in v.1.181

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