view etc/images/exit.xpm @ 108024:4d8277a44bb4

Gtk tool bars can be text, icons with text or just icons. * xsettings.c: Qmonospace_font_name, Qtool_bar_style and current_tool_bar_style are new. (store_config_changed_event): Rename from store_font_changed_event. (XSETTINGS_TOOL_BAR_STYLE): New define. (SEEN_FONT, SEEN_TB_STYLE): New enum values. (struct xsettings): Add font and tb_style, set xft stuff inside #ifdef HAVE_XFT. (something_changedCB): store_font_changed_event is now store_config_changed_event (parse_settings): Rename from parse_xft_settings. Read non-xft xsettings outside #ifdef HAVE_XFT. (read_settings): Renamed from read_xft_settings. (apply_xft_settings): Take current settings as parameter. Do not call read_(xft)_settings. (read_and_apply_settings): New function. (xft_settings_event): Do non-xft stuff out of HAVE_XFT. Call read_and_apply_settings if there are settings to be read. (init_xsettings): Renamed from init_xfd_settings. Call read_and_apply_settings unconditionally. (xsettings_initialize): Call init_xsettings. (Ftool_bar_get_system_style): New function. (syms_of_xsettings): Define Qmonospace_font_name and Qtool_bar_style. Initialize current_tool_bar_style to nil. defsubr Stool_bar_get_system_style. Fprovide on dynamic-setting. * xsettings.h (Ftool_bar_get_system_style): Declare. * xdisp.c: Vtool_bar_style, tool_bar_max_label_size, Qtext, Qboth, Qboth_horiz are new. (syms_of_xdisp): Intern Qtext, Qboth, Qboth_horiz, DEFVAR Vtool_bar_style, tool_bar_max_label_size. * lisp.h: Extern declare Qtext, Qboth, Qboth_horiz. * keyboard.c: QClabel is new. (parse_tool_bar_item): Take out QClabel from tool bar items. Try to construct a label if ther is no QClabel. (syms_of_keyboard): Intern :label as QClabel. * dispextern.h (tool_bar_item_idx): TOOL_BAR_ITEM_LABEL is new. (Vtool_bar_style, tool_bar_max_label_size, DEFAULT_TOOL_BAR_LABEL_SIZE): New. * Makefile.in (SOME_MACHINE_LISP): font-setting.el renamed to dynamic-setting.el. * gtkutil.c (xg_tool_bar_menu_proxy): Handle label in tool bar item. (xg_make_tool_item, xg_show_toolbar_item): New function. (update_frame_tool_bar): Take label from TOOL_BAR_ITEM_LABEL. Call xg_make_tool_item to make a tool bar item. Call xg_show_toolbar_item. Use wtoolbar instead of x->toolbar_widget. * xterm.c (x_draw_image_relief): Take Vtool_bar_button_margin into account for toolbars. * vc-dir.el (vc-dir-tool-bar-map): Add :label on some tool bar items. * tool-bar.el (tool-bar-setup): Add :label on some tool bar items. * loadup.el: Load dynamic-setting.el if feature dynamic-setting is present. * info.el (info-tool-bar-map): Add labels. * cus-start.el (all): Add tool-bar-style and tool-bar-max-label-size. * cus-edit.el (custom-commands): Add labels for tool bar. (custom-buffer-create-internal, Custom-mode): Adjust for labels in custom-commands. * dynamic-setting.el: Renamed from font-setting.el.

/* XPM */
static char * stock_exit_xpm[] = {
"24 24 140 2",
"  	c None",
". 	c #000000",
"+ 	c #D6D6D4",
"@ 	c #BDBDBC",
"# 	c #A8A8A4",
"$ 	c #92928F",
"% 	c #727370",
"& 	c #61615E",
"* 	c #20201F",
"= 	c #F1F1EF",
"- 	c #E6E6E4",
"; 	c #DADAD7",
"> 	c #CFCFCD",
", 	c #C4C4C1",
"' 	c #A8A8A5",
") 	c #767674",
"! 	c #777774",
"~ 	c #1E1E1D",
"{ 	c #B9B9B7",
"] 	c #AEAEAC",
"^ 	c #8F8F8D",
"/ 	c #262626",
"( 	c #414140",
"_ 	c #E9836C",
": 	c #DEDEDC",
"< 	c #C5C5C2",
"[ 	c #636362",
"} 	c #040504",
"| 	c #040604",
"1 	c #050705",
"2 	c #E87B62",
"3 	c #E67056",
"4 	c #D5D5D3",
"5 	c #DBDBD8",
"6 	c #D0D0CE",
"7 	c #080A07",
"8 	c #0A0C09",
"9 	c #0A0D09",
"0 	c #0B0E0A",
"a 	c #F0B0A1",
"b 	c #EB8D77",
"c 	c #DF421E",
"d 	c #E97E66",
"e 	c #CBCBC8",
"f 	c #0C0F0B",
"g 	c #0F130D",
"h 	c #10140E",
"i 	c #11150F",
"j 	c #EFA392",
"k 	c #BFBFBD",
"l 	c #5D5D5C",
"m 	c #10150F",
"n 	c #141912",
"o 	c #161C14",
"p 	c #171D15",
"q 	c #B7B7B4",
"r 	c #0C0C0C",
"s 	c #192017",
"t 	c #1C2319",
"u 	c #1D241A",
"v 	c #CD8484",
"w 	c #990000",
"x 	c #701616",
"y 	c #A6A6A5",
"z 	c #181E16",
"A 	c #1E261B",
"B 	c #212A1E",
"C 	c #222B1F",
"D 	c #4F0000",
"E 	c #AEAEAB",
"F 	c #1D261B",
"G 	c #242E21",
"H 	c #273224",
"I 	c #283325",
"J 	c #580000",
"K 	c #B5B5B3",
"L 	c #293426",
"M 	c #2D3929",
"N 	c #2E3A2A",
"O 	c #7C4343",
"P 	c #6A0000",
"Q 	c #720000",
"R 	c #BDBDBB",
"S 	c #232C20",
"T 	c #2A3526",
"U 	c #303C2B",
"V 	c #33402E",
"W 	c #C5C5C3",
"X 	c #1E261C",
"Y 	c #303D2C",
"Z 	c #374532",
"` 	c #394834",
" .	c #500000",
"..	c #CDCDCB",
"+.	c #1B2319",
"@.	c #253022",
"#.	c #303E2D",
"$.	c #394934",
"%.	c #3D4E38",
"&.	c #9D9D9B",
"*.	c #565655",
"=.	c #2C3828",
"-.	c #40503A",
";.	c #43553E",
">.	c #BABAB7",
",.	c #777776",
"'.	c #323830",
").	c #232C1F",
"!.	c #313E2D",
"~.	c #3B4A36",
"{.	c #43553D",
"].	c #485B42",
"^.	c #4A5E44",
"/.	c #F0F0EE",
"(.	c #E5E5E3",
"_.	c #C6C6C3",
":.	c #ACACAB",
"<.	c #8B8B8A",
"[.	c #32392F",
"}.	c #2C3728",
"|.	c #3F503A",
"1.	c #465840",
"2.	c #4B5E44",
"3.	c #4E6347",
"4.	c #506549",
"5.	c #DADAD8",
"6.	c #7A7D78",
"7.	c #333C30",
"8.	c #475A41",
"9.	c #4F6348",
"0.	c #53694C",
"a.	c #566C4E",
"b.	c #576D4F",
"c.	c #91968F",
"d.	c #3B4736",
"e.	c #42543C",
"f.	c #51674A",
"g.	c #586F50",
"h.	c #5B7353",
"i.	c #5C7454",
"                                                ",
"              . . . . . . . . . . . . . . . .   ",
"              . + @ # $ % & & & * . . . . . .   ",
"              . = - ; > , ' ) ! ~ . . . . . .   ",
"          .   . = - ; > , { ] ^ / . . . . . .   ",
"          . . . = - ; > , { { { ( . . . . . .   ",
"          . _ . : - ; > < { { { [ } | 1 1 1 .   ",
". . . . . . 2 3 . 4 5 6 < { { { [ 7 8 9 0 0 .   ",
". a 2 2 2 2 b c d . e 6 < { { { [ f g h i i .   ",
". j c c c c c c c 3 . k < { l { [ m n o p p .   ",
". j c c c c c c c c 3 . q { l r [ n s t u u .   ",
". v w w w w w w w w w x . y r { [ z A B C C .   ",
". v w w w w w w w w D . E { { { [ F G H I I .   ",
". v w w w w w w w J . K < { { { [ C L M N N .   ",
". O P P P P Q w J . R 6 < { { { [ S T U V V .   ",
". . . . . . Q J . W 5 6 < { { { [ X H Y Z ` .   ",
"          .  .. ..- 5 6 < { { { [ +.@.#.$.%..   ",
"          . . . = - 5 6 < { ] &.*.B =.Z -.;..   ",
"          .   . = - 5 6 >.&.,.'.).!.~.{.].^..   ",
"              . /.(._.:.<.[.}.Z |.1.2.3.4.4..   ",
"              . 5.k 6.7.Z -.8.9.0.a.a.b.b.b..   ",
"              . c.d.e.^.f.g.h.i.i.i.i.i.i.i..   ",
"              . . . . . . . . . . . . . . . .   ",
"                                                "};