mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-27 07:41:28 -08:00
* Makefile.in (emacs): Set the LC_ALL environment variable to "C" when dumping, so that the dumped Emacs doesn't have stray locale info. (dired.o): Depend on systime.h. (editfns.o): Depend on coding.h. * alloc.c, buffer.c, callproc.c, ccl.c, charset.c, coding.c, data.c, dispnew.c, editfns.c, emacs.c, filelock.c, floatfns.c, hftctl.c, keyboard.c, process.c, sysdep.c, unexelf.c, unexhp9k800.c, unexsunos4.c, vmsfns.c, vmsgmalloc.c, w32faces.c, w32menu.c, w32term.c, w32xfns.c, xfaces.c, xfns.c, xmenu.c, xterm.c: Include <config.h> before any system include files. * alloc.c, buffer.c, ccl.c, data.c, editfns.c, emacs.c, eval.c, fileio.c, filelock.c, frame.c, insdel.c, keymap.c, lread.c, m/alpha.h, print.c, search.c, sysdep.c, xdisp.c, xfaces.c, xfns.c, xmenu.c, xterm.c: Do not include <stdlib.h>, as <config.h> does this now. * callproc.c (Fcall_process): Synchronize messages locale before invoking strerror. Decode resulting string with locale-coding-system. * coding.c (Vlocale_coding_system): New var. (syms_of_coding): Adjust to above change. (emacs_strerror): New function. * coding.h (emacs_strerror, Vlocale_coding_system): New decls. * config.in (HAVE_STDIO_EXT_H, HAVE_TM_GMTOFF, HAVE___FPENDING, HAVE_FTELLO, HAVE_GETLOADAVG, HAVE_MBLEN, HAVE_MBRLEN, HAVE_STRSIGNAL): New macros. (BITS_PER_LONG): Default to 64 if _LP64 is defined. <stdlib.h>: Include if HAVE_STDLIB_H is defined and NOT_C_CODE isn't. * dired.c: Include "systime.h". (Ffile_attributes): Do not cast s.st_size to int; this loses information if int is 32 bits but st_size and EMACS_INT are larger. Treat large device numbers like large inode numbers. * dispnew.c (PENDING_OUTPUT_COUNT): Use __fpending if available. * editfns.c: Include coding.h. (emacs_strftime): Remove decl. (emacs_strftimeu): New decl. (emacs_memftimeu): Renamed from emacs_memftime; new arg UT. Use emacs_strftimeu instead of emacs_strftime. (Fformat_time_string): Convert format string using Vlocale_coding_system, and convert result back. Synchronize time locale before invoking lower level function. Invoke emacs_memftimeu, passing ut, instead of emacs_memftime. * emacs.c: Include <locale.h> if HAVE_SETLOCALE is defined. (Vmessages_locale, Vprevious_messages_locale, Vtime_locale, Vprevious_time_locale): New variables. (main): Invoke setlocale early, so that initial error messages are localized properly. But skip locale-setting if LC_ALL is "C". Fix up locale when it's safe to do so. (fixup_locale): Moved here from xterm.c. (synchronize_locale, synchronize_time_locale, synchronize_messages_locale): New functions. (syms_of_emacs): Accommodate above changes. * fileio.c (report_file_error): Convert strerror output according to Vlocale_coding_system. (Finsert_file_contents): Check for arithmetic overflow in computations that depend on file size. Report IO errors with emacs_strerror, not strerror. * fns.c (Fgethash): Declare dflt parameter. * gmalloc.c: Do not define const to nothing if HAVE_CONFIG_H is defined; that's config.h's job. * lisp.h (EMACS_INT, BITS_PER_EMACS_INT, EMACS_UINT): If _LP64, default these values to long, BITS_PER_LONG, and unsigned long. (VALBITS, MARKBIT, XINT): Do not assume 32-bit EMACS_INT. (PNTR_COMPARISON_TYPE): Default to EMACS_UINT, not to unsigned int. (code_convert_string_norecord, fixup_locale, synchronize_messages_locale, synchronize_time_locale, emacs_open, emacs_close, emacs_read, emacs_write): New decls. All Emacs callers of open, close, read, write changed to use emacs_open, emacs_close, emacs_read, emacs_write. * lread.c (file_offset, file_tell): New macros. All uses of ftell changed to file_tell. (saved_doc_string_position, prev_saved_doc_string_position): Now of type file_offset. (init_lread): Do not fix locale here; fixup_locale now does this. * m/amdahl.h, s/usg5-4.h: (NSIG): Remove. (NSIG_MINIMUM): New macro. * m/cydra5.h, m/dpx2.h, m/mips.h, m/pfa50.h, m/sps7.h, m/stride.h, m/ustation.h, s/gnu-linux.h, s/hpux.h, s/iris3-5.h, s/iris3-6.h, s/umips.h, s/usg5-4.h: (SIGIO): Do not undef. (BROKEN_SIGIO): New macro. * m/ustation.h: (SIGTSTP): Do not undef. (BROKEN_SIGTSTP): New macro. * s/gnu-linux.h: (SIGPOLL, SIGURG): Do not undef. (BROKEN_SIGPOLL, BROKEN_SIGURG): New macros. * s/ptx4.h: (SIGINFO): Do not undef. (BROKEN_SIGINFO): New macros. * m/delta.h, s/ptx.h, s/template.h: Doc fix. * mktime.c, strftime.c: Update to glibc 2.1.2 version, with some Emacs-related changes merged. * print.c (float_to_string): Prepend "-" to representation of a NaN if the NaN is negative. * process.c (sys_siglist): Omit if HAVE_STRSIGNAL. (wait_reading_process_input): Use emacs_strerror, not strerror. * process.c (status_message, sigchld_handler): Synchronize locale, then use strsignal istead of sys_siglist. * w32proc.c (sys_wait): Likewise. * s/aix3-1.h, s/bsd4-1.h, s/dgux.h, s/gnu-linux.h, s/hiuxmpp.h, s/hpux.h, s/iris3-5.h, s/iris3-6.h, s/irix3-3.h, s/osf1.h, s/rtu.h, s/sunos4-1.h, s/unipl5-0.h, s/unipl5-2.h, s/usg5-0.h, s/usg5-2-2.h, s/usg5-2.h, s/usg5-3.h, s/xenix.h: (open, close, read, write, INTERRUPTIBLE_OPEN, INTERRUPTIBLE_CLOSE, INTERRUPTIBLE_IO): Remove. * s/sol2-5.h (_LARGEFILE_SOURCE, _FILE_OFFSET_BITS): New macros. * sysdep.c (sys_read, sys_write, read, write, sys_close, close, sys_open, open): Remove. (emacs_open, emacs_close, emacs_read, emacs_write): Always define; the old INTERRUPTIBLE_OPEN, INTERRUPTIBLE_CLOSE, and INTERRUPTIBLE_IO macros are no longer used. (emacs_open): Renamed from sys_open. Merge BSD4_1 version. (emacs_close): Renamed from sys_close. (emacs_read): Renamed from sys_read. (emacs_write): Renamed from sys_write. (sys_siglist): Do not declare if HAVE_STRSIGNAL. (dup2): Do not print error on failure; the real dup2 doesn't. (strsignal): New function, defined if !HAVE_STRSIGNAL. * syssignal.h (SIGINFO): Undef if defined and if BROKEN_SIGINFO is defined. (SIGIO, SIGPOLL, SIGTSTP, SIGURG): Likewise. (NSIG): If less than NSIG_MINIMUM, define to NSIG_MINIMUM. (strsignal): Declare if !HAVE_STRSIGNAL. * unexelf.c (ElfBitsW, ELFSIZE, ElfExpandBitsW): New macros. (ElfW): Define in terms of ElfExpandBitsW. * w32proc.c (sys_siglist): Remove decl. * xdisp.c (decode_mode_spec): 3rd arg is int, not char, to comply with ANSI C. (display_string): Declare face_string_pos arg. * xfns.c (Fx_show_tip): Declare timeout param. * xterm.c: No need to include locale.h. (x_alloc_lighter_color, x_setup_relief_color): Pass arg as double, not float, for compatibility with ANSI C. (fixup_locale): Move to emacs.c. (x_term_init): Do not setlocale or fixup locale; the main program does this now.
395 lines
8.2 KiB
C
395 lines
8.2 KiB
C
/* Functions taken directly from X sources for use with the Microsoft W32 API.
|
|
Copyright (C) 1989, 1992, 1993, 1994, 1995, 1999 Free Software Foundation.
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
GNU Emacs is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Emacs is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Emacs; see the file COPYING. If not, write to
|
|
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <config.h>
|
|
#include <signal.h>
|
|
#include <stdio.h>
|
|
#include "lisp.h"
|
|
#include "frame.h"
|
|
#include "charset.h"
|
|
#include "fontset.h"
|
|
#include "blockinput.h"
|
|
#include "w32term.h"
|
|
#include "windowsx.h"
|
|
|
|
#define myalloc(cb) GlobalAllocPtr (GPTR, cb)
|
|
#define myfree(lp) GlobalFreePtr (lp)
|
|
|
|
CRITICAL_SECTION critsect;
|
|
extern HANDLE keyboard_handle;
|
|
HANDLE input_available = NULL;
|
|
HANDLE interrupt_handle = NULL;
|
|
|
|
void
|
|
init_crit ()
|
|
{
|
|
InitializeCriticalSection (&critsect);
|
|
|
|
/* For safety, input_available should only be reset by get_next_msg
|
|
when the input queue is empty, so make it a manual reset event. */
|
|
keyboard_handle = input_available = CreateEvent (NULL, TRUE, FALSE, NULL);
|
|
|
|
/* interrupt_handle is signalled when quit (C-g) is detected, so that
|
|
blocking system calls can be interrupted. We make it a manual
|
|
reset event, so that if we should ever have multiple threads
|
|
performing system calls, they will all be interrupted (I'm guessing
|
|
that would the right response). Note that we use PulseEvent to
|
|
signal this event, so that it never remains signalled. */
|
|
interrupt_handle = CreateEvent (NULL, TRUE, FALSE, NULL);
|
|
}
|
|
|
|
void
|
|
delete_crit ()
|
|
{
|
|
DeleteCriticalSection (&critsect);
|
|
|
|
if (input_available)
|
|
{
|
|
CloseHandle (input_available);
|
|
input_available = NULL;
|
|
}
|
|
if (interrupt_handle)
|
|
{
|
|
CloseHandle (interrupt_handle);
|
|
interrupt_handle = NULL;
|
|
}
|
|
}
|
|
|
|
void
|
|
signal_quit ()
|
|
{
|
|
/* Make sure this event never remains signalled; if the main thread
|
|
isn't in a blocking call, then this should do nothing. */
|
|
PulseEvent (interrupt_handle);
|
|
}
|
|
|
|
void
|
|
select_palette (FRAME_PTR f, HDC hdc)
|
|
{
|
|
if (!NILP (Vw32_enable_palette))
|
|
f->output_data.w32->old_palette =
|
|
SelectPalette (hdc, one_w32_display_info.palette, FALSE);
|
|
else
|
|
f->output_data.w32->old_palette = NULL;
|
|
|
|
if (RealizePalette (hdc))
|
|
{
|
|
Lisp_Object frame, framelist;
|
|
FOR_EACH_FRAME (framelist, frame)
|
|
{
|
|
SET_FRAME_GARBAGED (XFRAME (frame));
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
deselect_palette (FRAME_PTR f, HDC hdc)
|
|
{
|
|
if (f->output_data.w32->old_palette)
|
|
SelectPalette (hdc, f->output_data.w32->old_palette, FALSE);
|
|
}
|
|
|
|
/* Get a DC for frame and select palette for drawing; force an update of
|
|
all frames if palette's mapping changes. */
|
|
HDC
|
|
get_frame_dc (FRAME_PTR f)
|
|
{
|
|
HDC hdc;
|
|
|
|
enter_crit ();
|
|
|
|
hdc = GetDC (f->output_data.w32->window_desc);
|
|
select_palette (f, hdc);
|
|
|
|
return hdc;
|
|
}
|
|
|
|
int
|
|
release_frame_dc (FRAME_PTR f, HDC hdc)
|
|
{
|
|
int ret;
|
|
|
|
deselect_palette (f, hdc);
|
|
ret = ReleaseDC (f->output_data.w32->window_desc, hdc);
|
|
|
|
leave_crit ();
|
|
|
|
return ret;
|
|
}
|
|
|
|
typedef struct int_msg
|
|
{
|
|
W32Msg w32msg;
|
|
struct int_msg *lpNext;
|
|
} int_msg;
|
|
|
|
int_msg *lpHead = NULL;
|
|
int_msg *lpTail = NULL;
|
|
int nQueue = 0;
|
|
|
|
BOOL
|
|
get_next_msg (lpmsg, bWait)
|
|
W32Msg * lpmsg;
|
|
BOOL bWait;
|
|
{
|
|
BOOL bRet = FALSE;
|
|
|
|
enter_crit ();
|
|
|
|
/* The while loop takes care of multiple sets */
|
|
|
|
while (!nQueue && bWait)
|
|
{
|
|
leave_crit ();
|
|
WaitForSingleObject (input_available, INFINITE);
|
|
enter_crit ();
|
|
}
|
|
|
|
if (nQueue)
|
|
{
|
|
bcopy (&(lpHead->w32msg), lpmsg, sizeof (W32Msg));
|
|
|
|
{
|
|
int_msg * lpCur = lpHead;
|
|
|
|
lpHead = lpHead->lpNext;
|
|
|
|
myfree (lpCur);
|
|
}
|
|
|
|
nQueue--;
|
|
|
|
bRet = TRUE;
|
|
}
|
|
|
|
if (nQueue == 0)
|
|
ResetEvent (input_available);
|
|
|
|
leave_crit ();
|
|
|
|
return (bRet);
|
|
}
|
|
|
|
BOOL
|
|
post_msg (lpmsg)
|
|
W32Msg * lpmsg;
|
|
{
|
|
int_msg * lpNew = (int_msg *) myalloc (sizeof (int_msg));
|
|
|
|
if (!lpNew)
|
|
return (FALSE);
|
|
|
|
bcopy (lpmsg, &(lpNew->w32msg), sizeof (W32Msg));
|
|
lpNew->lpNext = NULL;
|
|
|
|
enter_crit ();
|
|
|
|
if (nQueue++)
|
|
{
|
|
lpTail->lpNext = lpNew;
|
|
}
|
|
else
|
|
{
|
|
lpHead = lpNew;
|
|
}
|
|
|
|
lpTail = lpNew;
|
|
SetEvent (input_available);
|
|
|
|
leave_crit ();
|
|
|
|
return (TRUE);
|
|
}
|
|
|
|
BOOL
|
|
prepend_msg (W32Msg *lpmsg)
|
|
{
|
|
int_msg * lpNew = (int_msg *) myalloc (sizeof (int_msg));
|
|
|
|
if (!lpNew)
|
|
return (FALSE);
|
|
|
|
bcopy (lpmsg, &(lpNew->w32msg), sizeof (W32Msg));
|
|
|
|
enter_crit ();
|
|
|
|
nQueue++;
|
|
lpNew->lpNext = lpHead;
|
|
lpHead = lpNew;
|
|
|
|
leave_crit ();
|
|
|
|
return (TRUE);
|
|
}
|
|
|
|
/* Process all messages in the current thread's queue. */
|
|
void
|
|
drain_message_queue ()
|
|
{
|
|
MSG msg;
|
|
while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
|
|
{
|
|
TranslateMessage (&msg);
|
|
DispatchMessage (&msg);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
* XParseGeometry parses strings of the form
|
|
* "=<width>x<height>{+-}<xoffset>{+-}<yoffset>", where
|
|
* width, height, xoffset, and yoffset are unsigned integers.
|
|
* Example: "=80x24+300-49"
|
|
* The equal sign is optional.
|
|
* It returns a bitmask that indicates which of the four values
|
|
* were actually found in the string. For each value found,
|
|
* the corresponding argument is updated; for each value
|
|
* not found, the corresponding argument is left unchanged.
|
|
*/
|
|
|
|
static int
|
|
read_integer (string, NextString)
|
|
register char *string;
|
|
char **NextString;
|
|
{
|
|
register int Result = 0;
|
|
int Sign = 1;
|
|
|
|
if (*string == '+')
|
|
string++;
|
|
else if (*string == '-')
|
|
{
|
|
string++;
|
|
Sign = -1;
|
|
}
|
|
for (; (*string >= '0') && (*string <= '9'); string++)
|
|
{
|
|
Result = (Result * 10) + (*string - '0');
|
|
}
|
|
*NextString = string;
|
|
if (Sign >= 0)
|
|
return (Result);
|
|
else
|
|
return (-Result);
|
|
}
|
|
|
|
int
|
|
XParseGeometry (string, x, y, width, height)
|
|
char *string;
|
|
int *x, *y;
|
|
unsigned int *width, *height; /* RETURN */
|
|
{
|
|
int mask = NoValue;
|
|
register char *strind;
|
|
unsigned int tempWidth, tempHeight;
|
|
int tempX, tempY;
|
|
char *nextCharacter;
|
|
|
|
if ((string == NULL) || (*string == '\0')) return (mask);
|
|
if (*string == '=')
|
|
string++; /* ignore possible '=' at beg of geometry spec */
|
|
|
|
strind = (char *)string;
|
|
if (*strind != '+' && *strind != '-' && *strind != 'x')
|
|
{
|
|
tempWidth = read_integer (strind, &nextCharacter);
|
|
if (strind == nextCharacter)
|
|
return (0);
|
|
strind = nextCharacter;
|
|
mask |= WidthValue;
|
|
}
|
|
|
|
if (*strind == 'x' || *strind == 'X')
|
|
{
|
|
strind++;
|
|
tempHeight = read_integer (strind, &nextCharacter);
|
|
if (strind == nextCharacter)
|
|
return (0);
|
|
strind = nextCharacter;
|
|
mask |= HeightValue;
|
|
}
|
|
|
|
if ((*strind == '+') || (*strind == '-'))
|
|
{
|
|
if (*strind == '-')
|
|
{
|
|
strind++;
|
|
tempX = -read_integer (strind, &nextCharacter);
|
|
if (strind == nextCharacter)
|
|
return (0);
|
|
strind = nextCharacter;
|
|
mask |= XNegative;
|
|
|
|
}
|
|
else
|
|
{
|
|
strind++;
|
|
tempX = read_integer (strind, &nextCharacter);
|
|
if (strind == nextCharacter)
|
|
return (0);
|
|
strind = nextCharacter;
|
|
}
|
|
mask |= XValue;
|
|
if ((*strind == '+') || (*strind == '-'))
|
|
{
|
|
if (*strind == '-')
|
|
{
|
|
strind++;
|
|
tempY = -read_integer (strind, &nextCharacter);
|
|
if (strind == nextCharacter)
|
|
return (0);
|
|
strind = nextCharacter;
|
|
mask |= YNegative;
|
|
|
|
}
|
|
else
|
|
{
|
|
strind++;
|
|
tempY = read_integer (strind, &nextCharacter);
|
|
if (strind == nextCharacter)
|
|
return (0);
|
|
strind = nextCharacter;
|
|
}
|
|
mask |= YValue;
|
|
}
|
|
}
|
|
|
|
/* If strind isn't at the end of the string the it's an invalid
|
|
geometry specification. */
|
|
|
|
if (*strind != '\0') return (0);
|
|
|
|
if (mask & XValue)
|
|
*x = tempX;
|
|
if (mask & YValue)
|
|
*y = tempY;
|
|
if (mask & WidthValue)
|
|
*width = tempWidth;
|
|
if (mask & HeightValue)
|
|
*height = tempHeight;
|
|
return (mask);
|
|
}
|
|
|
|
/* x_sync is a no-op on W32. */
|
|
void
|
|
x_sync (f)
|
|
void *f;
|
|
{
|
|
}
|