annotate lisp/mule/mule-composite-stub.el @ 5043:d0c14ea98592

various frame-geometry fixes -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-15 Ben Wing <ben@xemacs.org> * EmacsFrame.c: * EmacsFrame.c (EmacsFrameResize): * console-msw-impl.h: * console-msw-impl.h (struct mswindows_frame): * console-msw-impl.h (FRAME_MSWINDOWS_TARGET_RECT): * device-tty.c: * device-tty.c (tty_asynch_device_change): * event-msw.c: * event-msw.c (mswindows_wnd_proc): * faces.c (Fface_list): * faces.h: * frame-gtk.c: * frame-gtk.c (gtk_set_initial_frame_size): * frame-gtk.c (gtk_set_frame_size): * frame-msw.c: * frame-msw.c (mswindows_init_frame_1): * frame-msw.c (mswindows_set_frame_size): * frame-msw.c (mswindows_size_frame_internal): * frame-msw.c (msprinter_init_frame_3): * frame.c: * frame.c (enum): * frame.c (Fmake_frame): * frame.c (adjust_frame_size): * frame.c (store_minibuf_frame_prop): * frame.c (Fframe_property): * frame.c (Fframe_properties): * frame.c (Fframe_displayable_pixel_height): * frame.c (Fframe_displayable_pixel_width): * frame.c (internal_set_frame_size): * frame.c (Fset_frame_height): * frame.c (Fset_frame_pixel_height): * frame.c (Fset_frame_displayable_pixel_height): * frame.c (Fset_frame_width): * frame.c (Fset_frame_pixel_width): * frame.c (Fset_frame_displayable_pixel_width): * frame.c (Fset_frame_size): * frame.c (Fset_frame_pixel_size): * frame.c (Fset_frame_displayable_pixel_size): * frame.c (frame_conversion_internal_1): * frame.c (get_frame_displayable_pixel_size): * frame.c (change_frame_size_1): * frame.c (change_frame_size): * frame.c (generate_title_string): * frame.h: * gtk-xemacs.c: * gtk-xemacs.c (gtk_xemacs_size_request): * gtk-xemacs.c (gtk_xemacs_size_allocate): * gtk-xemacs.c (gtk_xemacs_paint): * gutter.c: * gutter.c (update_gutter_geometry): * redisplay.c (end_hold_frame_size_changes): * redisplay.c (redisplay_frame): * toolbar.c: * toolbar.c (update_frame_toolbars_geometry): * window.c: * window.c (frame_pixsize_valid_p): * window.c (check_frame_size): Various fixes to frame geometry to make it a bit easier to understand and fix some bugs. 1. IMPORTANT: Some renamings. Will need to be applied carefully to the carbon repository, in the following order: -- pixel_to_char_size -> pixel_to_frame_unit_size -- char_to_pixel_size -> frame_unit_to_pixel_size -- pixel_to_real_char_size -> pixel_to_char_size -- char_to_real_pixel_size -> char_to_pixel_size -- Reverse second and third arguments of change_frame_size() and change_frame_size_1() to try to make functions consistent in putting width before height. -- Eliminate old round_size_to_char, because it didn't really do anything differently from round_size_to_real_char() -- round_size_to_real_char -> round_size_to_char; any places that called the old round_size_to_char should just call the new one. 2. IMPORTANT FOR CARBON: The set_frame_size() method is now passed sizes in "frame units", like all other frame-sizing functions, rather than some hacked-up combination of char-cell units and total pixel size. This only affects window systems that use "pixelated geometry", and I'm not sure if Carbon is one of them. MS Windows is pixelated, X and GTK are not. For pixelated-geometry systems, the size in set_frame_size() is in displayable pixels rather than total pixels and needs to be converted appropriately; take a look at the changes made to mswindows_set_frame_size() method if necessary. 3. Add a big long comment in frame.c describing how frame geometry works. 4. Remove MS Windows-specific character height and width fields, duplicative and unused. 5. frame-displayable-pixel-* and set-frame-displayable-pixel-* didn't use to work on MS Windows, but they do now. 6. In general, clean up the handling of "pixelated geometry" so that fewer functions have to worry about this. This is really an abomination that should be removed entirely but that will have to happen later. Fix some buggy code in frame_conversion_internal() that happened to "work" because it was countered by oppositely buggy code in change_frame_size(). 7. Clean up some frame-size code in toolbar.c and use functions already provided in frame.c instead of rolling its own. 8. Fix check_frame_size() in window.c, which formerly didn't take pixelated geometry into account.
author Ben Wing <ben@xemacs.org>
date Mon, 15 Feb 2010 22:14:11 -0600
parents 2923009caf47
children 308d34e9f07d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
778
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
1 ;;; mule-composite-stub.el --- Stubs of composition support -*- coding: iso-2022-7bit; -*-
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
2
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
3 ;; Copyright (C) 2002 Ben Wing.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
4
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
5 ;; Keywords: multibyte character, composition
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
6
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
7 ;; This file is part of XEmacs.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
8
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
9 ;; XEmacs is free software; you can redistribute it and/or modify it
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
10 ;; under the terms of the GNU General Public License as published by
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
11 ;; the Free Software Foundation; either version 2, or (at your option)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
12 ;; any later version.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
13
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
14 ;; XEmacs is distributed in the hope that it will be useful, but
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
15 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
17 ;; General Public License for more details.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
18
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
19 ;; You should have received a copy of the GNU General Public License
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
20 ;; along with XEmacs; see the file COPYING. If not, write to the Free
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
21 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
22 ;; 02111-1307, USA.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
23
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
24 ;;; Synched up with: Emacs 21.1 (src/fontset.c, src/composite.c).
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
25
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
26 ;;; Commentary:
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
27
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
28 ;;; Code:
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
29
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
30 (defvar use-default-ascent (make-char-table 'generic)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
31 "UNIMPLEMENTED.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
32 Char table of characters whose ascent values should be ignored.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
33 If an entry for a character is non-nil, the ascent value of the glyph
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
34 is assumed to be what specified by _MULE_DEFAULT_ASCENT property of a font.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
35
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
36 This affects how a composite character which contains
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
37 such a character is displayed on screen.")
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
38
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
39 (defvar ignore-relative-composition (make-char-table 'generic)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
40 "UNIMPLEMENTED.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
41 Char table of characters which is not composed relatively.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
42 If an entry for a character is non-nil, a composition sequence
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
43 which contains that character is displayed so that
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
44 the glyph of that character is put without considering
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
45 an ascent and descent value of a previous character.")
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
46
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
47 (defvar compose-chars-after-function 'compose-chars-after
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
48 "UNIMPLEMENTED.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
49 Function to adjust composition of buffer text.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
50
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
51 The function is called with three arguments FROM, TO, and OBJECT.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
52 FROM and TO specify the range of text of which composition should be
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
53 adjusted. OBJECT, if non-nil, is a string that contains the text.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
54
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
55 This function is called after a text with `composition' property is
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
56 inserted or deleted to keep `composition' property of buffer text
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
57 valid.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
58
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
59 The default value is the function `compose-chars-after'.")
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
60
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
61 (defvar composition-function-table (make-char-table 'generic)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
62 "UNIMPLEMENTED.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
63 Char table of patterns and functions to make a composition.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
64
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
65 Each element is nil or an alist of PATTERNs vs FUNCs, where PATTERNs
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
66 are regular expressions and FUNCs are functions. FUNC is responsible
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
67 for composing text matching the corresponding PATTERN. FUNC is called
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
68 with three arguments FROM, TO, and PATTERN. See the function
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
69 `compose-chars-after' for more detail.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
70
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
71 This table is looked up by the first character of a composition when
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
72 the composition gets invalid after a change in a buffer.")
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
73
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
74 (defun compose-region-internal (start end &optional components mod-func)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
75 "UNIMPLEMENTED.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
76 Internal use only.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
77
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
78 Compose text in the region between START and END.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
79 Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
80 for the composition. See `compose-region' for more detial."
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
81 nil)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
82
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
83 (defun compose-string-internal (string start end &optional components mod-func)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
84 "UNIMPLEMENTED.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
85 Internal use only.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
86
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
87 Compose text between indices START and END of STRING.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
88 Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
89 for the composition. See `compose-string' for more detial."
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
90 nil)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
91
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
92 (defun find-composition-internal (pos limit string detail-p)
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
93 "UNIMPLEMENTED.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
94 Internal use only.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
95
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
96 Return information about composition at or nearest to position POS.
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
97 See `find-composition' for more detail."
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents:
diff changeset
98 nil)