summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
Diffstat (limited to 'legacy')
-rw-r--r--legacy/ecore/src/lib/ecore_x/Ecore_X.h20
-rw-r--r--legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c13
2 files changed, 16 insertions, 17 deletions
diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X.h b/legacy/ecore/src/lib/ecore_x/Ecore_X.h
index 27359d8836..f0af0d1471 100644
--- a/legacy/ecore/src/lib/ecore_x/Ecore_X.h
+++ b/legacy/ecore/src/lib/ecore_x/Ecore_X.h
@@ -2274,17 +2274,17 @@ typedef struct _Ecore_X_Window_Attributes
2274 int x, y, w, h; 2274 int x, y, w, h;
2275 int border; 2275 int border;
2276 int depth; 2276 int depth;
2277 unsigned char visible : 1; 2277 Eina_Bool visible : 1;
2278 unsigned char viewable : 1; 2278 Eina_Bool viewable : 1;
2279 unsigned char override : 1; 2279 Eina_Bool override : 1;
2280 unsigned char input_only : 1; 2280 Eina_Bool input_only : 1;
2281 unsigned char save_under : 1; 2281 Eina_Bool save_under : 1;
2282 struct 2282 struct
2283 { 2283 {
2284 Ecore_X_Event_Mask mine; 2284 Ecore_X_Event_Mask mine;
2285 Ecore_X_Event_Mask all; 2285 Ecore_X_Event_Mask all;
2286 Ecore_X_Event_Mask no_propagate; 2286 Ecore_X_Event_Mask no_propagate;
2287 } event_mask; 2287 } event_mask;
2288 Ecore_X_Gravity window_gravity; 2288 Ecore_X_Gravity window_gravity;
2289 Ecore_X_Gravity pixel_gravity; 2289 Ecore_X_Gravity pixel_gravity;
2290 Ecore_X_Colormap colormap; 2290 Ecore_X_Colormap colormap;
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c
index a64383660d..299821cf92 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c
+++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c
@@ -1076,21 +1076,19 @@ ecore_x_window_attributes_get(Ecore_X_Window win, Ecore_X_Window_Attributes *att
1076 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1076 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1077 1077
1078 cookie = xcb_get_window_attributes_unchecked(_ecore_xcb_conn, win); 1078 cookie = xcb_get_window_attributes_unchecked(_ecore_xcb_conn, win);
1079 gcookie = xcb_get_geometry_unchecked(_ecore_xcb_conn, win);
1080
1081 reply = xcb_get_window_attributes_reply(_ecore_xcb_conn, cookie, NULL); 1079 reply = xcb_get_window_attributes_reply(_ecore_xcb_conn, cookie, NULL);
1082 if (!reply) return EINA_FALSE; 1080 if (!reply) return EINA_FALSE;
1083 1081
1084 memset(att_ret, 0, sizeof(Ecore_X_Window_Attributes)); 1082 memset(att_ret, 0, sizeof(Ecore_X_Window_Attributes));
1085 1083
1086 if (reply->map_state != XCB_MAP_STATE_UNMAPPED) 1084 if (reply->map_state != XCB_MAP_STATE_UNMAPPED)
1087 att_ret->visible = 1; 1085 att_ret->visible = EINA_TRUE;
1088 if (reply->map_state == XCB_MAP_STATE_VIEWABLE) 1086 if (reply->map_state == XCB_MAP_STATE_VIEWABLE)
1089 att_ret->viewable = 1; 1087 att_ret->viewable = EINA_TRUE;
1090 if (reply->override_redirect) att_ret->override = 1; 1088 if (reply->override_redirect) att_ret->override = EINA_TRUE;
1091 if (reply->_class == XCB_WINDOW_CLASS_INPUT_ONLY) 1089 if (reply->_class == XCB_WINDOW_CLASS_INPUT_ONLY)
1092 att_ret->input_only = 1; 1090 att_ret->input_only = EINA_TRUE;
1093 if (reply->save_under) att_ret->save_under = 1; 1091 if (reply->save_under) att_ret->save_under = EINA_TRUE;
1094 att_ret->event_mask.mine = reply->your_event_mask; 1092 att_ret->event_mask.mine = reply->your_event_mask;
1095 att_ret->event_mask.all = reply->all_event_masks; 1093 att_ret->event_mask.all = reply->all_event_masks;
1096 att_ret->event_mask.no_propagate = reply->do_not_propagate_mask; 1094 att_ret->event_mask.no_propagate = reply->do_not_propagate_mask;
@@ -1101,6 +1099,7 @@ ecore_x_window_attributes_get(Ecore_X_Window win, Ecore_X_Window_Attributes *att
1101 1099
1102 free(reply); 1100 free(reply);
1103 1101
1102 gcookie = xcb_get_geometry_unchecked(_ecore_xcb_conn, win);
1104 greply = xcb_get_geometry_reply(_ecore_xcb_conn, gcookie, NULL); 1103 greply = xcb_get_geometry_reply(_ecore_xcb_conn, gcookie, NULL);
1105 if (!greply) return EINA_TRUE; 1104 if (!greply) return EINA_TRUE;
1106 1105