X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/984f5aaa6199142c112ce6c0fcafea8ddf42bfb9..c9029fe54be0f7b0a6ecfee0528b171d7392b5fe:/src/msdos.c diff --git a/src/msdos.c b/src/msdos.c index 9939cc5fe7..6b56cf72de 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1,5 +1,6 @@ /* MS-DOS specific C utilities. -*- coding: raw-text -*- - Copyright (C) 1993, 94, 95, 96, 97, 1999 Free Software Foundation, Inc. + Copyright (C) 1993, 94, 95, 96, 97, 1999, 2000, 2001 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -37,6 +38,7 @@ Boston, MA 02111-1307, USA. */ #include /* for bzero and string functions */ #include /* for _fixpath */ #include /* for chdir, dup, dup2, etc. */ +#include /* for getdisk */ #if __DJGPP__ >= 2 #include #include /* for setmode */ @@ -107,14 +109,14 @@ event_timestamp () { struct time t; unsigned long s; - + gettime (&t); s = t.ti_min; s *= 60; s += t.ti_sec; s *= 1000; s += t.ti_hund * 10; - + return s; } @@ -188,15 +190,22 @@ mouse_setup_buttons (int n_buttons) 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) + doc: /* Set the number of mouse buttons to use by Emacs. +This is useful with mice that report the number of buttons inconsistently, +e.g., if the number of buttons is reported as 3, but Emacs only sees 2 of +them. This happens with wheeled mice on Windows 9X, for example. */) + (nbuttons) Lisp_Object nbuttons; { - CHECK_NUMBER (nbuttons, 0); - mouse_setup_buttons (XINT (nbuttons)); + int n; + + CHECK_NUMBER (nbuttons); + n = XINT (nbuttons); + if (n < 2 || n > 3) + Fsignal (Qargs_out_of_range, + Fcons (build_string ("only 2 or 3 mouse buttons are supported"), + Fcons (nbuttons, Qnil))); + mouse_setup_buttons (n); return Qnil; } @@ -366,7 +375,6 @@ static int internal_terminal = 0; #ifndef HAVE_X_WINDOWS extern unsigned char ScreenAttrib; static int screen_face; -static int highlight; static int screen_size_X; static int screen_size_Y; @@ -404,7 +412,11 @@ 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; +Lisp_Object Qbar, Qhbar; + +/* The screen colors of the current frame, which serve as the default + colors for newly-created frames. */ +static int initial_screen_colors[2]; #if __DJGPP__ > 1 /* Update the screen from a part of relocated DOS/V screen buffer which @@ -427,8 +439,7 @@ dosv_refresh_virtual_screen (int offset, int count) static void dos_direct_output (y, x, buf, len) - int y; - int x; + int x, y; char *buf; int len; { @@ -460,29 +471,29 @@ do_visible_bell (xorattr) unsigned char xorattr; { asm volatile - (" movb $1,%%dl -visible_bell_0: - movl _ScreenPrimary,%%eax - call dosmemsetup - movl %%eax,%%ebx - movl %1,%%ecx - movb %0,%%al - incl %%ebx -visible_bell_1: - xorb %%al,%%gs:(%%ebx) - addl $2,%%ebx - decl %%ecx - jne visible_bell_1 - decb %%dl - jne visible_bell_3 -visible_bell_2: - movzwl %%ax,%%eax - movzwl %%ax,%%eax - movzwl %%ax,%%eax - movzwl %%ax,%%eax - decw %%cx - jne visible_bell_2 - jmp visible_bell_0 + (" movb $1,%%dl \n\ +visible_bell_0: \n\ + movl _ScreenPrimary,%%eax \n\ + call dosmemsetup \n\ + movl %%eax,%%ebx \n\ + movl %1,%%ecx \n\ + movb %0,%%al \n\ + incl %%ebx \n\ +visible_bell_1: \n\ + xorb %%al,%%gs:(%%ebx) \n\ + addl $2,%%ebx \n\ + decl %%ecx \n\ + jne visible_bell_1 \n\ + decb %%dl \n\ + jne visible_bell_3 \n\ +visible_bell_2: \n\ + movzwl %%ax,%%eax \n\ + movzwl %%ax,%%eax \n\ + movzwl %%ax,%%eax \n\ + movzwl %%ax,%%eax \n\ + decw %%cx \n\ + jne visible_bell_2 \n\ + jmp visible_bell_0 \n\ visible_bell_3:" : /* no output */ : "m" (xorattr), "g" (screen_size) @@ -556,10 +567,9 @@ dos_set_window_size (rows, cols) int *rows, *cols; { char video_name[30]; - Lisp_Object video_mode; - int video_mode_value; - int have_vga = 0; union REGS regs; + Lisp_Object video_mode; + int video_mode_value, have_vga = 0; int current_rows = ScreenRows (), current_cols = ScreenCols (); if (*rows == current_rows && *cols == current_cols) @@ -598,8 +608,7 @@ dos_set_window_size (rows, cols) else { static struct { - int rows; - int need_vga; + int rows, need_vga; } std_dimension[] = { {25, 0}, {28, 1}, @@ -670,6 +679,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) @@ -703,14 +717,14 @@ static void mouse_off_maybe () { int x, y; - + if (!mouse_visible) return; - + mouse_get_xy (&x, &y); if (y != new_pos_Y || x < new_pos_X) return; - + mouse_off (); } @@ -803,12 +817,14 @@ msdos_set_cursor_shape (struct frame *f, int start_line, int width) static void IT_set_cursor_type (struct frame *f, Lisp_Object cursor_type) { - if (EQ (cursor_type, Qbar)) + if (EQ (cursor_type, Qbar) || EQ (cursor_type, Qhbar)) { /* 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)) + else if (CONSP (cursor_type) + && (EQ (XCAR (cursor_type), Qbar) + || EQ (XCAR (cursor_type), Qhbar))) { Lisp_Object bar_parms = XCDR (cursor_type); int width; @@ -864,12 +880,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) @@ -878,13 +895,13 @@ 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 - highlight is on, invert the foreground and the background. Note - that we assume all 16 colors to be available for the background, - since Emacs switches on this mode (and loses the blinking - attribute) at startup. */ + /* Don't use invalid colors. In particular, FACE_TTY_DEFAULT_* colors + mean use the colors of the default face. Note that we assume all + 16 colors to be available for the background, since Emacs switches + on this mode (and loses the blinking attribute) at startup. */ if (fg == FACE_TTY_DEFAULT_COLOR || fg == FACE_TTY_DEFAULT_FG_COLOR) fg = FRAME_FOREGROUND_PIXEL (sf); else if (fg == FACE_TTY_DEFAULT_BG_COLOR) @@ -895,18 +912,24 @@ IT_set_face (int face) bg = FRAME_FOREGROUND_PIXEL (sf); /* 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))) + if (fp->tty_reverse_p && (fg == dflt_fg && bg == dflt_bg)) { unsigned long tem = fg; fg = bg; bg = tem; } + /* If the user requested inverse video, obey. */ + if (inverse_video) + { + unsigned long tem2 = fg; + + fg = bg; + bg = tem2; + } if (termscript) - fprintf (termscript, "", face, - highlight ? "H" : "", fp->foreground, fp->background, fg, bg); + fprintf (termscript, "", face, + fp->foreground, fp->background, fg, bg); if (fg >= 0 && fg < 16) { ScreenAttrib &= 0xf0; @@ -951,7 +974,7 @@ IT_write_glyphs (struct glyph *str, int str_len) int conversion_buffer_size = sizeof conversion_buffer; if (str_len <= 0) return; - + screen_buf = screen_bp = alloca (str_len * 2); screen_buf_end = screen_buf + str_len * 2; sf = SELECTED_FRAME(); @@ -962,7 +985,7 @@ IT_write_glyphs (struct glyph *str, int str_len) face of the frame, before writing glyphs, and let the glyphs set the right face if it's different from the default. */ IT_set_face (DEFAULT_FACE_ID); - + /* The mode bit CODING_MODE_LAST_BLOCK should be set to 1 only at the tail. */ terminal_coding.mode &= ~CODING_MODE_LAST_BLOCK; @@ -985,6 +1008,9 @@ IT_write_glyphs (struct glyph *str, int str_len) register GLYPH g = GLYPH_FROM_CHAR_GLYPH (*str); int glyph_not_in_table = 0; + /* If g is negative, it means we have a multibyte character + in *str. That's what GLYPH_FROM_CHAR_GLYPH returns for + multibyte characters. */ if (g < 0 || g >= tlen) { /* This glyph doesn't have an entry in Vglyph_table. */ @@ -1020,7 +1046,7 @@ IT_write_glyphs (struct glyph *str, int str_len) /* If the face of this glyph is different from the current screen face, update the screen attribute byte. */ - cf = FAST_GLYPH_FACE (g); + cf = str->face_id; if (cf != screen_face) IT_set_face (cf); /* handles invalid faces gracefully */ @@ -1154,9 +1180,6 @@ IT_write_glyphs (struct glyph *str, int str_len) Mouse Highlight (and friends..) ************************************************************************/ -/* This is used for debugging, to turn off note_mouse_highlight. */ -int disable_mouse_highlight; - /* 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.) */ @@ -1169,6 +1192,13 @@ static Lisp_Object help_echo_window; static Lisp_Object help_echo_object; static int help_echo_pos; +/* Non-zero means automatically select any window when the mouse + cursor moves into it. */ +int mouse_autoselect_window; + +/* Last window where we saw the mouse. Used by mouse-autoselect-window. */ +static Lisp_Object last_mouse_window; + static int mouse_preempted = 0; /* non-zero when XMenu gobbles mouse events */ /* Set the mouse pointer shape according to whether it is in the @@ -1194,7 +1224,7 @@ show_mouse_face (struct display_info *dpyinfo, int hl) int i; struct face *fp; - + /* If window is in the process of being destroyed, don't bother doing anything. */ if (w->current_matrix == NULL) @@ -1208,6 +1238,9 @@ show_mouse_face (struct display_info *dpyinfo, int hl) /* There's no sense to do anything if the mouse face isn't realized. */ if (hl > 0) { + if (dpyinfo->mouse_face_hidden) + goto set_cursor_shape; + fp = FACE_FROM_ID (SELECTED_FRAME(), dpyinfo->mouse_face_face_id); if (!fp) goto set_cursor_shape; @@ -1301,7 +1334,6 @@ show_mouse_face (struct display_info *dpyinfo, int hl) } set_cursor_shape: - /* Change the mouse pointer shape. */ IT_set_mouse_pointer (hl); } @@ -1326,13 +1358,9 @@ clear_mouse_face (struct display_info *dpyinfo) static int fast_find_position (struct window *w, int pos, int *hpos, int *vpos) { - int i; - int lastcol; - int maybe_next_line_p = 0; - int line_start_position; + int i, lastcol, line_start_position, maybe_next_line_p = 0; int yb = window_text_bottom_y (w); - struct glyph_row *row = MATRIX_ROW (w->current_matrix, 0); - struct glyph_row *best_row = row; + struct glyph_row *row = MATRIX_ROW (w->current_matrix, 0), *best_row = row; while (row->y < yb) { @@ -1353,10 +1381,15 @@ fast_find_position (struct window *w, int pos, int *hpos, int *vpos) } else if (line_start_position > 0) best_row = row; - + + /* Don't overstep the last matrix row, lest we get into the + never-never land... */ + if (row->y + 1 >= yb) + break; + ++row; } - + /* Find the right column within BEST_ROW. */ lastcol = 0; row = best_row; @@ -1395,7 +1428,7 @@ fast_find_position (struct window *w, int pos, int *hpos, int *vpos) /* Take proper action when mouse has moved to the mode or top line of window W, x-position X. MODE_LINE_P non-zero means mouse is on the mode line. X is relative to the start of the text display area of - W, so the width of bitmap areas and scroll bars must be subtracted + W, so the width of fringes and scroll bars must be subtracted to get a position relative to the start of the mode line. */ static void IT_note_mode_line_highlight (struct window *w, int x, int mode_line_p) @@ -1408,22 +1441,22 @@ IT_note_mode_line_highlight (struct window *w, int x, int mode_line_p) row = MATRIX_MODE_LINE_ROW (w->current_matrix); else row = MATRIX_HEADER_LINE_ROW (w->current_matrix); - + if (row->enabled_p) { extern Lisp_Object Qhelp_echo; struct glyph *glyph, *end; Lisp_Object help, map; - + /* Find the glyph under X. */ glyph = row->glyphs[TEXT_AREA] + x - FRAME_LEFT_SCROLL_BAR_WIDTH (f) * CANON_X_UNIT (f); end = glyph + row->used[TEXT_AREA]; if (glyph < end && STRINGP (glyph->object) - && XSTRING (glyph->object)->intervals + && STRING_INTERVALS (glyph->object) && glyph->charpos >= 0 - && glyph->charpos < XSTRING (glyph->object)->size) + && glyph->charpos < SCHARS (glyph->object)) { /* If we're on a string with `help-echo' text property, arrange for the help to be displayed. This is done by @@ -1449,7 +1482,7 @@ static void IT_note_mouse_highlight (struct frame *f, int x, int y) { struct display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); - int portion; + int portion = -1; Lisp_Object window; struct window *w; @@ -1457,7 +1490,7 @@ IT_note_mouse_highlight (struct frame *f, int x, int y) if (mouse_preempted) return; - if (disable_mouse_highlight + if (NILP (Vmouse_highlight) || !f->glyphs_initialized_p) return; @@ -1508,16 +1541,21 @@ IT_note_mouse_highlight (struct frame *f, int x, int y) && (XFASTINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (XBUFFER (w->buffer)))) { - int pos, i, area; + int pos, i, nrows = w->current_matrix->nrows; struct glyph_row *row; struct glyph *glyph; /* Find the glyph under X/Y. */ glyph = NULL; - if (y < w->current_matrix->nrows) + if (y >= 0 && y < nrows) { row = MATRIX_ROW (w->current_matrix, y); - if (row->enabled_p + /* Give up if some row before the one we are looking for is + not enabled. */ + for (i = 0; i <= y; i++) + if (!MATRIX_ROW (w->current_matrix, i)->enabled_p) + break; + if (i > y /* all rows upto and including the one at Y are enabled */ && row->displays_text_p && x < window_box_width (w, TEXT_AREA)) { @@ -1547,11 +1585,9 @@ IT_note_mouse_highlight (struct frame *f, int x, int y) /* Check for mouse-face and help-echo. */ { extern Lisp_Object Qmouse_face; - Lisp_Object mouse_face, overlay, position; - Lisp_Object *overlay_vec; - int len, noverlays; + Lisp_Object mouse_face, overlay, position, *overlay_vec; + int len, noverlays, obegv, ozv;; struct buffer *obuf; - int obegv, ozv; /* If we get an out-of-range value, return now; avoid an error. */ if (pos > BUF_Z (XBUFFER (w->buffer))) @@ -1582,7 +1618,7 @@ IT_note_mouse_highlight (struct frame *f, int x, int y) noverlays = overlays_at (pos, 0, &overlay_vec, &len, NULL, NULL, 0); } - + /* Sort overlays into increasing priority order. */ noverlays = sort_overlays (overlay_vec, noverlays, w); @@ -1637,7 +1673,8 @@ IT_note_mouse_highlight (struct frame *f, int x, int y) dpyinfo->mouse_face_window = window; dpyinfo->mouse_face_face_id = face_at_buffer_position (w, pos, 0, 0, - &ignore, pos + 1, 1); + &ignore, pos + 1, + !dpyinfo->mouse_face_hidden); /* Display it as active. */ show_mouse_face (dpyinfo, 1); @@ -1671,7 +1708,8 @@ IT_note_mouse_highlight (struct frame *f, int x, int y) dpyinfo->mouse_face_window = window; dpyinfo->mouse_face_face_id = face_at_buffer_position (w, pos, 0, 0, - &ignore, pos + 1, 1); + &ignore, pos + 1, + !dpyinfo->mouse_face_hidden); /* Display it as active. */ show_mouse_face (dpyinfo, 1); @@ -1690,7 +1728,7 @@ IT_note_mouse_highlight (struct frame *f, int x, int y) overlay = overlay_vec[i]; help = Foverlay_get (overlay, Qhelp_echo); } - + if (!NILP (help)) { help_echo = help; @@ -1702,7 +1740,7 @@ IT_note_mouse_highlight (struct frame *f, int x, int y) else if (NILP (help) && ((STRINGP (glyph->object) && glyph->charpos >= 0 - && glyph->charpos < XSTRING (glyph->object)->size) + && glyph->charpos < SCHARS (glyph->object)) || (BUFFERP (glyph->object) && glyph->charpos >= BEGV && glyph->charpos < ZV))) @@ -1718,7 +1756,7 @@ IT_note_mouse_highlight (struct frame *f, int x, int y) } } } - + BEGV = obegv; ZV = ozv; current_buffer = obuf; @@ -1730,8 +1768,7 @@ static void IT_clear_end_of_line (int first_unused) { char *spaces, *sp; - int i, j; - int offset = 2 * (new_pos_X + screen_size_X * new_pos_Y); + int i, j, offset = 2 * (new_pos_X + screen_size_X * new_pos_Y); extern int fatal_error_in_progress; if (new_pos_X >= first_unused || fatal_error_in_progress) @@ -1742,7 +1779,7 @@ IT_clear_end_of_line (int first_unused) if (termscript) fprintf (termscript, "", new_pos_X, first_unused); spaces = sp = alloca (i); - + while (--j >= 0) { *sp++ = ' '; @@ -1764,7 +1801,16 @@ IT_clear_screen (void) { if (termscript) fprintf (termscript, ""); - IT_set_face (0); + /* We are sometimes called (from clear_garbaged_frames) when a new + frame is being created, but its faces are not yet realized. In + such a case we cannot call IT_set_face, since it will fail to find + any valid faces and will abort. Instead, use the initial screen + colors; that should mimic what a Unix tty does, which simply clears + the screen with whatever default colors are in use. */ + if (FACE_FROM_ID (SELECTED_FRAME (), DEFAULT_FACE_ID) == NULL) + ScreenAttrib = (initial_screen_colors[0] << 4) | initial_screen_colors[1]; + else + IT_set_face (0); mouse_off (); ScreenClear (); if (screen_virtual_segment) @@ -1898,27 +1944,11 @@ IT_cmgoto (FRAME_PTR f) mouse_on (); } -static void -IT_reassert_line_highlight (int new, int vpos) -{ - highlight = new; -} - -static void -IT_change_line_highlight (int new_highlight, int y, int vpos, int first_unused_hpos) -{ - highlight = new_highlight; - IT_cursor_to (vpos, 0); - IT_clear_end_of_line (first_unused_hpos); -} - 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; @@ -1976,7 +2006,6 @@ IT_update_begin (struct frame *f) static void IT_update_end (struct frame *f) { - highlight = 0; FRAME_X_DISPLAY_INFO (f)->mouse_face_defer = 0; } @@ -2113,19 +2142,18 @@ IT_set_terminal_modes (void) { if (termscript) fprintf (termscript, "\n"); - highlight = 0; screen_size_X = ScreenCols (); screen_size_Y = ScreenRows (); screen_size = screen_size_X * screen_size_Y; - + new_pos_X = new_pos_Y = 0; current_pos_X = current_pos_Y = -1; if (term_setup_done) return; term_setup_done = 1; - + startup_screen_size_X = screen_size_X; startup_screen_size_Y = screen_size_Y; startup_screen_attrib = ScreenAttrib; @@ -2181,21 +2209,17 @@ IT_reset_terminal_modes (void) { int display_row_start = (int) ScreenPrimary; int saved_row_len = startup_screen_size_X * 2; - int update_row_len = ScreenCols () * 2; - int current_rows = ScreenRows (); + int update_row_len = ScreenCols () * 2, current_rows = ScreenRows (); int to_next_row = update_row_len; unsigned char *saved_row = startup_screen_buffer; - int cursor_pos_X = ScreenCols () - 1; - int cursor_pos_Y = ScreenRows () - 1; + int cursor_pos_X = ScreenCols () - 1, cursor_pos_Y = ScreenRows () - 1; if (termscript) fprintf (termscript, "\n"); - highlight = 0; - if (!term_setup_done) return; - + mouse_off (); /* Leave the video system in the same state as we found it, @@ -2262,26 +2286,31 @@ IT_set_terminal_window (int foo) /* Remember the screen colors of the curent frame, to serve as the default colors for newly-created frames. */ - -static int initial_screen_colors[2]; - DEFUN ("msdos-remember-default-colors", Fmsdos_remember_default_colors, Smsdos_remember_default_colors, 1, 1, 0, - "Remember the screen colors of the current frame.") + doc: /* Remember the screen colors of the current frame. */) (frame) Lisp_Object frame; { - int reverse; struct frame *f; - CHECK_FRAME (frame, 0); + CHECK_FRAME (frame); 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); + /* This function is called after applying default-frame-alist to the + initial frame. At that time, if reverse-colors option was + specified in default-frame-alist, it was already applied, and + frame colors are reversed. We need to account for that. */ + if (EQ (Fcdr (Fassq (Qreverse, f->param_alist)), Qt)) + { + initial_screen_colors[0] = FRAME_BACKGROUND_PIXEL (f); + initial_screen_colors[1] = FRAME_FOREGROUND_PIXEL (f); + } + else + { + initial_screen_colors[0] = FRAME_FOREGROUND_PIXEL (f); + initial_screen_colors[1] = FRAME_BACKGROUND_PIXEL (f); + } } void @@ -2290,18 +2319,18 @@ IT_set_frame_parameters (f, alist) Lisp_Object alist; { Lisp_Object tail; - int length = XINT (Flength (alist)); - int i, j; + int i, j, length = XINT (Flength (alist)); Lisp_Object *parms = (Lisp_Object *) alloca (length * sizeof (Lisp_Object)); Lisp_Object *values = (Lisp_Object *) alloca (length * sizeof (Lisp_Object)); /* Do we have to reverse the foreground and background colors? */ int reverse = EQ (Fcdr (Fassq (Qreverse, f->param_alist)), Qt); - int was_reverse = reverse; + int need_to_reverse, was_reverse = reverse; int redraw = 0, fg_set = 0, bg_set = 0; - unsigned long orig_fg; - unsigned long orig_bg; + unsigned long orig_fg, 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. */ @@ -2313,6 +2342,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; @@ -2322,7 +2360,7 @@ IT_set_frame_parameters (f, alist) elt = Fcar (tail); parms[i] = Fcar (elt); - CHECK_SYMBOL (parms[i], 1); + CHECK_SYMBOL (parms[i]); values[i] = Fcdr (elt); i++; } @@ -2331,58 +2369,85 @@ 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; + + 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, 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; + bg_set = 1; + } else - FRAME_FOREGROUND_PIXEL (f) = new_color; + { + Finternal_set_lisp_face_attribute (Qdefault, QCforeground, + val, frame); + fg_set = 1; + } redraw = 1; - fg_set = 1; if (termscript) fprintf (termscript, "\n", new_color); } } 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; + fg_set = 1; + } else - FRAME_BACKGROUND_PIXEL (f) = new_color; + { + Finternal_set_lisp_face_attribute (Qdefault, QCbackground, + val, frame); + bg_set = 1; + } redraw = 1; - bg_set = 1; if (termscript) fprintf (termscript, "\n", new_color); } @@ -2391,14 +2456,16 @@ IT_set_frame_parameters (f, alist) { x_set_title (f, val); if (termscript) - fprintf (termscript, "\n", XSTRING (val)->data); + fprintf (termscript, "\n", SDATA (val)); } 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) + EQ (val, Qbar) || EQ (val, Qhbar) + || CONSP (val) && (EQ (XCAR (val), Qbar) + || EQ (XCAR (val), Qhbar)) ? "bar" : "box"); } store_frame_param (f, prop, val); @@ -2406,16 +2473,24 @@ IT_set_frame_parameters (f, alist) /* 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, QCforeground, + tty_color_name (f, orig_bg), + frame); redraw = 1; } if (!bg_set) { - FRAME_FOREGROUND_PIXEL (f) = orig_bg; + XSETFRAME (frame, f); + Finternal_set_lisp_face_attribute (Qdefault, QCbackground, + tty_color_name (f, orig_fg), + frame); redraw = 1; } } @@ -2438,8 +2513,7 @@ extern void init_frame_faces (FRAME_PTR); void internal_terminal_init () { - char *term = getenv ("TERM"); - char *colors; + char *term = getenv ("TERM"), *colors; struct frame *sf = SELECTED_FRAME(); #ifdef HAVE_X_WINDOWS @@ -2452,7 +2526,7 @@ internal_terminal_init () if (getenv ("EMACSTEST")) termscript = fopen (getenv ("EMACSTEST"), "wt"); - + #ifndef HAVE_X_WINDOWS if (!internal_terminal || inhibit_window_system) { @@ -2504,6 +2578,7 @@ internal_terminal_init () the_only_x_display.display_info.mouse_face_mouse_x = the_only_x_display.display_info.mouse_face_mouse_y = 0; the_only_x_display.display_info.mouse_face_defer = 0; + the_only_x_display.display_info.mouse_face_hidden = 0; init_frame_faces (sf); @@ -2515,10 +2590,8 @@ internal_terminal_init () clear_to_end_hook = IT_clear_to_end; clear_end_of_line_hook = IT_clear_end_of_line; clear_frame_hook = IT_clear_screen; - change_line_highlight_hook = IT_change_line_highlight; update_begin_hook = IT_update_begin; update_end_hook = IT_update_end; - reassert_line_highlight_hook = IT_reassert_line_highlight; frame_up_to_date_hook = IT_frame_up_to_date; /* These hooks are called by term.c without being checked. */ @@ -2541,7 +2614,7 @@ dos_get_saved_screen (screen, rows, cols) return *screen != (char *)0; #else return 0; -#endif +#endif } #ifndef HAVE_X_WINDOWS @@ -2711,7 +2784,7 @@ dos_set_keyboard (code, always) keyboard = keyboard_layout_list[0].keyboard_map; keyboard_map_all = always; dos_keyboard_layout = 1; - + for (i = 0; i < (sizeof (keyboard_layout_list)/sizeof (struct keyboard_layout_list)); i++) if (code == keyboard_layout_list[i].country_code) { @@ -2788,7 +2861,7 @@ ibmpc_translate_map[] = Map | 23, /* 'o' */ Map | 24, /* 'p' */ Map | 25, /* '[' */ - Map | 26, /* ']' */ + Map | 26, /* ']' */ ModFct | 0x0d, /* Return */ Ignore, /* Ctrl */ Map | 30, /* 'a' */ @@ -2964,23 +3037,22 @@ dos_get_modifiers (keymask) int *keymask; { union REGS regs; - int mask; - int modifiers = 0; - + int mask, modifiers = 0; + /* Calculate modifier bits */ regs.h.ah = extended_kbd ? 0x12 : 0x02; int86 (0x16, ®s, ®s); if (!extended_kbd) { - mask = regs.h.al & (SHIFT_P | CTRL_P | ALT_P | + mask = regs.h.al & (SHIFT_P | CTRL_P | ALT_P | SCRLOCK_P | NUMLOCK_P | CAPSLOCK_P); } else { mask = regs.h.al & (SHIFT_P | SCRLOCK_P | NUMLOCK_P | CAPSLOCK_P); - + /* Do not break international keyboard support. */ /* When Keyb.Com is loaded, the right Alt key is */ /* used for accessing characters like { and } */ @@ -3008,7 +3080,7 @@ dos_get_modifiers (keymask) mask |= ALT_P; } } - + if (regs.h.ah & 1) /* Left CTRL pressed ? */ mask |= CTRL_P; @@ -3047,13 +3119,12 @@ int total_doskeys; /* Total number of elements stored into recent_doskeys */ Lisp_Object recent_doskeys; /* A vector, holding the last 100 keystrokes */ DEFUN ("recent-doskeys", Frecent_doskeys, Srecent_doskeys, 0, 0, 0, - "Return vector of last 100 keyboard input values seen in dos_rawgetc.\n\ -Each input key receives two values in this vector: first the ASCII code,\n\ -and then the scan code.") + doc: /* Return vector of last 100 keyboard input values seen in dos_rawgetc. +Each input key receives two values in this vector: first the ASCII code, +and then the scan code. */) () { - Lisp_Object *keys = XVECTOR (recent_doskeys)->contents; - Lisp_Object val; + Lisp_Object val, *keys = XVECTOR (recent_doskeys)->contents; if (total_doskeys < NUM_RECENT_DOSKEYS) return Fvector (total_doskeys, keys); @@ -3076,7 +3147,8 @@ dos_rawgetc () { struct input_event event; union REGS regs; - + struct display_info *dpyinfo = FRAME_X_DISPLAY_INFO (SELECTED_FRAME()); + #ifndef HAVE_X_WINDOWS /* Maybe put the cursor where it should be. */ IT_cmgoto (SELECTED_FRAME()); @@ -3090,8 +3162,7 @@ dos_rawgetc () { union REGS regs; register unsigned char c; - int sc, code = -1, mask, kp_mode; - int modifiers; + int modifiers, sc, code = -1, mask, kp_mode; regs.h.ah = extended_kbd ? 0x10 : 0x00; int86 (0x16, ®s, ®s); @@ -3109,7 +3180,7 @@ dos_rawgetc () recent_doskeys_index = 0; modifiers = dos_get_modifiers (&mask); - + #ifndef HAVE_X_WINDOWS if (!NILP (Vdos_display_scancodes)) { @@ -3165,7 +3236,7 @@ dos_rawgetc () continue; } } - + if (c == 0) { /* We only look at the keyboard Ctrl/Shift/Alt keys when @@ -3187,22 +3258,22 @@ dos_rawgetc () if (code & Shift) modifiers |= shift_modifier; } - + switch (code & 0xf000) { case ModFct: if (c && !(mask & (SHIFT_P | ALT_P | CTRL_P | HYPER_P | SUPER_P))) return c; c = 0; /* Special */ - + case FctKey: if (c != 0) return c; - + case Special: code |= 0xff00; break; - + case Normal: if (sc == 0) { @@ -3217,7 +3288,7 @@ dos_rawgetc () code = c; break; } - + case Map: if (c && !(mask & ALT_P) && !((mask & SHIFT_P) && (mask & CTRL_P))) if (!keyboard_map_all) @@ -3226,7 +3297,7 @@ dos_rawgetc () code &= 0xff; if (mask & ALT_P && code <= 10 && code > 0 && dos_keypad_mode & 0x200) mask |= SHIFT_P; /* ALT-1 => M-! etc. */ - + if (mask & SHIFT_P) { code = keyboard->shifted[code]; @@ -3249,7 +3320,7 @@ dos_rawgetc () kp_mode = dos_keypad_mode & 0x03; else kp_mode = (dos_keypad_mode >> 4) & 0x03; - + switch (kp_mode) { case 0: @@ -3265,13 +3336,13 @@ dos_rawgetc () code = keypad_translate_map[code].meta_code; modifiers = meta_modifier; break; - + case 3: code = 0xff00 | keypad_translate_map[code].editkey_code; break; } break; - + case Grey: code &= 0xff; kp_mode = ((mask & (NUMLOCK_P|CTRL_P|SHIFT_P|ALT_P)) == NUMLOCK_P) ? 0x04 : 0x40; @@ -3281,15 +3352,21 @@ dos_rawgetc () code = grey_key_translate_map[code].char_code; break; } - + make_event: if (code == 0) continue; - + + if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)) + { + dpyinfo->mouse_face_hidden = 1; + clear_mouse_face (dpyinfo); + } + if (code >= 0x100) - event.kind = non_ascii_keystroke; + event.kind = NON_ASCII_KEYSTROKE_EVENT; else - event.kind = ascii_keystroke; + event.kind = ASCII_KEYSTROKE_EVENT; event.code = code; event.modifiers = modifiers; event.frame_or_window = selected_frame; @@ -3302,6 +3379,7 @@ dos_rawgetc () { int but, press, x, y, ok; int mouse_prev_x = mouse_last_x, mouse_prev_y = mouse_last_y; + Lisp_Object mouse_window = Qnil; /* Check for mouse movement *before* buttons. */ mouse_check_moved (); @@ -3310,6 +3388,40 @@ dos_rawgetc () might need to update mouse highlight. */ if (mouse_last_x != mouse_prev_x || mouse_last_y != mouse_prev_y) { + if (dpyinfo->mouse_face_hidden) + { + dpyinfo->mouse_face_hidden = 0; + clear_mouse_face (dpyinfo); + } + + /* Generate SELECT_WINDOW_EVENTs when needed. */ + if (mouse_autoselect_window) + { + int mouse_area; + + mouse_window = window_from_coordinates (SELECTED_FRAME(), + mouse_last_x, + mouse_last_y, + &mouse_area, 0); + /* A window will be selected only when it is not + selected now, and the last mouse movement event was + not in it. A minibuffer window will be selected iff + it is active. */ + if (WINDOWP (mouse_window) + && !EQ (mouse_window, last_mouse_window) + && !EQ (mouse_window, selected_window)) + { + event.kind = SELECT_WINDOW_EVENT; + event.frame_or_window = mouse_window; + event.arg = Qnil; + event.timestamp = event_timestamp (); + kbd_buffer_store_event (&event); + } + last_mouse_window = mouse_window; + } + else + last_mouse_window = Qnil; + previous_help_echo = help_echo; help_echo = help_echo_object = help_echo_window = Qnil; help_echo_pos = -1; @@ -3319,18 +3431,14 @@ dos_rawgetc () changed, generate a HELP_EVENT. */ 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 = selected_frame; event.arg = help_echo_object; - event.x = make_number (help_echo_pos); + event.x = WINDOWP (help_echo_window) + ? help_echo_window : selected_frame; + event.y = help_echo; 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; + event.code = help_echo_pos; kbd_buffer_store_event (&event); } } @@ -3367,7 +3475,7 @@ dos_rawgetc () } } - event.kind = mouse_click; + event.kind = MOUSE_CLICK_EVENT; event.code = button_num; event.modifiers = dos_get_modifiers (0) | (press ? down_modifier : up_modifier); @@ -3415,8 +3523,7 @@ dos_keyread () void pixel_to_glyph_coords (f, pix_x, pix_y, x, y, bounds, noclip) FRAME_PTR f; - register int pix_x, pix_y; - register int *x, *y; + register int pix_x, pix_y, *x, *y; XRectangle *bounds; int noclip; { @@ -3431,8 +3538,7 @@ pixel_to_glyph_coords (f, pix_x, pix_y, x, y, bounds, noclip) void glyph_to_pixel_coords (f, x, y, pix_x, pix_y) FRAME_PTR f; - register int x, y; - register int *pix_x, *pix_y; + register int x, y, *pix_x, *pix_y; { *pix_x = x; *pix_y = y; @@ -3536,12 +3642,9 @@ IT_menu_calc_size (XMenu *menu, int *width, int *height) static void IT_menu_display (XMenu *menu, int y, int x, int pn, int *faces, int disp_help) { - int i, j, face, width; + int i, j, face, width, mx, my, enabled, mousehere, row, col; struct glyph *text, *p; char *q; - int mx, my; - int enabled, mousehere; - int row, col; struct frame *sf = SELECTED_FRAME(); menu_help_message = NULL; @@ -3610,10 +3713,7 @@ IT_menu_display (XMenu *menu, int y, int x, int pn, int *faces, int disp_help) /* Report availability of menus. */ int -have_menus_p () -{ - return 1; -} +have_menus_p () { return 1; } /* Create a brand new menu structure. */ @@ -3715,16 +3815,11 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, void (*help_callback)(char *, int, int)) { struct IT_menu_state *state; - int statecount; - int x, y, i, b; - int screensize; - int faces[4]; - Lisp_Object selectface; - int leave, result, onepane; + int statecount, x, y, i, b, screensize, leave, result, onepane; int title_faces[4]; /* face to display the menu title */ - int buffers_num_deleted = 0; + int faces[4], buffers_num_deleted = 0; struct frame *sf = SELECTED_FRAME(); - Lisp_Object saved_echo_area_message; + Lisp_Object saved_echo_area_message, selectface; /* Just in case we got here without a mouse present... */ if (have_mouse <= 0) @@ -3763,7 +3858,7 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, /* Don't let the title for the "Buffers" popup menu include a digit (which is ugly). - + This is a terrible kludge, but I think the "Buffers" case is the only one where the title includes a number, so it doesn't seem to be necessary to make this more general. */ @@ -3855,7 +3950,7 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, state[statecount].x = state[i].x + state[i].menu->width + 2; state[statecount].y = y; - statecount++; + statecount++; } } } @@ -4016,8 +4111,7 @@ getdefdir (drive, dst) int drive; char *dst; { - char in_path[4], *p = in_path; - int e = errno; + char in_path[4], *p = in_path, e = errno;; /* Generate "X:." (when drive is X) or "." (when drive is 0). */ if (drive != 0) @@ -4041,6 +4135,16 @@ getdefdir (drive, dst) return 1; } +char * +emacs_root_dir (void) +{ + static char root_dir[4]; + + sprintf (root_dir, "%c:/", 'A' + getdisk ()); + root_dir[0] = tolower (root_dir[0]); + return root_dir; +} + /* Remove all CR's that are followed by a LF. */ int @@ -4048,9 +4152,7 @@ crlf_to_lf (n, buf) register int n; register unsigned char *buf; { - unsigned char *np = buf; - unsigned char *startp = buf; - unsigned char *endp = buf + n; + unsigned char *np = buf, *startp = buf, *endp = buf + n; if (n == 0) return n; @@ -4145,7 +4247,7 @@ __write (int handle, const void *buffer, size_t count) used when you compile with DJGPP v2.0. */ #include - + int _rename(const char *old, const char *new) { __dpmi_regs r; @@ -4259,9 +4361,9 @@ int _rename(const char *old, const char *new) #endif /* __DJGPP__ == 2 && __DJGPP_MINOR__ == 0 */ DEFUN ("msdos-long-file-names", Fmsdos_long_file_names, Smsdos_long_file_names, - 0, 0, 0, - "Return non-nil if long file names are supported on MSDOS.") - () + 0, 0, 0, + doc: /* Return non-nil if long file names are supported on MSDOS. */) + () { return (_USE_LFN ? Qt : Qnil); } @@ -4292,11 +4394,11 @@ msdos_downcase_filename (p) DEFUN ("msdos-downcase-filename", Fmsdos_downcase_filename, Smsdos_downcase_filename, 1, 1, 0, - "Convert alphabetic characters in FILENAME to lower case and return that.\n\ -When long filenames are supported, doesn't change FILENAME.\n\ -If FILENAME is not a string, returns nil.\n\ -The argument object is never altered--the value is a copy.") - (filename) + doc: /* Convert alphabetic characters in FILENAME to lower case and return that. +When long filenames are supported, doesn't change FILENAME. +If FILENAME is not a string, returns nil. +The argument object is never altered--the value is a copy. */) + (filename) Lisp_Object filename; { Lisp_Object tem; @@ -4305,7 +4407,7 @@ The argument object is never altered--the value is a copy.") return Qnil; tem = Fcopy_sequence (filename); - msdos_downcase_filename (XSTRING (tem)->data); + msdos_downcase_filename (SDATA (tem)); return tem; } @@ -4336,11 +4438,10 @@ init_environment (argc, argv, skip_args) int skip_args; { char *s, *t, *root; - int len; + int len, i; static const char * const tempdirs[] = { "$TMPDIR", "$TEMP", "$TMP", "c:/" }; - int i; const int imax = sizeof (tempdirs) / sizeof (tempdirs[0]); /* Make sure they have a usable $TMPDIR. Many Emacs functions use @@ -4526,7 +4627,7 @@ dos_ttraw () { union REGS inregs, outregs; static int first_time = 1; - + break_stat = getcbrk (); setcbrk (0); #if __DJGPP__ < 2 @@ -4538,7 +4639,7 @@ dos_ttraw () inregs.h.ah = 0xc0; int86 (0x15, &inregs, &outregs); extended_kbd = (!outregs.x.cflag) && (outregs.h.ah == 0); - + have_mouse = 0; if (internal_terminal @@ -4657,9 +4758,7 @@ run_msdos_command (argv, working_dir, tempin, tempout, temperr, envv) { char *saveargv1, *saveargv2, *lowcase_argv0, *pa, *pl; char oldwd[MAXPATHLEN + 1]; /* Fixed size is safe on MSDOS. */ - int msshell, result = -1; - int inbak, outbak, errbak; - int x, y; + int msshell, result = -1, inbak, outbak, errbak, x, y; Lisp_Object cmd; /* Get current directory as MSDOS cwd is not per-process. */ @@ -4716,7 +4815,7 @@ run_msdos_command (argv, working_dir, tempin, tempout, temperr, envv) mouse_get_xy (&x, &y); dos_ttcooked (); /* do it here while 0 = stdin */ - + dup2 (tempin, 0); dup2 (tempout, 1); dup2 (temperr, 2); @@ -4767,7 +4866,7 @@ run_msdos_command (argv, working_dir, tempin, tempout, temperr, envv) #endif /* __DJGPP__ > 1 */ result = spawnve (P_WAIT, argv[0], argv, envv); - + dup2 (inbak, 0); dup2 (outbak, 1); dup2 (errbak, 2); @@ -4786,7 +4885,7 @@ run_msdos_command (argv, working_dir, tempin, tempout, temperr, envv) text attribute byte, so we get blinking characters instead of the bright background colors. Restore that. */ bright_bg (); - + done: chdir (oldwd); if (msshell) @@ -4797,6 +4896,7 @@ run_msdos_command (argv, working_dir, tempin, tempout, temperr, envv) return result; } +void croak (badfunc) char *badfunc; { @@ -4829,7 +4929,7 @@ gethostname (p, size) /* When time zones are set from Ms-Dos too many C-libraries are playing tricks with time values. We solve this by defining our own version of `gettimeofday' bypassing GO32. Our version needs to be initialized - once and after each call to `tzset' with TZ changed. That is + once and after each call to `tzset' with TZ changed. That is accomplished by aliasing tzset to init_gettimeofday. */ static struct tm time_rec; @@ -4841,7 +4941,7 @@ gettimeofday (struct timeval *tp, struct timezone *tzp) { struct time t; struct tm tm; - + gettime (&t); if (t.ti_hour < time_rec.tm_hour) /* midnight wrap */ { @@ -4851,14 +4951,14 @@ gettimeofday (struct timeval *tp, struct timezone *tzp) time_rec.tm_mon = d.da_mon - 1; time_rec.tm_mday = d.da_day; } - + time_rec.tm_hour = t.ti_hour; time_rec.tm_min = t.ti_min; time_rec.tm_sec = t.ti_sec; tm = time_rec; tm.tm_gmtoff = dos_timezone_offset; - + tp->tv_sec = mktime (&tm); /* may modify tm */ tp->tv_usec = t.ti_hund * (1000000 / 100); } @@ -4879,7 +4979,7 @@ int kill (x, y) int x, y; { return -1; } nice (p) int p; {} void volatile pause () {} sigsetmask (x) int x; { return 0; } -sigblock (mask) int mask; { return 0; } +sigblock (mask) int mask; { return 0; } #endif void request_sigio (void) {} @@ -4888,6 +4988,7 @@ setpriority (x,y,z) int x,y,z; { return 0; } void unrequest_sigio (void) {} #if __DJGPP__ > 1 +#if __DJGPP_MINOR__ < 2 #ifdef POSIX_SIGNALS @@ -4909,7 +5010,7 @@ static sigset_t pending_signals; typedef void (*sighandler_t)(int); static sighandler_t prev_handlers[320]; -/* A signal handler which just records that a signal occured +/* A signal handler which just records that a signal occurred (it will be raised later, if and when the signal is unblocked). */ static void sig_suspender (signo) @@ -4991,9 +5092,10 @@ sigprocmask (how, new_set, old_set) #else /* not POSIX_SIGNALS */ sigsetmask (x) int x; { return 0; } -sigblock (mask) int mask; { return 0; } +sigblock (mask) int mask; { return 0; } #endif /* not POSIX_SIGNALS */ +#endif /* not __DJGPP_MINOR__ < 2 */ #endif /* __DJGPP__ > 1 */ #ifndef HAVE_SELECT @@ -5051,7 +5153,7 @@ sys_select (nfds, rfds, wfds, efds, timeout) if (nfds != 1) abort (); - + /* If we are looking only for the terminal, with no timeout, just read it and wait -- that's more efficient. */ if (!timeout) @@ -5087,7 +5189,7 @@ sys_select (nfds, rfds, wfds, efds, timeout) dos_yield_time_slice (); } } - + FD_SET (0, rfds); return 1; } @@ -5119,7 +5221,7 @@ sys_chdir (path) tmp += 2; /* strip drive: KFS 1995-07-06 */ len -= 2; } - + if (len > 1 && (tmp[len - 1] == '/')) { char *tmp1 = (char *) alloca (len + 1); @@ -5160,7 +5262,7 @@ dos_abort (file, line) { char buffer1[200], buffer2[400]; int i, j; - + sprintf (buffer1, "", file, line); for (i = j = 0; buffer1[i]; i++) { buffer2[j++] = buffer1[i]; @@ -5194,11 +5296,6 @@ abort () /* The following variables are required so that cus-start.el won't complain about unbound variables. */ -#ifndef HAVE_X_WINDOWS -/* Search path for bitmap files (xfns.c). */ -Lisp_Object Vx_bitmap_file_path; -int x_stretch_cursor_p; -#endif #ifndef subprocesses /* Nonzero means delete a process right away if it exits (process.c). */ static int delete_exited_processes; @@ -5219,34 +5316,30 @@ syms_of_msdos () 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."); - Vx_bitmap_file_path = decode_env_path ((char *) 0, "."); - - DEFVAR_BOOL ("x-stretch-cursor", &x_stretch_cursor_p, - "*Non-nil means draw block cursor as wide as the glyph under it.\n\ -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 two are from xfns.c: */ Qbar = intern ("bar"); staticpro (&Qbar); + Qhbar = intern ("hbar"); + staticpro (&Qhbar); 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\ + doc: /* *Glyph to display instead of chars not supported by current codepage. + +This variable is used only by MSDOS terminals. */); + Vdos_unsupported_char_glyph = '\177'; -This variable is used only by MSDOS terminals."); - Vdos_unsupported_char_glyph = '\177'; + DEFVAR_BOOL ("mouse-autoselect-window", &mouse_autoselect_window, + doc: /* *Non-nil means autoselect window with mouse pointer. */); + mouse_autoselect_window = 0; #endif #ifndef subprocesses DEFVAR_BOOL ("delete-exited-processes", &delete_exited_processes, - "*Non-nil means delete processes immediately when they exit.\n\ -nil means don't delete them until `list-processes' is run."); + doc: /* *Non-nil means delete processes immediately when they exit. +nil means don't delete them until `list-processes' is run. */); delete_exited_processes = 0; #endif @@ -5258,4 +5351,3 @@ nil means don't delete them until `list-processes' is run."); } #endif /* MSDOS */ -