diff options
author | Jan D <jan.h.d@swipnet.se> | 2010-08-01 15:57:07 +0200 |
---|---|---|
committer | Jan D <jan.h.d@swipnet.se> | 2010-08-01 15:57:07 +0200 |
commit | aa1859f5cd51d760a1b30f01d1fc3928a8c10363 (patch) | |
tree | 53dc2df9be3cbe487e79c0085612a0c83615881b /src/gtkutil.h | |
parent | 6e051c0a1330f539e036597988a0973fbd1adaef (diff) | |
download | emacs-aa1859f5cd51d760a1b30f01d1fc3928a8c10363.tar.gz |
Use Gtk+ tooltips by default for Gtk+ Emacs.
* lisp/cus-start.el (x-gtk-use-system-tooltips): New variable.
* src/gtkutil.c (hierarchy_ch_cb, qttip_cb, xg_prepare_tooltip)
(xg_show_tooltip, xg_hide_tooltip, xg_free_frame_widgets): New
functions.
(xg_create_frame_widgets): Set ttip_* to 0. Set a dummy tooltip
text so qttip_cb is called. Connect query-tooltip to qttip_cb.
Remove code that is commented out.
* src/gtkutil.h (xg_free_frame_widgets, xg_prepare_tooltip)
(xg_show_tooltip, xg_hide_tooltip): Declare.
* src/xfns.c (x_gtk_use_system_tooltips): New variable.
(Fx_show_tip): If USE_GTK and x_gtk_use_system_tooltips, call
new gtkutil tooltip functions to show the tooltip.
(Fx_hide_tip): Call xg_hide_tooltip.
(syms_of_xfns): Defvar x-gtk-use-system-tooltips.
* src/xterm.c (x_clear_frame): Check FRAME_GTK_WIDGET (f) before
calling gtk_widget_queue_draw.
(x_free_frame_resources): Call xg_free_frame_widgets.
* src/xterm.h (struct x_output): Add ttip_widget, ttip_window and
ttip_lbl.
Diffstat (limited to 'src/gtkutil.h')
-rw-r--r-- | src/gtkutil.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/gtkutil.h b/src/gtkutil.h index 3f1d1a2b856..9748b07cca0 100644 --- a/src/gtkutil.h +++ b/src/gtkutil.h @@ -194,6 +194,7 @@ extern void xg_display_close (Display *dpy); extern GdkCursor * xg_create_default_cursor (Display *dpy); extern int xg_create_frame_widgets (FRAME_PTR f); +extern void xg_free_frame_widgets (FRAME_PTR f); extern void x_wm_set_size_hint (FRAME_PTR f, long flags, int user_position); @@ -203,6 +204,14 @@ extern void xg_set_frame_icon (FRAME_PTR f, Pixmap icon_pixmap, Pixmap icon_mask); +extern int xg_prepare_tooltip (FRAME_PTR f, + Lisp_Object string, + int *width, + int *height); +extern void xg_show_tooltip (FRAME_PTR f, int root_x, int root_y); +extern int xg_hide_tooltip (FRAME_PTR f); + + /* Mark all callback data that are Lisp_object:s during GC. */ extern void xg_mark_data (void); |