From 2d0d852fa9e36461f7573824f03ffdcb0269ba77 Mon Sep 17 00:00:00 2001 From: Jiyoun Park Date: Thu, 18 Apr 2013 14:45:11 +0900 Subject: [PATCH] expand indicator type to support if it want more than two indicator type --- src/lib/ecore_x/Ecore_X.h | 3 ++- src/lib/ecore_x/Ecore_X_Atoms.h | 1 + src/lib/ecore_x/ecore_x_atoms_decl.h | 2 ++ src/lib/ecore_x/xcb/ecore_xcb_e.c | 6 ++++++ src/lib/ecore_x/xlib/ecore_x_e.c | 6 ++++++ 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h index ddd21a2ff9..a23b1739c6 100644 --- a/src/lib/ecore_x/Ecore_X.h +++ b/src/lib/ecore_x/Ecore_X.h @@ -1270,7 +1270,8 @@ typedef enum _Ecore_X_Illume_Indicator_Type_Mode { ECORE_X_ILLUME_INDICATOR_TYPE_UNKNOWN = 0, ECORE_X_ILLUME_INDICATOR_TYPE_1, - ECORE_X_ILLUME_INDICATOR_TYPE_2 + ECORE_X_ILLUME_INDICATOR_TYPE_2, + ECORE_X_ILLUME_INDICATOR_TYPE_3 } Ecore_X_Illume_Indicator_Type_Mode; /**< @since 1.8 */ typedef enum _Ecore_X_Illume_Window_State diff --git a/src/lib/ecore_x/Ecore_X_Atoms.h b/src/lib/ecore_x/Ecore_X_Atoms.h index 253ff5a29b..12a0cee893 100644 --- a/src/lib/ecore_x/Ecore_X_Atoms.h +++ b/src/lib/ecore_x/Ecore_X_Atoms.h @@ -248,6 +248,7 @@ EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_INDICATOR_TRANSPARENT; EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_MODE; EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_1; EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_2; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_3; EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_AVAILABLE_ANGLE; EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE; EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ROTATE_ROOT_ANGLE; diff --git a/src/lib/ecore_x/ecore_x_atoms_decl.h b/src/lib/ecore_x/ecore_x_atoms_decl.h index d5f533b901..37ace98aa9 100644 --- a/src/lib/ecore_x/ecore_x_atoms_decl.h +++ b/src/lib/ecore_x/ecore_x_atoms_decl.h @@ -274,6 +274,7 @@ EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_INDICATOR_TRANSPARENT = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_MODE = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_1 = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_2 = 0; +EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_3 = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_AVAILABLE_ANGLE = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE = 0; EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ROTATE_ROOT_ANGLE = 0; @@ -585,6 +586,7 @@ const Atom_Item atom_items[] = { "_E_ILLUME_INDICATOR_TYPE", &ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_MODE }, { "_E_ILLUME_INDICATOR_TYPE_0", &ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_1 }, { "_E_ILLUME_INDICATOR_TYPE_1", &ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_2 }, + { "_E_ILLUME_INDICATOR_TYPE_2", &ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_3 }, { "_E_ILLUME_ROTATE_WINDOW_AVAILABLE_ANGLES", &ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_AVAILABLE_ANGLE }, { "_E_ILLUME_ROTATE_WINDOW_ANGLE", &ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE }, { "_E_ILLUME_ROTATE_ROOT_ANGLE", &ECORE_X_ATOM_E_ILLUME_ROTATE_ROOT_ANGLE }, diff --git a/src/lib/ecore_x/xcb/ecore_xcb_e.c b/src/lib/ecore_x/xcb/ecore_xcb_e.c index c1ae76c211..8fe0104a64 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_e.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_e.c @@ -1799,6 +1799,9 @@ _ecore_x_e_indicator_type_atom_get(Ecore_X_Illume_Indicator_Type_Mode mode) case ECORE_X_ILLUME_INDICATOR_TYPE_2: return ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_2; + case ECORE_X_ILLUME_INDICATOR_TYPE_3: + return ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_3; + default: break; } @@ -1814,6 +1817,9 @@ _ecore_x_e_indicator_type_get(Ecore_X_Atom atom) if (atom == ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_2) return ECORE_X_ILLUME_INDICATOR_TYPE_2; + if (atom == ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_3) + return ECORE_X_ILLUME_INDICATOR_TYPE_3; + return ECORE_X_ILLUME_INDICATOR_TYPE_UNKNOWN; } diff --git a/src/lib/ecore_x/xlib/ecore_x_e.c b/src/lib/ecore_x/xlib/ecore_x_e.c index 29f66376ab..ec0b2af72c 100644 --- a/src/lib/ecore_x/xlib/ecore_x_e.c +++ b/src/lib/ecore_x/xlib/ecore_x_e.c @@ -1850,6 +1850,9 @@ _ecore_x_e_indicator_type_atom_get(Ecore_X_Illume_Indicator_Type_Mode mode) case ECORE_X_ILLUME_INDICATOR_TYPE_2: return ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_2; + case ECORE_X_ILLUME_INDICATOR_TYPE_3: + return ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_3; + default: break; } @@ -1865,6 +1868,9 @@ _ecore_x_e_indicator_type_get(Ecore_X_Atom atom) if (atom == ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_2) return ECORE_X_ILLUME_INDICATOR_TYPE_2; + if (atom == ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_3) + return ECORE_X_ILLUME_INDICATOR_TYPE_3; + return ECORE_X_ILLUME_INDICATOR_TYPE_UNKNOWN; }