aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2003-03-21 13:52:37 +0000
committerKim F. Storm2003-03-21 13:52:37 +0000
commit3d970f2841eb5dcebd0bf80369dc001174e308b7 (patch)
tree18e792305b2ae477cb5580dcb031b4d22aaaeb2a /src
parentfa3c6b4da4179157ea4c4a295a554dea8794f846 (diff)
downloademacs-3d970f2841eb5dcebd0bf80369dc001174e308b7.tar.gz
emacs-3d970f2841eb5dcebd0bf80369dc001174e308b7.zip
Setup and use hand_cursor instead of cross_cursor.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/xfns.c b/src/xfns.c
index 77a46bf212c..68002e458c5 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1640,7 +1640,7 @@ x_set_mouse_color (f, arg, oldval)
1640{ 1640{
1641 struct x_output *x = f->output_data.x; 1641 struct x_output *x = f->output_data.x;
1642 Display *dpy = FRAME_X_DISPLAY (f); 1642 Display *dpy = FRAME_X_DISPLAY (f);
1643 Cursor cursor, nontext_cursor, mode_cursor, cross_cursor; 1643 Cursor cursor, nontext_cursor, mode_cursor, hand_cursor;
1644 Cursor hourglass_cursor, horizontal_drag_cursor; 1644 Cursor hourglass_cursor, horizontal_drag_cursor;
1645 int count; 1645 int count;
1646 unsigned long pixel = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f)); 1646 unsigned long pixel = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
@@ -1703,11 +1703,11 @@ x_set_mouse_color (f, arg, oldval)
1703 if (!NILP (Vx_sensitive_text_pointer_shape)) 1703 if (!NILP (Vx_sensitive_text_pointer_shape))
1704 { 1704 {
1705 CHECK_NUMBER (Vx_sensitive_text_pointer_shape); 1705 CHECK_NUMBER (Vx_sensitive_text_pointer_shape);
1706 cross_cursor 1706 hand_cursor
1707 = XCreateFontCursor (dpy, XINT (Vx_sensitive_text_pointer_shape)); 1707 = XCreateFontCursor (dpy, XINT (Vx_sensitive_text_pointer_shape));
1708 } 1708 }
1709 else 1709 else
1710 cross_cursor = XCreateFontCursor (dpy, XC_hand2); 1710 hand_cursor = XCreateFontCursor (dpy, XC_hand2);
1711 1711
1712 if (!NILP (Vx_window_horizontal_drag_shape)) 1712 if (!NILP (Vx_window_horizontal_drag_shape))
1713 { 1713 {
@@ -1734,7 +1734,7 @@ x_set_mouse_color (f, arg, oldval)
1734 XRecolorCursor (dpy, cursor, &fore_color, &back_color); 1734 XRecolorCursor (dpy, cursor, &fore_color, &back_color);
1735 XRecolorCursor (dpy, nontext_cursor, &fore_color, &back_color); 1735 XRecolorCursor (dpy, nontext_cursor, &fore_color, &back_color);
1736 XRecolorCursor (dpy, mode_cursor, &fore_color, &back_color); 1736 XRecolorCursor (dpy, mode_cursor, &fore_color, &back_color);
1737 XRecolorCursor (dpy, cross_cursor, &fore_color, &back_color); 1737 XRecolorCursor (dpy, hand_cursor, &fore_color, &back_color);
1738 XRecolorCursor (dpy, hourglass_cursor, &fore_color, &back_color); 1738 XRecolorCursor (dpy, hourglass_cursor, &fore_color, &back_color);
1739 XRecolorCursor (dpy, horizontal_drag_cursor, &fore_color, &back_color); 1739 XRecolorCursor (dpy, horizontal_drag_cursor, &fore_color, &back_color);
1740 } 1740 }
@@ -1762,10 +1762,10 @@ x_set_mouse_color (f, arg, oldval)
1762 XFreeCursor (dpy, f->output_data.x->modeline_cursor); 1762 XFreeCursor (dpy, f->output_data.x->modeline_cursor);
1763 x->modeline_cursor = mode_cursor; 1763 x->modeline_cursor = mode_cursor;
1764 1764
1765 if (cross_cursor != x->cross_cursor 1765 if (hand_cursor != x->hand_cursor
1766 && x->cross_cursor != 0) 1766 && x->hand_cursor != 0)
1767 XFreeCursor (dpy, x->cross_cursor); 1767 XFreeCursor (dpy, x->hand_cursor);
1768 x->cross_cursor = cross_cursor; 1768 x->hand_cursor = hand_cursor;
1769 1769
1770 if (horizontal_drag_cursor != x->horizontal_drag_cursor 1770 if (horizontal_drag_cursor != x->horizontal_drag_cursor
1771 && x->horizontal_drag_cursor != 0) 1771 && x->horizontal_drag_cursor != 0)