Mercurial > hg > xemacs-beta
view src/frame.h @ 5077:d372b17f63ce
clean up toolbar/gutter edge geometry
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-25 Ben Wing <ben@xemacs.org>
* EmacsFrame.c (EmacsFrameSetValues):
* frame-impl.h:
* frame-impl.h (struct frame):
* frame-impl.h (FRAME_THEORETICAL_TOP_TOOLBAR_HEIGHT):
* frame-impl.h (FRAME_THEORETICAL_TOP_TOOLBAR_BORDER_WIDTH):
* frame-impl.h (FRAME_REAL_TOP_TOOLBAR_HEIGHT):
* frame-impl.h (FRAME_REAL_TOP_TOOLBAR_BORDER_WIDTH):
* frame-impl.h (FRAME_REAL_TOP_TOOLBAR_VISIBLE):
* frame-impl.h (FRAME_REAL_TOP_TOOLBAR_BOUNDS):
* frame.h:
* frame.h (enum edge_pos):
* gutter.c:
* gutter.c (get_gutter_coords):
* gutter.c (display_boxes_in_gutter_p):
* gutter.c (construct_window_gutter_spec):
* gutter.c (calculate_gutter_size_from_display_lines):
* gutter.c (calculate_gutter_size):
* gutter.c (output_gutter):
* gutter.c (clear_gutter):
* gutter.c (mark_gutters):
* gutter.c (gutter_extent_signal_changed_region_maybe):
* gutter.c (update_gutter_geometry):
* gutter.c (update_frame_gutter_geometry):
* gutter.c (update_frame_gutters):
* gutter.c (reset_gutter_display_lines):
* gutter.c (redraw_exposed_gutter):
* gutter.c (redraw_exposed_gutters):
* gutter.c (free_frame_gutters):
* gutter.c (decode_gutter_position):
* gutter.c (Fset_default_gutter_position):
* gutter.c (Fgutter_pixel_width):
* gutter.c (Fgutter_pixel_height):
* gutter.c (recompute_overlaying_specifier):
* gutter.c (gutter_specs_changed_1):
* gutter.c (gutter_specs_changed):
* gutter.c (top_gutter_specs_changed):
* gutter.c (bottom_gutter_specs_changed):
* gutter.c (left_gutter_specs_changed):
* gutter.c (right_gutter_specs_changed):
* gutter.c (gutter_geometry_changed_in_window):
* gutter.c (init_frame_gutters):
* gutter.c (specifier_vars_of_gutter):
* gutter.h:
* gutter.h (WINDOW_REAL_TOP_GUTTER_BOUNDS):
* gutter.h (FRAME_TOP_GUTTER_BOUNDS):
* lisp.h (enum edge_style):
* native-gtk-toolbar.c:
* native-gtk-toolbar.c (gtk_output_toolbar):
* native-gtk-toolbar.c (gtk_clear_toolbar):
* native-gtk-toolbar.c (gtk_output_frame_toolbars):
* native-gtk-toolbar.c (gtk_initialize_frame_toolbars):
* toolbar-msw.c:
* toolbar-msw.c (TOOLBAR_HANDLE):
* toolbar-msw.c (allocate_toolbar_item_id):
* toolbar-msw.c (mswindows_clear_toolbar):
* toolbar-msw.c (mswindows_output_toolbar):
* toolbar-msw.c (mswindows_move_toolbar):
* toolbar-msw.c (mswindows_redraw_exposed_toolbars):
* toolbar-msw.c (mswindows_initialize_frame_toolbars):
* toolbar-msw.c (mswindows_output_frame_toolbars):
* toolbar-msw.c (mswindows_clear_frame_toolbars):
* toolbar-msw.c (DELETE_TOOLBAR):
* toolbar-msw.c (mswindows_free_frame_toolbars):
* toolbar-msw.c (mswindows_get_toolbar_button_text):
* toolbar-xlike.c:
* toolbar-xlike.c (__prepare_button_area):
* toolbar-xlike.c (XLIKE_OUTPUT_BUTTONS_LOOP):
* toolbar-xlike.c (xlike_output_toolbar):
* toolbar-xlike.c (xlike_clear_toolbar):
* toolbar-xlike.c (xlike_output_frame_toolbars):
* toolbar-xlike.c (xlike_clear_frame_toolbars):
* toolbar-xlike.c (xlike_redraw_exposed_toolbar):
* toolbar-xlike.c (xlike_redraw_exposed_toolbars):
* toolbar-xlike.c (xlike_redraw_frame_toolbars):
* toolbar.c:
* toolbar.c (decode_toolbar_position):
* toolbar.c (Fset_default_toolbar_position):
* toolbar.c (mark_frame_toolbar_buttons_dirty):
* toolbar.c (compute_frame_toolbar_buttons):
* toolbar.c (set_frame_toolbar):
* toolbar.c (compute_frame_toolbars_data):
* toolbar.c (update_frame_toolbars_geometry):
* toolbar.c (init_frame_toolbars):
* toolbar.c (get_toolbar_coords):
* toolbar.c (CHECK_TOOLBAR):
* toolbar.c (toolbar_buttons_at_pixpos):
* toolbar.c (CTB_ERROR):
* toolbar.c (recompute_overlaying_specifier):
* toolbar.c (specifier_vars_of_toolbar):
* toolbar.h:
* toolbar.h (SET_TOOLBAR_WAS_VISIBLE_FLAG):
Create new enum edge_pos with TOP_EDGE, BOTTOM_EDGE, LEFT_EDGE,
RIGHT_EDGE; subsume TOP_BORDER, TOP_GUTTER, enum toolbar_pos,
enum gutter_pos, etc.
Create EDGE_POS_LOOP, subsuming GUTTER_POS_LOOP.
Create NUM_EDGES, use in many places instead of hardcoded '4'.
Instead of top_toolbar_was_visible, bottom_toolbar_was_visible,
etc. make an array toolbar_was_visible[NUM_EDGES]. This increases
the frame size by 15 bytes or so (could be 3 if we use Boolbytes)
but hardly seems w to matter -- frames are heavy weight objects
anyway. Same with top_gutter_was_visible, etc.
Remove duplicated SET_TOOLBAR_WAS_VISIBLE_FLAG and put defn in
one place (toolbar.h).
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Thu, 25 Feb 2010 04:45:13 -0600 |
parents | d0c14ea98592 |
children | 7be849cb8828 |
line wrap: on
line source
/* Define frame-object for XEmacs. Copyright (C) 1988, 1992, 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995, 2002, 2010 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: FSF 19.30. */ #ifndef INCLUDED_frame_h_ #define INCLUDED_frame_h_ #include "redisplay.h" #include "console.h" /* for error_check_frame_type */ struct frame; EXFUN (Fselected_frame, 1); EXFUN (Fdelete_frame, 2); EXFUN (Fframe_iconified_p, 1); EXFUN (Fframe_name, 1); EXFUN (Fframe_property, 3); EXFUN (Fmake_frame, 2); EXFUN (Fmake_frame_visible, 1); EXFUN (Fraise_frame, 1); EXFUN (Fselect_frame, 1); EXFUN (Fset_frame_pointer, 2); EXFUN (Fset_frame_position, 3); EXFUN (Fset_frame_properties, 2); EXFUN (Fset_frame_size, 4); extern Lisp_Object Qbackground_toolbar_color, Qbell_volume, Qborder_color; extern Lisp_Object Qborder_width, Qbottom_toolbar_shadow_color; extern Lisp_Object Qbottom_toolbar_shadow_pixmap, Qdelete_frame; extern Lisp_Object Qdeselect_frame_hook, Qdrag_and_drop_functions, Qgc_pointer; extern Lisp_Object Qiconic, Qinitially_unmapped, Qinter_line_space; extern Lisp_Object Qinternal_border_width, Qinvisible, Qmap_frame_hook; extern Lisp_Object Qminibuffer, Qmodeline_pointer, Qmouse_enter_frame_hook; extern Lisp_Object Qmouse_leave_frame_hook, Qpointer_background; extern Lisp_Object Qpointer_color, Qpopup, Qscrollbar_placement; extern Lisp_Object Qselect_frame_hook, Qspace_pointer; extern Lisp_Object Qsynchronize_minibuffers, Qtext_pointer; extern Lisp_Object Qtoolbar_shadow_thickness, Qtop_toolbar_shadow_color; extern Lisp_Object Qtop_toolbar_shadow_pixmap, Qunmap_frame_hook; extern Lisp_Object Qunsplittable, Quse_backing_store, Qvisible, Qvisual_bell; extern Lisp_Object Vframe_icon_title_format, Vframe_title_format; extern Lisp_Object Vmouse_motion_handler; DECLARE_LRECORD (frame, struct frame); #define XFRAME(x) XRECORD (x, frame, struct frame) #define wrap_frame(p) wrap_record (p, frame) #define FRAMEP(x) RECORDP (x, frame) #define CHECK_FRAME(x) CHECK_RECORD (x, frame) #define CONCHECK_FRAME(x) CONCHECK_RECORD (x, frame) /* Basic properties available to non-privileged users; redefined in frame-impl.h */ int frame_live_p (struct frame *f); Lisp_Object frame_device (struct frame *f); #define FRAME_LIVE_P(f) frame_live_p (f) #define FRAME_DEVICE(f) frame_device (f) #define FRAME_XDEVICE(f) XDEVICE (FRAME_DEVICE (f)) #define FRAME_CONSOLE(f) XDEVICE_CONSOLE (FRAME_DEVICE (f)) #define FRAME_XCONSOLE(f) XCONSOLE (FRAME_CONSOLE (f)) #define XFRAME_DEVICE(f) FRAME_DEVICE (XFRAME (f)) #define XFRAME_XDEVICE(f) XDEVICE (XFRAME_DEVICE (f)) #define XFRAME_CONSOLE(f) XDEVICE_CONSOLE (XFRAME_DEVICE (f)) #define XFRAME_XCONSOLE(f) XCONSOLE (XFRAME_CONSOLE (f)) #define CHECK_LIVE_FRAME(x) do { \ CHECK_FRAME (x); \ if (! FRAME_LIVE_P (XFRAME (x))) \ dead_wrong_type_argument (Qframe_live_p, (x)); \ } while (0) #define CONCHECK_LIVE_FRAME(x) do { \ CONCHECK_FRAME (x); \ if (! FRAME_LIVE_P (XFRAME (x))) \ x = wrong_type_argument (Qframe_live_p, (x)); \ } while (0) #define FW_FRAME(obj) \ (WINDOWP (obj) ? WINDOW_FRAME (XWINDOW (obj)) \ : (FRAMEP (obj) ? obj \ : Qnil)) /* Equivalent in FSF Emacs: FOR_EACH_FRAME (LIST_VAR, FRAME_VAR) followed by a statement is a `for' loop which iterates over the elements of Vframe_list. The loop will set FRAME_VAR, a Lisp_Object, to each frame in Vframe_list in succession and execute the statement. LIST_VAR should be a Lisp_Object too; it is used to iterate through the Vframe_list. */ /* NO_BREAK means that "break" doesn't do what you think it does! Use goto instead. "continue" is OK, though. */ #define FRAME_LOOP_NO_BREAK(frmcons, devcons, concons) \ DEVICE_LOOP_NO_BREAK (devcons, concons) \ DEVICE_FRAME_LOOP (frmcons, XDEVICE (XCAR (devcons))) void update_frame_title (struct frame *f); Lisp_Object next_frame (Lisp_Object, Lisp_Object, Lisp_Object); Lisp_Object previous_frame (Lisp_Object, Lisp_Object, Lisp_Object); void pixel_to_frame_unit_size (struct frame *f, int pixel_width, int pixel_height, int *char_width, int *char_height); void frame_unit_to_pixel_size (struct frame *f, int char_width, int char_height, int *pixel_width, int *pixel_height); void pixel_to_char_size (struct frame *f, int pixel_width, int pixel_height, int *char_width, int *char_height); void char_to_pixel_size (struct frame *f, int char_width, int char_height, int *pixel_width, int *pixel_height); void round_size_to_char (struct frame *f, int in_width, int in_height, int *out_width, int *out_height); void change_frame_size (struct frame *frame, int newlength, int newwidth, int delay); void adjust_frame_size (struct frame *frame); void internal_set_frame_size (struct frame *f, int cols, int rows, int pretend); void frame_size_slipped (Lisp_Object specifier, struct frame *f, Lisp_Object oldval); void select_frame_1 (Lisp_Object frame); void select_frame_2 (Lisp_Object frame); struct frame *selected_frame (void); struct frame *device_selected_frame (struct device *d); struct frame *decode_frame (Lisp_Object frame); struct frame *decode_frame_or_selected (Lisp_Object cdf); Lisp_Object make_frame (struct frame *f); int other_visible_frames (struct frame *f); void delete_frame_internal (struct frame *f, int force, int called_from_delete_device, int from_io_error); void io_error_delete_frame (Lisp_Object frame); Lisp_Object find_some_frame (int (*predicate) (Lisp_Object, void *), void *closure); int device_matches_device_spec (Lisp_Object device, Lisp_Object device_spec); Lisp_Object frame_first_window (struct frame *f); void set_frame_selected_window (struct frame *f, Lisp_Object window); int is_surrogate_for_selected_frame (struct frame *f); void update_frame_icon (struct frame *f); void invalidate_vertical_divider_cache_in_frame (struct frame *f); void init_frame (void); enum edge_pos { TOP_EDGE, BOTTOM_EDGE, LEFT_EDGE, RIGHT_EDGE, NUM_EDGES }; /* Iterate over all possible edge positions */ #define EDGE_POS_LOOP(var) \ for (var = (enum edge_pos) 0; var < NUM_EDGES; \ var = (enum edge_pos) (var + 1)) #endif /* INCLUDED_frame_h_ */