mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

* xfns.c (x_set_mouse_color): Recolor vertical_drag_cursor.

Browse source 
* xterm.c (x_free_frame_resources): Free all allocated cursors.
This commit is contained in:
Dmitry Antipov 2014-03-11 10:50:01 +04:00
parent baf8d0ac7d
commit b0b486db04
3 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2014-03-11 Dmitry Antipov <dmantipov@yandex.ru>
* xfns.c (x_set_mouse_color): Recolor vertical_drag_cursor.
* xterm.c (x_free_frame_resources): Free all allocated cursors.
2014-03-10 Eli Zaretskii <eliz@gnu.org>
* w32.c (fstatat): Don't add an extra slash if the argument ends

1
src/xfns.c
View file

@ -716,6 +716,7 @@ x_set_mouse_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
XRecolorCursor (dpy, hand_cursor, &fore_color, &back_color);
XRecolorCursor (dpy, hourglass_cursor, &fore_color, &back_color);
XRecolorCursor (dpy, horizontal_drag_cursor, &fore_color, &back_color);
XRecolorCursor (dpy, vertical_drag_cursor, &fore_color, &back_color);
}
if (FRAME_X_WINDOW (f) != 0)

16
src/xterm.c
View file

@ -9305,6 +9305,22 @@ x_free_frame_resources (struct frame *f)
f->output_data.x->black_relief.gc = 0;
}
/* Free cursors. */
if (f->output_data.x->text_cursor != 0)
XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->text_cursor);
if (f->output_data.x->nontext_cursor != 0)
XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->nontext_cursor);
if (f->output_data.x->modeline_cursor != 0)
XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->modeline_cursor);
if (f->output_data.x->hand_cursor != 0)
XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->hand_cursor);
if (f->output_data.x->hourglass_cursor != 0)
XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->hourglass_cursor);
if (f->output_data.x->horizontal_drag_cursor != 0)
XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->horizontal_drag_cursor);
if (f->output_data.x->vertical_drag_cursor != 0)
XFreeCursor (FRAME_X_DISPLAY (f), f->output_data.x->vertical_drag_cursor);
XFlush (FRAME_X_DISPLAY (f));
}