Mercurial > hg > xemacs-beta
annotate src/toolbar.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 | 1e7cc382eb16 |
children | 7be849cb8828 |
rev | line source |
---|---|
428 | 1 /* Define general toolbar support. |
2 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
5077
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
3 Copyright (C) 1995, 1996, 2010 Ben Wing. |
428 | 4 Copyright (C) 1996 Chuck Thompson. |
5 | |
6 This file is part of XEmacs. | |
7 | |
8 XEmacs is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
10 Free Software Foundation; either version 2, or (at your option) any | |
11 later version. | |
12 | |
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
19 along with XEmacs; see the file COPYING. If not, write to | |
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
21 Boston, MA 02111-1307, USA. */ | |
22 | |
23 /* Synched up with: Not in FSF. */ | |
24 | |
440 | 25 #ifndef INCLUDED_toolbar_h_ |
26 #define INCLUDED_toolbar_h_ | |
428 | 27 |
28 #ifdef HAVE_TOOLBARS | |
29 | |
30 #include "specifier.h" | |
31 | |
32 #define FRAME_TOOLBAR_BUTTONS(frame, pos) \ | |
33 ((frame)->toolbar_buttons[pos]) | |
34 #define FRAME_CURRENT_TOOLBAR_SIZE(frame, pos) \ | |
35 ((frame)->current_toolbar_size[pos]) | |
5077
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
36 #define SET_TOOLBAR_WAS_VISIBLE_FLAG(frame, pos, flag) \ |
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
37 do { \ |
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
38 (frame)->toolbar_was_visible[pos] = flag; \ |
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
39 } while (0) |
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
40 |
428 | 41 #define DEVICE_SUPPORTS_TOOLBARS_P(d) \ |
434 | 42 HAS_DEVMETH_P (d, output_frame_toolbars) |
428 | 43 |
44 struct toolbar_button | |
45 { | |
3017 | 46 struct LCRECORD_HEADER header; |
428 | 47 |
48 Lisp_Object next; | |
49 Lisp_Object frame; | |
50 | |
51 Lisp_Object up_glyph; | |
52 Lisp_Object down_glyph; | |
53 Lisp_Object disabled_glyph; | |
54 | |
55 Lisp_Object cap_up_glyph; | |
56 Lisp_Object cap_down_glyph; | |
57 Lisp_Object cap_disabled_glyph; | |
58 | |
59 Lisp_Object callback; | |
60 Lisp_Object enabled_p; | |
61 Lisp_Object help_string; | |
62 | |
63 char enabled; | |
64 char down; | |
65 char pushright; | |
66 char blank; | |
67 | |
68 int x, y; | |
69 int width, height; | |
70 int dirty; | |
71 /* is this button in a left or right toolbar? */ | |
72 int vertical; | |
73 /* border_width when this button was laid out */ | |
74 int border_width; | |
75 }; | |
76 | |
77 DECLARE_LRECORD (toolbar_button, struct toolbar_button); | |
78 #define XTOOLBAR_BUTTON(x) XRECORD (x, toolbar_button, struct toolbar_button) | |
617 | 79 #define wrap_toolbar_button(p) wrap_record (p, toolbar_button) |
428 | 80 #define TOOLBAR_BUTTONP(x) RECORDP (x, toolbar_button) |
81 #define CHECK_TOOLBAR_BUTTON(x) CHECK_RECORD (x, toolbar_button) | |
82 #define CONCHECK_TOOLBAR_BUTTON(x) CONCHECK_RECORD (x, toolbar_button) | |
83 | |
5077
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
84 void get_toolbar_coords (struct frame *f, enum edge_pos pos, int *x, |
428 | 85 int *y, int *width, int *height, int *vert, |
86 int for_layout); | |
87 Lisp_Object toolbar_button_at_pixpos (struct frame *f, int x_coord, | |
88 int y_coord); | |
89 DECLARE_SPECIFIER_TYPE (toolbar); | |
90 #define XTOOLBAR_SPECIFIER(x) XSPECIFIER_TYPE (x, toolbar) | |
91 #define TOOLBAR_SPECIFIERP(x) SPECIFIER_TYPEP (x, toolbar) | |
92 #define CHECK_TOOLBAR_SPECIFIER(x) CHECK_SPECIFIER_TYPE (x, toolbar) | |
93 #define CONCHECK_TOOLBAR_SPECIFIER(x) CONCHECK_SPECIFIER_TYPE (x, toolbar) | |
94 | |
95 #define MSWINDOWS_DEFAULT_TOOLBAR_HEIGHT 37 | |
96 #define MSWINDOWS_DEFAULT_TOOLBAR_WIDTH 40 | |
97 #define MSWINDOWS_DEFAULT_TOOLBAR_BORDER_WIDTH 0 | |
98 #define DEFAULT_TOOLBAR_HEIGHT 37 | |
99 #define DEFAULT_TOOLBAR_WIDTH 40 | |
100 #define DEFAULT_TOOLBAR_BLANK_SIZE 8 | |
101 #define DEFAULT_TOOLBAR_BORDER_WIDTH 0 | |
102 #define MINIMUM_SHADOW_THICKNESS 1 | |
103 | |
104 extern Lisp_Object Vtoolbar_size[4]; | |
105 extern Lisp_Object Vtoolbar_border_width[4]; | |
106 void update_frame_toolbars (struct frame *f); | |
905 | 107 void update_frame_toolbars_geometry (struct frame *f); |
428 | 108 void init_frame_toolbars (struct frame *f); |
109 void init_device_toolbars (struct device *d); | |
110 void init_global_toolbars (struct device *d); | |
111 void free_frame_toolbars (struct frame *f); | |
112 Lisp_Object get_toolbar_button_glyph (struct window *w, | |
113 struct toolbar_button *tb); | |
5077
d372b17f63ce
clean up toolbar/gutter edge geometry
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
114 void mark_frame_toolbar_buttons_dirty (struct frame *f, enum edge_pos pos); |
428 | 115 |
116 #endif /* HAVE_TOOLBARS */ | |
117 | |
440 | 118 #endif /* INCLUDED_toolbar_h_ */ |