Eina_Bool top_animate : 1;
Eina_Bool geometry_changed : 1;
} focus_highlight;
+ struct
+ {
+ const char *name;
+ Ecore_Timer *timer;
+ Eina_List *names;
+ } profile;
Evas_Object *icon;
const char *title;
Eina_Bool fullscreen : 1;
Eina_Bool maximized : 1;
Eina_Bool skip_focus : 1;
+ Eina_Bool floating : 1;
};
static const char *widtype = NULL;
static const char SIG_UNFULLSCREEN[] = "unfullscreen";
static const char SIG_MAXIMIZED[] = "maximized";
static const char SIG_UNMAXIMIZED[] = "unmaximized";
+static const char SIG_PROFILE_CHANGED[] = "profile,changed";
static const Evas_Smart_Cb_Description _signals[] = {
{SIG_DELETE_REQUEST, ""},
{SIG_UNFULLSCREEN, ""},
{SIG_MAXIMIZED, ""},
{SIG_UNMAXIMIZED, ""},
+ {SIG_PROFILE_CHANGED, ""},
{NULL, NULL}
};
*pd = *p;
}
*pd = 0;
- v = atof(d);
+ v = _elm_atof(d);
free(d);
return v;
}
}
static void
+_elm_win_profile_update(Ecore_Evas *ee)
+{
+ Evas_Object *obj = ecore_evas_object_associate_get(ee);
+ Elm_Win *win;
+
+ if (!obj) return;
+ win = elm_widget_data_get(obj);
+ if (!win) return;
+
+ if (win->profile.timer)
+ ecore_timer_del(win->profile.timer);
+ win->profile.timer = NULL;
+
+ /* TODO: We need the ability to bind a profile to a specific window.
+ * Elementary's configuration still has a single global profile for the app.
+ */
+ _elm_config_profile_set(win->profile.name);
+
+ evas_object_smart_callback_call(win->win_obj, SIG_PROFILE_CHANGED, NULL);
+}
+
+static Eina_Bool
+_elm_win_profile_change_delay(void *data)
+{
+ Elm_Win *win = data;
+ const char *profile;
+ Eina_Bool changed = EINA_FALSE;
+
+ profile = eina_list_nth(win->profile.names, 0);
+ if (profile)
+ {
+ if (win->profile.name)
+ {
+ if (strcmp(win->profile.name, profile))
+ {
+ eina_stringshare_replace(&(win->profile.name), profile);
+ changed = EINA_TRUE;
+ }
+ }
+ else
+ {
+ win->profile.name = eina_stringshare_add(profile);
+ changed = EINA_TRUE;
+ }
+ }
+ win->profile.timer = NULL;
+ if (changed) _elm_win_profile_update(win->ee);
+ return EINA_FALSE;
+}
+
+static void
_elm_win_state_change(Ecore_Evas *ee)
{
Evas_Object *obj;
Eina_Bool ch_iconified = EINA_FALSE;
Eina_Bool ch_fullscreen = EINA_FALSE;
Eina_Bool ch_maximized = EINA_FALSE;
+ Eina_Bool ch_profile = EINA_FALSE;
+ const char *profile;
if (!(obj = ecore_evas_object_associate_get(ee))) return;
win->maximized = ecore_evas_maximized_get(win->ee);
ch_maximized = EINA_TRUE;
}
+ profile = ecore_evas_profile_get(win->ee);
+ if ((profile) &&
+ _elm_config_profile_exists(profile))
+ {
+ if (win->profile.name)
+ {
+ if (strcmp(win->profile.name, profile))
+ {
+ eina_stringshare_replace(&(win->profile.name), profile);
+ ch_profile = EINA_TRUE;
+ }
+ }
+ else
+ {
+ win->profile.name = eina_stringshare_add(profile);
+ ch_profile = EINA_TRUE;
+ }
+ }
if ((ch_withdrawn) || (ch_iconified))
{
if (win->withdrawn)
else
evas_object_smart_callback_call(win->win_obj, SIG_UNMAXIMIZED, NULL);
}
+ if (ch_profile)
+ {
+ _elm_win_profile_update(win->ee);
+ }
}
static Eina_Bool
{
Elm_Win *wd = elm_widget_data_get(obj);
const Eina_List *items;
+ const Eina_List *list;
void *(*list_data_get) (const Eina_List *list);
if (!wd)
return EINA_FALSE;
+ list = elm_widget_sub_object_list_get(obj);
/* Focus chain */
- if (wd->subobjs)
+ if (list)
{
if (!(items = elm_widget_focus_custom_chain_get(obj)))
- {
- items = wd->subobjs;
- if (!items)
- return EINA_FALSE;
- }
+ items = list;
+
list_data_get = eina_list_data_get;
elm_widget_focus_list_next_get(obj, items, list_data_get, dir, next);
if (*next)
return EINA_TRUE;
}
-
*next = (Evas_Object *)obj;
return EINA_FALSE;
}
return EINA_TRUE;
}
else if ((!strcmp(ev->keyname, "Left")) ||
- (!strcmp(ev->keyname, "KP_Left")))
+ ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
{
//TODO : woohyun jung
}
else if ((!strcmp(ev->keyname, "Right")) ||
- (!strcmp(ev->keyname, "KP_Right")))
+ ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
{
//TODO : woohyun jung
}
else if ((!strcmp(ev->keyname, "Up")) ||
- (!strcmp(ev->keyname, "KP_Up")))
+ ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
{
//TODO : woohyun jung
}
else if ((!strcmp(ev->keyname, "Down")) ||
- (!strcmp(ev->keyname, "KP_Down")))
+ ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
{
//TODO : woohyun jung
}
}
static void
+_elm_win_obj_callback_img_obj_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+ Elm_Win *win = data;
+ win->img_obj = NULL;
+}
+
+static void
_elm_win_obj_callback_del(void *data, Evas *e, Evas_Object *obj, void *event_info __UNUSED__)
{
Elm_Win *win = data;
Evas_Object *child, *child2 = NULL;
+ const char *str;
if (win->parent)
{
if (win->img_obj)
{
+ evas_object_event_callback_del_full
+ (win->img_obj, EVAS_CALLBACK_DEL, _elm_win_obj_callback_img_obj_del, win);
win->img_obj = NULL;
}
else
if (win->role) eina_stringshare_del(win->role);
if (win->icon) evas_object_del(win->icon);
+ EINA_LIST_FREE(win->profile.names, str) eina_stringshare_del(str);
+ if (win->profile.name) eina_stringshare_del(win->profile.name);
+ if (win->profile.timer) ecore_timer_del(win->profile.timer);
+
free(win);
if ((!_elm_win_list) &&
}
}
-static void
-_elm_win_obj_callback_img_obj_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- Elm_Win *win = data;
- if (!win->img_obj) return;
- evas_object_event_callback_del_full
- (win->img_obj, EVAS_CALLBACK_DEL, _elm_win_obj_callback_img_obj_del, win);
- evas_object_del(win->img_obj);
-}
static void
_elm_win_obj_callback_parent_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
win->screen.x = x;
win->screen.y = y;
+
+ /* FIXME: We should update ecore_wl_window_location here !! */
}
else if (win->img_obj)
{
if (!(win = data)) return;
/* FIXME: Change mouse pointer */
- /* NB: 0,0 are dummy values. Wayland handles the move by itself */
- ecore_evas_move(win->ee, 0, 0);
+ /* NB: Wayland handles moving surfaces by itself so we cannot
+ * specify a specific x/y we want. Instead, we will pass in the
+ * existing x/y values so they can be recorded as 'previous' position.
+ * The new position will get updated automatically when the move is
+ * finished */
+
+ ecore_evas_wayland_move(win->ee, win->screen.x, win->screen.y);
}
static void
eina_stringshare_replace(&(win->title), title);
ecore_evas_title_set(win->ee, win->title);
if (win->frame_obj)
- edje_object_part_text_set(win->frame_obj, "elm.text.title", win->title);
+ edje_object_part_text_escaped_set(win->frame_obj, "elm.text.title", win->title);
}
EAPI const char *
}
EAPI void
+elm_win_profiles_set(Evas_Object *obj, const char **profiles, unsigned int num_profiles)
+{
+ Elm_Win *win;
+ char **profiles_int;
+ const char *str;
+ unsigned int i, num;
+ Eina_List *l;
+
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ win = elm_widget_data_get(obj);
+ if (!win) return;
+ if (!profiles) return;
+
+ if (win->profile.timer) ecore_timer_del(win->profile.timer);
+ win->profile.timer = ecore_timer_add(0.1, _elm_win_profile_change_delay, win);
+ EINA_LIST_FREE(win->profile.names, str) eina_stringshare_del(str);
+
+ for (i = 0; i < num_profiles; i++)
+ {
+ if ((profiles[i]) &&
+ _elm_config_profile_exists(profiles[i]))
+ {
+ str = eina_stringshare_add(profiles[i]);
+ win->profile.names = eina_list_append(win->profile.names, str);
+ }
+ }
+
+ num = eina_list_count(win->profile.names);
+ profiles_int = alloca(num * sizeof(char *));
+
+ if (profiles_int)
+ {
+ i = 0;
+ EINA_LIST_FOREACH(win->profile.names, l, str)
+ {
+ if (str)
+ profiles_int[i] = strdup(str);
+ else
+ profiles_int[i] = NULL;
+ i++;
+ }
+ ecore_evas_profiles_set(win->ee, (const char **)profiles_int, i);
+ for (i = 0; i < num; i++)
+ {
+ if (profiles_int[i]) free(profiles_int[i]);
+ }
+ }
+ else
+ ecore_evas_profiles_set(win->ee, profiles, num_profiles);
+}
+
+EAPI const char *
+elm_win_profile_get(const Evas_Object *obj)
+{
+ Elm_Win *win;
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ win = elm_widget_data_get(obj);
+ if (!win) return NULL;
+
+ return win->profile.name;
+}
+
+EAPI void
elm_win_urgent_set(Evas_Object *obj, Eina_Bool urgent)
{
Elm_Win *win;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd || !item) return;
- edje_object_part_text_set(wd->frm, item, text);
+ edje_object_part_text_escaped_set(wd->frm, item, text);
_sizing_eval(obj);
}
#endif
return 0;
}
+
+EAPI void
+elm_win_floating_mode_set(Evas_Object *obj, Eina_Bool floating)
+{
+ Elm_Win *win;
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ win = elm_widget_data_get(obj);
+ if (!win) return;
+ if (floating == win->floating) return;
+#ifdef HAVE_ELEMENTARY_X
+ _elm_win_xwindow_get(win);
+#endif
+ win->floating = floating;
+#ifdef HAVE_ELEMENTARY_X
+ if (win->xwin)
+ {
+ if (win->floating)
+ ecore_x_e_illume_window_state_set
+ (win->xwin, ECORE_X_ILLUME_WINDOW_STATE_FLOATING);
+ else
+ ecore_x_e_illume_window_state_set
+ (win->xwin, ECORE_X_ILLUME_WINDOW_STATE_NORMAL);
+ }
+#endif
+}
+
+EAPI Eina_Bool
+elm_win_floating_mode_get(const Evas_Object *obj)
+{
+ Elm_Win *win;
+ ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
+ win = elm_widget_data_get(obj);
+ if (!win) return EINA_FALSE;
+
+ return win->floating;
+}
+