diff options
| author | Jan D | 2010-08-01 15:57:07 +0200 |
|---|---|---|
| committer | Jan D | 2010-08-01 15:57:07 +0200 |
| commit | aa1859f5cd51d760a1b30f01d1fc3928a8c10363 (patch) | |
| tree | 53dc2df9be3cbe487e79c0085612a0c83615881b /src/xterm.h | |
| parent | 6e051c0a1330f539e036597988a0973fbd1adaef (diff) | |
| download | emacs-aa1859f5cd51d760a1b30f01d1fc3928a8c10363.tar.gz emacs-aa1859f5cd51d760a1b30f01d1fc3928a8c10363.zip | |
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/xterm.h')
| -rw-r--r-- | src/xterm.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xterm.h b/src/xterm.h index c487ae4bd63..1674cdbac68 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -502,6 +502,10 @@ struct x_output | |||
| 502 | /* The last size hints set. */ | 502 | /* The last size hints set. */ |
| 503 | GdkGeometry size_hints; | 503 | GdkGeometry size_hints; |
| 504 | long hint_flags; | 504 | long hint_flags; |
| 505 | |||
| 506 | GtkTooltip *ttip_widget; | ||
| 507 | GtkWidget *ttip_lbl; | ||
| 508 | GtkWindow *ttip_window; | ||
| 505 | #endif | 509 | #endif |
| 506 | 510 | ||
| 507 | /* If >=0, a bitmap index. The indicated bitmap is used for the | 511 | /* If >=0, a bitmap index. The indicated bitmap is used for the |