[Emacs-diffs] trunk r116731: * xfns.c (x_set_mouse_color): Recolor vertical_drag_cursor.

[Dmitry Antipov]

------------------------------------------------------------
revno: 116731
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2014-03-11 10:50:01 +0400
message:
  * xfns.c (x_set_mouse_color): Recolor vertical_drag_cursor.
  * xterm.c (x_free_frame_resources): Free all allocated cursors.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xfns.c                     xfns.c-20091113204419-o5vbwnq5f7feedwu-274
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-03-10 18:53:39 +0000
+++ b/src/ChangeLog     2014-03-11 06:50:01 +0000
@@ -1,3 +1,8 @@
+2014-03-11  Dmitry Antipov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * w32.c (fstatat): Don't add an extra slash if the argument ends

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2014-02-04 07:36:58 +0000
+++ b/src/xfns.c        2014-03-11 06:50:01 +0000
@@ -716,6 +716,7 @@
     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)

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2014-03-06 11:18:22 +0000
+++ b/src/xterm.c       2014-03-11 06:50:01 +0000
@@ -9305,6 +9305,22 @@
          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));
     }