mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-07 20:54:32 +00:00
Code Issues Releases Activity

Fix cursor setting for tip frame; re-enable cursor generation.

Browse Source 
* src/xfns.c (x_create_tip_frame): Include the cursor in the window
attributes sent when creating the new X window.  Don't skip setting
the pointerColor parameter.
This commit is contained in:
Ken Raeburn 2015-10-08 04:13:06 -04:00
parent 08e27d2944
commit ec2d99026f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/xfns.c
View File

@ -5319,12 +5319,8 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
"foreground", "Foreground", RES_TYPE_STRING);
x_default_parameter (f, parms, Qbackground_color, build_string ("white"),
"background", "Background", RES_TYPE_STRING);
#if 0 /* This code currently doesn't work for tooltip frames; the
cursor being set doesn't seem to get used. The call generates
a bit of traffic, so skip it for now. */
x_default_parameter (f, parms, Qmouse_color, build_string ("black"),
"pointerColor", "Foreground", RES_TYPE_STRING);
#endif
x_default_parameter (f, parms, Qcursor_color, build_string ("black"),
"cursorColor", "Foreground", RES_TYPE_STRING);
x_default_parameter (f, parms, Qborder_color, build_string ("black"),
@ -5345,7 +5341,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
Atom type = FRAME_DISPLAY_INFO (f)->Xatom_net_window_type_tooltip;
block_input ();
mask = CWBackPixel | CWOverrideRedirect | CWEventMask;
mask = CWBackPixel | CWOverrideRedirect | CWEventMask | CWCursor;
if (DoesSaveUnders (dpyinfo->screen))
mask |= CWSaveUnder;
@ -5355,6 +5351,9 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
attrs.override_redirect = True;
attrs.save_under = True;
attrs.background_pixel = FRAME_BACKGROUND_PIXEL (f);
attrs.cursor =
f->output_data.x->current_cursor
= f->output_data.x->text_cursor;
/* Arrange for getting MapNotify and UnmapNotify events. */
attrs.event_mask = StructureNotifyMask;
tip_window