forked from enlightenment/efl
Ecore_X(cb): Fix formatting in ecore_xcb_window. Fix buggers in ICCCM
code which were not setting icccm wm protocols correctly. This 'fix' matches up w/ the xcb_icccm_* functions defined in the xcb headers. SVN revision: 65195
This commit is contained in:
parent
6f2a5f3562
commit
dd933bf536
|
@ -1017,9 +1017,9 @@ ecore_x_icccm_protocol_set(Ecore_X_Window win,
|
||||||
ECORE_X_ATOM_WM_PROTOCOLS,
|
ECORE_X_ATOM_WM_PROTOCOLS,
|
||||||
win, count, atoms);
|
win, count, atoms);
|
||||||
#else
|
#else
|
||||||
xcb_icccm_set_wm_protocols(_ecore_xcb_conn,
|
xcb_icccm_set_wm_protocols(_ecore_xcb_conn, win,
|
||||||
ECORE_X_ATOM_WM_PROTOCOLS,
|
ECORE_X_ATOM_WM_PROTOCOLS,
|
||||||
win, count, atoms);
|
count, atoms);
|
||||||
#endif
|
#endif
|
||||||
free(atoms);
|
free(atoms);
|
||||||
}
|
}
|
||||||
|
@ -1043,10 +1043,9 @@ ecore_x_icccm_protocol_set(Ecore_X_Window win,
|
||||||
ECORE_X_ATOM_WM_PROTOCOLS,
|
ECORE_X_ATOM_WM_PROTOCOLS,
|
||||||
win, count - 1, protos.atoms);
|
win, count - 1, protos.atoms);
|
||||||
#else
|
#else
|
||||||
xcb_icccm_set_wm_protocols(_ecore_xcb_conn,
|
xcb_icccm_set_wm_protocols(_ecore_xcb_conn, win,
|
||||||
ECORE_X_ATOM_WM_PROTOCOLS,
|
ECORE_X_ATOM_WM_PROTOCOLS,
|
||||||
win, count - 1,
|
count - 1, protos.atoms);
|
||||||
protos.atoms);
|
|
||||||
#endif
|
#endif
|
||||||
else
|
else
|
||||||
ecore_x_window_prop_property_del(win,
|
ecore_x_window_prop_property_del(win,
|
||||||
|
@ -1135,8 +1134,8 @@ ecore_x_icccm_protocol_atoms_set(Ecore_X_Window win,
|
||||||
xcb_set_wm_protocols(_ecore_xcb_conn, ECORE_X_ATOM_WM_PROTOCOLS,
|
xcb_set_wm_protocols(_ecore_xcb_conn, ECORE_X_ATOM_WM_PROTOCOLS,
|
||||||
win, num, protos);
|
win, num, protos);
|
||||||
#else
|
#else
|
||||||
xcb_icccm_set_wm_protocols(_ecore_xcb_conn, ECORE_X_ATOM_WM_PROTOCOLS,
|
xcb_icccm_set_wm_protocols(_ecore_xcb_conn, win,
|
||||||
win, num, protos);
|
ECORE_X_ATOM_WM_PROTOCOLS, num, protos);
|
||||||
#endif
|
#endif
|
||||||
else
|
else
|
||||||
ecore_x_window_prop_property_del(win, ECORE_X_ATOM_WM_PROTOCOLS);
|
ecore_x_window_prop_property_del(win, ECORE_X_ATOM_WM_PROTOCOLS);
|
||||||
|
|
|
@ -356,7 +356,7 @@ ecore_x_window_free(Ecore_X_Window win)
|
||||||
/* XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, */
|
/* XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, */
|
||||||
/* (const char *)&ev); */
|
/* (const char *)&ev); */
|
||||||
|
|
||||||
xcb_destroy_window(_ecore_xcb_conn, win);
|
xcb_destroy_window(_ecore_xcb_conn, win);
|
||||||
// ecore_x_flush();
|
// ecore_x_flush();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue