Mercurial > hg > xemacs-beta
view lisp/win32-native.el @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +0000 |
parents | 79940b592197 |
children | eeb607577f17 |
line wrap: on
line source
;;; win32-native.el --- Lisp routines when running on native MS Windows. ;; Copyright (C) 1994 Free Software Foundation, Inc. ;; Copyright (C) 2000 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: mouse, dumped ;; This file is part of XEmacs. ;; XEmacs 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. ;; XEmacs 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 XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; (FSF has stuff in w32-fns.el and term/w32-win.el.) ;;; Commentary: ;; This file is dumped with XEmacs for MS Windows (without cygwin). ;; It is for stuff that is used specifically when `system-type' eq ;; `windows-nt' (i.e. also applies to MinGW), and has nothing to do ;; with the `mswindows' device type. Thus, it probably applies in ;; non-interactive mode as well, and it DOES NOT APPLY to Cygwin. ;; Based (originally) on NT Emacs version by Geoff Voelker ;; (voelker@cs.washington.edu) ;; Ported to XEmacs by Marc Paquette <marcpa@cam.org> ;; Largely modified by Kirill M. Katsnelson <kkm@kis.ru> ;; Rewritten from scratch by Ben Wing <ben@xemacs.org>. No code in common ;; with FSF. ;;; Code: ;; For appending suffixes to directories and files in shell ;; completions. This screws up cygwin users so we leave it out for ;; now. Uncomment this if you only ever want to use cmd. ;(defun nt-shell-mode-hook () ; (setq comint-completion-addsuffix '("\\" . " ") ; comint-process-echoes t)) ;(add-hook 'shell-mode-hook 'nt-shell-mode-hook) ;; Use ";" instead of ":" as a path separator (from files.el). (setq path-separator ";") ;; Set the null device (for compile.el). ;; #### There should be such a global thingy as null-device - kkm (defvar grep-null-device) (setq grep-null-device "NUL") ;; Set the grep regexp to match entries with drive letters. (defvar grep-regexp-alist) (setq grep-regexp-alist '(("^\\(\\([a-zA-Z]:\\)?[^:( \t\n]+\\)[:( \t]+\\([0-9]+\\)[:) \t]" 1 3))) (defvar mswindows-system-shells '("cmd" "cmd.exe" "command" "command.com" "4nt" "4nt.exe" "4dos" "4dos.exe" "ndos" "ndos.exe") "List of strings recognized as Windows NT/9X system shells. These are shells with native semantics, e.g. they use `/c', not '-c', to pass a command in.") (defun mswindows-system-shell-p (shell-name) (member (downcase (file-name-nondirectory shell-name)) mswindows-system-shells)) (defun init-mswindows-at-startup () ;; shell-file-name is initialized in the C code (callproc.c) from ;; SHELL or COMSPEC. ;; #### If only shell-command-switch could be a function. But there ;; is code littered around that uses it. ;; #### Maybe we should set a symbol-value handler on `shell-file-name' ;; that automatically sets shell-command-switch? (if (mswindows-system-shell-p shell-file-name) (setq shell-command-switch "/c"))) ;;---------------------------------------------------------------------- ;; Quoting process args ;;-------------------- (defvar debug-mswindows-process-command-lines nil "If non-nil, output debug information about the command lines constructed. This can be useful if you are getting process errors where the arguments to the process appear to be getting passed incorrectly.") ;; properly quotify one arg for the vc runtime argv constructor. (defun mswindows-quote-one-vc-runtime-arg (arg &optional quote-shell) ;; we mess with any arg with whitespace, quotes, or globbing chars in it. ;; we also include shell metachars if asked. ;; note that \ is NOT included! it's perfectly OK to include an ;; arg like c:\ or c:\foo. (cond ((equal arg "") "\"\"") ((string-match (if quote-shell "[ \t\n\r\f*?\"<>|&^%]" "[ \t\n\r\f*?\"]") arg) ;; handle nested quotes, possibly preceded by backslashes (setq arg (replace-in-string arg "\\([\\]*\\)\"" "\\1\\1\\\\\"")) ;; handle trailing backslashes (setq arg (replace-in-string arg "\\([\\]+\\)$" "\\1\\1")) (concat "\"" arg "\"")) (t arg))) (defun mswindows-quote-one-simple-arg (arg &optional quote-shell) ;; just put double quotes around args with spaces (and maybe shell ;; metachars). (cond ((equal arg "") "\"\"") ((string-match (if quote-shell "[ \t\n\r\f*?\"<>|&^%]" "[ \t\n\r\f*?]") arg) (concat "\"" arg "\"")) (t arg))) (defun mswindows-quote-one-command-arg (arg) ;; quote an arg to get it past COMMAND.COM/CMD.EXE: need to quote shell ;; metachars with ^. (cond ((equal arg "") "\"\"") (t (replace-in-string "[<>|&^%]" "^\\1" arg)))) (defun mswindows-construct-verbatim-command-line (program args) (mapconcat #'identity args " ")) ;; for use with either standard VC++ compiled programs or Cygwin programs, ;; which emulate the same behavior. (defun mswindows-construct-vc-runtime-command-line (program args) (mapconcat #'mswindows-quote-one-vc-runtime-arg args " ")) ;; note: for pulling apart an arg: ;; each arg consists of either ;; something surrounded by single quotes ;; or ;; one or more of ;; 1. a non-ws, non-" char ;; 2. a section of double-quoted text ;; 3. a section of double-quoted text with end-of-string instead of the final ;; quote. ;; 2 and 3 get handled together. ;; quoted text is one of ;; ;; 1. quote + even number of backslashes + quote, or ;; 2. quote + non-greedy anything + non-backslash + even number of ;; backslashes + quote. ;; we need to separate the two because we unfortunately have no non-greedy ;; ? operator. (urk! we actually do, but it wasn't documented.) --ben ;; if you want to mess around, keep this test case in mind: ;; this string ;; " as'f 'FOO BAR' '' \"\" \"asdf \\ \\\" \\\\\\\" asdfasdf\\\\\" foo\" " ;; should tokenize into this: ;; (" " "as'f" " " "'FOO BAR' " "'' " "\"\"" " " "\"asdf \\ \\\" \\\\\\\" asdfasdf\\\\\"" " " "foo" "\" ") ;; this regexp actually separates the arg into individual args, like a ;; shell (such as sh) does, but using vc-runtime rules. it's easy to ;; derive the tokenizing regexp from it, and that's exactly what i did. ;; but oh was it hard to get this first regexp right. --ben ;(defvar mswindows-match-one-cmd-exe-arg-regexp ; (concat ; "^\\(" ; "'\\([\\]*\\)\\2'" "\\|" ; "'.*?[^\\]\\(\\([\\]*\\)\\4'\\)" "\\|" ; "\\(" ; "[^ \t\n\r\f\v\"]" "\\|" ; "\"\\([\\]*\\)\\6\"" "\\|" ; "\".*?[^\\]\\(\\([\\]*\\)\\8\"\\|$\\)" ; "\\)+" ; "\\)" ; "\\([ \t\n\r\f\v]+\\|$\\)")) (defvar mswindows-match-one-cmd-exe-token-regexp (concat "^\\(" "[ \t\n\r\f\v]+" "\\|" "'\\([\\]*\\)\\2'" "\\([ \t\n\r\f\v]+\\|$\\)" "\\|" "'.*?[^\\]\\(\\([\\]*\\)\\5'\\)" "\\([ \t\n\r\f\v]+\\|$\\)" "\\|" "[^ \t\n\r\f\v\"]+" "\\|" "\"\\([\\]*\\)\\7\"" "\\|" "\".*?[^\\]\\(\\([\\]*\\)\\9\"\\|$\\)" "\\)")) (defun mswindows-construct-command-command-line (program args) ;; for use with COMMAND.COM and CMD.EXE: ;; for each arg, tokenize it into quoted and non-quoted sections; ;; then quote all the shell meta-chars with ^; then put everything ;; back together. the truly hard part is the tokenizing -- typically ;; we get a single argument (the command to execute) and we have to ;; worry about quotes that are backslash-quoted and such. (mapconcat #'(lambda (arg) (mapconcat #'(lambda (part) (if (string-match "^'" part) (replace-in-string part "\\([<>|^&%]\\)" "^\\1") part)) (let (parts) (while (and (> (length arg) 0) (string-match mswindows-match-one-cmd-exe-token-regexp arg)) (push (match-string 0 arg) parts) (setq arg (substring arg (match-end 0)))) (if (> (length arg) 0) (push arg parts)) (nreverse parts)) "")) args " ")) (defvar mswindows-construct-process-command-line-alist '( ;; at one point (pre-1.0), this was required for Cygwin bash. ;; evidently, Cygwin changed its arg handling to work just like ;; any standard VC program, so we no longer need it. ;;("[\\/].?.?sh\\." . mswindows-construct-verbatim-command-line) ("[\\/]command\\.com$" . mswindows-construct-command-command-line) ("[\\/]cmd\\.exe$" . mswindows-construct-command-command-line) ("" . mswindows-construct-vc-runtime-command-line)) "An alist for determining proper argument quoting given executable file name. Car of each cons should be a string, a regexp against which the file name is matched. Matching is case-insensitive but does include the directory, so you should begin your regexp with [\\\\/] if you don't want the directory to matter. Alternatively, the car can be a function of one arg, which is called with the executable's name and should return t if this entry should be processed. Cdr is a function symbol, which is called with two args, the executable name and a list of the args passed to it. It should return a string, which includes the executable's args (but not the executable name itself) properly quoted and pasted together. The list is matched in order, and the first matching entry specifies how the processing will happen.") (defun mswindows-construct-process-command-line (args) ;;Properly quote process ARGS for executing (car ARGS). ;;Called from the C code. (let ((fname (car args)) (alist mswindows-construct-process-command-line-alist) (case-fold-search t) (return-me nil) (assoc nil)) (while (and alist (null return-me)) (setq assoc (pop alist)) (if (if (stringp (car assoc)) (string-match (car assoc) fname) (funcall (car assoc) fname)) (setq return-me (cdr assoc)))) (let* ((called-fun (or return-me #'mswindows-construct-vc-runtime-command-line)) (retval (let ((str (funcall called-fun fname (cdr args))) (quoted-fname (mswindows-quote-one-simple-arg fname))) (if (and str (> (length str) 0)) (concat quoted-fname " " str) quoted-fname)))) (when debug-mswindows-process-command-lines (debug-print "mswindows-construct-process-command-line called:\n") (debug-print "received args: \n%s" (let ((n -1)) (mapconcat #'(lambda (arg) (incf n) (format " %d %s\n" n arg)) args ""))) (debug-print "called fun %s\n" called-fun) (debug-print "resulting command line: %s\n" retval)) retval))) ;;; win32-native.el ends here