X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/d2a0a50628933d3cdb09818eee2e17f55e22531f..23f86fce48e1cc8118f0ea5cce49d1acfd4364c4:/src/msdos.c
diff --git a/src/msdos.c b/src/msdos.c
index 3f12bc85cb..64fc671fa4 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1,6 +1,6 @@
/* MS-DOS specific C utilities. -*- coding: raw-text -*-
-Copyright (C) 1993-1997, 1999-2011 Free Software Foundation, Inc.
+Copyright (C) 1993-1997, 1999-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -31,7 +31,13 @@ along with GNU Emacs. If not, see . */
#include
#include
#include
+/* gettime and settime in dos.h clash with their namesakes from
+ gnulib, so we move out of our way the prototypes in dos.h. */
+#define gettime dos_h_gettime_
+#define settime dos_h_settime_
#include
+#undef gettime
+#undef settime
#include
#include /* for _fixpath */
#include /* for chdir, dup, dup2, etc. */
@@ -103,18 +109,18 @@ int _crt0_startup_flags = (_CRT0_FLAG_UNIX_SBRK | _CRT0_FLAG_FILL_SBRK_MEMORY);
#endif /* not SYSTEM_MALLOC */
+/* Return the current timestamp in milliseconds since midnight. */
static unsigned long
event_timestamp (void)
{
- struct time t;
+ struct timespec t;
unsigned long s;
gettime (&t);
- s = t.ti_min;
- s *= 60;
- s += t.ti_sec;
+ s = t.tv_sec;
+ s %= 86400;
s *= 1000;
- s += t.ti_hund * 10;
+ s += t.tv_nsec * 1000000;
return s;
}
@@ -296,7 +302,7 @@ mouse_get_pos (FRAME_PTR *f, int insist, Lisp_Object *bar_window,
FOR_EACH_FRAME (tail, frame)
XFRAME (frame)->mouse_moved = 0;
- *f = SELECTED_FRAME();
+ *f = SELECTED_FRAME ();
*bar_window = Qnil;
mouse_get_xy (&ix, &iy);
*time = event_timestamp ();
@@ -310,7 +316,7 @@ mouse_check_moved (void)
int x, y;
mouse_get_xy (&x, &y);
- SELECTED_FRAME()->mouse_moved |= (x != mouse_last_x || y != mouse_last_y);
+ SELECTED_FRAME ()->mouse_moved |= (x != mouse_last_x || y != mouse_last_y);
mouse_last_x = x;
mouse_last_y = y;
}
@@ -582,7 +588,7 @@ dos_set_window_size (int *rows, int *cols)
/* If the dimensions changed, the mouse highlight info is invalid. */
if (current_rows != *rows || current_cols != *cols)
{
- struct frame *f = SELECTED_FRAME();
+ struct frame *f = SELECTED_FRAME ();
Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
Lisp_Object window = hlinfo->mouse_face_window;
@@ -639,7 +645,7 @@ msdos_set_cursor_shape (struct frame *f, int start_line, int width)
/* 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())
+ if (f && f != SELECTED_FRAME ())
return;
if (tty->termscript)
@@ -776,7 +782,7 @@ IT_ring_bell (struct frame *f)
static void
IT_set_face (int face)
{
- struct frame *sf = SELECTED_FRAME();
+ struct frame *sf = SELECTED_FRAME ();
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;
@@ -868,7 +874,7 @@ IT_write_glyphs (struct frame *f, struct glyph *str, int str_len)
if (str_len <= 0) return;
- sf = SELECTED_FRAME();
+ sf = SELECTED_FRAME ();
/* Since faces get cached and uncached behind our back, we can't
rely on their indices in the cache being consistent across
@@ -1342,7 +1348,7 @@ static void
IT_copy_glyphs (int xfrom, int xto, size_t len, int ypos)
{
/* The offsets of source and destination relative to the
- conventional memorty selector. */
+ conventional memory selector. */
int from = 2 * (xfrom + screen_size_X * ypos) + ScreenPrimary;
int to = 2 * (xto + screen_size_X * ypos) + ScreenPrimary;
@@ -1558,7 +1564,7 @@ IT_set_terminal_window (struct frame *f, int foo)
{
}
-/* Remember the screen colors of the curent frame, to serve as the
+/* Remember the screen colors of the current frame, to serve as the
default colors for newly-created frames. */
DEFUN ("msdos-remember-default-colors", Fmsdos_remember_default_colors,
Smsdos_remember_default_colors, 1, 1, 0,
@@ -1755,7 +1761,7 @@ IT_set_frame_parameters (struct frame *f, Lisp_Object alist)
if (redraw)
{
face_change_count++; /* forces xdisp.c to recompute basic faces */
- if (f == SELECTED_FRAME())
+ if (f == SELECTED_FRAME ())
redraw_frame (f);
}
}
@@ -1772,7 +1778,7 @@ internal_terminal_init (void)
{
static int init_needed = 1;
char *term = getenv ("TERM"), *colors;
- struct frame *sf = SELECTED_FRAME();
+ struct frame *sf = SELECTED_FRAME ();
struct tty_display_info *tty;
#ifdef HAVE_X_WINDOWS
@@ -1813,7 +1819,7 @@ internal_terminal_init (void)
}
Vinitial_window_system = Qpc;
- Vwindow_system_version = make_number (23); /* RE Emacs version */
+ Vwindow_system_version = make_number (24); /* RE Emacs version */
tty->terminal->type = output_msdos_raw;
/* If Emacs was dumped on DOS/V machine, forget the stale VRAM
@@ -1923,7 +1929,7 @@ dos_get_saved_screen (char **screen, int *rows, int *cols)
void
check_x (void)
{
- if (! FRAME_MSDOS_P (SELECTED_FRAME()))
+ if (! FRAME_MSDOS_P (SELECTED_FRAME ()))
error ("Not running under a window system");
}
@@ -2442,12 +2448,12 @@ dos_rawgetc (void)
{
struct input_event event;
union REGS regs;
- Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (SELECTED_FRAME());
+ Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (SELECTED_FRAME ());
EVENT_INIT (event);
#ifndef HAVE_X_WINDOWS
/* Maybe put the cursor where it should be. */
- IT_cmgoto (SELECTED_FRAME());
+ IT_cmgoto (SELECTED_FRAME ());
#endif
/* The following condition is equivalent to `kbhit ()', except that
@@ -2466,12 +2472,12 @@ dos_rawgetc (void)
sc = regs.h.ah;
total_doskeys += 2;
- XVECTOR (recent_doskeys)->contents[recent_doskeys_index++]
- = make_number (c);
+ ASET (recent_doskeys, recent_doskeys_index, make_number (c));
+ recent_doskeys_index++;
if (recent_doskeys_index == NUM_RECENT_DOSKEYS)
recent_doskeys_index = 0;
- XVECTOR (recent_doskeys)->contents[recent_doskeys_index++]
- = make_number (sc);
+ ASET (recent_doskeys, recent_doskeys_index, make_number (sc));
+ recent_doskeys_index++;
if (recent_doskeys_index == NUM_RECENT_DOSKEYS)
recent_doskeys_index = 0;
@@ -2692,7 +2698,7 @@ dos_rawgetc (void)
/* Generate SELECT_WINDOW_EVENTs when needed. */
if (!NILP (Vmouse_autoselect_window))
{
- mouse_window = window_from_coordinates (SELECTED_FRAME(),
+ mouse_window = window_from_coordinates (SELECTED_FRAME (),
mouse_last_x,
mouse_last_y,
0, 0);
@@ -2718,7 +2724,7 @@ dos_rawgetc (void)
previous_help_echo_string = help_echo_string;
help_echo_string = help_echo_object = help_echo_window = Qnil;
help_echo_pos = -1;
- 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))
@@ -2822,7 +2828,7 @@ IT_menu_create (void)
{
XMenu *menu;
- menu = (XMenu *) xmalloc (sizeof (XMenu));
+ menu = xmalloc (sizeof (XMenu));
menu->allocated = menu->count = menu->panecount = menu->width = 0;
return menu;
}
@@ -2836,10 +2842,10 @@ IT_menu_make_room (XMenu *menu)
if (menu->allocated == 0)
{
int count = menu->allocated = 10;
- menu->text = (char **) xmalloc (count * sizeof (char *));
- menu->submenu = (XMenu **) xmalloc (count * sizeof (XMenu *));
- menu->panenumber = (int *) xmalloc (count * sizeof (int));
- menu->help_text = (const char **) xmalloc (count * sizeof (char *));
+ menu->text = xmalloc (count * sizeof (char *));
+ menu->submenu = xmalloc (count * sizeof (XMenu *));
+ menu->panenumber = xmalloc (count * sizeof (int));
+ menu->help_text = xmalloc (count * sizeof (char *));
}
else if (menu->allocated == menu->count)
{
@@ -2913,14 +2919,14 @@ IT_menu_display (XMenu *menu, int y, int x, int pn, int *faces, int disp_help)
int i, j, face, width, mx, my, enabled, mousehere, row, col;
struct glyph *text, *p;
const unsigned char *q;
- struct frame *sf = SELECTED_FRAME();
+ struct frame *sf = SELECTED_FRAME ();
menu_help_message = NULL;
width = menu->width;
/* We multiply width by 2 to account for possible control characters.
FIXME: cater to non-ASCII characters in menus. */
- text = (struct glyph *) xmalloc ((width * 2 + 2) * sizeof (struct glyph));
+ text = xmalloc ((width * 2 + 2) * sizeof (struct glyph));
ScreenGetCursor (&row, &col);
mouse_get_xy (&mx, &my);
IT_update_begin (sf);
@@ -3092,7 +3098,7 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx,
int statecount, x, y, i, b, screensize, leave, result, onepane;
int title_faces[4]; /* face to display the menu title */
int faces[4], buffers_num_deleted = 0;
- struct frame *sf = SELECTED_FRAME();
+ struct frame *sf = SELECTED_FRAME ();
Lisp_Object saved_echo_area_message, selectface;
/* Just in case we got here without a mouse present... */
@@ -3539,10 +3545,10 @@ init_environment (int argc, char **argv, int skip_args)
/* Some lusers set TMPDIR=e:, probably because some losing
programs cannot handle multiple slashes if they use e:/.
e: fails in `access' below, so we interpret e: as e:/. */
- tmp_len = strlen(tmp);
+ tmp_len = strlen (tmp);
if (tmp[tmp_len - 1] != '/' && tmp[tmp_len - 1] != '\\')
{
- strcpy(buf, tmp);
+ strcpy (buf, tmp);
buf[tmp_len++] = '/', buf[tmp_len] = 0;
tmp = buf;
}
@@ -4072,13 +4078,6 @@ sigprocmask (int how, const sigset_t *new_set, sigset_t *old_set)
#ifndef HAVE_SELECT
#include "sysselect.h"
-#ifndef EMACS_TIME_ZERO_OR_NEG_P
-#define EMACS_TIME_ZERO_OR_NEG_P(time) \
- ((long)(time).tv_sec < 0 \
- || ((time).tv_sec == 0 \
- && (long)(time).tv_usec <= 0))
-#endif
-
/* This yields the rest of the current time slice to the task manager.
It should be called by any code which knows that it has nothing
useful to do except idle.
@@ -4104,10 +4103,10 @@ dos_yield_time_slice (void)
because wait_reading_process_output takes care of that. */
int
sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
- EMACS_TIME *timeout)
+ EMACS_TIME *timeout, void *ignored)
{
int check_input;
- struct time t;
+ struct timespec t;
check_input = 0;
if (rfds)
@@ -4137,22 +4136,17 @@ sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
EMACS_TIME clnow, cllast, cldiff;
gettime (&t);
- EMACS_SET_SECS_USECS (cllast, t.ti_sec, t.ti_hund * 10000L);
+ EMACS_SET_SECS_NSECS (cllast, t.tv_sec, t.tv_nsec);
while (!check_input || !detect_input_pending ())
{
gettime (&t);
- EMACS_SET_SECS_USECS (clnow, t.ti_sec, t.ti_hund * 10000L);
+ EMACS_SET_SECS_NSECS (clnow, t.tv_sec, t.tv_nsec);
EMACS_SUB_TIME (cldiff, clnow, cllast);
-
- /* When seconds wrap around, we assume that no more than
- 1 minute passed since last `gettime'. */
- if (EMACS_TIME_NEG_P (cldiff))
- EMACS_SET_SECS (cldiff, EMACS_SECS (cldiff) + 60);
EMACS_SUB_TIME (*timeout, *timeout, cldiff);
/* Stop when timeout value crosses zero. */
- if (EMACS_TIME_ZERO_OR_NEG_P (*timeout))
+ if (EMACS_TIME_SIGN (*timeout) <= 0)
return 0;
cllast = clnow;
dos_yield_time_slice ();
@@ -4270,7 +4264,7 @@ syms_of_msdos (void)
DEFSYM (Qreverse, "reverse");
DEFVAR_LISP ("dos-unsupported-char-glyph", Vdos_unsupported_char_glyph,
- doc: /* *Glyph to display instead of chars not supported by current codepage.
+ doc: /* Glyph to display instead of chars not supported by current codepage.
This variable is used only by MS-DOS terminals. */);
Vdos_unsupported_char_glyph = make_number ('\177');