Mercurial > hg > xemacs-beta
view lisp/x-win-sun.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 | 7039e6323819 |
children | 4cad7ff4a200 |
line wrap: on
line source
;;; x-win-sun.el --- runtime initialization for Sun X servers and keyboards ;; Copyright (C) 1993, 1994 Free Software Foundation, Inc. ;; Authors: jwz, ben, martin ;; Keywords: terminals ;; 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, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; This file is loaded by x-win.el at run-time when we are sure that XEmacs ;; is running on the display of a Sun. ;; The Sun X server (both the MIT and OpenWindows varieties) have extremely ;; stupid names for their keypad and function keys. For example, the key ;; labeled 3 / PgDn, with R15 written on the front, is actually called F35. ;; There are 3 methods of dealing with the Sun key brokenness: ;; ;; - Use xmodmap to give all keys more sensible names for all apps: ;; I use this shell script: ;; ;; for i in 0 1 2 3 4 5 6 7 8 9 Add Subtract Multiply Divide Decimal ; do ;; echo "keysym KP-$i = KP-$i" ;; done | xmodmap ;; ;; Clearly, as a good X11 citizen, we can't do this. ;; ;; - Use keyboard-translate-table to remap the keybindings at a low level. ;; This approach is taken in the function `sun-x11-keyboard-translate'. ;; This is like running xmodmap within XEmacs only. ;; This is not the default, however, so that legacy keybindings in users' ;; .emacs files like (global-set-key [(f35)] 'foo) continue to work ;; ;; - Use keyboard macros to provide indirection for keybindings. ;; If we do (global-set-key [(f35)] [(kp-3)]), then the user's keybindings ;; work whether he uses `f35' or `kp-3'. ;; This is also compatible with FSF Emacs and other X11 apps. ;; Although this has the disadvantage that these remappings ;; only work with the global key map, we use this as the default. ;; ;; - The Right Way to do this remains to be written... ;; OK, here's another try at doing things the right way. ;; We use function-key-map, which honors explicit key-bindings for the ;; stupid Sun names, but also allows indirection if no explicit ;; key-binding exists. ;;; Code: (globally-declare-fboundp '(x-keysym-on-keyboard-sans-modifiers-p)) ;;;###autoload (defun x-win-init-sun () ;; help is ok ;; num_lock is ok ;; up is ok ;; left is ok ;; right is ok ;; kp-add is ok ;; down is ok ;; insert is ok ;; delete is ok ;; kp-enter is ok ;; Sun Function keys (loop for (from-key to-key) in `((f21 pause) (f22 print) (f23 scroll_lock) ;; X11 R6 mappings (SunProps props) (SunFront front) (SunOpen open) (SunFind find) (cancel stop) (Undo undo) (SunCopy copy) (SunPaste paste) (SunCut cut) (f13 props) (f14 undo) (f15 front) (f16 copy) (f17 open) (f18 paste) (f19 find) (f20 cut) (f25 kp-divide) (f26 kp-multiply) (f31 kp-5) ;; Map f33 and r13 to end or kp-end ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'end)) '((f33 end) (r13 end))) ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-end)) '((f33 kp-end) (r13 kp-end)))) ,@(when (x-keysym-on-keyboard-sans-modifiers-p 'f36) '((f36 stop) (f37 again))) ;; Type 4 keyboards have a real kp-subtract and a f24 labelled `=' ;; Type 5 keyboards have no key labelled `=' and a f24 labelled `-' ,@(when (x-keysym-on-keyboard-sans-modifiers-p 'f24) `((f24 ,(if (x-keysym-on-keyboard-sans-modifiers-p 'kp-subtract) 'kp-equal 'kp-subtract)))) ;; Map f27 to home or kp-home, as appropriate ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'home)) '((f27 home))) ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-home)) '((f27 kp-home)))) ;; Map f29 to prior or kp-prior, as appropriate ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'prior)) '((f29 prior))) ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-prior)) '((f29 kp-prior)))) ;; Map f35 to next or kp-next, as appropriate ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'next)) '((f35 next))) ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-next)) '((f35 kp-next)))) ,@(cond ((x-keysym-on-keyboard-sans-modifiers-p 'apRead) ; SunOS 4.1.1 '((apRead f11) (apEdit f12))) ((x-keysym-on-keyboard-sans-modifiers-p 'SunF36) ; SunOS 5 '((SunF36 f11) (SunF37 f12) (f11 stop) (f12 again)))) ) do (when (x-keysym-on-keyboard-sans-modifiers-p from-key) (dolist (prefix '(() (shift) (control) (meta) (alt) (shift control) (shift alt) (shift meta) (control alt) (control meta) (alt meta) (shift control alt) (shift control meta) (shift alt meta) (control alt meta) (shift control alt meta))) (define-key function-key-map (append prefix (list from-key)) (vector (append prefix (list to-key))))))) ;; for each element in the left column of the above table, alias it ;; to the thing in the right column. Then do the same for many, but ;; not all, modifier combinations. ;; ;; (Well, we omit hyper and super. #### Handle this some other way!) ;; (while mapping ;; (let ((mods '(() (shift) (control) (meta) (alt)))) ;; (while mods ;; (let ((k1 (vector (append (car mods) (list (car (car mapping)))))) ;; (k2 (vector (append (car mods) (list (cdr (car mapping))))))) ;; (define-key global-map k1 k2)) ;; (setq mods (cdr mods)))) ;; (setq mapping (cdr mapping)))) ;;; I've extended keyboard-translate-table to work over keysyms. ;;; [FSF Emacs has something called `system-key-alist' that is ;;; supposed to accomplish approximately the same thing. Unfortunately, ;;; it's brain-dead in the typically FSF way, and associates *numbers* ;;; (who knows where the hell they come from?) with symbols.] --ben ;;; And I've made it into a function which is NOT called by default --martin (defun sun-x11-keyboard-translate () "Remap Sun's X11 keyboard. Keys with names like `f35' are remapped, at a low level, to more mnemonic ones,like `kp-3'." (interactive) (keyboard-translate 'f11 'stop ; the type4 keyboard Sun/MIT name 'f36 'stop ; the type5 keyboard Sun name 'cancel 'stop ; R6 binding 'f12 'again ; the type4 keyboard Sun/MIT name 'f37 'again ; the type5 keyboard Sun name 'f13 'props ; 'SunProps 'props ; R6 binding 'f14 'undo ; 'f15 'front ; 'SunFront 'front ; R6 binding 'f16 'copy ; 'SunCopy 'copy ; R6 binding 'f17 'open ; 'SunOpen 'open ; R6 binding 'f18 'paste ; 'SunPaste 'paste ; R6 binding 'f19 'find ; 'f20 'cut ; 'SunCut 'cut ; R6 binding ;; help is ok 'f21 'pause 'f22 'prsc 'f23 'scroll ;; num_lock is ok ;;'f24 'kp-equal) ; type4 only! 'f25 'kp-divide ; 'f26 'kp-multiply ; 'f24 'kp-subtract ; type5 only! 'f27 'kp-7 ; ;; up is ok 'f29 'kp-9 ;; left is ok 'f31 'kp-5 ;; right is ok ;; kp-add is ok 'f33 'kp-1 ; the Sun name 'r13 'end ; the MIT name ;; down is ok 'f35 'kp-3 ;; insert is ok ;; delete is ok ;; kp-enter is ok 'SunF36 'f11 ; Type 5 keyboards 'SunF37 'f12 ; Used to be Stop & Again )) ;;; OpenWindows-like "find" processing. ;;; As far as I know, the `find' key is a Sunism, so we do that binding ;;; here. This is the only Sun-specific keybinding. (The functions ;;; themselves are in x-win.el in case someone wants to use them when ;;; not running on a Sun display.) (or (lookup-key global-map 'find) (define-key global-map 'find 'ow-find)) (or (lookup-key global-map '(shift find)) (define-key global-map '(shift find) 'ow-find-backward)) ) ;;; x-win-sun.el ends here