annotate tests/frame.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 931aaa7a6b37
children 308d34e9f07d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4980
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
1 ;;; Test geometry setting for frames.
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
2 ;;;
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
3 ;;; Copyright (C) 1997 Martin Buchholz
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
4 ;;;
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
5 ;;; This file is part of XEmacs.
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
6 ;;;
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
7 ;;; XEmacs is free software; you can redistribute it and/or modify it
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
8 ;;; under the terms of the GNU General Public License as published by
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
9 ;;; the Free Software Foundation; either version 2, or (at your
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
10 ;;; option) any later version.
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
11 ;;;
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
12 ;;; XEmacs is distributed in the hope that it will be useful, but
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
13 ;;; WITHOUT ANY WARRANTY; without even the implied warranty of
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
14 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
15 ;;; General Public License for more details.
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
16 ;;;
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
17 ;;; You should have received a copy of the GNU General Public License
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
18 ;;; along with XEmacs; see the file COPYING. If not, write to the Free
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
19 ;;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
20 ;;; Boston, MA 02110-1301, USA.
931aaa7a6b37 Martin Buchholz claims tests/frame.el.
Jerry James <james@xemacs.org>
parents: 108
diff changeset
21
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
22 (defmacro check-frame-geometry (xx yy)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
23 `(loop for frame in (list nil (selected-frame))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
24 do
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
25 (assert (eq (frame-property frame 'top) ,yy))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
26 (assert (eq (frame-property frame 'left) ,xx))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
27 (assert (eq (frame-property frame 'top) ,yy))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
28 (assert (eq (frame-property frame 'left) ,xx))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
29 (loop for plist in
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
30 (list (frame-properties)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
31 (frame-properties nil)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
32 (frame-properties (selected-frame)))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
33 do
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
34 (assert (eq (plist-get plist 'top) ,yy))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
35 (assert (eq (plist-get plist 'left) ,xx)))))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
36
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
37 (loop for (x y) in '((0 0) (1 1) (3 3) (9 9) (10 20) (20 40) (40 80) (100 200))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
38 do
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
39 (loop for frame in (list nil (selected-frame))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
40 do
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
41 (set-frame-properties frame `(left ,x top ,y))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
42 (check-frame-geometry x y)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
43 (set-frame-property frame 'top (+ y 3))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
44 (check-frame-geometry x (+ y 3))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
45 (set-frame-property frame 'left (+ x 3))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents:
diff changeset
46 (check-frame-geometry (+ x 3) (+ y 3))))