Mercurial > hg > xemacs-beta
annotate src/gutter.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 | 6728e641994e |
| children | 0ca81354c4c7 |
| rev | line source |
|---|---|
| 428 | 1 /* Define general gutter support. |
| 2 Copyright (C) 1999 Andy Piper. | |
|
5077
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
826
diff
changeset
|
3 Copyright (C) 2010 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 440 | 24 #ifndef INCLUDED_gutter_h_ |
| 25 #define INCLUDED_gutter_h_ | |
| 428 | 26 |
| 27 #include "specifier.h" | |
| 28 | |
| 434 | 29 #define DEVICE_SUPPORTS_GUTTERS_P(d) HAS_DEVMETH_P (d, output_frame_gutters) |
| 428 | 30 |
| 31 DECLARE_SPECIFIER_TYPE (gutter); | |
| 32 #define XGUTTER_SPECIFIER(x) XSPECIFIER_TYPE (x, gutter) | |
| 33 #define GUTTER_SPECIFIERP(x) SPECIFIER_TYPEP (x, gutter) | |
| 34 #define CHECK_GUTTER_SPECIFIER(x) CHECK_SPECIFIER_TYPE (x, gutter) | |
| 35 #define CONCHECK_GUTTER_SPECIFIER(x) CONCHECK_SPECIFIER_TYPE (x, gutter) | |
| 36 | |
| 37 #define DEFAULT_GUTTER_WIDTH 40 | |
| 38 #define DEFAULT_GUTTER_BORDER_WIDTH 2 | |
| 39 | |
| 40 extern Lisp_Object Qgutter; | |
| 41 | |
| 42 extern Lisp_Object Vgutter_size[4]; | |
| 43 extern Lisp_Object Vgutter_border_width[4]; | |
| 44 void update_frame_gutters (struct frame *f); | |
| 442 | 45 void update_frame_gutter_geometry (struct frame *f); |
| 46 void mark_gutters (struct frame* f); | |
| 428 | 47 void init_frame_gutters (struct frame *f); |
| 48 void init_device_gutters (struct device *d); | |
| 49 void init_global_gutters (struct device *d); | |
| 50 void free_frame_gutters (struct frame *f); | |
| 51 void redraw_exposed_gutters (struct frame *f, int x, int y, int width, | |
| 52 int height); | |
| 53 void reset_gutter_display_lines (struct frame* f); | |
| 442 | 54 void gutter_extent_signal_changed_region_maybe (Lisp_Object obj, |
| 665 | 55 Charbpos start, Charbpos end); |
| 446 | 56 int display_boxes_in_gutter_p (struct frame *f, struct display_box* db, |
| 57 struct display_glyph_area* dga); | |
| 428 | 58 |
| 59 #define WINDOW_GUTTER_BORDER_WIDTH(w, pos) \ | |
| 442 | 60 (INTP ((w)->gutter_border_width[pos]) ? XINT ((w)->gutter_border_width[pos]) : 0) |
| 428 | 61 #define WINDOW_GUTTER_SIZE(w, pos) \ |
| 442 | 62 (INTP ((w)->gutter_size[pos]) ? XINT ((w)->gutter_size[pos]) : 0) |
| 428 | 63 #define WINDOW_GUTTER_SIZE_INTERNAL(w, pos) \ |
| 442 | 64 (INTP ((w)->real_gutter_size[pos]) ? XINT ((w)->real_gutter_size[pos]) : 0) |
| 428 | 65 #define WINDOW_GUTTER_VISIBLE(w, pos) \ |
| 442 | 66 ((w)->gutter_visible_p[pos]) |
| 428 | 67 #define WINDOW_GUTTER(w, pos) \ |
| 442 | 68 ((w)->real_gutter[pos]) |
| 69 #define RAW_WINDOW_GUTTER(w, pos) \ | |
| 70 ((w)->gutter[pos]) | |
| 428 | 71 |
| 72 #define WINDOW_REAL_GUTTER_SIZE(w, pos) \ | |
| 73 (!NILP (WINDOW_GUTTER_VISIBLE (w, pos)) \ | |
| 74 ? WINDOW_GUTTER_SIZE_INTERNAL (w, pos) \ | |
| 75 : 0) | |
| 76 #define WINDOW_REAL_GUTTER_VISIBLE(f, pos) \ | |
| 77 (WINDOW_REAL_GUTTER_SIZE (f, pos) > 0) | |
| 78 #define WINDOW_REAL_GUTTER_BORDER_WIDTH(f, pos) \ | |
| 79 ((!NILP (WINDOW_GUTTER_VISIBLE (f, pos)) \ | |
| 80 && WINDOW_GUTTER_SIZE_INTERNAL (f,pos) > 0) \ | |
| 81 ? WINDOW_GUTTER_BORDER_WIDTH (f, pos) \ | |
| 82 : 0) | |
| 83 #define WINDOW_REAL_GUTTER_BOUNDS(f, pos) \ | |
| 84 (WINDOW_REAL_GUTTER_SIZE (f,pos) + \ | |
| 85 2 * WINDOW_REAL_GUTTER_BORDER_WIDTH (f,pos)) | |
| 86 | |
| 87 /* these macros predicate size on position and type of window */ | |
| 88 #define WINDOW_REAL_TOP_GUTTER_BOUNDS(w) \ | |
|
5077
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
826
diff
changeset
|
89 WINDOW_REAL_GUTTER_BOUNDS (w,TOP_EDGE) |
| 428 | 90 #define WINDOW_REAL_BOTTOM_GUTTER_BOUNDS(w) \ |
|
5077
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
826
diff
changeset
|
91 WINDOW_REAL_GUTTER_BOUNDS (w,BOTTOM_EDGE) |
| 428 | 92 #define WINDOW_REAL_LEFT_GUTTER_BOUNDS(w) \ |
|
5077
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
826
diff
changeset
|
93 WINDOW_REAL_GUTTER_BOUNDS (w,LEFT_EDGE) |
| 428 | 94 #define WINDOW_REAL_RIGHT_GUTTER_BOUNDS(w) \ |
|
5077
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
826
diff
changeset
|
95 WINDOW_REAL_GUTTER_BOUNDS (w,RIGHT_EDGE) |
| 428 | 96 |
| 97 #define FRAME_GUTTER_VISIBLE(f, pos) \ | |
| 98 WINDOW_REAL_GUTTER_VISIBLE (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), pos) | |
| 99 #define FRAME_GUTTER_SIZE(f, pos) \ | |
| 100 WINDOW_REAL_GUTTER_SIZE (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), pos) | |
| 101 #define FRAME_GUTTER_BOUNDS(f, pos) \ | |
| 102 WINDOW_REAL_GUTTER_BOUNDS (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), pos) | |
| 103 #define FRAME_GUTTER_BORDER_WIDTH(f, pos) \ | |
| 104 WINDOW_REAL_GUTTER_BORDER_WIDTH (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), pos) | |
| 105 | |
| 106 #define FRAME_GUTTER(f, pos) \ | |
| 107 WINDOW_GUTTER (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), pos) | |
| 108 | |
| 109 /* these macros predicate size on position and type of window */ | |
| 110 #define FRAME_TOP_GUTTER_BOUNDS(f) \ | |
|
5077
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
826
diff
changeset
|
111 WINDOW_REAL_GUTTER_BOUNDS (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), TOP_EDGE) |
| 428 | 112 #define FRAME_BOTTOM_GUTTER_BOUNDS(f) \ |
|
5077
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
826
diff
changeset
|
113 WINDOW_REAL_GUTTER_BOUNDS (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), BOTTOM_EDGE) |
| 428 | 114 #define FRAME_LEFT_GUTTER_BOUNDS(f) \ |
|
5077
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
826
diff
changeset
|
115 WINDOW_REAL_GUTTER_BOUNDS (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), LEFT_EDGE) |
| 428 | 116 #define FRAME_RIGHT_GUTTER_BOUNDS(f) \ |
|
5077
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
826
diff
changeset
|
117 WINDOW_REAL_GUTTER_BOUNDS (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)), RIGHT_EDGE) |
| 428 | 118 |
| 440 | 119 #endif /* INCLUDED_gutter_h_ */ |