kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Elm: Patch from Rob Bradford <rob@linux.intel.com> for: 

* Move X related window items into their own substruct of
_Elm_Win_Smart_Data to allow grouping based on engine.



SVN revision: 71736
This commit is contained in:
Christopher Michael 2012-06-06 08:25:12 +00:00
parent fd96bbf201
commit 8ec6c0d94e
1 changed files with 81 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
legacy/elementary/src/lib/elm_win.c
View File

@ -44,8 +44,11 @@ struct _Elm_Win_Smart_Data
* *multiple* resize * *multiple* resize
* objects */ * objects */
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
Ecore_X_Window xwin; struct
Ecore_Event_Handler *client_message_handler; {
Ecore_X_Window xwin;
Ecore_Event_Handler *client_message_handler;
} x;
#endif #endif
Ecore_Job *deferred_resize_job; Ecore_Job *deferred_resize_job;
Ecore_Job *deferred_child_eval_job; Ecore_Job *deferred_child_eval_job;
@ -1076,8 +1079,8 @@ _elm_win_smart_del(Evas_Object *obj)
if (sd->shot.timer) ecore_timer_del(sd->shot.timer); if (sd->shot.timer) ecore_timer_del(sd->shot.timer);
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
if (sd->client_message_handler) if (sd->x.client_message_handler)
ecore_event_handler_del(sd->client_message_handler); ecore_event_handler_del(sd->x.client_message_handler);
#endif #endif
if (sd->img_obj) if (sd->img_obj)
@ -1298,9 +1301,8 @@ _elm_ee_xwin_get(const Ecore_Evas *ee)
static void static void
_elm_win_xwindow_get(Elm_Win_Smart_Data *sd) _elm_win_xwindow_get(Elm_Win_Smart_Data *sd)
{ {
sd->xwin = _elm_ee_xwin_get(sd->ee); sd->x.xwin = _elm_ee_xwin_get(sd->ee);
} }
#endif #endif
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
@ -1315,22 +1317,22 @@ _elm_win_xwin_update(Elm_Win_Smart_Data *sd)
ELM_WIN_DATA_GET(sd->parent, sdp); ELM_WIN_DATA_GET(sd->parent, sdp);
if (sdp) if (sdp)
{ {
if (sd->xwin) if (sd->x.xwin)
ecore_x_icccm_transient_for_set(sd->xwin, sdp->xwin); ecore_x_icccm_transient_for_set(sd->x.xwin, sdp->x.xwin);
} }
} }
if (!sd->xwin) return; /* nothing more to do */ if (!sd->x.xwin) return; /* nothing more to do */
s = sd->title; s = sd->title;
if (!s) s = _elm_appname; if (!s) s = _elm_appname;
if (!s) s = ""; if (!s) s = "";
if (sd->icon_name) s = sd->icon_name; if (sd->icon_name) s = sd->icon_name;
ecore_x_icccm_icon_name_set(sd->xwin, s); ecore_x_icccm_icon_name_set(sd->x.xwin, s);
ecore_x_netwm_icon_name_set(sd->xwin, s); ecore_x_netwm_icon_name_set(sd->x.xwin, s);
s = sd->role; s = sd->role;
if (s) ecore_x_icccm_window_role_set(sd->xwin, s); if (s) ecore_x_icccm_window_role_set(sd->x.xwin, s);
// set window icon // set window icon
if (sd->icon) if (sd->icon)
@ -1368,7 +1370,7 @@ _elm_win_xwin_update(Elm_Win_Smart_Data *sd)
} }
p += (stride - (w * sizeof(unsigned int))); p += (stride - (w * sizeof(unsigned int)));
} }
ecore_x_netwm_icons_set(sd->xwin, &ic, 1); ecore_x_netwm_icons_set(sd->x.xwin, &ic, 1);
free(ic.data); free(ic.data);
} }
} }
@ -1379,77 +1381,76 @@ _elm_win_xwin_update(Elm_Win_Smart_Data *sd)
switch (sd->type) switch (sd->type)
{ {
case ELM_WIN_BASIC: case ELM_WIN_BASIC:
ecore_x_netwm_window_type_set(sd->xwin, ECORE_X_WINDOW_TYPE_NORMAL); ecore_x_netwm_window_type_set(sd->x.xwin, ECORE_X_WINDOW_TYPE_NORMAL);
break; break;
case ELM_WIN_DIALOG_BASIC: case ELM_WIN_DIALOG_BASIC:
ecore_x_netwm_window_type_set(sd->xwin, ECORE_X_WINDOW_TYPE_DIALOG); ecore_x_netwm_window_type_set(sd->x.xwin, ECORE_X_WINDOW_TYPE_DIALOG);
break; break;
case ELM_WIN_DESKTOP: case ELM_WIN_DESKTOP:
ecore_x_netwm_window_type_set(sd->xwin, ECORE_X_WINDOW_TYPE_DESKTOP); ecore_x_netwm_window_type_set(sd->x.xwin, ECORE_X_WINDOW_TYPE_DESKTOP);
break; break;
case ELM_WIN_DOCK: case ELM_WIN_DOCK:
ecore_x_netwm_window_type_set(sd->xwin, ECORE_X_WINDOW_TYPE_DOCK); ecore_x_netwm_window_type_set(sd->x.xwin, ECORE_X_WINDOW_TYPE_DOCK);
break; break;
case ELM_WIN_TOOLBAR: case ELM_WIN_TOOLBAR:
ecore_x_netwm_window_type_set(sd->xwin, ECORE_X_WINDOW_TYPE_TOOLBAR); ecore_x_netwm_window_type_set(sd->x.xwin, ECORE_X_WINDOW_TYPE_TOOLBAR);
break; break;
case ELM_WIN_MENU: case ELM_WIN_MENU:
ecore_x_netwm_window_type_set(sd->xwin, ECORE_X_WINDOW_TYPE_MENU); ecore_x_netwm_window_type_set(sd->x.xwin, ECORE_X_WINDOW_TYPE_MENU);
break; break;
case ELM_WIN_UTILITY: case ELM_WIN_UTILITY:
ecore_x_netwm_window_type_set(sd->xwin, ECORE_X_WINDOW_TYPE_UTILITY); ecore_x_netwm_window_type_set(sd->x.xwin, ECORE_X_WINDOW_TYPE_UTILITY);
break; break;
case ELM_WIN_SPLASH: case ELM_WIN_SPLASH:
ecore_x_netwm_window_type_set(sd->xwin, ECORE_X_WINDOW_TYPE_SPLASH); ecore_x_netwm_window_type_set(sd->x.xwin, ECORE_X_WINDOW_TYPE_SPLASH);
break; break;
case ELM_WIN_DROPDOWN_MENU: case ELM_WIN_DROPDOWN_MENU:
ecore_x_netwm_window_type_set ecore_x_netwm_window_type_set
(sd->xwin, ECORE_X_WINDOW_TYPE_DROPDOWN_MENU); (sd->x.xwin, ECORE_X_WINDOW_TYPE_DROPDOWN_MENU);
break; break;
case ELM_WIN_POPUP_MENU: case ELM_WIN_POPUP_MENU:
ecore_x_netwm_window_type_set ecore_x_netwm_window_type_set
(sd->xwin, ECORE_X_WINDOW_TYPE_POPUP_MENU); (sd->x.xwin, ECORE_X_WINDOW_TYPE_POPUP_MENU);
break; break;
case ELM_WIN_TOOLTIP: case ELM_WIN_TOOLTIP:
ecore_x_netwm_window_type_set(sd->xwin, ECORE_X_WINDOW_TYPE_TOOLTIP); ecore_x_netwm_window_type_set(sd->x.xwin, ECORE_X_WINDOW_TYPE_TOOLTIP);
break; break;
case ELM_WIN_NOTIFICATION: case ELM_WIN_NOTIFICATION:
ecore_x_netwm_window_type_set ecore_x_netwm_window_type_set
(sd->xwin, ECORE_X_WINDOW_TYPE_NOTIFICATION); (sd->x.xwin, ECORE_X_WINDOW_TYPE_NOTIFICATION);
break; break;
case ELM_WIN_COMBO: case ELM_WIN_COMBO:
ecore_x_netwm_window_type_set(sd->xwin, ECORE_X_WINDOW_TYPE_COMBO); ecore_x_netwm_window_type_set(sd->x.xwin, ECORE_X_WINDOW_TYPE_COMBO);
break; break;
case ELM_WIN_DND: case ELM_WIN_DND:
ecore_x_netwm_window_type_set(sd->xwin, ECORE_X_WINDOW_TYPE_DND); ecore_x_netwm_window_type_set(sd->x.xwin, ECORE_X_WINDOW_TYPE_DND);
break; break;
default: default:
break; break;
} }
ecore_x_e_virtual_keyboard_state_set ecore_x_e_virtual_keyboard_state_set
(sd->xwin, (Ecore_X_Virtual_Keyboard_State)sd->kbdmode); (sd->x.xwin, (Ecore_X_Virtual_Keyboard_State)sd->kbdmode);
if (sd->indmode == ELM_WIN_INDICATOR_SHOW) if (sd->indmode == ELM_WIN_INDICATOR_SHOW)
ecore_x_e_illume_indicator_state_set ecore_x_e_illume_indicator_state_set
(sd->xwin, ECORE_X_ILLUME_INDICATOR_STATE_ON); (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_STATE_ON);
else if (sd->indmode == ELM_WIN_INDICATOR_HIDE) else if (sd->indmode == ELM_WIN_INDICATOR_HIDE)
ecore_x_e_illume_indicator_state_set ecore_x_e_illume_indicator_state_set
(sd->xwin, ECORE_X_ILLUME_INDICATOR_STATE_OFF); (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_STATE_OFF);
} }
#endif #endif
static void static void
@ -1569,7 +1570,7 @@ _elm_win_client_message(void *data,
if (e->format != 32) return ECORE_CALLBACK_PASS_ON; if (e->format != 32) return ECORE_CALLBACK_PASS_ON;
if (e->message_type == ECORE_X_ATOM_E_COMP_FLUSH) if (e->message_type == ECORE_X_ATOM_E_COMP_FLUSH)
{ {
if ((unsigned int)e->data.l[0] == sd->xwin) if ((unsigned int)e->data.l[0] == sd->x.xwin)
{ {
Evas *evas = evas_object_evas_get(ELM_WIDGET_DATA(sd)->obj); Evas *evas = evas_object_evas_get(ELM_WIDGET_DATA(sd)->obj);
if (evas) if (evas)
@ -1583,7 +1584,7 @@ _elm_win_client_message(void *data,
} }
else if (e->message_type == ECORE_X_ATOM_E_COMP_DUMP) else if (e->message_type == ECORE_X_ATOM_E_COMP_DUMP)
{ {
if ((unsigned int)e->data.l[0] == sd->xwin) if ((unsigned int)e->data.l[0] == sd->x.xwin)
{ {
Evas *evas = evas_object_evas_get(ELM_WIDGET_DATA(sd)->obj); Evas *evas = evas_object_evas_get(ELM_WIDGET_DATA(sd)->obj);
if (evas) if (evas)
@ -1598,7 +1599,7 @@ _elm_win_client_message(void *data,
} }
else if (e->message_type == ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL) else if (e->message_type == ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL)
{ {
if ((unsigned int)e->data.l[0] == sd->xwin) if ((unsigned int)e->data.l[0] == sd->x.xwin)
{ {
if ((unsigned int)e->data.l[1] == if ((unsigned int)e->data.l[1] ==
ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_NEXT) ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_NEXT)
@ -2122,16 +2123,16 @@ elm_win_add(Evas_Object *parent,
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
else if (ENGINE_COMPARE(ELM_SOFTWARE_X11)) else if (ENGINE_COMPARE(ELM_SOFTWARE_X11))
sd->client_message_handler = ecore_event_handler_add sd->x.client_message_handler = ecore_event_handler_add
(ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, sd); (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, sd);
else if (ENGINE_COMPARE(ELM_SOFTWARE_16_X11)) else if (ENGINE_COMPARE(ELM_SOFTWARE_16_X11))
sd->client_message_handler = ecore_event_handler_add sd->x.client_message_handler = ecore_event_handler_add
(ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, sd); (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, sd);
else if (ENGINE_COMPARE(ELM_SOFTWARE_8_X11)) else if (ENGINE_COMPARE(ELM_SOFTWARE_8_X11))
sd->client_message_handler = ecore_event_handler_add sd->x.client_message_handler = ecore_event_handler_add
(ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, sd); (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, sd);
else if (ENGINE_COMPARE(ELM_OPENGL_X11)) else if (ENGINE_COMPARE(ELM_OPENGL_X11))
sd->client_message_handler = ecore_event_handler_add sd->x.client_message_handler = ecore_event_handler_add
(ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, sd); (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, sd);
#endif #endif
@ -2543,7 +2544,7 @@ elm_win_alpha_set(Evas_Object *obj,
else else
{ {
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
if (sd->xwin) if (sd->x.xwin)
{ {
if (alpha) if (alpha)
{ {
@ -2909,9 +2910,9 @@ elm_win_keyboard_mode_set(Evas_Object *obj,
#endif #endif
sd->kbdmode = mode; sd->kbdmode = mode;
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
if (sd->xwin) if (sd->x.xwin)
ecore_x_e_virtual_keyboard_state_set ecore_x_e_virtual_keyboard_state_set
(sd->xwin, (Ecore_X_Virtual_Keyboard_State)sd->kbdmode); (sd->x.xwin, (Ecore_X_Virtual_Keyboard_State)sd->kbdmode);
#endif #endif
} }
@ -2933,8 +2934,8 @@ elm_win_keyboard_win_set(Evas_Object *obj,
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
_elm_win_xwindow_get(sd); _elm_win_xwindow_get(sd);
if (sd->xwin) if (sd->x.xwin)
ecore_x_e_virtual_keyboard_set(sd->xwin, is_keyboard); ecore_x_e_virtual_keyboard_set(sd->x.xwin, is_keyboard);
#else #else
(void)is_keyboard; (void)is_keyboard;
#endif #endif
@ -2948,8 +2949,8 @@ elm_win_keyboard_win_get(const Evas_Object *obj)
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
_elm_win_xwindow_get(sd); _elm_win_xwindow_get(sd);
if (sd->xwin) if (sd->x.xwin)
return ecore_x_e_virtual_keyboard_get(sd->xwin); return ecore_x_e_virtual_keyboard_get(sd->x.xwin);
#endif #endif
return EINA_FALSE; return EINA_FALSE;
} }
@ -2967,14 +2968,14 @@ elm_win_indicator_mode_set(Evas_Object *obj,
#endif #endif
sd->indmode = mode; sd->indmode = mode;
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
if (sd->xwin) if (sd->x.xwin)
{ {
if (sd->indmode == ELM_WIN_INDICATOR_SHOW) if (sd->indmode == ELM_WIN_INDICATOR_SHOW)
ecore_x_e_illume_indicator_state_set ecore_x_e_illume_indicator_state_set
(sd->xwin, ECORE_X_ILLUME_INDICATOR_STATE_ON); (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_STATE_ON);
else if (sd->indmode == ELM_WIN_INDICATOR_HIDE) else if (sd->indmode == ELM_WIN_INDICATOR_HIDE)
ecore_x_e_illume_indicator_state_set ecore_x_e_illume_indicator_state_set
(sd->xwin, ECORE_X_ILLUME_INDICATOR_STATE_OFF); (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_STATE_OFF);
} }
#endif #endif
} }
@ -2999,17 +3000,17 @@ elm_win_indicator_opacity_set(Evas_Object *obj,
sd->ind_o_mode = mode; sd->ind_o_mode = mode;
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
_elm_win_xwindow_get(sd); _elm_win_xwindow_get(sd);
if (sd->xwin) if (sd->x.xwin)
{ {
if (sd->ind_o_mode == ELM_WIN_INDICATOR_OPAQUE) if (sd->ind_o_mode == ELM_WIN_INDICATOR_OPAQUE)
ecore_x_e_illume_indicator_opacity_set ecore_x_e_illume_indicator_opacity_set
(sd->xwin, ECORE_X_ILLUME_INDICATOR_OPAQUE); (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_OPAQUE);
else if (sd->ind_o_mode == ELM_WIN_INDICATOR_TRANSLUCENT) else if (sd->ind_o_mode == ELM_WIN_INDICATOR_TRANSLUCENT)
ecore_x_e_illume_indicator_opacity_set ecore_x_e_illume_indicator_opacity_set
(sd->xwin, ECORE_X_ILLUME_INDICATOR_TRANSLUCENT); (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_TRANSLUCENT);
else if (sd->ind_o_mode == ELM_WIN_INDICATOR_TRANSPARENT) else if (sd->ind_o_mode == ELM_WIN_INDICATOR_TRANSPARENT)
ecore_x_e_illume_indicator_opacity_set ecore_x_e_illume_indicator_opacity_set
(sd->xwin, ECORE_X_ILLUME_INDICATOR_TRANSPARENT); (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_TRANSPARENT);
} }
#endif #endif
} }
@ -3085,8 +3086,8 @@ elm_win_conformant_set(Evas_Object *obj,
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
_elm_win_xwindow_get(sd); _elm_win_xwindow_get(sd);
if (sd->xwin) if (sd->x.xwin)
ecore_x_e_illume_conformant_set(sd->xwin, conformant); ecore_x_e_illume_conformant_set(sd->x.xwin, conformant);
#else #else
(void)conformant; (void)conformant;
#endif #endif
@ -3100,8 +3101,8 @@ elm_win_conformant_get(const Evas_Object *obj)
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
_elm_win_xwindow_get(sd); _elm_win_xwindow_get(sd);
if (sd->xwin) if (sd->x.xwin)
return ecore_x_e_illume_conformant_get(sd->xwin); return ecore_x_e_illume_conformant_get(sd->x.xwin);
#endif #endif
return EINA_FALSE; return EINA_FALSE;
} }
@ -3114,17 +3115,17 @@ elm_win_quickpanel_set(Evas_Object *obj,
ELM_WIN_DATA_GET_OR_RETURN(obj, sd); ELM_WIN_DATA_GET_OR_RETURN(obj, sd);
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
_elm_win_xwindow_get(sd); _elm_win_xwindow_get(sd);
if (sd->xwin) if (sd->x.xwin)
{ {
ecore_x_e_illume_quickpanel_set(sd->xwin, quickpanel); ecore_x_e_illume_quickpanel_set(sd->x.xwin, quickpanel);
if (quickpanel) if (quickpanel)
{ {
Ecore_X_Window_State states[2]; Ecore_X_Window_State states[2];
states[0] = ECORE_X_WINDOW_STATE_SKIP_TASKBAR; states[0] = ECORE_X_WINDOW_STATE_SKIP_TASKBAR;
states[1] = ECORE_X_WINDOW_STATE_SKIP_PAGER; states[1] = ECORE_X_WINDOW_STATE_SKIP_PAGER;
ecore_x_netwm_window_state_set(sd->xwin, states, 2); ecore_x_netwm_window_state_set(sd->x.xwin, states, 2);
ecore_x_icccm_hints_set(sd->xwin, 0, 0, 0, 0, 0, 0, 0); ecore_x_icccm_hints_set(sd->x.xwin, 0, 0, 0, 0, 0, 0, 0);
} }
} }
#else #else
@ -3140,8 +3141,8 @@ elm_win_quickpanel_get(const Evas_Object *obj)
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
_elm_win_xwindow_get(sd); _elm_win_xwindow_get(sd);
if (sd->xwin) if (sd->x.xwin)
return ecore_x_e_illume_quickpanel_get(sd->xwin); return ecore_x_e_illume_quickpanel_get(sd->x.xwin);
#endif #endif
return EINA_FALSE; return EINA_FALSE;
} }
@ -3155,8 +3156,8 @@ elm_win_quickpanel_priority_major_set(Evas_Object *obj,
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
_elm_win_xwindow_get(sd); _elm_win_xwindow_get(sd);
if (sd->xwin) if (sd->x.xwin)
ecore_x_e_illume_quickpanel_priority_major_set(sd->xwin, priority); ecore_x_e_illume_quickpanel_priority_major_set(sd->x.xwin, priority);
#else #else
(void)priority; (void)priority;
#endif #endif
@ -3170,8 +3171,8 @@ elm_win_quickpanel_priority_major_get(const Evas_Object *obj)
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
_elm_win_xwindow_get(sd); _elm_win_xwindow_get(sd);
if (sd->xwin) if (sd->x.xwin)
return ecore_x_e_illume_quickpanel_priority_major_get(sd->xwin); return ecore_x_e_illume_quickpanel_priority_major_get(sd->x.xwin);
#endif #endif
return -1; return -1;
} }
@ -3185,8 +3186,8 @@ elm_win_quickpanel_priority_minor_set(Evas_Object *obj,
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
_elm_win_xwindow_get(sd); _elm_win_xwindow_get(sd);
if (sd->xwin) if (sd->x.xwin)
ecore_x_e_illume_quickpanel_priority_minor_set(sd->xwin, priority); ecore_x_e_illume_quickpanel_priority_minor_set(sd->x.xwin, priority);
#else #else
(void)priority; (void)priority;
#endif #endif
@ -3200,8 +3201,8 @@ elm_win_quickpanel_priority_minor_get(const Evas_Object *obj)
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
_elm_win_xwindow_get(sd); _elm_win_xwindow_get(sd);
if (sd->xwin) if (sd->x.xwin)
return ecore_x_e_illume_quickpanel_priority_minor_get(sd->xwin); return ecore_x_e_illume_quickpanel_priority_minor_get(sd->x.xwin);
#endif #endif
return -1; return -1;
} }
@ -3215,8 +3216,8 @@ elm_win_quickpanel_zone_set(Evas_Object *obj,
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
_elm_win_xwindow_get(sd); _elm_win_xwindow_get(sd);
if (sd->xwin) if (sd->x.xwin)
ecore_x_e_illume_quickpanel_zone_set(sd->xwin, zone); ecore_x_e_illume_quickpanel_zone_set(sd->x.xwin, zone);
#else #else
(void)zone; (void)zone;
#endif #endif
@ -3230,8 +3231,8 @@ elm_win_quickpanel_zone_get(const Evas_Object *obj)
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
_elm_win_xwindow_get(sd); _elm_win_xwindow_get(sd);
if (sd->xwin) if (sd->x.xwin)
return ecore_x_e_illume_quickpanel_zone_get(sd->xwin); return ecore_x_e_illume_quickpanel_zone_get(sd->x.xwin);
#endif #endif
return 0; return 0;
} }
@ -3257,24 +3258,24 @@ elm_win_illume_command_send(Evas_Object *obj,
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
_elm_win_xwindow_get(sd); _elm_win_xwindow_get(sd);
if (sd->xwin) if (sd->x.xwin)
{ {
switch (command) switch (command)
{ {
case ELM_ILLUME_COMMAND_FOCUS_BACK: case ELM_ILLUME_COMMAND_FOCUS_BACK:
ecore_x_e_illume_focus_back_send(sd->xwin); ecore_x_e_illume_focus_back_send(sd->x.xwin);
break; break;
case ELM_ILLUME_COMMAND_FOCUS_FORWARD: case ELM_ILLUME_COMMAND_FOCUS_FORWARD:
ecore_x_e_illume_focus_forward_send(sd->xwin); ecore_x_e_illume_focus_forward_send(sd->x.xwin);
break; break;
case ELM_ILLUME_COMMAND_FOCUS_HOME: case ELM_ILLUME_COMMAND_FOCUS_HOME:
ecore_x_e_illume_focus_home_send(sd->xwin); ecore_x_e_illume_focus_home_send(sd->x.xwin);
break; break;
case ELM_ILLUME_COMMAND_CLOSE: case ELM_ILLUME_COMMAND_CLOSE:
ecore_x_e_illume_close_send(sd->xwin); ecore_x_e_illume_close_send(sd->x.xwin);
break; break;
default: default:
@ -3378,7 +3379,7 @@ elm_win_xwindow_get(const Evas_Object *obj)
ELM_WIN_DATA_GET_OR_RETURN_VAL(obj, sd, 0); ELM_WIN_DATA_GET_OR_RETURN_VAL(obj, sd, 0);
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
if (sd->xwin) return sd->xwin; if (sd->x.xwin) return sd->x.xwin;
if (sd->parent) return elm_win_xwindow_get(sd->parent); if (sd->parent) return elm_win_xwindow_get(sd->parent);
#endif #endif
return 0; return 0;