From: Po Lu <luangruo@yahoo.com>
Date: Sun, 8 May 2022 01:06:40 +0000 (+0800)
Subject: Use correct event structures to fetch time on XI2
X-Git-Tag: emacs-29.0.90~1910^2~920
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=672a296d3b353249ed829a7164c3db55ee204e47;p=emacs.git

Use correct event structures to fetch time on XI2

* src/xterm.c (handle_one_xevent): Don't use generic `xi_event'
to access the event time.
---

diff --git a/src/xterm.c b/src/xterm.c
index 848389ce965..2fc4c559a9c 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -16807,7 +16807,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 	      ev.window = enter->event;
 	      ev.time = enter->time;
 
-	      x_display_set_last_user_time (dpyinfo, xi_event->time);
+	      x_display_set_last_user_time (dpyinfo, enter->time);
 
 #ifdef USE_MOTIF
 	      use_copy = true;
@@ -16955,7 +16955,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 							 leave->deviceid, false);
 #endif
 
-	      x_display_set_last_user_time (dpyinfo, xi_event->time);
+	      x_display_set_last_user_time (dpyinfo, leave->time);
 
 #ifdef HAVE_XWIDGETS
 	      {
@@ -17572,7 +17572,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 		{
 #ifndef USE_TOOLKIT_SCROLL_BARS
 		  struct scroll_bar *bar
-		    = x_window_to_scroll_bar (xi_event->display, xev->event, 2);
+		    = x_window_to_scroll_bar (dpyinfo->display, xev->event, 2);
 
 		  if (bar)
 		    x_scroll_bar_note_movement (bar, &ev);
@@ -19149,7 +19149,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 
 	      device = xi_device_from_id (dpyinfo, pev->deviceid);
 	      source = xi_device_from_id (dpyinfo, pev->sourceid);
-	      x_display_set_last_user_time (dpyinfo, xi_event->time);
+	      x_display_set_last_user_time (dpyinfo, pev->time);
 
 	      if (!device)
 		goto XI_OTHER;