From: Po Lu <luangruo@yahoo.com>
Date: Mon, 28 Mar 2022 00:39:37 +0000 (+0800)
Subject: ; * src/xterm.c (x_dnd_compute_toplevels): Use right enum on XCB.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~2370^2~887
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=45a1bb0efbdd827e91cf80d0c93f60c311e85255;p=emacs.git

; * src/xterm.c (x_dnd_compute_toplevels): Use right enum on XCB.
---

diff --git a/src/xterm.c b/src/xterm.c
index a77b90a4b5c..fbd6fadf1d5 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1108,6 +1108,7 @@ x_dnd_compute_toplevels (struct x_display_info *dpyinfo)
 	  tem->y = dest_y;
 	  tem->width = attrs.width + attrs.border_width;
 	  tem->height = attrs.height + attrs.border_width;
+	  tem->mapped_p = (attrs.map_state != IsUnmapped);
 #else
 	  tem->x = (coordinates_reply->dst_x
 		    - geometry_reply->border_width);
@@ -1117,8 +1118,8 @@ x_dnd_compute_toplevels (struct x_display_info *dpyinfo)
 			+ geometry_reply->border_width);
 	  tem->height = (geometry_reply->height
 			 + geometry_reply->border_width);
+	  tem->mapped_p = (attrs.map_state != XCB_MAP_STATE_UNMAPPED);
 #endif
-	  tem->mapped_p = (attrs.map_state != IsUnmapped);
 	  tem->next = x_dnd_toplevels;
 	  tem->previous_event_mask = attrs.your_event_mask;
 	  tem->wm_state = wmstate[0];
@@ -1311,8 +1312,8 @@ x_dnd_compute_toplevels (struct x_display_info *dpyinfo)
 		      && dpyinfo->xshape_minor >= 1)))
 	    {
 	      input_rect_reply = xcb_shape_get_rectangles_reply (dpyinfo->xcb_connection,
-								    input_rect_cookies[i],
-								    &error);
+								 input_rect_cookies[i],
+								 &error);
 
 	      if (input_rect_reply)
 		free (input_rect_reply);