Mercurial > hg > xemacs-beta

comparison src/toolbar.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 1e7cc382eb16
children 7be849cb8828
comparison
equal deleted inserted replaced
5076:d555581e3cba 5077:d372b17f63ce
1 /* Define general toolbar support. 1 /* Define general toolbar support.
2 Copyright (C) 1995 Board of Trustees, University of Illinois. 2 Copyright (C) 1995 Board of Trustees, University of Illinois.
3 Copyright (C) 1995, 1996 Ben Wing. 3 Copyright (C) 1995, 1996, 2010 Ben Wing.
4 Copyright (C) 1996 Chuck Thompson. 4 Copyright (C) 1996 Chuck Thompson.
5 5
6 This file is part of XEmacs. 6 This file is part of XEmacs.
7 7
8 XEmacs is free software; you can redistribute it and/or modify it 8 XEmacs is free software; you can redistribute it and/or modify it
31 31
32 #define FRAME_TOOLBAR_BUTTONS(frame, pos) \ 32 #define FRAME_TOOLBAR_BUTTONS(frame, pos) \
33 ((frame)->toolbar_buttons[pos]) 33 ((frame)->toolbar_buttons[pos])
34 #define FRAME_CURRENT_TOOLBAR_SIZE(frame, pos) \ 34 #define FRAME_CURRENT_TOOLBAR_SIZE(frame, pos) \
35 ((frame)->current_toolbar_size[pos]) 35 ((frame)->current_toolbar_size[pos])
36 #define SET_TOOLBAR_WAS_VISIBLE_FLAG(frame, pos, flag) \
37 do { \
38 (frame)->toolbar_was_visible[pos] = flag; \
39 } while (0)
40
36 #define DEVICE_SUPPORTS_TOOLBARS_P(d) \ 41 #define DEVICE_SUPPORTS_TOOLBARS_P(d) \
37 HAS_DEVMETH_P (d, output_frame_toolbars) 42 HAS_DEVMETH_P (d, output_frame_toolbars)
38 43
39 struct toolbar_button 44 struct toolbar_button
40 { 45 {
74 #define wrap_toolbar_button(p) wrap_record (p, toolbar_button) 79 #define wrap_toolbar_button(p) wrap_record (p, toolbar_button)
75 #define TOOLBAR_BUTTONP(x) RECORDP (x, toolbar_button) 80 #define TOOLBAR_BUTTONP(x) RECORDP (x, toolbar_button)
76 #define CHECK_TOOLBAR_BUTTON(x) CHECK_RECORD (x, toolbar_button) 81 #define CHECK_TOOLBAR_BUTTON(x) CHECK_RECORD (x, toolbar_button)
77 #define CONCHECK_TOOLBAR_BUTTON(x) CONCHECK_RECORD (x, toolbar_button) 82 #define CONCHECK_TOOLBAR_BUTTON(x) CONCHECK_RECORD (x, toolbar_button)
78 83
79 void get_toolbar_coords (struct frame *f, enum toolbar_pos pos, int *x, 84 void get_toolbar_coords (struct frame *f, enum edge_pos pos, int *x,
80 int *y, int *width, int *height, int *vert, 85 int *y, int *width, int *height, int *vert,
81 int for_layout); 86 int for_layout);
82 Lisp_Object toolbar_button_at_pixpos (struct frame *f, int x_coord, 87 Lisp_Object toolbar_button_at_pixpos (struct frame *f, int x_coord,
83 int y_coord); 88 int y_coord);
84 DECLARE_SPECIFIER_TYPE (toolbar); 89 DECLARE_SPECIFIER_TYPE (toolbar);
104 void init_device_toolbars (struct device *d); 109 void init_device_toolbars (struct device *d);
105 void init_global_toolbars (struct device *d); 110 void init_global_toolbars (struct device *d);
106 void free_frame_toolbars (struct frame *f); 111 void free_frame_toolbars (struct frame *f);
107 Lisp_Object get_toolbar_button_glyph (struct window *w, 112 Lisp_Object get_toolbar_button_glyph (struct window *w,
108 struct toolbar_button *tb); 113 struct toolbar_button *tb);
109 void mark_frame_toolbar_buttons_dirty (struct frame *f, enum toolbar_pos pos); 114 void mark_frame_toolbar_buttons_dirty (struct frame *f, enum edge_pos pos);
110 115
111 #endif /* HAVE_TOOLBARS */ 116 #endif /* HAVE_TOOLBARS */
112 117
113 #endif /* INCLUDED_toolbar_h_ */ 118 #endif /* INCLUDED_toolbar_h_ */