Mercurial > hg > xemacs-beta
view lisp/x-init.el @ 617:af57a77cbc92
[xemacs-hg @ 2001-06-18 07:09:50 by ben]
---------------------------------------------------------------
DOCUMENTATION FIXES:
---------------------------------------------------------------
eval.c: Correct documentation.
elhash.c: Doc correction.
---------------------------------------------------------------
LISP OBJECT CLEANUP:
---------------------------------------------------------------
bytecode.h, buffer.h, casetab.h, chartab.h, console-msw.h, console.h, database.c, device.h, eldap.h, elhash.h, events.h, extents.h, faces.h, file-coding.h, frame.h, glyphs.h, gui-x.h, gui.h, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lrecord.h, lstream.h, mule-charset.h, objects.h, opaque.h, postgresql.h, process.h, rangetab.h, specifier.h, toolbar.h, tooltalk.h, ui-gtk.h: Add wrap_* to all objects (it was already there for a few of them)
-- an expression to encapsulate a pointer into a Lisp object,
rather than the inconvenient XSET*. "wrap" was chosen because
"make" as in make_int(), make_char() is not appropriate. (It
implies allocation. The issue does not exist for ints and chars
because they are not allocated.)
Full error checking has been added to these expressions. When
used without error checking, non-union build, use of these
expressions will incur no loss of efficiency. (In fact, XSET* is
now defined in terms of wrap_* in a non-union build.) In a union
build, you will also get no loss of efficiency provided that you
have a decent optimizing compiler, and a compiler that either
understands inlines or automatically inlines those particular
functions. (And since people don't normally do their production
builds on union, it doesn't matter.)
Update the sample Lisp object definition in lrecord.h accordingly.
dumper.c: Fix places in dumper that referenced wrap_object to reference
its new name, wrap_pointer_1.
buffer.c, bufslots.h, conslots.h, console.c, console.h, devslots.h, device.c, device.h, frame.c, frame.h, frameslots.h, window.c, window.h, winslots.h: -- Extract out the Lisp objects of `struct device' into devslots.h,
just like for the other structures.
-- Extract out the remaining (not copied into the window config)
Lisp objects in `struct window' into winslots.h; use different
macros (WINDOW_SLOT vs. WINDOW_SAVED_SLOT) to differentiate them.
-- Eliminate the `dead' flag of `struct frame', since it
duplicates information already available in `framemeths', and fix
FRAME_LIVE_P accordingly. (Devices and consoles already work this
way.)
-- In *slots.h, switch to system where MARKED_SLOT is automatically
undef'd at the end of the file. (Follows what winslots.h already
does.)
-- Update the comments at the beginning of *slots.h to be accurate.
-- When making any of the above objects dead, zero it out entirely
and reset all Lisp object slots to Qnil. (We were already doing
this somewhat, but not consistently.) This (1) Eliminates the
possibility of extra objects hanging around that ought to be
GC'd, (2) Causes an immediate crash if anyone tries to access a
structure in one of these objects, (3) Ensures consistent behavior
wrt dead objects.
dialog-msw.c: Use internal_object_printer, since this object should not escape.
---------------------------------------------------------------
FIXING A CRASH THAT I HIT ONCE (AND A RELATED BAD BEHAVIOR):
---------------------------------------------------------------
eval.c: Fix up some comments about the FSF implementation.
Fix two nasty bugs:
(1) condition_case_unwind frees the conses sitting in the
catch->tag slot too quickly, resulting in a crash that I hit.
(2) catches need to be unwound one at a time when calling
unwind-protect code, rather than all at once at the end; otherwise,
incorrect behavior can result. (A comment shows exactly how.)
backtrace.h: Improve comment about FSF differences in the handler stack.
---------------------------------------------------------------
FIXING A CRASH THAT I REPEATEDLY HIT WHEN USING THE MOUSE WHEEL
UNDER MSWINDOWS:
---------------------------------------------------------------
Basic idea: My crash is due either to a dead, non-marked,
GC-collected frame inside of a window mirror, or a prematurely
freed window mirror. We need to mark the Lisp objects inside of
window mirrors. Tracking the lifespan of window mirrors and
scrollbar instances is extremely hard, and there may well be
lurking bugs where such objects are freed too soon. The only safe
way to fix these problems (and it fixes both problems at once) is
to make both of these structures Lisp objects.
lrecord.h, emacs.c, inline.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, symsinit.h: Make scrollbar instances actual Lisp objects. Mark the window
mirrors in them. inline.c needs to know about scrollbar.h now.
Record the new type in lrecord.h. Fix up scrollbar-*.c
appropriately. Create a hash table in scrollbar-msw.c so that the
scrollbar instances stored in scrollbar HWND's are properly
GC-protected. Create complex_vars_of_scrollbar_mswindows() to
create the hash table at startup, and call it from emacs.c. Don't
store the scrollbar instance as a property of the GTK scrollbar,
as it's not used and if we did this, we'd have to separately
GC-protect it in a hash table, like in MS Windows.
lrecord.h, frame.h, frame.c, frameslots.h, redisplay.c, window.c, window.h: Move mark_window_mirror from redisplay.c to window.c. Make window
mirrors actual Lisp objects. Tell lrecord.h about them. Change
the window mirror member of struct frame from a pointer to a Lisp
object, and add XWINDOW_MIRROR in appropriate places. Mark the
scrollbar instances in the window mirror.
redisplay.c, redisplay.h, alloc.c: Delete mark_redisplay. Don't call mark_redisplay. We now mark
frame-specific structures in mark_frame.
NOTE: I also deleted an extremely questionable call to
update_frame_window_mirrors(). It was extremely questionable
before, and now totally impossible, since it will create
Lisp objects during redisplay.
frame.c: Mark the scrollbar instances, which are now Lisp objects.
Call mark_gutter() here, not in mark_redisplay().
gutter.c: Update comments about correct marking.
---------------------------------------------------------------
ISSUES BROUGHT UP BY MARTIN:
---------------------------------------------------------------
buffer.h: Put back these macros the way Steve T and I think they ought to be.
I already explained in a previous changelog entry why I think these
macros should be the way I'd defined them. Once again:
We fix these macros so they don't care about the type of their
lvalues. The non-C-string equivalents of these already function
in the same way, and it's correct because it should be OK to pass
in a CBufbyte *, a BufByte *, a Char_Binary *, an UChar_Binary *,
etc. The whole reason for these different types is to work around
errors caused by signed-vs-unsigned non-matching types. Any
possible error that might be caught in a DFC macro would also be
caught wherever the argument is used elsewhere. So creating
multiple macro versions would add no useful error-checking and
just further complicate an already complicated area.
As for Martin's "ANSI aliasing" bug, XEmacs is not ANSI-aliasing
clean and probably never will be. Unless the board agrees to
change XEmacs in this way (and we really don't want to go down
that road), this is not a bug.
sound.h: Undo Martin's type change.
signal.c: Fix problem identified by Martin with Linux and g++ due to
non-standard declaration of setitimer().
systime.h: Update the docs for "qxe_" to point out why making the
encapsulation explicit is always the right way to go. (setitimer()
itself serves as an example.)
For 21.4:
update-elc-2.el: Correct misplaced parentheses, making lisp/mule not get
recompiled.
| author | ben |
|---|---|
| date | Mon, 18 Jun 2001 07:10:32 +0000 |
| parents | 7039e6323819 |
| children | 79c6ff3eef26 |
line wrap: on
line source
;;; x-init.el --- initialization code for X windows ;; Copyright (C) 1990, 1993, 1994, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Board of Trustees, University of Illinois. ;; Copyright (C) 1995, 1996 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: terminals, 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 synched. ;;; Commentary: ;; This file is dumped with XEmacs (when X support is compiled in). ;;; Code: (globally-declare-fboundp '(x-keysym-on-keyboard-p x-server-vendor x-init-specifier-from-resources init-mule-x-win)) (globally-declare-boundp '(x-initial-argv-list)) ;; If you want to change this variable, this is the place you must do it. ;; Do not set it to a string containing periods. X doesn't like that. ;(setq x-emacs-application-class "Emacs") (defgroup x nil "The X Window system." :group 'environment) ;; OpenWindows-like "find" processing. These functions are really Sunisms, ;; but we put them here instead of in x-win-sun.el in case someone wants ;; to use them when not running on a Sun console (presumably after binding ;; them to different keys, or putting them on menus.) (defvar ow-find-last-string nil) (defvar ow-find-last-clipboard nil) (defun ow-find (&optional backward-p) "Search forward the next occurrence of the text of the selection." (interactive) (let ((sel (ignore-errors (get-selection))) (clip (ignore-errors (get-clipboard))) text) (setq text (cond (sel) ((not (equal clip ow-find-last-clipboard)) (setq ow-find-last-clipboard clip)) (ow-find-last-string) (t (error "No selection available")))) (setq ow-find-last-string text) (cond (backward-p (search-backward text) (set-mark (+ (point) (length text)))) (t (search-forward text) (set-mark (- (point) (length text))))) (zmacs-activate-region))) (defun ow-find-backward () "Search backward for the previous occurrence of the text of the selection." (interactive) (ow-find t)) ;; Load X-server specific code. ;; Specifically, load some code to repair the grievous damage that MIT and ;; Sun have done to the default keymap for the Sun keyboards. (eval-when-compile (defmacro x-define-dead-key (key map) `(when (x-keysym-on-keyboard-p ',key) (define-key function-key-map [,key] ',map)))) (defun x-initialize-compose () "Enable compose key and dead key processing." (autoload 'compose-map "x-compose" nil t 'keymap) (autoload 'compose-acute-map "x-compose" nil t 'keymap) (autoload 'compose-grave-map "x-compose" nil t 'keymap) (autoload 'compose-cedilla-map "x-compose" nil t 'keymap) (autoload 'compose-diaeresis-map "x-compose" nil t 'keymap) (autoload 'compose-circumflex-map "x-compose" nil t 'keymap) (autoload 'compose-tilde-map "x-compose" nil t 'keymap) (when (x-keysym-on-keyboard-p 'multi-key) (define-key function-key-map [multi-key] 'compose-map)) ;; The dead keys might really be called just about anything, depending ;; on the vendor. MIT thinks that the prefixes are "SunFA_", "D", and ;; "hpmute_" for Sun, DEC, and HP respectively. However, OpenWindows 3 ;; thinks that the prefixes are "SunXK_FA_", "DXK_", and "hpXK_mute_". ;; And HP (who don't mention Sun and DEC at all) use "XK_mute_". ;; Go figure. ;; Presumably if someone is running OpenWindows, they won't be using ;; the DEC or HP keysyms, but if they are defined then that is possible, ;; so in that case we accept them all. ;; If things seem not to be working, you might want to check your ;; /usr/lib/X11/XKeysymDB file to see if your vendor has an equally ;; mixed up view of what these keys should be called. ;; Canonical names: (x-define-dead-key acute compose-acute-map) (x-define-dead-key grave compose-grave-map) (x-define-dead-key cedilla compose-cedilla-map) (x-define-dead-key diaeresis compose-diaeresis-map) (x-define-dead-key circumflex compose-circumflex-map) (x-define-dead-key tilde compose-tilde-map) (x-define-dead-key degree compose-ring-map) ;; Sun according to MIT: (x-define-dead-key SunFA_Acute compose-acute-map) (x-define-dead-key SunFA_Grave compose-grave-map) (x-define-dead-key SunFA_Cedilla compose-cedilla-map) (x-define-dead-key SunFA_Diaeresis compose-diaeresis-map) (x-define-dead-key SunFA_Circum compose-circumflex-map) (x-define-dead-key SunFA_Tilde compose-tilde-map) ;; Sun according to OpenWindows 2: (x-define-dead-key Dead_Grave compose-grave-map) (x-define-dead-key Dead_Circum compose-circumflex-map) (x-define-dead-key Dead_Tilde compose-tilde-map) ;; Sun according to OpenWindows 3: (x-define-dead-key SunXK_FA_Acute compose-acute-map) (x-define-dead-key SunXK_FA_Grave compose-grave-map) (x-define-dead-key SunXK_FA_Cedilla compose-cedilla-map) (x-define-dead-key SunXK_FA_Diaeresis compose-diaeresis-map) (x-define-dead-key SunXK_FA_Circum compose-circumflex-map) (x-define-dead-key SunXK_FA_Tilde compose-tilde-map) ;; DEC according to MIT: (x-define-dead-key Dacute_accent compose-acute-map) (x-define-dead-key Dgrave_accent compose-grave-map) (x-define-dead-key Dcedilla_accent compose-cedilla-map) (x-define-dead-key Dcircumflex_accent compose-circumflex-map) (x-define-dead-key Dtilde compose-tilde-map) (x-define-dead-key Dring_accent compose-ring-map) ;; DEC according to OpenWindows 3: (x-define-dead-key DXK_acute_accent compose-acute-map) (x-define-dead-key DXK_grave_accent compose-grave-map) (x-define-dead-key DXK_cedilla_accent compose-cedilla-map) (x-define-dead-key DXK_circumflex_accent compose-circumflex-map) (x-define-dead-key DXK_tilde compose-tilde-map) (x-define-dead-key DXK_ring_accent compose-ring-map) ;; HP according to MIT: (x-define-dead-key hpmute_acute compose-acute-map) (x-define-dead-key hpmute_grave compose-grave-map) (x-define-dead-key hpmute_diaeresis compose-diaeresis-map) (x-define-dead-key hpmute_asciicircum compose-circumflex-map) (x-define-dead-key hpmute_asciitilde compose-tilde-map) ;; Empirically discovered on Linux XFree86 MetroX: (x-define-dead-key usldead_acute compose-acute-map) (x-define-dead-key usldead_grave compose-grave-map) (x-define-dead-key usldead_diaeresis compose-diaeresis-map) (x-define-dead-key usldead_asciicircum compose-circumflex-map) (x-define-dead-key usldead_asciitilde compose-tilde-map) ;; HP according to OpenWindows 3: (x-define-dead-key hpXK_mute_acute compose-acute-map) (x-define-dead-key hpXK_mute_grave compose-grave-map) (x-define-dead-key hpXK_mute_diaeresis compose-diaeresis-map) (x-define-dead-key hpXK_mute_asciicircum compose-circumflex-map) (x-define-dead-key hpXK_mute_asciitilde compose-tilde-map) ;; HP according to HP-UX 8.0: (x-define-dead-key XK_mute_acute compose-acute-map) (x-define-dead-key XK_mute_grave compose-grave-map) (x-define-dead-key XK_mute_diaeresis compose-diaeresis-map) (x-define-dead-key XK_mute_asciicircum compose-circumflex-map) (x-define-dead-key XK_mute_asciitilde compose-tilde-map) ;; Xfree86 seems to use lower case and a hyphen (x-define-dead-key dead-acute compose-acute-map) (x-define-dead-key dead-grave compose-grave-map) (x-define-dead-key dead-cedilla compose-cedilla-map) (x-define-dead-key dead-diaeresis compose-diaeresis-map) (x-define-dead-key dead-circum compose-circumflex-map) (x-define-dead-key dead-circumflex compose-circumflex-map) (x-define-dead-key dead-tilde compose-tilde-map) ) (eval-when-compile (load "x-win-sun" nil t) (load "x-win-xfree86" nil t)) (defun x-initialize-keyboard () "Perform X-Server-specific initializations. Don't call this." ;; This is some heuristic junk that tries to guess whether this is ;; a Sun keyboard. ;; ;; One way of implementing this (which would require C support) would ;; be to examine the X keymap itself and see if the layout looks even ;; remotely like a Sun - check for the Find key on a particular ;; keycode, for example. It'd be nice to have a table of this to ;; recognize various keyboards; see also xkeycaps. ;; ;; Note that we cannot use most vendor-provided proprietary keyboard ;; APIs to identify the keyboard - those only work on the console. ;; xkeycaps has the same problem when running `remotely'. (let ((vendor (x-server-vendor))) (cond ((or (string-match "Sun Microsystems" vendor) ;; MIT losingly fails to tell us what hardware the X server ;; is managing, so assume all MIT displays are Suns... HA HA! (string-equal "MIT X Consortium" vendor) (string-equal "X Consortium" vendor)) ;; Ok, we think this could be a Sun keyboard. Run the Sun code. (x-win-init-sun)) ((string-match "XFree86" vendor) ;; Those XFree86 people do some weird keysym stuff, too. (x-win-init-xfree86))))) ;; Moved from x-toolbar.el, since InfoDock doesn't dump a x-toolbar.el. (defun x-init-toolbar-from-resources (locale) (loop for (specifier . resname) in `(( ,top-toolbar-height . "topToolBarHeight") (,bottom-toolbar-height . "bottomToolBarHeight") ( ,left-toolbar-width . "leftToolBarWidth") ( ,right-toolbar-width . "rightToolBarWidth") ( ,top-toolbar-border-width . "topToolBarBorderWidth") (,bottom-toolbar-border-width . "bottomToolBarBorderWidth") ( ,left-toolbar-border-width . "leftToolBarBorderWidth") ( ,right-toolbar-border-width . "rightToolBarBorderWidth")) do (x-init-specifier-from-resources specifier 'natnum locale (cons resname (upcase-initials resname))))) (defvar pre-x-win-initted nil) (defun init-pre-x-win () "Initialize X Windows at startup (pre). Don't call this." (when (not pre-x-win-initted) (require 'x-iso8859-1) (setq character-set-property 'x-iso8859/1) ; see x-iso8859-1.el (setq initial-frame-plist (if initial-frame-unmapped-p '(initially-unmapped t) nil)) (setq pre-x-win-initted t))) (defvar x-win-initted nil) (defun init-x-win () "Initialize X Windows at startup. Don't call this." (when (not x-win-initted) (defvar x-app-defaults-directory) (init-pre-x-win) ;; Open the X display when this file is loaded ;; (Note that the first frame is created later.) (setq x-initial-argv-list (cons (car command-line-args) command-line-args-left)) ;; Locate the app-defaults directory (when (and (boundp 'x-app-defaults-directory) (null x-app-defaults-directory)) (setq x-app-defaults-directory (locate-data-directory "app-defaults"))) (make-x-device nil) (setq command-line-args-left (cdr x-initial-argv-list)) (setq x-win-initted t))) (defvar post-x-win-initted nil) (defun init-post-x-win () "Initialize X Windows at startup (post). Don't call this." (when (not post-x-win-initted) (if (featurep 'mule) (init-mule-x-win)) ;; Motif-ish bindings ;; The following two were generally unliked. ;;(define-key global-map '(shift delete) 'kill-primary-selection) ;;(define-key global-map '(control delete) 'delete-primary-selection) (define-key global-map '(shift insert) 'yank-clipboard-selection) (define-key global-map '(control insert) 'copy-primary-selection) ;; These are Sun-isms. (define-key global-map 'copy 'copy-primary-selection) (define-key global-map 'paste 'yank-clipboard-selection) (define-key global-map 'cut 'kill-primary-selection) ;;(define-key global-map '(shift menu) 'x-goto-menubar) ;NYI (setq post-x-win-initted t))) ;;; Keyboard initialization needs to be done differently for each X ;;; console, so use create-console-hook. (when (featurep 'x) (add-hook 'create-console-hook (lambda (console) (letf (((selected-console) console)) (when (eq 'x (console-type console)) (x-initialize-keyboard) (x-initialize-compose)))))) (defun make-frame-on-display (display &optional props) "Create a frame on the X display named DISPLAY. DISPLAY should be a standard display string such as \"unix:0\", or nil for the display specified on the command line or in the DISPLAY environment variable. PROPS should be a plist of properties, as in the call to `make-frame'. This function opens a connection to the display or reuses an existing connection. This function is a trivial wrapper around `make-frame-on-device'." (interactive "sMake frame on display: ") (if (equal display "") (setq display nil)) (make-frame-on-device 'x display props)) ;; Character 160 (octal 0240) displays incorrectly under X apparently ;; due to a universally crocked font width specification. Display it ;; as a space since that's what seems to be expected. ;; ;; (make-vector 256 nil) instead of (make-display-table) because ;; make-display-table doesn't exist when this file is loaded. (let ((tab (make-vector 256 nil))) (aset tab 160 " ") (set-specifier current-display-table tab 'global 'x)) ;;; x-init.el ends here
