EFL core migration revision 69115

Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
	src/lib/ecore_evas/ecore_evas_x.c
	src/lib/ecore_x/xlib/ecore_x_e.c

diff --cc po/cs.po
index 091e92d,fb209db..f785b55
--- 1/po/cs.po
--- 2/po/cs.po
+++ b/po/cs.po
@@@ -12,8 -13,10 +12,8 @@@ msgstr "
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
 -"X-Generator: Lokalize 1.2\n"
 -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
  
- #: src/lib/ecore/ecore_getopt.c:91
+ #: src/lib/ecore/ecore_getopt.c:95
  msgid "Version:"
  msgstr "Verze:"
  
@@@ -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:1831
+ #: src/lib/ecore/ecore_getopt.c:1835
  #, c-format
  msgid " See --%s.\n"
 -msgstr " Viz --%s.\n"
 +msgstr " viz. --%s.\n"
  
- #: src/lib/ecore/ecore_getopt.c:1833
+ #: src/lib/ecore/ecore_getopt.c:1837
  #, c-format
  msgid " See -%c.\n"
 -msgstr " Viz -%c.\n"
 +msgstr " viz. -%c.\n"
  
- #: src/lib/ecore/ecore_getopt.c:1874
+ #: src/lib/ecore/ecore_getopt.c:1879
  #, c-format
  msgid "ERROR: incorrect geometry value '%s'\n"
  msgstr "CHYBA: neplatná hodnota geometrie '%s'\n"

diff --cc src/lib/ecore/ecore_thread.c
Simple merge

diff --cc src/lib/ecore_con/ecore_con_url.c
Simple merge

diff --cc src/lib/ecore_evas/ecore_evas_x.c
Simple merge

diff --cc src/lib/ecore_x/Ecore_X.h
index 522c553,ff29cca..df62df2
--- 1/src/lib/ecore_x/Ecore_X.h
--- 2/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@@ -2467,26 -2425,26 +2482,45 @@@ EAPI voi
  EAPI void
   ecore_x_e_illume_quickpanel_position_update_send(Ecore_X_Window win);
  
 +/* for sliding window */
 +EAPI void
 + ecore_x_e_illume_sliding_win_state_set(Ecore_X_Window win,
 +                                       unsigned int is_visible);
 +EAPI int
 + ecore_x_e_illume_sliding_win_state_get(Ecore_X_Window win);
 +EAPI void
 + ecore_x_e_illume_sliding_win_geometry_set(Ecore_X_Window win,
 +                                          int x,
 +                                          int y,
 +                                          int w,
 +                                          int h);
 +EAPI int
 + ecore_x_e_illume_sliding_win_geometry_get(Ecore_X_Window win,
 +                                          int *x,
 +                                          int *y,
 +                                          int *w,
 +                                          int *h);
 +
  EAPI void
+ ecore_x_e_illume_clipboard_state_set(Ecore_X_Window win,
+                                      Ecore_X_Illume_Clipboard_State state);
+ 
+ EAPI Ecore_X_Illume_Clipboard_State
+ ecore_x_e_illume_clipboard_state_get(Ecore_X_Window win);
+ 
+ EAPI void
+ ecore_x_e_illume_clipboard_geometry_set(Ecore_X_Window win,
+                                         int x,
+                                         int y,
+                                         int w,
+                                         int h);
+ EAPI Eina_Bool
+ ecore_x_e_illume_clipboard_geometry_get(Ecore_X_Window win,
+                                         int *x,
+                                         int *y,
+                                         int *w,
+                                         int *h);
+ EAPI void
  ecore_x_e_comp_sync_counter_set(Ecore_X_Window win,
                                  Ecore_X_Sync_Counter counter);
  EAPI Ecore_X_Sync_Counter

diff --cc src/lib/ecore_x/Ecore_X_Atoms.h
Simple merge

diff --cc src/lib/ecore_x/ecore_x_atoms_decl.h
index 8e7e641,8952df3..69d4b9a
--- 1/src/lib/ecore_x/ecore_x_atoms_decl.h
--- 2/src/lib/ecore_x/ecore_x_atoms_decl.h
+++ b/src/lib/ecore_x/ecore_x_atoms_decl.h
@@@ -279,14 -290,6 +290,11 @@@ EAPI Ecore_X_Atom ECORE_X_ATOM_E_COMP_F
  EAPI Ecore_X_Atom ECORE_X_ATOM_E_COMP_DUMP = 0;
  EAPI Ecore_X_Atom ECORE_X_ATOM_E_COMP_PIXMAP = 0;
  
- EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE = 0;
- EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_AVAILABLE_ANGLE = 0;
 +EAPI Ecore_X_Atom ECORE_X_ATOM_E_USER_CREATED_WINDOW = 0;
 +EAPI Ecore_X_Atom ECORE_X_ATOM_E_PARENT_BORDER_WINDOW = 0;
 +EAPI Ecore_X_Atom ECORE_X_ATOM_E_COMP_DRI_BUFF_FLIP_SUPPORTED = 0;
- EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ROTATE_ROOT_ANGLE = 0;
 +EAPI Ecore_X_Atom ECORE_X_ATOM_E_ILLUME_ROTATE_OPERATOR = 0;
 +
  /* currently Emotion and E17 specific extension */
  EAPI Ecore_X_Atom ECORE_X_ATOM_E_VIDEO_PARENT = 0;
  EAPI Ecore_X_Atom ECORE_X_ATOM_E_VIDEO_POSITION = 0;

diff --cc src/lib/ecore_x/xlib/ecore_x_atoms.c
Simple merge

diff --cc src/lib/ecore_x/xlib/ecore_x_e.c
index 004b25f,4bd5218..f4b741b
--- 1/src/lib/ecore_x/xlib/ecore_x_e.c
--- 2/src/lib/ecore_x/xlib/ecore_x_e.c
+++ b/src/lib/ecore_x/xlib/ecore_x_e.c
@@@ -768,83 -768,99 +768,176 @@@ ecore_x_e_illume_quickpanel_position_up
                                   1, 0, 0, 0, 0);
  }
  
+ static Ecore_X_Atom
+ _ecore_x_e_clipboard_atom_get(Ecore_X_Illume_Clipboard_State state)
+ {
+    switch (state)
+      {
+       case ECORE_X_ILLUME_CLIPBOARD_STATE_ON:
+         return ECORE_X_ATOM_E_ILLUME_CLIPBOARD_ON;
+       case ECORE_X_ILLUME_CLIPBOARD_STATE_OFF:
+         return ECORE_X_ATOM_E_ILLUME_CLIPBOARD_OFF;
+       default:
+         break;
+      }
+    return 0;
+ }
+ 
+ static Ecore_X_Illume_Clipboard_State
+ _ecore_x_e_clipboard_state_get(Ecore_X_Atom atom)
+ {
+    if (atom == ECORE_X_ATOM_E_ILLUME_CLIPBOARD_ON)
+      return ECORE_X_ILLUME_CLIPBOARD_STATE_ON;
+ 
+    if (atom == ECORE_X_ATOM_E_ILLUME_CLIPBOARD_OFF)
+      return ECORE_X_ILLUME_CLIPBOARD_STATE_OFF;
+ 
+    return ECORE_X_ILLUME_INDICATOR_STATE_UNKNOWN;
+ }
+ 
+ EAPI void
+ ecore_x_e_illume_clipboard_state_set(Ecore_X_Window win,
+                                      Ecore_X_Illume_Clipboard_State state)
+ {
+    Ecore_X_Atom atom = 0;
+ 
+    LOGFN(__FILE__, __LINE__, __FUNCTION__);
+    atom = _ecore_x_e_clipboard_atom_get(state);
+ 
+    ecore_x_window_prop_atom_set(win,
+                                 ECORE_X_ATOM_E_ILLUME_CLIPBOARD_STATE,
+                                 &atom, 1);
+ }
+ 
+ EAPI Ecore_X_Illume_Clipboard_State
+ ecore_x_e_illume_clipboard_state_get(Ecore_X_Window win)
+ {
+    Ecore_X_Atom atom = 0;
+ 
+    LOGFN(__FILE__, __LINE__, __FUNCTION__);
+ 
+    if (!ecore_x_window_prop_atom_get(win,
+                                      ECORE_X_ATOM_E_ILLUME_CLIPBOARD_STATE,
+                                      &atom, 1))
+      return ECORE_X_ILLUME_CLIPBOARD_STATE_UNKNOWN;
+    return _ecore_x_e_clipboard_state_get(atom);
+ }
+ 
+ EAPI void
+ ecore_x_e_illume_clipboard_geometry_set(Ecore_X_Window win,
+                                         int x, int y, int w, int h)
+ {
+    unsigned int geom[4];
+ 
+    LOGFN(__FILE__, __LINE__, __FUNCTION__);
+    geom[0] = x;
+    geom[1] = y;
+    geom[2] = w;
+    geom[3] = h;
+    ecore_x_window_prop_card32_set(win,
+                                   ECORE_X_ATOM_E_ILLUME_CLIPBOARD_GEOMETRY,
+                                   geom, 4);
+ }
+ 
+ EAPI Eina_Bool
+ ecore_x_e_illume_clipboard_geometry_get(Ecore_X_Window win,
+                                         int *x, int *y, int *w, int *h)
+ {
+    int ret = 0;
+    unsigned int geom[4];
+ 
+    LOGFN(__FILE__, __LINE__, __FUNCTION__);
+    ret =
+       ecore_x_window_prop_card32_get(win,
+                                      ECORE_X_ATOM_E_ILLUME_CLIPBOARD_GEOMETRY,
+                                      geom, 4);
+    if (ret != 4) return EINA_FALSE;
+ 
+    if (x) *x = geom[0];
+    if (y) *y = geom[1];
+    if (w) *w = geom[2];
+    if (h) *h = geom[3];
+ 
+    return EINA_TRUE;
+ }
+ 
 +/* for sliding window */
 +EAPI void 
 +ecore_x_e_illume_sliding_win_state_set(Ecore_X_Window win,
 +                                       unsigned int   is_visible)
 +{
 +   LOGFN(__FILE__, __LINE__, __FUNCTION__);
 +   ecore_x_window_prop_card32_set(win, 
 +                                  ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE, 
 +                                  &is_visible, 1);
 +} /* ecore_x_e_illume_sliding_win_state_set */
 +
 +EAPI int 
 +ecore_x_e_illume_sliding_win_state_get(Ecore_X_Window win)
 +{
 +   unsigned int is_visible = 0;
 +   
 +   LOGFN(__FILE__, __LINE__, __FUNCTION__);
 +   if (!ecore_x_window_prop_card32_get(win,
 +                                       ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE, 
 +                                       &is_visible, 1))
 +      return 0;
 +
 +   return is_visible;
 +}
 +
 +EAPI void
 +ecore_x_e_illume_sliding_win_geometry_set(Ecore_X_Window win,
 +                                          int            x,
 +                                          int            y,
 +                                          int            w,
 +                                          int            h)
 +{
 +   unsigned int geom[4];
 +
 +   LOGFN(__FILE__, __LINE__, __FUNCTION__);
 +   geom[0] = x;
 +   geom[1] = y;
 +   geom[2] = w;
 +   geom[3] = h;
 +   ecore_x_window_prop_card32_set(win,
 +                                  ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_GEOMETRY, 
 +                                  geom, 4);
 +} /* ecore_x_e_illume_sliding_win_geometry_set */
 +
 +EAPI int 
 +ecore_x_e_illume_sliding_win_geometry_get(Ecore_X_Window win,
 +                                          int           *x,
 +                                          int           *y,
 +                                          int           *w,
 +                                          int           *h)
 +{
 +   int ret = 0;
 +   unsigned int geom[4];
 +   
 +   LOGFN(__FILE__, __LINE__, __FUNCTION__);
 +   ret = 
 +     ecore_x_window_prop_card32_get(win, 
 +                                    ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_GEOMETRY, 
 +                                    geom, 4);
 +   if (ret != 4)
 +      return 0;
 +   
 +   if (x)
 +      *x = geom[0];
 +   
 +   if (y)
 +      *y = geom[1];
 +   
 +   if (w)
 +      *w = geom[2];
 +   
 +   if (h)
 +      *h = geom[3];
 +   
 +   return 1;
 +}/* ecore_x_e_illume_sliding_win_geometry_get */
 +
  EAPI void
  ecore_x_e_comp_sync_counter_set(Ecore_X_Window win,
                                  Ecore_X_Sync_Counter counter)
@@@ -1257,57 -1218,76 +1350,130 @@@ ecore_x_e_illume_indicator_state_send(E
  }
  
  static Ecore_X_Atom
- 
+ _ecore_x_e_indicator_opacity_atom_get(Ecore_X_Illume_Indicator_Opacity_Mode mode)
+ {
+    switch (mode)
+      {
+       case ECORE_X_ILLUME_INDICATOR_OPAQUE:
+         return ECORE_X_ATOM_E_ILLUME_INDICATOR_OPAQUE;
+ 
+       case ECORE_X_ILLUME_INDICATOR_TRANSLUCENT:
+         return ECORE_X_ATOM_E_ILLUME_INDICATOR_TRANSLUCENT;
+ 
+       case ECORE_X_ILLUME_INDICATOR_TRANSPARENT:
+         return ECORE_X_ATOM_E_ILLUME_INDICATOR_TRANSPARENT;
+ 
+       default:
+         break;
+      }
+    return 0;
+ }
+ 
+ static Ecore_X_Illume_Indicator_Opacity_Mode
+ _ecore_x_e_indicator_opacity_get(Ecore_X_Atom atom)
+ {
+    if (atom == ECORE_X_ATOM_E_ILLUME_INDICATOR_OPAQUE)
+      return ECORE_X_ILLUME_INDICATOR_OPAQUE;
+ 
+    if (atom == ECORE_X_ATOM_E_ILLUME_INDICATOR_TRANSLUCENT)
+      return ECORE_X_ILLUME_INDICATOR_TRANSLUCENT;
+ 
+    if (atom == ECORE_X_ATOM_E_ILLUME_INDICATOR_TRANSPARENT)
+      return ECORE_X_ILLUME_INDICATOR_TRANSPARENT;
+ 
+    return ECORE_X_ILLUME_INDICATOR_OPACITY_UNKNOWN;
+ }
+ 
+ EAPI void
+ ecore_x_e_illume_indicator_opacity_set(Ecore_X_Window win,
+                                      Ecore_X_Illume_Indicator_Opacity_Mode mode)
+ {
+    Ecore_X_Atom atom = 0;
+ 
+    LOGFN(__FILE__, __LINE__, __FUNCTION__);
+    atom = _ecore_x_e_indicator_opacity_atom_get(mode);
+    ecore_x_window_prop_atom_set(win,
+                                 ECORE_X_ATOM_E_ILLUME_INDICATOR_OPACITY_MODE,
+                                 &atom, 1);
+ }
+ 
+ EAPI Ecore_X_Illume_Indicator_Opacity_Mode
+ ecore_x_e_illume_indicator_opacity_get(Ecore_X_Window win)
+ {
+    Ecore_X_Atom atom;
+ 
+    LOGFN(__FILE__, __LINE__, __FUNCTION__);
+    if (!ecore_x_window_prop_atom_get(win,
+                                      ECORE_X_ATOM_E_ILLUME_INDICATOR_OPACITY_MODE,
+                                      &atom, 1))
+      return ECORE_X_ILLUME_INDICATOR_OPACITY_UNKNOWN;
+ 
+    return _ecore_x_e_indicator_opacity_get(atom);
+ }
+ 
+ EAPI void
+ ecore_x_e_illume_indicator_opacity_send(Ecore_X_Window win,
+                                       Ecore_X_Illume_Indicator_Opacity_Mode mode)
+ {
+    LOGFN(__FILE__, __LINE__, __FUNCTION__);
+    ecore_x_client_message32_send(win,
+                                  ECORE_X_ATOM_E_ILLUME_INDICATOR_OPACITY_MODE,
+                                  ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
+                                  _ecore_x_e_indicator_opacity_atom_get(mode),
+                                  0, 0, 0, 0);
+ }
+ 
++static Ecore_X_Atom
 +_ecore_x_e_illume_window_state_atom_get(Ecore_X_Illume_Window_State state)
 +{
 +   switch (state)
 +     {
 +      case ECORE_X_ILLUME_WINDOW_STATE_NORMAL:
 +        return ECORE_X_ATOM_E_ILLUME_WINDOW_STATE_NORMAL;
 +
 +      case ECORE_X_ILLUME_WINDOW_STATE_INSET:
 +        return ECORE_X_ATOM_E_ILLUME_WINDOW_STATE_INSET;
 +
 +      default:
 +        break;
 +     }
 +   return 0;
 +}
 +
 +static Ecore_X_Illume_Window_State
 +_ecore_x_e_illume_window_state_get(Ecore_X_Atom atom)
 +{
 +   if (atom == ECORE_X_ATOM_E_ILLUME_WINDOW_STATE_NORMAL)
 +     return ECORE_X_ILLUME_WINDOW_STATE_NORMAL;
 +
 +   if (atom == ECORE_X_ATOM_E_ILLUME_WINDOW_STATE_INSET)
 +     return ECORE_X_ILLUME_WINDOW_STATE_INSET;
 +
 +   return ECORE_X_ILLUME_WINDOW_STATE_NORMAL;
 +}
 +
 +EAPI void
 +ecore_x_e_illume_window_state_set(Ecore_X_Window win,
 +                                  Ecore_X_Illume_Window_State state)
 +{
 +   Ecore_X_Atom atom = 0;
 +
 +   LOGFN(__FILE__, __LINE__, __FUNCTION__);
 +   atom = _ecore_x_e_illume_window_state_atom_get(state);
 +   ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_WINDOW_STATE,
 +                                &atom, 1);
 +}
 +
 +EAPI Ecore_X_Illume_Window_State
 +ecore_x_e_illume_window_state_get(Ecore_X_Window win)
 +{
 +   Ecore_X_Atom atom;
 +
 +   LOGFN(__FILE__, __LINE__, __FUNCTION__);
 +   if (!ecore_x_window_prop_atom_get(win,
 +                                     ECORE_X_ATOM_E_ILLUME_WINDOW_STATE,
 +                                     &atom, 1))
 +     return ECORE_X_ILLUME_WINDOW_STATE_NORMAL;
 +
 +   return _ecore_x_e_illume_window_state_get(atom);
 +}