Mercurial > hg > xemacs-beta
annotate lisp/version.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 | 788c38f20376 |
children | 5efbd1253905 |
rev | line source |
---|---|
428 | 1 ;; version.el --- Record version number of Emacs. |
2 | |
3 ;; Copyright (C) 1985, 1991-1994, 1997 Free Software Foundation, Inc. | |
4 | |
5 ;; Maintainer: XEmacs Development Team | |
6 ;; Keywords: internal, dumped | |
7 | |
8 ;; This file is part of XEmacs. | |
9 | |
10 ;; XEmacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
12 ;; the Free Software Foundation; either version 2, or (at your option) | |
13 ;; any later version. | |
14 | |
15 ;; XEmacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
613 | 21 ;; along with XEmacs; see the file COPYING. If not, write to the |
428 | 22 ;; Free Software Foundation Inc., 59 Temple Place - Suite 330, |
23 ;; Boston, MA 02111-1307, USA. | |
24 | |
25 ;;; Synched up with: FSF 19.34. | |
26 | |
27 ;;; Commentary: | |
28 | |
29 ;; This file is dumped with XEmacs. | |
30 | |
31 ;;; Code: | |
32 | |
33 (defconst xemacs-betaname | |
34 (and emacs-beta-version (format "(beta%d)" emacs-beta-version)) | |
35 "Non-nil when this is a test (beta) version of XEmacs. | |
4519
41c84a94258b
Improve beta-version-name docstring.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4246
diff
changeset
|
36 Warning, this variable did not exist in XEmacs versions prior to 20.3. |
4523
6a3006b37260
Fix docstring typo (and commit only this fix).
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4522
diff
changeset
|
37 Its value is derived from `emacs-beta-version'. It is mutually exclusive |
4519
41c84a94258b
Improve beta-version-name docstring.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4246
diff
changeset
|
38 with `emacs-patch-level'.") |
428 | 39 |
40 (defconst emacs-version | |
975 | 41 (format "%d.%d %s%s%s%s%s" |
444 | 42 emacs-major-version |
43 emacs-minor-version | |
44 (if emacs-patch-level | |
45 (format "(patch %d)" emacs-patch-level) | |
46 "") | |
47 (if xemacs-betaname | |
48 (concat " " xemacs-betaname) | |
49 "") | |
50 (if xemacs-codename | |
51 (concat " \"" xemacs-codename "\"") | |
52 "") | |
975 | 53 (if xemacs-extra-name |
54 (concat " " xemacs-extra-name) | |
55 "") | |
444 | 56 " XEmacs Lucid") |
428 | 57 "Version numbers of this version of XEmacs.") |
58 | |
59 (if (featurep 'infodock) | |
60 (require 'id-vers)) | |
61 | |
62 ;; Moved to C code as of XEmacs 20.3 | |
63 ;(defconst emacs-major-version | |
64 ; (progn (or (string-match "^[0-9]+" emacs-version) | |
65 ; (error "emacs-version unparsable")) | |
66 ; (string-to-int (match-string 0 emacs-version))) | |
67 ; "Major version number of this version of Emacs, as an integer. | |
68 ;Warning, this variable did not exist in Emacs versions earlier than: | |
69 ; FSF Emacs: 19.23 | |
70 ; XEmacs: 19.10") | |
71 | |
72 ;; Moved to C code as of XEmacs 20.3 | |
73 ;(defconst emacs-minor-version | |
74 ; (progn (or (string-match "^[0-9]+\\.\\([0-9]+\\)" emacs-version) | |
75 ; (error "emacs-version unparsable")) | |
76 ; (string-to-int (match-string 1 emacs-version))) | |
77 ; "Minor version number of this version of Emacs, as an integer. | |
78 ;Warning, this variable did not exist in Emacs versions earlier than: | |
79 ; FSF Emacs: 19.23 | |
80 ; XEmacs: 19.10") | |
81 | |
82 (defconst emacs-build-time (current-time-string) | |
83 "Time at which Emacs was dumped out.") | |
84 | |
85 (defconst emacs-build-system (system-name)) | |
86 | |
87 (defun emacs-version (&optional arg) | |
88 "Return string describing the version of Emacs that is running. | |
89 When called interactively with a prefix argument, insert string at point. | |
90 Don't use this function in programs to choose actions according | |
91 to the system configuration; look at `system-configuration' instead." | |
92 (interactive "p") | |
93 (save-match-data | |
94 (let ((version-string | |
95 (format | |
96 "XEmacs %s %s(%s%s) of %s %s on %s" | |
97 (substring emacs-version 0 (string-match " XEmacs" emacs-version)) | |
98 (if (not (featurep 'infodock)) | |
99 "[Lucid] " | |
100 "") | |
101 system-configuration | |
102 (cond ((or (and (fboundp 'featurep) | |
103 (featurep 'mule)) | |
104 (memq 'mule features)) ", Mule") | |
105 (t "")) | |
106 (substring emacs-build-time 0 | |
107 (string-match " *[0-9]*:" emacs-build-time)) | |
108 (substring emacs-build-time | |
109 (string-match "[0-9]*$" emacs-build-time)) | |
110 emacs-build-system))) | |
111 (cond | |
112 ((null arg) version-string) | |
113 ((eq arg 1) (message "%s" version-string)) | |
114 (t (insert version-string)))))) | |
115 | |
116 ;; from emacs-vers.el | |
117 (defun emacs-version>= (major &optional minor patch) | |
118 "Return true if the Emacs version is >= to the given MAJOR, MINOR, | |
119 and PATCH numbers. | |
120 The MAJOR version number argument is required, but the other arguments | |
121 argument are optional. Only the Non-nil arguments are used in the test." | |
122 (let ((emacs-patch (or emacs-patch-level emacs-beta-version -1))) | |
123 (cond ((> emacs-major-version major)) | |
124 ((< emacs-major-version major) nil) | |
125 ((null minor)) | |
126 ((> emacs-minor-version minor)) | |
127 ((< emacs-minor-version minor) nil) | |
128 ((null patch)) | |
129 ((>= emacs-patch patch))))) | |
130 | |
131 ;;; We hope that this alias is easier for people to find. | |
132 (define-function 'version 'emacs-version) | |
133 | |
4246 | 134 (defvar Installation-file-coding-system |
135 (eval-when-compile `,(coding-system-name (find-coding-system 'native))) | |
136 "The coding system used to create the `Installation' file. | |
137 | |
138 The `Installation' file is created by configure, and the | |
139 `Installation-string' variable reflects its contents. | |
140 | |
141 This is initialized to reflect the native coding system at the time | |
142 version.el was byte-compiled; ideally it would reflect the native coding | |
143 system of the environment when XEmacs was dumped, but the locale | |
144 initialization code isn't called at dump time, and the appropriate value | |
145 at byte-compile time should be close enough. Note that this means that the | |
146 value of `Installation-string' during dump time thus reflects loading the | |
147 file using the `binary' coding system. ") | |
428 | 148 |
4246 | 149 (defvar Installation-string |
150 ;; Initialize Installation-string. We do it before loading | |
151 ;; anything so that dumped code can make use of its value. | |
152 (save-current-buffer | |
153 (set-buffer (get-buffer-create (generate-new-buffer-name | |
154 " *temp*"))) | |
155 (insert-file-contents-internal | |
156 (expand-file-name "Installation" build-directory) | |
157 ;; Relies on our working out the system coding system | |
158 ;; correctly at startup. | |
159 nil nil nil nil | |
160 ;; Installation-file-coding-system is actually respected in | |
161 ;; mule/general-late.el, after all the dumped coding systems have been | |
162 ;; loaded. | |
163 'binary) | |
164 (prog1 (buffer-substring) | |
165 (kill-buffer (current-buffer)))) | |
166 "Description of XEmacs installation. | |
428 | 167 |
4246 | 168 This reflects the values that the configure script worked out at build time, |
169 including things like the C code features included at compile time and the | |
170 installation prefix. Normally used when submitting a bug report; | |
171 occasionally used, in a way the XEmacs developers don't endorse, to work out | |
172 version information. ") | |
173 | |
5004
788c38f20376
Do not assume #'format-decode exists in fileio.c.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4523
diff
changeset
|
174 ;;; version.el ends here |