Mercurial > hg > xemacs-beta
view lisp/gtk-init.el @ 1292:f3437b56874d
[xemacs-hg @ 2003-02-13 09:57:04 by ben]
profile updates
profile.c: Major reworking. Keep track of new information -- total
function timing (includes descendants), GC usage, total GC usage
(includes descendants). New functions to be called appropriately
from eval.c, alloc.c to keep track of this information. Keep track
of when we're actually in a function vs. in its profile, for more
accurate timing counts. Track profile overhead separately. Create
new mechanism for specifying "internal sections" that are tracked
just like regular Lisp functions and even appear in the backtrace
if `backtrace-with-internal-sections' is non-nil (t by default
for error-checking builds). Add some KKCC information for the
straight (non-Elisp) hash table used by profile, which contains
Lisp objects in its keys -- but not used yet. Remove old ad-hoc
methods for tracking garbage collection, redisplay (which was
incorrect anyway when Lisp was called within these sections).
Don't record any tick info when blocking under MS Windows, since
the timer there is in real time rather than in process time.
Make `start-profiling', `stop-profiling' interactive. Be consistent
wrt. recursive functions and functions currently on the stack when
starting or stopping -- together these make implementing the
`total' values extremely difficult. When we start profiling, we
act as if we just entered all the functions currently on the stack.
Likewise when exiting. Create vars in_profile for tracking
time spent inside of profiling, and profiling_lock for setting
exclusive access to the main hash table when reading from it or
modifying it. (protects against getting screwed up by the signal
handle going off at the same time.
profile.h: New file.
Create macros for declaring internal profiling sections.
lisp.h: Move profile-related stuff to profile.h.
alloc.c: Keep track of total consing, for profile.
Tell profile when we are consing.
Use new profile-section method for noting garbage-collection.
alloc.c: Abort if we attempt to call the allocator reentrantly.
backtrace.h, eval.c: Add info for use by profile in the backtrace frame and transfer
PUSH_BACKTRACE/POP_BACKTRACE from eval.c, for use with profile.
elhash.c: Author comment.
eval.c, lisp.h: New Lisp var `backtrace-with-internal-sections'. Set to t when
error-checking is on.
eval.c: When unwinding,
eval.c: Report to profile when we are about-to-call and just-called wrt. a
function.
alloc.c, eval.c: Allow for "fake" backtrace frames, for internal sections (used by
profile and `backtrace-with-internal-sections'.
event-Xt.c, event-gtk.c, event-msw.c, event-tty.c: Record when we are actually blocking on an event, for profile's sake.
event-stream.c: Record internal profiling sections for getting, dispatching events.
extents.c: Record internal profiling sections for map_extents.
hash.c, hash.h: Add pregrow_hash_table_if_necessary(). (Used in profile code
since the signal handler is the main grower but can't allow
a realloc(). We make sure, at critical points, that the table
is large enough.)
lread.c: Create internal profiling sections for `load' (which may be triggered
internally by autoload, etc.).
redisplay.c: Remove old profile_redisplay_flag. Use new macros to declare
internal profiling section for redisplay.
text.c: Use new macros to declare internal profiling sections for
char-byte conversion and internal-external conversion.
SEMI-UNRELATED CHANGES:
-----------------------
text.c: Update the long comments.
| author | ben |
|---|---|
| date | Thu, 13 Feb 2003 09:57:08 +0000 |
| parents | 39ccc7dd8077 |
| children | 461fdb92f3b6 |
line wrap: on
line source
;;; gtk-init.el --- initialization code for mswindows ;; Copyright (C) 1990, 1993, 1994 Free Software Foundation, Inc. ;; Copyright (C) 1995 Board of Trustees, University of Illinois. ;; Copyright (C) 1995, 1996 Ben Wing. ;; Author: various ;; Rewritten for Gtk by: William Perry ;; 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. (globally-declare-boundp '(gtk-initial-argv-list gtk-initial-geometry)) (globally-declare-fboundp '(gtk-keysym-on-keyboard-p)) (defvar gtk-win-initted nil) (defvar gtk-pre-win-initted nil) (defvar gtk-post-win-initted nil) (defvar gtk-command-switch-alist '( ;; GNOME Options ("--disable-sound" . nil) ("--enable-sound" . nil) ("--espeaker" . t) ;; GTK Options ("--gdk-debug" . t) ("--gdk-no-debug" . t) ("--display" . t) ("--sync" . nil) ("--no-xshm" . nil) ("--name" . t) ("--class" . t) ("--gxid_host" . t) ("--gxid_port" . t) ("--xim-preedit" . t) ("--xim-status" . t) ("--gtk-debug" . t) ("--gtk-no-debug" . t) ("--gtk-module" . t) ;; Glib options ("--g-fatal-warnings" . nil) ;; Session management options ("--sm-client-id" . t) ("--sm-config-prefix" . t) ("--sm-disable" . t) ) "An assoc list of command line arguments that should in gtk-initial-argv-list. This is necessary because GTK and GNOME consider it a fatal error if they receive unknown command line arguments (perfectly reasonable). But this means that if the user specifies a file name on the command line they will be unable to start. So we filter the command line and allow only items in this list in. The CDR of the assoc list is whether it accepts an argument. All options are in GNU long form though.") (defun init-pre-gtk-win () "Initialize Gtk GUI at startup (pre). Don't call this." (when (not gtk-pre-win-initted) (setq initial-frame-plist (if initial-frame-unmapped-p '(initially-unmapped t) nil) gtk-pre-win-initted t))) (defun gtk-init-handle-geometry (arg) "Set up initial geometry info for GTK devices." (setq gtk-initial-geometry (pop command-line-args-left))) (defun gtk-filter-arguments () (let ((accepted nil) (rejected nil) (todo nil)) (setq todo (mapcar (lambda (argdesc) (if (cdr argdesc) ;; Need to look for --foo=bar (concat "^" (car argdesc) "=") ;; Just a simple arg (concat "^" (regexp-quote (car argdesc)) "$"))) gtk-command-switch-alist)) (while command-line-args-left (if (catch 'found (mapc (lambda (r) (if (string-match r (car command-line-args-left)) (throw 'found t))) todo) (mapc (lambda (argdesc) (if (cdr argdesc) ;; This time we only care about argument items ;; that take an argument. We'll check to see if ;; someone used --foo bar instead of --foo=bar (if (string-match (concat "^" (car argdesc) "$") (car command-line-args-left)) ;; Yup! Need to push (progn (push (pop command-line-args-left) accepted) (throw 'found t))))) gtk-command-switch-alist) nil) (push (pop command-line-args-left) accepted) (push (pop command-line-args-left) rejected))) (setq command-line-args-left (nreverse rejected)) (nreverse accepted))) (defun init-gtk-win () "Initialize Gtk GUI at startup. Don't call this." (unless gtk-win-initted (init-pre-gtk-win) (setq gtk-initial-argv-list (cons (car command-line-args) (gtk-filter-arguments)) gtk-initial-geometry (nth 1 (member "-geometry" command-line-args-left))) (make-gtk-device) (init-post-gtk-win) (setq gtk-win-initted t))) (defun init-post-gtk-win () (unless gtk-post-win-initted (when (featurep 'mule) (define-specifier-tag 'mule-fonts (lambda (device) (eq 'gtk (device-type device)))) (set-face-font 'default '("-*-fixed-medium-r-*--16-*-iso8859-1" "-*-fixed-medium-r-*--*-iso8859-1" "-*-fixed-medium-r-*--*-iso8859-2" "-*-fixed-medium-r-*--*-iso8859-3" "-*-fixed-medium-r-*--*-iso8859-4" "-*-fixed-medium-r-*--*-iso8859-7" "-*-fixed-medium-r-*--*-iso8859-8" "-*-fixed-medium-r-*--*-iso8859-5" "-*-fixed-medium-r-*--*-iso8859-9" ;; Following 3 fonts proposed by Teruhiko.Kurosaka@Japan.eng.sun "-sun-gothic-medium-r-normal--14-120-75-75-c-60-jisx0201.1976-0" "-sun-gothic-medium-r-normal--14-120-75-75-c-120-jisx0208.1983-0" "-wadalab-gothic-medium-r-normal--14-120-75-75-c-120-jisx0212.1990-0" ;; Other Japanese fonts "-*-fixed-medium-r-*--*-jisx0201.1976-*" "-*-fixed-medium-r-*--*-jisx0208.1983-*" "-*-fixed-medium-r-*--*-jisx0212*-*" ;; Chinese fonts "-*-*-medium-r-*--*-gb2312.1980-*" ;; Use One font specification for CNS chinese ;; Too many variations in font naming "-*-fixed-medium-r-*--*-cns11643*-*" ;; "-*-fixed-medium-r-*--*-cns11643*2" ;; "-*-fixed-medium-r-*--*-cns11643*3" ;; "-*-fixed-medium-r-*--*-cns11643*4" ;; "-*-fixed-medium-r-*--*-cns11643.5-0" ;; "-*-fixed-medium-r-*--*-cns11643.6-0" ;; "-*-fixed-medium-r-*--*-cns11643.7-0" "-*-fixed-medium-r-*--*-big5*-*" "-*-fixed-medium-r-*--*-sisheng_cwnn-0" ;; Other fonts ;; "-*-fixed-medium-r-*--*-viscii1.1-1" ;; "-*-fixed-medium-r-*--*-mulearabic-0" ;; "-*-fixed-medium-r-*--*-mulearabic-1" ;; "-*-fixed-medium-r-*--*-mulearabic-2" ;; "-*-fixed-medium-r-*--*-muleipa-1" ;; "-*-fixed-medium-r-*--*-ethio-*" "-*-mincho-medium-r-*--*-ksc5601.1987-*" ; Korean "-*-fixed-medium-r-*--*-tis620.2529-1" ; Thai ) 'global '(mule-fonts) 'append)) (setq gtk-post-win-initted t))) (push '("-geometry" . gtk-init-handle-geometry) command-switch-alist) ;;; Stuff to get compose keys working on GTK (eval-when-compile (defmacro gtk-define-dead-key (key map) `(when (gtk-keysym-on-keyboard-p ',key) (define-key function-key-map [,key] ',map)))) (defun gtk-initialize-compose () "Enable compose processing" (autoload 'compose-map "gtk-compose" nil t 'keymap) (autoload 'compose-acute-map "gtk-compose" nil t 'keymap) (autoload 'compose-grave-map "gtk-compose" nil t 'keymap) (autoload 'compose-cedilla-map "gtk-compose" nil t 'keymap) (autoload 'compose-diaeresis-map "gtk-compose" nil t 'keymap) (autoload 'compose-circumflex-map "gtk-compose" nil t 'keymap) (autoload 'compose-tilde-map "gtk-compose" nil t 'keymap) (when (gtk-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: (gtk-define-dead-key acute compose-acute-map) (gtk-define-dead-key grave compose-grave-map) (gtk-define-dead-key cedilla compose-cedilla-map) (gtk-define-dead-key diaeresis compose-diaeresis-map) (gtk-define-dead-key circumflex compose-circumflex-map) (gtk-define-dead-key tilde compose-tilde-map) (gtk-define-dead-key degree compose-ring-map) ;; Sun according to MIT: (gtk-define-dead-key SunFA_Acute compose-acute-map) (gtk-define-dead-key SunFA_Grave compose-grave-map) (gtk-define-dead-key SunFA_Cedilla compose-cedilla-map) (gtk-define-dead-key SunFA_Diaeresis compose-diaeresis-map) (gtk-define-dead-key SunFA_Circum compose-circumflex-map) (gtk-define-dead-key SunFA_Tilde compose-tilde-map) ;; Sun according to OpenWindows 2: (gtk-define-dead-key Dead_Grave compose-grave-map) (gtk-define-dead-key Dead_Circum compose-circumflex-map) (gtk-define-dead-key Dead_Tilde compose-tilde-map) ;; Sun according to OpenWindows 3: (gtk-define-dead-key SunXK_FA_Acute compose-acute-map) (gtk-define-dead-key SunXK_FA_Grave compose-grave-map) (gtk-define-dead-key SunXK_FA_Cedilla compose-cedilla-map) (gtk-define-dead-key SunXK_FA_Diaeresis compose-diaeresis-map) (gtk-define-dead-key SunXK_FA_Circum compose-circumflex-map) (gtk-define-dead-key SunXK_FA_Tilde compose-tilde-map) ;; DEC according to MIT: (gtk-define-dead-key Dacute_accent compose-acute-map) (gtk-define-dead-key Dgrave_accent compose-grave-map) (gtk-define-dead-key Dcedilla_accent compose-cedilla-map) (gtk-define-dead-key Dcircumflex_accent compose-circumflex-map) (gtk-define-dead-key Dtilde compose-tilde-map) (gtk-define-dead-key Dring_accent compose-ring-map) ;; DEC according to OpenWindows 3: (gtk-define-dead-key DXK_acute_accent compose-acute-map) (gtk-define-dead-key DXK_grave_accent compose-grave-map) (gtk-define-dead-key DXK_cedilla_accent compose-cedilla-map) (gtk-define-dead-key DXK_circumflex_accent compose-circumflex-map) (gtk-define-dead-key DXK_tilde compose-tilde-map) (gtk-define-dead-key DXK_ring_accent compose-ring-map) ;; HP according to MIT: (gtk-define-dead-key hpmute_acute compose-acute-map) (gtk-define-dead-key hpmute_grave compose-grave-map) (gtk-define-dead-key hpmute_diaeresis compose-diaeresis-map) (gtk-define-dead-key hpmute_asciicircum compose-circumflex-map) (gtk-define-dead-key hpmute_asciitilde compose-tilde-map) ;; Empirically discovered on Linux XFree86 MetroX: (gtk-define-dead-key usldead_acute compose-acute-map) (gtk-define-dead-key usldead_grave compose-grave-map) (gtk-define-dead-key usldead_diaeresis compose-diaeresis-map) (gtk-define-dead-key usldead_asciicircum compose-circumflex-map) (gtk-define-dead-key usldead_asciitilde compose-tilde-map) ;; HP according to OpenWindows 3: (gtk-define-dead-key hpXK_mute_acute compose-acute-map) (gtk-define-dead-key hpXK_mute_grave compose-grave-map) (gtk-define-dead-key hpXK_mute_diaeresis compose-diaeresis-map) (gtk-define-dead-key hpXK_mute_asciicircum compose-circumflex-map) (gtk-define-dead-key hpXK_mute_asciitilde compose-tilde-map) ;; HP according to HP-UX 8.0: (gtk-define-dead-key XK_mute_acute compose-acute-map) (gtk-define-dead-key XK_mute_grave compose-grave-map) (gtk-define-dead-key XK_mute_diaeresis compose-diaeresis-map) (gtk-define-dead-key XK_mute_asciicircum compose-circumflex-map) (gtk-define-dead-key XK_mute_asciitilde compose-tilde-map) ;; Xfree86 seems to use lower case and a hyphen (gtk-define-dead-key dead-acute compose-acute-map) (gtk-define-dead-key dead-grave compose-grave-map) (gtk-define-dead-key dead-cedilla compose-cedilla-map) (gtk-define-dead-key dead-diaeresis compose-diaeresis-map) (gtk-define-dead-key dead-circum compose-circumflex-map) (gtk-define-dead-key dead-circumflex compose-circumflex-map) (gtk-define-dead-key dead-tilde compose-tilde-map) ) (when (featurep 'gtk) (add-hook 'create-console-hook (lambda (console) (letf (((selected-console) console)) (when (eq 'gtk (console-type console)) (gtk-initialize-compose))))))