Mercurial > hg > xemacs-beta

comparison src/gutter.h @ 5077:d372b17f63ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 6728e641994e
children 0ca81354c4c7
comparison
equal deleted inserted replaced
5076:d555581e3cba 5077:d372b17f63ce
1 /* Define general gutter support. 1 /* Define general gutter support.
2 Copyright (C) 1999 Andy Piper. 2 Copyright (C) 1999 Andy Piper.
3 Copyright (C) 2010 Ben Wing.
3 4
4 This file is part of XEmacs. 5 This file is part of XEmacs.
5 6
6 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
7 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
33 #define CHECK_GUTTER_SPECIFIER(x) CHECK_SPECIFIER_TYPE (x, gutter) 34 #define CHECK_GUTTER_SPECIFIER(x) CHECK_SPECIFIER_TYPE (x, gutter)
34 #define CONCHECK_GUTTER_SPECIFIER(x) CONCHECK_SPECIFIER_TYPE (x, gutter) 35 #define CONCHECK_GUTTER_SPECIFIER(x) CONCHECK_SPECIFIER_TYPE (x, gutter)
35 36
36 #define DEFAULT_GUTTER_WIDTH 40 37 #define DEFAULT_GUTTER_WIDTH 40
37 #define DEFAULT_GUTTER_BORDER_WIDTH 2 38 #define DEFAULT_GUTTER_BORDER_WIDTH 2
38
39 enum gutter_pos
40 {
41 TOP_GUTTER = 0,
42 BOTTOM_GUTTER = 1,
43 LEFT_GUTTER = 2,
44 RIGHT_GUTTER = 3
45 };
46
47 /* Iterate over all possible gutter positions */
48 #define GUTTER_POS_LOOP(var) \
49 for (var = (enum gutter_pos) 0; var < 4; var = (enum gutter_pos) (var + 1))
50 39
51 extern Lisp_Object Qgutter; 40 extern Lisp_Object Qgutter;
52 41
53 extern Lisp_Object Vgutter_size[4]; 42 extern Lisp_Object Vgutter_size[4];
54 extern Lisp_Object Vgutter_border_width[4]; 43 extern Lisp_Object Vgutter_border_width[4];
95 (WINDOW_REAL_GUTTER_SIZE (f,pos) + \ 84 (WINDOW_REAL_GUTTER_SIZE (f,pos) + \
96 2 * WINDOW_REAL_GUTTER_BORDER_WIDTH (f,pos)) 85 2 * WINDOW_REAL_GUTTER_BORDER_WIDTH (f,pos))
97 86
98 /* these macros predicate size on position and type of window */ 87 /* these macros predicate size on position and type of window */
99 #define WINDOW_REAL_TOP_GUTTER_BOUNDS(w) \ 88 #define WINDOW_REAL_TOP_GUTTER_BOUNDS(w) \
100 WINDOW_REAL_GUTTER_BOUNDS (w,TOP_GUTTER) 89 WINDOW_REAL_GUTTER_BOUNDS (w,TOP_EDGE)
101 #define WINDOW_REAL_BOTTOM_GUTTER_BOUNDS(w) \ 90 #define WINDOW_REAL_BOTTOM_GUTTER_BOUNDS(w) \
102 WINDOW_REAL_GUTTER_BOUNDS (w,BOTTOM_GUTTER) 91 WINDOW_REAL_GUTTER_BOUNDS (w,BOTTOM_EDGE)
103 #define WINDOW_REAL_LEFT_GUTTER_BOUNDS(w) \ 92 #define WINDOW_REAL_LEFT_GUTTER_BOUNDS(w) \
104 WINDOW_REAL_GUTTER_BOUNDS (w,LEFT_GUTTER) 93 WINDOW_REAL_GUTTER_BOUNDS (w,LEFT_EDGE)
105 #define WINDOW_REAL_RIGHT_GUTTER_BOUNDS(w) \ 94 #define WINDOW_REAL_RIGHT_GUTTER_BOUNDS(w) \
106 WINDOW_REAL_GUTTER_BOUNDS (w,RIGHT_GUTTER) 95 WINDOW_REAL_GUTTER_BOUNDS (w,RIGHT_EDGE)
107 96
108 #define FRAME_GUTTER_VISIBLE(f, pos) \ 97 #define FRAME_GUTTER_VISIBLE(f, pos) \
109 WINDOW_REAL_GUTTER_VISIBLE (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), pos) 98 WINDOW_REAL_GUTTER_VISIBLE (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), pos)
110 #define FRAME_GUTTER_SIZE(f, pos) \ 99 #define FRAME_GUTTER_SIZE(f, pos) \
111 WINDOW_REAL_GUTTER_SIZE (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), pos) 100 WINDOW_REAL_GUTTER_SIZE (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), pos)
117 #define FRAME_GUTTER(f, pos) \ 106 #define FRAME_GUTTER(f, pos) \
118 WINDOW_GUTTER (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), pos) 107 WINDOW_GUTTER (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), pos)
119 108
120 /* these macros predicate size on position and type of window */ 109 /* these macros predicate size on position and type of window */
121 #define FRAME_TOP_GUTTER_BOUNDS(f) \ 110 #define FRAME_TOP_GUTTER_BOUNDS(f) \
122 WINDOW_REAL_GUTTER_BOUNDS (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), TOP_GUTTER) 111 WINDOW_REAL_GUTTER_BOUNDS (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), TOP_EDGE)
123 #define FRAME_BOTTOM_GUTTER_BOUNDS(f) \ 112 #define FRAME_BOTTOM_GUTTER_BOUNDS(f) \
124 WINDOW_REAL_GUTTER_BOUNDS (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), BOTTOM_GUTTER) 113 WINDOW_REAL_GUTTER_BOUNDS (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), BOTTOM_EDGE)
125 #define FRAME_LEFT_GUTTER_BOUNDS(f) \ 114 #define FRAME_LEFT_GUTTER_BOUNDS(f) \
126 WINDOW_REAL_GUTTER_BOUNDS (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), LEFT_GUTTER) 115 WINDOW_REAL_GUTTER_BOUNDS (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), LEFT_EDGE)
127 #define FRAME_RIGHT_GUTTER_BOUNDS(f) \ 116 #define FRAME_RIGHT_GUTTER_BOUNDS(f) \
128 WINDOW_REAL_GUTTER_BOUNDS (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), RIGHT_GUTTER) 117 WINDOW_REAL_GUTTER_BOUNDS (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), RIGHT_EDGE)
129 118
130 #endif /* INCLUDED_gutter_h_ */ 119 #endif /* INCLUDED_gutter_h_ */