diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c index df19c4101..5c3406521 100644 --- a/src/modules/pager/e_mod_config.c +++ b/src/modules/pager/e_mod_config.c @@ -29,7 +29,7 @@ struct _E_Config_Dialog_Data Evas_Object *ob1, *ob2, *ob3; Eina_List *popup_list, *urgent_list; } gui; - int drag_resist, flip_desk, show_desk_names, disable_live_preview, live_windows; + int drag_resist, flip_desk, show_desk_names, disable_live_preview; }; /* local function prototypes */ @@ -105,7 +105,6 @@ _fill_data(E_Config_Dialog_Data *cfdata) cfdata->btn.desk = pager_config->btn_desk; cfdata->flip_desk = pager_config->flip_desk; cfdata->disable_live_preview = pager_config->disable_live_preview; - cfdata->live_windows = pager_config->live_windows; cfdata->show_desk_names = pager_config->show_desk_names; } @@ -132,12 +131,9 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data ow = e_widget_check_add(evas, _("Show desktop names"), &(cfdata->show_desk_names)); e_widget_framelist_object_append(of, ow); - ow = e_widget_check_add(evas, _("Disable desktop image preview"), + ow = e_widget_check_add(evas, _("Disable live preview"), &(cfdata->disable_live_preview)); e_widget_framelist_object_append(of, ow); - ow = e_widget_check_add(evas, _("Enable window preview (Needs Comp)"), - &(cfdata->live_windows)); - e_widget_framelist_object_append(of, ow); e_widget_list_object_append(ol, of, 1, 0, 0.5); of = e_widget_framelist_add(evas, _("Popup"), 0); @@ -158,7 +154,6 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) pager_config->popup = cfdata->popup.show; pager_config->flip_desk = cfdata->flip_desk; pager_config->disable_live_preview = cfdata->disable_live_preview; - pager_config->live_windows = cfdata->live_windows; pager_config->show_desk_names = cfdata->show_desk_names; pager_config->popup_urgent = cfdata->popup.urgent_show; _pager_cb_config_updated(); @@ -172,7 +167,6 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda if ((int)pager_config->popup != cfdata->popup.show) return 1; if ((int)pager_config->flip_desk != cfdata->flip_desk) return 1; if ((int)pager_config->disable_live_preview != cfdata->disable_live_preview) return 1; - if ((int)pager_config->live_windows != cfdata->live_windows) return 1; if ((int)pager_config->show_desk_names != cfdata->show_desk_names) return 1; if ((int)pager_config->popup_urgent != cfdata->popup.urgent_show) return 1; @@ -195,12 +189,9 @@ _adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *c ow = e_widget_check_add(evas, _("Show desktop names"), &(cfdata->show_desk_names)); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_check_add(evas, _("Disable desktop image preview"), + ow = e_widget_check_add(evas, _("Disable live preview"), &(cfdata->disable_live_preview)); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_check_add(evas, _("Enable window preview (Needs Comp)"), - &(cfdata->live_windows)); - e_widget_list_object_append(ol, ow, 1, 0, 0.5); ow = e_widget_label_add(evas, _("Resistance to dragging")); e_widget_list_object_append(ol, ow, 1, 0, 0.5); ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 0.0, 10.0, 1.0, 0, NULL, @@ -310,7 +301,6 @@ _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) pager_config->popup_speed = cfdata->popup.speed; pager_config->flip_desk = cfdata->flip_desk; pager_config->disable_live_preview = cfdata->disable_live_preview; - pager_config->live_windows = cfdata->live_windows; pager_config->popup_urgent = cfdata->popup.urgent_show; pager_config->popup_urgent_stick = cfdata->popup.urgent_stick; pager_config->popup_urgent_focus = cfdata->popup.urgent_focus; @@ -332,7 +322,6 @@ _adv_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata { if ((int)pager_config->popup != cfdata->popup.show) return 1; if ((int)pager_config->disable_live_preview != cfdata->disable_live_preview) return 1; - if ((int)pager_config->live_windows != cfdata->live_windows) return 1; if ((int)pager_config->show_desk_names != cfdata->show_desk_names) return 1; if ((int)pager_config->popup_urgent != cfdata->popup.urgent_show) return 1; if (pager_config->popup_speed != cfdata->popup.speed) return 1; diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c index 9968eebf8..0465af96a 100644 --- a/src/modules/pager/e_mod_main.c +++ b/src/modules/pager/e_mod_main.c @@ -48,7 +48,6 @@ struct _Pager unsigned char just_dragged : 1; Evas_Coord dnd_x, dnd_y; Pager_Desk *active_drop_pd; - Eina_Bool live_windows : 1; }; struct _Pager_Desk @@ -76,8 +75,6 @@ struct _Pager_Win Pager_Desk *desk; Evas_Object *o_window; Evas_Object *o_icon; - Evas_Object *o_mirror; - E_Msg_Handler *msg_handler; unsigned char skip_winlist : 1; struct { @@ -292,7 +289,6 @@ _pager_new(Evas *evas, E_Zone *zone) p = E_NEW(Pager, 1); p->inst = NULL; p->popup = NULL; - p->live_windows = pager_config->live_windows; p->o_table = e_table_add(evas); e_table_homogenous_set(p->o_table, 1); p->zone = zone; @@ -588,89 +584,6 @@ _pager_desk_switch(Pager_Desk *pd1, Pager_Desk *pd2) } } -static Evas_Object * -_pager_window_mirror_add(E_Manager *man, Evas *e, Evas_Object *edje, E_Manager_Comp_Source *src) -{ - Evas_Object *img, *o; - void *data; - int w, h; - if (!src) return NULL; - img = e_manager_comp_src_image_get(man, src); - o = evas_object_image_filled_add(e); - data = evas_object_image_data_get(img, EINA_FALSE); - evas_object_image_size_get(img, &w, &h); - evas_object_image_size_set(o, w, h); - evas_object_image_data_set(o, data); - edje_object_part_swallow(edje, "e.swallow.content", o); - edje_object_signal_emit(edje, "e,preview,on", "e"); - return o; -} - -static void -_pager_window_mirror_refresh(Pager_Win *pw, E_Manager_Comp_Source *src) -{ - if (pw->o_mirror) - { - edje_object_part_unswallow(pw->o_window, pw->o_mirror); - evas_object_del(pw->o_mirror); - pw->o_mirror = NULL; - } - pw->o_mirror = _pager_window_mirror_add(pw->border->zone->container->manager, evas_object_evas_get(pw->o_window), pw->o_window, src); -} - -static void -_pager_window_msg_handler(void *data, const char *name, const char *info, int val __UNUSED__, E_Object *obj, void *msgdata) -{ - E_Manager *man = (E_Manager*)obj; - E_Manager_Comp_Source *src = NULL; - Pager_Win *pw = data; - Evas *e; - - if (strcmp(name, "comp.manager")) return; - - e = e_manager_comp_evas_get(man); - if (!e) - { - _pager_window_mirror_refresh(pw, NULL); - return; - } - if (!strcmp(info, "change.comp")) - { - src = e_manager_comp_border_src_get(man, pw->border->client.win); - _pager_window_mirror_refresh(pw, src); - } - else if (!strcmp(info, "resize.comp")) - { - src = msgdata; - if (pw->border == e_manager_comp_src_border_get(man, src)) - _pager_window_mirror_refresh(pw, src); - } - else if (!strcmp(info, "add.src")) - { - src = msgdata; - if (pw->border == e_manager_comp_src_border_get(man, src)) - _pager_window_mirror_refresh(pw, src); - } - else if (!strcmp(info, "del.src")) - { - src = msgdata; - if (pw->border == e_manager_comp_src_border_get(man, src)) - _pager_window_mirror_refresh(pw, NULL); - } - else if (!strcmp(info, "config.src")) - { - src = msgdata; - if (pw->border == e_manager_comp_src_border_get(man, src)) - _pager_window_mirror_refresh(pw, src); - } - else if (!strcmp(info, "visibility.src")) - { - src = msgdata; - if (pw->border == e_manager_comp_src_border_get(man, src)) - _pager_window_mirror_refresh(pw, e_manager_comp_src_visible_get(man, src) ? src : NULL); - } -} - static Pager_Win * _pager_window_new(Pager_Desk *pd, E_Border *border) { @@ -693,29 +606,7 @@ _pager_window_new(Pager_Desk *pd, E_Border *border) pw->o_window = o; e_theme_edje_object_set(o, "base/theme/modules/pager", "e/modules/pager/window"); - if (!pager_config->live_windows) - { - edje_object_signal_emit(o, "e,preview,off", "e"); - o = e_border_icon_add(border, evas_object_evas_get(pd->pager->o_table)); - if (o) - { - pw->o_icon = o; - evas_object_show(o); - edje_object_part_swallow(pw->o_window, "e.swallow.icon", o); - } - } - else - { - if (e_manager_comp_evas_get(border->zone->container->manager)) - { - E_Manager_Comp_Source *src; - - src = e_manager_comp_border_src_get(border->zone->container->manager, border->client.win); - _pager_window_mirror_refresh(pw, src); - } - pw->msg_handler = e_msg_handler_add(_pager_window_msg_handler, pw); - } - if (visible) evas_object_show(pw->o_window); + if (visible) evas_object_show(o); e_layout_pack(pd->o_layout, pw->o_window); e_layout_child_raise(pw->o_window); @@ -726,6 +617,15 @@ _pager_window_new(Pager_Desk *pd, E_Border *border) _pager_window_cb_mouse_up, pw); evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _pager_window_cb_mouse_move, pw); + + o = e_border_icon_add(border, evas_object_evas_get(pd->pager->o_table)); + if (o) + { + pw->o_icon = o; + evas_object_show(o); + edje_object_part_swallow(pw->o_window, "e.swallow.icon", o); + } + if (border->client.icccm.urgent && !border->focused) { if (!(border->iconic)) @@ -746,8 +646,6 @@ _pager_window_free(Pager_Win *pw) pw->desk->pager->dragging = 0; if (pw->o_window) evas_object_del(pw->o_window); if (pw->o_icon) evas_object_del(pw->o_icon); - if (pw->o_mirror) evas_object_del(pw->o_mirror); - if (pw->msg_handler) e_msg_handler_del(pw->msg_handler); e_object_unref(E_OBJECT(pw->border)); E_FREE(pw); } @@ -985,33 +883,21 @@ _pager_cb_config_updated(void) Eina_List *l, *ll; if (!pager_config) return; EINA_LIST_FOREACH(pagers, l, p) - { - if (p->live_windows != pager_config->live_windows) - { - p->live_windows = pager_config->live_windows; - _pager_empty(p); - _pager_fill(p); - if (p->inst) _gc_orient(p->inst->gcc, p->inst->gcc->gadcon->orient); - } - else - { - EINA_LIST_FOREACH(p->desks, ll, pd) - { - if (pager_config->disable_live_preview) - edje_object_signal_emit(pd->o_desk, "e,preview,off", "e"); - else - edje_object_signal_emit(pd->o_desk, "e,preview,on", "e"); - if (pd->current) - edje_object_signal_emit(pd->o_desk, "e,state,selected", "e"); - else - edje_object_signal_emit(pd->o_desk, "e,state,unselected", "e"); - if (pager_config->show_desk_names) - edje_object_signal_emit(pd->o_desk, "e,name,show", "e"); - else - edje_object_signal_emit(pd->o_desk, "e,name,hide", "e"); - } - } - } + EINA_LIST_FOREACH(p->desks, ll, pd) + { + if (pager_config->disable_live_preview) + edje_object_signal_emit(pd->o_desk, "e,preview,off", "e"); + else + edje_object_signal_emit(pd->o_desk, "e,preview,on", "e"); + if (pd->current) + edje_object_signal_emit(pd->o_desk, "e,state,selected", "e"); + else + edje_object_signal_emit(pd->o_desk, "e,state,unselected", "e"); + if (pager_config->show_desk_names) + edje_object_signal_emit(pd->o_desk, "e,name,show", "e"); + else + edje_object_signal_emit(pd->o_desk, "e,name,hide", "e"); + } } static Eina_Bool @@ -1450,17 +1336,14 @@ _pager_cb_event_border_icon_change(void *data __UNUSED__, int type __UNUSED__, v evas_object_del(pw->o_icon); pw->o_icon = NULL; } - if (!pager_config->live_windows) + o = e_border_icon_add(ev->border, + evas_object_evas_get(p->o_table)); + if (o) { - o = e_border_icon_add(ev->border, - evas_object_evas_get(p->o_table)); - if (o) - { - pw->o_icon = o; - evas_object_show(o); - edje_object_part_swallow(pw->o_window, - "e.swallow.icon", o); - } + pw->o_icon = o; + evas_object_show(o); + edje_object_part_swallow(pw->o_window, + "e.swallow.icon", o); } } } @@ -1975,26 +1858,13 @@ _pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __U "e/modules/pager/window"); evas_object_show(o); - if (!pager_config->live_windows) + oo = e_border_icon_add(pw->border, drag->evas); + if (oo) { - oo = e_border_icon_add(pw->border, drag->evas); - if (oo) - { - evas_object_show(oo); - edje_object_part_swallow(o, "e.swallow.icon", oo); - } - edje_object_signal_emit(o, "e,preview,off", "e"); + evas_object_show(oo); + edje_object_part_swallow(o, "e.swallow.icon", oo); } - else - { - if (e_manager_comp_evas_get(pw->border->zone->container->manager)) - { - E_Manager_Comp_Source *src; - src = e_manager_comp_border_src_get(pw->border->zone->container->manager, pw->border->client.win); - _pager_window_mirror_add(pw->border->zone->container->manager, drag->evas, o, src); - } - } e_drag_object_set(drag, o); e_drag_resize(drag, w, h); e_drag_start(drag, x - pw->drag.dx, y - pw->drag.dy); @@ -2387,16 +2257,6 @@ _pager_desk_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU o = edje_object_add(drag->evas); e_theme_edje_object_set(o, "base/theme/modules/pager", "e/modules/pager/window"); - if (pager_config->live_windows) - { - if (e_manager_comp_evas_get(pw->border->zone->container->manager)) - { - E_Manager_Comp_Source *src; - - src = e_manager_comp_border_src_get(pw->border->zone->container->manager, pw->border->client.win); - _pager_window_mirror_add(pw->border->zone->container->manager, drag->evas, o, src); - } - } e_layout_pack(oo, o); e_layout_child_raise(o); e_zone_useful_geometry_get(pw->desk->desk->zone, @@ -2888,7 +2748,6 @@ e_modapi_init(E_Module *m) E_CONFIG_VAL(D, T, btn_desk, UCHAR); E_CONFIG_VAL(D, T, flip_desk, UCHAR); E_CONFIG_VAL(D, T, disable_live_preview, UCHAR); - E_CONFIG_VAL(D, T, live_windows, UCHAR); pager_config = e_config_domain_load("module.pager", conf_edd); @@ -2923,7 +2782,6 @@ e_modapi_init(E_Module *m) E_CONFIG_LIMIT(pager_config->btn_noplace, 0, 32); E_CONFIG_LIMIT(pager_config->btn_desk, 0, 32); E_CONFIG_LIMIT(pager_config->disable_live_preview, 0, 1); - E_CONFIG_LIMIT(pager_config->live_windows, 0, 1); pager_config->handlers = eina_list_append (pager_config->handlers, ecore_event_handler_add diff --git a/src/modules/pager/e_mod_main.h b/src/modules/pager/e_mod_main.h index f14a69674..fc1d1f455 100644 --- a/src/modules/pager/e_mod_main.h +++ b/src/modules/pager/e_mod_main.h @@ -32,7 +32,6 @@ struct _Config unsigned int btn_desk; unsigned int flip_desk; unsigned int disable_live_preview; - unsigned int live_windows; /* just config state */ E_Module *module;