Mercurial > hg > xemacs-beta
view src/opaque.c @ 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 | 6ef8256a020a |
children | b5df3737028a |
line wrap: on
line source
/* Opaque Lisp objects. Copyright (C) 1993, 1994, 1995 Sun Microsystems, Inc. Copyright (C) 1995, 1996, 2002 Ben Wing. 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. */ /* Written by Ben Wing, October 1993. */ /* "Opaque" is used internally to hold keep track of allocated memory so it gets GC'd properly, and to store arbitrary data in places where a Lisp_Object is required and which may get GC'd. (e.g. as the argument to record_unwind_protect()). Once created in C, opaque objects cannot be resized. OPAQUE OBJECTS SHOULD NEVER ESCAPE TO THE LISP LEVEL. Some code depends on this. As such, opaque objects are a generalization of the Qunbound marker. */ #include <config.h> #include "lisp.h" #include "opaque.h" #ifndef NEW_GC Lisp_Object Vopaque_ptr_free_list; #endif /* not NEW_GC */ /* Should never, ever be called. (except by an external debugger) */ static void print_opaque (Lisp_Object obj, Lisp_Object printcharfun, int UNUSED (escapeflag)) { const Lisp_Opaque *p = XOPAQUE (obj); write_fmt_string (printcharfun, "#<INTERNAL OBJECT (XEmacs bug?) (opaque, size=%lu) 0x%lx>", (long)(p->size), (unsigned long) p); } inline static Bytecount aligned_sizeof_opaque (Bytecount opaque_size) { return MAX_ALIGN_SIZE (offsetof (Lisp_Opaque, data) + opaque_size); } static Bytecount sizeof_opaque (const void *header) { return aligned_sizeof_opaque (((const Lisp_Opaque *) header)->size); } /* Return an opaque object of size SIZE. If DATA is OPAQUE_CLEAR, the object's data is memset to '\0' bytes. If DATA is OPAQUE_UNINIT, the object's data is uninitialized. Else the object's data is initialized by copying from DATA. */ Lisp_Object make_opaque (const void *data, Bytecount size) { Lisp_Opaque *p = (Lisp_Opaque *) BASIC_ALLOC_LCRECORD (aligned_sizeof_opaque (size), &lrecord_opaque); p->size = size; if (data == OPAQUE_CLEAR) memset (p->data, '\0', size); else if (data == OPAQUE_UNINIT) DO_NOTHING; else memcpy (p->data, data, size); { return wrap_opaque (p); } } /* This will not work correctly for opaques with subobjects! */ static int equal_opaque (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth), int UNUSED (foldcase)) { Bytecount size; return ((size = XOPAQUE_SIZE (obj1)) == XOPAQUE_SIZE (obj2) && !memcmp (XOPAQUE_DATA (obj1), XOPAQUE_DATA (obj2), size)); } /* This will not work correctly for opaques with subobjects! */ static Hashcode hash_opaque (Lisp_Object obj, int UNUSED (depth)) { if (XOPAQUE_SIZE (obj) == sizeof (unsigned long)) return *((Hashcode *) XOPAQUE_DATA (obj)); else return memory_hash (XOPAQUE_DATA (obj), XOPAQUE_SIZE (obj)); } static const struct memory_description opaque_description[] = { { XD_END } }; DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION ("opaque", opaque, 1, /*dumpable-flag*/ 0, print_opaque, 0, equal_opaque, hash_opaque, opaque_description, sizeof_opaque, Lisp_Opaque); /* stuff to handle opaque pointers */ /* Should never, ever be called. (except by an external debugger) */ static void print_opaque_ptr (Lisp_Object obj, Lisp_Object printcharfun, int UNUSED (escapeflag)) { const Lisp_Opaque_Ptr *p = XOPAQUE_PTR (obj); write_fmt_string (printcharfun, "#<INTERNAL OBJECT (XEmacs bug?) (opaque-ptr, adr=0x%lx) 0x%lx>", (long)(p->ptr), (unsigned long) p); } static int equal_opaque_ptr (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth), int UNUSED (foldcase)) { return (XOPAQUE_PTR (obj1)->ptr == XOPAQUE_PTR (obj2)->ptr); } static Hashcode hash_opaque_ptr (Lisp_Object obj, int UNUSED (depth)) { return (Hashcode) XOPAQUE_PTR (obj)->ptr; } static const struct memory_description opaque_ptr_description[] = { { XD_END } }; DEFINE_LRECORD_IMPLEMENTATION ("opaque-ptr", opaque_ptr, 0, /*dumpable-flag*/ 0, print_opaque_ptr, 0, equal_opaque_ptr, hash_opaque_ptr, opaque_ptr_description, Lisp_Opaque_Ptr); Lisp_Object make_opaque_ptr (void *val) { #ifdef NEW_GC Lisp_Object res = wrap_pointer_1 (alloc_lrecord_type (Lisp_Opaque_Ptr, &lrecord_opaque_ptr)); #else /* not NEW_GC */ Lisp_Object res = alloc_managed_lcrecord (Vopaque_ptr_free_list); #endif /* not NEW_GC */ set_opaque_ptr (res, val); return res; } /* Be very very careful with this. Same admonitions as with free_cons() apply. */ void free_opaque_ptr (Lisp_Object ptr) { #ifdef NEW_GC free_lrecord (ptr); #else /* not NEW_GC */ free_managed_lcrecord (Vopaque_ptr_free_list, ptr); #endif /* not NEW_GC */ } #ifndef NEW_GC void reinit_opaque_early (void) { Vopaque_ptr_free_list = make_lcrecord_list (sizeof (Lisp_Opaque_Ptr), &lrecord_opaque_ptr); staticpro_nodump (&Vopaque_ptr_free_list); } #endif /* not NEW_GC */ void init_opaque_once_early (void) { INIT_LRECORD_IMPLEMENTATION (opaque); INIT_LRECORD_IMPLEMENTATION (opaque_ptr); #ifndef NEW_GC reinit_opaque_early (); #endif /* not NEW_GC */ }