From 2a687cab8b6e5ad879e572d6e506743b98cef32d Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Wed, 23 Dec 2009 13:10:34 +0000 Subject: [PATCH] Remove winlist atoms/props/functions...I was under the wrong impression wrt this. SVN revision: 44685 --- legacy/ecore/src/lib/ecore_x/Ecore_X.h | 9 ----- legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h | 4 -- legacy/ecore/src/lib/ecore_x/ecore_x_atoms_decl.h | 5 +-- legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c | 6 +-- legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c | 46 ----------------------- 5 files changed, 2 insertions(+), 68 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X.h b/legacy/ecore/src/lib/ecore_x/Ecore_X.h index b7f9682..b534208 100644 --- a/legacy/ecore/src/lib/ecore_x/Ecore_X.h +++ b/legacy/ecore/src/lib/ecore_x/Ecore_X.h @@ -1018,13 +1018,6 @@ typedef enum _Ecore_X_Illume_Mode ECORE_X_ILLUME_MODE_DUAL } Ecore_X_Illume_Mode; -typedef enum _Ecore_X_Illume_Winlist_State -{ - ECORE_X_ILLUME_WINLIST_STATE_UNKNOWN = 0, - ECORE_X_ILLUME_WINLIST_STATE_ON, - ECORE_X_ILLUME_WINLIST_STATE_OFF -} Ecore_X_Illume_Winlist_State; - /* Window layer constants */ #define ECORE_X_WINDOW_LAYER_BELOW 2 #define ECORE_X_WINDOW_LAYER_NORMAL 4 @@ -1558,8 +1551,6 @@ EAPI void ecore_x_e_illume_drag_locked_set(Ecore_X_Window win, un EAPI int ecore_x_e_illume_drag_locked_get(Ecore_X_Window win); EAPI void ecore_x_e_illume_drag_start_send(Ecore_X_Window win); EAPI void ecore_x_e_illume_drag_end_send(Ecore_X_Window win); -EAPI void ecore_x_e_illume_winlist_state_set(Ecore_X_Window win, Ecore_X_Illume_Winlist_State state); -EAPI Ecore_X_Illume_Winlist_State ecore_x_e_illume_winlist_state_get(Ecore_X_Window win); EAPI void ecore_x_xinerama_query_screens_prefetch(void); diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h b/legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h index 32771b9..408ef2b 100644 --- a/legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h +++ b/legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h @@ -214,9 +214,5 @@ EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_DRAG; EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED; EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_DRAG_START; EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_DRAG_END; -EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_WINLIST; -EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_WINLIST_STATE; -EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_WINLIST_ON; -EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_WINLIST_OFF; #endif /* _ECORE_X_ATOMS_H */ diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_atoms_decl.h b/legacy/ecore/src/lib/ecore_x/ecore_x_atoms_decl.h index 0eba880..78c3267 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x_atoms_decl.h +++ b/legacy/ecore/src/lib/ecore_x/ecore_x_atoms_decl.h @@ -237,7 +237,4 @@ EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_DRAG = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_DRAG_START = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_DRAG_END = 0; -EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_WINLIST = 0; -EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_WINLIST_STATE = 0; -EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_WINLIST_ON = 0; -EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_WINLIST_OFF = 0; + diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c index f9be3e6..ae9cbb2 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c @@ -226,11 +226,7 @@ _ecore_x_atoms_init(void) { "_E_ILLUME_DRAG", &ECORE_X_ATOM_E_ILLUME_DRAG }, { "_E_ILLUME_DRAG_LOCKED", &ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED }, { "_E_ILLUME_DRAG_START", &ECORE_X_ATOM_E_ILLUME_DRAG_START }, - { "_E_ILLUME_DRAG_END", &ECORE_X_ATOM_E_ILLUME_DRAG_END }, - { "_E_ILLUME_WINLIST", &ECORE_X_ATOM_E_ILLUME_WINLIST }, - { "_E_ILLUME_WINLIST_STATE", &ECORE_X_ATOM_E_ILLUME_WINLIST_STATE }, - { "_E_ILLUME_WINLIST_ON", &ECORE_X_ATOM_E_ILLUME_WINLIST_ON }, - { "_E_ILLUME_WINLIST_OFF", &ECORE_X_ATOM_E_ILLUME_WINLIST_OFF } + { "_E_ILLUME_DRAG_END", &ECORE_X_ATOM_E_ILLUME_DRAG_END } }; Atom *atoms; char **names; diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c index 7700f12..1e86da4 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c @@ -291,49 +291,3 @@ ecore_x_e_illume_drag_end_send(Ecore_X_Window win) ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); } - -static Ecore_X_Atom -_ecore_x_e_illume_winlist_atom_get(Ecore_X_Illume_Winlist_State state) -{ - switch (state) - { - case ECORE_X_ILLUME_WINLIST_STATE_ON: - return ECORE_X_ATOM_E_ILLUME_WINLIST_ON; - case ECORE_X_ILLUME_WINLIST_STATE_OFF: - return ECORE_X_ATOM_E_ILLUME_WINLIST_OFF; - default: - return 0; - } - return 0; -} - -static Ecore_X_Illume_Mode -_ecore_x_e_illume_winlist_state_get(Ecore_X_Atom atom) -{ - if (atom == ECORE_X_ATOM_E_ILLUME_WINLIST_ON) - return ECORE_X_ILLUME_WINLIST_STATE_ON; - if (atom == ECORE_X_ATOM_E_ILLUME_WINLIST_OFF) - return ECORE_X_ILLUME_WINLIST_STATE_OFF; - return ECORE_X_ILLUME_WINLIST_STATE_UNKNOWN; -} - -EAPI void -ecore_x_e_illume_winlist_state_set(Ecore_X_Window win, Ecore_X_Illume_Winlist_State state) -{ - Ecore_X_Atom atom = 0; - - atom = _ecore_x_e_illume_winlist_atom_get(state); - ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_WINLIST_STATE, - &atom, 1); -} - -EAPI Ecore_X_Illume_Winlist_State -ecore_x_e_illume_winlist_state_get(Ecore_X_Window win) -{ - Ecore_X_Atom atom; - - if (!ecore_x_window_prop_atom_get(win, ECORE_X_ATOM_E_ILLUME_WINLIST_STATE, - &atom, 1)) - return ECORE_X_ILLUME_WINLIST_STATE_UNKNOWN; - return _ecore_x_e_illume_winlist_state_get(atom); -} -- 2.7.4