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

Add flags in new monitor structure for enabled, moving, resizing, rotating. 

Add field(s) in the smart data structure to store the layout widget reference along with layout geometry and size.
Add code to set the monitor name.
Add code to set the resolution name.
Add code to set enabled/disabled state.
Add code to handle when the layout widget gets moved so we can update the recorded geometry.
Add livethumb background preview.
Add edje signal callbacks for resize, rotate, and indicator.
On monitor deletion, remove the bg_update_handler, and free the list of modes.
Add code to handle manual user moving of monitor.

Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 81077
This commit is contained in:
Christopher Michael 2012-12-17 09:19:19 +00:00 committed by Christopher Michael
parent 9bdafc8d2d
commit 13eb1a0321
1 changed files with 348 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

370
src/modules/conf_randr/e_smart_monitor.c
View File

@ -27,6 +27,18 @@ struct _E_Smart_Data
/* visible flag */
Eina_Bool visible : 1;
/* enabled flag */
Eina_Bool enabled : 1;
/* moving flag */
Eina_Bool moving : 1;
/* resizing flag */
Eina_Bool resizing : 1;
/* rotating flag */
Eina_Bool rotating : 1;
/* handler for bg updates */
Ecore_Event_Handler *bg_update_hdl;
@ -43,7 +55,14 @@ struct _E_Smart_Data
E_Randr_Output_Info *output;
/* reference to the Layout widget */
Evas_Object *o_layout;
struct
{
Evas_Object *obj; /* the actual layout widget */
Evas_Coord x, y; /* the layout widget's position */
Evas_Coord vw, vh; /* the layout widget's virtual size */
} layout;
/* Evas_Object *o_layout; */
/* reference to the Container number */
int con_num;
@ -67,13 +86,25 @@ static int _e_smart_monitor_modes_sort(const void *data1, const void *data2);
static void _e_smart_monitor_background_set(E_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy);
static Eina_Bool _e_smart_monitor_background_update(void *data, int type, void *event);
static void _e_smart_monitor_move_event(E_Smart_Data *sd, Evas_Object *mon, void *event);
/* local callback prototypes */
static void _e_smart_monitor_frame_cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event);
static void _e_smart_monitor_frame_cb_resize_in(void *data __UNUSED__, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__);
static void _e_smart_monitor_frame_cb_resize_out(void *data __UNUSED__, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__);
static void _e_smart_monitor_frame_cb_rotate_in(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__);
static void _e_smart_monitor_frame_cb_rotate_out(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__);
static void _e_smart_monitor_frame_cb_indicator_in(void *data __UNUSED__, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__);
static void _e_smart_monitor_frame_cb_indicator_out(void *data __UNUSED__, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__);
static void _e_smart_monitor_frame_cb_indicator_toggle(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__);
static void _e_smart_monitor_thumb_cb_mouse_in(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void *event __UNUSED__);
static void _e_smart_monitor_thumb_cb_mouse_out(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void *event __UNUSED__);
static void _e_smart_monitor_thumb_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event);
static void _e_smart_monitor_thumb_cb_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event);
static void _e_smart_monitor_layout_cb_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__);
/* external functions exposed by this widget */
Evas_Object *
e_smart_monitor_add(Evas *evas)
@ -115,14 +146,15 @@ e_smart_monitor_output_set(Evas_Object *obj, E_Randr_Output_Info *output)
sd->output = output;
/* fill the list of 'modes' for this monitor
*
* NB: This clears old modes and also sets the min & max resolutions */
_e_smart_monitor_modes_fill(sd);
if (sd->o_layout)
if (sd->layout.obj)
{
/* with the min & max resolutions, we can now set the thumbnail size.
* get largest resolution and convert to largest canvas size */
e_layout_coord_virtual_to_canvas(sd->o_layout,
e_layout_coord_virtual_to_canvas(sd->layout.obj,
sd->max.w, sd->max.h, &mw, &mh);
}
@ -132,6 +164,7 @@ e_smart_monitor_output_set(Evas_Object *obj, E_Randr_Output_Info *output)
e_livethumb_vsize_set(sd->o_thumb, mw, mh);
/* if we have a crtc, get the x/y location of it
*
* NB: Used to determine the proper container */
if ((sd->output) && (sd->output->crtc))
{
@ -150,6 +183,7 @@ e_smart_monitor_output_set(Evas_Object *obj, E_Randr_Output_Info *output)
desk = e_desk_current_get(zone);
/* set references to the container & zone number
*
* NB: Used later if background gets updated */
sd->con_num = con->num;
sd->zone_num = zone->num;
@ -157,13 +191,54 @@ e_smart_monitor_output_set(Evas_Object *obj, E_Randr_Output_Info *output)
/* set the background image */
_e_smart_monitor_background_set(sd, desk->x, desk->y);
/* if we have an output, lets set the monitor name */
if (sd->output)
{
E_Randr_Monitor_Info *monitor = NULL;
const char *name = NULL;
if ((monitor = sd->output->monitor))
name = ecore_x_randr_edid_display_name_get(monitor->edid,
monitor->edid_length);
if (!name) name = sd->output->name;
edje_object_part_text_set(sd->o_frame, "e.text.name", name);
}
/* if we have an output, lets set the resolution name */
if ((sd->output) && (sd->output->crtc))
{
Ecore_X_Randr_Mode_Info *mode;
if ((mode = sd->output->crtc->current_mode))
{
char buff[1024];
snprintf(buff, sizeof(buff), "%d x %d",
mode->width, mode->height);
edje_object_part_text_set(sd->o_frame, "e.text.resolution", buff);
}
}
/* check if enabled */
if ((sd->output) && (sd->output->crtc))
{
if (sd->output->crtc->current_mode)
sd->enabled = EINA_TRUE;
}
/* send enabled/disabled signals */
if (sd->enabled)
edje_object_signal_emit(sd->o_frame, "e,state,enabled", "e");
else
edje_object_signal_emit(sd->o_frame, "e,state,disabled", "e");
/* with the background all setup, calculate the smallest frame width */
edje_object_size_min_get(sd->o_frame, &fw, &fh);
if (sd->o_layout)
if (sd->layout.obj)
{
/* get smallest resolution and convert to smallest canvas size */
e_layout_coord_virtual_to_canvas(sd->o_layout,
e_layout_coord_virtual_to_canvas(sd->layout.obj,
sd->min.w, sd->min.h, &mw, &mh);
}
@ -195,7 +270,13 @@ e_smart_monitor_layout_set(Evas_Object *obj, Evas_Object *layout)
if (!(sd = evas_object_smart_data_get(obj))) return;
/* set this monitor's layout reference */
sd->o_layout = layout;
sd->layout.obj = layout;
/* get the layout's virtual size */
e_layout_virtual_size_get(layout, &sd->layout.vw, &sd->layout.vh);
evas_object_event_callback_add(layout, EVAS_CALLBACK_MOVE,
_e_smart_monitor_layout_cb_move, sd);
}
Evas_Object *
@ -207,7 +288,21 @@ e_smart_monitor_layout_get(Evas_Object *obj)
if (!(sd = evas_object_smart_data_get(obj))) return NULL;
/* return the monitor's referenced layout widget */
return sd->o_layout;
return sd->layout.obj;
}
void
e_smart_monitor_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
if (!obj) return;
e_layout_child_move(obj, x, y);
}
void
e_smart_monitor_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
if (!obj) return;
e_layout_child_resize(obj, w, h);
}
/* local functions */
@ -238,22 +333,47 @@ _e_smart_add(Evas_Object *obj)
_e_smart_monitor_frame_cb_mouse_move, obj);
/* create the preview */
/* sd->o_thumb = e_livethumb_add(evas); */
/* edje_object_part_swallow(sd->o_frame, "e.swallow.preview", sd->o_thumb); */
/* evas_object_event_callback_add(sd->o_thumb, EVAS_CALLBACK_MOUSE_IN, */
/* _e_smart_monitor_thumb_cb_mouse_in, NULL); */
/* evas_object_event_callback_add(sd->o_thumb, EVAS_CALLBACK_MOUSE_OUT, */
/* _e_smart_monitor_thumb_cb_mouse_out, NULL); */
/* evas_object_event_callback_add(sd->o_thumb, EVAS_CALLBACK_MOUSE_UP, */
/* _e_smart_monitor_thumb_cb_mouse_up, NULL); */
/* evas_object_event_callback_add(sd->o_thumb, EVAS_CALLBACK_MOUSE_DOWN, */
/* _e_smart_monitor_thumb_cb_mouse_down, NULL); */
sd->o_thumb = e_livethumb_add(evas);
edje_object_part_swallow(sd->o_frame, "e.swallow.preview", sd->o_thumb);
evas_object_event_callback_add(sd->o_thumb, EVAS_CALLBACK_MOUSE_IN,
_e_smart_monitor_thumb_cb_mouse_in, NULL);
evas_object_event_callback_add(sd->o_thumb, EVAS_CALLBACK_MOUSE_OUT,
_e_smart_monitor_thumb_cb_mouse_out, NULL);
evas_object_event_callback_add(sd->o_thumb, EVAS_CALLBACK_MOUSE_UP,
_e_smart_monitor_thumb_cb_mouse_up, obj);
evas_object_event_callback_add(sd->o_thumb, EVAS_CALLBACK_MOUSE_DOWN,
_e_smart_monitor_thumb_cb_mouse_down, obj);
/* create monitor stand */
/* sd->o_stand = edje_object_add(evas); */
/* e_theme_edje_object_set(sd->o_stand, "base/theme/widgets", */
/* "e/conf/randr/main/stand"); */
/* edje_object_part_swallow(sd->o_base, "e.swallow.stand", sd->o_stand); */
sd->o_stand = edje_object_add(evas);
e_theme_edje_object_set(sd->o_stand, "base/theme/widgets",
"e/conf/randr/main/stand");
edje_object_part_swallow(sd->o_base, "e.swallow.stand", sd->o_stand);
/* add callbacks for resize signals */
edje_object_signal_callback_add(sd->o_frame, "e,action,resize,in", "e",
_e_smart_monitor_frame_cb_resize_in, NULL);
edje_object_signal_callback_add(sd->o_frame, "e,action,resize,out", "e",
_e_smart_monitor_frame_cb_resize_out, NULL);
/* add callbacks for rotate signals */
edje_object_signal_callback_add(sd->o_frame, "e,action,rotate,in", "e",
_e_smart_monitor_frame_cb_rotate_in, sd);
edje_object_signal_callback_add(sd->o_frame, "e,action,rotate,out", "e",
_e_smart_monitor_frame_cb_rotate_out, sd);
/* add callbacks for indicator signals */
edje_object_signal_callback_add(sd->o_frame, "e,action,indicator,in", "e",
_e_smart_monitor_frame_cb_indicator_in, sd);
edje_object_signal_callback_add(sd->o_frame, "e,action,indicator,out", "e",
_e_smart_monitor_frame_cb_indicator_out, sd);
edje_object_signal_callback_add(sd->o_frame,
"e,action,indicator,toggle", "e",
_e_smart_monitor_frame_cb_indicator_toggle,
obj);
/* NB: Not entirely sure this is needed */
/* evas_object_stack_below(sd->o_stand, sd->o_frame); */
/* add handler for bg updates */
sd->bg_update_hdl =
@ -272,6 +392,12 @@ _e_smart_del(Evas_Object *obj)
/* try to get the objects smart data */
if (!(sd = evas_object_smart_data_get(obj))) return;
/* delete the list of modes */
if (sd->modes) eina_list_free(sd->modes);
/* delete the bg update handler */
if (sd->bg_update_hdl) ecore_event_handler_del(sd->bg_update_hdl);
/* delete the stand object */
if (sd->o_stand) evas_object_del(sd->o_stand);
@ -292,6 +418,27 @@ _e_smart_del(Evas_Object *obj)
/* delete the frame object */
if (sd->o_frame)
{
edje_object_signal_callback_del(sd->o_frame,
"e,action,resize,in", "e",
_e_smart_monitor_frame_cb_resize_in);
edje_object_signal_callback_del(sd->o_frame,
"e,action,resize,out", "e",
_e_smart_monitor_frame_cb_resize_out);
edje_object_signal_callback_del(sd->o_frame,
"e,action,rotate,in", "e",
_e_smart_monitor_frame_cb_rotate_in);
edje_object_signal_callback_del(sd->o_frame,
"e,action,rotate,out", "e",
_e_smart_monitor_frame_cb_rotate_out);
edje_object_signal_callback_del(sd->o_frame,
"e,action,indicator,in", "e",
_e_smart_monitor_frame_cb_indicator_in);
edje_object_signal_callback_del(sd->o_frame,
"e,action,indicator,out", "e",
_e_smart_monitor_frame_cb_indicator_out);
edje_object_signal_callback_del(sd->o_frame,
"e,action,indicator,toggle", "e",
_e_smart_monitor_frame_cb_indicator_toggle);
evas_object_event_callback_del(sd->o_frame, EVAS_CALLBACK_MOUSE_MOVE,
_e_smart_monitor_frame_cb_mouse_move);
evas_object_del(sd->o_frame);
@ -525,6 +672,54 @@ _e_smart_monitor_background_update(void *data, int type, void *event)
return ECORE_CALLBACK_PASS_ON;
}
static void
_e_smart_monitor_move_event(E_Smart_Data *sd, Evas_Object *mon, void *event)
{
Evas_Event_Mouse_Move *ev;
Evas_Coord dx = 0, dy = 0;
Evas_Coord nx = 0, ny = 0;
Evas_Coord mx = 0, my = 0;
Evas_Coord mw = 0, mh = 0;
/* check for valid smart data */
if (!sd) return;
ev = event;
/* calculate the difference in mouse movement */
dx = (ev->cur.canvas.x - ev->prev.canvas.x);
dy = (ev->cur.canvas.y - ev->prev.canvas.y);
/* convert these coords to virtual space */
e_layout_coord_canvas_to_virtual(sd->layout.obj, (sd->layout.x + dx),
(sd->layout.y + dy), &nx, &ny);
/* get monitors current geometry */
e_layout_child_geometry_get(mon, &mx, &my, &mw, &mh);
nx += mx;
ny += my;
/* constrain to the layout bounds */
if (nx < sd->layout.x)
nx = sd->layout.x;
else if (nx > (sd->layout.x + sd->layout.vw) - mw)
nx = (sd->layout.x + sd->layout.vw) - mw;
if (ny < sd->layout.y)
ny = sd->layout.y;
else if (ny > (sd->layout.y + sd->layout.vh) - mh)
ny = (sd->layout.y + sd->layout.vh) - mh;
/* actually do the move */
if ((nx != mx) || (ny != my))
{
e_layout_child_move(mon, nx, ny);
evas_object_smart_callback_call(mon, "monitor_moved", NULL);
}
/* TODO: handle changes */
}
/* local callbacks */
static void
_e_smart_monitor_frame_cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event)
@ -537,6 +732,104 @@ _e_smart_monitor_frame_cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Obj
if (!(sd = evas_object_smart_data_get(mon))) return;
/* TODO: handle moving, resize, rotating */
if (sd->moving)
_e_smart_monitor_move_event(sd, mon, event);
}
static void
_e_smart_monitor_frame_cb_resize_in(void *data __UNUSED__, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Manager *man;
if ((man = e_manager_current_get()))
e_pointer_type_push(man->pointer, obj, "resize_br");
}
static void
_e_smart_monitor_frame_cb_resize_out(void *data __UNUSED__, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Manager *man;
if ((man = e_manager_current_get()))
e_pointer_type_pop(man->pointer, obj, "resize_br");
}
static void
_e_smart_monitor_frame_cb_rotate_in(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Smart_Data *sd;
Ecore_Evas *ee;
Ecore_X_Window win;
Ecore_X_Cursor cur;
if (!(sd = data)) return;
/* changing cursors for rotate is done this way because e_pointer
* does not support all available X cursors */
ee = ecore_evas_ecore_evas_get(evas_object_evas_get(sd->o_frame));
win = (Ecore_X_Window)ecore_evas_window_get(ee);
cur = ecore_x_cursor_shape_get(ECORE_X_CURSOR_EXCHANGE);
ecore_x_window_cursor_set(win, cur);
ecore_x_cursor_free(cur);
}
static void
_e_smart_monitor_frame_cb_rotate_out(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Smart_Data *sd;
Ecore_Evas *ee;
Ecore_X_Window win;
if (!(sd = data)) return;
/* reset cursor back to default */
ee = ecore_evas_ecore_evas_get(evas_object_evas_get(sd->o_frame));
win = (Ecore_X_Window)ecore_evas_window_get(ee);
ecore_x_window_cursor_set(win, 0);
}
static void
_e_smart_monitor_frame_cb_indicator_in(void *data __UNUSED__, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Manager *man;
if ((man = e_manager_current_get()))
e_pointer_type_push(man->pointer, obj, "hand");
}
static void
_e_smart_monitor_frame_cb_indicator_out(void *data __UNUSED__, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Manager *man;
if ((man = e_manager_current_get()))
e_pointer_type_pop(man->pointer, obj, "hand");
}
static void
_e_smart_monitor_frame_cb_indicator_toggle(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
Evas_Object *mon;
E_Smart_Data *sd;
if (!(mon = data)) return;
if (!(sd = evas_object_smart_data_get(mon))) return;
if (sd->enabled)
{
sd->enabled = EINA_FALSE;
edje_object_signal_emit(sd->o_frame, "e,state,disabled", "e");
}
else
{
sd->enabled = EINA_TRUE;
edje_object_signal_emit(sd->o_frame, "e,state,enabled", "e");
}
/* TODO: Record changes */
evas_object_smart_callback_call(mon, "monitor_toggled", NULL);
}
static void
@ -544,7 +837,6 @@ _e_smart_monitor_thumb_cb_mouse_in(void *data __UNUSED__, Evas *evas __UNUSED__,
{
E_Manager *man;
printf("Thumb Mouse IN\n");
if ((man = e_manager_current_get()))
e_pointer_type_push(man->pointer, obj, "hand");
}
@ -567,9 +859,20 @@ _e_smart_monitor_thumb_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Obj
if (ev->button == 1)
{
E_Manager *man;
Evas_Object *mon;
E_Smart_Data *sd;
if ((man = e_manager_current_get()))
e_pointer_type_push(man->pointer, obj, "move");
if (!(mon = data)) return;
if (!(sd = evas_object_smart_data_get(mon))) return;
/* set moving state */
sd->moving = EINA_TRUE;
/* raise this monitor */
e_layout_child_raise(mon);
}
}
@ -582,8 +885,31 @@ _e_smart_monitor_thumb_cb_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Objec
if (ev->button == 1)
{
E_Manager *man;
Evas_Object *mon;
E_Smart_Data *sd;
if ((man = e_manager_current_get()))
e_pointer_type_pop(man->pointer, obj, "move");
if (!(mon = data)) return;
if (!(sd = evas_object_smart_data_get(mon))) return;
/* set moving state */
sd->moving = EINA_FALSE;
/* send monitor moved signal */
evas_object_smart_callback_call(mon, "monitor_moved", NULL);
}
}
static void
_e_smart_monitor_layout_cb_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
{
E_Smart_Data *sd;
if (!(sd = data)) return;
/* get the layout's geometry */
evas_object_geometry_get(sd->layout.obj,
&sd->layout.x, &sd->layout.y, NULL, NULL);
}