Mercurial > hg > xemacs-beta

annotate lisp/gtk-glyphs.el @ 5047:07dcc7000bbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
put width before height consistently, fix a real bug found in the process -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-20 Ben Wing <ben@xemacs.org> * EmacsFrame.c (EmacsFrameRecomputeCellSize): * faces.c (default_face_font_info): * faces.c (default_face_width_and_height): * faces.c (Fface_list): * faces.h: * frame-gtk.c (gtk_set_initial_frame_size): * frame-gtk.c (gtk_set_frame_size): * frame-gtk.c (gtk_recompute_cell_sizes): * frame.c: * frame.c (frame_conversion_internal_1): * frame.c (change_frame_size_1): * frame.c (change_frame_size): * glyphs-msw.c (mswindows_combo_box_instantiate): * glyphs-widget.c (widget_instantiate): * glyphs-widget.c (tree_view_query_geometry): * glyphs-widget.c (Fwidget_logical_to_character_width): * glyphs-widget.c (Fwidget_logical_to_character_height): * indent.c (vmotion_pixels): * redisplay-output.c (get_cursor_size_and_location): * redisplay-xlike-inc.c (XLIKE_output_eol_cursor): * redisplay-xlike-inc.c (XLIKE_flash): * redisplay.c (calculate_baseline): * redisplay.c (start_with_point_on_display_line): * redisplay.c (glyph_to_pixel_translation): * redisplay.c (pixel_to_glyph_translation): * window.c (margin_width_internal): * window.c (frame_size_valid_p): * window.c (frame_pixsize_valid_p): * window.c (check_frame_size): * window.c (set_window_pixsize): * window.c (window_pixel_height_to_char_height): * window.c (window_char_height_to_pixel_height): * window.c (window_displayed_height): * window.c (window_pixel_width_to_char_width): * window.c (window_char_width_to_pixel_width): * window.c (change_window_height): * window.c (window_scroll): * window.h: IMPORTANT: Aidan and Carbon Repo, please pay attention and fix appropriately! Rename: default_face_height_and_width -> default_face_width_and_height and reverse width/height arguments. Reverse width/height arguments to the following functions: -- default_face_font_info -- default_face_height_and_width (see above) -- check_frame_size -- frame_size_valid_p (made into a static function) Fix a redisplay bug where args to default_face_height_and_width were in the wrong order.
author Ben Wing <ben@xemacs.org>
date Sat, 20 Feb 2010 18:56:01 -0600
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