annotate lisp/gtk-glyphs.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 0784d089fdc9
children 308d34e9f07d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
1 ;;; gtk-glyphs.el --- Support for glyphs in Gtk
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
2
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
3 ;; Copyright (C) 1994, 1997 Free Software Foundation, Inc.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
4
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
5 ;; Author: Kirill M. Katsnelson <kkm@kis.ru>
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
6 ;; Maintainer: XEmacs Development Team
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
7 ;; Keywords: extensions, internal, dumped
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
8
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
9 ;; This file is part of XEmacs.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
10
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
11 ;; XEmacs is free software; you can redistribute it and/or modify it
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
12 ;; under the terms of the GNU General Public License as published by
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
13 ;; the Free Software Foundation; either version 2, or (at your option)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
14 ;; any later version.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
15
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
16 ;; XEmacs is distributed in the hope that it will be useful, but
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
17 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
19 ;; General Public License for more details.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
20
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
22 ;; along with XEmacs; see the file COPYING. If not, write to the
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
23 ;; Free Software Foundation, 59 Temple Place - Suite 330,
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
24 ;; Boston, MA 02111-1307, USA.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
25
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
26 ;;; Synched up with: Not in FSF.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
27
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
28 ;;; Commentary:
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
29
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
30 ;; This file contains temporary definitions for 'gtk glyphs.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
31 ;; Since there currently is no image support, the glyps are defined
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
32 ;; TTY-style. This file has to be removed or reworked completely
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
33 ;; when we have images.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
34
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
35 ;; This file is dumped with XEmacs.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
36
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
37 ;;; Code:
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
38
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
39 (progn
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
40 (if (featurep 'gtk)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
41 (set-console-type-image-conversion-list
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
42 'gtk
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
43 `(,@(if (featurep 'xpm) '(("\\.xpm\\'" [xpm :file nil] 2)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
44 ("\\.xbm\\'" [xbm :file nil] 2)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
45 ,@(if (featurep 'xpm) '(("\\`/\\* XPM \\*/" [xpm :data nil] 2)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
46 ,@(if (featurep 'xface) '(("\\`X-Face:" [xface :data nil] 2)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
47 ,@(if (featurep 'gif) '(("\\.gif\\'" [gif :file nil] 2)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
48 ("\\`GIF8[79]" [gif :data nil] 2)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
49 ,@(if (featurep 'jpeg) '(("\\.jpe?g\\'" [jpeg :file nil] 2)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
50 ;; all of the JFIF-format JPEG's that I've seen begin with
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
51 ;; the following. I have no idea if this is standard.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
52 ,@(if (featurep 'jpeg) '(("\\`\377\330\377\340\000\020JFIF"
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
53 [jpeg :data nil] 2)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
54 ,@(if (featurep 'png) '(("\\.png\\'" [png :file nil] 2)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
55 ,@(if (featurep 'png) '(("\\`\211PNG" [png :data nil] 2)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
56 ("" [autodetect :data nil] 2))))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
57 (cond ((featurep 'xpm)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
58 (set-glyph-image frame-icon-glyph
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
59 (concat "../etc/" "xemacs-icon3.xpm")
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
60 'global 'gtk)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
61 (set-glyph-image xemacs-logo
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
62 (concat "../etc/"
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
63 (if emacs-beta-version
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
64 "xemacs-beta.xpm"
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
65 "xemacs.xpm"))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
66 'global 'gtk))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
67 (t
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
68 (set-glyph-image xemacs-logo
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
69 "XEmacs <insert spiffy graphic logo here>"
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
70 'global 'gtk)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
71 (set-glyph-image octal-escape-glyph "\\")
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
72 (set-glyph-image control-arrow-glyph "^")
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
73 (set-glyph-image invisible-text-glyph " ...")
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
74 )
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
75
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
76 ;;; gtk-glyphs.el ends here