Upstream merge
authorJiyoun Park <jy0703.park@samsung.com>
Wed, 20 Jun 2012 08:20:07 +0000 (17:20 +0900)
committerJiyoun Park <jy0703.park@samsung.com>
Wed, 20 Jun 2012 08:20:07 +0000 (17:20 +0900)
Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
ChangeLog
NEWS
src/lib/ecore/ecore_thread.c
src/lib/ecore_evas/ecore_evas_wayland_shm.c
src/lib/ecore_x/Ecore_X.h
src/lib/ecore_x/Ecore_X_Atoms.h
src/lib/ecore_x/ecore_x_atoms_decl.h
src/lib/ecore_x/xcb/ecore_xcb_atoms.c
src/lib/ecore_x/xlib/ecore_x_atoms.c

Change-Id: I1061e8307ecaf505c897d7279ca0eac4daacd2e4

20 files changed:
1  2 
ChangeLog
NEWS
packaging/ecore.spec
po/cs.po
src/lib/ecore_evas/Ecore_Evas.h
src/lib/ecore_evas/ecore_evas.c
src/lib/ecore_evas/ecore_evas_directfb.c
src/lib/ecore_evas/ecore_evas_fb.c
src/lib/ecore_evas/ecore_evas_wayland_egl.c
src/lib/ecore_evas/ecore_evas_wayland_shm.c
src/lib/ecore_evas/ecore_evas_win32.c
src/lib/ecore_evas/ecore_evas_x.c
src/lib/ecore_imf/ecore_imf_context.c
src/lib/ecore_x/Ecore_X.h
src/lib/ecore_x/Ecore_X_Atoms.h
src/lib/ecore_x/ecore_x_atoms_decl.h
src/lib/ecore_x/xcb/ecore_xcb_atoms.c
src/lib/ecore_x/xcb/ecore_xcb_e.c
src/lib/ecore_x/xlib/ecore_x_atoms.c
src/lib/ecore_x/xlib/ecore_x_e.c

diff --cc ChangeLog
Simple merge
diff --cc NEWS
Simple merge
index 3dcf661,0000000..c3917d2
mode 100644,000000..100644
--- /dev/null
@@@ -1,309 -1,0 +1,311 @@@
- Version:    1.2.0+svn.70444slp2+build05
- Release:    2
 +#sbs-git:slp/pkgs/e/ecore ecore 1.2.0+svn.70444slp2+build05 cfce17dc2fedf3e6b9acacd210857a110c3f1be1
 +Name:       ecore
 +Summary:    Enlightened Core X interface library
++Version:    1.2.0+svn.72378slp2+build01
++Release:    1
 +Group:      System/Libraries
 +License:    BSD
 +URL:        http://www.enlightenment.org
 +Source0:    %{name}-%{version}.tar.gz
 +Requires(post): /sbin/ldconfig
 +Requires(postun): /sbin/ldconfig
++BuildRequires:  gettext
 +BuildRequires:  eina-devel
 +BuildRequires:  eet-devel
 +BuildRequires:  evas-devel
 +BuildRequires:  glib2-devel
 +BuildRequires:  libxcursor-devel
 +BuildRequires:  libxrender-devel
 +BuildRequires:  libxinerama-devel
 +BuildRequires:  libxrandr-devel
 +BuildRequires:  libxext-devel
 +BuildRequires:  libxi-devel
 +BuildRequires:  libxfixes-devel
 +BuildRequires:  libxcomposite-devel
 +BuildRequires:  libxdamage-devel
 +BuildRequires:  x11proto-xext
 +BuildRequires:  libxtst-devel
 +BuildRequires:  curl-devel
 +BuildRequires:  libjpeg-devel
 +
 +
 +%description
 +Core abstraction layer for enlightenment DR 0.17 This is the core event abstraction layer and X abstraction layer that makes
 + doing selections, Xdnd, general X stuff, and event loops, timeouts and idle
 + handlers fast, optimized, and convenient. It's a separate library so anyone
 + can make use of the work put into Ecore to make this job easy for
 + applications.
 +
 +
 +
 +%package devel
 +Summary:    Enlightened Core X interface library (devel)
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +
 +%description devel
 +Core abstraction layer for enlightenment (devel)
 +
 +%package tools
 +Summary:    Enlightened Core X interface library (bin)
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +Provides:   %{name}-bin
 +Obsoletes:  %{name}-bin
 +
 +%description tools
 +Core abstraction layer for enlightenment (tools)
 +
 +%package con
 +Summary:    Enlightened Core X interface library (con)
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +Requires(post): /sbin/ldconfig
 +Requires(postun): /sbin/ldconfig
 +
 +%description con
 +Core abstraction layer for enlightenment (con)
 +
 +%package evas
 +Summary:    Enlightened Core X interface library (evas)
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +Requires(post): /sbin/ldconfig
 +Requires(postun): /sbin/ldconfig
 +
 +%description evas
 +Core abstraction layer for enlightenment (evas)
 +
 +%package file
 +Summary:    Enlightened Core X interface library (file)
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +Requires(post): /sbin/ldconfig
 +Requires(postun): /sbin/ldconfig
 +
 +%description file
 +Core abstraction layer for enlightenment (file)
 +
 +%package imf
 +Summary:    Enlightened Core X interface library (imf)
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +Requires(post): /sbin/ldconfig
 +Requires(postun): /sbin/ldconfig
 +
 +%description imf
 +Core abstraction layer for enlightenment (imf)
 +
 +%package imf-evas
 +Summary:    Enlightened Core X interface library (imf-evas)
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +Requires(post): /sbin/ldconfig
 +Requires(postun): /sbin/ldconfig
 +
 +%description imf-evas
 +Core abstraction layer for enlightenment (imf-evas)
 +
 +%package input
 +Summary:    Enlightened Core X interface library (input)
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +Requires(post): /sbin/ldconfig
 +Requires(postun): /sbin/ldconfig
 +
 +%description input
 +Core abstraction layer for enlightenment (input)
 +
 +%package input-evas
 +Summary:    Enlightened Core X interface library (input-evas)
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +Requires(post): /sbin/ldconfig
 +Requires(postun): /sbin/ldconfig
 +
 +%description input-evas
 +Core abstraction layer for enlightenment (input-evas)
 +
 +%package ipc
 +Summary:    Enlightened Core X interface library (ipc)
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +Requires(post): /sbin/ldconfig
 +Requires(postun): /sbin/ldconfig
 +
 +%description ipc
 +Core abstraction layer for enlightenment (ipc)
 +
 +%package x
 +Summary:    Enlightened Core X interface library (x)
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +Requires(post): /sbin/ldconfig
 +Requires(postun): /sbin/ldconfig
 +
 +%description x
 +Core abstraction layer for enlightenment (x)
 +
 +%package fb
 +Summary:    Enlightened Core X interface library (fb)
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +Requires(post): /sbin/ldconfig
 +Requires(postun): /sbin/ldconfig
 +
 +%description fb
 +Core abstraction layer for enlightenment (fb)
 +
 +
 +%prep
 +%setup -q
 +
 +
 +%build
 +export CFLAGS+=" -fvisibility=hidden -fPIC"
 +export LDFLAGS+=" -fvisibility=hidden -Wl,--hash-style=both -Wl,--as-needed"
 +
 +%autogen
 +%configure --disable-static \
 +      --enable-ecore-fb \
 +      --enable-dependency-tracking \
 +      --disable-ecore-directfb \
 +      --enable-ecore-evas-fb \
 +      --disable-rpath \
 +      --disable-openssl \
 +      --disable-gnutls \
 +      --disable-tslib \
 +      --enable-simple-x11 \
 +      --enable-ecore-evas-opengl-x11 \
 +      --disable-ecore-evas-xrender-x11 \
 +      --enable-curl \
 +      --enable-glib-integration-always \
 +      --enable-ecore-x-gesture \
 +      --disable-xim \
 +      --disable-ecore-imf-xim \
 +      --disable-ecore-imf-scim
 +
 +make %{?jobs:-j%jobs}
 +
 +%install
 +rm -rf %{buildroot}
 +%make_install
 +
 +
 +%post -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
 +
 +%post con -p /sbin/ldconfig
 +
 +%postun con -p /sbin/ldconfig
 +
 +%post evas -p /sbin/ldconfig
 +
 +%postun evas -p /sbin/ldconfig
 +
 +
 +%post file -p /sbin/ldconfig
 +
 +%postun file -p /sbin/ldconfig
 +
 +
 +%post imf -p /sbin/ldconfig
 +
 +%postun imf -p /sbin/ldconfig
 +
 +
 +%post imf-evas -p /sbin/ldconfig
 +
 +%postun imf-evas -p /sbin/ldconfig
 +
 +
 +%post input -p /sbin/ldconfig
 +
 +%postun input -p /sbin/ldconfig
 +
 +
 +%post input-evas -p /sbin/ldconfig
 +
 +%postun input-evas -p /sbin/ldconfig
 +
 +
 +%post ipc -p /sbin/ldconfig
 +
 +%postun ipc -p /sbin/ldconfig
 +
 +
 +%post x -p /sbin/ldconfig
 +
 +%postun x -p /sbin/ldconfig
 +
 +
 +%post fb -p /sbin/ldconfig
 +
 +%postun fb -p /sbin/ldconfig
 +
 +%files 
 +%defattr(-,root,root,-)
 +%{_libdir}/libecore.so.*
++/usr/share/locale/*
 +
 +%files devel
 +%defattr(-,root,root,-)
 +%{_includedir}/ecore-1/*.h
 +%{_libdir}/pkgconfig/ecore*.pc
 +%{_libdir}/libecore.so
 +%{_libdir}/libecore_con.so
 +%{_libdir}/libecore_evas.so
 +%{_libdir}/libecore_file.so
 +%{_libdir}/libecore_imf.so
 +%{_libdir}/libecore_imf_evas.so
 +%{_libdir}/libecore_input.so
 +%{_libdir}/libecore_input_evas.so
 +%{_libdir}/libecore_ipc.so
 +%{_libdir}/libecore_x.so
 +%{_libdir}/libecore_fb.so
 +
 +%files tools
 +%defattr(-,root,root,-)
 +#/usr/bin/ecore_test
 +
 +%files con
 +%defattr(-,root,root,-)
 +%{_libdir}/libecore_con.so.*
 +
 +%files evas
 +%defattr(-,root,root,-)
 +%{_libdir}/libecore_evas.so.*
 +
 +%files file
 +%defattr(-,root,root,-)
 +%{_libdir}/libecore_file.so.*
 +
 +%files imf
 +%defattr(-,root,root,-)
 +%{_libdir}/libecore_imf.so.*
 +
 +%files imf-evas
 +%defattr(-,root,root,-)
 +%{_libdir}/libecore_imf_evas.so.*
 +
 +%files input
 +%defattr(-,root,root,-)
 +%{_libdir}/libecore_input.so.*
 +
 +%files input-evas
 +%defattr(-,root,root,-)
 +%{_libdir}/libecore_input_evas.so.*
 +
 +%files ipc
 +%defattr(-,root,root,-)
 +%{_libdir}/libecore_ipc.so.*
 +
 +%files x
 +%defattr(-,root,root,-)
 +%{_libdir}/libecore_x.so.*
 +
 +%files fb
 +%defattr(-,root,root,-)
 +%{_libdir}/libecore_fb.so.*
 +
diff --cc po/cs.po
+++ b/po/cs.po
@@@ -150,17 -153,17 +150,17 @@@ msgstr "CHYBA: nebyly poskytnuty argume
  msgid "ERROR: invalid options found."
  msgstr "CHYBA: nalezeny neplatné volby."
  
- #: src/lib/ecore/ecore_getopt.c:1837
+ #: src/lib/ecore/ecore_getopt.c:1839
  #, c-format
  msgid " See --%s.\n"
 -msgstr " Viz --%s.\n"
 +msgstr " viz. --%s.\n"
  
- #: src/lib/ecore/ecore_getopt.c:1839
+ #: src/lib/ecore/ecore_getopt.c:1841
  #, c-format
  msgid " See -%c.\n"
 -msgstr " Viz -%c.\n"
 +msgstr " viz. -%c.\n"
  
- #: src/lib/ecore/ecore_getopt.c:1882
+ #: src/lib/ecore/ecore_getopt.c:1887
  #, c-format
  msgid "ERROR: incorrect geometry value '%s'\n"
  msgstr "CHYBA: neplatná hodnota geometrie '%s'\n"
Simple merge
Simple merge
Simple merge
@@@ -146,14 -148,13 +148,14 @@@ static Ecore_Evas_Engine_Func _ecore_wl
     _ecore_evas_wl_ignore_events_set,
     _ecore_evas_wl_alpha_set,
     _ecore_evas_wl_transparent_set,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    _ecore_evas_wl_render, 
 +   NULL, // func profiles set
 -   _ecore_evas_wl_render, 
+    NULL, // window group set
+    NULL, // aspect set
+    NULL, // urgent set
+    NULL, // modal set
+    NULL, // demand attention set
+    NULL, // focus skip set
++   _ecore_evas_wl_render,
     _ecore_evas_wl_screen_geometry_get
  };
  
@@@ -993,9 -1070,8 +1070,9 @@@ static Ecore_Evas_Engine_Func _ecore_wi
       NULL, /* _ecore_evas_x_withdrawn_set */
       NULL, /* _ecore_evas_x_sticky_set */
       NULL, /* _ecore_evas_x_ignore_events_set */
-      NULL,  /* _ecore_evas_x_alpha_set */
+      _ecore_evas_win32_alpha_set,
       NULL, //transparent
 +     NULL, // profiles_set
  
       NULL,
       NULL,
Simple merge
Simple merge
@@@ -349,20 -337,36 +337,50 @@@ typedef enum _Ecore_X_Randr_Property_Ch
     ECORE_X_RANDR_PROPERTY_CHANGE_DEL
  } Ecore_X_Randr_Property_Change;
  
 +typedef enum _Ecore_X_Netwm_Direction
 +{
 +   ECORE_X_NETWM_DIRECTION_SIZE_TL = 0,
 +   ECORE_X_NETWM_DIRECTION_SIZE_T = 1,
 +   ECORE_X_NETWM_DIRECTION_SIZE_TR = 2,
 +   ECORE_X_NETWM_DIRECTION_SIZE_R = 3,
 +   ECORE_X_NETWM_DIRECTION_SIZE_BR = 4,
 +   ECORE_X_NETWM_DIRECTION_SIZE_B = 5,
 +   ECORE_X_NETWM_DIRECTION_SIZE_BL = 6,
 +   ECORE_X_NETWM_DIRECTION_SIZE_L = 7,
 +   ECORE_X_NETWM_DIRECTION_MOVE = 8,
 +   ECORE_X_NETWM_DIRECTION_CANCEL = 11,
 +} Ecore_X_Netwm_Direction;
 +
+ /**
+  * @typedef _Ecore_X_Error_Code
+  * Defines the error codes of Ecore_X which wraps the X Window Systems
+  * protocol's errors.
+  *
+  * @since 1.3.0
+  */
+ typedef enum _Ecore_X_Error_Code
+ {
+    /** Everything is okay. */
+    ECORE_X_ERROR_CODE_SUCCESS = 0, /** Bad request code */
+    ECORE_X_ERROR_CODE_BAD_REQUEST = 1, /** Int parameter out of range */
+    ECORE_X_ERROR_CODE_BAD_VALUE = 2, /** Parameter not a Window */
+    ECORE_X_ERROR_CODE_BAD_WINDOW = 3, /** Parameter not a Pixmap */
+    ECORE_X_ERROR_CODE_BAD_PIXMAP = 4, /** Parameter not an Atom */
+    ECORE_X_ERROR_CODE_BAD_ATOM = 5, /** Parameter not a Cursor */
+    ECORE_X_ERROR_CODE_BAD_CURSOR = 6, /** Parameter not a Font */
+    ECORE_X_ERROR_CODE_BAD_FONT = 7, /** Parameter mismatch */
+    ECORE_X_ERROR_CODE_BAD_MATCH = 8, /** Parameter not a Pixmap or Window */
+    ECORE_X_ERROR_CODE_BAD_DRAWABLE = 9, /** Bad access */
+    ECORE_X_ERROR_CODE_BAD_ACCESS = 10, /** Insufficient resources */
+    ECORE_X_ERROR_CODE_BAD_ALLOC = 11, /** No such colormap */
+    ECORE_X_ERROR_CODE_BAD_COLOR = 12, /** Parameter not a GC */
+    ECORE_X_ERROR_CODE_BAD_GC = 13, /** Choice not in range or already used */
+    ECORE_X_ERROR_CODE_BAD_ID_CHOICE = 14, /** Font or color name doesn't exist */
+    ECORE_X_ERROR_CODE_BAD_NAME = 15, /** Request length incorrect */
+    ECORE_X_ERROR_CODE_BAD_LENGTH = 16, /** Server is defective */
+    ECORE_X_ERROR_CODE_BAD_IMPLEMENTATION = 17,
+ } Ecore_X_Error_Code;
  typedef struct _Ecore_X_Event_Mouse_In                     Ecore_X_Event_Mouse_In;
  typedef struct _Ecore_X_Event_Mouse_Out                    Ecore_X_Event_Mouse_Out;
  typedef struct _Ecore_X_Event_Window_Focus_In              Ecore_X_Event_Window_Focus_In;
@@@ -3822,60 -2255,33 +2332,40 @@@ struct _Ecore_X_Event_Gesture_Notify_Ho
  
  struct _Ecore_X_Event_Gesture_Notify_Group
  {
-    Ecore_X_Window win;
-    Ecore_X_Time time;
+    Ecore_X_Window                win;
+    Ecore_X_Time                  time;
     Ecore_X_Gesture_Group_Subtype subtype;
-    int num_groups;
-    int group_id;
+    int                           num_groups;
+    int                           group_id;
  };
  
- EAPI Eina_Bool
- ecore_x_gesture_supported(void);
+ EAPI Eina_Bool                             ecore_x_gesture_supported(void);
  
- EAPI Eina_Bool
- ecore_x_gesture_events_select(Ecore_X_Window win,
-                               Ecore_X_Gesture_Event_Mask mask);
+ EAPI Eina_Bool                             ecore_x_gesture_events_select(Ecore_X_Window win, Ecore_X_Gesture_Event_Mask mask);
  
- EAPI Ecore_X_Gesture_Event_Mask
- ecore_x_gesture_events_selected_get(Ecore_X_Window win);
+ EAPI Ecore_X_Gesture_Event_Mask            ecore_x_gesture_events_selected_get(Ecore_X_Window win);
  
- EAPI Eina_Bool
- ecore_x_gesture_event_grab(Ecore_X_Window win,
-                            Ecore_X_Gesture_Event_Type type,
-                            int num_fingers);
+ EAPI Eina_Bool                             ecore_x_gesture_event_grab(Ecore_X_Window win, Ecore_X_Gesture_Event_Type type, int num_fingers);
  
- EAPI Eina_Bool
- ecore_x_gesture_event_ungrab(Ecore_X_Window win,
-                              Ecore_X_Gesture_Event_Type type,
-                              int num_fingers);
+ EAPI Eina_Bool                             ecore_x_gesture_event_ungrab(Ecore_X_Window win, Ecore_X_Gesture_Event_Type type, int num_fingers);
  
- EAPI void
- ecore_x_e_illume_indicator_state_set(Ecore_X_Window win,
-                                      Ecore_X_Illume_Indicator_State state);
- EAPI Ecore_X_Illume_Indicator_State
- ecore_x_e_illume_indicator_state_get(Ecore_X_Window win);
- EAPI void
- ecore_x_e_illume_indicator_state_send(Ecore_X_Window win,
-                                       Ecore_X_Illume_Indicator_State state);
+ EAPI void                                  ecore_x_e_illume_indicator_state_set(Ecore_X_Window win, Ecore_X_Illume_Indicator_State state);
+ EAPI Ecore_X_Illume_Indicator_State        ecore_x_e_illume_indicator_state_get(Ecore_X_Window win);
+ EAPI void                                  ecore_x_e_illume_indicator_state_send(Ecore_X_Window win, Ecore_X_Illume_Indicator_State state);
  
- EAPI void
- ecore_x_e_illume_indicator_opacity_set(Ecore_X_Window win,
-                                      Ecore_X_Illume_Indicator_Opacity_Mode mode);
+ EAPI void                                  ecore_x_e_illume_indicator_opacity_set(Ecore_X_Window win, Ecore_X_Illume_Indicator_Opacity_Mode mode);
  
- EAPI Ecore_X_Illume_Indicator_Opacity_Mode
- ecore_x_e_illume_indicator_opacity_get(Ecore_X_Window win);
+ EAPI Ecore_X_Illume_Indicator_Opacity_Mode ecore_x_e_illume_indicator_opacity_get(Ecore_X_Window win);
  
- EAPI void
- ecore_x_e_illume_indicator_opacity_send(Ecore_X_Window win,
-                                       Ecore_X_Illume_Indicator_Opacity_Mode mode);
+ EAPI void                                  ecore_x_e_illume_indicator_opacity_send(Ecore_X_Window win, Ecore_X_Illume_Indicator_Opacity_Mode mode);
  
 +EAPI void
 +ecore_x_e_illume_window_state_set(Ecore_X_Window win,
 +                                  Ecore_X_Illume_Window_State state);
 +
 +EAPI Ecore_X_Illume_Window_State
 +ecore_x_e_illume_window_state_get(Ecore_X_Window win);
 +
  #ifdef __cplusplus
  }
  #endif // ifdef __cplusplus
@@@ -252,9 -252,13 +252,16 @@@ EAPI extern Ecore_X_Atom ECORE_X_ATOM_E
  EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CLIPBOARD_ON;
  EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CLIPBOARD_OFF;
  EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CLIPBOARD_GEOMETRY;
 +EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_WINDOW_STATE;
 +EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_WINDOW_STATE_NORMAL;
 +EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_WINDOW_STATE_FLOATING;
+ EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL;
+ EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_NEXT;
+ EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_PREV;
+ EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_ACTIVATE;
+ EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_READ;
+ EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_READ_NEXT;
+ EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_READ_PREV;
  
  EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_COMP_SYNC_COUNTER;
  EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_COMP_SYNC_DRAW_DONE;
@@@ -278,9 -278,13 +278,16 @@@ EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME
  EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CLIPBOARD_GEOMETRY = 0;
  EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CLIPBOARD_ON = 0;
  EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_CLIPBOARD_OFF = 0;
 +EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_WINDOW_STATE = 0;
 +EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_WINDOW_STATE_NORMAL = 0;
 +EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_WINDOW_STATE_FLOATING = 0;
+ EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL = 0;
+ EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_NEXT = 0;
+ EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_PREV = 0;
+ EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_ACTIVATE = 0;
+ EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_READ = 0;
+ EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_READ_NEXT = 0;
+ EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_READ_PREV = 0;
  
  EAPI Ecore_X_Atom ECORE_X_ATOM_E_COMP_SYNC_COUNTER = 0;
  EAPI Ecore_X_Atom ECORE_X_ATOM_E_COMP_SYNC_DRAW_DONE = 0;
@@@ -297,14 -301,280 +304,292 @@@ EAPI Ecore_X_Atom ECORE_X_ATOM_E_COMP_P
  EAPI Ecore_X_Atom ECORE_X_ATOM_E_VIDEO_PARENT = 0;
  EAPI Ecore_X_Atom ECORE_X_ATOM_E_VIDEO_POSITION = 0;
  
 +/* for sliding window */
 +EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE = 0;
 +EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_GEOMETRY = 0;
 +
 +/* for SDB(Samsung Debug Bridge) */
 +EAPI Ecore_X_Atom ECORE_X_ATOM_SDB_SERVER_CONNECT = 0;
 +EAPI Ecore_X_Atom ECORE_X_ATOM_SDB_SERVER_DISCONNECT = 0;
 +
 +/* currently elementary and E specific extension */
 +EAPI Ecore_X_Atom ECORE_X_ATOM_E_PROFILE = 0;
 +EAPI Ecore_X_Atom ECORE_X_ATOM_E_PROFILE_LIST = 0;
++
+ typedef struct _Atom_Item Atom_Item;
+ struct _Atom_Item
+ {
+    const char   *name;
+    Ecore_X_Atom *atom;
+ };
+ const Atom_Item atom_items[] =
+ {
+    { "ATOM", &ECORE_X_ATOM_ATOM },
+    { "CARDINAL", &ECORE_X_ATOM_CARDINAL },
+    { "COMPOUND_TEXT", &ECORE_X_ATOM_COMPOUND_TEXT },
+    { "FILE_NAME", &ECORE_X_ATOM_FILE_NAME },
+    { "STRING", &ECORE_X_ATOM_STRING },
+    { "TEXT", &ECORE_X_ATOM_TEXT },
+    { "UTF8_STRING", &ECORE_X_ATOM_UTF8_STRING },
+    { "WINDOW", &ECORE_X_ATOM_WINDOW },
+    { "PIXMAP", &ECORE_X_ATOM_PIXMAP },
+    { "VISUALID", &ECORE_X_ATOM_VISUALID },
+    { "JXSelectionWindowProperty", &ECORE_X_ATOM_SELECTION_PROP_XDND },
+    { "XdndSelection", &ECORE_X_ATOM_SELECTION_XDND },
+    { "XdndAware", &ECORE_X_ATOM_XDND_AWARE },
+    { "XdndEnter", &ECORE_X_ATOM_XDND_ENTER },
+    { "XdndTypeList", &ECORE_X_ATOM_XDND_TYPE_LIST },
+    { "XdndPosition", &ECORE_X_ATOM_XDND_POSITION },
+    { "XdndActionCopy", &ECORE_X_ATOM_XDND_ACTION_COPY },
+    { "XdndActionMove", &ECORE_X_ATOM_XDND_ACTION_MOVE },
+    { "XdndActionPrivate", &ECORE_X_ATOM_XDND_ACTION_PRIVATE },
+    { "XdndActionAsk", &ECORE_X_ATOM_XDND_ACTION_ASK },
+    { "XdndActionList", &ECORE_X_ATOM_XDND_ACTION_LIST },
+    { "XdndActionLink", &ECORE_X_ATOM_XDND_ACTION_LINK },
+    { "XdndActionDescription", &ECORE_X_ATOM_XDND_ACTION_DESCRIPTION },
+    { "XdndProxy", &ECORE_X_ATOM_XDND_PROXY },
+    { "XdndStatus", &ECORE_X_ATOM_XDND_STATUS },
+    { "XdndLeave", &ECORE_X_ATOM_XDND_LEAVE },
+    { "XdndDrop", &ECORE_X_ATOM_XDND_DROP },
+    { "XdndFinished", &ECORE_X_ATOM_XDND_FINISHED },
+    { "XdndActionCopy", &ECORE_X_DND_ACTION_COPY },
+    { "XdndActionMove", &ECORE_X_DND_ACTION_MOVE },
+    { "XdndActionLink", &ECORE_X_DND_ACTION_LINK },
+    { "XdndActionAsk", &ECORE_X_DND_ACTION_ASK },
+    { "XdndActionPrivate", &ECORE_X_DND_ACTION_PRIVATE },
+    { "_E_FRAME_SIZE", &ECORE_X_ATOM_E_FRAME_SIZE },
+    { "_WIN_LAYER", &ECORE_X_ATOM_WIN_LAYER },
+    { "WM_NAME", &ECORE_X_ATOM_WM_NAME },
+    { "WM_ICON_NAME", &ECORE_X_ATOM_WM_ICON_NAME },
+    { "WM_NORMAL_HINTS", &ECORE_X_ATOM_WM_NORMAL_HINTS },
+    { "WM_SIZE_HINTS", &ECORE_X_ATOM_WM_SIZE_HINTS },
+    { "WM_HINTS", &ECORE_X_ATOM_WM_HINTS },
+    { "WM_CLASS", &ECORE_X_ATOM_WM_CLASS },
+    { "WM_TRANSIENT_FOR", &ECORE_X_ATOM_WM_TRANSIENT_FOR },
+    { "WM_PROTOCOLS", &ECORE_X_ATOM_WM_PROTOCOLS },
+    { "WM_COLORMAP_WINDOWS", &ECORE_X_ATOM_WM_COLORMAP_WINDOWS },
+    { "WM_COMMAND", &ECORE_X_ATOM_WM_COMMAND },
+    { "WM_CLIENT_MACHINE", &ECORE_X_ATOM_WM_CLIENT_MACHINE },
+    { "WM_STATE", &ECORE_X_ATOM_WM_STATE },
+    { "WM_ICON_SIZE", &ECORE_X_ATOM_WM_ICON_SIZE },
+    { "WM_CHANGE_STATE", &ECORE_X_ATOM_WM_CHANGE_STATE },
+    { "WM_TAKE_FOCUS", &ECORE_X_ATOM_WM_TAKE_FOCUS },
+    { "WM_SAVE_YOURSELF", &ECORE_X_ATOM_WM_SAVE_YOURSELF },
+    { "WM_DELETE_WINDOW", &ECORE_X_ATOM_WM_DELETE_WINDOW },
+    { "WM_COLORMAP_NOTIFY", &ECORE_X_ATOM_WM_COLORMAP_NOTIFY },
+    { "SM_CLIENT_ID", &ECORE_X_ATOM_SM_CLIENT_ID },
+    { "WM_CLIENT_LEADER", &ECORE_X_ATOM_WM_CLIENT_LEADER },
+    { "WM_WINDOW_ROLE", &ECORE_X_ATOM_WM_WINDOW_ROLE },
+    { "_MOTIF_WM_HINTS", &ECORE_X_ATOM_MOTIF_WM_HINTS },
+    { "_NET_SUPPORTED", &ECORE_X_ATOM_NET_SUPPORTED },
+    { "_NET_CLIENT_LIST", &ECORE_X_ATOM_NET_CLIENT_LIST },
+    { "_NET_CLIENT_LIST_STACKING", &ECORE_X_ATOM_NET_CLIENT_LIST_STACKING },
+    { "_NET_NUMBER_OF_DESKTOPS", &ECORE_X_ATOM_NET_NUMBER_OF_DESKTOPS },
+    { "_NET_DESKTOP_GEOMETRY", &ECORE_X_ATOM_NET_DESKTOP_GEOMETRY },
+    { "_NET_DESKTOP_VIEWPORT", &ECORE_X_ATOM_NET_DESKTOP_VIEWPORT },
+    { "_NET_CURRENT_DESKTOP", &ECORE_X_ATOM_NET_CURRENT_DESKTOP },
+    { "_NET_DESKTOP_NAMES", &ECORE_X_ATOM_NET_DESKTOP_NAMES },
+    { "_NET_ACTIVE_WINDOW", &ECORE_X_ATOM_NET_ACTIVE_WINDOW },
+    { "_NET_WORKAREA", &ECORE_X_ATOM_NET_WORKAREA },
+    { "_NET_SUPPORTING_WM_CHECK", &ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK },
+    { "_NET_VIRTUAL_ROOTS", &ECORE_X_ATOM_NET_VIRTUAL_ROOTS },
+    { "_NET_DESKTOP_LAYOUT", &ECORE_X_ATOM_NET_DESKTOP_LAYOUT },
+    { "_NET_SHOWING_DESKTOP", &ECORE_X_ATOM_NET_SHOWING_DESKTOP },
+    { "_NET_CLOSE_WINDOW", &ECORE_X_ATOM_NET_CLOSE_WINDOW },
+    { "_NET_MOVERESIZE_WINDOW", &ECORE_X_ATOM_NET_MOVERESIZE_WINDOW },
+    { "_NET_WM_MOVERESIZE", &ECORE_X_ATOM_NET_WM_MOVERESIZE },
+    { "_NET_RESTACK_WINDOW", &ECORE_X_ATOM_NET_RESTACK_WINDOW },
+    { "_NET_REQUEST_FRAME_EXTENTS", &ECORE_X_ATOM_NET_REQUEST_FRAME_EXTENTS },
+    { "_NET_WM_NAME", &ECORE_X_ATOM_NET_WM_NAME },
+    { "_NET_WM_VISIBLE_NAME", &ECORE_X_ATOM_NET_WM_VISIBLE_NAME },
+    { "_NET_WM_ICON_NAME", &ECORE_X_ATOM_NET_WM_ICON_NAME },
+    { "_NET_WM_VISIBLE_ICON_NAME", &ECORE_X_ATOM_NET_WM_VISIBLE_ICON_NAME },
+    { "_NET_WM_DESKTOP", &ECORE_X_ATOM_NET_WM_DESKTOP },
+    { "_NET_WM_WINDOW_TYPE", &ECORE_X_ATOM_NET_WM_WINDOW_TYPE },
+    { "_NET_WM_WINDOW_TYPE_DESKTOP", &ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DESKTOP },
+    { "_NET_WM_WINDOW_TYPE_DOCK", &ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DOCK },
+    { "_NET_WM_WINDOW_TYPE_TOOLBAR", &ECORE_X_ATOM_NET_WM_WINDOW_TYPE_TOOLBAR },
+    { "_NET_WM_WINDOW_TYPE_MENU", &ECORE_X_ATOM_NET_WM_WINDOW_TYPE_MENU },
+    { "_NET_WM_WINDOW_TYPE_UTILITY", &ECORE_X_ATOM_NET_WM_WINDOW_TYPE_UTILITY },
+    { "_NET_WM_WINDOW_TYPE_SPLASH", &ECORE_X_ATOM_NET_WM_WINDOW_TYPE_SPLASH },
+    { "_NET_WM_WINDOW_TYPE_DIALOG", &ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DIALOG },
+    { "_NET_WM_WINDOW_TYPE_NORMAL", &ECORE_X_ATOM_NET_WM_WINDOW_TYPE_NORMAL },
+    { "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU",
+      &ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DROPDOWN_MENU },
+    { "_NET_WM_WINDOW_TYPE_POPUP_MENU",
+      &ECORE_X_ATOM_NET_WM_WINDOW_TYPE_POPUP_MENU },
+    { "_NET_WM_WINDOW_TYPE_TOOLTIP", &ECORE_X_ATOM_NET_WM_WINDOW_TYPE_TOOLTIP },
+    { "_NET_WM_WINDOW_TYPE_NOTIFICATION",
+      &ECORE_X_ATOM_NET_WM_WINDOW_TYPE_NOTIFICATION },
+    { "_NET_WM_WINDOW_TYPE_COMBO", &ECORE_X_ATOM_NET_WM_WINDOW_TYPE_COMBO },
+    { "_NET_WM_WINDOW_TYPE_DND", &ECORE_X_ATOM_NET_WM_WINDOW_TYPE_DND },
+    { "_NET_WM_STATE", &ECORE_X_ATOM_NET_WM_STATE },
+    { "_NET_WM_STATE_MODAL", &ECORE_X_ATOM_NET_WM_STATE_MODAL },
+    { "_NET_WM_STATE_STICKY", &ECORE_X_ATOM_NET_WM_STATE_STICKY },
+    { "_NET_WM_STATE_MAXIMIZED_VERT",
+      &ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_VERT },
+    { "_NET_WM_STATE_MAXIMIZED_HORZ",
+      &ECORE_X_ATOM_NET_WM_STATE_MAXIMIZED_HORZ },
+    { "_NET_WM_STATE_SHADED", &ECORE_X_ATOM_NET_WM_STATE_SHADED },
+    { "_NET_WM_STATE_SKIP_TASKBAR", &ECORE_X_ATOM_NET_WM_STATE_SKIP_TASKBAR },
+    { "_NET_WM_STATE_SKIP_PAGER", &ECORE_X_ATOM_NET_WM_STATE_SKIP_PAGER },
+    { "_NET_WM_STATE_HIDDEN", &ECORE_X_ATOM_NET_WM_STATE_HIDDEN },
+    { "_NET_WM_STATE_FULLSCREEN", &ECORE_X_ATOM_NET_WM_STATE_FULLSCREEN },
+    { "_NET_WM_STATE_ABOVE", &ECORE_X_ATOM_NET_WM_STATE_ABOVE },
+    { "_NET_WM_STATE_BELOW", &ECORE_X_ATOM_NET_WM_STATE_BELOW },
+    { "_NET_WM_STATE_DEMANDS_ATTENTION",
+      &ECORE_X_ATOM_NET_WM_STATE_DEMANDS_ATTENTION },
+    { "_NET_WM_ALLOWED_ACTIONS", &ECORE_X_ATOM_NET_WM_ALLOWED_ACTIONS },
+    { "_NET_WM_ACTION_MOVE", &ECORE_X_ATOM_NET_WM_ACTION_MOVE },
+    { "_NET_WM_ACTION_RESIZE", &ECORE_X_ATOM_NET_WM_ACTION_RESIZE },
+    { "_NET_WM_ACTION_MINIMIZE", &ECORE_X_ATOM_NET_WM_ACTION_MINIMIZE },
+    { "_NET_WM_ACTION_SHADE", &ECORE_X_ATOM_NET_WM_ACTION_SHADE },
+    { "_NET_WM_ACTION_STICK", &ECORE_X_ATOM_NET_WM_ACTION_STICK },
+    { "_NET_WM_ACTION_MAXIMIZE_HORZ",
+      &ECORE_X_ATOM_NET_WM_ACTION_MAXIMIZE_HORZ },
+    { "_NET_WM_ACTION_MAXIMIZE_VERT",
+      &ECORE_X_ATOM_NET_WM_ACTION_MAXIMIZE_VERT },
+    { "_NET_WM_ACTION_FULLSCREEN", &ECORE_X_ATOM_NET_WM_ACTION_FULLSCREEN },
+    { "_NET_WM_ACTION_CHANGE_DESKTOP",
+      &ECORE_X_ATOM_NET_WM_ACTION_CHANGE_DESKTOP },
+    { "_NET_WM_ACTION_CLOSE", &ECORE_X_ATOM_NET_WM_ACTION_CLOSE },
+    { "_NET_WM_ACTION_ABOVE", &ECORE_X_ATOM_NET_WM_ACTION_ABOVE },
+    { "_NET_WM_ACTION_BELOW", &ECORE_X_ATOM_NET_WM_ACTION_BELOW },
+    { "_NET_WM_STRUT", &ECORE_X_ATOM_NET_WM_STRUT },
+    { "_NET_WM_STRUT_PARTIAL", &ECORE_X_ATOM_NET_WM_STRUT_PARTIAL },
+    { "_NET_WM_ICON_GEOMETRY", &ECORE_X_ATOM_NET_WM_ICON_GEOMETRY },
+    { "_NET_WM_ICON", &ECORE_X_ATOM_NET_WM_ICON },
+    { "_NET_WM_PID", &ECORE_X_ATOM_NET_WM_PID },
+    { "_NET_WM_HANDLED_ICONS", &ECORE_X_ATOM_NET_WM_HANDLED_ICONS },
+    { "_NET_WM_USER_TIME", &ECORE_X_ATOM_NET_WM_USER_TIME },
+    { "_NET_STARTUP_ID", &ECORE_X_ATOM_NET_STARTUP_ID },
+    { "_NET_FRAME_EXTENTS", &ECORE_X_ATOM_NET_FRAME_EXTENTS },
+    { "_NET_WM_PING", &ECORE_X_ATOM_NET_WM_PING },
+    { "_NET_WM_SYNC_REQUEST", &ECORE_X_ATOM_NET_WM_SYNC_REQUEST },
+    { "_NET_WM_SYNC_REQUEST_COUNTER",
+      &ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER },
+    { "_NET_WM_WINDOW_OPACITY", &ECORE_X_ATOM_NET_WM_WINDOW_OPACITY },
+    { "_NET_WM_WINDOW_SHADOW", &ECORE_X_ATOM_NET_WM_WINDOW_SHADOW },
+    { "_NET_WM_WINDOW_SHADE", &ECORE_X_ATOM_NET_WM_WINDOW_SHADE },
+    { "TARGETS", &ECORE_X_ATOM_SELECTION_TARGETS },
+    { "CLIPBOARD", &ECORE_X_ATOM_SELECTION_CLIPBOARD },
+    { "PRIMARY", &ECORE_X_ATOM_SELECTION_PRIMARY },
+    { "SECONDARY", &ECORE_X_ATOM_SELECTION_SECONDARY },
+    { "_ECORE_SELECTION_PRIMARY", &ECORE_X_ATOM_SELECTION_PROP_PRIMARY },
+    { "_ECORE_SELECTION_SECONDARY", &ECORE_X_ATOM_SELECTION_PROP_SECONDARY },
+    { "_ECORE_SELECTION_CLIPBOARD", &ECORE_X_ATOM_SELECTION_PROP_CLIPBOARD },
+    { "_E_VIRTUAL_KEYBOARD", &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD },
+    { "_E_VIRTUAL_KEYBOARD_STATE", &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE },
+    { "_E_VIRTUAL_KEYBOARD_ON", &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_ON },
+    { "_E_VIRTUAL_KEYBOARD_OFF", &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_OFF },
+    { "_E_VIRTUAL_KEYBOARD_ALPHA", &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_ALPHA },
+    { "_E_VIRTUAL_KEYBOARD_NUMERIC", &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_NUMERIC },
+    { "_E_VIRTUAL_KEYBOARD_PIN", &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_PIN },
+    { "_E_VIRTUAL_KEYBOARD_PHONE_NUMBER",
+      &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_PHONE_NUMBER },
+    { "_E_VIRTUAL_KEYBOARD_HEX", &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_HEX },
+    { "_E_VIRTUAL_KEYBOARD_TERMINAL",
+      &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_TERMINAL },
+    { "_E_VIRTUAL_KEYBOARD_PASSWORD",
+      &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_PASSWORD },
+    { "_E_VIRTUAL_KEYBOARD_IP", &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_IP },
+    { "_E_VIRTUAL_KEYBOARD_HOST", &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_HOST },
+    { "_E_VIRTUAL_KEYBOARD_FILE", &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_FILE },
+    { "_E_VIRTUAL_KEYBOARD_URL", &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_URL },
+    { "_E_VIRTUAL_KEYBOARD_KEYPAD", &ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_KEYPAD },
+    { "_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 },
+    { "_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_FOCUS_BACK", &ECORE_X_ATOM_E_ILLUME_FOCUS_BACK },
+    { "_E_ILLUME_FOCUS_FORWARD", &ECORE_X_ATOM_E_ILLUME_FOCUS_FORWARD },
+    { "_E_ILLUME_FOCUS_HOME", &ECORE_X_ATOM_E_ILLUME_FOCUS_HOME },
+    { "_E_ILLUME_CLOSE", &ECORE_X_ATOM_E_ILLUME_CLOSE },
+    { "_E_ILLUME_HOME_NEW", &ECORE_X_ATOM_E_ILLUME_HOME_NEW },
+    { "_E_ILLUME_HOME_DEL", &ECORE_X_ATOM_E_ILLUME_HOME_DEL },
+    { "_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_INDICATOR_GEOMETRY",
+      &ECORE_X_ATOM_E_ILLUME_INDICATOR_GEOMETRY },
+    { "_E_ILLUME_SOFTKEY_GEOMETRY", &ECORE_X_ATOM_E_ILLUME_SOFTKEY_GEOMETRY },
+    { "_E_ILLUME_KEYBOARD_GEOMETRY", &ECORE_X_ATOM_E_ILLUME_KEYBOARD_GEOMETRY },
+    { "_E_ILLUME_QUICKPANEL", &ECORE_X_ATOM_E_ILLUME_QUICKPANEL },
+    { "_E_ILLUME_QUICKPANEL_STATE", &ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE },
+    { "_E_ILLUME_QUICKPANEL_STATE_TOGGLE",
+      &ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE_TOGGLE },
+    { "_E_ILLUME_QUICKPANEL_ON", &ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ON },
+    { "_E_ILLUME_QUICKPANEL_OFF", &ECORE_X_ATOM_E_ILLUME_QUICKPANEL_OFF },
+    { "_E_ILLUME_QUICKPANEL_PRIORITY_MAJOR",
+      &ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MAJOR },
+    { "_E_ILLUME_QUICKPANEL_PRIORITY_MINOR",
+      &ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MINOR },
+    { "_E_ILLUME_QUICKPANEL_ZONE", &ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ZONE },
+    { "_E_ILLUME_QUICKPANEL_POSITION_UPDATE",
+      &ECORE_X_ATOM_E_ILLUME_QUICKPANEL_POSITION_UPDATE },
+    { "_E_ILLUME_INDICATOR_STATE", &ECORE_X_ATOM_E_ILLUME_INDICATOR_STATE },
+    { "_E_ILLUME_INDICATOR_ON", &ECORE_X_ATOM_E_ILLUME_INDICATOR_ON },
+    { "_E_ILLUME_INDICATOR_OFF", &ECORE_X_ATOM_E_ILLUME_INDICATOR_OFF },
+    { "_E_ILLUME_INDICATOR_OPACITY_MODE", &ECORE_X_ATOM_E_ILLUME_INDICATOR_OPACITY_MODE },
+    { "_E_ILLUME_INDICATOR_OPAQUE", &ECORE_X_ATOM_E_ILLUME_INDICATOR_OPAQUE },
+    { "_E_ILLUME_INDICATOR_TRANSLUCENT", &ECORE_X_ATOM_E_ILLUME_INDICATOR_TRANSLUCENT },
+    { "_E_ILLUME_INDICATOR_TRANSPARENT", &ECORE_X_ATOM_E_ILLUME_INDICATOR_TRANSPARENT },
+    { "_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 },
+    { "_E_ILLUME_CLIPBOARD_STATE", &ECORE_X_ATOM_E_ILLUME_CLIPBOARD_STATE },
+    { "_E_ILLUME_CLIPBOARD_ON", &ECORE_X_ATOM_E_ILLUME_CLIPBOARD_ON },
+    { "_E_ILLUME_CLIPBOARD_OFF", &ECORE_X_ATOM_E_ILLUME_CLIPBOARD_OFF },
+    { "_E_ILLUME_CLIPBOARD_GEOMETRY", &ECORE_X_ATOM_E_ILLUME_CLIPBOARD_GEOMETRY },
+    { "_E_ILLUME_ACCESS_CONTROL", &ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL },
+    { "_E_ILLUME_ACCESS_ACTION_NEXT", &ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_NEXT },
+    { "_E_ILLUME_ACCESS_ACTION_PREV", &ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_PREV },
+    { "_E_ILLUME_ACCESS_ACTION_ACTIVATE", &ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_ACTIVATE },
+    { "_E_ILLUME_ACCESS_ACTION_READ", &ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_READ },
+    { "_E_ILLUME_ACCESS_ACTION_READ_NEXT", &ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_READ_NEXT },
+    { "_E_ILLUME_ACCESS_ACTION_READ_PREV", &ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_READ_PREV },
+    { "_E_COMP_SYNC_COUNTER", &ECORE_X_ATOM_E_COMP_SYNC_COUNTER },
+    { "_E_COMP_SYNC_DRAW_DONE", &ECORE_X_ATOM_E_COMP_SYNC_DRAW_DONE },
+    { "_E_COMP_SYNC_SUPPORTED", &ECORE_X_ATOM_E_COMP_SYNC_SUPPORTED },
+    { "_E_COMP_SYNC_BEGIN", &ECORE_X_ATOM_E_COMP_SYNC_BEGIN },
+    { "_E_COMP_SYNC_END", &ECORE_X_ATOM_E_COMP_SYNC_END },
+    { "_E_COMP_SYNC_CANCEL", &ECORE_X_ATOM_E_COMP_SYNC_CANCEL },
+    { "_E_COMP_FLUSH", &ECORE_X_ATOM_E_COMP_FLUSH },
+    { "_E_COMP_DUMP", &ECORE_X_ATOM_E_COMP_DUMP },
+    { "_E_COMP_PIXMAP", &ECORE_X_ATOM_E_COMP_PIXMAP },
+    { "_E_VIDEO_PARENT", &ECORE_X_ATOM_E_VIDEO_PARENT },
+    { "_E_VIDEO_POSITION", &ECORE_X_ATOM_E_VIDEO_POSITION }
+ };
Simple merge
Simple merge
Simple merge
Simple merge