diff options
| author | Eli Zaretskii | 2002-04-19 12:13:47 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2002-04-19 12:13:47 +0000 |
| commit | a0738471ba26a4ad44f8a151cc950b3aae916d4a (patch) | |
| tree | ff0ded512d649378c2d8c446cfc1568f7523718f /src/msdos.c | |
| parent | 267bdad3193d6cf12eb39f6bdb1e2fed9abeefe6 (diff) | |
| download | emacs-a0738471ba26a4ad44f8a151cc950b3aae916d4a.tar.gz emacs-a0738471ba26a4ad44f8a151cc950b3aae916d4a.zip | |
(Qhbar): New variable.
(syms_of_msdos): intern and staticpro it.
(IT_set_cursor_type, IT_set_frame_parameters): Handle the `hbar'
cursor type.
Diffstat (limited to 'src/msdos.c')
| -rw-r--r-- | src/msdos.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/msdos.c b/src/msdos.c index 2cba37f9858..ecaa8a4eda2 100644 --- a/src/msdos.c +++ b/src/msdos.c | |||
| @@ -412,7 +412,7 @@ static unsigned short screen_virtual_offset = 0; | |||
| 412 | /* A flag to control how to display unibyte 8-bit characters. */ | 412 | /* A flag to control how to display unibyte 8-bit characters. */ |
| 413 | extern int unibyte_display_via_language_environment; | 413 | extern int unibyte_display_via_language_environment; |
| 414 | 414 | ||
| 415 | Lisp_Object Qbar; | 415 | Lisp_Object Qbar, Qhbar; |
| 416 | 416 | ||
| 417 | /* The screen colors of the curent frame, which serve as the default | 417 | /* The screen colors of the curent frame, which serve as the default |
| 418 | colors for newly-created frames. */ | 418 | colors for newly-created frames. */ |
| @@ -820,12 +820,14 @@ msdos_set_cursor_shape (struct frame *f, int start_line, int width) | |||
| 820 | static void | 820 | static void |
| 821 | IT_set_cursor_type (struct frame *f, Lisp_Object cursor_type) | 821 | IT_set_cursor_type (struct frame *f, Lisp_Object cursor_type) |
| 822 | { | 822 | { |
| 823 | if (EQ (cursor_type, Qbar)) | 823 | if (EQ (cursor_type, Qbar) || EQ (cursor_type, Qhbar)) |
| 824 | { | 824 | { |
| 825 | /* Just BAR means the normal EGA/VGA cursor. */ | 825 | /* Just BAR means the normal EGA/VGA cursor. */ |
| 826 | msdos_set_cursor_shape (f, DEFAULT_CURSOR_START, DEFAULT_CURSOR_WIDTH); | 826 | msdos_set_cursor_shape (f, DEFAULT_CURSOR_START, DEFAULT_CURSOR_WIDTH); |
| 827 | } | 827 | } |
| 828 | else if (CONSP (cursor_type) && EQ (XCAR (cursor_type), Qbar)) | 828 | else if (CONSP (cursor_type) |
| 829 | && (EQ (XCAR (cursor_type), Qbar) | ||
| 830 | || EQ (XCAR (cursor_type), Qhbar))) | ||
| 829 | { | 831 | { |
| 830 | Lisp_Object bar_parms = XCDR (cursor_type); | 832 | Lisp_Object bar_parms = XCDR (cursor_type); |
| 831 | int width; | 833 | int width; |
| @@ -2477,7 +2479,9 @@ IT_set_frame_parameters (f, alist) | |||
| 2477 | IT_set_cursor_type (f, val); | 2479 | IT_set_cursor_type (f, val); |
| 2478 | if (termscript) | 2480 | if (termscript) |
| 2479 | fprintf (termscript, "<CTYPE: %s>\n", | 2481 | fprintf (termscript, "<CTYPE: %s>\n", |
| 2480 | EQ (val, Qbar) || CONSP (val) && EQ (XCAR (val), Qbar) | 2482 | EQ (val, Qbar) || EQ (val, Qhbar) |
| 2483 | || CONSP (val) && (EQ (XCAR (val), Qbar) | ||
| 2484 | || EQ (XCAR (val), Qhbar)) | ||
| 2481 | ? "bar" : "box"); | 2485 | ? "bar" : "box"); |
| 2482 | } | 2486 | } |
| 2483 | store_frame_param (f, prop, val); | 2487 | store_frame_param (f, prop, val); |
| @@ -5351,6 +5355,8 @@ syms_of_msdos () | |||
| 5351 | /* The following two are from xfns.c: */ | 5355 | /* The following two are from xfns.c: */ |
| 5352 | Qbar = intern ("bar"); | 5356 | Qbar = intern ("bar"); |
| 5353 | staticpro (&Qbar); | 5357 | staticpro (&Qbar); |
| 5358 | Qhbar = intern ("hbar"); | ||
| 5359 | staticpro (&Qhbar); | ||
| 5354 | Qcursor_type = intern ("cursor-type"); | 5360 | Qcursor_type = intern ("cursor-type"); |
| 5355 | staticpro (&Qcursor_type); | 5361 | staticpro (&Qcursor_type); |
| 5356 | Qreverse = intern ("reverse"); | 5362 | Qreverse = intern ("reverse"); |