Mercurial > hg > xemacs-beta
view lisp/win32-native.el @ 872:79c6ff3eef26
[xemacs-hg @ 2002-06-20 21:18:01 by ben]
font changes etc.; some 21.4 changes
mule/mule-msw-init-late.el: Specify charset->windows-registry conversion.
mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c.
cl-macs.el: Document better.
font-lock.el: Move Lisp function regexp to lisp-mode.el.
lisp-mode.el: Various indentation fixes:
Handle flet functions better.
Handle argument lists in defuns and flets.
Handle quoted lists, e.g. property lists -- don't indent like
function calls. Distinguish between lambdas and other lists.
lisp-mode.el: Handle this form.
faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code:
-- Fix lots of bogus code in msw-faces.el, msw-font-menu.el,
font-menu.el that was "truenaming" font specs -- i.e. in the
process of frobbing a particular field in a general user-specified
font spec with wildcarded fields, sticking in particular values
for all the remaining wildcarded fields. This bug was rampant
everywhere except in x-faces.el (the oldest and only correctly
written code). This also means that we need to work with font
names at all times and not font instances, because a font instance
is essentially a truenamed font.
-- Total rewrite of extremely junky code in msw-faces.el. Work
with names as well as font instances, and return names; stop
truenaming when canonicalizing and frobbing; fix handling of the
combined style field, i.e. weight/slant (also fixed in font.el).
-- Totally rewrite the frobbing functions in faces.el. This time,
we frob all the instantiators rather than just computing a single
instance value and working backwards. That way, e.g., `bold' will
work for all charsets that have bold available, rather than only
for whatever charset was part of the computed font instance
(another example of the truename virus). Also fix up code to look
at the fallbacks (all of them) when no global value present, so we
don't need to put something in the global value. Intelligently
handle a request to frob a buffer locale, rather than signalling
an error. When frobbing instantiators, try hard to figure out
what device type is associated with them, and frob each according
to its own proper device type. Correctly handle inheritance
vectors given as instantiators. Preserve existing tags when
putting back frobbed instantiators. Extract out general
specifier-frobbing code into specifier.el. Document everything
cleanly. Do lots of other things better, etc.
-- Don't duplicatively set a global specification for the default
font -- it's already in the fallback and we no longer need a
default global specification present. Delete various code in
x-faces.el and msw-faces.el that duplicated the lists of fonts in
faces.c.
-- init-global-faces was not being called at all under MS Windows!
Major bogosity. That caused device-specific values to get stuck
into all the fonts, making it very hard to change them -- setting
global specs caused nothing to happen.
-- Correct weight names in font.el.
-- Lots more font fixups in objects*.c.
Printer.el: Warning fix.
specifier.el: Add more args to map-specifier.
Add various "heuristic" specifier functions to aid in creation of
specifier-munging code such as in faces.el.
subr.el: New functions.
lwlib.c: Fix warning.
config.inc.samp: Clean up, add args to control fastcall (not yet supported! the
changes needed are in another ws of mine), profile support, vc6
support, union-type.
xemacs.dsp, xemacs.mak: Semi-major overhaul.
Fix bug where dump-id was always getting recomputed, forcing a
redump even when nothing changed.
Add support for fastcall. Support edit-and-continue (on by
default) with vc6. Use incremental linking when doing a debug
compilation. Add support for profiling.
Consolidate the various debug flags.
Partial support for "batch-compiling" -- compiling many files on a
single invocation of the compiler. Doesn't seem to help that much
for me, so it's not finished or enabled by default.
Remove HAVE_MSW_C_DIRED, we always do.
Correct some sloppy use of directories.
s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine
HAVE_MMAP).
s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32
variants (Cygwin, native, MinGW). Both of these are properly used
in another ws.
alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made:
(1) Separation of various header files into an external and an
internal version, similar to the existing separation of process.h
and procimpl.h. Eventually this should be done for all Lisp
objects. The external version has the same name as currently; the
internal adds -impl. The external file has XFOO() macros for
objects, but the structure is opaque and defined only in the
internal file. It's now reasonable to move all prototypes in
lisp.h into the appropriate external file, and this should be
done. Currently, separation has been done on extents.h,
objects*.h, console.h, device.h, frame.h, and window.h.
For c/d/f/w, the most basic properties are available in the
external header file, with the macros resolving to functions. In
the internal header file, the macros are redefined to directly
access the structure. Also, the global MARK_FOO_CHANGED macros
have been made into functions so that they can be accessed without
needing to include lots of -impl headers -- they are used in
almost exclusively in non-time-critical functions, and take up
enough time that the function overhead will be negligible.
Similarly, the function overhead from making the basic properties
mentioned above into functions is negligible, and code that does
heavy accessing of c/d/f/w structures inevitably ends up needing
the internal header files, anyway.
(2) More face changes.
-- Major rewrite of objects-msw.c. Now handles wildcard specs
properly, rather than "truenaming" (or even worse, signalling an
error, which previously happened with some of the fallbacks if you
tried to use them in make-font-instance!).
-- Split charset matching of fonts into two stages -- one to find
a font specifically designed for a particular charset (by
examining its registry), the second to find a Unicode font that
can support the charset. This needs to proceed as two complete,
separate instantiations in order to work properly (otherwise many
of the fonts in the HELLO page look wrong). This should also make
it easy to support iso10646 (Unicode) fonts under X.
-- All default values for fonts are now completely specified in
the fallbacks. Stuff from mule-x-init.el has all been moved here,
merged with the existing specs, and totally rethought so you get
sensible results. (HELLO now looks much better!).
-- Generalize the "default X/GTK device" stuff into a
per-device-type "default device".
-- Add mswindows-{set-}charset-registry. In time,
charset<->code-page conversion functions will be removed.
-- Wrap protective code around calls to compute device specifier tags,
and do this computation before calling the face initialization code
because the latter may need these tags to be correctly updated.
(3) Other changes.
EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes.
config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of
#ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside!
eval.c: Let detailed backtraces be detailed.
specifier.c: Don't override user's print-string-length/print-length settings.
glyphs.c: New function image-instance-instantiator.
config.h.in, sysdep.c: Changes for fastcall.
sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both
EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP
NEEDS TO GO IN, TOO.
search.c: Fix *evil* crash due to incorrect synching of syntax-cache code
with 21.1. THIS SHOULD GO INTO 21.4.
author | ben |
---|---|
date | Thu, 20 Jun 2002 21:19:10 +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