#include <setjmp.h>
#include "lisp.h"
#include <stdio.h>
-#include <stdlib.h>
#include <time.h>
#include <sys/param.h>
#include <sys/time.h>
#include <dos.h>
#include <errno.h>
-#include <string.h> /* for bzero and string functions */
#include <sys/stat.h> /* for _fixpath */
#include <unistd.h> /* for chdir, dup, dup2, etc. */
#include <dir.h> /* for getdisk */
#include <pc.h>
#include <ctype.h>
/* #include <process.h> */
-/* Damn that local process.h! Instead we can define P_WAIT ourselves. */
+/* Damn that local process.h! Instead we can define P_WAIT and
+ spawnve ourselves. */
#define P_WAIT 1
+extern int spawnve (int, const char *, char *const [], char *const []);
#ifndef _USE_LFN
#define _USE_LFN 0
#endif /* not SYSTEM_MALLOC */
static unsigned long
-event_timestamp ()
+event_timestamp (void)
{
struct time t;
unsigned long s;
static int mouse_button_count;
void
-mouse_on ()
+mouse_on (void)
{
union REGS regs;
}
void
-mouse_off ()
+mouse_off (void)
{
union REGS regs;
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;
+ (Lisp_Object nbuttons)
{
int n;
}
void
-mouse_moveto (x, y)
- int x, y;
+mouse_moveto (int x, int y)
{
union REGS regs;
struct tty_display_info *tty = CURTTY ();
}
static int
-mouse_pressed (b, xp, yp)
- int b, *xp, *yp;
+mouse_pressed (int b, int *xp, int *yp)
{
union REGS regs;
}
static int
-mouse_released (b, xp, yp)
- int b, *xp, *yp;
+mouse_released (int b, int *xp, int *yp)
{
union REGS regs;
}
static int
-mouse_button_depressed (b, xp, yp)
- int b, *xp, *yp;
+mouse_button_depressed (int b, int *xp, int *yp)
{
union REGS regs;
}
void
-mouse_get_pos (f, insist, bar_window, part, x, y, time)
- FRAME_PTR *f;
- int insist;
- Lisp_Object *bar_window, *x, *y;
- enum scroll_bar_part *part;
- unsigned long *time;
+mouse_get_pos (FRAME_PTR *f, int insist, Lisp_Object *bar_window,
+ enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y,
+ unsigned long *time)
{
int ix, iy;
Lisp_Object frame, tail;
}
static void
-mouse_check_moved ()
+mouse_check_moved (void)
{
int x, y;
}
void
-mouse_init ()
+mouse_init (void)
{
union REGS regs;
struct tty_display_info *tty = CURTTY ();
}
static void
-dos_direct_output (y, x, buf, len)
- int x, y;
- char *buf;
- int len;
+dos_direct_output (int y, int x, char *buf, int len)
{
int t0 = 2 * (x + y * screen_size_X);
int t = t0 + (int) ScreenPrimary;
ROWS x COLS frame. */
void
-dos_set_window_size (rows, cols)
- int *rows, *cols;
+dos_set_window_size (int *rows, int *cols)
{
char video_name[30];
union REGS regs;
if (current_rows != *rows || current_cols != *cols)
{
struct frame *f = SELECTED_FRAME();
- struct tty_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
- Lisp_Object window = dpyinfo->mouse_face_window;
+ Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
+ Lisp_Object window = hlinfo->mouse_face_window;
if (! NILP (window) && XFRAME (XWINDOW (window)->frame) == f)
{
- dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1;
- dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_end_col = -1;
- dpyinfo->mouse_face_window = Qnil;
+ hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1;
+ hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1;
+ hlinfo->mouse_face_window = Qnil;
}
}
the mouse cursor may need to be refreshed. */
static void
-mouse_off_maybe ()
+mouse_off_maybe (void)
{
int x, y;
bg = tem2;
}
if (tty->termscript)
- fprintf (tty->termscript, "<FACE %d: %d/%d[FG:%d/BG:%d]>", face,
+ fprintf (tty->termscript, "<FACE %d: %lu/%lu[FG:%lu/BG:%lu]>", face,
fp->foreground, fp->background, fg, bg);
if (fg >= 0 && fg < 16)
{
struct frame *sf;
unsigned char *conversion_buffer;
- /* Do we need to consider conversion of unibyte characters to
- multibyte? */
- int convert_unibyte_characters
- = (NILP (current_buffer->enable_multibyte_characters)
- && unibyte_display_via_language_environment);
-
/* 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. */
static int mouse_preempted = 0; /* non-zero when XMenu gobbles mouse events */
-/* Set the mouse pointer shape according to whether it is in the
- area where the mouse highlight is in effect. */
-static void
-IT_set_mouse_pointer (int mode)
+int
+popup_activated (void)
{
- /* A no-op for now. DOS text-mode mouse pointer doesn't offer too
- many possibilities to change its shape, and the available
- functionality pretty much sucks (e.g., almost every reasonable
- shape will conceal the character it is on). Since the color of
- the pointer changes in the highlighted area, it is not clear to
- me whether anything else is required, anyway. */
+ return mouse_preempted;
}
-/* Display the active region described by mouse_face_*
- in its mouse-face if HL > 0, in its normal face if HL = 0. */
-static void
-show_mouse_face (struct tty_display_info *dpyinfo, int hl)
+/* Draw TEXT_AREA glyphs between START and END of glyph row ROW on
+ window W. X is relative to TEXT_AREA in W. HL is a face override
+ for drawing the glyphs. */
+void
+tty_draw_row_with_mouse_face (struct window *w, struct glyph_row *row,
+ int start_hpos, int end_hpos,
+ enum draw_glyphs_face hl)
{
- struct window *w = XWINDOW (dpyinfo->mouse_face_window);
struct frame *f = XFRAME (WINDOW_FRAME (w));
- int i;
- struct face *fp;
struct tty_display_info *tty = FRAME_TTY (f);
+ Mouse_HLInfo *hlinfo = &tty->mouse_highlight;
-
- /* If window is in the process of being destroyed, don't bother
- doing anything. */
- if (w->current_matrix == NULL)
- goto set_cursor_shape;
-
- /* Recognize when we are called to operate on rows that don't exist
- anymore. This can happen when a window is split. */
- if (dpyinfo->mouse_face_end_row >= w->current_matrix->nrows)
- goto set_cursor_shape;
-
- /* There's no sense to do anything if the mouse face isn't realized. */
- if (hl > 0)
+ if (hl == DRAW_MOUSE_FACE)
{
- 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;
- }
-
- /* Note that mouse_face_beg_row etc. are window relative. */
- for (i = dpyinfo->mouse_face_beg_row;
- i <= dpyinfo->mouse_face_end_row;
- i++)
- {
- int start_hpos, end_hpos;
- struct glyph_row *row = MATRIX_ROW (w->current_matrix, i);
-
- /* Don't do anything if row doesn't have valid contents. */
- if (!row->enabled_p)
- continue;
-
- /* For all but the first row, the highlight starts at column 0. */
- if (i == dpyinfo->mouse_face_beg_row)
- start_hpos = dpyinfo->mouse_face_beg_col;
- else
- start_hpos = 0;
-
- if (i == dpyinfo->mouse_face_end_row)
- end_hpos = dpyinfo->mouse_face_end_col;
- else
- end_hpos = row->used[TEXT_AREA];
-
- 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_TOP_EDGE_Y (w);
- int kstart = start_hpos + WINDOW_LEFT_EDGE_X (w);
- int nglyphs = end_hpos - start_hpos;
- int offset = ScreenPrimary + 2*(vpos*screen_size_X + kstart) + 1;
- int start_offset = offset;
+ int vpos = row->y + WINDOW_TOP_EDGE_Y (w);
+ int kstart = start_hpos + WINDOW_LEFT_EDGE_X (w);
+ int nglyphs = end_hpos - start_hpos;
+ int offset = ScreenPrimary + 2*(vpos*screen_size_X + kstart) + 1;
+ int start_offset = offset;
- if (tty->termscript)
- fprintf (tty->termscript, "\n<MH+ %d-%d:%d>",
- kstart, kstart + nglyphs - 1, vpos);
-
- mouse_off ();
- IT_set_face (dpyinfo->mouse_face_face_id);
- /* Since we are going to change only the _colors_ of the
- displayed text, there's no need to go through all the
- pain of generating and encoding the text from the glyphs.
- Instead, we simply poke the attribute byte of each
- affected position in video memory with the colors
- computed by IT_set_face! */
- _farsetsel (_dos_ds);
- while (nglyphs--)
- {
- _farnspokeb (offset, ScreenAttrib);
- offset += 2;
- }
- if (screen_virtual_segment)
- dosv_refresh_virtual_screen (start_offset, end_hpos - start_hpos);
- mouse_on ();
- }
- else
- {
- /* We are removing a previously-drawn mouse highlight. The
- safest way to do so is to redraw the glyphs anew, since
- all kinds of faces and display tables could have changed
- behind our back. */
- int nglyphs = end_hpos - start_hpos;
- int save_x = new_pos_X, save_y = new_pos_Y;
-
- if (end_hpos >= row->used[TEXT_AREA])
- nglyphs = row->used[TEXT_AREA] - start_hpos;
-
- /* IT_write_glyphs writes at cursor position, so we need to
- temporarily move cursor coordinates to the beginning of
- the highlight region. */
- new_pos_X = start_hpos + WINDOW_LEFT_EDGE_X (w);
- new_pos_Y = row->y + WINDOW_TOP_EDGE_Y (w);
-
- if (tty->termscript)
- fprintf (tty->termscript, "<MH- %d-%d:%d>",
- new_pos_X, new_pos_X + nglyphs - 1, new_pos_Y);
- IT_write_glyphs (f, row->glyphs[TEXT_AREA] + start_hpos, nglyphs);
- if (tty->termscript)
- fputs ("\n", tty->termscript);
- new_pos_X = save_x;
- new_pos_Y = save_y;
- }
- }
-
- set_cursor_shape:
- /* Change the mouse pointer shape. */
- IT_set_mouse_pointer (hl);
-}
-
-/* Clear out the mouse-highlighted active region.
- Redraw it un-highlighted first. */
-static void
-clear_mouse_face (struct tty_display_info *dpyinfo)
-{
- if (!dpyinfo->mouse_face_hidden && ! NILP (dpyinfo->mouse_face_window))
- show_mouse_face (dpyinfo, 0);
-
- dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1;
- dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_end_col = -1;
- dpyinfo->mouse_face_window = Qnil;
-}
-
-/* Find the glyph matrix position of buffer position POS in window W.
- *HPOS and *VPOS are set to the positions found. W's current glyphs
- must be up to date. If POS is above window start return (0, 0).
- If POS is after end of W, return end of last line in W. */
-static int
-fast_find_position (struct window *w, int pos, int *hpos, int *vpos)
-{
- 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), *best_row = row;
-
- while (row->y < yb)
- {
- if (row->used[TEXT_AREA])
- line_start_position = row->glyphs[TEXT_AREA]->charpos;
- else
- line_start_position = 0;
-
- if (line_start_position > pos)
- break;
- /* If the position sought is the end of the buffer,
- don't include the blank lines at the bottom of the window. */
- else if (line_start_position == pos
- && pos == BUF_ZV (XBUFFER (w->buffer)))
- {
- maybe_next_line_p = 1;
- break;
- }
- 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;
- for (i = 0; i < row->used[TEXT_AREA]; i++)
- {
- struct glyph *glyph = row->glyphs[TEXT_AREA] + i;
- int charpos;
-
- charpos = glyph->charpos;
- if (charpos == pos)
- {
- *hpos = i;
- *vpos = row->y;
- return 1;
- }
- else if (charpos > pos)
- break;
- else if (charpos > 0)
- lastcol = i;
- }
-
- /* If we're looking for the end of the buffer,
- and we didn't find it in the line we scanned,
- use the start of the following line. */
- if (maybe_next_line_p)
- {
- ++row;
- lastcol = 0;
- }
-
- *vpos = row->y;
- *hpos = lastcol + 1;
- return 0;
-}
-
-/* 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 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)
-{
- struct frame *f = XFRAME (w->frame);
- struct tty_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
- struct glyph_row *row;
-
- if (mode_line_p)
- row = MATRIX_MODE_LINE_ROW (w->current_matrix);
- else
- row = MATRIX_HEADER_LINE_ROW (w->current_matrix);
+ if (tty->termscript)
+ fprintf (tty->termscript, "\n<MH+ %d-%d:%d>",
+ kstart, kstart + nglyphs - 1, vpos);
- 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
- /* in case someone implements scroll bars some day... */
- - WINDOW_LEFT_SCROLL_BAR_AREA_WIDTH (w));
- end = glyph + row->used[TEXT_AREA];
- if (glyph < end
- && STRINGP (glyph->object)
- && STRING_INTERVALS (glyph->object)
- && glyph->charpos >= 0
- && glyph->charpos < SCHARS (glyph->object))
+ mouse_off ();
+ IT_set_face (hlinfo->mouse_face_face_id);
+ /* Since we are going to change only the _colors_ of already
+ displayed text, there's no need to go through all the pain of
+ generating and encoding the text from the glyphs. Instead,
+ we simply poke the attribute byte of each affected position
+ in video memory with the colors computed by IT_set_face! */
+ _farsetsel (_dos_ds);
+ while (nglyphs--)
{
- /* If we're on a string with `help-echo' text property,
- arrange for the help to be displayed. This is done by
- setting the global variable help_echo to the help string. */
- help = Fget_text_property (make_number (glyph->charpos),
- Qhelp_echo, glyph->object);
- if (!NILP (help))
- {
- help_echo_string = help;
- XSETWINDOW (help_echo_window, w);
- help_echo_object = glyph->object;
- help_echo_pos = glyph->charpos;
- }
+ _farnspokeb (offset, ScreenAttrib);
+ offset += 2;
}
+ if (screen_virtual_segment)
+ dosv_refresh_virtual_screen (start_offset, end_hpos - start_hpos);
+ mouse_on ();
}
-}
-
-/* Take proper action when the mouse has moved to position X, Y on
- frame F as regards highlighting characters that have mouse-face
- properties. Also de-highlighting chars where the mouse was before.
- X and Y can be negative or out of range. */
-static void
-IT_note_mouse_highlight (struct frame *f, int x, int y)
-{
- struct tty_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
- enum window_part part = ON_NOTHING;
- Lisp_Object window;
- struct window *w;
-
- /* When a menu is active, don't highlight because this looks odd. */
- if (mouse_preempted)
- return;
-
- if (NILP (Vmouse_highlight)
- || !f->glyphs_initialized_p)
- return;
-
- dpyinfo->mouse_face_mouse_x = x;
- dpyinfo->mouse_face_mouse_y = y;
- dpyinfo->mouse_face_mouse_frame = f;
-
- if (dpyinfo->mouse_face_defer)
- return;
-
- if (gc_in_progress)
- {
- dpyinfo->mouse_face_deferred_gc = 1;
- return;
- }
-
- /* Which window is that in? */
- window = window_from_coordinates (f, x, y, &part, &x, &y, 0);
-
- /* If we were displaying active text in another window, clear that. */
- if (! EQ (window, dpyinfo->mouse_face_window))
- clear_mouse_face (dpyinfo);
-
- /* Not on a window -> return. */
- if (!WINDOWP (window))
- return;
-
- /* Convert to window-relative coordinates. */
- w = XWINDOW (window);
-
- if (part == ON_MODE_LINE || part == ON_HEADER_LINE)
- {
- /* Mouse is on the mode or top line. */
- IT_note_mode_line_highlight (w, x, part == ON_MODE_LINE);
- return;
- }
-
- IT_set_mouse_pointer (0);
-
- /* Are we in a window whose display is up to date?
- And verify the buffer's text has not changed. */
- if (part == ON_TEXT
- && EQ (w->window_end_valid, w->buffer)
- && XFASTINT (w->last_modified) == BUF_MODIFF (XBUFFER (w->buffer))
- && (XFASTINT (w->last_overlay_modified)
- == BUF_OVERLAY_MODIFF (XBUFFER (w->buffer))))
+ else if (hl == DRAW_NORMAL_TEXT)
{
- int pos, i, nrows = w->current_matrix->nrows;
- struct glyph_row *row;
- struct glyph *glyph;
+ /* We are removing a previously-drawn mouse highlight. The
+ safest way to do so is to redraw the glyphs anew, since all
+ kinds of faces and display tables could have changed behind
+ our back. */
+ int nglyphs = end_hpos - start_hpos;
+ int save_x = new_pos_X, save_y = new_pos_Y;
+
+ if (end_hpos >= row->used[TEXT_AREA])
+ nglyphs = row->used[TEXT_AREA] - start_hpos;
+
+ /* IT_write_glyphs writes at cursor position, so we need to
+ temporarily move cursor coordinates to the beginning of
+ the highlight region. */
+ new_pos_X = start_hpos + WINDOW_LEFT_EDGE_X (w);
+ new_pos_Y = row->y + WINDOW_TOP_EDGE_Y (w);
- /* Find the glyph under X/Y. */
- glyph = NULL;
- if (y >= 0 && y < nrows)
- {
- row = MATRIX_ROW (w->current_matrix, y);
- /* 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))
- {
- glyph = row->glyphs[TEXT_AREA];
- if (x >= row->used[TEXT_AREA])
- glyph = NULL;
- else
- {
- glyph += x;
- if (!BUFFERP (glyph->object))
- glyph = NULL;
- }
- }
- }
-
- /* Clear mouse face if X/Y not over text. */
- if (glyph == NULL)
- {
- clear_mouse_face (dpyinfo);
- return;
- }
-
- if (!BUFFERP (glyph->object))
- abort ();
- pos = glyph->charpos;
-
- /* Check for mouse-face and help-echo. */
- {
- extern Lisp_Object Qmouse_face;
- Lisp_Object mouse_face, overlay, position, *overlay_vec;
- int noverlays, obegv, ozv;
- struct buffer *obuf;
-
- /* If we get an out-of-range value, return now; avoid an error. */
- if (pos > BUF_Z (XBUFFER (w->buffer)))
- return;
-
- /* Make the window's buffer temporarily current for
- overlays_at and compute_char_face. */
- obuf = current_buffer;
- current_buffer = XBUFFER (w->buffer);
- obegv = BEGV;
- ozv = ZV;
- BEGV = BEG;
- ZV = Z;
-
- /* Is this char mouse-active or does it have help-echo? */
- XSETINT (position, pos);
-
- /* Put all the overlays we want in a vector in overlay_vec. */
- GET_OVERLAYS_AT (pos, overlay_vec, noverlays, NULL, 0);
- /* Sort overlays into increasing priority order. */
- noverlays = sort_overlays (overlay_vec, noverlays, w);
-
- /* Check mouse-face highlighting. */
- if (! (EQ (window, dpyinfo->mouse_face_window)
- && y >= dpyinfo->mouse_face_beg_row
- && y <= dpyinfo->mouse_face_end_row
- && (y > dpyinfo->mouse_face_beg_row
- || x >= dpyinfo->mouse_face_beg_col)
- && (y < dpyinfo->mouse_face_end_row
- || x < dpyinfo->mouse_face_end_col
- || dpyinfo->mouse_face_past_end)))
- {
- /* Clear the display of the old active region, if any. */
- clear_mouse_face (dpyinfo);
-
- /* Find highest priority overlay that has a mouse-face prop. */
- overlay = Qnil;
- for (i = noverlays - 1; i >= 0; --i)
- {
- mouse_face = Foverlay_get (overlay_vec[i], Qmouse_face);
- if (!NILP (mouse_face))
- {
- overlay = overlay_vec[i];
- break;
- }
- }
-
- /* If no overlay applies, get a text property. */
- if (NILP (overlay))
- mouse_face = Fget_text_property (position, Qmouse_face,
- w->buffer);
-
- /* Handle the overlay case. */
- if (! NILP (overlay))
- {
- /* Find the range of text around this char that
- should be active. */
- Lisp_Object before, after;
- EMACS_INT ignore;
-
- before = Foverlay_start (overlay);
- after = Foverlay_end (overlay);
- /* Record this as the current active region. */
- fast_find_position (w, XFASTINT (before),
- &dpyinfo->mouse_face_beg_col,
- &dpyinfo->mouse_face_beg_row);
- dpyinfo->mouse_face_past_end
- = !fast_find_position (w, XFASTINT (after),
- &dpyinfo->mouse_face_end_col,
- &dpyinfo->mouse_face_end_row);
- dpyinfo->mouse_face_window = window;
- dpyinfo->mouse_face_face_id
- = face_at_buffer_position (w, pos, 0, 0,
- &ignore, pos + 1,
- !dpyinfo->mouse_face_hidden,
- -1);
-
- /* Display it as active. */
- show_mouse_face (dpyinfo, 1);
- }
- /* Handle the text property case. */
- else if (! NILP (mouse_face))
- {
- /* Find the range of text around this char that
- should be active. */
- Lisp_Object before, after, beginning, end;
- EMACS_INT ignore;
-
- beginning = Fmarker_position (w->start);
- XSETINT (end, (BUF_Z (XBUFFER (w->buffer))
- - XFASTINT (w->window_end_pos)));
- before
- = Fprevious_single_property_change (make_number (pos + 1),
- Qmouse_face,
- w->buffer, beginning);
- after
- = Fnext_single_property_change (position, Qmouse_face,
- w->buffer, end);
- /* Record this as the current active region. */
- fast_find_position (w, XFASTINT (before),
- &dpyinfo->mouse_face_beg_col,
- &dpyinfo->mouse_face_beg_row);
- dpyinfo->mouse_face_past_end
- = !fast_find_position (w, XFASTINT (after),
- &dpyinfo->mouse_face_end_col,
- &dpyinfo->mouse_face_end_row);
- dpyinfo->mouse_face_window = window;
- dpyinfo->mouse_face_face_id
- = face_at_buffer_position (w, pos, 0, 0,
- &ignore, pos + 1,
- !dpyinfo->mouse_face_hidden,
- -1);
-
- /* Display it as active. */
- show_mouse_face (dpyinfo, 1);
- }
- }
-
- /* Look for a `help-echo' property. */
- {
- Lisp_Object help;
- extern Lisp_Object Qhelp_echo;
-
- /* Check overlays first. */
- help = Qnil;
- for (i = noverlays - 1; i >= 0 && NILP (help); --i)
- {
- overlay = overlay_vec[i];
- help = Foverlay_get (overlay, Qhelp_echo);
- }
-
- if (!NILP (help))
- {
- help_echo_string = help;
- help_echo_window = window;
- help_echo_object = overlay;
- help_echo_pos = pos;
- }
- /* Try text properties. */
- else if (NILP (help)
- && ((STRINGP (glyph->object)
- && glyph->charpos >= 0
- && glyph->charpos < SCHARS (glyph->object))
- || (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_string = help;
- help_echo_window = window;
- help_echo_object = glyph->object;
- help_echo_pos = glyph->charpos;
- }
- }
- }
-
- BEGV = obegv;
- ZV = ozv;
- current_buffer = obuf;
- }
+ if (tty->termscript)
+ fprintf (tty->termscript, "<MH- %d-%d:%d>",
+ new_pos_X, new_pos_X + nglyphs - 1, new_pos_Y);
+ IT_write_glyphs (f, row->glyphs[TEXT_AREA] + start_hpos, nglyphs);
+ if (tty->termscript)
+ fputs ("\n", tty->termscript);
+ new_pos_X = save_x;
+ new_pos_Y = save_y;
}
}
ScreenSetCursor (current_pos_Y, current_pos_X);
cursor_cleared = 0;
if (tty->termscript)
- fprintf (tty->termscript, "\nCURSOR ON");
+ fprintf (tty->termscript, "\nCURSOR ON (%dx%d)",
+ current_pos_Y, current_pos_X);
}
else if (!on && !cursor_cleared)
{
ScreenSetCursor (-1, -1);
cursor_cleared = 1;
if (tty->termscript)
- fprintf (tty->termscript, "\nCURSOR OFF");
+ fprintf (tty->termscript, "\nCURSOR OFF (%dx%d)",
+ current_pos_Y, current_pos_X);
}
}
IT_update_begin (struct frame *f)
{
struct tty_display_info *display_info = FRAME_X_DISPLAY_INFO (f);
- struct frame *mouse_face_frame = display_info->mouse_face_mouse_frame;
+ Mouse_HLInfo *hlinfo = &display_info->mouse_highlight;
+ struct frame *mouse_face_frame = hlinfo->mouse_face_mouse_frame;
if (display_info->termscript)
fprintf (display_info->termscript, "\n\n<UPDATE_BEGIN");
if (f && f == mouse_face_frame)
{
/* Don't do highlighting for mouse motion during the update. */
- display_info->mouse_face_defer = 1;
+ hlinfo->mouse_face_defer = 1;
/* If F needs to be redrawn, simply forget about any prior mouse
highlighting. */
if (FRAME_GARBAGED_P (f))
- display_info->mouse_face_window = Qnil;
+ hlinfo->mouse_face_window = Qnil;
/* 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 none of the enabled rows
contains glyphs highlighted in mouse face. */
- if (!NILP (display_info->mouse_face_window)
- && WINDOWP (display_info->mouse_face_window))
+ if (!NILP (hlinfo->mouse_face_window)
+ && WINDOWP (hlinfo->mouse_face_window))
{
- struct window *w = XWINDOW (display_info->mouse_face_window);
+ struct window *w = XWINDOW (hlinfo->mouse_face_window);
int i;
/* 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;
+ hlinfo->mouse_face_window = Qnil;
else
{
for (i = 0; i < w->desired_matrix->nrows; ++i)
}
if (NILP (w->buffer) || i < w->desired_matrix->nrows)
- clear_mouse_face (display_info);
+ clear_mouse_face (hlinfo);
}
}
else if (mouse_face_frame && !FRAME_LIVE_P (mouse_face_frame))
{
/* If the frame with mouse highlight was deleted, invalidate the
highlight info. */
- display_info->mouse_face_beg_row = display_info->mouse_face_beg_col = -1;
- display_info->mouse_face_end_row = display_info->mouse_face_end_col = -1;
- display_info->mouse_face_window = Qnil;
- display_info->mouse_face_deferred_gc = 0;
- display_info->mouse_face_mouse_frame = NULL;
+ hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1;
+ hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1;
+ hlinfo->mouse_face_window = Qnil;
+ hlinfo->mouse_face_deferred_gc = 0;
+ hlinfo->mouse_face_mouse_frame = NULL;
}
UNBLOCK_INPUT;
if (dpyinfo->termscript)
fprintf (dpyinfo->termscript, "\n<UPDATE_END\n");
- dpyinfo->mouse_face_defer = 0;
+ dpyinfo->mouse_highlight.mouse_face_defer = 0;
}
static void
IT_frame_up_to_date (struct frame *f)
{
- struct tty_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
+ Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
Lisp_Object new_cursor, frame_desired_cursor;
struct window *sw;
- if (dpyinfo->mouse_face_deferred_gc
- || (f && f == dpyinfo->mouse_face_mouse_frame))
+ if (hlinfo->mouse_face_deferred_gc
+ || (f && f == hlinfo->mouse_face_mouse_frame))
{
BLOCK_INPUT;
- if (dpyinfo->mouse_face_mouse_frame)
- IT_note_mouse_highlight (dpyinfo->mouse_face_mouse_frame,
- dpyinfo->mouse_face_mouse_x,
- dpyinfo->mouse_face_mouse_y);
- dpyinfo->mouse_face_deferred_gc = 0;
+ if (hlinfo->mouse_face_mouse_frame)
+ note_mouse_highlight (hlinfo->mouse_face_mouse_frame,
+ hlinfo->mouse_face_mouse_x,
+ hlinfo->mouse_face_mouse_y);
+ hlinfo->mouse_face_deferred_gc = 0;
UNBLOCK_INPUT;
}
/* Insert and delete glyphs. */
static void
-IT_insert_glyphs (f, start, len)
- struct frame *f;
- register struct glyph *start;
- register int len;
+IT_insert_glyphs (struct frame *f, struct glyph *start, int len)
{
int shift_by_width = screen_size_X - (new_pos_X + len);
}
static void
-IT_delete_glyphs (f, n)
- struct frame *f;
- register int n;
+IT_delete_glyphs (struct frame *f, int n)
{
abort ();
}
/* set-window-configuration on window.c needs this. */
void
-x_set_menu_bar_lines (f, value, oldval)
- struct frame *f;
- Lisp_Object value, oldval;
+x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
{
+ extern void set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
+
set_menu_bar_lines (f, value, oldval);
}
already point to the relocated buffer address returned by
the Int 10h/AX=FEh call above. DJGPP v2.02 and later sets
ScreenPrimary to that address at startup under DOS/V. */
- if (regs.x.es != (ScreenPrimary >> 4) & 0xffff)
+ if (regs.x.es != ((ScreenPrimary >> 4) & 0xffff))
screen_old_address = ScreenPrimary;
screen_virtual_segment = regs.x.es;
screen_virtual_offset = regs.x.di;
DEFUN ("msdos-remember-default-colors", Fmsdos_remember_default_colors,
Smsdos_remember_default_colors, 1, 1, 0,
doc: /* Remember the screen colors of the current frame. */)
- (frame)
- Lisp_Object frame;
+ (Lisp_Object frame)
{
struct frame *f;
frame colors are reversed. */
initial_screen_colors[0] = FRAME_FOREGROUND_PIXEL (f);
initial_screen_colors[1] = FRAME_BACKGROUND_PIXEL (f);
+
+ return Qnil;
}
void
-IT_set_frame_parameters (f, alist)
- struct frame *f;
- Lisp_Object alist;
+IT_set_frame_parameters (struct frame *f, Lisp_Object alist)
{
Lisp_Object tail;
int i, j, length = XINT (Flength (alist));
int reverse = EQ (Fcdr (Fassq (Qreverse, f->param_alist)), Qt);
int redraw = 0, fg_set = 0, bg_set = 0;
unsigned long orig_fg, orig_bg;
- Lisp_Object frame_bg, frame_fg;
struct tty_display_info *tty = FRAME_TTY (f);
- extern Lisp_Object Qmenu_bar_lines;
- extern Lisp_Object Vmenu_bar_mode;
- int menu_bar_lines_defined =
- !NILP (Fassq (Qmenu_bar_lines, Vdefault_frame_alist));
/* If we are creating a new frame, begin with the original screen colors
used for the initial frame. */
if (EQ (prop, Qreverse))
reverse = EQ (val, Qt);
- else if (!menu_bar_lines_defined && EQ (prop, Qmenu_bar_lines))
- menu_bar_lines_defined = 1;
}
if (tty->termscript && reverse)
IT_set_cursor_type (f, val);
if (tty->termscript)
fprintf (tty->termscript, "<CTYPE: %s>\n",
- EQ (val, Qbar) || EQ (val, Qhbar)
- || CONSP (val) && (EQ (XCAR (val), Qbar)
- || EQ (XCAR (val), Qhbar))
+ EQ (val, Qbar)
+ || EQ (val, Qhbar)
+ || (CONSP (val) && (EQ (XCAR (val), Qbar)
+ || EQ (XCAR (val), Qhbar)))
? "bar" : "box");
}
else if (EQ (prop, Qtty_type))
store_frame_param (f, prop, val);
}
- /* If menu-bar-lines is neither in the frame parameters nor in
- default-frame-alist, set it according to menu-bar-mode. */
- if (!menu_bar_lines_defined)
- {
- store_frame_param (f, Qmenu_bar_lines,
- NILP (Vmenu_bar_mode)
- ? make_number (0) : make_number (1));
- if (tty->termscript)
- fprintf (tty->termscript, "<MENU BAR LINES DEFAULTED: %d\n",
- !NILP (Vmenu_bar_mode));
- }
-
/* If they specified "reverse", but not the colors, we need to swap
the current frame colors. */
if (reverse)
{
- Lisp_Object frame;
-
if (!fg_set)
{
FRAME_FOREGROUND_PIXEL (f) = orig_bg;
/* Do we need the internal terminal? */
void
-internal_terminal_init ()
+internal_terminal_init (void)
{
static int init_needed = 1;
char *term = getenv ("TERM"), *colors;
if (colors[1] >= 0 && colors[1] < 16)
FRAME_BACKGROUND_PIXEL (SELECTED_FRAME ()) = colors[1];
}
- the_only_display_info.mouse_face_mouse_frame = NULL;
- the_only_display_info.mouse_face_deferred_gc = 0;
- the_only_display_info.mouse_face_beg_row =
- the_only_display_info.mouse_face_beg_col = -1;
- the_only_display_info.mouse_face_end_row =
- the_only_display_info.mouse_face_end_col = -1;
- the_only_display_info.mouse_face_face_id = DEFAULT_FACE_ID;
- the_only_display_info.mouse_face_window = Qnil;
- the_only_display_info.mouse_face_mouse_x =
- the_only_display_info.mouse_face_mouse_y = 0;
- the_only_display_info.mouse_face_defer = 0;
- the_only_display_info.mouse_face_hidden = 0;
+ the_only_display_info.mouse_highlight.mouse_face_mouse_frame = NULL;
+ the_only_display_info.mouse_highlight.mouse_face_deferred_gc = 0;
+ the_only_display_info.mouse_highlight.mouse_face_beg_row =
+ the_only_display_info.mouse_highlight.mouse_face_beg_col = -1;
+ the_only_display_info.mouse_highlight.mouse_face_end_row =
+ the_only_display_info.mouse_highlight.mouse_face_end_col = -1;
+ the_only_display_info.mouse_highlight.mouse_face_face_id = DEFAULT_FACE_ID;
+ the_only_display_info.mouse_highlight.mouse_face_window = Qnil;
+ the_only_display_info.mouse_highlight.mouse_face_mouse_x =
+ the_only_display_info.mouse_highlight.mouse_face_mouse_y = 0;
+ the_only_display_info.mouse_highlight.mouse_face_defer = 0;
+ the_only_display_info.mouse_highlight.mouse_face_hidden = 0;
if (have_mouse) /* detected in dos_ttraw, which see */
{
term->read_socket_hook = &tty_read_avail_input; /* from keyboard.c */
}
-dos_get_saved_screen (screen, rows, cols)
- char **screen;
- int *rows;
- int *cols;
+int
+dos_get_saved_screen (char **screen, int *rows, int *cols)
{
#ifndef HAVE_X_WINDOWS
*screen = startup_screen_buffer;
struct dos_keyboard_map *keyboard_map;
} keyboard_layout_list[] =
{
- 1, &us_keyboard,
- 33, &fr_keyboard,
- 39, &it_keyboard,
- 45, &dk_keyboard,
- 81, &jp_keyboard
+ { 1, &us_keyboard },
+ { 33, &fr_keyboard },
+ { 39, &it_keyboard },
+ { 45, &dk_keyboard },
+ { 81, &jp_keyboard }
};
static struct dos_keyboard_map *keyboard;
static int international_keyboard;
int
-dos_set_keyboard (code, always)
- int code;
- int always;
+dos_set_keyboard (int code, int always)
{
int i;
_go32_dpmi_registers regs;
unsigned char keypad_code; /* keypad code */
unsigned char editkey_code; /* edit key */
} keypad_translate_map[] = {
- '0', '0', 0xb0, /* kp-0 */ 0x63, /* insert */
- '1', '1', 0xb1, /* kp-1 */ 0x57, /* end */
- '2', '2', 0xb2, /* kp-2 */ 0x54, /* down */
- '3', '3', 0xb3, /* kp-3 */ 0x56, /* next */
- '4', '4', 0xb4, /* kp-4 */ 0x51, /* left */
- '5', '5', 0xb5, /* kp-5 */ 0xb5, /* kp-5 */
- '6', '6', 0xb6, /* kp-6 */ 0x53, /* right */
- '7', '7', 0xb7, /* kp-7 */ 0x50, /* home */
- '8', '8', 0xb8, /* kp-8 */ 0x52, /* up */
- '9', '9', 0xb9, /* kp-9 */ 0x55, /* prior */
- '.', '-', 0xae, /* kp-decimal */ 0xff /* delete */
+ { '0', '0', 0xb0, /* kp-0 */ 0x63 /* insert */ },
+ { '1', '1', 0xb1, /* kp-1 */ 0x57 /* end */ },
+ { '2', '2', 0xb2, /* kp-2 */ 0x54 /* down */ },
+ { '3', '3', 0xb3, /* kp-3 */ 0x56 /* next */ },
+ { '4', '4', 0xb4, /* kp-4 */ 0x51 /* left */ },
+ { '5', '5', 0xb5, /* kp-5 */ 0xb5 /* kp-5 */ },
+ { '6', '6', 0xb6, /* kp-6 */ 0x53 /* right */ },
+ { '7', '7', 0xb7, /* kp-7 */ 0x50 /* home */ },
+ { '8', '8', 0xb8, /* kp-8 */ 0x52 /* up */ },
+ { '9', '9', 0xb9, /* kp-9 */ 0x55 /* prior */ },
+ { '.', '-', 0xae, /* kp-decimal */ 0xff /* delete */}
};
static struct
unsigned char char_code; /* normal code */
unsigned char keypad_code; /* keypad code */
} grey_key_translate_map[] = {
- '/', 0xaf, /* kp-decimal */
- '*', 0xaa, /* kp-multiply */
- '-', 0xad, /* kp-subtract */
- '+', 0xab, /* kp-add */
- '\r', 0x8d /* kp-enter */
+ { '/', 0xaf /* kp-decimal */ },
+ { '*', 0xaa /* kp-multiply */ },
+ { '-', 0xad /* kp-subtract */ },
+ { '+', 0xab /* kp-add */ },
+ { '\r', 0x8d /* kp-enter */ }
};
static unsigned short
#define HYPER_P 0x8000 /* pseudo */
static int
-dos_get_modifiers (keymask)
- int *keymask;
+dos_get_modifiers (int *keymask)
{
union REGS regs;
int mask, modifiers = 0;
#define NUM_RECENT_DOSKEYS (100)
int recent_doskeys_index; /* Index for storing next element into recent_doskeys */
int total_doskeys; /* Total number of elements stored into recent_doskeys */
-Lisp_Object recent_doskeys; /* A vector, holding the last 100 keystrokes */
+Lisp_Object recent_doskeys; /* A vector, holding the last 100 keystrokes */
DEFUN ("recent-doskeys", Frecent_doskeys, Srecent_doskeys, 0, 0, 0,
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. */)
- ()
+ (void)
{
Lisp_Object val, *keys = XVECTOR (recent_doskeys)->contents;
else
{
val = Fvector (NUM_RECENT_DOSKEYS, keys);
- bcopy (keys + recent_doskeys_index,
- XVECTOR (val)->contents,
- (NUM_RECENT_DOSKEYS - recent_doskeys_index) * sizeof (Lisp_Object));
- bcopy (keys,
- XVECTOR (val)->contents + NUM_RECENT_DOSKEYS - recent_doskeys_index,
- recent_doskeys_index * sizeof (Lisp_Object));
+ memcpy (XVECTOR (val)->contents, keys + recent_doskeys_index,
+ (NUM_RECENT_DOSKEYS - recent_doskeys_index) * sizeof (Lisp_Object));
+ memcpy (XVECTOR (val)->contents + NUM_RECENT_DOSKEYS - recent_doskeys_index,
+ keys, recent_doskeys_index * sizeof (Lisp_Object));
return val;
}
}
/* Get a char from keyboard. Function keys are put into the event queue. */
static int
-dos_rawgetc ()
+dos_rawgetc (void)
{
struct input_event event;
union REGS regs;
- struct tty_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (SELECTED_FRAME());
+ Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (SELECTED_FRAME());
EVENT_INIT (event);
#ifndef HAVE_X_WINDOWS
break;
}
- make_event:
if (code == 0)
continue;
- if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
+ if (!hlinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
{
- clear_mouse_face (dpyinfo);
- dpyinfo->mouse_face_hidden = 1;
+ clear_mouse_face (hlinfo);
+ hlinfo->mouse_face_hidden = 1;
}
if (code >= 0x100)
might need to update mouse highlight. */
if (mouse_last_x != mouse_prev_x || mouse_last_y != mouse_prev_y)
{
- if (dpyinfo->mouse_face_hidden)
+ if (hlinfo->mouse_face_hidden)
{
- dpyinfo->mouse_face_hidden = 0;
- clear_mouse_face (dpyinfo);
+ hlinfo->mouse_face_hidden = 0;
+ clear_mouse_face (hlinfo);
}
/* Generate SELECT_WINDOW_EVENTs when needed. */
mouse_window = window_from_coordinates (SELECTED_FRAME(),
mouse_last_x,
mouse_last_y,
- 0, 0, 0, 0);
+ 0, 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
previous_help_echo_string = help_echo_string;
help_echo_string = help_echo_object = help_echo_window = Qnil;
help_echo_pos = -1;
- IT_note_mouse_highlight (SELECTED_FRAME(),
- mouse_last_x, mouse_last_y);
+ 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 (!NILP (help_echo_string) || !NILP (previous_help_echo_string))
- {
- event.kind = HELP_EVENT;
- event.frame_or_window = selected_frame;
- event.arg = help_echo_object;
- event.x = WINDOWP (help_echo_window)
- ? help_echo_window : selected_frame;
- event.y = help_echo_string;
- event.timestamp = event_timestamp ();
- event.code = help_echo_pos;
- kbd_buffer_store_event (&event);
- }
+ gen_help_event (help_echo_string, selected_frame, help_echo_window,
+ help_echo_object, help_echo_pos);
}
for (but = 0; but < NUM_MOUSE_BUTTONS; but++)
/* If only one button is pressed, wait 100 msec and
check again. This way, Speedy Gonzales isn't
punished, while the slow get their chance. */
- if (press && mouse_pressed (1-but, &x2, &y2)
- || !press && mouse_released (1-but, &x2, &y2))
+ if ((press && mouse_pressed (1-but, &x2, &y2))
+ || (!press && mouse_released (1-but, &x2, &y2)))
button_num = 2;
else
{
delay (100);
- if (press && mouse_pressed (1-but, &x2, &y2)
- || !press && mouse_released (1-but, &x2, &y2))
+ if ((press && mouse_pressed (1-but, &x2, &y2))
+ || (!press && mouse_released (1-but, &x2, &y2)))
button_num = 2;
}
}
static int prev_get_char = -1;
/* Return 1 if a key is ready to be read without suspending execution. */
-
-dos_keysns ()
+int
+dos_keysns (void)
{
if (prev_get_char != -1)
return 1;
}
/* Read a key. Return -1 if no key is ready. */
-
-dos_keyread ()
+int
+dos_keyread (void)
{
if (prev_get_char != -1)
{
static int menu_help_paneno, menu_help_itemno;
static XMenu *
-IT_menu_create ()
+IT_menu_create (void)
{
XMenu *menu;
/* Report availability of menus. */
int
-have_menus_p () { return 1; }
+have_menus_p (void) { return 1; }
/* Create a brand new menu structure. */
if (0 <= dy && dy < state[i].menu->count)
{
if (!state[i].menu->submenu[dy])
- if (state[i].menu->panenumber[dy])
- result = XM_SUCCESS;
- else
- result = XM_IA_SELECT;
+ {
+ if (state[i].menu->panenumber[dy])
+ result = XM_SUCCESS;
+ else
+ result = XM_IA_SELECT;
+ }
*pane = state[i].pane - 1;
*selidx = dy;
/* We hit some part of a menu, so drop extra menus that
/* Destructively turn backslashes into slashes. */
void
-dostounix_filename (p)
- register char *p;
+dostounix_filename (char *p)
{
msdos_downcase_filename (p);
/* Destructively turn slashes into backslashes. */
void
-unixtodos_filename (p)
- register char *p;
+unixtodos_filename (char *p)
{
if (p[1] == ':' && *p >= 'A' && *p <= 'Z')
{
/* Get the default directory for a given drive. 0=def, 1=A, 2=B, ... */
int
-getdefdir (drive, dst)
- int drive;
- char *dst;
+getdefdir (int drive, char *dst)
{
char in_path[4], *p = in_path, e = errno;
/* Remove all CR's that are followed by a LF. */
int
-crlf_to_lf (n, buf)
- register int n;
- register unsigned char *buf;
+crlf_to_lf (int n, unsigned char *buf)
{
unsigned char *np = buf, *startp = buf, *endp = buf + n;
DEFUN ("msdos-long-file-names", Fmsdos_long_file_names, Smsdos_long_file_names,
0, 0, 0,
doc: /* Return non-nil if long file names are supported on MS-DOS. */)
- ()
+ (void)
{
return (_USE_LFN ? Qt : Qnil);
}
/* Convert alphabetic characters in a filename to lower-case. */
void
-msdos_downcase_filename (p)
- register unsigned char *p;
+msdos_downcase_filename (unsigned char *p)
{
/* Always lower-case drive letters a-z, even if the filesystem
preserves case in filenames.
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 filename)
{
Lisp_Object tem;
static char emacsroot[MAXPATHLEN];
char *
-rootrelativepath (rel)
- char *rel;
+rootrelativepath (char *rel)
{
static char result[MAXPATHLEN + 10];
break if one or more of these are missing. */
void
-init_environment (argc, argv, skip_args)
- int argc;
- char **argv;
- int skip_args;
+init_environment (int argc, char **argv, int skip_args)
{
char *s, *t, *root;
int len, i;
/* If we are called for the initial terminal, it's too early to do
anything, and termscript isn't set up. */
if (tty->terminal->type == output_initial)
- return;
+ return 2;
break_stat = getcbrk ();
setcbrk (0);
/* Restore status of standard input and Ctrl-C checking. */
int
-dos_ttcooked ()
+dos_ttcooked (void)
{
union REGS inregs, outregs;
file TEMPOUT and stderr to TEMPERR. */
int
-run_msdos_command (argv, working_dir, tempin, tempout, temperr, envv)
- unsigned char **argv;
- const char *working_dir;
- int tempin, tempout, temperr;
- char **envv;
+run_msdos_command (unsigned char **argv, const char *working_dir,
+ int tempin, int tempout, int temperr, char **envv)
{
char *saveargv1, *saveargv2, *lowcase_argv0, *pa, *pl;
char oldwd[MAXPATHLEN + 1]; /* Fixed size is safe on MSDOS. */
result = 0; /* emulate Unixy shell behavior with empty cmd line */
}
else
- result = spawnve (P_WAIT, argv[0], argv, envv);
+ result = spawnve (P_WAIT, argv[0], (char **)argv, envv);
dup2 (inbak, 0);
dup2 (outbak, 1);
}
void
-croak (badfunc)
- char *badfunc;
+croak (char *badfunc)
{
fprintf (stderr, "%s not yet implemented\r\n", badfunc);
reset_all_sys_modes ();
/*
* A few unimplemented functions that we silently ignore.
*/
-setpgrp () {return 0; }
-setpriority (x,y,z) int x,y,z; { return 0; }
+int setpgrp (void) {return 0; }
+int setpriority (int x, int y, int z) { return 0; }
\f
#if __DJGPP__ == 2 && __DJGPP_MINOR__ < 2
/* 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)
- int signo;
+sig_suspender (int signo)
{
sigaddset (&msdos_pending_signals, signo);
}
int
-sigprocmask (how, new_set, old_set)
- int how;
- const sigset_t *new_set;
- sigset_t *old_set;
+sigprocmask (int how, const sigset_t *new_set, sigset_t *old_set)
{
int signo;
sigset_t new_mask;
/* We don't have to call timer_check here
because wait_reading_process_output takes care of that. */
int
-sys_select (nfds, rfds, wfds, efds, timeout)
- int nfds;
- SELECT_TYPE *rfds, *wfds, *efds;
- EMACS_TIME *timeout;
+sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
+ EMACS_TIME *timeout)
{
int check_input;
struct time t;
#ifdef chdir
#undef chdir
-extern int chdir ();
+extern int chdir (const char *);
int
-sys_chdir (path)
- const char* path;
+sys_chdir (const char *path)
{
int len = strlen (path);
char *tmp = (char *)path;
extern void tzset (void);
void
-init_gettimeofday ()
+init_gettimeofday (void)
{
time_t ltm, gtm;
struct tm *lstm;
#ifdef abort
#undef abort
void
-dos_abort (file, line)
- char *file;
- int line;
+dos_abort (char *file, int line)
{
char buffer1[200], buffer2[400];
int i, j;
}
#else
void
-abort ()
+abort (void)
{
dos_ttcooked ();
ScreenSetCursor (10, 0);
}
#endif
-/* The following variables are required so that cus-start.el won't
- complain about unbound variables. */
-#ifndef subprocesses
-/* Nonzero means delete a process right away if it exits (process.c). */
-static int delete_exited_processes;
-#endif
-
-syms_of_msdos ()
+void
+syms_of_msdos (void)
{
recent_doskeys = Fmake_vector (make_number (NUM_RECENT_DOSKEYS), Qnil);
staticpro (&recent_doskeys);
#ifndef HAVE_X_WINDOWS
/* The following two are from xfns.c: */
- Qreverse = intern ("reverse");
+ Qreverse = intern_c_string ("reverse");
staticpro (&Qreverse);
DEFVAR_LISP ("dos-unsupported-char-glyph", &Vdos_unsupported_char_glyph,
This variable is used only by MS-DOS terminals. */);
Vdos_unsupported_char_glyph = make_number ('\177');
-#endif
-#ifndef subprocesses
- DEFVAR_BOOL ("delete-exited-processes", &delete_exited_processes,
- doc: /* *Non-nil means delete processes immediately when they exit.
-A value of nil means don't delete them until `list-processes' is run. */);
- delete_exited_processes = 0;
#endif
defsubr (&Srecent_doskeys);
HCoop / bpt / emacs.git / blobdiff