summaryrefslogtreecommitdiff
path: root/src/nsterm.h
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2013-09-19 11:48:53 +0400
committerDmitry Antipov <dmantipov@yandex.ru>2013-09-19 11:48:53 +0400
commitced135ebdbfb0eea719ce165a454e7ff0b681e88 (patch)
tree17311f84267e23afbd4d1131ea2fe1fa14aa6f55 /src/nsterm.h
parentf75447737926fd8c898b9e0b77f581f4993a52f1 (diff)
downloademacs-ced135ebdbfb0eea719ce165a454e7ff0b681e88.tar.gz
* xterm.h (struct x_display_info): New members last_mouse_glyph_frame,
last_mouse_scroll_bar, last_mouse_glyph and last_mouse_movement_time, going to replace static variables below. Adjust comments. * xterm.c (last_mouse_glyph, last_mouse_glyph_frame) (last_mouse_scroll_bar, last_mouse_movement_time): Remove. (note_mouse_movement, XTmouse_position, x_scroll_bar_note_movement) (x_scroll_bar_report_motion, handle_one_xevent, syms_of_xterm): Related users changed. * w32term.h (struct w32_display_info): New members last_mouse_glyph_frame, last_mouse_scroll_bar, last_mouse_scroll_bar_pos, last_mouse_glyph and last_mouse_movement_time, going to replace static variables below. Adjust comments. * w32term.c (last_mouse_glyph_frame, last_mouse_scroll_bar) (last_mouse_scroll_bar_pos, last_mouse_glyph, last_mouse_movement_time): Remove. (note_mouse_movement, w32_mouse_position, w32_scroll_bar_handle_click) (x_scroll_bar_report_motion, syms_of_w32term): Related users changed. * nsterm.h (struct ns_display_info): New members last_mouse_glyph, last_mouse_movement_time and last_mouse_scroll_bar, going to replace static variables below. * nsterm.m (last_mouse_glyph, last_mouse_movement_time) (last_mouse_scroll_bar): Remove. (note_mouse_movement, ns_mouse_position, mouseMoved, mouseEntered) (mouseExited): Related users changed.
Diffstat (limited to 'src/nsterm.h')
-rw-r--r--src/nsterm.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/nsterm.h b/src/nsterm.h
index 7a626c75fe6..9f7767b312e 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -608,6 +608,19 @@ struct ns_display_info
This is a position on last_mouse_motion_frame. */
int last_mouse_motion_x;
int last_mouse_motion_y;
+
+ /* Where the mouse was last time we reported a mouse position. */
+ NSRect last_mouse_glyph;
+
+ /* Time of last mouse movement. */
+ Time last_mouse_movement_time;
+
+ /* The scroll bar in which the last motion event occurred. */
+#ifdef __OBJC__
+ EmacsScroller *last_mouse_scroll_bar;
+#else
+ void *last_mouse_scroll_bar;
+#endif
};
/* This is a chain of structures for all the NS displays currently in use. */