Mercurial > hg > xemacs-beta
view lwlib/xt-wrappers.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 | 308d34e9f07d |
line wrap: on
line source
/* Wrappers for Xt functions and macros Copyright (C) 2008 Free Software Foundation This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Original author: Stephen J. Turnbull for 21.5.29 */ /* Generic utility macros, including coping with G++ whining. Used in lwlib via lwlib.h and X consoles via console-x.h. We would prefer to find another way to shut up G++. The issue is that recent versions of the C++ standard deprecate implicit conversions across function boundaries like typedef char *String; void foo (String string); foo ("bar"); because "bar" should be allowed to be a read-only array of chars. But of course lots of legacy code (== X11) declares things as char * and expects to assign literal strings to them. Now, the typedef in the example is important because in G++ 4.3.2 at least, this void foo (const String string); foo ("bar"); does not work as expected! G++ still warns about this construct. However, if foo is declared void foo (const char *string); G++ does not complain. (#### There are two possibilities I can think of. (a) G++ is buggy. (b) "const String" is interpreted as "char * const".) The upshot is that to avoid warnings with Xt's String typedef, we need to arrange to cast literal strings to String, rather than use "const String" in declarations. (My <X11/Intrinsic.h> says that the actual internal typedef used is _XtString, so that String can be #define'd to something else for the purposes of C++. But that doesn't really help us much.) It's not very satisfactory to do it this way -- it would be much better to have const Strings where they make sense -- but it does eliminate a few hundred warnings from the C++ build. And in any case we don't control the many objects declared with String components in Intrinsic.h. The remaining issues are the WEXTTEXT macro used in src/emacs.c, and Emacs.ad.h (where instead of String we use const char * in src/event-Xt.c in the array that #includes it). */ #ifndef INCLUDED_xt_wrappers_h_ #define INCLUDED_xt_wrappers_h_ /* Wrap XtResource, with the same elements as arguments. The cast to String shuts up G++ 4.3's whining about const char *. The invocation of sizeof should be pretty safe, and the cast to XtPointer surely is, since that's how that member of XtResource is declared. It doesn't hide potential problems, because XtPointer is a "generic" type in any case -- the actual object will have a different type, that will be cast to XtPointer. */ #define Xt_RESOURCE(name,_class,intrepr,type,member,extrepr,value) \ { (String) name, (String) _class, (String) intrepr, sizeof(type), \ member, extrepr, (XtPointer) value } /* Wrap XtSetArg, with the same arguments. The cast to String shuts up G++ 4.3's whining about const char *. */ #define Xt_SET_ARG(al, resource, x) do { \ XtSetArg ((al), (String) (resource), (x)); \ } while (0) /* Convenience macros for getting/setting one resource value. */ #define Xt_SET_VALUE(widget, resource, value) do { \ Arg al__; \ Xt_SET_ARG (al__, resource, value); \ XtSetValues (widget, &al__, 1); \ } while (0) #define Xt_GET_VALUE(widget, resource, location) do { \ Arg al__; \ Xt_SET_ARG (al__, resource, location); \ XtGetValues (widget, &al__, 1); \ } while (0) #endif /* INCLUDED_xt_wrappers_h_ */