From 88af43001e383c386322455c9adea0200131e302 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 18 Mar 2015 18:17:02 -0400 Subject: [PATCH] remove contact module this is dead. dead code does not belong in master. see devs/discomfitor/e_module-contact.git --- configure.ac | 2 - src/modules/Makefile.mk | 2 - src/modules/Makefile_contact.mk | 25 -- src/modules/contact/e-module-contact.edj | Bin 9866 -> 0 bytes src/modules/contact/e_edges.c | 241 ------------------- src/modules/contact/e_edges.h | 20 -- src/modules/contact/e_mod_main.c | 133 ----------- src/modules/contact/e_mod_main.h | 8 - src/modules/contact/e_policy.c | 285 ----------------------- src/modules/contact/e_policy.h | 10 - src/modules/contact/module.desktop.in | 17 -- 11 files changed, 743 deletions(-) delete mode 100644 src/modules/Makefile_contact.mk delete mode 100644 src/modules/contact/e-module-contact.edj delete mode 100644 src/modules/contact/e_edges.c delete mode 100644 src/modules/contact/e_edges.h delete mode 100644 src/modules/contact/e_mod_main.c delete mode 100644 src/modules/contact/e_mod_main.h delete mode 100644 src/modules/contact/e_policy.c delete mode 100644 src/modules/contact/e_policy.h delete mode 100644 src/modules/contact/module.desktop.in diff --git a/configure.ac b/configure.ac index 580e4492b..cf1fdf0cf 100644 --- a/configure.ac +++ b/configure.ac @@ -960,7 +960,6 @@ AC_E_OPTIONAL_MODULE([tiling], true) #AC_E_OPTIONAL_MODULE([access], false, $ecore_x) AC_E_OPTIONAL_MODULE([music_control], true, [CHECK_MODULE_MUSIC_CONTROL]) AC_E_OPTIONAL_MODULE([packagekit], true) -AC_E_OPTIONAL_MODULE([contact], false) AC_E_OPTIONAL_MODULE([wl_desktop_shell], $have_wayland, [CHECK_MODULE_WL_DESKTOP_SHELL]) AC_E_OPTIONAL_MODULE([wl_x11], $have_wayland, $wl_x11) AC_E_OPTIONAL_MODULE([wl_fb], $have_wayland, [CHECK_MODULE_WL_FB]) @@ -1094,7 +1093,6 @@ src/modules/xkbswitch/module.desktop src/modules/tiling/module.desktop src/modules/music-control/module.desktop src/modules/packagekit/module.desktop -src/modules/contact/module.desktop src/modules/wl_desktop_shell/module.desktop src/modules/wl_screenshot/module.desktop data/xsession/enlightenment.desktop diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk index 6efe674eb..a1acd78e8 100644 --- a/src/modules/Makefile.mk +++ b/src/modules/Makefile.mk @@ -119,8 +119,6 @@ include src/modules/Makefile_music_control.mk include src/modules/Makefile_packagekit.mk -include src/modules/Makefile_contact.mk - include src/modules/Makefile_wl_drm.mk include src/modules/Makefile_wl_desktop_shell.mk diff --git a/src/modules/Makefile_contact.mk b/src/modules/Makefile_contact.mk deleted file mode 100644 index 2e949d197..000000000 --- a/src/modules/Makefile_contact.mk +++ /dev/null @@ -1,25 +0,0 @@ -EXTRA_DIST += src/modules/contact/module.desktop.in \ -src/modules/contact/e-module-contact.edj -if USE_MODULE_CONTACT -contactdir = $(MDIR)/contact -contact_DATA = src/modules/contact/e-module-contact.edj \ - src/modules/contact/module.desktop - -contactpkgdir = $(MDIR)/contact/$(MODULE_ARCH) -contactpkg_LTLIBRARIES = src/modules/contact/module.la - -src_modules_contact_module_la_LIBADD = $(MOD_LIBS) -src_modules_contact_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X -src_modules_contact_module_la_LDFLAGS = $(MOD_LDFLAGS) -src_modules_contact_module_la_SOURCES = src/modules/contact/e_mod_main.c \ - src/modules/contact/e_mod_main.h \ - src/modules/contact/e_policy.c \ - src/modules/contact/e_policy.h \ - src/modules/contact/e_edges.c \ - src/modules/contact/e_edges.h - -# TODO: incomplete -PHONIES += contact install-contact -contact: $(contactpkg_LTLIBRARIES) $(contact_DATA) -install-contact: install-contactDATA install-contactpkgLTLIBRARIES -endif diff --git a/src/modules/contact/e-module-contact.edj b/src/modules/contact/e-module-contact.edj deleted file mode 100644 index 43d8150811faab5905a49adb0dd541d03b3b1025..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9866 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 NOrMyszones, l, zone) - { - Edgeset *es = _edgeset_new(zone); - - if (es) edges = eina_list_append(edges, es); - } -} - -void -e_edges_shutdown(void) -{ - Edgeset *es; - Edgehandler *eh; - - EINA_LIST_FREE(edges, es) _edgeset_free(es); - EINA_LIST_FREE(handlers, eh) free(eh); -} - -void -e_edges_handler_set(E_Edges_Event event, void (*func) (void *data, int d, double v), void *data) -{ - Edgehandler *eh; - - eh = _handler_find(event); - if (!eh) - { - eh = calloc(1, sizeof(*eh)); - if (!eh) return; - handlers = eina_list_append(handlers, eh); - } - eh->event = event; - eh->func = func; - eh->data = data; -} - -static Edgehandler * -_handler_find(E_Edges_Event event) -{ - Eina_List *l; - Edgehandler *eh; - - EINA_LIST_FOREACH(handlers, l, eh) - { - if (eh->event == event) - { - handlers = eina_list_promote_list(handlers, l); - return eh; - } - } - return NULL; -} - -static void -_handler_call(E_Edges_Event event, int d, double v) -{ - Edgehandler *eh = _handler_find(event); - - if (!eh) return; - if (!eh->func) return; - eh->func(eh->data, d, v); -} - -static Evas_Object * -_input_obj(Edgeset *es, int x, int y, int w, int h) -{ - Evas_Object *o = evas_object_rectangle_add(e_comp->evas); - evas_object_color_set(o, 0, 0, 0, 0); - evas_object_move(o, x, y); - evas_object_resize(o, w, h); - evas_object_layer_set(o, 999); - evas_object_show(o); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _cb_down, es); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _cb_up, es); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _cb_move, es); - return o; -} - -static Edgeset * -_edgeset_new(E_Zone *zone) -{ - Edgeset *es = calloc(1, sizeof(*es)); - - if (!es) return NULL; - es->zone = zone; - - es->t.obj = _input_obj(es, zone->x, zone->y, zone->w, 8); - es->b.obj = _input_obj(es, zone->x, zone->y + zone->h - 8, zone->w, 8); - es->l.obj = _input_obj(es, zone->x, zone->y, 8, zone->h); - es->r.obj = _input_obj(es, zone->x + zone->w - 8, zone->y, 8, zone->h); - return es; -} - -static void -_edgeset_free(Edgeset *es) -{ - evas_object_del(es->t.obj); - evas_object_del(es->b.obj); - evas_object_del(es->l.obj); - evas_object_del(es->r.obj); - free(es); -} - -static void -_cb_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) -{ - Edgeset *es = data; - Evas_Event_Mouse_Down *ev = event; - if (ev->button != 1) return; - es->down.button = ev->button; - es->down.x = ev->canvas.x; - es->down.y = ev->canvas.y; - es->down.recognized = EINA_FALSE; -} - -static void -_cb_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) -{ - Edgeset *es = data; - Evas_Event_Mouse_Up *ev = event; - if (ev->button != 1) return; - es->down.button = 0; -} - -static void -_cb_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event) -{ - Edgeset *es = data; - Evas_Event_Mouse_Move *ev = event; - int dx, dy, d; - double v; - - if (!es->down.button) return; - dx = ev->cur.canvas.x - es->down.x; - dy = ev->cur.canvas.y - es->down.y; - d = 40; - if (obj == es->l.obj) - { - if ((!es->down.recognized) && (dx > d) && (abs(dy) < d)) - { - es->down.recognized = EINA_TRUE; - _handler_call(E_EDGES_LEFT_IN_BEGIN, 0, 0); - } - if (es->down.recognized) - { - d = (dx - d); - if (d < 0) d = 0; - if (es->zone->w > 1) v = (double)d / (es->zone->w / 2); - else v = 1.0; - _handler_call(E_EDGES_LEFT_IN_SLIDE, d, v); - } - } - else if (obj == es->r.obj) - { - if ((!es->down.recognized) && (-dx > d) && (abs(dy) < d)) - { - es->down.recognized = EINA_TRUE; - _handler_call(E_EDGES_RIGHT_IN_BEGIN, 0, 0); - } - if (es->down.recognized) - { - d = (-dx - d); - if (d < 0) d = 0; - if (es->zone->w > 1) v = (double)d / (es->zone->w / 2); - else v = 1.0; - _handler_call(E_EDGES_RIGHT_IN_SLIDE, d, v); - } - } - else if (obj == es->t.obj) - { - if ((!es->down.recognized) && (dy > d) && (abs(dx) < d)) - { - es->down.recognized = EINA_TRUE; - _handler_call(E_EDGES_TOP_IN_BEGIN, 0, 0); - } - if (es->down.recognized) - { - d = (dy - d); - if (d < 0) d = 0; - if (es->zone->h > 1) v = (double)d / (es->zone->h / 2); - else v = 1.0; - _handler_call(E_EDGES_TOP_IN_SLIDE, d, v); - } - } - else if (obj == es->b.obj) - { - if ((!es->down.recognized) && (-dy > d) && (abs(dx) < d)) - { - es->down.recognized = EINA_TRUE; - _handler_call(E_EDGES_BOTTOM_IN_BEGIN, 0, 0); - } - if (es->down.recognized) - { - d = (-dy - d); - if (d < 0) d = 0; - if (es->zone->h > 1) v = (double)d / (es->zone->h / 2); - else v = 1.0; - _handler_call(E_EDGES_BOTTOM_IN_SLIDE, d, v); - } - } -} diff --git a/src/modules/contact/e_edges.h b/src/modules/contact/e_edges.h deleted file mode 100644 index 3f8fad28b..000000000 --- a/src/modules/contact/e_edges.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef E_EDGES_H -# define E_EDGES_H - -typedef enum -{ - E_EDGES_LEFT_IN_BEGIN, - E_EDGES_RIGHT_IN_BEGIN, - E_EDGES_TOP_IN_BEGIN, - E_EDGES_BOTTOM_IN_BEGIN, - E_EDGES_LEFT_IN_SLIDE, - E_EDGES_RIGHT_IN_SLIDE, - E_EDGES_TOP_IN_SLIDE, - E_EDGES_BOTTOM_IN_SLIDE -} E_Edges_Event; - -void e_edges_init(void); -void e_edges_shutdown(void); -void e_edges_handler_set(E_Edges_Event event, void (*func) (void *data, int d, double v), void *data); - -#endif diff --git a/src/modules/contact/e_mod_main.c b/src/modules/contact/e_mod_main.c deleted file mode 100644 index 90784a8d2..000000000 --- a/src/modules/contact/e_mod_main.c +++ /dev/null @@ -1,133 +0,0 @@ -#include "e_mod_main.h" - -EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Contact" }; - -static void -_cb_in_left(void *data EINA_UNUSED, int d EINA_UNUSED, double v EINA_UNUSED) -{ - // show PREV window in list from urrent focused window on top of current - // window but in an inital "off to the right" state in comp - Eina_List *clients = (Eina_List *)e_policy_clients_get(); - E_Client *ec_active = (E_Client *)e_policy_client_active_get(); - E_Client *ec = NULL; - Eina_List *ec_active_l = NULL; - if (!ec_active) - { - if (!clients) return; - ec = eina_list_last(clients)->data; - } - if (!ec) - { - if (ec_active) - ec_active_l = eina_list_data_find_list(clients, ec_active); - if ((ec_active_l) && (ec_active_l->prev)) ec = ec_active_l->prev->data; - } - if ((!ec) && (ec_active)) - { - e_client_iconify(ec_active); - return; - } - if (!ec) return; - e_client_activate(ec, EINA_TRUE); -} - -static void -_cb_in_left_go(void *data EINA_UNUSED, int d EINA_UNUSED, double v EINA_UNUSED) -{ - // as v > 0 (and heads towards 1.0) flip/slide new window in unbtil v > 1.0 - // and once over 1.0 just do transition until end -} - -static void -_cb_in_right(void *data EINA_UNUSED, int d EINA_UNUSED, double v EINA_UNUSED) -{ - // show NEXT window in list from urrent focused window on top of current - // window but in an inital "off to the right" state in comp - Eina_List *clients = (Eina_List *)e_policy_clients_get(); - E_Client *ec_active = (E_Client *)e_policy_client_active_get(); - E_Client *ec = NULL; - Eina_List *ec_active_l = NULL; - if (!ec_active) - { - if (!clients) return; - ec = clients->data; - } - if (!ec) - { - if (ec_active) - ec_active_l = eina_list_data_find_list(clients, ec_active); - if ((ec_active_l) && (ec_active_l->next)) ec = ec_active_l->next->data; - } - if ((!ec) && (ec_active)) - { - e_client_iconify(ec_active); - return; - } - if (!ec) return; - e_client_activate(ec, EINA_TRUE); -} - -static void -_cb_in_right_go(void *data EINA_UNUSED, int d EINA_UNUSED, double v EINA_UNUSED) -{ - // as v > 0 (and heads towards 1.0) flip/slide new window in unbtil v > 1.0 - // and once over 1.0 just do transition until end -} - -static void -_cb_in_top(void *data EINA_UNUSED, int d EINA_UNUSED, double v EINA_UNUSED) -{ - // show/populate top controls if not already there and start in offscreen - // state and beign slide in anim and place controls at final spot -} - -static void -_cb_in_top_go(void *data EINA_UNUSED, int d EINA_UNUSED, double v EINA_UNUSED) -{ - // for now nothing - but animation would be nice for top controls -} - -static void -_cb_in_bottom(void *data EINA_UNUSED, int d EINA_UNUSED, double v EINA_UNUSED) -{ - // force kbd activation if no kbd - e_policy_kbd_override_set(EINA_TRUE); - // if kbd already up... hmmm show app menu? -} - -static void -_cb_in_bottom_go(void *data EINA_UNUSED, int d EINA_UNUSED, double v EINA_UNUSED) -{ - // for now nothing - but slide animation is nice -} - -EAPI void * -e_modapi_init(E_Module *m EINA_UNUSED) -{ - e_policy_init(); - e_edges_init(); - - e_edges_handler_set(E_EDGES_LEFT_IN_BEGIN, _cb_in_left, NULL); - e_edges_handler_set(E_EDGES_LEFT_IN_SLIDE, _cb_in_left_go, NULL); - e_edges_handler_set(E_EDGES_RIGHT_IN_BEGIN, _cb_in_right, NULL); - e_edges_handler_set(E_EDGES_RIGHT_IN_SLIDE, _cb_in_right_go, NULL); - e_edges_handler_set(E_EDGES_TOP_IN_BEGIN, _cb_in_top, NULL); - e_edges_handler_set(E_EDGES_TOP_IN_SLIDE, _cb_in_top_go, NULL); - e_edges_handler_set(E_EDGES_BOTTOM_IN_BEGIN, _cb_in_bottom, NULL); - e_edges_handler_set(E_EDGES_BOTTOM_IN_SLIDE, _cb_in_bottom_go, NULL); - return m; -} - -EAPI int -e_modapi_shutdown(E_Module *m EINA_UNUSED) -{ - e_edges_shutdown(); - e_policy_shutdown(); - return 1; -} - -EAPI int -e_modapi_save(E_Module *m EINA_UNUSED) -{ - return 1; -} diff --git a/src/modules/contact/e_mod_main.h b/src/modules/contact/e_mod_main.h deleted file mode 100644 index 8e1527af3..000000000 --- a/src/modules/contact/e_mod_main.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef E_MOD_MAIN_H -# define E_MOD_MAIN_H - -# include "e.h" -# include "e_policy.h" -# include "e_edges.h" - -#endif diff --git a/src/modules/contact/e_policy.c b/src/modules/contact/e_policy.c deleted file mode 100644 index 473ade7ed..000000000 --- a/src/modules/contact/e_policy.c +++ /dev/null @@ -1,285 +0,0 @@ -#define E_COMP_X - -#include "e_mod_main.h" - -static Eina_Bool _cb_event_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); -static Eina_Bool _cb_event_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); -static Eina_Bool _cb_event_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); -static Eina_Bool _cb_event_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); -static void _cb_hook_post_fetch(void *data EINA_UNUSED, E_Client *ec); -static void _cb_hook_post_assign(void *data EINA_UNUSED, E_Client *ec); -static void _cb_hook_layout(void); - -static Eina_List *hooks = NULL; -static Eina_List *handlers = NULL; - -static Eina_Bool kbd_on = EINA_FALSE; -static Eina_Bool kbd_override = EINA_FALSE; -static Eina_List *clients = NULL; -static E_Client *ec_active = NULL; - -#define LADD(l, f) l = eina_list_append(l, f) - -void -e_policy_init(void) -{ - LADD(hooks, e_client_hook_add(E_CLIENT_HOOK_EVAL_POST_FETCH, - _cb_hook_post_fetch, NULL)); - LADD(hooks, e_client_hook_add(E_CLIENT_HOOK_EVAL_POST_FRAME_ASSIGN, - _cb_hook_post_assign, NULL)); - LADD(handlers, ecore_event_handler_add(E_EVENT_CLIENT_ADD, - _cb_event_add, NULL)); - LADD(handlers, ecore_event_handler_add(E_EVENT_CLIENT_REMOVE, - _cb_event_del, NULL)); - LADD(handlers, ecore_event_handler_add(E_EVENT_CLIENT_FOCUS_IN, - _cb_event_focus_in, NULL)); - LADD(handlers, ecore_event_handler_add(E_EVENT_CLIENT_FOCUS_OUT, - _cb_event_focus_out, NULL)); - e_client_layout_cb_set((E_Client_Layout_Cb)_cb_hook_layout); -} - -void -e_policy_shutdown(void) -{ - E_Client_Hook *bh; - Ecore_Event_Handler *eh; - - EINA_LIST_FREE(hooks, bh) e_client_hook_del(bh); - EINA_LIST_FREE(handlers, eh) ecore_event_handler_del(eh); - e_client_layout_cb_set(NULL); -} - -void -e_policy_kbd_override_set(Eina_Bool override) -{ - const Eina_List *l; - E_Client *ec, *kbd = NULL;; - - if (kbd_override == override) return; - kbd_override = override; - EINA_LIST_FOREACH(e_comp->clients, l, ec) - { - if (ec->vkbd.vkbd) - { - kbd = ec; - } - } - if (kbd) - { - ec = kbd; - e_client_uniconify(ec); - evas_object_raise(ec->frame); - evas_object_show(ec->frame); - } -} - -const Eina_List * -e_policy_clients_get(void) -{ - return clients; -} - -const E_Client * -e_policy_client_active_get(void) -{ - return ec_active; -} - -static Eina_Bool -_cb_event_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) -{ - E_Event_Client *ev = event; - E_Client *ec = ev->ec; - - if (ec_active) clients = eina_list_append_relative(clients, ec, ec_active); - else clients = eina_list_prepend(clients, ec); - return ECORE_CALLBACK_PASS_ON; -} - -static Eina_Bool -_cb_event_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) -{ - E_Event_Client *ev = event; - E_Client *ec = ev->ec; - - clients = eina_list_remove(clients, ec); - if (ec_active == ec) ec_active = NULL; - return ECORE_CALLBACK_PASS_ON; -} - -static Eina_Bool -_cb_event_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) -{ - E_Event_Client *ev = event; - E_Client *ec = ev->ec; - - ec_active = ec; - return ECORE_CALLBACK_PASS_ON; -} - -static Eina_Bool -_cb_event_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) -{ - E_Event_Client *ev = event; - E_Client *ec = ev->ec; - - if (ec_active == ec) ec_active = NULL; - if (kbd_on) e_policy_kbd_override_set(EINA_FALSE); - return ECORE_CALLBACK_PASS_ON; -} - -static void -_cb_hook_post_fetch(void *data EINA_UNUSED, E_Client *ec) -{ - /* NB: for this policy we disable all remembers set on a client */ - if (ec->remember) e_remember_del(ec->remember); - ec->remember = NULL; - - /* set this client to borderless */ - ec->borderless = 1; - EC_CHANGED(ec); -} - -static void -_cb_hook_post_assign(void *data EINA_UNUSED, E_Client *ec) -{ - ec->internal_no_remember = 1; - - /* do not allow client to change these properties */ - ec->lock_client_size = 1; - ec->lock_client_shade = 1; - ec->lock_client_maximize = 1; - ec->lock_client_location = 1; - ec->lock_client_stacking = 1; - - /* do not allow the user to change these properties */ - ec->lock_user_location = 1; - ec->lock_user_size = 1; - ec->lock_user_shade = 1; - - /* clear any centered states */ - /* NB: this is mainly needed for E's main config dialog */ - ec->e.state.centered = 0; - - /* lock the border type so user/client cannot change */ - ec->lock_border = 1; -} - -static void -_cb_hook_layout(void) -{ - Eina_List *l; - E_Client *ec, *kbd = NULL;; - Eina_Bool want_kbd = EINA_FALSE; - Eina_Bool have_focused = EINA_FALSE; - int kx = 0, ky = 0, kw = 0, kh = 0; - - EINA_LIST_FOREACH(e_comp->clients, l, ec) - { - if (e_client_util_ignored_get(ec)) continue; - if (ec->focused) have_focused = EINA_TRUE; -#ifndef HAVE_WAYLAND_ONLY - if ((ec->focused) && - (ec->vkbd.state > ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF)) - want_kbd = EINA_TRUE; - if (ec->vkbd.vkbd) kbd = ec; -#endif - } - - if ((have_focused) && (kbd_override)) want_kbd = EINA_TRUE; - - if (kbd) - { - kw = kbd->zone->w; - kh = kbd->icccm.min_h; - kx = kbd->zone->x; - ky = kbd->zone->y + kbd->zone->h - kh; - } - EINA_LIST_FOREACH(e_comp->clients, l, ec) - { - int x, y, w, h; - - if (!ec->zone) continue; - if (e_client_util_ignored_get(ec)) continue; - - w = ec->zone->w; - h = ec->zone->h; - x = ec->zone->x; - y = ec->zone->y; - - if (ec->vkbd.vkbd) - { - x = kx; y = ky; w = kw; h = kh; - if (want_kbd) - { - e_client_uniconify(ec); - evas_object_raise(ec->frame); - evas_object_show(ec->frame); - } - else - { - e_client_iconify(ec); - } - } - else if (((ec->netwm.type == E_WINDOW_TYPE_DIALOG) || - (ec->icccm.transient_for != 0)) && - ((ec->icccm.min_w == ec->icccm.max_w) && - (ec->icccm.min_h == ec->icccm.max_h))) - { - // center dialog at min size - w = ec->icccm.min_w; - h = ec->icccm.min_h; - if (w > (ec->zone->w)) w = ec->zone->w; - if (h > (ec->zone->h - kh)) h = (ec->zone->h - kh); - x = ec->zone->x + ((ec->zone->w - w) / 2); - y = ec->zone->y + ((ec->zone->h - kh - h) / 2); - } - else - { -#warning X ONLY! SPANK! SPANK! SPANK!!! - if (ec->comp_data->illume.conformant.conformant) - { - if (kbd_on != want_kbd) - { - if (want_kbd) - ecore_x_e_illume_keyboard_geometry_set(e_client_util_win_get(ec), - kx, ky, kw, kh); - else - ecore_x_e_illume_keyboard_geometry_set(e_client_util_win_get(ec), - 0, 0, 0, 0); - } - } - else - { - // just make all windows fill the zone... - if (want_kbd) - { - w = ec->zone->w; - h = ec->zone->h - kh; - x = ec->zone->x; - y = ec->zone->y; - } - } - } - - // implement the positioning/sizing - if ((ec->x != x) || (ec->y != y)) - { - ec->placed = 1; - ec->x = x; - ec->y = y; - ec->changes.pos = 1; - EC_CHANGED(ec); - } - if ((ec->w != w) || (ec->h != h)) - { - ec->w = w; - ec->h = h; - e_comp_object_frame_wh_unadjust(ec->frame, ec->w, ec->h, &ec->client.w, &ec->client.h); - ec->changes.size = 1; - EC_CHANGED(ec); - } - } - - kbd_on = want_kbd; -} diff --git a/src/modules/contact/e_policy.h b/src/modules/contact/e_policy.h deleted file mode 100644 index 9f8a8ed3c..000000000 --- a/src/modules/contact/e_policy.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef E_POLICY_H -# define E_POLICY_H - -void e_policy_init(void); -void e_policy_shutdown(void); -void e_policy_kbd_override_set(Eina_Bool override); -const Eina_List *e_policy_clients_get(void); -const E_Client *e_policy_client_active_get(void); - -#endif diff --git a/src/modules/contact/module.desktop.in b/src/modules/contact/module.desktop.in deleted file mode 100644 index 928c24713..000000000 --- a/src/modules/contact/module.desktop.in +++ /dev/null @@ -1,17 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Link -Name=Contact -Name[ca]=Contacteu -Name[de]=Kontakt -Name[eo]=Kontakto -Name[fr]=Contact -Name[gl]=Contacto -Name[ja]=コンタクト -Name[ms]=Kenalan -Name[pl]=Kontakt -Name[sr]=Веза -Name[tr]=Kişiler -Comment= -Icon=e-module-contact -X-Enlightenment-ModuleType=mobile