Mercurial > emacs
view src/gtkutil.h @ 108027:2ba5d029fd5e
Gtk tool bars can be text, icons with text or just icons
* frames.texi (Tool Bars): Add tool-bar-style.
* 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.
* 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.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Wed, 21 Apr 2010 18:26:09 +0200 |
parents | 1d1d5d9bd884 |
children | 3e9a832a5533 60266cf487b0 |
line wrap: on
line source
/* Definitions and headers for GTK widgets. Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #ifndef GTKUTIL_H #define GTKUTIL_H #ifdef USE_GTK #include <gtk/gtk.h> #include "frame.h" /* Minimum and maximum values used for GTK scroll bars */ #define XG_SB_MIN 1 #define XG_SB_MAX 10000000 #define XG_SB_RANGE (XG_SB_MAX-XG_SB_MIN) /* Key for data that is valid for menus and scroll bars in a frame */ #define XG_FRAME_DATA "emacs_frame" /* Key for data that menu items hold. */ #define XG_ITEM_DATA "emacs_menuitem" /* Button types in menus. */ enum button_type { BUTTON_TYPE_NONE, BUTTON_TYPE_TOGGLE, BUTTON_TYPE_RADIO }; /* This is a list node in a generic list implementation. */ typedef struct xg_list_node_ { struct xg_list_node_ *prev; struct xg_list_node_ *next; } xg_list_node; /* This structure is the callback data that is shared for menu items. We need to keep it separate from the frame structure due to detachable menus. The data in the frame structure is only valid while the menu is popped up. This structure is kept around as long as the menu is. */ typedef struct xg_menu_cb_data_ { xg_list_node ptrs; FRAME_PTR f; Lisp_Object menu_bar_vector; int menu_bar_items_used; GCallback highlight_cb; int ref_count; } xg_menu_cb_data; /* This structure holds callback information for each individual menu item. */ typedef struct xg_menu_item_cb_data_ { xg_list_node ptrs; gulong select_id; Lisp_Object help; gpointer call_data; xg_menu_cb_data *cl_data; } xg_menu_item_cb_data; /* Used to specify menus and dialogs. This is an adaption from lwlib for Gtk so we can use more of the same code as lwlib in xmenu.c. */ typedef struct _widget_value { /* name of widget */ Lisp_Object lname; char *name; /* value (meaning depend on widget type) */ char *value; /* keyboard equivalent. no implications for XtTranslations */ Lisp_Object lkey; char *key; /* Help string or nil if none. GC finds this string through the frame's menu_bar_vector or through menu_items. */ Lisp_Object help; /* true if enabled */ gint enabled; /* true if selected */ gint selected; /* The type of a button. */ enum button_type button_type; /* Contents of the sub-widgets, also selected slot for checkbox */ struct _widget_value *contents; /* data passed to callback */ gpointer call_data; /* next one in the list */ struct _widget_value *next; /* we resource the widget_value structures; this points to the next one on the free list if this one has been deallocated. */ struct _widget_value *free_list; } widget_value; #ifdef HAVE_GTK_FILE_BOTH extern int use_old_gtk_file_dialog; #endif extern widget_value *malloc_widget_value P_ ((void)); extern void free_widget_value P_ ((widget_value *)); extern int xg_uses_old_file_dialog P_ ((void)); extern char *xg_get_file_name P_ ((FRAME_PTR f, char *prompt, char *default_filename, int mustmatch_p, int only_dir_p)); extern char *xg_get_font_name P_ ((FRAME_PTR f, char *)); extern GtkWidget *xg_create_widget P_ ((char *type, char *name, FRAME_PTR f, widget_value *val, GCallback select_cb, GCallback deactivate_cb, GCallback hightlight_cb)); extern void xg_modify_menubar_widgets P_ ((GtkWidget *menubar, FRAME_PTR f, widget_value *val, int deep_p, GCallback select_cb, GCallback deactivate_cb, GCallback hightlight_cb)); extern int xg_update_frame_menubar P_ ((FRAME_PTR f)); extern int xg_have_tear_offs P_ ((void)); extern int xg_get_scroll_id_for_window P_ ((Display *dpy, Window wid)); extern void xg_create_scroll_bar P_ ((FRAME_PTR f, struct scroll_bar *bar, GCallback scroll_callback, GCallback end_callback, char *scroll_bar_name)); extern void xg_show_scroll_bar P_ ((int scrollbar_id)); extern void xg_remove_scroll_bar P_ ((FRAME_PTR f, int scrollbar_id)); extern void xg_update_scrollbar_pos P_ ((FRAME_PTR f, int scrollbar_id, int top, int left, int width, int height)); extern void xg_set_toolkit_scroll_bar_thumb P_ ((struct scroll_bar *bar, int portion, int position, int whole)); extern int xg_event_is_for_scrollbar P_ ((FRAME_PTR f, XEvent *event)); extern void update_frame_tool_bar P_ ((FRAME_PTR f)); extern void free_frame_tool_bar P_ ((FRAME_PTR f)); extern void xg_frame_resized P_ ((FRAME_PTR f, int pixelwidth, int pixelheight)); extern void xg_frame_set_char_size P_ ((FRAME_PTR f, int cols, int rows)); extern GtkWidget * xg_win_to_widget P_ ((Display *dpy, Window wdesc)); extern int xg_display_open P_ ((char *display_name, Display **dpy)); extern void xg_display_close P_ ((Display *dpy)); extern GdkCursor * xg_create_default_cursor P_ ((Display *dpy)); extern int xg_create_frame_widgets P_ ((FRAME_PTR f)); extern void x_wm_set_size_hint P_ ((FRAME_PTR f, long flags, int user_position)); extern void xg_set_background_color P_ ((FRAME_PTR f, unsigned long bg)); extern void xg_set_frame_icon P_ ((FRAME_PTR f, Pixmap icon_pixmap, Pixmap icon_mask)); /* Mark all callback data that are Lisp_object:s during GC. */ extern void xg_mark_data P_ ((void)); /* Initialize GTK specific parts. */ extern void xg_initialize P_ ((void)); /* Setting scrollbar values invokes the callback. Use this variable to indicate that the callback should do nothing. */ extern int xg_ignore_gtk_scrollbar; #endif /* USE_GTK */ #endif /* GTKUTIL_H */ /* arch-tag: 0757f3dc-00c7-4cee-9e4c-282cf1d34c72 (do not change this comment) */