forked from enlightenment/enlightenment
fix client struct alignment when using x + wl
This commit is contained in:
parent
fd0a5bc934
commit
6d0ef37821
|
@ -172,6 +172,10 @@ typedef void (*E_Client_Hook_Cb)(void *data, E_Client *ec);
|
||||||
typedef void (*E_Client_Layout_Cb)(void * /* E_Comp */); //< can't use real type because of include order
|
typedef void (*E_Client_Layout_Cb)(void * /* E_Comp */); //< can't use real type because of include order
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
#ifndef HAVE_WAYLAND_ONLY
|
||||||
|
# include <Ecore_X.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#define E_CLIENT_TYPE (int)0xE0b01002
|
#define E_CLIENT_TYPE (int)0xE0b01002
|
||||||
|
|
||||||
struct E_Event_Client
|
struct E_Event_Client
|
||||||
|
@ -332,7 +336,7 @@ struct E_Client
|
||||||
Ecore_Window window_group;
|
Ecore_Window window_group;
|
||||||
Ecore_Window transient_for;
|
Ecore_Window transient_for;
|
||||||
Ecore_Window client_leader;
|
Ecore_Window client_leader;
|
||||||
#ifdef E_COMP_X_H
|
#ifndef HAVE_WAYLAND_ONLY
|
||||||
Ecore_X_Window_State_Hint initial_state;
|
Ecore_X_Window_State_Hint initial_state;
|
||||||
Ecore_X_Window_State_Hint state;
|
Ecore_X_Window_State_Hint state;
|
||||||
Ecore_X_Pixmap icon_pixmap;
|
Ecore_X_Pixmap icon_pixmap;
|
||||||
|
@ -370,7 +374,7 @@ struct E_Client
|
||||||
/* MWM */
|
/* MWM */
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
#ifdef E_COMP_X_H
|
#ifndef HAVE_WAYLAND_ONLY
|
||||||
Ecore_X_MWM_Hint_Func func;
|
Ecore_X_MWM_Hint_Func func;
|
||||||
Ecore_X_MWM_Hint_Decor decor;
|
Ecore_X_MWM_Hint_Decor decor;
|
||||||
Ecore_X_MWM_Hint_Input input;
|
Ecore_X_MWM_Hint_Input input;
|
||||||
|
@ -538,7 +542,7 @@ struct E_Client
|
||||||
unsigned char state : 1;
|
unsigned char state : 1;
|
||||||
unsigned char vkbd : 1;
|
unsigned char vkbd : 1;
|
||||||
} fetch;
|
} fetch;
|
||||||
#ifdef E_COMP_X_H
|
#ifndef HAVE_WAYLAND_ONLY
|
||||||
Ecore_X_Virtual_Keyboard_State state;
|
Ecore_X_Virtual_Keyboard_State state;
|
||||||
#endif
|
#endif
|
||||||
unsigned char have_property : 1;
|
unsigned char have_property : 1;
|
||||||
|
|
Loading…
Reference in New Issue