From 7e6493e11f0265826c0aebbe87b5306782e8de50 Mon Sep 17 00:00:00 2001 From: devilhorns Date: Mon, 22 Feb 2010 17:12:24 +0000 Subject: [PATCH] Readd zone_list functions and atoms. (Needed for some elm apps like elm_indicator & elm_softkey). git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@46357 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_x/Ecore_X.h | 1 + src/lib/ecore_x/Ecore_X_Atoms.h | 1 + src/lib/ecore_x/ecore_x_atoms_decl.h | 1 + src/lib/ecore_x/xlib/ecore_x_atoms.c | 1 + src/lib/ecore_x/xlib/ecore_x_e.c | 7 +++++++ 5 files changed, 11 insertions(+) diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h index ea14c42..535220f 100644 --- a/src/lib/ecore_x/Ecore_X.h +++ b/src/lib/ecore_x/Ecore_X.h @@ -1568,6 +1568,7 @@ EAPI void ecore_x_e_virtual_keyboard_state_send(Ecore_X_Window wi /* Illume functions */ EAPI void ecore_x_e_illume_zone_set(Ecore_X_Window win, Ecore_X_Window zone); EAPI Ecore_X_Window ecore_x_e_illume_zone_get(Ecore_X_Window win); +EAPI void ecore_x_e_illume_zone_list_set(Ecore_X_Window win, Ecore_X_Window *zones, unsigned int n_zones); EAPI void ecore_x_e_illume_conformant_set(Ecore_X_Window win, unsigned int is_conformant); EAPI int ecore_x_e_illume_conformant_get(Ecore_X_Window win); EAPI void ecore_x_e_illume_mode_set(Ecore_X_Window win, Ecore_X_Illume_Mode mode); diff --git a/src/lib/ecore_x/Ecore_X_Atoms.h b/src/lib/ecore_x/Ecore_X_Atoms.h index e9e65fe..aea8ed7 100644 --- a/src/lib/ecore_x/Ecore_X_Atoms.h +++ b/src/lib/ecore_x/Ecore_X_Atoms.h @@ -206,6 +206,7 @@ EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_J2ME; /* Illume specific atoms */ EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ZONE; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ZONE_LIST; 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_SINGLE; diff --git a/src/lib/ecore_x/ecore_x_atoms_decl.h b/src/lib/ecore_x/ecore_x_atoms_decl.h index c9c1b61..674a391 100644 --- a/src/lib/ecore_x/ecore_x_atoms_decl.h +++ b/src/lib/ecore_x/ecore_x_atoms_decl.h @@ -228,6 +228,7 @@ EAPI Ecore_X_Atom ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_J2ME = 0; /* currently E specific illume extension */ EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ZONE = 0; +EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ZONE_LIST = 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_SINGLE = 0; diff --git a/src/lib/ecore_x/xlib/ecore_x_atoms.c b/src/lib/ecore_x/xlib/ecore_x_atoms.c index 733271a..61bddd5 100644 --- a/src/lib/ecore_x/xlib/ecore_x_atoms.c +++ b/src/lib/ecore_x/xlib/ecore_x_atoms.c @@ -221,6 +221,7 @@ _ecore_x_atoms_init(void) { "_E_VIRTUAL_KEYBOARD_J2ME", &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_J2ME }, { "_E_ILLUME_ZONE", &ECORE_X_ATOM_E_ILLUME_ZONE }, + { "_E_ILLUME_ZONE_LIST", &ECORE_X_ATOM_E_ILLUME_ZONE_LIST }, { "_E_ILLUME_CONFORMANT", &ECORE_X_ATOM_E_ILLUME_CONFORMANT }, { "_E_ILLUME_MODE", &ECORE_X_ATOM_E_ILLUME_MODE }, { "_E_ILLUME_MODE_SINGLE", &ECORE_X_ATOM_E_ILLUME_MODE_SINGLE }, diff --git a/src/lib/ecore_x/xlib/ecore_x_e.c b/src/lib/ecore_x/xlib/ecore_x_e.c index 60b2ff1..38c0564 100644 --- a/src/lib/ecore_x/xlib/ecore_x_e.c +++ b/src/lib/ecore_x/xlib/ecore_x_e.c @@ -202,6 +202,13 @@ ecore_x_e_illume_zone_get(Ecore_X_Window win) } EAPI void +ecore_x_e_illume_zone_list_set(Ecore_X_Window win, Ecore_X_Window *zones, unsigned int n_zones) +{ + ecore_x_window_prop_window_set(win, ECORE_X_ATOM_E_ILLUME_ZONE_LIST, + zones, n_zones); +} + +EAPI void ecore_x_e_illume_conformant_set(Ecore_X_Window win, unsigned int is_conformant) { ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_CONFORMANT, -- 2.7.4