summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Michael <cpmichael1@comcast.net>2009-12-29 22:14:38 +0000
committerChristopher Michael <cpmichael1@comcast.net>2009-12-29 22:14:38 +0000
commit8e455fa1e69003aea7cd2cdef568c882356f8d56 (patch)
tree4687125585ac4dbf1f4a317090f4969569b70bf5
parent331d672b58a7eb93cd8a878c5832abce1416df52 (diff)
Add another illume 'mode'. This allows us to know if we are top/bottom or
left/right. SVN revision: 44768
-rw-r--r--legacy/ecore/src/lib/ecore_x/Ecore_X.h145
-rw-r--r--legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h3
-rw-r--r--legacy/ecore/src/lib/ecore_x/ecore_x_atoms_decl.h3
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c3
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c12
5 files changed, 85 insertions, 81 deletions
diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X.h b/legacy/ecore/src/lib/ecore_x/Ecore_X.h
index 8ff57fa653..80f9e2c360 100644
--- a/legacy/ecore/src/lib/ecore_x/Ecore_X.h
+++ b/legacy/ecore/src/lib/ecore_x/Ecore_X.h
@@ -896,52 +896,47 @@ EAPI extern int ECORE_X_LOCK_SCROLL;
896EAPI extern int ECORE_X_LOCK_NUM; 896EAPI extern int ECORE_X_LOCK_NUM;
897EAPI extern int ECORE_X_LOCK_CAPS; 897EAPI extern int ECORE_X_LOCK_CAPS;
898 898
899typedef enum _Ecore_X_WM_Protocol { 899typedef enum _Ecore_X_WM_Protocol
900 /** 900{
901 * If enabled the window manager will be asked to send a 901 /* If enabled the window manager will be asked to send a
902 * delete message instead of just closing (destroying) the window. 902 * delete message instead of just closing (destroying) the window. */
903 */
904 ECORE_X_WM_PROTOCOL_DELETE_REQUEST, 903 ECORE_X_WM_PROTOCOL_DELETE_REQUEST,
905 904
906 /** 905 /* If enabled the window manager will be told that the window
907 * If enabled the window manager will be told that the window 906 * explicitly sets input focus. */
908 * explicitly sets input focus. 907 ECORE_X_WM_PROTOCOL_TAKE_FOCUS,
909 */ 908
910 ECORE_X_WM_PROTOCOL_TAKE_FOCUS, 909 /* If enabled the window manager can ping the window to check
911 910 * if it is alive. */
912 /** 911 ECORE_X_NET_WM_PROTOCOL_PING,
913 * If enabled the window manager can ping the window to check 912
914 * if it is alive. 913 /* If enabled the window manager can sync updating with the
915 */ 914 * window (?) */
916 ECORE_X_NET_WM_PROTOCOL_PING, 915 ECORE_X_NET_WM_PROTOCOL_SYNC_REQUEST,
917 916
918 /** 917 /* Number of defined items */
919 * If enabled the window manager can sync updating with the 918 ECORE_X_WM_PROTOCOL_NUM
920 * window (?)
921 */
922 ECORE_X_NET_WM_PROTOCOL_SYNC_REQUEST,
923
924 /* Number of defined items */
925 ECORE_X_WM_PROTOCOL_NUM
926} Ecore_X_WM_Protocol; 919} Ecore_X_WM_Protocol;
927 920
928typedef enum _Ecore_X_Window_Input_Mode { 921typedef enum _Ecore_X_Window_Input_Mode
929 /** The window can never be focused */ 922{
923 /* The window can never be focused */
930 ECORE_X_WINDOW_INPUT_MODE_NONE, 924 ECORE_X_WINDOW_INPUT_MODE_NONE,
931 925
932 /** The window can be focused by the WM but doesn't focus itself */ 926 /* The window can be focused by the WM but doesn't focus itself */
933 ECORE_X_WINDOW_INPUT_MODE_PASSIVE, 927 ECORE_X_WINDOW_INPUT_MODE_PASSIVE,
934 928
935 /** The window sets the focus itself if one of its sub-windows 929 /* The window sets the focus itself if one of its sub-windows
936 * already is focused */ 930 * already is focused */
937 ECORE_X_WINDOW_INPUT_MODE_ACTIVE_LOCAL, 931 ECORE_X_WINDOW_INPUT_MODE_ACTIVE_LOCAL,
938 932
939 /** The window sets the focus itself even if another window 933 /* The window sets the focus itself even if another window
940 * is currently focused */ 934 * is currently focused */
941 ECORE_X_WINDOW_INPUT_MODE_ACTIVE_GLOBAL 935 ECORE_X_WINDOW_INPUT_MODE_ACTIVE_GLOBAL
942} Ecore_X_Window_Input_Mode; 936} Ecore_X_Window_Input_Mode;
943 937
944typedef enum _Ecore_X_Window_State_Hint { 938typedef enum _Ecore_X_Window_State_Hint
939{
945 /** Do not provide any state hint to the window manager */ 940 /** Do not provide any state hint to the window manager */
946 ECORE_X_WINDOW_STATE_HINT_NONE = -1, 941 ECORE_X_WINDOW_STATE_HINT_NONE = -1,
947 942
@@ -955,7 +950,8 @@ typedef enum _Ecore_X_Window_State_Hint {
955 ECORE_X_WINDOW_STATE_HINT_ICONIC 950 ECORE_X_WINDOW_STATE_HINT_ICONIC
956} Ecore_X_Window_State_Hint; 951} Ecore_X_Window_State_Hint;
957 952
958typedef enum _Ecore_X_Window_Type { 953typedef enum _Ecore_X_Window_Type
954{
959 ECORE_X_WINDOW_TYPE_DESKTOP, 955 ECORE_X_WINDOW_TYPE_DESKTOP,
960 ECORE_X_WINDOW_TYPE_DOCK, 956 ECORE_X_WINDOW_TYPE_DOCK,
961 ECORE_X_WINDOW_TYPE_TOOLBAR, 957 ECORE_X_WINDOW_TYPE_TOOLBAR,
@@ -970,62 +966,63 @@ typedef enum _Ecore_X_Window_Type {
970typedef enum _Ecore_X_Action 966typedef enum _Ecore_X_Action
971{ 967{
972 ECORE_X_ACTION_MOVE, 968 ECORE_X_ACTION_MOVE,
973 ECORE_X_ACTION_RESIZE, 969 ECORE_X_ACTION_RESIZE,
974 ECORE_X_ACTION_MINIMIZE, 970 ECORE_X_ACTION_MINIMIZE,
975 ECORE_X_ACTION_SHADE, 971 ECORE_X_ACTION_SHADE,
976 ECORE_X_ACTION_STICK, 972 ECORE_X_ACTION_STICK,
977 ECORE_X_ACTION_MAXIMIZE_HORZ, 973 ECORE_X_ACTION_MAXIMIZE_HORZ,
978 ECORE_X_ACTION_MAXIMIZE_VERT, 974 ECORE_X_ACTION_MAXIMIZE_VERT,
979 ECORE_X_ACTION_FULLSCREEN, 975 ECORE_X_ACTION_FULLSCREEN,
980 ECORE_X_ACTION_CHANGE_DESKTOP, 976 ECORE_X_ACTION_CHANGE_DESKTOP,
981 ECORE_X_ACTION_CLOSE, 977 ECORE_X_ACTION_CLOSE,
982 ECORE_X_ACTION_ABOVE, 978 ECORE_X_ACTION_ABOVE,
983 ECORE_X_ACTION_BELOW 979 ECORE_X_ACTION_BELOW
984} Ecore_X_Action; 980} Ecore_X_Action;
985 981
986typedef enum _Ecore_X_Window_Configure_Mask 982typedef enum _Ecore_X_Window_Configure_Mask
987{ 983{
988 ECORE_X_WINDOW_CONFIGURE_MASK_X = (1 << 0), 984 ECORE_X_WINDOW_CONFIGURE_MASK_X = (1 << 0),
989 ECORE_X_WINDOW_CONFIGURE_MASK_Y = (1 << 1), 985 ECORE_X_WINDOW_CONFIGURE_MASK_Y = (1 << 1),
990 ECORE_X_WINDOW_CONFIGURE_MASK_W = (1 << 2), 986 ECORE_X_WINDOW_CONFIGURE_MASK_W = (1 << 2),
991 ECORE_X_WINDOW_CONFIGURE_MASK_H = (1 << 3), 987 ECORE_X_WINDOW_CONFIGURE_MASK_H = (1 << 3),
992 ECORE_X_WINDOW_CONFIGURE_MASK_BORDER_WIDTH = (1 << 4), 988 ECORE_X_WINDOW_CONFIGURE_MASK_BORDER_WIDTH = (1 << 4),
993 ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING = (1 << 5), 989 ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING = (1 << 5),
994 ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE = (1 << 6) 990 ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE = (1 << 6)
995} Ecore_X_Window_Configure_Mask; 991} Ecore_X_Window_Configure_Mask;
996 992
997typedef enum _Ecore_X_Virtual_Keyboard_State 993typedef enum _Ecore_X_Virtual_Keyboard_State
998{ 994{
999 ECORE_X_VIRTUAL_KEYBOARD_STATE_UNKNOWN = 0, 995 ECORE_X_VIRTUAL_KEYBOARD_STATE_UNKNOWN = 0,
1000 ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF, 996 ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF,
1001 ECORE_X_VIRTUAL_KEYBOARD_STATE_ON, 997 ECORE_X_VIRTUAL_KEYBOARD_STATE_ON,
1002 ECORE_X_VIRTUAL_KEYBOARD_STATE_ALPHA, 998 ECORE_X_VIRTUAL_KEYBOARD_STATE_ALPHA,
1003 ECORE_X_VIRTUAL_KEYBOARD_STATE_NUMERIC, 999 ECORE_X_VIRTUAL_KEYBOARD_STATE_NUMERIC,
1004 ECORE_X_VIRTUAL_KEYBOARD_STATE_PIN, 1000 ECORE_X_VIRTUAL_KEYBOARD_STATE_PIN,
1005 ECORE_X_VIRTUAL_KEYBOARD_STATE_PHONE_NUMBER, 1001 ECORE_X_VIRTUAL_KEYBOARD_STATE_PHONE_NUMBER,
1006 ECORE_X_VIRTUAL_KEYBOARD_STATE_HEX, 1002 ECORE_X_VIRTUAL_KEYBOARD_STATE_HEX,
1007 ECORE_X_VIRTUAL_KEYBOARD_STATE_TERMINAL, 1003 ECORE_X_VIRTUAL_KEYBOARD_STATE_TERMINAL,
1008 ECORE_X_VIRTUAL_KEYBOARD_STATE_PASSWORD, 1004 ECORE_X_VIRTUAL_KEYBOARD_STATE_PASSWORD,
1009 ECORE_X_VIRTUAL_KEYBOARD_STATE_IP, 1005 ECORE_X_VIRTUAL_KEYBOARD_STATE_IP,
1010 ECORE_X_VIRTUAL_KEYBOARD_STATE_HOST, 1006 ECORE_X_VIRTUAL_KEYBOARD_STATE_HOST,
1011 ECORE_X_VIRTUAL_KEYBOARD_STATE_FILE, 1007 ECORE_X_VIRTUAL_KEYBOARD_STATE_FILE,
1012 ECORE_X_VIRTUAL_KEYBOARD_STATE_URL, 1008 ECORE_X_VIRTUAL_KEYBOARD_STATE_URL,
1013 ECORE_X_VIRTUAL_KEYBOARD_STATE_KEYPAD, 1009 ECORE_X_VIRTUAL_KEYBOARD_STATE_KEYPAD,
1014 ECORE_X_VIRTUAL_KEYBOARD_STATE_J2ME 1010 ECORE_X_VIRTUAL_KEYBOARD_STATE_J2ME
1015} Ecore_X_Virtual_Keyboard_State; 1011} Ecore_X_Virtual_Keyboard_State;
1016 1012
1017typedef enum _Ecore_X_Illume_Mode 1013typedef enum _Ecore_X_Illume_Mode
1018{ 1014{
1019 ECORE_X_ILLUME_MODE_UNKNOWN = 0, 1015 ECORE_X_ILLUME_MODE_UNKNOWN = 0,
1020 ECORE_X_ILLUME_MODE_SINGLE, 1016 ECORE_X_ILLUME_MODE_SINGLE,
1021 ECORE_X_ILLUME_MODE_DUAL 1017 ECORE_X_ILLUME_MODE_DUAL_TOP,
1018 ECORE_X_ILLUME_MODE_DUAL_LEFT
1022} Ecore_X_Illume_Mode; 1019} Ecore_X_Illume_Mode;
1023 1020
1024typedef enum _Ecore_X_Illume_Quickpanel_State 1021typedef enum _Ecore_X_Illume_Quickpanel_State
1025{ 1022{
1026 ECORE_X_ILLUME_QUICKPANEL_STATE_UNKNOWN = 0, 1023 ECORE_X_ILLUME_QUICKPANEL_STATE_UNKNOWN = 0,
1027 ECORE_X_ILLUME_QUICKPANEL_STATE_OFF, 1024 ECORE_X_ILLUME_QUICKPANEL_STATE_OFF,
1028 ECORE_X_ILLUME_QUICKPANEL_STATE_ON 1025 ECORE_X_ILLUME_QUICKPANEL_STATE_ON
1029} Ecore_X_Illume_Quickpanel_State; 1026} Ecore_X_Illume_Quickpanel_State;
1030 1027
1031/* Window layer constants */ 1028/* Window layer constants */
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 d596ea72d8..6cae19047d 100644
--- a/legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h
+++ b/legacy/ecore/src/lib/ecore_x/Ecore_X_Atoms.h
@@ -207,7 +207,8 @@ EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_J2ME;
207EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CONFORMANT; 207EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CONFORMANT;
208EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE; 208EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE;
209EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_SINGLE; 209EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_SINGLE;
210EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_DUAL; 210EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_DUAL_TOP;
211EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_DUAL_LEFT;
211EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_BACK; 212EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_BACK;
212EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CLOSE; 213EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CLOSE;
213EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_DRAG; 214EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_DRAG;
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 15a174c945..e598449a0e 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
@@ -230,7 +230,8 @@ EAPI Ecore_X_Atom ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_J2ME = 0;
230EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CONFORMANT = 0; 230EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CONFORMANT = 0;
231EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE = 0; 231EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE = 0;
232EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_SINGLE = 0; 232EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_SINGLE = 0;
233EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_DUAL = 0; 233EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_DUAL_TOP = 0;
234EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_MODE_DUAL_LEFT = 0;
234EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_BACK = 0; 235EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_BACK = 0;
235EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CLOSE = 0; 236EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CLOSE = 0;
236EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_DRAG = 0; 237EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_DRAG = 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 1a6be350d1..b8edb1186f 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
@@ -221,7 +221,8 @@ _ecore_x_atoms_init(void)
221 { "_E_ILLUME_CONFORMANT", &ECORE_X_ATOM_E_ILLUME_CONFORMANT }, 221 { "_E_ILLUME_CONFORMANT", &ECORE_X_ATOM_E_ILLUME_CONFORMANT },
222 { "_E_ILLUME_MODE", &ECORE_X_ATOM_E_ILLUME_MODE }, 222 { "_E_ILLUME_MODE", &ECORE_X_ATOM_E_ILLUME_MODE },
223 { "_E_ILLUME_MODE_SINGLE", &ECORE_X_ATOM_E_ILLUME_MODE_SINGLE }, 223 { "_E_ILLUME_MODE_SINGLE", &ECORE_X_ATOM_E_ILLUME_MODE_SINGLE },
224 { "_E_ILLUME_MODE_DUAL", &ECORE_X_ATOM_E_ILLUME_MODE_DUAL }, 224 { "_E_ILLUME_MODE_DUAL_TOP", &ECORE_X_ATOM_E_ILLUME_MODE_DUAL_TOP },
225 { "_E_ILLUME_MODE_DUAL_LEFT", &ECORE_X_ATOM_E_ILLUME_MODE_DUAL_LEFT },
225 { "_E_ILLUME_BACK", &ECORE_X_ATOM_E_ILLUME_BACK }, 226 { "_E_ILLUME_BACK", &ECORE_X_ATOM_E_ILLUME_BACK },
226 { "_E_ILLUME_DRAG", &ECORE_X_ATOM_E_ILLUME_DRAG }, 227 { "_E_ILLUME_DRAG", &ECORE_X_ATOM_E_ILLUME_DRAG },
227 { "_E_ILLUME_DRAG_LOCKED", &ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED }, 228 { "_E_ILLUME_DRAG_LOCKED", &ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED },
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 72ddbee038..328ed10398 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
@@ -162,8 +162,10 @@ _ecore_x_e_illume_atom_get(Ecore_X_Illume_Mode mode)
162 { 162 {
163 case ECORE_X_ILLUME_MODE_SINGLE: 163 case ECORE_X_ILLUME_MODE_SINGLE:
164 return ECORE_X_ATOM_E_ILLUME_MODE_SINGLE; 164 return ECORE_X_ATOM_E_ILLUME_MODE_SINGLE;
165 case ECORE_X_ILLUME_MODE_DUAL: 165 case ECORE_X_ILLUME_MODE_DUAL_TOP:
166 return ECORE_X_ATOM_E_ILLUME_MODE_DUAL; 166 return ECORE_X_ATOM_E_ILLUME_MODE_DUAL_TOP;
167 case ECORE_X_ILLUME_MODE_DUAL_LEFT:
168 return ECORE_X_ATOM_E_ILLUME_MODE_DUAL_LEFT;
167 default: 169 default:
168 return 0; 170 return 0;
169 } 171 }
@@ -175,8 +177,10 @@ _ecore_x_e_illume_mode_get(Ecore_X_Atom atom)
175{ 177{
176 if (atom == ECORE_X_ATOM_E_ILLUME_MODE_SINGLE) 178 if (atom == ECORE_X_ATOM_E_ILLUME_MODE_SINGLE)
177 return ECORE_X_ILLUME_MODE_SINGLE; 179 return ECORE_X_ILLUME_MODE_SINGLE;
178 if (atom == ECORE_X_ATOM_E_ILLUME_MODE_DUAL) 180 if (atom == ECORE_X_ATOM_E_ILLUME_MODE_DUAL_TOP)
179 return ECORE_X_ILLUME_MODE_DUAL; 181 return ECORE_X_ILLUME_MODE_DUAL_TOP;
182 if (atom == ECORE_X_ATOM_E_ILLUME_MODE_DUAL_LEFT)
183 return ECORE_X_ILLUME_MODE_DUAL_LEFT;
180 return ECORE_X_ILLUME_MODE_UNKNOWN; 184 return ECORE_X_ILLUME_MODE_UNKNOWN;
181} 185}
182 186