X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/41ad069bdc70ca9afbdddc7076038f9d5566af97..3ea79df89070c16fc2968ff8705296d0b9499b91:/src/msdos.c diff --git a/src/msdos.c b/src/msdos.c index b1cbb6b558..f26ddd868a 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -61,6 +61,7 @@ Boston, MA 02111-1307, USA. */ #include "buffer.h" #include "commands.h" #include "blockinput.h" +#include "keyboard.h" #include #include #include @@ -124,6 +125,10 @@ event_timestamp () * Mouse buttons are numbered from left to right and also zero based. */ +/* This used to be in termhooks.h, but mainstream Emacs code no longer + uses it, and it was removed... */ +#define NUM_MOUSE_BUTTONS (5) + int have_mouse; /* 0: no, 1: enabled, -1: disabled */ static int mouse_visible; @@ -163,6 +168,38 @@ mouse_off () } } +static void +mouse_setup_buttons (int n_buttons) +{ + if (n_buttons == 3) + { + mouse_button_count = 3; + mouse_button_translate[0] = 0; /* Left */ + mouse_button_translate[1] = 2; /* Middle */ + mouse_button_translate[2] = 1; /* Right */ + } + else /* two, what else? */ + { + mouse_button_count = 2; + mouse_button_translate[0] = 0; + mouse_button_translate[1] = 1; + } +} + +DEFUN ("msdos-set-mouse-buttons", Fmsdos_set_mouse_buttons, Smsdos_set_mouse_buttons, + 1, 1, "NSet number of mouse buttons to: ", + "Set the number of mouse buttons to use by Emacs.\n\ +This is useful with mice that report the number of buttons inconsistently,\n\ +e.g., if the number of buttons is reported as 3, but Emacs only sees 2 of\n\ +them. This happens with wheeled mice on Windows 9X, for example.") + (nbuttons) + Lisp_Object nbuttons; +{ + CHECK_NUMBER (nbuttons, 0); + mouse_setup_buttons (XINT (nbuttons)); + return Qnil; +} + static void mouse_get_xy (int *x, int *y) { @@ -273,11 +310,26 @@ mouse_check_moved () mouse_last_y = y; } +/* Force the mouse driver to ``forget'' about any button clicks until + now. */ +static void +mouse_clear_clicks (void) +{ + int b; + + for (b = 0; b < mouse_button_count; b++) + { + int dummy_x, dummy_y; + + (void) mouse_pressed (b, &dummy_x, &dummy_y); + (void) mouse_released (b, &dummy_x, &dummy_y); + } +} + void mouse_init () { union REGS regs; - int b; if (termscript) fprintf (termscript, ""); @@ -289,13 +341,7 @@ mouse_init () doesn't do that automatically when function 21h is called, which causes Emacs to ``remember'' the click that switched focus to the window just before Emacs was started from that window. */ - for (b = 0; b < mouse_button_count; b++) - { - int dummy_x, dummy_y; - - (void) mouse_pressed (b, &dummy_x, &dummy_y); - (void) mouse_released (b, &dummy_x, &dummy_y); - } + mouse_clear_clicks (); regs.x.ax = 0x0007; regs.x.cx = 0; @@ -342,6 +388,8 @@ static clock_t startup_time; static int term_setup_done; +static unsigned short outside_cursor; + /* Similar to the_only_frame. */ struct x_output the_only_x_display; @@ -356,6 +404,8 @@ static unsigned short screen_virtual_offset = 0; /* A flag to control how to display unibyte 8-bit characters. */ extern int unibyte_display_via_language_environment; +Lisp_Object Qbar; + #if __DJGPP__ > 1 /* Update the screen from a part of relocated DOS/V screen buffer which begins at OFFSET and includes COUNT characters. */ @@ -364,7 +414,7 @@ dosv_refresh_virtual_screen (int offset, int count) { __dpmi_regs regs; - if (offset < 0 || count < 0) /* paranoia; illegal values crash DOS/V */ + if (offset < 0 || count < 0) /* paranoia; invalid values crash DOS/V */ return; regs.h.ah = 0xff; /* update relocated screen */ @@ -485,6 +535,19 @@ maybe_enable_blinking (void) } } +/* Return non-zero if the system has a VGA adapter. */ +static int +vga_installed (void) +{ + union REGS regs; + + regs.x.ax = 0x1a00; + int86 (0x10, ®s, ®s); + if (regs.h.al == 0x1a && regs.h.bl > 5 && regs.h.bl < 13) + return 1; + return 0; +} + /* Set the screen dimensions so that it can show no less than ROWS x COLS frame. */ @@ -502,13 +565,8 @@ dos_set_window_size (rows, cols) if (*rows == current_rows && *cols == current_cols) return; - /* Do we have a VGA? */ - regs.x.ax = 0x1a00; - int86 (0x10, ®s, ®s); - if (regs.h.al == 0x1a && regs.h.bl > 5 && regs.h.bl < 13) - have_vga = 1; - mouse_off (); + have_vga = vga_installed (); /* If the user specified a special video mode for these dimensions, use that mode. */ @@ -612,6 +670,11 @@ dos_set_window_size (rows, cols) *rows = ScreenRows (); *cols = ScreenCols (); + /* Update Emacs' notion of screen dimensions. */ + screen_size_X = *cols; + screen_size_Y = *rows; + screen_size = *cols * *rows; + #if __DJGPP__ > 1 /* If the dimensions changed, the mouse highlight info is invalid. */ if (current_rows != *rows || current_cols != *cols) @@ -656,6 +719,130 @@ mouse_off_maybe () mouse_off (); } +#define DEFAULT_CURSOR_START (-1) +#define DEFAULT_CURSOR_WIDTH (-1) +#define BOX_CURSOR_WIDTH (-32) + +/* Set cursor to begin at scan line START_LINE in the character cell + and extend for WIDTH scan lines. Scan lines are counted from top + of the character cell, starting from zero. */ +static void +msdos_set_cursor_shape (struct frame *f, int start_line, int width) +{ +#if __DJGPP__ > 1 + unsigned desired_cursor; + __dpmi_regs regs; + int max_line, top_line, bot_line; + + /* Avoid the costly BIOS call if F isn't the currently selected + frame. Allow for NULL as unconditionally meaning the selected + frame. */ + if (f && f != SELECTED_FRAME()) + return; + + /* The character cell size in scan lines is stored at 40:85 in the + BIOS data area. */ + max_line = _farpeekw (_dos_ds, 0x485) - 1; + switch (max_line) + { + default: /* this relies on CGA cursor emulation being ON! */ + case 7: + bot_line = 7; + break; + case 9: + bot_line = 9; + break; + case 13: + bot_line = 12; + break; + case 15: + bot_line = 14; + break; + } + + if (width < 0) + { + if (width == BOX_CURSOR_WIDTH) + { + top_line = 0; + bot_line = max_line; + } + else if (start_line != DEFAULT_CURSOR_START) + { + top_line = start_line; + bot_line = top_line - width - 1; + } + else if (width != DEFAULT_CURSOR_WIDTH) + { + top_line = 0; + bot_line = -1 - width; + } + else + top_line = bot_line + 1; + } + else if (width == 0) + { + /* [31, 0] seems to DTRT for all screen sizes. */ + top_line = 31; + bot_line = 0; + } + else /* WIDTH is positive */ + { + if (start_line != DEFAULT_CURSOR_START) + bot_line = start_line; + top_line = bot_line - (width - 1); + } + + /* If the current cursor shape is already what they want, we are + history here. */ + desired_cursor = ((top_line & 0x1f) << 8) | (bot_line & 0x1f); + if (desired_cursor == _farpeekw (_dos_ds, 0x460)) + return; + + regs.h.ah = 1; + regs.x.cx = desired_cursor; + __dpmi_int (0x10, ®s); +#endif /* __DJGPP__ > 1 */ +} + +static void +IT_set_cursor_type (struct frame *f, Lisp_Object cursor_type) +{ + if (EQ (cursor_type, Qbar)) + { + /* Just BAR means the normal EGA/VGA cursor. */ + msdos_set_cursor_shape (f, DEFAULT_CURSOR_START, DEFAULT_CURSOR_WIDTH); + } + else if (CONSP (cursor_type) && EQ (XCAR (cursor_type), Qbar)) + { + Lisp_Object bar_parms = XCDR (cursor_type); + int width; + + if (INTEGERP (bar_parms)) + { + /* Feature: negative WIDTH means cursor at the top + of the character cell, zero means invisible cursor. */ + width = XINT (bar_parms); + msdos_set_cursor_shape (f, width >= 0 ? DEFAULT_CURSOR_START : 0, + width); + } + else if (CONSP (bar_parms) + && INTEGERP (XCAR (bar_parms)) + && INTEGERP (XCDR (bar_parms))) + { + int start_line = XINT (XCDR (bar_parms)); + + width = XINT (XCAR (bar_parms)); + msdos_set_cursor_shape (f, start_line, width); + } + } + else + /* Treat anything unknown as "box cursor". This includes nil, so + that a frame which doesn't specify a cursor type gets a box, + which is the default in Emacs. */ + msdos_set_cursor_shape (f, 0, BOX_CURSOR_WIDTH); +} + static void IT_ring_bell (void) { @@ -682,12 +869,13 @@ static void IT_set_face (int face) { struct frame *sf = SELECTED_FRAME(); - struct face *fp = FACE_FROM_ID (sf, face); - unsigned long fg, bg; + struct face *fp = FACE_FROM_ID (sf, face); + struct face *dfp = FACE_FROM_ID (sf, DEFAULT_FACE_ID); + unsigned long fg, bg, dflt_fg, dflt_bg; if (!fp) { - fp = FACE_FROM_ID (sf, DEFAULT_FACE_ID); + fp = dfp; /* The default face for the frame should always be realized and cached. */ if (!fp) @@ -696,6 +884,8 @@ IT_set_face (int face) screen_face = face; fg = fp->foreground; bg = fp->background; + dflt_fg = dfp->foreground; + dflt_bg = dfp->background; /* Don't use invalid colors. In particular, FACE_TTY_DEFAULT_* colors mean use the colors of the default face, except that if @@ -714,8 +904,7 @@ IT_set_face (int face) /* Make sure highlighted lines really stand out, come what may. */ if ((highlight || fp->tty_reverse_p) - && (fg == FRAME_FOREGROUND_PIXEL (sf) - && bg == FRAME_BACKGROUND_PIXEL (sf))) + && (fg == dflt_fg && bg == dflt_bg)) { unsigned long tem = fg; @@ -750,9 +939,13 @@ IT_write_glyphs (struct glyph *str, int str_len) register int tlen = GLYPH_TABLE_LENGTH; register Lisp_Object *tbase = GLYPH_TABLE_BASE; - struct coding_system *coding = (CODING_REQUIRE_ENCODING (&terminal_coding) - ? &terminal_coding - : &safe_terminal_coding); + /* If terminal_coding does any conversion, use it, otherwise use + safe_terminal_coding. We can't use CODING_REQUIRE_ENCODING here + because it always returns 1 if terminal_coding.src_multibyte is 1. */ + struct coding_system *coding = + (terminal_coding.common_flags & CODING_REQUIRE_ENCODING_MASK + ? &terminal_coding + : &safe_terminal_coding); struct frame *sf; /* Do we need to consider conversion of unibyte characters to @@ -761,6 +954,9 @@ IT_write_glyphs (struct glyph *str, int str_len) = (NILP (current_buffer->enable_multibyte_characters) && unibyte_display_via_language_environment); + unsigned char conversion_buffer[256]; + int conversion_buffer_size = sizeof conversion_buffer; + if (str_len <= 0) return; screen_buf = screen_bp = alloca (str_len * 2); @@ -782,11 +978,6 @@ IT_write_glyphs (struct glyph *str, int str_len) int cf, chlen, enclen; unsigned char workbuf[MAX_MULTIBYTE_LENGTH], *buf; unsigned ch; - register GLYPH g = GLYPH_FROM_CHAR_GLYPH (*str); - - /* Find the actual glyph to display by traversing the entire - aliases chain for this glyph. */ - GLYPH_FOLLOW_ALIASES (tbase, tlen, g); /* Glyphs with GLYPH_MASK_PADDING bit set are actually there only for the redisplay code to know how many columns does @@ -798,19 +989,35 @@ IT_write_glyphs (struct glyph *str, int str_len) } else { + register GLYPH g = GLYPH_FROM_CHAR_GLYPH (*str); + int glyph_not_in_table = 0; + + if (g < 0 || g >= tlen) + { + /* This glyph doesn't have an entry in Vglyph_table. */ + ch = str->u.ch; + glyph_not_in_table = 1; + } + else + { + /* This glyph has an entry in Vglyph_table, so process + any aliases before testing for simpleness. */ + GLYPH_FOLLOW_ALIASES (tbase, tlen, g); + ch = FAST_GLYPH_CHAR (g); + } + /* Convert the character code to multibyte, if they - requested display via language environment. */ - ch = FAST_GLYPH_CHAR (g); - /* We only want to convert unibyte characters to multibyte - in unibyte buffers! Otherwise, the 8-bit code might come - from the display table set up to display foreign characters. */ + requested display via language environment. We only want + to convert unibyte characters to multibyte in unibyte + buffers! Otherwise, the 8-bit value in CH came from the + display table set up to display foreign characters. */ if (SINGLE_BYTE_CHAR_P (ch) && convert_unibyte_characters && (ch >= 0240 || (ch >= 0200 && !NILP (Vnonascii_translation_table)))) ch = unibyte_char_to_multibyte (ch); /* Invalid characters are displayed with a special glyph. */ - if (! GLYPH_CHAR_VALID_P (ch)) + if (! CHAR_VALID_P (ch, 0)) { g = !NILP (Vdos_unsupported_char_glyph) ? Vdos_unsupported_char_glyph @@ -824,7 +1031,7 @@ IT_write_glyphs (struct glyph *str, int str_len) if (cf != screen_face) IT_set_face (cf); /* handles invalid faces gracefully */ - if (GLYPH_SIMPLE_P (tbase, tlen, g)) + if (glyph_not_in_table || GLYPH_SIMPLE_P (tbase, tlen, g)) { /* We generate the multi-byte form of CH in WORKBUF. */ chlen = CHAR_STRING (ch, workbuf); @@ -846,6 +1053,7 @@ IT_write_glyphs (struct glyph *str, int str_len) } else { + coding->src_multibyte = 1; encode_coding (coding, buf, conversion_buffer, chlen, conversion_buffer_size); chlen -= coding->consumed; @@ -855,7 +1063,7 @@ IT_write_glyphs (struct glyph *str, int str_len) terminal_coding with Vdos_unsupported_char_glyph. */ if (*conversion_buffer == '?') { - char *cbp = conversion_buffer; + unsigned char *cbp = conversion_buffer; while (cbp < conversion_buffer + enclen && *cbp == '?') *cbp++ = unsupported_char; @@ -929,6 +1137,7 @@ IT_write_glyphs (struct glyph *str, int str_len) encode_coding (coding, "", conversion_buffer, 0, conversion_buffer_size); if (coding->produced > 0) { + screen_buf = alloca (coding->produced * 2); for (screen_bp = screen_buf, bp = conversion_buffer; coding->produced--; bp++) { @@ -955,11 +1164,18 @@ IT_write_glyphs (struct glyph *str, int str_len) /* This is used for debugging, to turn off note_mouse_highlight. */ int disable_mouse_highlight; -/* If a string, dos_rawgetc generates an event to display that string. - (The display is done in keyboard.c:read_char.) */ +/* If non-nil, dos_rawgetc generates an event to display that string. + (The display is done in keyboard.c:read_char, by calling + show_help_echo.) */ static Lisp_Object help_echo; static Lisp_Object previous_help_echo; /* a helper temporary variable */ +/* These record the window, the object and the position where the help + echo string was generated. */ +static Lisp_Object help_echo_window; +static Lisp_Object help_echo_object; +static int help_echo_pos; + static int mouse_preempted = 0; /* non-zero when XMenu gobbles mouse events */ /* Set the mouse pointer shape according to whether it is in the @@ -1029,6 +1245,9 @@ show_mouse_face (struct display_info *dpyinfo, int hl) if (end_hpos <= start_hpos) continue; + /* Record that some glyphs of this row are displayed in + mouse-face. */ + row->mouse_face_p = hl > 0; if (hl > 0) { int vpos = row->y + WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y (w); @@ -1218,8 +1437,13 @@ IT_note_mode_line_highlight (struct window *w, int x, int mode_line_p) setting the global variable help_echo to the help string. */ help = Fget_text_property (make_number (glyph->charpos), Qhelp_echo, glyph->object); - if (STRINGP (help)) - help_echo = help; + if (!NILP (help)) + { + help_echo = help; + XSETWINDOW (help_echo_window, w); + help_echo_object = glyph->object; + help_echo_pos = glyph->charpos; + } } } } @@ -1240,7 +1464,8 @@ IT_note_mouse_highlight (struct frame *f, int x, int y) if (mouse_preempted) return; - if (disable_mouse_highlight) + if (disable_mouse_highlight + || !f->glyphs_initialized_p) return; dpyinfo->mouse_face_mouse_x = x; @@ -1356,14 +1581,16 @@ IT_note_mouse_highlight (struct frame *f, int x, int y) enough space for all, and try again. */ len = 10; overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object)); - noverlays = overlays_at (pos, 0, &overlay_vec, &len, NULL, NULL); + noverlays = overlays_at (pos, 0, &overlay_vec, &len, NULL, NULL, 0); if (noverlays > len) { len = noverlays; overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object)); - noverlays = overlays_at (pos, 0, &overlay_vec, &len, NULL, NULL); + noverlays = overlays_at (pos, + 0, &overlay_vec, &len, NULL, NULL, 0); } + /* Sort overlays into increasing priority order. */ noverlays = sort_overlays (overlay_vec, noverlays, w); /* Check mouse-face highlighting. */ @@ -1381,7 +1608,7 @@ IT_note_mouse_highlight (struct frame *f, int x, int y) /* Find highest priority overlay that has a mouse-face prop. */ overlay = Qnil; - for (i = 0; i < noverlays; i++) + for (i = noverlays - 1; i >= 0; --i) { mouse_face = Foverlay_get (overlay_vec[i], Qmouse_face); if (!NILP (mouse_face)) @@ -1465,22 +1692,38 @@ IT_note_mouse_highlight (struct frame *f, int x, int y) /* Check overlays first. */ help = Qnil; - for (i = 0; i < noverlays && !STRINGP (help); ++i) - help = Foverlay_get (overlay_vec[i], Qhelp_echo); + for (i = noverlays - 1; i >= 0 && NILP (help); --i) + { + overlay = overlay_vec[i]; + help = Foverlay_get (overlay, Qhelp_echo); + } + if (!NILP (help)) + { + help_echo = help; + help_echo_window = window; + help_echo_object = overlay; + help_echo_pos = pos; + } /* Try text properties. */ - if (!STRINGP (help) - && ((STRINGP (glyph->object) - && glyph->charpos >= 0 - && glyph->charpos < XSTRING (glyph->object)->size) - || (BUFFERP (glyph->object) - && glyph->charpos >= BEGV - && glyph->charpos < ZV))) - help = Fget_text_property (make_number (glyph->charpos), - Qhelp_echo, glyph->object); - - if (STRINGP (help)) - help_echo = help; + else if (NILP (help) + && ((STRINGP (glyph->object) + && glyph->charpos >= 0 + && glyph->charpos < XSTRING (glyph->object)->size) + || (BUFFERP (glyph->object) + && glyph->charpos >= BEGV + && glyph->charpos < ZV))) + { + help = Fget_text_property (make_number (glyph->charpos), + Qhelp_echo, glyph->object); + if (!NILP (help)) + { + help_echo = help; + help_echo_window = window; + help_echo_object = glyph->object; + help_echo_pos = glyph->charpos; + } + } } BEGV = obegv; @@ -1502,9 +1745,9 @@ IT_clear_end_of_line (int first_unused) return; IT_set_face (0); - if (termscript) - fprintf (termscript, ""); i = (j = first_unused - new_pos_X) * 2; + if (termscript) + fprintf (termscript, "", new_pos_X, first_unused); spaces = sp = alloca (i); while (--j >= 0) @@ -1544,7 +1787,7 @@ IT_clear_to_end (void) while (new_pos_Y < screen_size_Y) { new_pos_X = 0; - IT_clear_end_of_line (0); + IT_clear_end_of_line (screen_size_X); new_pos_Y++; } } @@ -1680,12 +1923,13 @@ static void IT_update_begin (struct frame *f) { struct display_info *display_info = FRAME_X_DISPLAY_INFO (f); + struct frame *mouse_face_frame = display_info->mouse_face_mouse_frame; highlight = 0; BLOCK_INPUT; - if (f == display_info->mouse_face_mouse_frame) + if (f && f == mouse_face_frame) { /* Don't do highlighting for mouse motion during the update. */ display_info->mouse_face_defer = 1; @@ -1697,23 +1941,32 @@ IT_update_begin (struct frame *f) /* Can we tell that this update does not affect the window where the mouse highlight is? If so, no need to turn off. - Likewise, don't do anything if the frame is garbaged; - in that case, the frame's current matrix that we would use - is all wrong, and we will redisplay that line anyway. */ - if (!NILP (display_info->mouse_face_window)) + Likewise, don't do anything if none of the enabled rows + contains glyphs highlighted in mouse face. */ + if (!NILP (display_info->mouse_face_window) + && WINDOWP (display_info->mouse_face_window)) { struct window *w = XWINDOW (display_info->mouse_face_window); int i; - for (i = 0; i < w->desired_matrix->nrows; ++i) - if (MATRIX_ROW_ENABLED_P (w->desired_matrix, i)) - break; + /* If the mouse highlight is in the window that was deleted + (e.g., if it was popped by completion), clear highlight + unconditionally. */ + if (NILP (w->buffer)) + display_info->mouse_face_window = Qnil; + else + { + for (i = 0; i < w->desired_matrix->nrows; ++i) + if (MATRIX_ROW_ENABLED_P (w->desired_matrix, i) + && MATRIX_ROW (w->current_matrix, i)->mouse_face_p) + break; + } - if (i < w->desired_matrix->nrows) + if (NILP (w->buffer) || i < w->desired_matrix->nrows) clear_mouse_face (display_info); } } - else if (!FRAME_LIVE_P (display_info->mouse_face_mouse_frame)) + else if (mouse_face_frame && !FRAME_LIVE_P (mouse_face_frame)) { /* If the frame with mouse highlight was deleted, invalidate the highlight info. */ @@ -1734,13 +1987,17 @@ IT_update_end (struct frame *f) FRAME_X_DISPLAY_INFO (f)->mouse_face_defer = 0; } +Lisp_Object Qcursor_type; + static void IT_frame_up_to_date (struct frame *f) { struct display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); + Lisp_Object new_cursor, frame_desired_cursor; + struct window *sw; if (dpyinfo->mouse_face_deferred_gc - || f == dpyinfo->mouse_face_mouse_frame) + || (f && f == dpyinfo->mouse_face_mouse_frame)) { BLOCK_INPUT; if (dpyinfo->mouse_face_mouse_frame) @@ -1751,6 +2008,33 @@ IT_frame_up_to_date (struct frame *f) UNBLOCK_INPUT; } + /* Set the cursor type to whatever they wanted. In a minibuffer + window, we want the cursor to appear only if we are reading input + from this window, and we want the cursor to be taken from the + frame parameters. For the selected window, we use either its + buffer-local value or the value from the frame parameters if the + buffer doesn't define its local value for the cursor type. */ + sw = XWINDOW (f->selected_window); + frame_desired_cursor = Fcdr (Fassq (Qcursor_type, f->param_alist)); + if (cursor_in_echo_area + && FRAME_HAS_MINIBUF_P (f) + && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window) + && sw == XWINDOW (echo_area_window)) + new_cursor = frame_desired_cursor; + else + { + struct buffer *b = XBUFFER (sw->buffer); + + if (EQ (b->cursor_type, Qt)) + new_cursor = frame_desired_cursor; + else if (NILP (b->cursor_type)) /* nil means no cursor */ + new_cursor = Fcons (Qbar, make_number (0)); + else + new_cursor = b->cursor_type; + } + + IT_set_cursor_type (f, new_cursor); + IT_cmgoto (f); /* position cursor when update is done */ } @@ -1821,10 +2105,11 @@ x_set_menu_bar_lines (f, value, oldval) set_menu_bar_lines (f, value, oldval); } -/* This was copied from xfns.c */ +/* This was copied from xfaces.c */ -Lisp_Object Qbackground_color; -Lisp_Object Qforeground_color; +extern Lisp_Object Qbackground_color; +extern Lisp_Object Qforeground_color; +Lisp_Object Qreverse; extern Lisp_Object Qtitle; /* IT_set_terminal_modes is called when emacs is started, @@ -1993,17 +2278,13 @@ DEFUN ("msdos-remember-default-colors", Fmsdos_remember_default_colors, (frame) Lisp_Object frame; { - int reverse; struct frame *f; CHECK_FRAME (frame, 0); f= XFRAME (frame); - reverse = EQ (Fcdr (Fassq (intern ("reverse"), f->param_alist)), Qt); - initial_screen_colors[0] - = reverse ? FRAME_BACKGROUND_PIXEL (f) : FRAME_FOREGROUND_PIXEL (f); - initial_screen_colors[1] - = reverse ? FRAME_FOREGROUND_PIXEL (f) : FRAME_BACKGROUND_PIXEL (f); + initial_screen_colors[0] = FRAME_FOREGROUND_PIXEL (f); + initial_screen_colors[1] = FRAME_BACKGROUND_PIXEL (f); } void @@ -2018,13 +2299,15 @@ IT_set_frame_parameters (f, alist) = (Lisp_Object *) alloca (length * sizeof (Lisp_Object)); Lisp_Object *values = (Lisp_Object *) alloca (length * sizeof (Lisp_Object)); - Lisp_Object qreverse = intern ("reverse"); /* Do we have to reverse the foreground and background colors? */ - int reverse = EQ (Fcdr (Fassq (qreverse, f->param_alist)), Qt); + int reverse = EQ (Fcdr (Fassq (Qreverse, f->param_alist)), Qt); int was_reverse = reverse; int redraw = 0, fg_set = 0, bg_set = 0; + int need_to_reverse; unsigned long orig_fg; unsigned long orig_bg; + Lisp_Object frame_bg, frame_fg; + extern Lisp_Object Qdefault, QCforeground, QCbackground; /* If we are creating a new frame, begin with the original screen colors used for the initial frame. */ @@ -2036,6 +2319,15 @@ IT_set_frame_parameters (f, alist) } orig_fg = FRAME_FOREGROUND_PIXEL (f); orig_bg = FRAME_BACKGROUND_PIXEL (f); + frame_fg = Fcdr (Fassq (Qforeground_color, f->param_alist)); + frame_bg = Fcdr (Fassq (Qbackground_color, f->param_alist)); + /* frame_fg and frame_bg could be nil if, for example, + f->param_alist is nil, e.g. if we are called from + Fmake_terminal_frame. */ + if (NILP (frame_fg)) + frame_fg = build_string (unspecified_fg); + if (NILP (frame_bg)) + frame_bg = build_string (unspecified_bg); /* Extract parm names and values into those vectors. */ i = 0; @@ -2054,37 +2346,52 @@ IT_set_frame_parameters (f, alist) for (i = 0; i < j; i++) { - Lisp_Object prop = parms[i]; - Lisp_Object val = values[i]; + Lisp_Object prop, val; - if (EQ (prop, qreverse)) + prop = parms[i]; + val = values[i]; + + if (EQ (prop, Qreverse)) reverse = EQ (val, Qt); } - - if (termscript && reverse && !was_reverse) + + need_to_reverse = reverse && !was_reverse; + if (termscript && need_to_reverse) fprintf (termscript, "\n"); /* Now process the alist elements in reverse of specified order. */ for (i--; i >= 0; i--) { - Lisp_Object prop = parms[i]; - Lisp_Object val = values[i]; + Lisp_Object prop, val; + Lisp_Object frame; + + prop = parms[i]; + val = values[i]; if (EQ (prop, Qforeground_color)) { - unsigned long new_color = load_color (f, NULL, val, reverse + unsigned long new_color = load_color (f, NULL, val, need_to_reverse ? LFACE_BACKGROUND_INDEX : LFACE_FOREGROUND_INDEX); if (new_color != FACE_TTY_DEFAULT_COLOR && new_color != FACE_TTY_DEFAULT_FG_COLOR && new_color != FACE_TTY_DEFAULT_BG_COLOR) { - if (reverse) - /* FIXME: should the fore-/background of the default - face change here as well? */ - FRAME_BACKGROUND_PIXEL (f) = new_color; + FRAME_FOREGROUND_PIXEL (f) = new_color; + /* Make sure the foreground of the default face for this + frame is changed as well. */ + XSETFRAME (frame, f); + if (need_to_reverse) + { + Finternal_set_lisp_face_attribute (Qdefault, QCbackground, + val, frame); + prop = Qbackground_color; + } else - FRAME_FOREGROUND_PIXEL (f) = new_color; + { + Finternal_set_lisp_face_attribute (Qdefault, QCforeground, + val, frame); + } redraw = 1; fg_set = 1; if (termscript) @@ -2093,17 +2400,28 @@ IT_set_frame_parameters (f, alist) } else if (EQ (prop, Qbackground_color)) { - unsigned long new_color = load_color (f, NULL, val, reverse + unsigned long new_color = load_color (f, NULL, val, need_to_reverse ? LFACE_FOREGROUND_INDEX : LFACE_BACKGROUND_INDEX); if (new_color != FACE_TTY_DEFAULT_COLOR && new_color != FACE_TTY_DEFAULT_FG_COLOR && new_color != FACE_TTY_DEFAULT_BG_COLOR) { - if (reverse) - FRAME_FOREGROUND_PIXEL (f) = new_color; + FRAME_BACKGROUND_PIXEL (f) = new_color; + /* Make sure the background of the default face for this + frame is changed as well. */ + XSETFRAME (frame, f); + if (need_to_reverse) + { + Finternal_set_lisp_face_attribute (Qdefault, QCforeground, + val, frame); + prop = Qforeground_color; + } else - FRAME_BACKGROUND_PIXEL (f) = new_color; + { + Finternal_set_lisp_face_attribute (Qdefault, QCbackground, + val, frame); + } redraw = 1; bg_set = 1; if (termscript) @@ -2116,21 +2434,39 @@ IT_set_frame_parameters (f, alist) if (termscript) fprintf (termscript, "\n", XSTRING (val)->data); } + else if (EQ (prop, Qcursor_type)) + { + IT_set_cursor_type (f, val); + if (termscript) + fprintf (termscript, "\n", + EQ (val, Qbar) || CONSP (val) && EQ (XCAR (val), Qbar) + ? "bar" : "box"); + } store_frame_param (f, prop, val); } /* If they specified "reverse", but not the colors, we need to swap the current frame colors. */ - if (reverse && !was_reverse) + if (need_to_reverse) { + Lisp_Object frame; + if (!fg_set) { - FRAME_BACKGROUND_PIXEL (f) = orig_fg; + XSETFRAME (frame, f); + Finternal_set_lisp_face_attribute (Qdefault, QCbackground, + tty_color_name (f, orig_fg), + frame); + store_frame_param (f, Qbackground_color, frame_fg); redraw = 1; } if (!bg_set) { - FRAME_FOREGROUND_PIXEL (f) = orig_bg; + XSETFRAME (frame, f); + Finternal_set_lisp_face_attribute (Qdefault, QCforeground, + tty_color_name (f, orig_bg), + frame); + store_frame_param (f, Qforeground_color, frame_bg); redraw = 1; } } @@ -2786,9 +3122,6 @@ and then the scan code.") } /* Get a char from keyboard. Function keys are put into the event queue. */ - -extern void kbd_buffer_store_event (struct input_event *); - static int dos_rawgetc () { @@ -3011,6 +3344,7 @@ dos_rawgetc () event.code = code; event.modifiers = modifiers; event.frame_or_window = selected_frame; + event.arg = Qnil; event.timestamp = event_timestamp (); kbd_buffer_store_event (&event); } @@ -3028,16 +3362,26 @@ dos_rawgetc () if (mouse_last_x != mouse_prev_x || mouse_last_y != mouse_prev_y) { previous_help_echo = help_echo; - help_echo = Qnil; + help_echo = help_echo_object = help_echo_window = Qnil; + help_echo_pos = -1; IT_note_mouse_highlight (SELECTED_FRAME(), mouse_last_x, mouse_last_y); /* If the contents of the global variable help_echo has changed, generate a HELP_EVENT. */ - if (STRINGP (help_echo) || STRINGP (previous_help_echo)) + if (!NILP (help_echo) || !NILP (previous_help_echo)) { + /* HELP_EVENT takes 2 events in the event loop. */ event.kind = HELP_EVENT; - event.frame_or_window = Fcons (selected_frame, help_echo); + event.frame_or_window = selected_frame; + event.arg = help_echo_object; + event.x = make_number (help_echo_pos); event.timestamp = event_timestamp (); + event.code = 0; + kbd_buffer_store_event (&event); + if (WINDOWP (help_echo_window)) + event.frame_or_window = help_echo_window; + event.arg = help_echo; + event.code = 1; kbd_buffer_store_event (&event); } } @@ -3081,6 +3425,7 @@ dos_rawgetc () event.x = x; event.y = y; event.frame_or_window = selected_frame; + event.arg = Qnil; event.timestamp = event_timestamp (); kbd_buffer_store_event (&event); } @@ -3152,6 +3497,12 @@ glyph_to_pixel_coords (f, x, y, pix_x, pix_y) grab the nearest Xlib manual (down the hall, second-to-last door on the left), but I don't think it's worth the effort. */ +/* These hold text of the current and the previous menu help messages. */ +static char *menu_help_message, *prev_menu_help_message; +/* Pane number and item number of the menu item which generated the + last menu help message. */ +static int menu_help_paneno, menu_help_itemno; + static XMenu * IT_menu_create () { @@ -3174,6 +3525,7 @@ IT_menu_make_room (XMenu *menu) menu->text = (char **) xmalloc (count * sizeof (char *)); menu->submenu = (XMenu **) xmalloc (count * sizeof (XMenu *)); menu->panenumber = (int *) xmalloc (count * sizeof (int)); + menu->help_text = (char **) xmalloc (count * sizeof (char *)); } else if (menu->allocated == menu->count) { @@ -3184,6 +3536,8 @@ IT_menu_make_room (XMenu *menu) = (XMenu **) xrealloc (menu->submenu, count * sizeof (XMenu *)); menu->panenumber = (int *) xrealloc (menu->panenumber, count * sizeof (int)); + menu->help_text + = (char **) xrealloc (menu->help_text, count * sizeof (char *)); } } @@ -3231,7 +3585,7 @@ IT_menu_calc_size (XMenu *menu, int *width, int *height) /* Display MENU at (X,Y) using FACES. */ static void -IT_menu_display (XMenu *menu, int y, int x, int *faces) +IT_menu_display (XMenu *menu, int y, int x, int pn, int *faces, int disp_help) { int i, j, face, width; struct glyph *text, *p; @@ -3241,6 +3595,8 @@ IT_menu_display (XMenu *menu, int y, int x, int *faces) int row, col; struct frame *sf = SELECTED_FRAME(); + menu_help_message = NULL; + width = menu->width; text = (struct glyph *) xmalloc ((width + 2) * sizeof (struct glyph)); ScreenGetCursor (&row, &col); @@ -3248,11 +3604,21 @@ IT_menu_display (XMenu *menu, int y, int x, int *faces) IT_update_begin (sf); for (i = 0; i < menu->count; i++) { + int max_width = width + 2; + IT_cursor_to (y + i, x); enabled = (!menu->submenu[i] && menu->panenumber[i]) || (menu->submenu[i]); mousehere = (y + i == my && x <= mx && mx < x + width + 2); face = faces[enabled + mousehere * 2]; + /* The following if clause means that we display the menu help + strings even if the menu item is currently disabled. */ + if (disp_help && enabled + mousehere * 2 >= 2) + { + menu_help_message = menu->help_text[i]; + menu_help_paneno = pn - 1; + menu_help_itemno = i; + } p = text; SET_CHAR_GLYPH (*p, ' ', face, 0); p++; @@ -3272,13 +3638,18 @@ IT_menu_display (XMenu *menu, int y, int x, int *faces) p++; } } - - for (; j < width; j++, p++) + /* Don't let the menu text overflow into the next screen row. */ + if (x + max_width > screen_size_X) + { + max_width = screen_size_X - x; + text[max_width - 1].u.ch = '$'; /* indicate it's truncated */ + } + for (; j < max_width - 2; j++, p++) SET_CHAR_GLYPH (*p, ' ', face, 0); SET_CHAR_GLYPH (*p, menu->submenu[i] ? 16 : ' ', face, 0); p++; - IT_write_glyphs (text, width + 2); + IT_write_glyphs (text, max_width); } IT_update_end (sf); IT_cursor_to (row, col); @@ -3320,6 +3691,7 @@ XMenuAddPane (Display *foo, XMenu *menu, char *txt, int enable) menu->submenu[menu->count] = IT_menu_create (); menu->text[menu->count] = txt; menu->panenumber[menu->count] = ++menu->panecount; + menu->help_text[menu->count] = NULL; menu->count++; /* Adjust length for possible control characters (which will @@ -3338,7 +3710,7 @@ XMenuAddPane (Display *foo, XMenu *menu, char *txt, int enable) int XMenuAddSelection (Display *bar, XMenu *menu, int pane, - int foo, char *txt, int enable) + int foo, char *txt, int enable, char *help_text) { int len; char *p; @@ -3350,6 +3722,7 @@ XMenuAddSelection (Display *bar, XMenu *menu, int pane, menu->submenu[menu->count] = (XMenu *) 0; menu->text[menu->count] = txt; menu->panenumber[menu->count] = enable; + menu->help_text[menu->count] = help_text; menu->count++; /* Adjust length for possible control characters (which will @@ -3389,7 +3762,8 @@ struct IT_menu_state int XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, - int x0, int y0, unsigned ButtonMask, char **txt) + int x0, int y0, unsigned ButtonMask, char **txt, + void (*help_callback)(char *, int, int)) { struct IT_menu_state *state; int statecount; @@ -3401,6 +3775,7 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, int title_faces[4]; /* face to display the menu title */ int buffers_num_deleted = 0; struct frame *sf = SELECTED_FRAME(); + Lisp_Object saved_echo_area_message; /* Just in case we got here without a mouse present... */ if (have_mouse <= 0) @@ -3413,22 +3788,22 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, y0 = 1; /* We will process all the mouse events directly, so we had - better prevented dos_rawgetc from stealing them from us. */ + better prevent dos_rawgetc from stealing them from us. */ mouse_preempted++; state = alloca (menu->panecount * sizeof (struct IT_menu_state)); screensize = screen_size * 2; faces[0] = lookup_derived_face (sf, intern ("msdos-menu-passive-face"), - CHARSET_ASCII, DEFAULT_FACE_ID); + 0, DEFAULT_FACE_ID); faces[1] = lookup_derived_face (sf, intern ("msdos-menu-active-face"), - CHARSET_ASCII, DEFAULT_FACE_ID); + 0, DEFAULT_FACE_ID); selectface = intern ("msdos-menu-select-face"); faces[2] = lookup_derived_face (sf, selectface, - CHARSET_ASCII, faces[0]); + 0, faces[0]); faces[3] = lookup_derived_face (sf, selectface, - CHARSET_ASCII, faces[1]); + 0, faces[1]); /* Make sure the menu title is always displayed with `msdos-menu-active-face', no matter where the mouse pointer is. */ @@ -3448,6 +3823,11 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, menu->text[0][7] = '\0'; buffers_num_deleted = 1; } + + /* We need to save the current echo area message, so that we could + restore it below, before we exit. See the commentary below, + before the call to message_with_string. */ + saved_echo_area_message = Fcurrent_message (); state[0].menu = menu; mouse_off (); ScreenRetrieve (state[0].screen_behind = xmalloc (screensize)); @@ -3456,7 +3836,8 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, panes, which is ugly. */ IT_display_cursor (0); - IT_menu_display (menu, y0 - 1, x0 - 1, title_faces); /* display menu title */ + /* Display the menu title. */ + IT_menu_display (menu, y0 - 1, x0 - 1, 1, title_faces, 0); if (buffers_num_deleted) menu->text[0][7] = ' '; if ((onepane = menu->count == 1 && menu->submenu[0])) @@ -3515,7 +3896,8 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, IT_menu_display (state[i].menu, state[i].y, state[i].x, - faces); + state[i].pane, + faces, 1); state[statecount].menu = state[i].menu->submenu[dy]; state[statecount].pane = state[i].menu->panenumber[dy]; mouse_off (); @@ -3531,12 +3913,23 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, IT_menu_display (state[statecount - 1].menu, state[statecount - 1].y, state[statecount - 1].x, - faces); + state[statecount - 1].pane, + faces, 1); } else - /* We are busy-waiting for the mouse to move, so let's be nice - to other Windows applications by releasing our time slice. */ - __dpmi_yield (); + { + if ((menu_help_message || prev_menu_help_message) + && menu_help_message != prev_menu_help_message) + { + help_callback (menu_help_message, + menu_help_paneno, menu_help_itemno); + IT_display_cursor (0); + prev_menu_help_message = menu_help_message; + } + /* We are busy-waiting for the mouse to move, so let's be nice + to other Windows applications by releasing our time slice. */ + __dpmi_yield (); + } for (b = 0; b < mouse_button_count && !leave; b++) { /* Only leave if user both pressed and released the mouse, and in @@ -3556,6 +3949,27 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, ScreenUpdate (state[0].screen_behind); if (screen_virtual_segment) dosv_refresh_virtual_screen (0, screen_size); + + /* We have a situation here. ScreenUpdate has just restored the + screen contents as it was before we started drawing this menu. + That includes any echo area message that could have been + displayed back then. (In reality, that echo area message will + almost always be the ``keystroke echo'' that echoes the sequence + of menu items chosen by the user.) However, if the menu had some + help messages, then displaying those messages caused Emacs to + forget about the original echo area message. So when + ScreenUpdate restored it, it created a discrepancy between the + actual screen contents and what Emacs internal data structures + know about it. + + To avoid this conflict, we force Emacs to restore the original + echo area message as we found it when we entered this function. + The irony of this is that we then erase the restored message + right away, so the only purpose of restoring it is so that + erasing it works correctly... */ + if (! NILP (saved_echo_area_message)) + message_with_string ("%s", saved_echo_area_message, 0); + message (0); while (statecount--) xfree (state[statecount].screen_behind); IT_display_cursor (1); /* turn cursor back on */ @@ -3565,6 +3979,9 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, (which invoked the menu) too quickly. If we don't remove these events, Emacs will process them after we return and surprise the user. */ discard_mouse_events (); + mouse_clear_clicks (); + if (!kbd_buffer_events_waiting (1)) + clear_input_pending (); /* Allow mouse events generation by dos_rawgetc. */ mouse_preempted--; return result; @@ -3584,8 +4001,10 @@ XMenuDestroy (Display *foo, XMenu *menu) xfree (menu->text); xfree (menu->submenu); xfree (menu->panenumber); + xfree (menu->help_text); } xfree (menu); + menu_help_message = prev_menu_help_message = NULL; } int @@ -4196,23 +4615,17 @@ dos_ttraw () { have_mouse = 1; /* enable mouse */ mouse_visible = 0; - - if (outregs.x.bx == 3) - { - mouse_button_count = 3; - mouse_button_translate[0] = 0; /* Left */ - mouse_button_translate[1] = 2; /* Middle */ - mouse_button_translate[2] = 1; /* Right */ - } - else - { - mouse_button_count = 2; - mouse_button_translate[0] = 0; - mouse_button_translate[1] = 1; - } + mouse_setup_buttons (outregs.x.bx); mouse_position_hook = &mouse_get_pos; mouse_init (); } + +#ifndef HAVE_X_WINDOWS +#if __DJGPP__ >= 2 + /* Save the cursor shape used outside Emacs. */ + outside_cursor = _farpeekw (_dos_ds, 0x460); +#endif +#endif } first_time = 0; @@ -4258,6 +4671,16 @@ dos_ttcooked () #if __DJGPP__ >= 2 +#ifndef HAVE_X_WINDOWS + /* Restore the cursor shape we found on startup. */ + if (outside_cursor) + { + inregs.h.ah = 1; + inregs.x.cx = outside_cursor; + int86 (0x10, &inregs, &outregs); + } +#endif + return (setmode (fileno (stdin), stdin_stat) != -1); #else /* not __DJGPP__ >= 2 */ @@ -4313,18 +4736,23 @@ run_msdos_command (argv, working_dir, tempin, tempout, temperr, envv) saveargv1 = argv[1]; saveargv2 = argv[2]; argv[1] = "/c"; - if (argv[2]) + /* We only need to mirror slashes if a DOS shell will be invoked + not via `system' (which does the mirroring itself). Yes, that + means DJGPP v1.x will lose here. */ + if (argv[2] && argv[3]) { char *p = alloca (strlen (argv[2]) + 1); strcpy (argv[2] = p, saveargv2); while (*p && isspace (*p)) p++; - while (*p && !isspace (*p)) - if (*p == '/') - *p++ = '\\'; - else - p++; + while (*p) + { + if (*p == '/') + *p++ = '\\'; + else + p++; + } } } @@ -4365,6 +4793,7 @@ run_msdos_command (argv, working_dir, tempin, tempout, temperr, envv) if (*cmnd) { extern char **environ; + char **save_env = environ; int save_system_flags = __system_flags; /* Request the most powerful version of `system'. We need @@ -4379,6 +4808,7 @@ run_msdos_command (argv, working_dir, tempin, tempout, temperr, envv) environ = envv; result = system (cmnd); __system_flags = save_system_flags; + environ = save_env; } else result = 0; /* emulate Unixy shell behavior with empty cmd line */ @@ -4830,10 +5260,15 @@ syms_of_msdos () recent_doskeys = Fmake_vector (make_number (NUM_RECENT_DOSKEYS), Qnil); staticpro (&recent_doskeys); #ifndef HAVE_X_WINDOWS - staticpro (&help_echo); help_echo = Qnil; - staticpro (&previous_help_echo); + staticpro (&help_echo); + help_echo_object = Qnil; + staticpro (&help_echo_object); + help_echo_window = Qnil; + staticpro (&help_echo_window); previous_help_echo = Qnil; + staticpro (&previous_help_echo); + help_echo_pos = -1; DEFVAR_LISP ("x-bitmap-file-path", &Vx_bitmap_file_path, "List of directories to search for bitmap files for X."); @@ -4845,11 +5280,13 @@ For example, if a block cursor is over a tab, it will be drawn as\n\ wide as that tab on the display. (No effect on MS-DOS.)"); x_stretch_cursor_p = 0; - /* The following three are from xfns.c: */ - Qbackground_color = intern ("background-color"); - staticpro (&Qbackground_color); - Qforeground_color = intern ("foreground-color"); - staticpro (&Qforeground_color); + /* The following two are from xfns.c: */ + Qbar = intern ("bar"); + staticpro (&Qbar); + Qcursor_type = intern ("cursor-type"); + staticpro (&Qcursor_type); + Qreverse = intern ("reverse"); + staticpro (&Qreverse); DEFVAR_LISP ("dos-unsupported-char-glyph", &Vdos_unsupported_char_glyph, "*Glyph to display instead of chars not supported by current codepage.\n\ @@ -4868,6 +5305,7 @@ nil means don't delete them until `list-processes' is run."); defsubr (&Smsdos_long_file_names); defsubr (&Smsdos_downcase_filename); defsubr (&Smsdos_remember_default_colors); + defsubr (&Smsdos_set_mouse_buttons); } #endif /* MSDOS */