Mercurial > hg > xemacs-beta
view src/profile.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 | 8f6a825eb3d3 |
children | 308d34e9f07d |
line wrap: on
line source
/* Profiling. Copyright (C) 2003, 2005 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. */ /* Authorship: Ben Wing: Feb 2003. */ #include "backtrace.h" void mark_profiling_info (void); void profile_record_unwind (struct backtrace *); void profile_record_about_to_call (struct backtrace *); void profile_record_just_called (struct backtrace *); void profile_record_consing (EMACS_INT size); void profile_record_unconsing (EMACS_INT size); extern int profiling_active; /* We call about_to_call() and just_called() depending on the current *dynamic* value of profiling_active (which could change as a result of calling the function) but if we push a backtrace, we must pop it later, so we need to remember the status of this. */ #define PROFILE_DECLARE() \ int do_backtrace = profiling_active || backtrace_with_internal_sections; \ struct backtrace backtrace /* As just mentioned, we rely on the dynamic value of profiling_active. This ensures correct behavior (e.g. we never modify the profiling info when profiling is not active) because we seed and reap all functions currently on the stack when starting and stopping. See `start-profiling'. We check do_backtrace to make sure that the backtrace structure is initialised. If it isn't, we can enter a function with profiling turned off, and exit it with it turned on, with the consequence that an unitialised backtrace structure is passed to profile_record_just_called. Since do_backtrace is function-local (apart from in the garbage collector) this avoids that. */ #define PROFILE_ENTER_FUNCTION() \ do \ { \ if (profiling_active && do_backtrace) \ profile_record_about_to_call (&backtrace); \ } \ while (0) #define PROFILE_EXIT_FUNCTION() \ do \ { \ if (profiling_active && do_backtrace) \ profile_record_just_called (&backtrace); \ } \ while (0) /* We are entering a section that we would like to record profile information about. We put this information into the backtrace list, just like normal functions do. That is one easy way to make sure that we always record info on the innermost section or function, whether section or function. (To do this, we always need some sort of collusion between profile and eval; this is one way.) */ /* Or, we could call xzero() to zero the whole thing, and avoid four of the statements below; or we could create a global backtrace object, uninitialized (i.e. it will be initialized to all 0), and do structure copy to initialize. It's not clear it will make much difference here, but someone who really cared about counting cycles could implement it. */ #define PROFILE_RECORD_ENTERING_SECTION(var) \ do \ { \ if (do_backtrace) \ { \ backtrace.function = &var; \ backtrace.args = NULL; \ backtrace.nargs = UNEVALLED; \ backtrace.evalargs = 0; \ backtrace.pdlcount = specpdl_depth (); \ backtrace.debug_on_exit = 0; \ backtrace.function_being_called = 0; \ PUSH_BACKTRACE (backtrace); \ } \ PROFILE_ENTER_FUNCTION (); \ } while (0) #define PROFILE_RECORD_EXITING_SECTION(var) \ do \ { \ PROFILE_EXIT_FUNCTION (); \ if (do_backtrace) \ POP_BACKTRACE (backtrace); \ } while (0) #define RETURN_EXIT_PROFILING(tag, type, expr) \ do \ { \ type _ret_exitpr_ = (expr); \ PROFILE_RECORD_EXITING_SECTION (tag); \ RETURN_SANS_WARNINGS _ret_exitpr_; \ } while (0) #define RETURN_LISP_EXIT_PROFILING(tag, expr) \ RETURN_EXIT_PROFILING (tag, Lisp_Object, expr) #define RETURN_UNGCPRO_EXIT_PROFILING(tag, expr) \ do \ { \ Lisp_Object ret_ungc_val = (expr); \ UNGCPRO; \ PROFILE_RECORD_EXITING_SECTION (tag); \ RETURN_SANS_WARNINGS ret_ungc_val; \ } while (0) #ifdef DEBUG_XEMACS extern Lisp_Object QSin_temp_spot_1; extern Lisp_Object QSin_temp_spot_2; extern Lisp_Object QSin_temp_spot_3; extern Lisp_Object QSin_temp_spot_4; extern Lisp_Object QSin_temp_spot_5; #endif /* DEBUG_XEMACS */