comparison src/frame.h @ 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 2ade80e8c640
children d372b17f63ce 2a462149bd6a
comparison
equal deleted inserted replaced
5042:f395ee7ad844 5043:d0c14ea98592
1 /* Define frame-object for XEmacs. 1 /* Define frame-object for XEmacs.
2 Copyright (C) 1988, 1992, 1993, 1994 Free Software Foundation, Inc. 2 Copyright (C) 1988, 1992, 1993, 1994 Free Software Foundation, Inc.
3 Copyright (C) 1995, 2002 Ben Wing. 3 Copyright (C) 1995, 2002, 2010 Ben Wing.
4 4
5 This file is part of XEmacs. 5 This file is part of XEmacs.
6 6
7 XEmacs is free software; you can redistribute it and/or modify it 7 XEmacs is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
118 DEVICE_FRAME_LOOP (frmcons, XDEVICE (XCAR (devcons))) 118 DEVICE_FRAME_LOOP (frmcons, XDEVICE (XCAR (devcons)))
119 119
120 void update_frame_title (struct frame *f); 120 void update_frame_title (struct frame *f);
121 Lisp_Object next_frame (Lisp_Object, Lisp_Object, Lisp_Object); 121 Lisp_Object next_frame (Lisp_Object, Lisp_Object, Lisp_Object);
122 Lisp_Object previous_frame (Lisp_Object, Lisp_Object, Lisp_Object); 122 Lisp_Object previous_frame (Lisp_Object, Lisp_Object, Lisp_Object);
123 void pixel_to_frame_unit_size (struct frame *f, int pixel_width, int pixel_height,
124 int *char_width, int *char_height);
125 void frame_unit_to_pixel_size (struct frame *f, int char_width, int char_height,
126 int *pixel_width, int *pixel_height);
123 void pixel_to_char_size (struct frame *f, int pixel_width, int pixel_height, 127 void pixel_to_char_size (struct frame *f, int pixel_width, int pixel_height,
124 int *char_width, int *char_height); 128 int *char_width, int *char_height);
125 void char_to_pixel_size (struct frame *f, int char_width, int char_height, 129 void char_to_pixel_size (struct frame *f, int char_width, int char_height,
126 int *pixel_width, int *pixel_height); 130 int *pixel_width, int *pixel_height);
127 void round_size_to_char (struct frame *f, int in_width, int in_height, 131 void round_size_to_char (struct frame *f, int in_width, int in_height,
128 int *out_width, int *out_height); 132 int *out_width, int *out_height);
129 void pixel_to_real_char_size (struct frame *f, int pixel_width, int pixel_height,
130 int *char_width, int *char_height);
131 void char_to_real_pixel_size (struct frame *f, int char_width, int char_height,
132 int *pixel_width, int *pixel_height);
133 void round_size_to_real_char (struct frame *f, int in_width, int in_height,
134 int *out_width, int *out_height);
135 void change_frame_size (struct frame *frame, 133 void change_frame_size (struct frame *frame,
136 int newlength, int newwidth, 134 int newlength, int newwidth,
137 int delay); 135 int delay);
138 void adjust_frame_size (struct frame *frame); 136 void adjust_frame_size (struct frame *frame);
137 void internal_set_frame_size (struct frame *f, int cols, int rows,
138 int pretend);
139 void frame_size_slipped (Lisp_Object specifier, struct frame *f, 139 void frame_size_slipped (Lisp_Object specifier, struct frame *f,
140 Lisp_Object oldval); 140 Lisp_Object oldval);
141 void select_frame_1 (Lisp_Object frame); 141 void select_frame_1 (Lisp_Object frame);
142 void select_frame_2 (Lisp_Object frame); 142 void select_frame_2 (Lisp_Object frame);
143 struct frame *selected_frame (void); 143 struct frame *selected_frame (void);