From: Po Lu <luangruo@yahoo.com>
Date: Sun, 12 Dec 2021 06:20:18 +0000 (+0800)
Subject: * src/xterm.c (x_detect_focus_change): Fix XI2 focus on GTK builds.
X-Git-Tag: emacs-29.0.90~3597^2~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=11b2dfca287dee4b4520d07e3ad6432870059100;p=emacs.git

* src/xterm.c (x_detect_focus_change): Fix XI2 focus on GTK builds.
---

diff --git a/src/xterm.c b/src/xterm.c
index 3d9dce27e82..0dc944fd819 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5144,13 +5144,13 @@ x_detect_focus_change (struct x_display_info *dpyinfo, struct frame *frame,
         int focus_state
           = focus_frame ? focus_frame->output_data.x->focus_state : 0;
 
-	if (!((((xi_event->evtype == XI_Enter
-		 || xi_event->evtype == XI_Leave)
-		&& (((XIEnterEvent *) xi_event)->detail
-		    != XINotifyInferior)
-		&& !(focus_state & FOCUS_EXPLICIT))
-	       || xi_event->evtype == XI_FocusIn
-	       || xi_event->evtype == XI_FocusOut)))
+	if (((((xi_event->evtype == XI_Enter
+		|| xi_event->evtype == XI_Leave)
+	       && (((XIEnterEvent *) xi_event)->detail
+		   != XINotifyInferior)
+	       && !(focus_state & FOCUS_EXPLICIT))
+	      || xi_event->evtype == XI_FocusIn
+	      || xi_event->evtype == XI_FocusOut)))
 	  x_focus_changed ((xi_event->evtype == XI_Enter
 			    || xi_event->evtype == XI_FocusIn
 			    ? FocusIn : FocusOut),