enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 1 Projects Releases Wiki Activity

Add another illume 'mode'. This allows us to know if we are top/bottom or 

left/right.



SVN revision: 44768
This commit is contained in:
Christopher Michael 2009-12-29 22:14:38 +00:00
parent 331d672b58
commit 8e455fa1e6
5 changed files with 82 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
legacy/ecore/src/lib/ecore_x/Ecore_X.h
View File

@ -896,52 +896,47 @@ EAPI extern int ECORE_X_LOCK_SCROLL;
EAPI extern int ECORE_X_LOCK_NUM; EAPI extern int ECORE_X_LOCK_NUM;
EAPI extern int ECORE_X_LOCK_CAPS; EAPI extern int ECORE_X_LOCK_CAPS;
typedef enum _Ecore_X_WM_Protocol { typedef enum _Ecore_X_WM_Protocol
/** {
* If enabled the window manager will be asked to send a /* If enabled the window manager will be asked to send a
* delete message instead of just closing (destroying) the window. * delete message instead of just closing (destroying) the window. */
*/
ECORE_X_WM_PROTOCOL_DELETE_REQUEST, ECORE_X_WM_PROTOCOL_DELETE_REQUEST,
/** /* If enabled the window manager will be told that the window
* If enabled the window manager will be told that the window * explicitly sets input focus. */
* explicitly sets input focus.
*/
ECORE_X_WM_PROTOCOL_TAKE_FOCUS, ECORE_X_WM_PROTOCOL_TAKE_FOCUS,
/** /* If enabled the window manager can ping the window to check
* If enabled the window manager can ping the window to check * if it is alive. */
* if it is alive.
*/
ECORE_X_NET_WM_PROTOCOL_PING, ECORE_X_NET_WM_PROTOCOL_PING,
/** /* If enabled the window manager can sync updating with the
* If enabled the window manager can sync updating with the * window (?) */
* window (?)
*/
ECORE_X_NET_WM_PROTOCOL_SYNC_REQUEST, ECORE_X_NET_WM_PROTOCOL_SYNC_REQUEST,
/* Number of defined items */ /* Number of defined items */
ECORE_X_WM_PROTOCOL_NUM ECORE_X_WM_PROTOCOL_NUM
} Ecore_X_WM_Protocol; } Ecore_X_WM_Protocol;
typedef enum _Ecore_X_Window_Input_Mode { typedef enum _Ecore_X_Window_Input_Mode
/** The window can never be focused */ {
/* The window can never be focused */
ECORE_X_WINDOW_INPUT_MODE_NONE, ECORE_X_WINDOW_INPUT_MODE_NONE,
/** The window can be focused by the WM but doesn't focus itself */ /* The window can be focused by the WM but doesn't focus itself */
ECORE_X_WINDOW_INPUT_MODE_PASSIVE, ECORE_X_WINDOW_INPUT_MODE_PASSIVE,
/** The window sets the focus itself if one of its sub-windows /* The window sets the focus itself if one of its sub-windows
* already is focused */ * already is focused */
ECORE_X_WINDOW_INPUT_MODE_ACTIVE_LOCAL, ECORE_X_WINDOW_INPUT_MODE_ACTIVE_LOCAL,
/** The window sets the focus itself even if another window /* The window sets the focus itself even if another window
* is currently focused */ * is currently focused */
ECORE_X_WINDOW_INPUT_MODE_ACTIVE_GLOBAL ECORE_X_WINDOW_INPUT_MODE_ACTIVE_GLOBAL
} Ecore_X_Window_Input_Mode; } Ecore_X_Window_Input_Mode;
typedef enum _Ecore_X_Window_State_Hint { typedef enum _Ecore_X_Window_State_Hint
{
/** Do not provide any state hint to the window manager */ /** Do not provide any state hint to the window manager */
ECORE_X_WINDOW_STATE_HINT_NONE = -1, ECORE_X_WINDOW_STATE_HINT_NONE = -1,
@ -955,7 +950,8 @@ typedef enum _Ecore_X_Window_State_Hint {
ECORE_X_WINDOW_STATE_HINT_ICONIC ECORE_X_WINDOW_STATE_HINT_ICONIC
} Ecore_X_Window_State_Hint; } Ecore_X_Window_State_Hint;
typedef enum _Ecore_X_Window_Type { typedef enum _Ecore_X_Window_Type
{
ECORE_X_WINDOW_TYPE_DESKTOP, ECORE_X_WINDOW_TYPE_DESKTOP,
ECORE_X_WINDOW_TYPE_DOCK, ECORE_X_WINDOW_TYPE_DOCK,
ECORE_X_WINDOW_TYPE_TOOLBAR, ECORE_X_WINDOW_TYPE_TOOLBAR,
@ -1018,7 +1014,8 @@ typedef enum _Ecore_X_Illume_Mode
{ {
ECORE_X_ILLUME_MODE_UNKNOWN = 0, ECORE_X_ILLUME_MODE_UNKNOWN = 0,
ECORE_X_ILLUME_MODE_SINGLE, ECORE_X_ILLUME_MODE_SINGLE,
ECORE_X_ILLUME_MODE_DUAL ECORE_X_ILLUME_MODE_DUAL_TOP,
ECORE_X_ILLUME_MODE_DUAL_LEFT
} Ecore_X_Illume_Mode; } Ecore_X_Illume_Mode;
typedef enum _Ecore_X_Illume_Quickpanel_State typedef enum _Ecore_X_Illume_Quickpanel_State

3
legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h
View File

@ -207,7 +207,8 @@ EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_J2ME;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CONFORMANT; EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CONFORMANT;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE; EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_SINGLE; EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_SINGLE;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_DUAL; EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_DUAL_TOP;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_DUAL_LEFT;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_BACK; EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_BACK;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CLOSE; EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CLOSE;
EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_DRAG; EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_DRAG;

3
legacy/ecore/src/lib/ecore_x/ecore_x_atoms_decl.h
View File

@ -230,7 +230,8 @@ EAPI Ecore_X_Atom ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_J2ME = 0;
EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CONFORMANT = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CONFORMANT = 0;
EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE = 0;
EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_SINGLE = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_SINGLE = 0;
EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_DUAL = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_DUAL_TOP = 0;
EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_DUAL_LEFT = 0;
EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_BACK = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_BACK = 0;
EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CLOSE = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CLOSE = 0;
EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_DRAG = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_DRAG = 0;

3
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c
View File

@ -221,7 +221,8 @@ _ecore_x_atoms_init(void)
{ "_E_ILLUME_CONFORMANT", &ECORE_X_ATOM_E_ILLUME_CONFORMANT }, { "_E_ILLUME_CONFORMANT", &ECORE_X_ATOM_E_ILLUME_CONFORMANT },
{ "_E_ILLUME_MODE", &ECORE_X_ATOM_E_ILLUME_MODE }, { "_E_ILLUME_MODE", &ECORE_X_ATOM_E_ILLUME_MODE },
{ "_E_ILLUME_MODE_SINGLE", &ECORE_X_ATOM_E_ILLUME_MODE_SINGLE }, { "_E_ILLUME_MODE_SINGLE", &ECORE_X_ATOM_E_ILLUME_MODE_SINGLE },
{ "_E_ILLUME_MODE_DUAL", &ECORE_X_ATOM_E_ILLUME_MODE_DUAL }, { "_E_ILLUME_MODE_DUAL_TOP", &ECORE_X_ATOM_E_ILLUME_MODE_DUAL_TOP },
{ "_E_ILLUME_MODE_DUAL_LEFT", &ECORE_X_ATOM_E_ILLUME_MODE_DUAL_LEFT },
{ "_E_ILLUME_BACK", &ECORE_X_ATOM_E_ILLUME_BACK }, { "_E_ILLUME_BACK", &ECORE_X_ATOM_E_ILLUME_BACK },
{ "_E_ILLUME_DRAG", &ECORE_X_ATOM_E_ILLUME_DRAG }, { "_E_ILLUME_DRAG", &ECORE_X_ATOM_E_ILLUME_DRAG },
{ "_E_ILLUME_DRAG_LOCKED", &ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED }, { "_E_ILLUME_DRAG_LOCKED", &ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED },

12
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c
View File

@ -162,8 +162,10 @@ _ecore_x_e_illume_atom_get(Ecore_X_Illume_Mode mode)
{ {
case ECORE_X_ILLUME_MODE_SINGLE: case ECORE_X_ILLUME_MODE_SINGLE:
return ECORE_X_ATOM_E_ILLUME_MODE_SINGLE; return ECORE_X_ATOM_E_ILLUME_MODE_SINGLE;
case ECORE_X_ILLUME_MODE_DUAL: case ECORE_X_ILLUME_MODE_DUAL_TOP:
return ECORE_X_ATOM_E_ILLUME_MODE_DUAL; return ECORE_X_ATOM_E_ILLUME_MODE_DUAL_TOP;
case ECORE_X_ILLUME_MODE_DUAL_LEFT:
return ECORE_X_ATOM_E_ILLUME_MODE_DUAL_LEFT;
default: default:
return 0; return 0;
} }
@ -175,8 +177,10 @@ _ecore_x_e_illume_mode_get(Ecore_X_Atom atom)
{ {
if (atom == ECORE_X_ATOM_E_ILLUME_MODE_SINGLE) if (atom == ECORE_X_ATOM_E_ILLUME_MODE_SINGLE)
return ECORE_X_ILLUME_MODE_SINGLE; return ECORE_X_ILLUME_MODE_SINGLE;
if (atom == ECORE_X_ATOM_E_ILLUME_MODE_DUAL) if (atom == ECORE_X_ATOM_E_ILLUME_MODE_DUAL_TOP)
return ECORE_X_ILLUME_MODE_DUAL; return ECORE_X_ILLUME_MODE_DUAL_TOP;
if (atom == ECORE_X_ATOM_E_ILLUME_MODE_DUAL_LEFT)
return ECORE_X_ILLUME_MODE_DUAL_LEFT;
return ECORE_X_ILLUME_MODE_UNKNOWN; return ECORE_X_ILLUME_MODE_UNKNOWN;
} }