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 /lisp | |
| 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 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/cus-start.el | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e6d67c13934..5509b1598a4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-08-01 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * cus-start.el (x-gtk-use-system-tooltips): New variable. | ||
| 4 | |||
| 1 | 2010-08-01 Chong Yidong <cyd@stupidchicken.com> | 5 | 2010-08-01 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * emacs-lisp/package.el (package--list-packages): Fix column | 7 | * emacs-lisp/package.el (package--list-packages): Fix column |
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 4778cf611e5..1e8898290fb 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el | |||
| @@ -358,6 +358,7 @@ since it could result in memory overflow and make Emacs crash." | |||
| 358 | (x-gtk-show-hidden-files menu boolean "22.1") | 358 | (x-gtk-show-hidden-files menu boolean "22.1") |
| 359 | (x-gtk-file-dialog-help-text menu boolean "22.1") | 359 | (x-gtk-file-dialog-help-text menu boolean "22.1") |
| 360 | (x-gtk-whole-detached-tool-bar x boolean "22.1") | 360 | (x-gtk-whole-detached-tool-bar x boolean "22.1") |
| 361 | (x-gtk-use-system-tooltips tooltip boolean "23.3") | ||
| 361 | ;; xterm.c | 362 | ;; xterm.c |
| 362 | (x-use-underline-position-properties display boolean "22.1") | 363 | (x-use-underline-position-properties display boolean "22.1") |
| 363 | (x-underline-at-descent-line display boolean "22.1") | 364 | (x-underline-at-descent-line display boolean "22.1") |