view etc/xemacs-icon3.xpm @ 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 376386a54a3c
children 7910031dd78a
line wrap: on
line source

/* XPM */
static char * xemacs_xpm[] = {
/* width height num_colors chars_per_pixel */
"48 48 11 1",
/* colors */
" 	s None	c none",
".	c #e5e5e5",
"X	c #cccccc",
"o	c #b2b2b2",
"O	c #999999",
"+	c #7f7f7f",
"@	c #666666",
"#	c #4c4c4c",
"$	c #323232",
"%	c #191919",
"&	c black",
/* pixels */
"                                                ",
"                                                ",
"                                                ",
"                 ............     .........     ",
"                XXXXXXXXXXXX.    XXXXXXXXX.     ",
"               ooooooooooooX    oooooooooX      ",
"              OOOOOOOOOOOOo    OOOOOOOOOo       ",
"             ++++++++++++O    +++++++++O        ",
"            @@@@@@@@@@@@+..  @@@@@@@@@+         ",
"           ############@XX. #########@          ",
"          $$$$$$$$$$$$#ooX.$$$$$$$$$#           ",
"         %%%%%%%%%%%%$OOoX%%%%%%%%%$            ",
"        &&&&&&&&&&&&%++Oo&&&&&&&&&%             ",
"        &&&&&&&&&&&&@@+Oo&&&&&&&&&              ",
"            &&&&&&$##@+OOoo&&&&Oo               ",
"            &&&&&%$$#@++OOo&&&+O                ",
"             &&&&%%$#@@++O&&&@+                 ",
"             &&&&&%$##@@+&&&#@                  ",
"             &&&&&%$$##@&&&$#..                 ",
"             &&&&&%%$$#&&&%$XX.                 ",
"              &&&&&%%$&&&&%ooX..                ",
"              &&&&&&%$&&&&OOoXX.                ",
"               &&&&&%&&&&++OooX..               ",
"                &&&&&&&&@@+OOoXX.               ",
"                &&&&&&&##@++OooX.               ",
"                &&&&&&$$#@@+OOoX..              ",
"                &&&&&%%$##@++OoXX.              ",
"                 &&&&&%$$#@@+OooX.              ",
"                &&&&&&%%$##@+OOoX.              ",
"               &&&&&&&&%$$#@++OoX..             ",
"              &&&&&&&&&%%$#@@+OoXX..            ",
"             &&&&#&&&&&&%$##@+OooXX..           ",
"            &&&&$o&&&&&&%$$#@+OOooXX...         ",
"           &&&&%OoX&&&&&%%$#@++OOooXXX          ",
"          &&&&&+Oooo&&&&&%$#@@++OOooo           ",
"          &&&&@+OOO &&&&&%$##@@++OOO            ",
"         +&&&#@+++   &&&&%$$##@@+++             ",
"        @&&&$#@@@    &&&&%%$$##@@@              ",
"       #&&&%$###     &&&&&%%$$###               ",
"      $&&&&%$$$     $&&&&&&%%$$$                ",
"     %&&&&&%%%     %&&&&&&&&%%%                 ",
"    &&&&&&&&&     &&&&&&&&&&&&                  ",
"                                                ",
"                                                ",
"                                                ",
"                                                ",
"                                                ",
"                                                "};