} shot;
Eina_Bool autodel : 1;
Eina_Bool constrain : 1;
- Eina_Bool moving : 1;
+ Eina_Bool resizing : 1;
+ int resize_location;
int *autodel_clear, rot;
int show_count;
struct {
int x, y;
} screen;
-
+ struct
+ {
+ Ecore_Evas *ee;
+ Evas *evas;
+ Evas_Object *obj, *hot_obj;
+ int hot_x, hot_y;
+ } pointer;
struct {
Evas_Object *top;
static void _elm_win_frame_add(Elm_Win *win, const char *style);
static void _elm_win_frame_cb_move_start(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__);
-static void _elm_win_frame_cb_move_stop(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__);
+static void _elm_win_frame_cb_resize_start(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source);
static void _elm_win_frame_cb_minimize(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__);
static void _elm_win_frame_cb_maximize(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__);
static void _elm_win_frame_cb_close(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__);
-static void _elm_win_frame_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info);
+
+static void _elm_win_pointer_add(Elm_Win *win, const char *style);
static const char SIG_DELETE_REQUEST[] = "delete,request";
static const char SIG_FOCUS_OUT[] = "focus,out";
win->deferred_resize_job = ecore_job_add(_elm_win_resize_job, win);
}
+static void
+_elm_win_mouse_in(Ecore_Evas *ee)
+{
+ Evas_Object *obj;
+ Elm_Win *win;
+
+ if (!(obj = ecore_evas_object_associate_get(ee))) return;
+ if (!(win = elm_widget_data_get(obj))) return;
+ if (win->resizing) win->resizing = EINA_FALSE;
+}
+
static void
_elm_win_focus_in(Ecore_Evas *ee)
{
win = elm_widget_data_get(obj);
if (!win) return;
_elm_widget_top_win_focused_set(win->win_obj, EINA_TRUE);
- if (win->show_count == 1)
+ if (!elm_widget_focus_order_get(obj))
{
elm_widget_focus_steal(win->win_obj);
win->show_count++;
{
evas_object_hide(win->img_obj);
}
+ if (win->pointer.obj)
+ {
+ evas_object_hide(win->pointer.obj);
+ ecore_evas_hide(win->pointer.ee);
+ }
}
static void
{
evas_object_show(win->img_obj);
}
+ if (win->pointer.obj)
+ {
+ ecore_evas_show(win->pointer.ee);
+ evas_object_show(win->pointer.obj);
+ ecore_evas_wayland_pointer_set(win->pointer.ee, 10, 10);
+ }
evas_object_show(obj);
}
evas_object_move(win->frame_obj, 0, 0);
evas_object_resize(win->frame_obj, 1, 1);
- evas_object_event_callback_add(win->frame_obj, EVAS_CALLBACK_MOUSE_MOVE,
- _elm_win_frame_cb_mouse_move, win);
-
edje_object_signal_callback_add(win->frame_obj, "elm,action,move,start",
"elm", _elm_win_frame_cb_move_start, win);
- edje_object_signal_callback_add(win->frame_obj, "elm,action,move,stop",
- "elm", _elm_win_frame_cb_move_stop, win);
+ edje_object_signal_callback_add(win->frame_obj, "elm,action,resize,start",
+ "*", _elm_win_frame_cb_resize_start, win);
edje_object_signal_callback_add(win->frame_obj, "elm,action,minimize",
"elm", _elm_win_frame_cb_minimize, win);
edje_object_signal_callback_add(win->frame_obj, "elm,action,maximize",
Elm_Win *win;
if (!(win = data)) return;
- win->moving = EINA_TRUE;
+ /* FIXME: Change mouse pointer */
+
+ /* NB: 0,0 are dummy values. Wayland handles the move by itself */
+ ecore_evas_move(win->ee, 0, 0);
}
static void
-_elm_win_frame_cb_move_stop(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__)
+_elm_win_frame_cb_resize_start(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source)
{
Elm_Win *win;
if (!(win = data)) return;
- win->moving = EINA_FALSE;
+ if (win->resizing) return;
+ win->resizing = EINA_TRUE;
+
+ /* FIXME: Change mouse pointer */
+
+ if (!strcmp(source, "elm.event.resize.t"))
+ win->resize_location = 1;
+ else if (!strcmp(source, "elm.event.resize.b"))
+ win->resize_location = 2;
+ else if (!strcmp(source, "elm.event.resize.l"))
+ win->resize_location = 4;
+ else if (!strcmp(source, "elm.event.resize.r"))
+ win->resize_location = 8;
+ else if (!strcmp(source, "elm.event.resize.tl"))
+ win->resize_location = 5;
+ else if (!strcmp(source, "elm.event.resize.tr"))
+ win->resize_location = 9;
+ else if (!strcmp(source, "elm.event.resize.bl"))
+ win->resize_location = 6;
+ else if (!strcmp(source, "elm.event.resize.br"))
+ win->resize_location = 10;
+ else
+ win->resize_location = 0;
+
+ if (win->resize_location > 0)
+ ecore_evas_wayland_resize(win->ee, win->resize_location);
}
static void
}
static void
-_elm_win_frame_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_elm_win_pointer_add(Elm_Win *win, const char *style)
{
- Elm_Win *win;
- Evas_Event_Mouse_Move *ev;
+ int mw, mh;
- if (!(win = data)) return;
- ev = event_info;
- if (win->moving)
- {
- /* NB: 0, 0 are bogus values and not used in wayland */
- ecore_evas_move(win->ee, 0, 0);
- }
+ win->pointer.ee = ecore_evas_wayland_shm_new(NULL, 0, 0, 32, 32, 0);
+ ecore_evas_resize(win->pointer.ee, 32, 32);
+
+ win->pointer.evas = ecore_evas_get(win->ee);
+
+ win->pointer.obj = edje_object_add(win->pointer.evas);
+ _elm_theme_set(NULL, win->pointer.obj, "pointer", "base", style);
+ edje_object_size_min_calc(win->pointer.obj, &mw, &mh);
+ printf("ELM Win Pointer Size: %d %d\n", mw, mh);
+ evas_object_move(win->pointer.obj, 0, 0);
+ evas_object_resize(win->pointer.obj, 32, 32);
+ evas_object_show(win->pointer.obj);
}
#ifdef ELM_DEBUG
if (win->ee) \
elm_engine_set(ecore_evas_engine_name_get(win->ee)); \
} while (0)
-#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))
+#define ENGINE_COMPARE(name) (_elm_config->engine && !strcmp(_elm_config->engine, name))
switch (type)
{
win->img_obj = NULL;
}
break;
+
+ case ELM_WIN_SOCKET_IMAGE:
+ win->ee = ecore_evas_extn_socket_new(1, 1);
+ break;
+
default:
if (ENGINE_COMPARE(ELM_SOFTWARE_X11))
{
else if (ENGINE_COMPARE(ELM_WAYLAND_SHM))
{
win->ee = ecore_evas_wayland_shm_new(NULL, 0, 0, 1, 1, 0);
- win->evas = ecore_evas_get(win->ee);
+ win->evas = ecore_evas_get(win->ee);
+
+ _elm_win_frame_add(win, "default");
+ _elm_win_pointer_add(win, "default");
+ }
+ else if (ENGINE_COMPARE(ELM_WAYLAND_EGL))
+ {
+ win->ee = ecore_evas_wayland_egl_new(NULL, 0, 0, 1, 1, 0);
+ win->evas = ecore_evas_get(win->ee);
_elm_win_frame_add(win, "default");
+ _elm_win_pointer_add(win, "default");
}
else if (!strncmp(_elm_config->engine, "shot:", 5))
{
ecore_evas_name_class_set(win->ee, name, _elm_appname);
ecore_evas_callback_delete_request_set(win->ee, _elm_win_delete_request);
ecore_evas_callback_resize_set(win->ee, _elm_win_resize);
+ ecore_evas_callback_mouse_in_set(win->ee, _elm_win_mouse_in);
ecore_evas_callback_focus_in_set(win->ee, _elm_win_focus_in);
ecore_evas_callback_focus_out_set(win->ee, _elm_win_focus_out);
ecore_evas_callback_move_set(win->ee, _elm_win_move);
Elm_Win *win;
ELM_CHECK_WIDTYPE(obj, widtype);
win = elm_widget_data_get(obj);
- if (!win) return;
+ if (!win || !title) return;
ecore_evas_title_set(win->ee, title);
if (win->frame_obj)
edje_object_part_text_set(win->frame_obj, "elm.text.title", title);
}
static void
+_elm_inwin_text_set_hook(Evas_Object *obj, const char *item, const char *text)
+{
+ Widget_Data *wd = elm_widget_data_get(obj);
+
+ if (!wd || !item) return;
+ edje_object_part_text_set(wd->frm, item, text);
+ _sizing_eval(obj);
+}
+
+static const char *
+_elm_inwin_text_get_hook(const Evas_Object *obj, const char *item)
+{
+ Widget_Data *wd = elm_widget_data_get(obj);
+
+ if (!item || !wd || !wd->frm) return NULL;
+ return edje_object_part_text_get(wd->frm, item);
+}
+
+static void
_sizing_eval(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
elm_widget_del_hook_set(obj2, _del_hook);
elm_widget_theme_hook_set(obj2, _theme_hook);
elm_widget_focus_next_hook_set(obj2, _elm_inwin_focus_next_hook);
+ elm_widget_text_set_hook_set(obj2, _elm_inwin_text_set_hook);
+ elm_widget_text_get_hook_set(obj2, _elm_inwin_text_get_hook);
elm_widget_can_focus_set(obj2, EINA_TRUE);
elm_widget_highlight_ignore_set(obj2, EINA_TRUE);
return content;
}
+EAPI Eina_Bool
+elm_win_socket_listen(Evas_Object *obj, const char *svcname, int svcnum, Eina_Bool svcsys)
+{
+
+ Elm_Win *win;
+
+ ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
+ win = elm_widget_data_get(obj);
+ if (!win) return EINA_FALSE;
+ if (!win->ee) return EINA_FALSE;
+
+ if(!ecore_evas_extn_socket_listen(win->ee, svcname, svcnum, svcsys))
+ return EINA_FALSE;
+
+ return EINA_TRUE;
+}
+
/* windowing spcific calls - shall we do this differently? */
static Ecore_X_Window