Pager Gadget: Introduce pager gadget using new gadget api.devs/okra/pager

8 files changed, 2745 insertions, 51 deletions

diff --git a/src/modules/Makefile_pager.mk b/src/modules/Makefile_pager.mk
index a77198e848..7c34f7d1b6 100644
--- a/src/modules/Makefile_pager.mk
+++ b/src/modules/Makefile_pager.mk
@@ -5,16 +5,19 @@ pagerdir = $(MDIR)/pager
 pager_DATA = src/modules/pager/e-module-pager.edj \
 	     src/modules/pager/module.desktop
 
-
 pagerpkgdir = $(MDIR)/pager/$(MODULE_ARCH)
 pagerpkg_LTLIBRARIES = src/modules/pager/module.la
 
 src_modules_pager_module_la_LIBADD = $(MOD_LIBS)
-src_modules_pager_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
+src_modules_pager_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -Wall -Wextra -Wshadow
 src_modules_pager_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_pager_module_la_SOURCES = src/modules/pager/e_mod_main.h \
 			  src/modules/pager/e_mod_main.c \
-			  src/modules/pager/e_mod_config.c
+			  src/modules/pager/e_mod_config.c \
+                          src/modules/pager/gadget/pager.h \
+                          src/modules/pager/gadget/pager.c \
+                          src/modules/pager/gadget/mod.c \
+                          src/modules/pager/gadget/config.c
 
 PHONIES += pager install-pager
 pager: $(pagerpkg_LTLIBRARIES) $(pager_DATA)
diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c
index 391c0ca4b6..5d57051a29 100644
--- a/src/modules/pager/e_mod_config.c
+++ b/src/modules/pager/e_mod_config.c
@@ -70,10 +70,10 @@ _config_pager_module(Config_Item *ci)
    v->advanced.check_changed = _adv_check_changed;
 
    snprintf(buff, sizeof(buff), "%s/e-module-pager.edj",
-            pager_config->module->dir);
+            module->dir);
    cfd = e_config_dialog_new(NULL, _("Pager Settings"), "E",
                              "_e_mod_pager_config_dialog", buff, 0, v, ci);
-   pager_config->config_dialog = cfd;
+   config_dialog = cfd;
 }
 
 /* local function prototypes */
@@ -111,7 +111,7 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
 {
    cfdata->gui.popup_list = eina_list_free(cfdata->gui.popup_list);
    cfdata->gui.urgent_list = eina_list_free(cfdata->gui.urgent_list);
-   pager_config->config_dialog = NULL;
+   config_dialog = NULL;
    E_FREE(cfdata);
 }
 
@@ -153,6 +153,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
    pager_config->show_desk_names = cfdata->show_desk_names;
    pager_config->popup_urgent = cfdata->popup.urgent_show;
    _pager_cb_config_updated();
+   _pager_cb_config_gadget_updated();
    e_config_save_queue();
    return 1;
 }
@@ -306,6 +307,7 @@ _adv_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
    pager_config->btn_noplace = cfdata->btn.noplace;
    pager_config->btn_desk = cfdata->btn.desk;
    _pager_cb_config_updated();
+   _pager_cb_config_gadget_updated();
    e_config_save_queue();
    return 1;
 }
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 3bde8977bd..a3a1963a14 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -167,8 +167,9 @@ static E_Desk *current_desk = NULL;
 static E_Config_DD *conf_edd = NULL;
 static Eina_List *pagers = NULL;
 
-Config *pager_config = NULL;
-
+E_Module *module;
+E_Config_Dialog *config_dialog;
+Eina_List *instances, *shandlers;
 
 static Pager_Win *
 _pager_desk_window_find(Pager_Desk *pd, E_Client *client)
@@ -240,7 +241,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
                                   _pager_cb_obj_show, inst);
    evas_object_event_callback_add(o, EVAS_CALLBACK_HIDE,
                                   _pager_cb_obj_hide, inst);
-   pager_config->instances = eina_list_append(pager_config->instances, inst);
+   instances = eina_list_append(instances, inst);
    return gcc;
 }
 
@@ -251,7 +252,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
 
    inst = gcc->data;
    if (pager_config)
-     pager_config->instances = eina_list_remove(pager_config->instances, inst);
+     instances = eina_list_remove(instances, inst);
    e_drop_handler_del(inst->pager->drop_handler);
    _pager_free(inst->pager);
    free(inst);
@@ -299,7 +300,7 @@ _gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas)
 
    o = edje_object_add(evas);
    snprintf(buf, sizeof(buf), "%s/e-module-pager.edj",
-            e_module_dir_get(pager_config->module));
+            e_module_dir_get(module));
    edje_object_file_set(o, buf, "icon");
    return o;
 }
@@ -310,7 +311,7 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class)
    static char buf[4096];
 
    snprintf(buf, sizeof(buf), "%s.%d", client_class->name,
-            eina_list_count(pager_config->instances) + 1);
+            eina_list_count(instances) + 1);
    return buf;
 }
 
@@ -908,7 +909,7 @@ static void
 _pager_inst_cb_menu_configure(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED)
 {
    if (!pager_config) return;
-   if (pager_config->config_dialog) return;
+   if (config_dialog) return;
    /* FIXME: pass zone config item */
    _config_pager_module(NULL);
 }
@@ -917,10 +918,10 @@ static E_Config_Dialog *
 _pager_config_dialog(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED)
 {
    if (!pager_config) return NULL;
-   if (pager_config->config_dialog) return NULL;
+   if (config_dialog) return NULL;
    /* FIXME: pass zone config item */
    _config_pager_module(NULL);
-   return pager_config->config_dialog;
+   return config_dialog;
 }
 
 static void
@@ -2040,6 +2041,7 @@ e_modapi_init(E_Module *m)
 {
    E_Module *p;
 
+   e_modapi_gadget_init(m);
    p = e_module_find("pager_plain");
    if (p && p->enabled)
      {
@@ -2098,13 +2100,13 @@ 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_LIST_HANDLER_APPEND(pager_config->handlers, E_EVENT_ZONE_DESK_COUNT_SET, _pager_cb_event_zone_desk_count_set, NULL);
-   E_LIST_HANDLER_APPEND(pager_config->handlers, E_EVENT_DESK_SHOW, _pager_cb_event_desk_show, NULL);
-   E_LIST_HANDLER_APPEND(pager_config->handlers, E_EVENT_DESK_NAME_CHANGE, _pager_cb_event_desk_name_change, NULL);
-   E_LIST_HANDLER_APPEND(pager_config->handlers, E_EVENT_COMPOSITOR_RESIZE, _pager_cb_event_compositor_resize, NULL);
-   E_LIST_HANDLER_APPEND(pager_config->handlers, E_EVENT_CLIENT_PROPERTY, _pager_cb_event_client_urgent_change, NULL);
+   E_LIST_HANDLER_APPEND(shandlers, E_EVENT_ZONE_DESK_COUNT_SET, _pager_cb_event_zone_desk_count_set, NULL);
+   E_LIST_HANDLER_APPEND(shandlers, E_EVENT_DESK_SHOW, _pager_cb_event_desk_show, NULL);
+   E_LIST_HANDLER_APPEND(shandlers, E_EVENT_DESK_NAME_CHANGE, _pager_cb_event_desk_name_change, NULL);
+   E_LIST_HANDLER_APPEND(shandlers, E_EVENT_COMPOSITOR_RESIZE, _pager_cb_event_compositor_resize, NULL);
+   E_LIST_HANDLER_APPEND(shandlers, E_EVENT_CLIENT_PROPERTY, _pager_cb_event_client_urgent_change, NULL);
 
-   pager_config->module = m;
+   module = m;
 
    e_gadcon_provider_register(&_gadcon_class);
 
@@ -2140,13 +2142,14 @@ e_modapi_init(E_Module *m)
 }
 
 E_API int
-e_modapi_shutdown(E_Module *m EINA_UNUSED)
+e_modapi_shutdown(E_Module *m)
 {
+   e_modapi_gadget_shutdown(m);
    e_gadcon_provider_unregister(&_gadcon_class);
 
-   if (pager_config->config_dialog)
-     e_object_del(E_OBJECT(pager_config->config_dialog));
-   E_FREE_LIST(pager_config->handlers, ecore_event_handler_del);
+   if (config_dialog)
+     e_object_del(E_OBJECT(config_dialog));
+   E_FREE_LIST(shandlers, ecore_event_handler_del);
 
    e_configure_registry_item_del("extensions/pager");
 
@@ -2166,8 +2169,9 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
 }
 
 E_API int
-e_modapi_save(E_Module *m EINA_UNUSED)
+e_modapi_save(E_Module *m)
 {
+   e_modapi_gadget_save(m);
    e_config_domain_save("module.pager", conf_edd, pager_config);
    return 1;
 }
diff --git a/src/modules/pager/e_mod_main.h b/src/modules/pager/e_mod_main.h
index 746e733439..90409952e9 100644
--- a/src/modules/pager/e_mod_main.h
+++ b/src/modules/pager/e_mod_main.h
@@ -1,5 +1,6 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
+#include "gadget/pager.h"
 
 typedef struct _Config Config;
 typedef struct _Config_Item Config_Item;
@@ -15,38 +16,17 @@ typedef struct _Config_Item Config_Item;
 #define PAGER_DESKNAME_LEFT 3
 #define PAGER_DESKNAME_RIGHT 4
 
-struct _Config
-{
-   unsigned int popup;
-   double popup_speed;
-   unsigned int popup_urgent;
-   unsigned int popup_urgent_stick;
-   unsigned int popup_urgent_focus;
-   double popup_urgent_speed;
-   unsigned int show_desk_names;
-   int popup_act_height; /*keyaction popup */
-   int popup_height;    /* urgent/on-deskswitch popup*/
-   unsigned int drag_resist;
-   unsigned int btn_drag;
-   unsigned int btn_noplace;
-   unsigned int btn_desk;
-   unsigned int flip_desk;
-
-   /* just config state */
-   E_Module *module;
-   E_Config_Dialog *config_dialog;
-   Eina_List *instances, *handlers;
-};
-
 E_API extern E_Module_Api e_modapi;
 
 E_API void *e_modapi_init(E_Module *m);
 E_API int e_modapi_shutdown(E_Module *m);
 E_API int e_modapi_save(E_Module *m);
 
-EINTERN void _pager_cb_config_updated(void);
 EINTERN void _config_pager_module(Config_Item *ci);
-extern Config *pager_config;
+
+extern E_Module *module;
+extern E_Config_Dialog *config_dialog;
+extern Eina_List *instances, *shandlers;
 
 /**
  * @addtogroup Optional_Gadgets
diff --git a/src/modules/pager/gadget/config.c b/src/modules/pager/gadget/config.c
new file mode 100644
index 0000000000..cb06e42603
--- /dev/null
+++ b/src/modules/pager/gadget/config.c
@@ -0,0 +1,601 @@
+#include "pager.h"
+
+#define BUTTON_DRAG    0
+#define BUTTON_NOPLACE 1
+#define BUTTON_DESK    2
+
+typedef struct _Config_Objects Config_Objects;
+struct _Config_Objects
+{
+   Evas_Object     *general_page;
+   Evas_Object     *popup_page;
+   Evas_Object     *urgent_page;
+   Evas_Object     *o_popup;
+   Evas_Object     *o_popup_speed;
+   Evas_Object     *o_popup_urgent;
+   Evas_Object     *o_popup_urgent_stick;
+   Evas_Object     *o_popup_urgent_focus;
+   Evas_Object     *o_popup_urgent_speed;
+   Evas_Object     *o_show_desk_names;
+   Evas_Object     *o_popup_act_height;
+   Evas_Object     *o_popup_height;
+   Evas_Object     *o_drag_resist;
+   Evas_Object     *o_btn_drag;
+   Evas_Object     *o_btn_noplace;
+   Evas_Object     *o_btn_desk;
+   Evas_Object     *o_flip_desk;
+   E_Grab_Dialog   *grab_dia;
+   int              grab_btn;
+   int              w, h;
+};
+Config_Objects *pager_gadget_config_objects = NULL;
+
+static void
+_config_close(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   cfg_dialog = NULL;
+   E_FREE(pager_gadget_config_objects);
+}
+
+static void
+_config_show_general(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   evas_object_hide(pager_gadget_config_objects->popup_page);
+   evas_object_hide(pager_gadget_config_objects->urgent_page);
+   evas_object_show(pager_gadget_config_objects->general_page);
+}
+
+static void
+_config_show_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   evas_object_hide(pager_gadget_config_objects->general_page);
+   evas_object_hide(pager_gadget_config_objects->urgent_page);
+   evas_object_show(pager_gadget_config_objects->popup_page);
+}
+
+static void
+_config_show_urgent(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   evas_object_hide(pager_gadget_config_objects->general_page);
+   evas_object_hide(pager_gadget_config_objects->popup_page);
+   evas_object_show(pager_gadget_config_objects->urgent_page);
+}
+
+static void
+_config_value_changed(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_data EINA_UNUSED)
+{
+   pager_config->popup =
+       elm_check_state_get(pager_gadget_config_objects->o_popup);
+   pager_config->popup_speed =
+       elm_slider_value_get(pager_gadget_config_objects->o_popup_speed);
+   pager_config->flip_desk = 
+       elm_check_state_get(pager_gadget_config_objects->o_flip_desk);
+   pager_config->popup_urgent = 
+       elm_check_state_get(pager_gadget_config_objects->o_popup_urgent);
+   pager_config->popup_urgent_stick = 
+       elm_check_state_get(pager_gadget_config_objects->o_popup_urgent_stick);
+   pager_config->popup_urgent_focus =
+       elm_check_state_get(pager_gadget_config_objects->o_popup_urgent_focus);
+   pager_config->popup_urgent_speed = 
+       elm_slider_value_get(pager_gadget_config_objects->o_popup_urgent_speed);
+   pager_config->show_desk_names = 
+       elm_check_state_get(pager_gadget_config_objects->o_show_desk_names);
+   pager_config->popup_height = 
+       elm_slider_value_get(pager_gadget_config_objects->o_popup_height);
+   pager_config->popup_act_height = 
+       elm_slider_value_get(pager_gadget_config_objects->o_popup_act_height);
+   pager_config->drag_resist = 
+       elm_slider_value_get(pager_gadget_config_objects->o_drag_resist);
+   _pager_cb_config_gadget_updated();
+   _pager_cb_config_updated();
+   e_config_save_queue();
+
+   elm_object_disabled_set(pager_gadget_config_objects->o_popup_speed,
+       !pager_config->popup);
+   elm_object_disabled_set(pager_gadget_config_objects->o_popup_act_height,
+       !pager_config->popup);
+   elm_object_disabled_set(pager_gadget_config_objects->o_popup_height,
+       !pager_config->popup);
+   elm_object_disabled_set(pager_gadget_config_objects->o_popup_urgent_stick,
+       !pager_config->popup_urgent);
+   elm_object_disabled_set(pager_gadget_config_objects->o_popup_urgent_focus,
+       !pager_config->popup_urgent);
+   elm_object_disabled_set(pager_gadget_config_objects->o_popup_urgent_speed,
+       !pager_config->popup_urgent);
+}
+
+static void
+_config_update_btn(Evas_Object *button, const int mouse_button)
+{
+   char lbl[256];
+   char *icon = NULL;
+   Evas_Object *ic = NULL;
+
+   switch (mouse_button)
+     {
+      case 0:
+        snprintf(lbl, sizeof(lbl), _("Click to set"));
+        break;
+      case 1:
+        if (e_config->mouse_hand == E_MOUSE_HAND_RIGHT)
+          {
+             snprintf(lbl, sizeof(lbl), _("Left button"));
+             icon = "preferences-desktop-mouse-left";
+          }
+        else if (e_config->mouse_hand == E_MOUSE_HAND_LEFT)
+          {
+             snprintf(lbl, sizeof(lbl), _("Right button"));
+             icon = "preferences-desktop-mouse-right";
+          }
+        else
+          {
+             snprintf(lbl, sizeof(lbl), _("Button %i"), mouse_button);
+             icon = "preferences-desktop-mouse-extra";
+          }
+        break;
+      case 2:
+        snprintf(lbl, sizeof(lbl), _("Middle button"));
+        icon = "preferences-desktop-mouse-middle";
+        break;
+      case 3:
+        if (e_config->mouse_hand == E_MOUSE_HAND_RIGHT)
+          {
+             snprintf(lbl, sizeof(lbl), _("Right button"));
+             icon = "preferences-desktop-mouse-right";
+          }
+        else if (e_config->mouse_hand == E_MOUSE_HAND_LEFT)
+          {
+             snprintf(lbl, sizeof(lbl), _("Left button"));
+             icon = "preferences-desktop-mouse-left";
+          }
+        else
+          {
+             snprintf(lbl, sizeof(lbl), _("Button %i"), mouse_button);
+             icon = "preferences-desktop-mouse-extra";
+          }
+        break;
+      default:
+        snprintf(lbl, sizeof(lbl), _("Button %i"), mouse_button);
+        icon = "preferences-desktop-mouse-extra";
+        break;
+     }
+   elm_object_text_set(button, lbl);
+   if (icon)
+     {
+        ic = elm_icon_add(evas_object_evas_get(button));
+        elm_icon_standard_set(ic, icon);
+        evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
+     }
+   elm_object_part_content_set(button, "icon", ic);
+}
+
+static void
+_config_update_btns(void)
+{
+#if 0
+   _config_update_btn(pager_gadget_config_objects->o_btn_drag, pager_config->btn_drag);
+#endif
+
+   _config_update_btn(pager_gadget_config_objects->o_btn_noplace, pager_config->btn_noplace);
+   _config_update_btn(pager_gadget_config_objects->o_btn_desk, pager_config->btn_desk);
+}
+
+static void
+_config_grab_window_del(void *data EINA_UNUSED)
+{
+   evas_object_show(cfg_dialog);
+   _config_update_btns();
+}
+
+static Eina_Bool
+_config_grab_cb_mouse_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
+{
+   Ecore_Event_Mouse_Button *ev;
+
+   ev = event;
+
+   if (ev->buttons == 3)
+     {
+        e_util_dialog_show(_("Attention"),
+                           _("You cannot use the right mouse button in the<br>"
+                             "gadget for this as it is already taken by internal<br>"
+                             "code for context menus.<br>"
+                             "This button only works in the popup."));
+     }
+   else
+     {
+        if (ev->buttons == pager_config->btn_drag)
+          pager_config->btn_drag = 0;
+        else if (ev->buttons == pager_config->btn_noplace)
+          pager_config->btn_noplace = 0;
+        else if (ev->buttons == pager_config->btn_desk)
+          pager_config->btn_desk = 0;
+
+        if (pager_gadget_config_objects->grab_btn == 1)
+          pager_config->btn_drag = ev->buttons;
+        else if (pager_gadget_config_objects->grab_btn == 2)
+          pager_config->btn_noplace = ev->buttons;
+        else
+          pager_config->btn_desk = ev->buttons;
+     }
+
+   e_object_del(E_OBJECT(pager_gadget_config_objects->grab_dia));
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_config_grab_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
+{
+   Ecore_Event_Key *ev;
+
+   ev = event;
+   if (!strcmp(ev->key, "Delete"))
+     {
+        if (pager_gadget_config_objects->grab_btn == 1)
+          pager_config->btn_drag = 0;
+        else if (pager_gadget_config_objects->grab_btn == 2)
+          pager_config->btn_noplace = 0;
+        else
+          pager_config->btn_desk = 0;
+     }
+   e_object_del(E_OBJECT(pager_gadget_config_objects->grab_dia));
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static void
+_config_grab_window_show(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+
+   evas_object_hide(cfg_dialog);
+   pager_gadget_config_objects->grab_btn = 0;
+   if ((long)data == BUTTON_DRAG)
+     pager_gadget_config_objects->grab_btn = 1;
+   else if ((long)data == BUTTON_NOPLACE)
+     pager_gadget_config_objects->grab_btn = 2;
+
+   pager_gadget_config_objects->grab_dia = e_grab_dialog_show(NULL, EINA_TRUE,
+       _config_grab_cb_key_down, _config_grab_cb_mouse_down, NULL, NULL);
+   e_object_del_attach_func_set(E_OBJECT(pager_gadget_config_objects->grab_dia), _config_grab_window_del);
+}
+
+static Evas_Object *
+_config_create_pages(Evas_Object *parent)
+{
+   Evas_Object *m, *tb, *ow;
+   int row = 4;
+
+   m = elm_table_add(parent);
+   E_EXPAND(m);
+   evas_object_show(m);
+
+   /* General Page */
+   tb = elm_table_add(m);
+   E_EXPAND(tb);
+   evas_object_show(tb);
+
+   ow = elm_check_add(tb);
+   elm_object_text_set(ow, _("Flip desktop on mouse wheel"));
+   evas_object_size_hint_align_set(ow, 0.0, EVAS_HINT_FILL);
+   elm_check_state_set(ow, pager_config->flip_desk);
+   elm_table_pack(tb, ow, 0, 0, 1, 1);
+   E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_smart_callback_add(ow, "changed",
+       _config_value_changed, NULL);
+   evas_object_show(ow);
+   pager_gadget_config_objects->o_flip_desk = ow;
+
+   ow = elm_check_add(tb);
+   elm_object_text_set(ow, _("Always show desktop names"));
+   evas_object_size_hint_align_set(ow, 0.0, EVAS_HINT_FILL);
+   elm_check_state_set(ow, pager_config->show_desk_names);
+   elm_table_pack(tb, ow, 0, 1, 1, 1);
+   E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_smart_callback_add(ow, "changed",
+       _config_value_changed, NULL);
+   evas_object_show(ow);
+   pager_gadget_config_objects->o_show_desk_names = ow;
+
+   ow = elm_label_add(tb);
+   elm_object_text_set(ow, _("Resistance to dragging"));
+   elm_table_pack(tb, ow, 0, 2, 1, 1);
+   E_ALIGN(ow, 0.5, 0.5);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_show(ow);
+
+   ow = elm_slider_add(tb);
+   elm_slider_min_max_set(ow, 0, 10);
+   elm_slider_step_set(ow, 1);
+   elm_slider_value_set(ow, pager_config->drag_resist);
+   elm_slider_unit_format_set(ow, _("%.0f pixels"));
+   elm_table_pack(tb, ow, 0, 3, 1, 1);
+   E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_smart_callback_add(ow, "delay,changed",
+       _config_value_changed, NULL);
+   evas_object_show(ow);
+   pager_gadget_config_objects->o_drag_resist = ow;
+
+#if 0
+   ow = elm_label_add(tb);
+   elm_object_text_set(ow, _("Select and Slide button"));
+   elm_table_pack(tb, ow, 0, row, 1, 1);
+   E_ALIGN(ow, 0.5, 0.5);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_show(ow);
+   row++;
+
+   ow = elm_button_add(tb);
+   elm_object_text_set(ow, _("Click to set"));
+   evas_object_smart_callback_add(ow, "clicked",
+       _config_grab_window_show, (void *)BUTTON_DRAG);
+   elm_table_pack(tb, ow, 0, row, 1, 1);
+   E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_show(ow);
+   pager_gadget_config_objects->o_btn_drag = ow;
+   row++;
+#endif
+
+   ow = elm_label_add(tb);
+   elm_object_text_set(ow, _("Drag and Drop button"));
+   elm_table_pack(tb, ow, 0, row, 1, 1);
+   E_ALIGN(ow, 0.5, 0.5);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_show(ow);
+   row++;
+
+   ow = elm_button_add(tb);
+   elm_object_text_set(ow, _("Click to set"));
+   evas_object_smart_callback_add(ow, "clicked",
+       _config_grab_window_show, (void *)BUTTON_NOPLACE);
+   elm_table_pack(tb, ow, 0, row, 1, 1);
+   E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_show(ow);
+   pager_gadget_config_objects->o_btn_noplace = ow;
+   row++;
+
+   ow = elm_label_add(tb);
+   elm_object_text_set(ow, _("Drag whole desktop"));
+   elm_table_pack(tb, ow, 0, row, 1, 1);
+   E_ALIGN(ow, 0.5, 0.5);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_show(ow);
+   row++;
+
+   ow = elm_button_add(tb);
+   elm_object_text_set(ow, _("Click to set"));
+   evas_object_smart_callback_add(ow, "clicked",
+       _config_grab_window_show, (void *)BUTTON_DESK);
+   elm_table_pack(tb, ow, 0, row, 1, 1);
+   E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_show(ow);
+   pager_gadget_config_objects->o_btn_desk = ow;
+
+   _config_update_btns();
+
+   elm_table_pack(m, tb, 0, 0, 1, 1);
+   pager_gadget_config_objects->general_page = tb;
+
+   /* Popup Page */
+   tb = elm_table_add(m);
+   E_EXPAND(tb);
+   evas_object_show(tb);
+
+   ow = elm_check_add(tb);
+   elm_object_text_set(ow, _("Show popup on desktop change"));
+   evas_object_size_hint_align_set(ow, 0.0, EVAS_HINT_FILL);
+   elm_check_state_set(ow, pager_config->show_desk_names);
+   elm_table_pack(tb, ow, 0, 0, 1, 1);
+   E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_smart_callback_add(ow, "changed",
+       _config_value_changed, NULL);
+   evas_object_show(ow);
+   pager_gadget_config_objects->o_popup = ow;
+
+   ow = elm_label_add(tb);
+   elm_object_text_set(ow, _("Popup pager height"));
+   elm_object_disabled_set(ow, !pager_config->popup);
+   elm_table_pack(tb, ow, 0, 1, 1, 1);
+   E_ALIGN(ow, 0.5, 0.5);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_show(ow);
+
+   ow = elm_slider_add(tb);
+   elm_object_disabled_set(ow, !pager_config->popup);
+   elm_slider_min_max_set(ow, 20, 200);
+   elm_slider_step_set(ow, 1);
+   elm_slider_value_set(ow, pager_config->popup_height);
+   elm_slider_unit_format_set(ow, _("%.0f pixels"));
+   elm_table_pack(tb, ow, 0, 2, 1, 1);
+   E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_smart_callback_add(ow, "delay,changed",
+       _config_value_changed, NULL);
+   evas_object_show(ow);
+   pager_gadget_config_objects->o_popup_height = ow;
+   
+   ow = elm_label_add(tb);
+   elm_object_text_set(ow, _("Popup duration"));
+   elm_object_disabled_set(ow, !pager_config->popup);
+   elm_table_pack(tb, ow, 0, 3, 1, 1);
+   E_ALIGN(ow, 0.5, 0.5);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_show(ow);
+
+   ow = elm_slider_add(tb);
+   elm_object_disabled_set(ow, !pager_config->popup);
+   elm_slider_min_max_set(ow, 0.1, 10);
+   elm_slider_step_set(ow, 0.1);
+   elm_slider_value_set(ow, pager_config->popup_speed);
+   elm_slider_unit_format_set(ow, _("%1.1f seconds"));
+   elm_table_pack(tb, ow, 0, 4, 1, 1);
+   E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_smart_callback_add(ow, "delay,changed",
+       _config_value_changed, NULL);
+   evas_object_show(ow);
+   pager_gadget_config_objects->o_popup_speed = ow;
+
+   ow = elm_label_add(tb);
+   elm_object_text_set(ow, _("Pager action popup height"));
+   elm_object_disabled_set(ow, !pager_config->popup);
+   elm_table_pack(tb, ow, 0, 5, 1, 1);
+   E_ALIGN(ow, 0.5, 0.5);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_show(ow);
+
+   ow = elm_slider_add(tb);
+   elm_object_disabled_set(ow, !pager_config->popup);
+   elm_slider_min_max_set(ow, 20, 200);
+   elm_slider_step_set(ow, 1);
+   elm_slider_value_set(ow, pager_config->popup_act_height);
+   elm_slider_unit_format_set(ow, _("%.0f pixels"));
+   elm_table_pack(tb, ow, 0, 6, 1, 1);
+   E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_smart_callback_add(ow, "delay,changed",
+       _config_value_changed, NULL);
+   evas_object_show(ow);
+   pager_gadget_config_objects->o_popup_act_height = ow;
+
+   elm_table_pack(m, tb, 0, 0, 1, 1);
+   pager_gadget_config_objects->popup_page = tb;
+
+   /* Urgent Page */
+   tb = elm_table_add(m);
+   E_EXPAND(tb);
+   evas_object_show(tb);
+
+   ow = elm_check_add(tb);
+   elm_object_text_set(ow, _("Show popup for urgent window"));
+   evas_object_size_hint_align_set(ow, 0.0, EVAS_HINT_FILL);
+   elm_check_state_set(ow, pager_config->popup_urgent);
+   elm_table_pack(tb, ow, 0, 0, 1, 1);
+   E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_smart_callback_add(ow, "changed",
+       _config_value_changed, NULL);
+   evas_object_show(ow);
+   pager_gadget_config_objects->o_popup_urgent = ow;
+
+   ow = elm_check_add(tb);
+   elm_object_disabled_set(ow, !pager_config->popup_urgent);
+   elm_object_text_set(ow, _("Urgent popup sticks on screen"));
+   evas_object_size_hint_align_set(ow, 0.0, EVAS_HINT_FILL);
+   elm_check_state_set(ow, pager_config->popup_urgent_stick);
+   elm_table_pack(tb, ow, 0, 1, 1, 1);
+   E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_smart_callback_add(ow, "changed",
+       _config_value_changed, NULL);
+   evas_object_show(ow);
+   pager_gadget_config_objects->o_popup_urgent_stick = ow;
+
+   ow = elm_check_add(tb);
+   elm_object_disabled_set(ow, !pager_config->popup_urgent);
+   elm_object_text_set(ow, _("Show popup for focused windows"));
+   evas_object_size_hint_align_set(ow, 0.0, EVAS_HINT_FILL);
+   elm_check_state_set(ow, pager_config->popup_urgent_focus);
+   elm_table_pack(tb, ow, 0, 2, 1, 1);
+   E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_smart_callback_add(ow, "changed",
+       _config_value_changed, NULL);
+   evas_object_show(ow);
+   pager_gadget_config_objects->o_popup_urgent_focus = ow;
+
+   ow = elm_label_add(tb);
+   elm_object_text_set(ow, _("Urgent Popup Duration"));
+   elm_object_disabled_set(ow, !pager_config->popup_urgent);
+   elm_table_pack(tb, ow, 0, 3, 1, 1);
+   E_ALIGN(ow, 0.5, 0.5);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_show(ow);
+
+   ow = elm_slider_add(tb);
+   elm_object_disabled_set(ow, !pager_config->popup_urgent);
+   elm_slider_min_max_set(ow, 0.1, 10);
+   elm_slider_step_set(ow, 0.1);
+   elm_slider_value_set(ow, pager_config->popup_urgent_speed);
+   elm_slider_unit_format_set(ow, _("%1.1f seconds"));
+   elm_table_pack(tb, ow, 0, 4, 1, 1);
+   E_ALIGN(ow, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   E_WEIGHT(ow, EVAS_HINT_EXPAND, 0);
+   evas_object_smart_callback_add(ow, "delay,changed",
+       _config_value_changed, NULL);
+   evas_object_show(ow);
+   pager_gadget_config_objects->o_popup_urgent_speed = ow;
+
+   elm_table_pack(m, tb, 0, 0, 1, 1);
+   pager_gadget_config_objects->urgent_page = tb;
+
+   return m;
+}
+
+EINTERN Evas_Object *
+config_pager(E_Zone *zone)
+{
+   Evas_Object *popup, *tb, *lbl, *list, *fr;
+   Elm_Object_Item *it;
+
+   pager_gadget_config_objects = E_NEW(Config_Objects, 1);
+   pager_gadget_config_objects->w = 0;
+   pager_gadget_config_objects->h = 0;
+
+   popup = elm_popup_add(e_comp->elm);
+   E_EXPAND(popup);
+   elm_popup_allow_events_set(popup, 1);
+   elm_popup_scrollable_set(popup, 1);
+
+   tb = elm_table_add(popup);
+   E_EXPAND(tb);
+   evas_object_show(tb);
+   elm_object_content_set(popup, tb);
+
+   lbl = elm_label_add(tb);
+   elm_object_style_set(lbl, "marker");
+   evas_object_show(lbl);
+   elm_object_text_set(lbl, _("Pager Configuration"));
+   elm_table_pack(tb, lbl, 0, 0, 2, 1);
+
+   list = elm_list_add(tb);
+   E_ALIGN(list, 0, EVAS_HINT_FILL);
+   E_WEIGHT(list, 0, EVAS_HINT_EXPAND);
+   elm_table_pack(tb, list, 0, 1, 1, 1);
+   elm_list_select_mode_set(list, ELM_OBJECT_SELECT_MODE_ALWAYS);
+   elm_scroller_content_min_limit(list, 1, 1);
+   it = elm_list_item_append(list, _("General"), NULL, NULL,
+       _config_show_general, NULL);
+   elm_list_item_selected_set(it, 1);
+   it = elm_list_item_append(list, _("Popup"), NULL, NULL,
+       _config_show_popup,  NULL);
+   it = elm_list_item_append(list, _("Urgent"), NULL, NULL,
+       _config_show_urgent, NULL);
+   elm_list_go(list);
+   evas_object_show(list);
+
+   fr = elm_frame_add(tb);
+   E_EXPAND(fr);
+   elm_table_pack(tb, fr, 1, 1, 1, 1);
+   evas_object_show(fr);
+   
+   elm_object_content_set(fr,
+     _config_create_pages(fr));
+   _config_show_general(NULL, NULL, NULL);
+
+   popup = e_comp_object_util_add(popup, E_COMP_OBJECT_TYPE_NONE);
+   evas_object_layer_set(popup, E_LAYER_POPUP);
+   evas_object_resize(popup, zone->w / 4, zone->h / 3);
+   e_comp_object_util_center(popup);
+   evas_object_show(popup);
+   e_comp_object_util_autoclose(popup, NULL, e_comp_object_util_autoclose_on_escape, NULL);
+   evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, _config_close, NULL);
+
+   return cfg_dialog = popup;
+}
+
diff --git a/src/modules/pager/gadget/mod.c b/src/modules/pager/gadget/mod.c
new file mode 100644
index 0000000000..af4c370fec
--- /dev/null
+++ b/src/modules/pager/gadget/mod.c
@@ -0,0 +1,104 @@
+#include "pager.h"
+static E_Config_DD *conf_edd = NULL;
+Config *pager_config;
+E_Module *gmodule;
+Evas_Object *cfg_dialog;
+Eina_List *ginstances, *ghandlers;
+
+E_API void *
+e_modapi_gadget_init(E_Module *m)
+{
+   conf_edd = E_CONFIG_DD_NEW("Pager_Config", Config);
+#undef T
+#undef D
+#define T Config
+#define D conf_edd
+   E_CONFIG_VAL(D, T, popup, UINT);
+   E_CONFIG_VAL(D, T, popup_speed, DOUBLE);
+   E_CONFIG_VAL(D, T, popup_urgent, UINT);
+   E_CONFIG_VAL(D, T, popup_urgent_stick, UINT);
+   E_CONFIG_VAL(D, T, popup_urgent_speed, DOUBLE);
+   E_CONFIG_VAL(D, T, show_desk_names, UINT);
+   E_CONFIG_VAL(D, T, popup_height, INT);
+   E_CONFIG_VAL(D, T, popup_act_height, INT);
+   E_CONFIG_VAL(D, T, drag_resist, UINT);
+   E_CONFIG_VAL(D, T, btn_drag, UCHAR);
+   E_CONFIG_VAL(D, T, btn_noplace, UCHAR);
+   E_CONFIG_VAL(D, T, btn_desk, UCHAR);
+   E_CONFIG_VAL(D, T, flip_desk, UCHAR);
+
+   pager_config = e_config_domain_load("module.pager", conf_edd);
+
+   if (!pager_config)
+     {
+        pager_config = E_NEW(Config, 1);
+        pager_config->popup = 1;
+        pager_config->popup_speed = 1.0;
+        pager_config->popup_urgent = 0;
+        pager_config->popup_urgent_stick = 0;
+        pager_config->popup_urgent_speed = 1.5;
+        pager_config->show_desk_names = 0;
+        pager_config->popup_height = 60;
+        pager_config->popup_act_height = 60;
+        pager_config->drag_resist = 3;
+        pager_config->btn_drag = 1;
+        pager_config->btn_noplace = 2;
+        pager_config->btn_desk = 2;
+        pager_config->flip_desk = 0;
+     }
+   E_CONFIG_LIMIT(pager_config->popup, 0, 1);
+   E_CONFIG_LIMIT(pager_config->popup_speed, 0.1, 10.0);
+   E_CONFIG_LIMIT(pager_config->popup_urgent, 0, 1);
+   E_CONFIG_LIMIT(pager_config->popup_urgent_stick, 0, 1);
+   E_CONFIG_LIMIT(pager_config->popup_urgent_speed, 0.1, 10.0);
+   E_CONFIG_LIMIT(pager_config->show_desk_names, 0, 1);
+   E_CONFIG_LIMIT(pager_config->popup_height, 20, 200);
+   E_CONFIG_LIMIT(pager_config->popup_act_height, 20, 200);
+   E_CONFIG_LIMIT(pager_config->drag_resist, 0, 50);
+   E_CONFIG_LIMIT(pager_config->flip_desk, 0, 1);
+   E_CONFIG_LIMIT(pager_config->btn_drag, 0, 32);
+   E_CONFIG_LIMIT(pager_config->btn_noplace, 0, 32);
+   E_CONFIG_LIMIT(pager_config->btn_desk, 0, 32);
+
+   gmodule = m;
+
+   pager_init();
+
+   e_gadget_type_add("Pager Gadget", pager_create, NULL);
+
+   return m;
+}
+
+E_API int
+e_modapi_gadget_shutdown(E_Module *m EINA_UNUSED)
+{
+   if (cfg_dialog)
+     e_object_del(E_OBJECT(cfg_dialog));
+
+   if (pager_config && ghandlers)
+     E_FREE_LIST(ghandlers, ecore_event_handler_del);
+
+   e_action_del("pager_gadget_show");
+   e_action_del("pager_gadget_switch");
+
+   e_action_predef_name_del("Pager Gadget", "Show Pager Popup");
+   e_action_predef_name_del("Pager Gadget", "Popup Desk Right");
+   e_action_predef_name_del("Pager Gadget", "Popup Desk Left");
+   e_action_predef_name_del("Pager Gadget", "Popup Desk Up");
+   e_action_predef_name_del("Pager Gadget", "Popup Desk Down");
+   e_action_predef_name_del("Pager Gadget", "Popup Desk Next");
+   e_action_predef_name_del("Pager Gadget", "Popup Desk Previous");
+
+   e_gadget_type_del("Pager Gadget");
+
+   E_FREE(pager_config);
+   E_CONFIG_DD_FREE(conf_edd);
+   return 1;
+}
+
+E_API int
+e_modapi_gadget_save(E_Module *m EINA_UNUSED)
+{
+   e_config_domain_save("module.pager", conf_edd, pager_config);
+   return 1;
+}
diff --git a/src/modules/pager/gadget/pager.c b/src/modules/pager/gadget/pager.c
new file mode 100644
index 0000000000..5886592338
--- /dev/null
+++ b/src/modules/pager/gadget/pager.c
@@ -0,0 +1,1950 @@
+#include "pager.h"
+
+/* actual module specifics */
+typedef struct _Instance    Instance;
+typedef struct _Pager       Pager;
+typedef struct _Pager_Desk  Pager_Desk;
+typedef struct _Pager_Win   Pager_Win;
+typedef struct _Pager_Popup Pager_Popup;
+
+struct _Instance
+{
+   Evas_Object     *o_pager; /* table */
+   Pager           *pager;
+   Pager_Popup     *popup;
+   Eina_Bool        destroyed;
+};
+
+struct _Pager
+{
+   Instance       *inst;
+   Pager_Popup    *popup;
+   Evas_Object    *o_table;
+   E_Zone         *zone;
+   int             xnum, ynum;
+   Eina_List      *desks;
+   Pager_Desk     *active_pd;
+   unsigned char   dragging : 1;
+   unsigned char   just_dragged : 1;
+   E_Client       *active_drag_client;
+   Ecore_Job      *recalc;
+   Eina_Bool       invert : 1;
+};
+
+struct _Pager_Desk
+{
+   Pager       *pager;
+   E_Desk      *desk;
+   Eina_List   *wins;
+   Evas_Object *o_desk;
+   Evas_Object *o_layout;
+   Evas_Object *drop_handler;
+   int          xpos, ypos, urgent;
+   int          current : 1;
+   struct
+   {
+      Pager        *from_pager;
+      unsigned char in_pager : 1;
+      unsigned char start : 1;
+      int           x, y, dx, dy, button;
+   } drag;
+};
+
+struct _Pager_Win
+{
+   E_Client     *client;
+   Pager_Desk   *desk;
+   Evas_Object  *o_window;
+   Evas_Object  *o_mirror;
+   unsigned char skip_winlist : 1;
+   struct
+   {
+      Pager        *from_pager;
+      unsigned char start : 1;
+      unsigned char in_pager : 1;
+      unsigned char desktop  : 1;
+      int           x, y, dx, dy, button;
+   } drag;
+};
+
+struct _Pager_Popup
+{
+   Evas_Object  *popup;
+   Evas_Object  *o_bg;
+   Pager        *pager;
+   Ecore_Timer  *timer;
+   unsigned char urgent : 1;
+};
+
+static void             _pager_cb_mirror_add(Pager_Desk *pd, Evas_Object *obj, Evas_Object *mirror);
+
+static void             _pager_cb_obj_show(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
+static void             _pager_cb_obj_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
+static void             _button_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info);
+static Evas_Object     *_pager_gadget_configure(Evas_Object *g);
+static Eina_Bool        _pager_cb_event_desk_show(void *data EINA_UNUSED, int type EINA_UNUSED, void *event);
+static Eina_Bool        _pager_cb_event_desk_name_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event);
+static Eina_Bool        _pager_cb_event_compositor_resize(void *data EINA_UNUSED, int type EINA_UNUSED, void *event);
+static void             _pager_window_cb_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
+static void             _pager_window_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info);
+static void             _pager_window_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info);
+static void             _pager_window_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info);
+static void            *_pager_window_cb_drag_convert(E_Drag *drag, const char *type);
+static void             _pager_window_cb_drag_finished(E_Drag *drag, int dropped);
+static void             _pager_drop_cb_enter(void *data, const char *type EINA_UNUSED, void *event_info);
+static void             _pager_drop_cb_move(void *data, const char *type EINA_UNUSED, void *event_info);
+static void             _pager_drop_cb_leave(void *data, const char *type EINA_UNUSED, void *event_info EINA_UNUSED);
+static void             _pager_drop_cb_drop(void *data, const char *type, void *event_info);
+static void             _pager_update_drop_position(Pager *p, Pager_Desk *pd, Evas_Coord x, Evas_Coord y);
+static void             _pager_desk_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info);
+static void             _pager_desk_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info);
+static void             _pager_desk_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info);
+static void             _pager_desk_cb_drag_finished(E_Drag *drag, int dropped);
+static void             _pager_desk_cb_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info);
+static Eina_Bool        _pager_popup_cb_timeout(void *data);
+static Pager           *_pager_new(Evas *evas);
+static void             _pager_free(Pager *p);
+static void             _pager_fill(Pager *p);
+static void             _pager_orient(Instance *inst, E_Gadget_Site_Orient orient);
+static void             _pager_empty(Pager *p);
+static Pager_Desk      *_pager_desk_new(Pager *p, E_Desk *desk, int xpos, int ypos, Eina_Bool invert);
+static void             _pager_desk_free(Pager_Desk *pd);
+static void             _pager_desk_select(Pager_Desk *pd);
+static Pager_Desk      *_pager_desk_find(Pager *p, E_Desk *desk);
+static void             _pager_desk_switch(Pager_Desk *pd1, Pager_Desk *pd2);
+static Pager_Win       *_pager_window_new(Pager_Desk *pd, Evas_Object *mirror, E_Client *client);
+static void             _pager_window_free(Pager_Win *pw);
+static Pager_Popup     *pager_popup_new(int keyaction);
+static void             _pager_popup_free(Pager_Popup *pp);
+static Pager_Popup     *_pager_popup_find(E_Zone *zone);
+
+/* functions for pager popup on key actions */
+static int              _pager_popup_show(void);
+static void             _pager_popup_hide(int switch_desk);
+static Eina_Bool        _pager_popup_cb_mouse_wheel(void *data EINA_UNUSED, int type EINA_UNUSED, void *event);
+static void             _pager_popup_desk_switch(int x, int y);
+static void             _pager_popup_modifiers_set(int mod);
+static Eina_Bool        _pager_popup_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event);
+static Eina_Bool        _pager_popup_cb_key_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event);
+static void             _pager_popup_cb_action_show(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED, Ecore_Event_Key *ev EINA_UNUSED);
+static void             _pager_popup_cb_action_switch(E_Object *obj EINA_UNUSED, const char *params, Ecore_Event_Key *ev);
+
+/* variables for pager popup on key actions */
+static Ecore_Window input_window = 0;
+static Eina_List *handlers = NULL;
+static Pager_Popup *act_popup = NULL; /* active popup */
+static int hold_count = 0;
+static int hold_mod = 0;
+static E_Desk *current_desk = NULL;
+static Eina_List *pagers = NULL;
+
+static E_Action *act_popup_show = NULL;
+static E_Action *act_popup_switch = NULL;
+
+static Pager_Win *
+_pager_desk_window_find(Pager_Desk *pd, E_Client *client)
+{
+   Eina_List *l;
+   Pager_Win *pw;
+
+   EINA_LIST_FOREACH(pd->wins, l, pw)
+     {
+        if (pw)
+          {
+             if (pw->client == client) return pw;
+          }
+     }
+   return NULL;
+}
+
+static Pager_Win *
+_pager_window_find(Pager *p, E_Client *client)
+{
+   Eina_List *l;
+   Pager_Desk *pd;
+
+   EINA_LIST_FOREACH(p->desks, l, pd)
+     {
+        Pager_Win *pw;
+
+        pw = _pager_desk_window_find(pd, client);
+        if (pw) return pw;
+     }
+   return NULL;
+}
+
+static void
+_pager_gadget_anchor_change_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
+{
+   Instance *inst = data;
+
+   _pager_orient(inst, e_gadget_site_orient_get(obj));
+   if (inst->pager && inst->o_pager)
+     {
+        _pager_empty(inst->pager);
+        _pager_fill(inst->pager);
+     }
+}
+
+
+static void
+_pager_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
+{
+   Instance *inst = data;
+   Eina_List *l;
+   Pager_Desk *pd;
+
+   e_gadget_configure_cb_set(inst->o_pager, _pager_gadget_configure);
+   _pager_orient(inst, e_gadget_site_orient_get(obj));
+   if (inst->pager && inst->o_pager)
+     {
+        _pager_empty(inst->pager);
+        _pager_fill(inst->pager);
+        
+        EINA_LIST_FOREACH(inst->pager->desks, l, pd)
+          {
+             if (!pd->drop_handler)
+               {
+                  const char *drop[] =
+                  {
+                     "enlightenment/pager_win", "enlightenment/border",
+                     "enlightenment/vdesktop"
+                  };
+                  pd->drop_handler =
+                    e_gadget_drop_handler_add(inst->o_pager, pd,
+                             _pager_drop_cb_enter, _pager_drop_cb_move,
+                             _pager_drop_cb_leave, _pager_drop_cb_drop,
+                             drop, 3);
+                  //edje_object_part_swallow(pd->o_desk, "e.swallow.drop", pd->drop_handler);
+                  evas_object_show(pd->drop_handler);
+               }
+          }
+     }
+   evas_object_smart_callback_del_full(obj, "gadget_created", _pager_gadget_created_cb, data);
+}
+
+static void
+_pager_gadget_destroyed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Instance *inst = data;
+
+   inst->destroyed = EINA_TRUE;
+}
+
+static void
+_pager_orient(Instance *inst, E_Gadget_Site_Orient orient)
+{
+   int aspect_w, aspect_h;
+   double aspect_ratio;
+
+   if (inst->o_pager)
+     {
+        switch (orient)
+          {
+
+             case E_GADGET_SITE_ORIENT_HORIZONTAL:
+                inst->pager->invert = EINA_FALSE;
+                break;
+             case E_GADGET_SITE_ORIENT_VERTICAL:
+                inst->pager->invert = EINA_TRUE;
+                break;
+             case E_GADGET_SITE_ORIENT_NONE:
+                inst->pager->invert = EINA_TRUE;
+                break;
+             default:
+                inst->pager->invert = EINA_FALSE;
+          }
+     }
+   if (inst->pager->invert)
+     {
+        aspect_w = inst->pager->ynum * inst->pager->zone->w;
+        aspect_h = inst->pager->xnum * inst->pager->zone->h;
+        evas_object_size_hint_aspect_set(inst->o_pager, EVAS_ASPECT_CONTROL_HORIZONTAL, aspect_w, aspect_h);
+     }
+   else
+     {
+        aspect_w = inst->pager->xnum * inst->pager->zone->w;
+        aspect_h = inst->pager->ynum * inst->pager->zone->h;
+        evas_object_size_hint_aspect_set(inst->o_pager, EVAS_ASPECT_CONTROL_VERTICAL, aspect_w, aspect_h);
+     }
+   aspect_ratio = (double)aspect_w / (double)aspect_h;
+
+   if (aspect_ratio > 1.0)
+     evas_object_size_hint_min_set(inst->o_pager, 4 * aspect_ratio, 4);
+   else
+     evas_object_size_hint_min_set(inst->o_pager, 4, 4 * aspect_ratio);
+}
+
+static void
+_pager_recalc(void *data)
+{
+   Pager *p = data;
+   Pager_Desk *pd;
+   Evas_Coord mw = 0, mh = 0;
+   int w, h, zw, zh, w2, h2;
+
+   p->recalc = NULL;
+   zw = p->zone->w; zh = p->zone->h;
+   pd = eina_list_data_get(p->desks);
+   if (!pd) return;
+
+   edje_object_size_min_calc(pd->o_desk, &mw, &mh);
+   evas_object_geometry_get(pd->o_desk, NULL, NULL, &w, &h);
+   w -= mw; h -= mh;
+   w2 = w; h2 = (zh * w) / zw;
+   if (h2 > h)
+     {
+        h2 = h; w2 = (zw * h) / zh;
+     }
+   w = w2; h = h2;
+   w += mw; h += mh;
+   if ((p->inst) && (p->inst->o_pager))
+     {
+        _pager_orient(p->inst, e_gadget_site_orient_get(e_gadget_site_get(p->inst->o_pager)));
+        if (p->invert)
+          evas_object_size_hint_min_set(p->inst->o_pager, p->ynum * w, p->xnum * h);
+        else
+          evas_object_size_hint_min_set(p->inst->o_pager, p->xnum * w, p->ynum * h);
+     }
+}
+
+static void
+_pager_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Pager *p = data;
+
+   if (!p->recalc)
+     p->recalc = ecore_job_add(_pager_recalc, p);
+}
+
+static Pager *
+_pager_new(Evas *evas)
+{
+   Pager *p;
+
+   p = E_NEW(Pager, 1);
+   p->inst = NULL;
+   p->popup = NULL;
+   p->o_table = elm_table_add(e_win_evas_win_get(evas));
+   evas_object_event_callback_add(p->o_table, EVAS_CALLBACK_RESIZE, _pager_resize, p);
+   elm_table_homogeneous_set(p->o_table, 1);
+   p->zone = e_comp_object_util_zone_get(p->o_table);
+   _pager_fill(p);
+   pagers = eina_list_append(pagers, p);
+   return p;
+}
+
+static void
+_pager_free(Pager *p)
+{
+   _pager_empty(p);
+   evas_object_del(p->o_table);
+   ecore_job_del(p->recalc);
+   pagers = eina_list_remove(pagers, p);
+   free(p);
+}
+
+static void
+_pager_fill(Pager *p)
+{
+   int x, y;
+   E_Gadget_Site_Orient orient;
+
+   if (p->inst && p->inst->o_pager)
+     {
+        orient = e_gadget_site_orient_get(e_gadget_site_get(p->inst->o_pager));
+        switch (orient)
+          {
+
+             case E_GADGET_SITE_ORIENT_HORIZONTAL:
+                p->invert = EINA_FALSE;
+                break;
+             case E_GADGET_SITE_ORIENT_VERTICAL:
+                p->invert = EINA_TRUE;
+                break;
+             case E_GADGET_SITE_ORIENT_NONE:
+                p->invert = EINA_TRUE;
+                break;
+             default:
+                p->invert = EINA_FALSE;
+          }
+     }
+   e_zone_desk_count_get(p->zone, &(p->xnum), &(p->ynum));
+   if (p->ynum != 1) p->invert = EINA_FALSE;
+   for (x = 0; x < p->xnum; x++)
+     {
+        for (y = 0; y < p->ynum; y++)
+          {
+             Pager_Desk *pd;
+             E_Desk *desk;
+
+             desk = e_desk_at_xy_get(p->zone, x, y);
+             if (desk)
+               {
+                  pd = _pager_desk_new(p, desk, x, y, p->invert);
+                  if (pd)
+                    {
+                       p->desks = eina_list_append(p->desks, pd);
+                       if (desk == e_desk_current_get(desk->zone))
+                         _pager_desk_select(pd);
+                    }
+               }
+          }
+     }
+}
+
+static void
+_pager_empty(Pager *p)
+{
+   p->active_pd = NULL;
+   E_FREE_LIST(p->desks, _pager_desk_free);
+}
+
+static Pager_Desk *
+_pager_desk_new(Pager *p, E_Desk *desk, int xpos, int ypos, Eina_Bool invert)
+{
+   Pager_Desk *pd;
+   Evas_Object *o, *evo;
+   E_Client *ec;
+   Eina_List *l;
+   int w, h;
+   Evas *e;
+   const char *drop[] =
+   {
+      "enlightenment/pager_win", "enlightenment/border",
+      "enlightenment/vdesktop"
+   };
+
+   if (!desk) return NULL;
+   pd = E_NEW(Pager_Desk, 1);
+   if (!pd) return NULL;
+
+   pd->xpos = xpos;
+   pd->ypos = ypos;
+   pd->urgent = 0;
+   pd->desk = desk;
+   e_object_ref(E_OBJECT(desk));
+   pd->pager = p;
+   pd->drop_handler = NULL;
+
+   e = evas_object_evas_get(p->o_table);
+   o = edje_object_add(e);
+   pd->o_desk = o;
+   e_theme_edje_object_set(o, "base/theme/modules/pager",
+                           "e/modules/pager16/desk");
+   edje_object_part_text_set(o, "e.text.label", desk->name);
+   if (pager_config->show_desk_names)
+     edje_object_signal_emit(o, "e,name,show", "e");
+
+   edje_object_size_min_calc(o, &w, &h);
+   evas_object_size_hint_min_set(o, w, h);
+
+   E_EXPAND(o);
+   E_FILL(o);
+   if (invert)
+     elm_table_pack(p->o_table, o, ypos, xpos, 1, 1);
+   else
+     elm_table_pack(p->o_table, o, xpos, ypos, 1, 1);
+
+   evo = (Evas_Object *)edje_object_part_object_get(o, "e.eventarea");
+   if (!evo) evo = o;
+
+   evas_object_event_callback_add(evo, EVAS_CALLBACK_MOUSE_DOWN,
+                                  _pager_desk_cb_mouse_down, pd);
+   evas_object_event_callback_add(evo, EVAS_CALLBACK_MOUSE_UP,
+                                  _pager_desk_cb_mouse_up, pd);
+   evas_object_event_callback_add(evo, EVAS_CALLBACK_MOUSE_MOVE,
+                                  _pager_desk_cb_mouse_move, pd);
+   evas_object_event_callback_add(evo, EVAS_CALLBACK_MOUSE_WHEEL,
+                                  _pager_desk_cb_mouse_wheel, pd);
+   evas_object_show(o);
+
+   pd->o_layout = e_deskmirror_add(desk, 1, 0);
+   evas_object_smart_callback_add(pd->o_layout, "mirror_add", (Evas_Smart_Cb)_pager_cb_mirror_add, pd);
+
+   l = e_deskmirror_mirror_list(pd->o_layout);
+   EINA_LIST_FREE(l, o)
+     {
+        ec = evas_object_data_get(o, "E_Client");
+        if (ec)
+          {
+             Pager_Win *pw;
+
+             pw = _pager_window_new(pd, o, ec);
+             if (pw) pd->wins = eina_list_append(pd->wins, pw);
+          }
+     }
+   edje_object_part_swallow(pd->o_desk, "e.swallow.content", pd->o_layout);
+   evas_object_show(pd->o_layout);
+
+   if (pd->pager->inst)
+     {
+        pd->drop_handler =
+           e_gadget_drop_handler_add(p->inst->o_pager, pd,
+                        _pager_drop_cb_enter, _pager_drop_cb_move,
+                        _pager_drop_cb_leave, _pager_drop_cb_drop,
+                        drop, 3);
+        edje_object_part_swallow(pd->o_desk, "e.swallow.drop", pd->drop_handler);
+        evas_object_show(pd->drop_handler);
+     }
+
+   return pd;
+}
+
+static void
+_pager_desk_free(Pager_Desk *pd)
+{
+   Pager_Win *w;
+   
+   if (pd->drop_handler)
+     evas_object_del(pd->drop_handler);
+   pd->drop_handler = NULL;
+   evas_object_del(pd->o_desk);
+   evas_object_del(pd->o_layout);
+   EINA_LIST_FREE(pd->wins, w)
+     _pager_window_free(w);
+   e_object_unref(E_OBJECT(pd->desk));
+   free(pd);
+}
+
+static void
+_pager_desk_select(Pager_Desk *pd)
+{
+   if (pd->current) return;
+   if (pd->pager->active_pd)
+     {
+        pd->pager->active_pd->current = 0;
+        edje_object_signal_emit(pd->pager->active_pd->o_desk, "e,state,unselected", "e");
+     }
+   pd->current = 1;
+   evas_object_raise(pd->o_desk);
+   edje_object_signal_emit(pd->o_desk, "e,state,selected", "e");
+   pd->pager->active_pd = pd;
+}
+
+static Pager_Desk *
+_pager_desk_find(Pager *p, E_Desk *desk)
+{
+   Eina_List *l;
+   Pager_Desk *pd;
+
+   EINA_LIST_FOREACH(p->desks, l, pd)
+     if (pd->desk == desk) return pd;
+
+   return NULL;
+}
+
+static void
+_pager_desk_switch(Pager_Desk *pd1, Pager_Desk *pd2)
+{
+   int c;
+   E_Zone *zone1, *zone2;
+   E_Desk *desk1, *desk2;
+   Pager_Win *pw;
+   Eina_List *l;
+
+   if ((!pd1) || (!pd2) || (!pd1->desk) || (!pd2->desk)) return;
+   if (pd1 == pd2) return;
+
+   desk1 = pd1->desk;
+   desk2 = pd2->desk;
+   zone1 = pd1->desk->zone;
+   zone2 = pd2->desk->zone;
+
+   /* Move opened windows from on desk to the other */
+   EINA_LIST_FOREACH(pd1->wins, l, pw)
+     {
+        if ((!pw) || (!pw->client) || (pw->client->iconic)) continue;
+        pw->client->hidden = 0;
+        e_client_desk_set(pw->client, desk2);
+     }
+   EINA_LIST_FOREACH(pd2->wins, l, pw)
+     {
+        if ((!pw) || (!pw->client) || (pw->client->iconic)) continue;
+        pw->client->hidden = 0;
+        e_client_desk_set(pw->client, desk1);
+     }
+
+   /* Modify desktop names in the config */
+   for (l = e_config->desktop_names, c = 0; l && c < 2; l = l->next)
+     {
+        E_Config_Desktop_Name *tmp_dn;
+
+        tmp_dn = l->data;
+        if (!tmp_dn) continue;
+        if ((tmp_dn->desk_x == desk1->x) &&
+            (tmp_dn->desk_y == desk1->y) &&
+            (tmp_dn->zone == (int)desk1->zone->num))
+          {
+             tmp_dn->desk_x = desk2->x;
+             tmp_dn->desk_y = desk2->y;
+             tmp_dn->zone = desk2->zone->num;
+             c++;
+          }
+        else if ((tmp_dn->desk_x == desk2->x) &&
+                 (tmp_dn->desk_y == desk2->y) &&
+                 (tmp_dn->zone == (int)desk2->zone->num))
+          {
+             tmp_dn->desk_x = desk1->x;
+             tmp_dn->desk_y = desk1->y;
+             tmp_dn->zone = desk1->zone->num;
+             c++;
+          }
+     }
+   if (c > 0) e_config_save();
+   e_desk_name_update();
+
+   /* Modify desktop backgrounds in the config */
+   for (l = e_config->desktop_backgrounds, c = 0; l && c < 2; l = l->next)
+     {
+        E_Config_Desktop_Background *tmp_db;
+
+        tmp_db = l->data;
+        if (!tmp_db) continue;
+        if ((tmp_db->desk_x == desk1->x) &&
+            (tmp_db->desk_y == desk1->y) &&
+            (tmp_db->zone == (int)desk1->zone->num))
+          {
+             tmp_db->desk_x = desk2->x;
+             tmp_db->desk_y = desk2->y;
+             tmp_db->zone = desk2->zone->num;
+             c++;
+          }
+        else if ((tmp_db->desk_x == desk2->x) &&
+                 (tmp_db->desk_y == desk2->y) &&
+                 (tmp_db->zone == (int)desk2->zone->num))
+          {
+             tmp_db->desk_x = desk1->x;
+             tmp_db->desk_y = desk1->y;
+             tmp_db->zone = desk1->zone->num;
+             c++;
+          }
+     }
+   if (c > 0) e_config_save();
+
+   /* If the current desktop has been switched, force to update of the screen */
+   if (desk2 == e_desk_current_get(zone2))
+     {
+        desk2->visible = 0;
+        e_desk_show(desk2);
+     }
+   if (desk1 == e_desk_current_get(zone1))
+     {
+        desk1->visible = 0;
+        e_desk_show(desk1);
+     }
+}
+
+static Pager_Win *
+_pager_window_new(Pager_Desk *pd, Evas_Object *mirror, E_Client *client)
+{
+   Pager_Win *pw;
+   //Evas_Object *o;
+   //int visible;
+
+   if (!client) return NULL;
+   pw = E_NEW(Pager_Win, 1);
+   if (!pw) return NULL;
+
+   pw->client = client;
+   pw->o_mirror = mirror;
+
+   //visible = evas_object_visible_get(mirror);
+   //pw->skip_winlist = client->netwm.state.skip_pager;
+   pw->desk = pd;
+
+   //o = edje_object_add(evas_object_evas_get(pd->pager->o_table));
+   //pw->o_window = o;
+   //e_theme_edje_object_set(o, "base/theme/modules/pager",
+                           //"e/modules/pager16/window");
+   //if (visible) evas_object_show(o);
+
+
+   evas_object_event_callback_add(mirror, EVAS_CALLBACK_MOUSE_DOWN,
+                                  _pager_window_cb_mouse_down, pw);
+   evas_object_event_callback_add(mirror, EVAS_CALLBACK_MOUSE_UP,
+                                  _pager_window_cb_mouse_up, pw);
+   evas_object_event_callback_add(mirror, EVAS_CALLBACK_MOUSE_MOVE,
+                                  _pager_window_cb_mouse_move, pw);
+   evas_object_event_callback_add(mirror, EVAS_CALLBACK_DEL,
+                                  _pager_window_cb_del, pw);
+
+   if (client->urgent)
+     {
+        if (!(client->iconic))
+          edje_object_signal_emit(pd->o_desk, "e,state,urgent", "e");
+        //edje_object_signal_emit(pw->o_window, "e,state,urgent", "e");
+     }
+
+   //evas_object_show(o);
+   return pw;
+}
+
+static void
+_pager_window_free(Pager_Win *pw)
+{
+   if ((pw->drag.from_pager) && (pw->desk->pager->dragging))
+     pw->desk->pager->dragging = 0;
+   if (pw->o_mirror)
+     evas_object_event_callback_del_full(pw->o_mirror, EVAS_CALLBACK_DEL,
+                                    _pager_window_cb_del, pw);
+   if (pw->o_window) evas_object_del(pw->o_window);
+   free(pw);
+}
+
+static void
+_pager_popup_cb_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Pager_Popup *pp = data;
+   E_FREE_FUNC(pp->timer, ecore_timer_del);
+   _pager_free(pp->pager);
+   free(pp);
+}
+
+static Pager_Popup *
+pager_popup_new(int keyaction)
+{
+   Pager_Popup *pp;
+   Evas_Coord w, h, zx, zy, zw, zh;
+   int x, y, height, width;
+   E_Desk *desk;
+   Pager_Desk *pd;
+   E_Zone *zone = e_zone_current_get();
+
+   pp = E_NEW(Pager_Popup, 1);
+   if (!pp) return NULL;
+
+   /* Show popup */
+
+   pp->pager = _pager_new(e_comp->evas);
+   
+   pp->pager->popup = pp;
+   pp->urgent = 0;
+
+   e_zone_desk_count_get(zone, &x, &y);
+
+   if (keyaction)
+     height = pager_config->popup_act_height;
+   else
+     height = pager_config->popup_height;
+
+   pd = eina_list_data_get(pp->pager->desks);
+   if (!pd)
+     {
+        height *= y;
+        width = height * (zone->w * x) / (zone->h * y);
+     }
+   else
+     {
+        Evas_Coord mw = 0, mh = 0;
+
+        edje_object_size_min_calc(pd->o_desk, &mw, &mh);
+        height -= mh;
+        width = (height * zone->w) / zone->h;
+        height *= y;
+        height += (y * mh);
+        width *= x;
+        width += (x * mw);
+     }
+
+   evas_object_move(pp->pager->o_table, 0, 0);
+   evas_object_resize(pp->pager->o_table, width, height);
+
+   pp->o_bg = edje_object_add(e_comp->evas);
+   evas_object_name_set(pp->o_bg, "pager_gadget_popup");
+   e_theme_edje_object_set(pp->o_bg, "base/theme/modules/pager",
+                           "e/modules/pager16/popup");
+   desk = e_desk_current_get(zone);
+   if (desk)
+     edje_object_part_text_set(pp->o_bg, "e.text.label", desk->name);
+
+   evas_object_size_hint_min_set(pp->pager->o_table, width, height);
+   edje_object_part_swallow(pp->o_bg, "e.swallow.content", pp->pager->o_table);
+   edje_object_size_min_calc(pp->o_bg, &w, &h);
+
+   pp->popup = e_comp_object_util_add(pp->o_bg, E_COMP_OBJECT_TYPE_POPUP);
+   evas_object_layer_set(pp->popup, E_LAYER_CLIENT_POPUP);
+   evas_object_pass_events_set(pp->popup, 1);
+   e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh);
+   evas_object_geometry_set(pp->popup, zx, zy, w, h);
+   e_comp_object_util_center(pp->popup);
+   evas_object_event_callback_add(pp->popup, EVAS_CALLBACK_DEL, _pager_popup_cb_del, pp);
+   evas_object_show(pp->popup);
+
+   pp->timer = NULL;
+
+   return pp;
+}
+
+static void
+_pager_popup_free(Pager_Popup *pp)
+{
+   E_FREE_FUNC(pp->timer, ecore_timer_del);
+   evas_object_hide(pp->popup);
+   evas_object_del(pp->popup);
+}
+
+static Pager_Popup *
+_pager_popup_find(E_Zone *zone)
+{
+   Eina_List *l;
+   Pager *p;
+
+   EINA_LIST_FOREACH(pagers, l, p)
+     if ((p->popup) && (p->zone == zone))
+       return p->popup;
+
+   return NULL;
+}
+
+static void
+_pager_cb_obj_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+    Instance *inst = data;
+    Eina_List *l;
+    Pager_Desk *pd;
+
+    EINA_LIST_FOREACH(inst->pager->desks, l, pd)
+       edje_object_signal_emit(pd->o_desk, "e,state,hidden", "e");
+}
+
+static void
+_pager_cb_obj_show(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+    Instance *inst = data;
+    Eina_List *l;
+    Pager_Desk *pd;
+
+    EINA_LIST_FOREACH(inst->pager->desks, l, pd)
+       edje_object_signal_emit(pd->o_desk, "e,state,visible", "e");
+}
+
+static Evas_Object *
+_pager_gadget_configure(Evas_Object *g)
+{
+   if (!pager_config) return NULL;
+   if (cfg_dialog) return NULL;
+   return config_pager(e_comp_object_util_zone_get(g));
+}
+
+static void
+_button_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
+{
+   Instance *inst = data;
+   Evas_Event_Mouse_Down *ev = event_info;
+
+   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+   if (ev->button != 3) return;
+   if(!pager_config) return;
+   if (cfg_dialog) return;
+   e_gadget_configure(inst->o_pager);
+}
+
+EINTERN void
+_pager_cb_config_gadget_updated(void)
+{
+   Pager *p;
+   Pager_Desk *pd;
+   Eina_List *l, *ll;
+   if (!pager_config) return;
+   EINA_LIST_FOREACH(pagers, l, p)
+     EINA_LIST_FOREACH(p->desks, ll, pd)
+       {
+          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 void
+_pager_cb_mirror_add(Pager_Desk *pd, Evas_Object *obj EINA_UNUSED, Evas_Object *mirror)
+{
+   Pager_Win *pw;
+
+   pw = _pager_window_new(pd, mirror, evas_object_data_get(mirror, "E_Client"));
+   if (pw) pd->wins = eina_list_append(pd->wins, pw);
+}
+
+static Eina_Bool
+_pager_cb_event_zone_desk_count_set(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Zone_Desk_Count_Set *ev)
+{
+   Eina_List *l;
+   Pager *p;
+
+   EINA_LIST_FOREACH(pagers, l, p)
+     {
+        if ((ev->zone->desk_x_count == p->xnum) &&
+            (ev->zone->desk_y_count == p->ynum)) continue;
+        _pager_empty(p);
+        _pager_fill(p);
+        if (p->inst) _pager_orient(p->inst, e_gadget_site_orient_get(e_gadget_site_get(p->inst->o_pager)));
+     }
+
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_pager_cb_event_desk_show(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
+{
+   E_Event_Desk_Show *ev = event;
+   Eina_List *l;
+   Pager *p;
+   Pager_Popup *pp;
+   Pager_Desk *pd;
+
+   EINA_LIST_FOREACH(pagers, l, p)
+     {
+        if (p->zone != ev->desk->zone) continue;
+        pd = _pager_desk_find(p, ev->desk);
+        if (pd) _pager_desk_select(pd);
+
+        if (p->popup)
+          edje_object_part_text_set(p->popup->o_bg, "e.text.label", ev->desk->name);
+     }
+
+   if ((pager_config->popup) && (!act_popup))
+     {
+        if ((pp = _pager_popup_find(ev->desk->zone)))
+          evas_object_show(pp->popup);
+        else
+          pp = pager_popup_new(0);
+        if (pp->timer)
+          ecore_timer_reset(pp->timer);
+        else
+          pp->timer = ecore_timer_add(pager_config->popup_speed,
+                                      _pager_popup_cb_timeout, pp);
+     }
+
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_pager_cb_event_desk_name_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
+{
+   E_Event_Desk_Name_Change *ev = event;
+   Eina_List *l;
+   Pager *p;
+
+   EINA_LIST_FOREACH(pagers, l, p)
+     {
+        Pager_Desk *pd;
+
+        if (p->zone != ev->desk->zone) continue;
+        pd = _pager_desk_find(p, ev->desk);
+        if (pager_config->show_desk_names)
+          {
+             if (pd)
+               edje_object_part_text_set(pd->o_desk, "e.text.label",
+                                         ev->desk->name);
+          }
+        else
+          {
+             if (pd)
+               edje_object_part_text_set(pd->o_desk, "e.text.label", "");
+          }
+     }
+
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_pager_cb_event_client_urgent_change(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Client_Property *ev)
+{
+   if (!(ev->property & E_CLIENT_PROPERTY_URGENCY)) return ECORE_CALLBACK_RENEW;
+
+   if (pager_config->popup_urgent && (!e_client_util_desk_visible(ev->ec, e_desk_current_get(ev->ec->zone))) &&
+                                      (pager_config->popup_urgent_focus ||
+                                      (!pager_config->popup_urgent_focus && (!ev->ec->focused) && (!ev->ec->want_focus))))
+     {
+        Pager_Popup *pp;
+
+        pp = _pager_popup_find(ev->ec->zone);
+
+        if ((!pp) && (ev->ec->urgent || ev->ec->icccm.urgent) && (!ev->ec->iconic))
+          {
+             pp = pager_popup_new(0);
+             if (!pp) return ECORE_CALLBACK_RENEW;
+
+             if (!pager_config->popup_urgent_stick)
+               pp->timer = ecore_timer_add(pager_config->popup_urgent_speed,
+                                           _pager_popup_cb_timeout, pp);
+             pp->urgent = 1;
+          }
+     }
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_pager_cb_event_compositor_resize(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
+{
+   Eina_List *l;
+   Pager *p;
+
+   EINA_LIST_FOREACH(pagers, l, p)
+     {
+        Eina_List *l2;
+        Pager_Desk *pd;
+
+        EINA_LIST_FOREACH(p->desks, l2, pd)
+          e_layout_virtual_size_set(pd->o_layout, pd->desk->zone->w,
+                                    pd->desk->zone->h);
+
+        if (p->inst) _pager_orient(p->inst, e_gadget_site_orient_get(e_gadget_site_get(p->inst->o_pager)));
+        /* TODO if (p->popup) */
+     }
+
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static void
+_pager_window_cb_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Pager_Win *pw = data;
+
+   pw->desk->wins = eina_list_remove(pw->desk->wins, pw);
+   _pager_window_free(data);
+}
+
+static void
+_pager_window_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Pager_Win *pw = data;
+
+   pw->drag.button = 0;
+}
+
+static void
+_pager_window_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
+{
+   Evas_Event_Mouse_Down *ev;
+   Pager_Win *pw;
+
+   ev = event_info;
+   pw = data;
+
+   if (!pw) return;
+   pw->desk->pager->active_drag_client = NULL;
+   if (pw->desk->pager->popup && !act_popup) return;
+   if (!pw->desk->pager->popup && ev->button == 3) return;
+   if (e_client_util_ignored_get(pw->client) || e_client_util_is_popup(pw->client)) return;
+   if (ev->button == (int)pager_config->btn_desk) return;
+   if ((ev->button == (int)pager_config->btn_drag) ||
+       (ev->button == (int)pager_config->btn_noplace))
+     {
+        Evas_Coord ox, oy;
+
+        evas_object_geometry_get(pw->o_mirror, &ox, &oy, NULL, NULL);
+        pw->drag.in_pager = 1;
+        pw->drag.x = ev->canvas.x;
+        pw->drag.y = ev->canvas.y;
+        pw->drag.dx = ox - ev->canvas.x;
+        pw->drag.dy = oy - ev->canvas.y;
+        pw->drag.start = 1;
+        pw->drag.button = ev->button;
+        pw->desk->pager->active_drag_client = pw->client;
+     }
+}
+
+static void
+_pager_window_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
+{
+   Evas_Event_Mouse_Move *ev;
+   Pager_Win *pw;
+   E_Drag *drag;
+   Evas_Object *o;
+   Evas_Coord x, y, w, h;
+   const char *drag_types[] =
+   { "enlightenment/pager_win", "enlightenment/border" };
+   Evas_Coord dx, dy;
+   unsigned int resist = 0;
+
+   ev = event_info;
+   pw = data;
+
+   if (!pw) return;
+   if (pw->client->lock_user_location) return;
+   if ((pw->desk->pager->popup) && (!act_popup)) return;
+   if (!pw->drag.button) return;
+
+   /* prevent drag for a few pixels */
+   if (!pw->drag.start) return;
+
+   dx = pw->drag.x - ev->cur.output.x;
+   dy = pw->drag.y - ev->cur.output.y;
+   if (pw->desk->pager)
+     resist = pager_config->drag_resist;
+
+   if (((unsigned int)(dx * dx) + (unsigned int)(dy * dy)) <=
+       (resist * resist)) return;
+
+   pw->desk->pager->dragging = 1;
+   pw->drag.start = 0;
+   e_comp_object_effect_clip(pw->client->frame);
+   edje_object_signal_emit(pw->desk->o_desk, "e,action,drag,in", "e");
+
+   evas_object_geometry_get(pw->o_mirror, &x, &y, &w, &h);
+   evas_object_hide(pw->o_mirror);
+
+   drag = e_drag_new(x, y, drag_types, 2, pw->desk->pager, -1,
+                     _pager_window_cb_drag_convert,
+                     _pager_window_cb_drag_finished);
+   drag->button_mask = evas_pointer_button_down_mask_get(e_comp->evas);
+
+   /* this is independent of the original mirror */
+   o = e_deskmirror_mirror_copy(pw->o_mirror);
+   evas_object_show(o);
+
+   e_drag_object_set(drag, o);
+   e_drag_resize(drag, w, h);
+   e_drag_show(drag);
+   e_drag_start(drag, x - pw->drag.dx, y - pw->drag.dy);
+}
+
+static void *
+_pager_window_cb_drag_convert(E_Drag *drag, const char *type)
+{
+   Pager *p;
+
+   p = drag->data;
+   if (!strcmp(type, "enlightenment/pager_win")) return _pager_window_find(p, p->active_drag_client);
+   if (!strcmp(type, "enlightenment/border")) return p->active_drag_client;
+   return NULL;
+}
+
+static void
+_pager_window_cb_drag_finished(E_Drag *drag, int dropped)
+{
+   Pager_Win *pw;
+   Pager *p;
+
+   p = drag->data;
+   if (!p) return;
+   pw = _pager_window_find(p, p->active_drag_client);
+   if (!pw) return;
+   p->active_drag_client = NULL;
+   evas_object_show(pw->o_mirror);
+   if (dropped)
+     {
+        /* be helpful */
+        if (pw->client->desk->visible && (!e_client_focused_get()))
+          evas_object_focus_set(pw->client->frame, 1);
+     }
+   else
+     {
+        int dx, dy, x, y, zx, zy, zw, zh;
+        pw->client->hidden = !p->active_pd->desk->visible;
+        e_client_desk_set(pw->client, p->active_pd->desk);
+
+        dx = (pw->client->w / 2);
+        dy = (pw->client->h / 2);
+
+        evas_pointer_canvas_xy_get(evas_object_evas_get(p->o_table), &x, &y);
+        e_zone_useful_geometry_get(p->zone, &zx, &zy, &zw, &zh);
+
+        /* offset so that center of window is on mouse, but keep within desk bounds */
+        if (dx < x)
+          {
+             x -= dx;
+             if ((pw->client->w < zw) &&
+                 (x + pw->client->w > zx + zw))
+               x -= x + pw->client->w - (zx + zw);
+          }
+        else x = 0;
+
+        if (dy < y)
+          {
+             y -= dy;
+             if ((pw->client->h < zh) &&
+                 (y + pw->client->h > zy + zh))
+               y -= y + pw->client->h - (zy + zh);
+          }
+        else y = 0;
+        evas_object_move(pw->client->frame, x, y);
+
+
+        if (!(pw->client->lock_user_stacking))
+          evas_object_raise(pw->client->frame);
+        evas_object_focus_set(pw->client->frame, 1);
+     }
+   edje_object_signal_emit(pw->desk->o_desk, "e,action,drag,out", "e");
+   if (!pw->drag.from_pager)
+     {
+        if (!pw->drag.start) p->just_dragged = 1;
+        pw->drag.in_pager = 0;
+        pw->drag.button = pw->drag.start = 0;
+        p->dragging = 0;
+     }
+   if (pw->drag.from_pager) pw->drag.from_pager->dragging = 0;
+   pw->drag.from_pager = NULL;
+   e_comp_object_effect_unclip(pw->client->frame);
+   if (act_popup)
+     {
+        if (e_comp->comp_type == E_PIXMAP_TYPE_X)
+          e_grabinput_get(input_window, 0, input_window);
+        else
+          e_comp_grab_input(1, 1);
+        if (!hold_count) _pager_popup_hide(1);
+     }
+}
+
+static void
+_pager_update_drop_position(Pager *p, Pager_Desk *pd, Evas_Coord x, Evas_Coord y)
+{
+   Pager_Win *pw = NULL;
+
+   if (pd)
+     pw = _pager_desk_window_find(pd, p->active_drag_client);
+   else
+     pw = _pager_window_find(p, p->active_drag_client);
+   if (!pw) return;
+   if (pd)
+     {
+        int zx, zy, zw, zh, vx, vy;
+
+        pw->drag.in_pager = 1;
+        //makes drags look weird
+        //e_zone_useful_geometry_get(pd->desk->zone, &zx, &zy, &zw, &zh);
+        zx = pd->desk->zone->x, zy = pd->desk->zone->y;
+        zw = pd->desk->zone->w, zh = pd->desk->zone->h;
+        e_deskmirror_coord_canvas_to_virtual(pd->o_layout,
+                                         x + pw->drag.dx,
+                                         y + pw->drag.dy, &vx, &vy);
+        pw->client->hidden = !pd->desk->visible;
+        e_client_desk_set(pw->client, pd->desk);
+        x = E_CLAMP(vx + zx, zx, zx + zw - pw->client->w);
+        y = E_CLAMP(vy + zy, zy, zy + zh - pw->client->h);
+        evas_object_move(pw->client->frame, x, y);
+     }
+   else
+     {
+        /* this prevents the desk from switching on drags */
+        pw->drag.from_pager = pw->desk->pager;
+        pw->drag.from_pager->dragging = 1;
+        pw->drag.in_pager = 0;
+     }
+}
+
+static void
+_pager_drop_cb_enter(void *data, const char *type EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Pager_Desk *pd = data;
+
+   /* FIXME this fixes a segv, but the case is not easy
+    * reproduceable. this makes no sense either since
+    * the same 'pager' is passed to e_drop_handler_add
+    * and it works without this almost all the time.
+    * so this must be an issue with e_dnd code... i guess */
+   if (act_popup) return;
+   edje_object_signal_emit(pd->o_desk, "e,action,drag,in", "e");
+}
+
+static void
+_pager_drop_cb_move(void *data, const char *type EINA_UNUSED, void *event_info)
+{
+   E_Event_Dnd_Move *ev;
+   Pager_Desk *pd;
+
+   ev = event_info;
+   pd = data;
+
+   if (act_popup) return;
+   _pager_update_drop_position(pd->pager, pd, ev->x, ev->y);
+}
+
+static void
+_pager_drop_cb_leave(void *data, const char *type EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Pager_Desk *pd = data;
+
+   if (act_popup) return;
+   edje_object_signal_emit(pd->o_desk, "e,action,drag,out", "e");
+}
+
+static void
+_pager_drop_cb_drop(void *data, const char *type, void *event_info)
+{
+   E_Event_Dnd_Drop *ev;
+   Eina_List *l;
+   Pager_Desk *pd;
+   Pager_Desk *pd2 = NULL;
+   E_Client *ec = NULL;
+   int dx = 0, dy = 0;
+   Pager_Win *pw = NULL;
+   Evas_Coord wx, wy, wx2, wy2;
+   Evas_Coord nx, ny;
+   ev = event_info;
+   pd = data;
+
+   if (act_popup) return;
+
+   if (pd)
+     {
+        if (!strcmp(type, "enlightenment/pager_win"))
+          {
+             pw = (Pager_Win *)(ev->data);
+             if (pw)
+               {
+                  ec = pw->client;
+                  dx = pw->drag.dx;
+                  dy = pw->drag.dy;
+               }
+          }
+        else if (!strcmp(type, "enlightenment/border"))
+          {
+             ec = ev->data;
+             e_deskmirror_coord_virtual_to_canvas(pd->o_layout, ec->x, ec->y,
+                                              &wx, &wy);
+             e_deskmirror_coord_virtual_to_canvas(pd->o_layout, ec->x + ec->w,
+                                              ec->y + ec->h, &wx2, &wy2);
+             dx = (wx - wx2) / 2;
+             dy = (wy - wy2) / 2;
+          }
+        else if (!strcmp(type, "enlightenment/vdesktop"))
+          {
+             pd2 = ev->data;
+             if (!pd2) return;
+             _pager_desk_switch(pd, pd2);
+          }
+        else
+          return;
+
+        if (ec)
+          {
+             E_Maximize max = ec->maximized;
+             E_Fullscreen fs = ec->fullscreen_policy;
+             Eina_Bool fullscreen = ec->fullscreen;
+
+             if (ec->iconic) e_client_uniconify(ec);
+             if (ec->maximized)
+               e_client_unmaximize(ec, E_MAXIMIZE_BOTH);
+             if (fullscreen) e_client_unfullscreen(ec);
+               ec->hidden = 0;
+             e_client_desk_set(ec, pd->desk);
+             evas_object_raise(ec->frame);
+                  
+             if ((!max) && (!fullscreen))
+               {
+                  int zx, zy, zw, zh, mx, my;
+
+                  e_deskmirror_coord_canvas_to_virtual(pd->o_layout,
+                                                   ev->x + dx,
+                                                   ev->y + dy,
+                                                   &nx, &ny);
+                  e_zone_useful_geometry_get(pd->desk->zone,
+                                             &zx, &zy, &zw, &zh);
+
+                  mx = E_CLAMP(nx + zx, zx, zx + zw - ec->w);
+                  my = E_CLAMP(ny + zy, zy, zy + zh - ec->h);
+                  evas_object_move(ec->frame, mx, my);
+               }
+             if (max) e_client_maximize(ec, max);
+             if (fullscreen) e_client_fullscreen(ec, fs);
+          }
+     }
+   EINA_LIST_FOREACH(pd->pager->desks, l, pd)
+     {
+        edje_object_signal_emit(pd->o_desk, "e,action,drag,out", "e");
+     }
+}
+
+static void
+_pager_desk_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
+{
+   Evas_Event_Mouse_Down *ev;
+   Pager_Desk *pd;
+   Evas_Coord ox, oy;
+
+   ev = event_info;
+   pd = data;
+   if (!pd) return;
+   if ((!pd->pager->popup) && (ev->button == 3)) return;
+   if (ev->button == (int)pager_config->btn_desk)
+     {
+        evas_object_geometry_get(pd->o_desk, &ox, &oy, NULL, NULL);
+        pd->drag.start = 1;
+        pd->drag.in_pager = 1;
+        pd->drag.dx = ox - ev->canvas.x;
+        pd->drag.dy = oy - ev->canvas.y;
+        pd->drag.x = ev->canvas.x;
+        pd->drag.y = ev->canvas.y;
+        pd->drag.button = ev->button;
+     }
+   else
+     {
+        pd->drag.dx = pd->drag.dy = pd->drag.x = pd->drag.y = 0;
+     }
+   pd->pager->just_dragged = 0;
+}
+
+static void
+_pager_desk_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
+{
+   Evas_Event_Mouse_Up *ev;
+   Pager_Desk *pd;
+   Pager *p;
+
+   ev = event_info;
+   pd = data;
+
+   if (!pd) return;
+   p = pd->pager;
+
+   /* FIXME: pd->pager->dragging is 0 when finishing a drag from desk to desk */
+   if ((ev->button == 1) && (!pd->pager->dragging) &&
+       (!pd->pager->just_dragged))
+     {
+        current_desk = pd->desk;
+        e_desk_show(pd->desk);
+        pd->drag.start = 0;
+        pd->drag.in_pager = 0;
+     }
+   else if (ev->button == (int)pager_config->btn_desk)
+     {
+        if (pd->pager->dragging) pd->pager->dragging = 0;
+        pd->drag.start = 0;
+        pd->drag.in_pager = 0;
+     }
+
+   if ((p->popup) && (p->popup->urgent)) _pager_popup_free(p->popup);
+}
+
+static void
+_pager_desk_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
+{
+   Evas_Event_Mouse_Move *ev;
+   Pager_Desk *pd;
+   Evas_Coord dx, dy;
+   unsigned int resist = 0;
+   E_Drag *drag;
+   Evas_Object *o;
+   Evas_Coord x, y, w, h;
+   const char *drag_types[] = { "enlightenment/vdesktop" };
+
+   ev = event_info;
+
+   pd = data;
+   if (!pd) return;
+   /* prevent drag for a few pixels */
+   if (pd->drag.start)
+     {
+        dx = pd->drag.x - ev->cur.output.x;
+        dy = pd->drag.y - ev->cur.output.y;
+        if ((pd->pager) && (pd->pager->inst))
+          resist = pager_config->drag_resist;
+
+        if (((unsigned int)(dx * dx) + (unsigned int)(dy * dy)) <=
+            (resist * resist)) return;
+
+        if (pd->pager) pd->pager->dragging = 1;
+        pd->drag.start = 0;
+     }
+
+   if (pd->drag.in_pager && pd->pager)
+     {
+        evas_object_geometry_get(pd->o_desk, &x, &y, &w, &h);
+        drag = e_drag_new(x, y, drag_types, 1, pd, -1,
+                          NULL, _pager_desk_cb_drag_finished);
+        drag->button_mask = evas_pointer_button_down_mask_get(e_comp->evas);
+        
+        /* redraw the desktop theme above */
+        o = e_comp_object_util_mirror_add(pd->o_layout);
+        e_drag_object_set(drag, o);
+
+        e_drag_resize(drag, w, h);
+        e_drag_start(drag, x - pd->drag.dx, y - pd->drag.dy);
+
+        pd->drag.from_pager = pd->pager;
+        pd->drag.from_pager->dragging = 1;
+        pd->drag.in_pager = 0;
+     }
+}
+
+static void
+_pager_desk_cb_drag_finished(E_Drag *drag, int dropped)
+{
+   Pager_Desk *pd;
+   Pager_Desk *pd2 = NULL;
+   Eina_List *l;
+   E_Desk *desk;
+   E_Zone *zone;
+   Pager *p;
+
+   pd = drag->data;
+   if (!pd) return;
+   if (!dropped)
+     {
+        /* wasn't dropped on pager, switch with current desktop */
+        if (!pd->desk) return;
+        zone = e_zone_current_get();
+        desk = e_desk_current_get(zone);
+        EINA_LIST_FOREACH(pagers, l, p)
+          {
+             pd2 = _pager_desk_find(p, desk);
+             if (pd2) break;
+          }
+        _pager_desk_switch(pd, pd2);
+     }
+   if (pd->drag.from_pager)
+     {
+        pd->drag.from_pager->dragging = 0;
+        pd->drag.from_pager->just_dragged = 0;
+     }
+   edje_object_signal_emit(pd->o_desk, "e,action,drag,out", "e");
+   pd->drag.from_pager = NULL;
+
+   if (act_popup)
+     {
+        if (e_comp->comp_type == E_PIXMAP_TYPE_X)
+          e_grabinput_get(input_window, 0, input_window);
+        else
+          e_comp_grab_input(1, 1);
+        if (!hold_count) _pager_popup_hide(1);
+     }
+}
+
+static void
+_pager_desk_cb_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
+{
+   Evas_Event_Mouse_Wheel *ev;
+   Pager_Desk *pd;
+
+   ev = event_info;
+   pd = data;
+
+   if (pd->pager->popup) return;
+
+   if (pager_config->flip_desk)
+     e_zone_desk_linear_flip_by(pd->desk->zone, ev->z);
+}
+
+static Eina_Bool
+_pager_popup_cb_timeout(void *data)
+{
+   Pager_Popup *pp;
+
+   pp = data;
+   pp->timer = NULL;
+   _pager_popup_free(pp);
+
+#ifndef HAVE_WAYLAND_ONLY
+   if (e_comp->comp_type == E_PIXMAP_TYPE_X)
+     {
+        if (input_window)
+          {
+             e_grabinput_release(input_window, input_window);
+             ecore_x_window_free(input_window);
+             input_window = 0;
+          }
+     }
+#endif
+   if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
+     {
+        e_comp_ungrab_input(1, 1);
+        input_window = 0;
+     }
+
+   return ECORE_CALLBACK_CANCEL;
+}
+
+/************************************************************************/
+/* popup-on-keyaction functions */
+static int
+_pager_popup_show(void)
+{
+   E_Zone *zone;
+   int x, y, w, h;
+   Pager_Popup *pp;
+   //const char *drop[] =
+   //{
+      //"enlightenment/pager_win", "enlightenment/border",
+      //"enlightenment/vdesktop"
+   //};
+
+   if ((act_popup) || (input_window)) return 0;
+
+   zone = e_zone_current_get();
+
+   pp = _pager_popup_find(zone);
+   if (pp) _pager_popup_free(pp);
+
+#ifndef HAVE_WAYLAND_ONLY
+   if (e_comp->comp_type == E_PIXMAP_TYPE_X)
+     {
+        input_window = ecore_x_window_input_new(e_comp->win, 0, 0, 1, 1);
+        ecore_x_window_show(input_window);
+        if (!e_grabinput_get(input_window, 0, input_window))
+          {
+             ecore_x_window_free(input_window);
+             input_window = 0;
+             return 0;
+          }
+     }
+#endif
+   if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
+     {
+        input_window = e_comp->ee_win;
+        e_comp_grab_input(1, 1);
+     }
+
+   handlers = eina_list_append
+       (handlers, ecore_event_handler_add
+         (ECORE_EVENT_KEY_DOWN, _pager_popup_cb_key_down, NULL));
+   handlers = eina_list_append
+       (handlers, ecore_event_handler_add
+         (ECORE_EVENT_KEY_UP, _pager_popup_cb_key_up, NULL));
+   handlers = eina_list_append
+       (handlers, ecore_event_handler_add
+         (ECORE_EVENT_MOUSE_WHEEL, _pager_popup_cb_mouse_wheel, NULL));
+
+   act_popup = pager_popup_new(0);
+
+   evas_object_geometry_get(act_popup->pager->o_table, &x, &y, &w, &h);
+
+   current_desk = e_desk_current_get(zone);
+
+   return 1;
+}
+
+static void
+_pager_popup_hide(int switch_desk)
+{
+   hold_count = 0;
+   hold_mod = 0;
+   while (handlers)
+     {
+        ecore_event_handler_del(handlers->data);
+        handlers = eina_list_remove_list(handlers, handlers);
+     }
+
+   act_popup->timer = ecore_timer_add(0.1, _pager_popup_cb_timeout, act_popup);
+
+   if ((switch_desk) && (current_desk)) e_desk_show(current_desk);
+
+   act_popup = NULL;
+}
+
+static void
+_pager_popup_modifiers_set(int mod)
+{
+   if (!act_popup) return;
+   hold_mod = mod;
+   hold_count = 0;
+   if (hold_mod & ECORE_EVENT_MODIFIER_SHIFT) hold_count++;
+   if (hold_mod & ECORE_EVENT_MODIFIER_CTRL) hold_count++;
+   if (hold_mod & ECORE_EVENT_MODIFIER_ALT) hold_count++;
+   if (hold_mod & ECORE_EVENT_MODIFIER_WIN) hold_count++;
+}
+
+static void
+_pager_popup_desk_switch(int x, int y)
+{
+   int max_x, max_y, desk_x, desk_y;
+   Pager_Desk *pd;
+   Pager_Popup *pp = act_popup;
+
+   e_zone_desk_count_get(pp->pager->zone, &max_x, &max_y);
+
+   desk_x = current_desk->x + x;
+   desk_y = current_desk->y + y;
+
+   if (desk_x < 0)
+     desk_x = max_x - 1;
+   else if (desk_x >= max_x)
+     desk_x = 0;
+
+   if (desk_y < 0)
+     desk_y = max_y - 1;
+   else if (desk_y >= max_y)
+     desk_y = 0;
+
+   current_desk = e_desk_at_xy_get(pp->pager->zone, desk_x, desk_y);
+
+   pd = _pager_desk_find(pp->pager, current_desk);
+   if (pd) _pager_desk_select(pd);
+
+   edje_object_part_text_set(pp->o_bg, "e.text.label", current_desk->name);
+}
+
+static void
+_pager_popup_cb_action_show(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED, Ecore_Event_Key *ev EINA_UNUSED)
+{
+   if (_pager_popup_show())
+     _pager_popup_modifiers_set(ev->modifiers);
+}
+
+static void
+_pager_popup_cb_action_switch(E_Object *obj EINA_UNUSED, const char *params, Ecore_Event_Key *ev)
+{
+   int max_x, max_y, desk_x;
+   int x = 0, y = 0;
+
+   if (!act_popup)
+     {
+        if (_pager_popup_show())
+          _pager_popup_modifiers_set(ev->modifiers);
+        else
+          return;
+     }
+
+   e_zone_desk_count_get(act_popup->pager->zone, &max_x, &max_y);
+   desk_x = current_desk->x /* + x <=this is always 0 */;
+
+   if (!strcmp(params, "left"))
+     x = -1;
+   else if (!strcmp(params, "right"))
+     x = 1;
+   else if (!strcmp(params, "up"))
+     y = -1;
+   else if (!strcmp(params, "down"))
+     y = 1;
+   else if (!strcmp(params, "next"))
+     {
+        x = 1;
+        if (desk_x == max_x - 1)
+          y = 1;
+     }
+   else if (!strcmp(params, "prev"))
+     {
+        x = -1;
+        if (desk_x == 0)
+          y = -1;
+     }
+
+   _pager_popup_desk_switch(x, y);
+}
+
+static Eina_Bool
+_pager_popup_cb_mouse_wheel(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
+{
+   Ecore_Event_Mouse_Wheel *ev = event;
+   Pager_Popup *pp = act_popup;
+   int max_x;
+
+   e_zone_desk_count_get(pp->pager->zone, &max_x, NULL);
+
+   if (current_desk->x + ev->z >= max_x)
+     _pager_popup_desk_switch(1, 1);
+   else if (current_desk->x + ev->z < 0)
+     _pager_popup_desk_switch(-1, -1);
+   else
+     _pager_popup_desk_switch(ev->z, 0);
+
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_pager_popup_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
+{
+   Ecore_Event_Key *ev;
+
+   ev = event;
+   if (ev->window != input_window) return ECORE_CALLBACK_PASS_ON;
+   if (!strcmp(ev->key, "Up"))
+     _pager_popup_desk_switch(0, -1);
+   else if (!strcmp(ev->key, "Down"))
+     _pager_popup_desk_switch(0, 1);
+   else if (!strcmp(ev->key, "Left"))
+     _pager_popup_desk_switch(-1, 0);
+   else if (!strcmp(ev->key, "Right"))
+     _pager_popup_desk_switch(1, 0);
+   else if (!strcmp(ev->key, "Escape"))
+     _pager_popup_hide(0);
+   else if ((!strcmp(ev->key, "Return")) || (!strcmp(ev->key, "KP_Enter")) ||
+            (!strcmp(ev->key, "space")))
+     {
+        Pager_Popup *pp = act_popup;
+
+        if (pp)
+          {
+             E_Desk *desk;
+             
+             desk = e_desk_at_xy_get(pp->pager->zone,
+                                     current_desk->x, current_desk->y);
+             if (desk) e_desk_show(desk);
+          }
+        _pager_popup_hide(0);
+     }
+   else
+     {
+        E_Config_Binding_Key *binding;
+        Eina_List *l;
+
+        EINA_LIST_FOREACH(e_bindings->key_bindings, l, binding)
+          {
+             E_Binding_Modifier mod = 0;
+
+             if ((binding->action) && (strcmp(binding->action, "pager_gadget_switch")))
+               continue;
+
+             if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
+               mod |= E_BINDING_MODIFIER_SHIFT;
+             if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)
+               mod |= E_BINDING_MODIFIER_CTRL;
+             if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT)
+               mod |= E_BINDING_MODIFIER_ALT;
+             if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
+               mod |= E_BINDING_MODIFIER_WIN;
+
+             if (binding->key && (!strcmp(binding->key, ev->key)) &&
+                 ((binding->modifiers == mod)))
+               {
+                  E_Action *act;
+
+                  act = e_action_find(binding->action);
+
+                  if (act)
+                    {
+                       if (act->func.go_key)
+                         act->func.go_key(NULL, binding->params, ev);
+                    }
+               }
+          }
+     }
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_pager_popup_cb_key_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
+{
+   Ecore_Event_Key *ev;
+
+   ev = event;
+   if (!(act_popup)) return ECORE_CALLBACK_PASS_ON;
+
+   if (hold_mod)
+     {
+        if ((hold_mod & ECORE_EVENT_MODIFIER_SHIFT) &&
+            (!strcmp(ev->key, "Shift_L"))) hold_count--;
+        else if ((hold_mod & ECORE_EVENT_MODIFIER_SHIFT) &&
+                 (!strcmp(ev->key, "Shift_R")))
+          hold_count--;
+        else if ((hold_mod & ECORE_EVENT_MODIFIER_CTRL) &&
+                 (!strcmp(ev->key, "Control_L")))
+          hold_count--;
+        else if ((hold_mod & ECORE_EVENT_MODIFIER_CTRL) &&
+                 (!strcmp(ev->key, "Control_R")))
+          hold_count--;
+        else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) &&
+                 (!strcmp(ev->key, "Alt_L")))
+          hold_count--;
+        else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) &&
+                 (!strcmp(ev->key, "Alt_R")))
+          hold_count--;
+        else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) &&
+                 (!strcmp(ev->key, "Meta_L")))
+          hold_count--;
+        else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) &&
+                 (!strcmp(ev->key, "Meta_R")))
+          hold_count--;
+        else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) &&
+                 (!strcmp(ev->key, "Super_L")))
+          hold_count--;
+        else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) &&
+                 (!strcmp(ev->key, "Super_R")))
+          hold_count--;
+        else if ((hold_mod & ECORE_EVENT_MODIFIER_WIN) &&
+                 (!strcmp(ev->key, "Super_L")))
+          hold_count--;
+        else if ((hold_mod & ECORE_EVENT_MODIFIER_WIN) &&
+                 (!strcmp(ev->key, "Super_R")))
+          hold_count--;
+        else if ((hold_mod & ECORE_EVENT_MODIFIER_WIN) &&
+                 (!strcmp(ev->key, "Mode_switch")))
+          hold_count--;
+        else if ((hold_mod & ECORE_EVENT_MODIFIER_WIN) &&
+                 (!strcmp(ev->key, "Meta_L")))
+          hold_count--;
+        else if ((hold_mod & ECORE_EVENT_MODIFIER_WIN) &&
+                 (!strcmp(ev->key, "Meta_R")))
+          hold_count--;
+        if ((hold_count <= 0) && (!act_popup->pager->dragging))
+          {
+             _pager_popup_hide(1);
+             return ECORE_CALLBACK_PASS_ON;
+          }
+     }
+
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static void
+pager_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Instance *inst = data;
+
+   _pager_free(inst->pager);
+   ginstances = eina_list_remove(ginstances, inst);
+   free(inst);
+}
+
+EINTERN Evas_Object *
+pager_create(Evas_Object *parent, int *id EINA_UNUSED, E_Gadget_Site_Orient orient EINA_UNUSED)
+{
+   Pager *p;
+   Evas_Object *o;
+   Instance *inst;
+
+   inst = E_NEW(Instance, 1);
+   p = _pager_new(evas_object_evas_get(parent));
+   p->inst = inst;
+   inst->pager = p;
+   o = p->o_table;
+   inst->o_pager = o;
+   inst->destroyed = EINA_FALSE;
+   _pager_orient(inst, e_gadget_site_orient_get(parent));
+
+   evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, pager_del, inst);
+   evas_object_smart_callback_add(parent, "gadget_created", _pager_gadget_created_cb, inst);
+   evas_object_smart_callback_add(parent, "gadget_site_anchor", _pager_gadget_anchor_change_cb, inst);
+   evas_object_smart_callback_add(parent, "gadget_destroyed", _pager_gadget_destroyed_cb, inst);
+
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
+                                  _button_cb_mouse_down, inst);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_SHOW,
+                                  _pager_cb_obj_show, inst);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_HIDE,
+                                  _pager_cb_obj_hide, inst);
+   ginstances = eina_list_append(ginstances, inst);
+   return inst->o_pager;
+}
+
+EINTERN void
+pager_init(void)
+{
+   E_LIST_HANDLER_APPEND(ghandlers, E_EVENT_ZONE_DESK_COUNT_SET, _pager_cb_event_zone_desk_count_set, NULL);
+   E_LIST_HANDLER_APPEND(ghandlers, E_EVENT_DESK_SHOW, _pager_cb_event_desk_show, NULL);
+   E_LIST_HANDLER_APPEND(ghandlers, E_EVENT_DESK_NAME_CHANGE, _pager_cb_event_desk_name_change, NULL);
+   E_LIST_HANDLER_APPEND(ghandlers, E_EVENT_COMPOSITOR_RESIZE, _pager_cb_event_compositor_resize, NULL);
+   E_LIST_HANDLER_APPEND(ghandlers, E_EVENT_CLIENT_PROPERTY, _pager_cb_event_client_urgent_change, NULL);
+
+   act_popup_show = e_action_add("pager_gadget_show");
+   if (act_popup_show)
+     {
+        act_popup_show->func.go_key = _pager_popup_cb_action_show;
+        e_action_predef_name_set(N_("Pager Gadget"), N_("Show Pager Popup"),
+                                 "pager_gadget_show", "<none>", NULL, 0);
+     }
+   act_popup_switch = e_action_add("pager_gadget_switch");
+   if (act_popup_switch)
+     {
+        act_popup_switch->func.go_key = _pager_popup_cb_action_switch;
+        e_action_predef_name_set(N_("Pager Gadget"), N_("Popup Desk Right"),
+                                 "pager_gadget_switch", "right", NULL, 0);
+        e_action_predef_name_set(N_("Pager Gadget"), N_("Popup Desk Left"),
+                                 "pager_gadget_switch", "left", NULL, 0);
+        e_action_predef_name_set(N_("Pager Gadget"), N_("Popup Desk Up"),
+                                 "pager_gadget_switch", "up", NULL, 0);
+        e_action_predef_name_set(N_("Pager Gadget"), N_("Popup Desk Down"),
+                                 "pager_gadget_switch", "down", NULL, 0);
+        e_action_predef_name_set(N_("Pager Gadget"), N_("Popup Desk Next"),
+                                 "pager_gadget_switch", "next", NULL, 0);
+        e_action_predef_name_set(N_("Pager Gadget"), N_("Popup Desk Previous"),
+                                 "pager_gadget_switch", "prev", NULL, 0);
+     }
+}
+
diff --git a/src/modules/pager/gadget/pager.h b/src/modules/pager/gadget/pager.h
new file mode 100644
index 0000000000..b75c53bb7d
--- /dev/null
+++ b/src/modules/pager/gadget/pager.h
@@ -0,0 +1,50 @@
+#ifndef PAGER_H
+#define PAGER_H
+
+#include "e.h"
+
+E_API void *e_modapi_gadget_init(E_Module *m);
+E_API int   e_modapi_gadget_shutdown(E_Module *m);
+E_API int   e_modapi_gadget_save(E_Module *m);
+
+typedef struct _Config Config;
+struct _Config
+{
+   unsigned int popup;
+   double       popup_speed;
+   unsigned int popup_urgent;
+   unsigned int popup_urgent_stick;
+   unsigned int popup_urgent_focus;
+   double       popup_urgent_speed;
+   unsigned int show_desk_names;
+   int          popup_act_height;
+   int          popup_height;
+   unsigned int drag_resist;
+   unsigned int btn_drag;
+   unsigned int btn_noplace;
+   unsigned int btn_desk;
+   unsigned int flip_desk;
+};
+
+EINTERN Evas_Object    *pager_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient);
+EINTERN Evas_Object    *config_pager(E_Zone *zone);
+EINTERN void           pager_init(void);
+EINTERN void           _pager_cb_config_gadget_updated(void);
+EINTERN void           _pager_cb_config_updated(void);
+
+extern Config          *pager_config;
+extern E_Module        *gmodule;
+extern Evas_Object     *cfg_dialog;
+extern Eina_List       *ginstances, *ghandlers;
+/**
+ * @addtogroup Optional_Gadgets
+ * @{
+ *
+ * @defgroup Module_Pager Virtual Desktop Pager
+ *
+ * Shows the grid of virtual desktops and allows changing between
+ * them.
+ *
+ * @}
+ */
+#endif