feature: make desklock hookable, break out current desklock into module, move pam stuff to separate file

after this commit, the new module "lokker" (or other loaded module) is in charge of creating all graphics for the lock screen, and it will be added to the user's config. failure to load a lockscreen module will just result in a black screen

desklock subsystem now handles all the pre/post lock stuff while the modules themselves are responsible for creating visuals and calling auth functions to determine whether to unlock the screen

17 files changed, 940 insertions, 801 deletions

diff --git a/config/mobile/e.src b/config/mobile/e.src
index 53ea0b8e8f..f0fef16cdb 100644
--- a/config/mobile/e.src
+++ b/config/mobile/e.src
@@ -332,6 +332,12 @@ group "E_Config" struct {
             value "priority" int: 0;
         }
         group "E_Config_Module" struct {
+            value "name" string: "lokker";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
             value "name" string: "conf";
             value "enabled" uchar: 1;
             value "delayed" uchar: 1;
diff --git a/config/standard/e.src b/config/standard/e.src
index 4b3c0ab181..31fabf923c 100644
--- a/config/standard/e.src
+++ b/config/standard/e.src
@@ -1017,6 +1017,12 @@ group "E_Config" struct {
             value "priority" int: 0;
         }
         group "E_Config_Module" struct {
+            value "name" string: "lokker";
+            value "enabled" uchar: 1;
+            value "delayed" uchar: 0;
+            value "priority" int: 0;
+        }
+        group "E_Config_Module" struct {
             value "name" string: "notification";
             value "enabled" uchar: 1;
             value "delayed" uchar: 1;
diff --git a/configure.ac b/configure.ac
index 5ad6d7e107..a9acf2e1df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -942,6 +942,7 @@ AC_E_OPTIONAL_MODULE([appmenu], true)
 AC_E_OPTIONAL_MODULE([physics], true, [CHECK_MODULE_PHYSICS])
 AC_E_OPTIONAL_MODULE([quickaccess], true)
 AC_E_OPTIONAL_MODULE([teamwork], true)
+AC_E_OPTIONAL_MODULE([lokker], true)
 AC_E_OPTIONAL_MODULE([shot], true, $ecore_x)
 AC_E_OPTIONAL_MODULE([backlight], true)
 AC_E_OPTIONAL_MODULE([tasks], true)
@@ -1055,6 +1056,7 @@ src/modules/appmenu/module.desktop
 src/modules/physics/module.desktop
 src/modules/quickaccess/module.desktop
 src/modules/teamwork/module.desktop
+src/modules/lokker/module.desktop
 src/modules/shot/module.desktop
 src/modules/backlight/module.desktop
 src/modules/tasks/module.desktop
diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 4359931985..efb7fcdfdc 100644
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -43,6 +43,7 @@ src/bin/e_acpi.h \
 src/bin/e_actions.h \
 src/bin/e_alert.h \
 src/bin/e_atoms.h \
+src/bin/e_auth.h \
 src/bin/e_backlight.h \
 src/bin/e_bg.h \
 src/bin/e_bindings.h \
@@ -213,6 +214,7 @@ src/bin/e_about.c \
 src/bin/e_acpi.c \
 src/bin/e_actions.c \
 src/bin/e_atoms.c \
+src/bin/e_auth.c \
 src/bin/e_backlight.c \
 src/bin/e_bg.c \
 src/bin/e_bindings.c \
diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c
new file mode 100644
index 0000000000..27abf51c10
--- /dev/null
+++ b/src/bin/e_auth.c
@@ -0,0 +1,191 @@
+#include "e.h"
+
+#ifdef HAVE_PAM
+# include <security/pam_appl.h>
+# include <pwd.h>
+
+
+typedef struct E_Auth
+{
+   struct
+   {
+      struct pam_conv conv;
+      pam_handle_t   *handle;
+   } pam;
+
+   char user[4096];
+   char passwd[4096];
+} E_Auth;
+
+static pid_t _e_auth_child_pid = -1;
+
+static char *
+_auth_auth_get_current_user(void)
+{
+   char *user;
+   struct passwd *pwent = NULL;
+
+   pwent = getpwuid(getuid());
+   user = strdup(pwent->pw_name);
+   return user;
+}
+
+static int
+_auth_auth_pam_conv(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr)
+{
+   int replies = 0;
+   E_Auth *da = (E_Auth *)appdata_ptr;
+   struct pam_response *reply = NULL;
+
+   reply = (struct pam_response *)malloc(sizeof(struct pam_response) * num_msg);
+
+   if (!reply) return PAM_CONV_ERR;
+
+   for (replies = 0; replies < num_msg; replies++)
+     {
+        switch (msg[replies]->msg_style)
+          {
+           case PAM_PROMPT_ECHO_ON:
+             reply[replies].resp_retcode = PAM_SUCCESS;
+             reply[replies].resp = strdup(da->user);
+             break;
+
+           case PAM_PROMPT_ECHO_OFF:
+             reply[replies].resp_retcode = PAM_SUCCESS;
+             reply[replies].resp = strdup(da->passwd);
+             break;
+
+           case PAM_ERROR_MSG:
+           case PAM_TEXT_INFO:
+             reply[replies].resp_retcode = PAM_SUCCESS;
+             reply[replies].resp = NULL;
+             break;
+
+           default:
+             free(reply);
+             return PAM_CONV_ERR;
+          }
+     }
+   *resp = reply;
+   return PAM_SUCCESS;
+}
+
+static int
+_auth_pam_init(E_Auth *da)
+{
+   int pamerr;
+   const char *pam_prof;
+   char *current_host;
+   char *current_user;
+
+   if (!da) return -1;
+
+   da->pam.conv.conv = _auth_auth_pam_conv;
+   da->pam.conv.appdata_ptr = da;
+   da->pam.handle = NULL;
+
+   /* try other pam profiles - and system-auth (login for fbsd users) is a fallback */
+   pam_prof = "login";
+   if (ecore_file_exists("/etc/pam.d/enlightenment"))
+     pam_prof = "enlightenment";
+   else if (ecore_file_exists("/etc/pam.d/xscreensaver"))
+     pam_prof = "xscreensaver";
+   else if (ecore_file_exists("/etc/pam.d/kscreensaver"))
+     pam_prof = "kscreensaver";
+   else if (ecore_file_exists("/etc/pam.d/system-auth"))
+     pam_prof = "system-auth";
+   else if (ecore_file_exists("/etc/pam.d/system"))
+     pam_prof = "system";
+   else if (ecore_file_exists("/etc/pam.d/xdm"))
+     pam_prof = "xdm";
+   else if (ecore_file_exists("/etc/pam.d/gdm"))
+     pam_prof = "gdm";
+   else if (ecore_file_exists("/etc/pam.d/kdm"))
+     pam_prof = "kdm";
+
+   if ((pamerr = pam_start(pam_prof, da->user, &(da->pam.conv),
+                           &(da->pam.handle))) != PAM_SUCCESS)
+     return pamerr;
+
+   current_user = _auth_auth_get_current_user();
+
+   if ((pamerr = pam_set_item(da->pam.handle, PAM_USER, current_user)) != PAM_SUCCESS)
+     {
+        free(current_user);
+        return pamerr;
+     }
+
+   current_host = e_auth_hostname_get();
+   if ((pamerr = pam_set_item(da->pam.handle, PAM_RHOST, current_host)) != PAM_SUCCESS)
+     {
+        free(current_user);
+        free(current_host);
+        return pamerr;
+     }
+
+   free(current_user);
+   free(current_host);
+   return 0;
+}
+
+#endif
+
+EAPI int
+e_auth_begin(char *passwd)
+{
+#ifdef HAVE_PAM
+   /* child */
+   int pamerr;
+   E_Auth da;
+   char *current_user, *p;
+   struct sigaction action;
+
+   _e_auth_child_pid = fork();
+   if (_e_auth_child_pid > 0) return _e_auth_child_pid;
+   if (_e_auth_child_pid < 0) return -1;
+
+   action.sa_handler = SIG_DFL;
+   action.sa_flags = SA_ONSTACK | SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
+   sigemptyset(&action.sa_mask);
+   sigaction(SIGSEGV, &action, NULL);
+   sigaction(SIGILL, &action, NULL);
+   sigaction(SIGFPE, &action, NULL);
+   sigaction(SIGBUS, &action, NULL);
+   sigaction(SIGABRT, &action, NULL);
+
+   current_user = _auth_auth_get_current_user();
+   eina_strlcpy(da.user, current_user, sizeof(da.user));
+   eina_strlcpy(da.passwd, passwd, sizeof(da.passwd));
+   /* security - null out passwd string once we are done with it */
+   for (p = passwd; *p; p++)
+     *p = 0;
+   da.pam.handle = NULL;
+   da.pam.conv.conv = NULL;
+   da.pam.conv.appdata_ptr = NULL;
+
+   pamerr = _auth_pam_init(&da);
+   if (pamerr != PAM_SUCCESS)
+     {
+        free(current_user);
+        exit(1);
+     }
+   pamerr = pam_authenticate(da.pam.handle, 0);
+   pam_end(da.pam.handle, pamerr);
+   /* security - null out passwd string once we are done with it */
+   memset(da.passwd, 0, sizeof(da.passwd));
+   if (pamerr == PAM_SUCCESS)
+     {
+        free(current_user);
+        exit(0);
+     }
+   free(current_user);
+   exit(-1);
+#endif
+   return 0;
+}
+
+EAPI char *
+e_auth_hostname_get(void)
+{
+   return strdup("localhost");
+}
diff --git a/src/bin/e_auth.h b/src/bin/e_auth.h
new file mode 100644
index 0000000000..7f989f23f1
--- /dev/null
+++ b/src/bin/e_auth.h
@@ -0,0 +1,7 @@
+#ifndef E_AUTH_H
+#define E_AUTH_H
+
+EAPI int e_auth_begin(char *passwd);
+EAPI char *e_auth_hostname_get(void);
+
+#endif
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 7ae539318f..91e57ceb78 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -1245,9 +1245,18 @@ e_config_load(void)
           }
         CONFIG_VERSION_CHECK(14)
           {
+             E_Config_Module *em;
+
              CONFIG_VERSION_UPDATE_INFO(14);
              if (e_config->desklock_use_custom_desklock)
                e_config->desklock_auth_method = E_DESKLOCK_AUTH_METHOD_EXTERNAL;
+
+             /* add new desklock module */
+             em = E_NEW(E_Config_Module, 1);
+             em->name = eina_stringshare_add("lokker");
+             em->enabled = 1;
+             em->delayed = 0;
+             e_config->modules = eina_list_append(e_config->modules, em);
           }
      }
    if (!e_config->remember_internal_fm_windows)
@@ -1349,7 +1358,6 @@ e_config_load(void)
    E_CONFIG_LIMIT(e_config->desklock_autolock_idle, 0, 1);
    E_CONFIG_LIMIT(e_config->desklock_autolock_idle_timeout, 1.0, 5400.0);
    E_CONFIG_LIMIT(e_config->desklock_use_custom_desklock, 0, 1);
-   E_CONFIG_LIMIT(e_config->desklock_auth_method, 0, E_DESKLOCK_AUTH_METHOD_LAST);
    E_CONFIG_LIMIT(e_config->desklock_ask_presentation, 0, 1);
    E_CONFIG_LIMIT(e_config->desklock_ask_presentation_timeout, 1.0, 300.0);
    E_CONFIG_LIMIT(e_config->border_raise_on_mouse_action, 0, 1);
diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index afe654b9fc..27dbba122d 100644
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -1,41 +1,10 @@
 #include "e.h"
-#ifdef HAVE_PAM
-# include <security/pam_appl.h>
-# include <pwd.h>
-#endif
-
-#define E_DESKLOCK_STATE_DEFAULT  0
-#define E_DESKLOCK_STATE_CHECKING 1
-#define E_DESKLOCK_STATE_INVALID  2
 
-#define PASSWD_LEN                256
 
 /**************************** private data ******************************/
-typedef struct _E_Desklock_Data       E_Desklock_Data;
-typedef struct _E_Desklock_Popup_Data E_Desklock_Popup_Data;
-#ifdef HAVE_PAM
-typedef struct _E_Desklock_Auth       E_Desklock_Auth;
-#endif
 
 typedef struct _E_Desklock_Run E_Desklock_Run;
 
-struct _E_Desklock_Popup_Data
-{
-   E_Zone *zone;
-   Evas_Object *comp_object;
-   Evas_Object *bg_object;
-   Evas_Object *login_box;
-};
-
-struct _E_Desklock_Data
-{
-   Eina_List           *elock_wnd_list;
-   Eina_List           *handlers;
-   Ecore_Event_Handler *move_handler;
-   char                 passwd[PASSWD_LEN];
-   int                  state;
-   Eina_Bool            selected : 1;
-};
 
 struct _E_Desklock_Run
 {
@@ -43,26 +12,6 @@ struct _E_Desklock_Run
    int      position;
 };
 
-#ifdef HAVE_PAM
-struct _E_Desklock_Auth
-{
-   struct
-   {
-      struct pam_conv conv;
-      pam_handle_t   *handle;
-   } pam;
-
-   char user[4096];
-   char passwd[4096];
-};
-#endif
-
-static E_Desklock_Data *edd = NULL;
-static E_Zone *last_active_zone = NULL;
-#ifdef HAVE_PAM
-static Ecore_Event_Handler *_e_desklock_exit_handler = NULL;
-static pid_t _e_desklock_child_pid = -1;
-#endif
 static Ecore_Exe *_e_custom_desklock_exe = NULL;
 static Ecore_Event_Handler *_e_custom_desklock_exe_handler = NULL;
 static Ecore_Poller *_e_desklock_idle_poller = NULL;
@@ -80,40 +29,15 @@ static Eina_List *hide_cbs = NULL;
 
 static Eina_List *block_rects = NULL;
 
-/***********************************************************************/
-
-static Eina_Bool _e_desklock_cb_key_down(void *data, int type, void *event);
-static Eina_Bool _e_desklock_cb_mouse_move(void *data, int type, void *event);
-static Eina_Bool _e_desklock_cb_custom_desklock_exit(void *data, int type, void *event);
-static Eina_Bool _e_desklock_cb_idle_poller(void *data);
-static Eina_Bool _e_desklock_cb_zone_add(void *data, int type, void *event);
-static Eina_Bool _e_desklock_cb_zone_del(void *data, int type, void *event);
-static Eina_Bool _e_desklock_cb_zone_move_resize(void *data, int type, void *event);
+static E_Desklock_Show_Cb create_cb = NULL;
+static E_Desklock_Hide_Cb destroy_cb = NULL;
 
+/***********************************************************************/
+static Eina_Bool _e_desklock_cb_custom_desklock_exit(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_desklock_cb_idle_poller(void *data __UNUSED__);
 static Eina_Bool _e_desklock_cb_run(void *data, int type, void *event);
 
-static void      _e_desklock_popup_free(E_Desklock_Popup_Data *edp);
-static void      _e_desklock_popup_add(E_Zone *zone);
-static void      _e_desklock_login_box_add(E_Desklock_Popup_Data *edp);
-static void      _e_desklock_select(void);
-static void      _e_desklock_unselect(void);
-static void      _e_desklock_null(void);
-static void      _e_desklock_passwd_update(void);
-static void      _e_desklock_backspace(void);
-static void      _e_desklock_delete(void);
-static int       _e_desklock_zone_num_get(void);
-static int       _e_desklock_check_auth(void);
-static void      _e_desklock_state_set(int state);
-
 static Eina_Bool _e_desklock_state = EINA_FALSE;
-#ifdef HAVE_PAM
-static Eina_Bool _e_desklock_cb_exit(void *data, int type, void *event);
-static int       _desklock_auth(char *passwd);
-static int       _desklock_pam_init(E_Desklock_Auth *da);
-static int       _desklock_auth_pam_conv(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr);
-static char     *_desklock_auth_get_current_user(void);
-static char     *_desklock_auth_get_current_host(void);
-#endif
 
 static void      _e_desklock_ask_presentation_mode(void);
 
@@ -142,12 +66,13 @@ e_desklock_init(void)
 EINTERN int
 e_desklock_shutdown(void)
 {
-   Eina_Bool waslocked = EINA_FALSE;
+   Eina_Bool waslocked = _e_desklock_state;
    E_Desklock_Run *task;
    Eina_List *l;
    E_Config_Desklock_Background *bg;
 
-   if (edd) waslocked = EINA_TRUE;
+   destroy_cb = NULL;
+   create_cb = NULL;
    if (!x_fatal)
      e_desklock_hide();
 
@@ -171,8 +96,8 @@ e_desklock_shutdown(void)
    return 1;
 }
 
-static const char *
-_user_wallpaper_get(E_Zone *zone)
+EAPI Eina_Stringshare *
+e_desklock_user_wallpaper_get(E_Zone *zone)
 {
    const E_Config_Desktop_Background *cdbg;
    const Eina_List *l;
@@ -195,6 +120,18 @@ _user_wallpaper_get(E_Zone *zone)
 }
 
 EAPI void
+e_desklock_create_callback_set(E_Desklock_Show_Cb cb)
+{
+   create_cb = cb;
+}
+
+EAPI void
+e_desklock_destroy_callback_set(E_Desklock_Hide_Cb cb)
+{
+   destroy_cb = cb;
+}
+
+EAPI void
 e_desklock_show_hook_add(E_Desklock_Show_Cb cb)
 {
    EINA_SAFETY_ON_NULL_RETURN(cb);
@@ -233,10 +170,8 @@ e_desklock_show_autolocked(void)
 EAPI int
 e_desklock_show(Eina_Bool suspend)
 {
-   const Eina_List *l, *l3;
+   const Eina_List *l;
    E_Comp *comp;
-   E_Manager *man;
-   int total_zone_num;
    E_Event_Desklock *ev;
    E_Desklock_Show_Cb show_cb;
    E_Desklock_Hide_Cb hide_cb;
@@ -271,33 +206,25 @@ e_desklock_show(Eina_Bool suspend)
      }
 #endif
 
-   if (edd) return 0;
-
-#ifdef HAVE_PAM
    if (e_desklock_is_personal())
      {
-#endif
-   if (!e_config->desklock_passwd)
-     {
-        E_Zone *zone;
+        if (!e_config->desklock_passwd)
+          {
+             E_Zone *zone;
 
-        zone = e_util_zone_current_get(e_manager_current_get());
-        if (zone)
-          e_configure_registry_call("screen/screen_lock", zone->comp, NULL);
-        return 0;
+             zone = e_util_zone_current_get(e_manager_current_get());
+             if (zone)
+               e_configure_registry_call("screen/screen_lock", zone->comp, NULL);
+             return 0;
+          }
      }
-#ifdef HAVE_PAM
-}
-
-#endif
 
    e_menu_hide_all();
    EINA_LIST_FOREACH(show_cbs, l, show_cb)
      {
         if (!show_cb()) goto fail;
      }
-   edd = E_NEW(E_Desklock_Data, 1);
-   if (!edd) return 0;
+
    EINA_LIST_FOREACH(e_comp_list(), l, comp)
      {
         Evas_Object *o;
@@ -315,24 +242,8 @@ e_desklock_show(Eina_Bool suspend)
    if (e_config->xkb.lock_layout)
      e_xkb_layout_set(e_config->xkb.lock_layout);
 
-   total_zone_num = _e_desklock_zone_num_get();
-   EINA_LIST_FOREACH(e_manager_list(), l, man)
-     {
-        E_Zone *zone;
-        EINA_LIST_FOREACH(man->comp->zones, l3, zone)
-          _e_desklock_popup_add(zone);
-     }
-
-   /* handlers */
-   E_LIST_HANDLER_APPEND(edd->handlers, ECORE_EVENT_KEY_DOWN, _e_desklock_cb_key_down, NULL);
-   E_LIST_HANDLER_APPEND(edd->handlers, E_EVENT_ZONE_ADD, _e_desklock_cb_zone_add, NULL);
-   E_LIST_HANDLER_APPEND(edd->handlers, E_EVENT_ZONE_DEL, _e_desklock_cb_zone_del, NULL);
-   E_LIST_HANDLER_APPEND(edd->handlers, E_EVENT_ZONE_MOVE_RESIZE, _e_desklock_cb_zone_move_resize, NULL);
-
-   if ((total_zone_num > 1) && (e_config->desklock_login_box_zone == -2))
-     edd->move_handler = ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _e_desklock_cb_mouse_move, NULL);
-
-   _e_desklock_passwd_update();
+   if (create_cb && !create_cb())
+     goto lang_fail;
 
    ev = E_NEW(E_Event_Desklock, 1);
    ev->on = 1;
@@ -342,10 +253,18 @@ e_desklock_show(Eina_Bool suspend)
    e_util_env_set("E_DESKLOCK_LOCKED", "locked");
    _e_desklock_state = EINA_TRUE;
    return 1;
+lang_fail:
+   if (e_config->desklock_language)
+     e_intl_language_set(e_config->language);
+
+   if (e_config_xkb_layout_eq(e_config->xkb.current_layout, e_config->xkb.lock_layout))
+     {
+        if (e_config->xkb.sel_layout)
+          e_xkb_layout_set(e_config->xkb.sel_layout);
+     }
 fail:
    EINA_LIST_FOREACH(hide_cbs, l, hide_cb)
      hide_cb();
-   E_FREE(edd);
    return 0;
 }
 
@@ -356,7 +275,7 @@ e_desklock_hide(void)
    E_Event_Desklock *ev;
    E_Desklock_Hide_Cb hide_cb;
 
-   if ((!edd) && (!_e_custom_desklock_exe)) return;
+   if ((!_e_desklock_state) && (!_e_custom_desklock_exe)) return;
 
    E_LIST_FOREACH(e_comp_list(), e_comp_override_del);
    E_FREE_LIST(block_rects, evas_object_del);
@@ -382,16 +301,11 @@ e_desklock_hide(void)
         return;
      }
 
-   if (!edd) return;
-
    EINA_LIST_FOREACH(hide_cbs, l, hide_cb)
      hide_cb();
 
-   E_FREE_LIST(edd->elock_wnd_list, _e_desklock_popup_free);
-   E_FREE_LIST(edd->handlers, ecore_event_handler_del);
-   if (edd->move_handler) ecore_event_handler_del(edd->move_handler);
-
-   E_FREE(edd);
+   if (destroy_cb)
+     destroy_cb();
 
    if (_e_desklock_autolock_time > 0.0)
      {
@@ -413,679 +327,12 @@ e_desklock_hide(void)
    e_util_env_set("E_DESKLOCK_LOCKED", "freefreefree");
 }
 
-static void
-_e_desklock_popup_add(E_Zone *zone)
-{
-   E_Desklock_Popup_Data *edp;
-   E_Config_Desklock_Background *cbg;
-   const char *bg;
-   Evas *evas;
-
-   cbg = eina_list_nth(e_config->desklock_backgrounds, zone->num);
-   bg = cbg ? cbg->file : NULL;
-   edp = E_NEW(E_Desklock_Popup_Data, 1);
-
-   edp->zone = zone;
-   evas = e_comp_get(zone)->evas;
-   evas_event_freeze(evas);
-   edp->bg_object = edje_object_add(evas);
-   evas_object_name_set(edp->bg_object, "desklock->bg_object");
-
-   if ((!bg) || (!strcmp(bg, "theme_desklock_background")))
-     {
-        e_theme_edje_object_set(edp->bg_object,
-                                "base/theme/desklock",
-                                "e/desklock/background");
-     }
-   else if (!strcmp(bg, "theme_background"))
-     {
-        e_theme_edje_object_set(edp->bg_object,
-                                "base/theme/backgrounds",
-                                "e/desktop/background");
-     }
-   else
-     {
-        const char *f;
-
-        if (!strcmp(bg, "user_background"))
-          f = _user_wallpaper_get(zone);
-        else
-          f = bg;
-
-        if (e_util_edje_collection_exists(f, "e/desklock/background"))
-          {
-             edje_object_file_set(edp->bg_object, f, "e/desklock/background");
-          }
-        else
-          {
-             if (!edje_object_file_set(edp->bg_object,
-                                       f, "e/desktop/background"))
-               {
-                  edje_object_file_set(edp->bg_object,
-                                       e_theme_edje_file_get("base/theme/desklock",
-                                                             "e/desklock/background"),
-                                       "e/desklock/background");
-               }
-          }
-     }
-
-   evas_object_move(edp->bg_object, zone->x, zone->y);
-   evas_object_resize(edp->bg_object, zone->w, zone->h);
-   evas_object_show(edp->bg_object);
-   edp->comp_object = e_comp_object_util_add(edp->bg_object, 0);
-   evas_object_layer_set(edp->comp_object, E_LAYER_DESKLOCK);
-   evas_object_clip_set(edp->comp_object, edp->zone->bg_clip_object);
-
-   _e_desklock_login_box_add(edp);
-   evas_event_thaw(evas);
-
-   edd->elock_wnd_list = eina_list_append(edd->elock_wnd_list, edp);
-}
-
-static void
-_e_desklock_login_box_add(E_Desklock_Popup_Data *edp)
-{
-   int mw, mh;
-   E_Zone *zone, *current_zone;
-   int total_zone_num;
-   Evas *evas;
-
-   zone = edp->zone;
-   last_active_zone = current_zone = e_util_zone_current_get(e_manager_current_get());
-   total_zone_num = _e_desklock_zone_num_get();
-   if (total_zone_num > 1)
-     {
-        if ((e_config->desklock_login_box_zone == -2) && (zone != current_zone))
-          return;
-        if ((e_config->desklock_login_box_zone > -1) && (e_config->desklock_login_box_zone != (int)eina_list_count(edd->elock_wnd_list)))
-          return;
-     }
-
-   evas = evas_object_evas_get(edp->bg_object);
-   edp->login_box = edje_object_add(evas);
-   evas_object_name_set(edp->login_box, "desklock->login_box");
-   e_theme_edje_object_set(edp->login_box,
-                           "base/theme/desklock",
-                           "e/desklock/login_box");
-   edje_object_part_text_set(edp->login_box, "e.text.title",
-                             _("Please enter your unlock password"));
-   edje_object_size_min_calc(edp->login_box, &mw, &mh);
-   if (edje_object_part_exists(edp->bg_object, "e.swallow.login_box"))
-     {
-        edje_extern_object_min_size_set(edp->login_box, mw, mh);
-        edje_object_part_swallow(edp->bg_object, "e.swallow.login_box", edp->login_box);
-     }
-   else
-     {
-        evas_object_resize(edp->login_box, mw, mh);
-        e_comp_object_util_center_on(edp->login_box, edp->comp_object);
-        evas_object_show(edp->login_box);
-        evas_object_layer_set(edp->login_box, E_LAYER_DESKLOCK);
-        evas_object_stack_above(edp->login_box, edp->comp_object);
-     }
-
-   evas_object_clip_set(edp->login_box, edp->zone->bg_clip_object);
-}
-
-static void
-_e_desklock_popup_free(E_Desklock_Popup_Data *edp)
-{
-   if (!edp) return;
-
-   evas_object_hide(edp->comp_object);
-   evas_object_del(edp->comp_object);
-   evas_object_del(edp->bg_object);
-   evas_object_del(edp->login_box);
-
-   free(edp);
-}
-
 EAPI Eina_Bool
 e_desklock_state_get(void)
 {
    return _e_desklock_state;
 }
 
-static Eina_List *
-_e_desklock_popup_find(E_Zone *zone)
-{
-   Eina_List *l;
-   E_Desklock_Popup_Data *edp;
-
-   EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
-     if (edp->zone == zone) return l;
-   return NULL;
-}
-
-static Eina_Bool
-_e_desklock_cb_zone_add(void *data __UNUSED__,
-                        int type __UNUSED__,
-                        void *event)
-{
-   E_Event_Zone_Add *ev = event;
-   if (!edd) return ECORE_CALLBACK_PASS_ON;
-   if ((!edd->move_handler) && (e_config->desklock_login_box_zone == -2))
-     edd->move_handler = ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _e_desklock_cb_mouse_move, NULL);
-   if (!_e_desklock_popup_find(ev->zone)) _e_desklock_popup_add(ev->zone);
-   return ECORE_CALLBACK_PASS_ON;
-}
-
-static Eina_Bool
-_e_desklock_cb_zone_del(void *data __UNUSED__,
-                        int type __UNUSED__,
-                        void *event)
-{
-   E_Event_Zone_Del *ev = event;
-   Eina_List *l;
-   if (!edd) return ECORE_CALLBACK_PASS_ON;
-   if ((eina_list_count(e_util_comp_current_get()->zones) == 1) && (e_config->desklock_login_box_zone == -2))
-     edd->move_handler = ecore_event_handler_del(edd->move_handler);
-
-   l = _e_desklock_popup_find(ev->zone);
-   if (l)
-     {
-        _e_desklock_popup_free(l->data);
-        edd->elock_wnd_list = eina_list_remove_list(edd->elock_wnd_list, l);
-     }
-   return ECORE_CALLBACK_PASS_ON;
-}
-
-static Eina_Bool
-_e_desklock_cb_zone_move_resize(void *data __UNUSED__,
-                                int type __UNUSED__,
-                                void *event)
-{
-   E_Desklock_Popup_Data *edp;
-   Eina_List *l;
-   E_Event_Zone_Move_Resize *ev = event;
-
-   if (!edd) return ECORE_CALLBACK_PASS_ON;
-   EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
-     if (edp->zone == ev->zone)
-       {
-          evas_object_resize(edp->bg_object, ev->zone->w, ev->zone->h);
-          e_comp_object_util_center_on(edp->login_box, edp->comp_object);
-          break;
-       }
-   return ECORE_CALLBACK_PASS_ON;
-}
-
-static Eina_Bool
-_e_desklock_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
-{
-   Ecore_Event_Key *ev = event;
-
-   if (edd->state == E_DESKLOCK_STATE_CHECKING) return ECORE_CALLBACK_DONE;
-
-   if (!strcmp(ev->key, "Escape"))
-     {
-        if (edd->selected)
-          {
-             _e_desklock_unselect();
-             return ECORE_CALLBACK_RENEW;
-          }
-     }
-   else if (!strcmp(ev->key, "KP_Enter"))
-     _e_desklock_check_auth();
-   else if (!strcmp(ev->key, "Return"))
-     _e_desklock_check_auth();
-   else if (!strcmp(ev->key, "BackSpace"))
-     {
-        if (edd->selected)
-          {
-             _e_desklock_null();
-             _e_desklock_unselect();
-             return ECORE_CALLBACK_RENEW;
-          }
-        _e_desklock_backspace();
-     }
-   else if (!strcmp(ev->key, "Delete"))
-     {
-        if (edd->selected)
-          {
-             _e_desklock_null();
-             _e_desklock_unselect();
-             return ECORE_CALLBACK_RENEW;
-          }
-        _e_desklock_delete();
-     }
-   else if ((!strcmp(ev->key, "u") &&
-             (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)))
-     _e_desklock_null();
-   else if ((!strcmp(ev->key, "a") &&
-             (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)))
-     _e_desklock_select();
-   else
-     {
-        /* here we have to grab a password */
-        if (ev->compose)
-          {
-             if (edd->selected)
-               {
-                  _e_desklock_null();
-                  _e_desklock_unselect();
-               }
-             if ((strlen(edd->passwd) < (PASSWD_LEN - strlen(ev->compose))))
-               {
-                  strcat(edd->passwd, ev->compose);
-                  _e_desklock_passwd_update();
-               }
-          }
-     }
-
-   return ECORE_CALLBACK_PASS_ON;
-}
-
-static Eina_Bool
-_e_desklock_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
-{
-   E_Desklock_Popup_Data *edp;
-   E_Zone *current_zone;
-   Eina_List *l;
-
-   current_zone = e_util_zone_current_get(e_manager_current_get());
-
-   if (current_zone == last_active_zone)
-     return ECORE_CALLBACK_PASS_ON;
-
-   EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
-     {
-        if (!edp) continue;
-
-        if (edp->zone != current_zone)
-          {
-             if (edp->login_box) evas_object_hide(edp->login_box);
-             continue;
-          }
-        if (edp->login_box)
-          evas_object_show(edp->login_box);
-        else
-          _e_desklock_login_box_add(edp);
-     }
-   _e_desklock_passwd_update();
-   last_active_zone = current_zone;
-   return ECORE_CALLBACK_PASS_ON;
-}
-
-static void
-_e_desklock_passwd_update(void)
-{
-   int len, i;
-   char passwd_hidden[PASSWD_LEN] = "", *pp;
-   E_Desklock_Popup_Data *edp;
-   Eina_List *l;
-
-   if (!edd) return;
-
-   len = eina_unicode_utf8_get_len(edd->passwd);
-   for (i = 0, pp = passwd_hidden; i < len; i++, pp++)
-     *pp = '*';
-   *pp = 0;
-
-   EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
-     if (edp->login_box)
-       edje_object_part_text_set(edp->login_box, "e.text.password",
-                                 passwd_hidden);
-}
-
-static void
-_e_desklock_select(void)
-{
-   E_Desklock_Popup_Data *edp;
-   Eina_List *l;
-   EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
-     if (edp->login_box)
-       edje_object_signal_emit(edp->login_box, "e,state,selected", "e");
-   edd->selected = EINA_TRUE;
-}
-
-static void
-_e_desklock_unselect(void)
-{
-   E_Desklock_Popup_Data *edp;
-   Eina_List *l;
-   EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
-     if (edp->login_box)
-       edje_object_signal_emit(edp->login_box, "e,state,unselected", "e");
-   edd->selected = EINA_FALSE;
-}
-
-static void
-_e_desklock_null(void)
-{
-   memset(edd->passwd, 0, sizeof(char) * PASSWD_LEN);
-   _e_desklock_passwd_update();
-}
-
-static void
-_e_desklock_backspace(void)
-{
-   int len, val, pos;
-
-   if (!edd) return;
-
-   len = strlen(edd->passwd);
-   if (len > 0)
-     {
-        pos = evas_string_char_prev_get(edd->passwd, len, &val);
-        if ((pos < len) && (pos >= 0))
-          {
-             edd->passwd[pos] = 0;
-             _e_desklock_passwd_update();
-          }
-     }
-}
-
-static void
-_e_desklock_delete(void)
-{
-   _e_desklock_backspace();
-}
-
-static int
-_e_desklock_zone_num_get(void)
-{
-   int num;
-   Eina_List *l;
-   E_Manager *man;
-
-   num = 0;
-   EINA_LIST_FOREACH(e_manager_list(), l, man)
-     num += eina_list_count(man->comp->zones);
-
-   return num;
-}
-
-static int
-_e_desklock_check_auth(void)
-{
-   if (!edd) return 0;
-#ifdef HAVE_PAM
-   if (e_config->desklock_auth_method == 0)
-     {
-        int ret;
-
-        ret = _desklock_auth(edd->passwd);
-        // passwd off in child proc now - null out from parent
-        memset(edd->passwd, 0, sizeof(char) * PASSWD_LEN);
-        return ret;
-     }
-   else if (e_config->desklock_auth_method == 1)
-     {
-#endif
-   if ((e_config->desklock_passwd) && (edd->passwd && edd->passwd[0]) &&
-       (e_config->desklock_passwd == eina_hash_djb2(edd->passwd, strlen(edd->passwd))))
-     {
-        /* password ok */
-        /* security - null out passwd string once we are done with it */
-        memset(edd->passwd, 0, sizeof(char) * PASSWD_LEN);
-        e_desklock_hide();
-        return 1;
-     }
-#ifdef HAVE_PAM
-}
-
-#endif
-   /* password is definitely wrong */
-   _e_desklock_state_set(E_DESKLOCK_STATE_INVALID);
-   _e_desklock_null();
-   return 0;
-}
-
-static void
-_e_desklock_state_set(int state)
-{
-   Eina_List *l;
-   E_Desklock_Popup_Data *edp;
-   const char *signal_desklock, *text;
-   if (!edd) return;
-
-   edd->state = state;
-   if (state == E_DESKLOCK_STATE_CHECKING)
-     {
-        signal_desklock = "e,state,checking";
-        text = _("Authenticating...");
-     }
-   else if (state == E_DESKLOCK_STATE_INVALID)
-     {
-        signal_desklock = "e,state,invalid";
-        text = _("The password you entered is invalid. Try again.");
-     }
-   else
-     return;
-
-   EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
-     {
-        edje_object_signal_emit(edp->login_box, signal_desklock, "e");
-        edje_object_signal_emit(edp->bg_object, signal_desklock, "e");
-        edje_object_part_text_set(edp->login_box, "e.text.title", text);
-     }
-}
-
-#ifdef HAVE_PAM
-static Eina_Bool
-_e_desklock_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
-{
-   Ecore_Exe_Event_Del *ev = event;
-
-   if (ev->pid == _e_desklock_child_pid)
-     {
-        _e_desklock_child_pid = -1;
-        /* ok */
-        if (ev->exit_code == 0)
-          {
-             /* security - null out passwd string once we are done with it */
-             memset(edd->passwd, 0, sizeof(char) * PASSWD_LEN);
-             e_desklock_hide();
-          }
-        /* error */
-        else if (ev->exit_code < 128)
-          {
-             /* security - null out passwd string once we are done with it */
-             memset(edd->passwd, 0, sizeof(char) * PASSWD_LEN);
-             e_desklock_hide();
-             e_util_dialog_show(_("Authentication System Error"),
-                                _("Authentication via PAM had errors setting up the<br>"
-                                  "authentication session. The error code was <hilight>%i</hilight>.<br>"
-                                  "This is bad and should not be happening. Please report this bug.")
-                                , ev->exit_code);
-          }
-        /* failed auth */
-        else
-          {
-             _e_desklock_state_set(E_DESKLOCK_STATE_INVALID);
-             /* security - null out passwd string once we are done with it */
-             _e_desklock_null();
-          }
-        if (_e_desklock_exit_handler)
-          ecore_event_handler_del(_e_desklock_exit_handler);
-        _e_desklock_exit_handler = NULL;
-     }
-   return ECORE_CALLBACK_PASS_ON;
-}
-
-static int
-_desklock_auth(char *passwd)
-{
-   _e_desklock_state_set(E_DESKLOCK_STATE_CHECKING);
-   _e_desklock_child_pid = fork();
-   if (_e_desklock_child_pid > 0)
-     {
-        /* parent */
-        _e_desklock_exit_handler =
-          ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_desklock_cb_exit,
-                                  NULL);
-     }
-   else if (_e_desklock_child_pid == 0)
-     {
-        /* child */
-        int pamerr;
-        E_Desklock_Auth da;
-        char *current_user, *p;
-        struct sigaction action;
-
-        action.sa_handler = SIG_DFL;
-        action.sa_flags = SA_ONSTACK | SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
-        sigemptyset(&action.sa_mask);
-        sigaction(SIGSEGV, &action, NULL);
-        sigaction(SIGILL, &action, NULL);
-        sigaction(SIGFPE, &action, NULL);
-        sigaction(SIGBUS, &action, NULL);
-        sigaction(SIGABRT, &action, NULL);
-
-        current_user = _desklock_auth_get_current_user();
-        eina_strlcpy(da.user, current_user, sizeof(da.user));
-        eina_strlcpy(da.passwd, passwd, sizeof(da.passwd));
-        /* security - null out passwd string once we are done with it */
-        for (p = passwd; *p; p++)
-          *p = 0;
-        da.pam.handle = NULL;
-        da.pam.conv.conv = NULL;
-        da.pam.conv.appdata_ptr = NULL;
-
-        pamerr = _desklock_pam_init(&da);
-        if (pamerr != PAM_SUCCESS)
-          {
-             free(current_user);
-             exit(1);
-          }
-        pamerr = pam_authenticate(da.pam.handle, 0);
-        pam_end(da.pam.handle, pamerr);
-        /* security - null out passwd string once we are done with it */
-        memset(da.passwd, 0, sizeof(da.passwd));
-        if (pamerr == PAM_SUCCESS)
-          {
-             free(current_user);
-             exit(0);
-          }
-        free(current_user);
-        exit(-1);
-     }
-   else
-     {
-        _e_desklock_state_set(E_DESKLOCK_STATE_INVALID);
-        return 0;
-     }
-   return 1;
-}
-
-static char *
-_desklock_auth_get_current_user(void)
-{
-   char *user;
-   struct passwd *pwent = NULL;
-
-   pwent = getpwuid(getuid());
-   user = strdup(pwent->pw_name);
-   return user;
-}
-
-static int
-_desklock_pam_init(E_Desklock_Auth *da)
-{
-   int pamerr;
-   const char *pam_prof;
-   char *current_host;
-   char *current_user;
-
-   if (!da) return -1;
-
-   da->pam.conv.conv = _desklock_auth_pam_conv;
-   da->pam.conv.appdata_ptr = da;
-   da->pam.handle = NULL;
-
-   /* try other pam profiles - and system-auth (login for fbsd users) is a fallback */
-   pam_prof = "login";
-   if (ecore_file_exists("/etc/pam.d/enlightenment"))
-     pam_prof = "enlightenment";
-   else if (ecore_file_exists("/etc/pam.d/xscreensaver"))
-     pam_prof = "xscreensaver";
-   else if (ecore_file_exists("/etc/pam.d/kscreensaver"))
-     pam_prof = "kscreensaver";
-   else if (ecore_file_exists("/etc/pam.d/system-auth"))
-     pam_prof = "system-auth";
-   else if (ecore_file_exists("/etc/pam.d/system"))
-     pam_prof = "system";
-   else if (ecore_file_exists("/etc/pam.d/xdm"))
-     pam_prof = "xdm";
-   else if (ecore_file_exists("/etc/pam.d/gdm"))
-     pam_prof = "gdm";
-   else if (ecore_file_exists("/etc/pam.d/kdm"))
-     pam_prof = "kdm";
-
-   if ((pamerr = pam_start(pam_prof, da->user, &(da->pam.conv),
-                           &(da->pam.handle))) != PAM_SUCCESS)
-     return pamerr;
-
-   current_user = _desklock_auth_get_current_user();
-
-   if ((pamerr = pam_set_item(da->pam.handle, PAM_USER, current_user)) != PAM_SUCCESS)
-     {
-        free(current_user);
-        return pamerr;
-     }
-
-   current_host = _desklock_auth_get_current_host();
-   if ((pamerr = pam_set_item(da->pam.handle, PAM_RHOST, current_host)) != PAM_SUCCESS)
-     {
-        free(current_user);
-        free(current_host);
-        return pamerr;
-     }
-
-   free(current_user);
-   free(current_host);
-   return 0;
-}
-
-static int
-_desklock_auth_pam_conv(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr)
-{
-   int replies = 0;
-   E_Desklock_Auth *da = (E_Desklock_Auth *)appdata_ptr;
-   struct pam_response *reply = NULL;
-
-   reply = (struct pam_response *)malloc(sizeof(struct pam_response) * num_msg);
-
-   if (!reply) return PAM_CONV_ERR;
-
-   for (replies = 0; replies < num_msg; replies++)
-     {
-        switch (msg[replies]->msg_style)
-          {
-           case PAM_PROMPT_ECHO_ON:
-             reply[replies].resp_retcode = PAM_SUCCESS;
-             reply[replies].resp = strdup(da->user);
-             break;
-
-           case PAM_PROMPT_ECHO_OFF:
-             reply[replies].resp_retcode = PAM_SUCCESS;
-             reply[replies].resp = strdup(da->passwd);
-             break;
-
-           case PAM_ERROR_MSG:
-           case PAM_TEXT_INFO:
-             reply[replies].resp_retcode = PAM_SUCCESS;
-             reply[replies].resp = NULL;
-             break;
-
-           default:
-             free(reply);
-             return PAM_CONV_ERR;
-          }
-     }
-   *resp = reply;
-   return PAM_SUCCESS;
-}
-
-static char *
-_desklock_auth_get_current_host(void)
-{
-   return strdup("localhost");
-}
-
-#endif
-
 static Eina_Bool
 _e_desklock_cb_custom_desklock_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
@@ -1111,7 +358,7 @@ _e_desklock_cb_idle_poller(void *data __UNUSED__)
         double idle, max;
 
         /* If a desklock is already up, bail */
-        if ((_e_custom_desklock_exe) || (edd)) return ECORE_CALLBACK_RENEW;
+        if ((_e_custom_desklock_exe) || (_e_desklock_state)) return ECORE_CALLBACK_RENEW;
 
         idle = ecore_x_screensaver_idle_time_get();
         max = e_config->desklock_autolock_idle_timeout;
diff --git a/src/bin/e_desklock.h b/src/bin/e_desklock.h
index bd2ae2b495..f534fc0060 100644
--- a/src/bin/e_desklock.h
+++ b/src/bin/e_desklock.h
@@ -36,6 +36,9 @@ EAPI int e_desklock_show_autolocked(void);
 EAPI void e_desklock_hide(void);
 EAPI Eina_Bool e_desklock_state_get(void);
 
+EAPI void e_desklock_create_callback_set(E_Desklock_Show_Cb cb);
+EAPI void e_desklock_destroy_callback_set(E_Desklock_Hide_Cb cb);
+EAPI Eina_Stringshare *e_desklock_user_wallpaper_get(E_Zone *zone);
 EAPI void e_desklock_show_hook_add(E_Desklock_Show_Cb cb);
 EAPI void e_desklock_show_hook_del(E_Desklock_Show_Cb cb);
 EAPI void e_desklock_hide_hook_add(E_Desklock_Hide_Cb cb);
diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 48338cc8a2..887037d315 100644
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -7,6 +7,7 @@
 #include "e_error.h"
 #include "e_zone.h"
 #include "e_desk.h"
+#include "e_auth.h"
 #ifndef WAYLAND_ONLY
 #  include "e_comp_x.h"
 #endif
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index e1e41cceee..05d228a934 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -903,6 +903,7 @@ _e_module_whitelist_check(void)
       "ibar",
       "ibox",
       "layout",
+      "lokker",
       "mixer",
       "msgbus",
       "notification",
diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk
index df9a492a58..06f83aa2a8 100644
--- a/src/modules/Makefile.mk
+++ b/src/modules/Makefile.mk
@@ -194,6 +194,10 @@ if USE_MODULE_TEAMWORK
 include src/modules/Makefile_teamwork.mk
 endif
 
+if USE_MODULE_LOKKER
+include src/modules/Makefile_lokker.mk
+endif
+
 if USE_MODULE_SHOT
 include src/modules/Makefile_shot.mk
 endif
diff --git a/src/modules/Makefile_lokker.mk b/src/modules/Makefile_lokker.mk
new file mode 100644
index 0000000000..7e7a763909
--- /dev/null
+++ b/src/modules/Makefile_lokker.mk
@@ -0,0 +1,23 @@
+lokkerdir = $(MDIR)/lokker
+lokker_DATA = \
+src/modules/lokker/module.desktop
+##src/modules/lokker/e-module-lokker.edj \
+
+EXTRA_DIST += $(lokker_DATA)
+
+lokkerpkgdir = $(MDIR)/lokker/$(MODULE_ARCH)
+lokkerpkg_LTLIBRARIES = src/modules/lokker/module.la
+
+src_modules_lokker_module_la_CPPFLAGS = $(MOD_CPPFLAGS) \
+@EMOTION_CFLAGS@
+src_modules_lokker_module_la_LIBADD = $(MOD_LIBS) \
+@EMOTION_LIBS@
+
+src_modules_lokker_module_la_LDFLAGS = $(MOD_LDFLAGS)
+src_modules_lokker_module_la_SOURCES = src/modules/lokker/e_mod_main.c \
+src/modules/lokker/lokker.c \
+src/modules/lokker/e_mod_main.h
+
+PHONIES += lokker install-lokker
+lokker: $(lokkerpkg_LTLIBRARIES) $(lokker_DATA)
+install-lokker: install-lokkerDATA install-lokkerpkgLTLIBRARIES
diff --git a/src/modules/lokker/e_mod_main.c b/src/modules/lokker/e_mod_main.c
new file mode 100644
index 0000000000..740a5e0538
--- /dev/null
+++ b/src/modules/lokker/e_mod_main.c
@@ -0,0 +1,32 @@
+#include "e_mod_main.h"
+
+EINTERN int _e_lokker_log_dom = -1;
+
+EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, "Lokker"};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   _e_lokker_log_dom = eina_log_domain_register("lokker", EINA_COLOR_ORANGE);
+   eina_log_domain_level_set("lokker", EINA_LOG_LEVEL_DBG);
+
+   e_desklock_create_callback_set(lokker_lock);
+   e_desklock_destroy_callback_set(lokker_unlock);
+
+   if (e_desklock_state_get())
+     lokker_lock();
+
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m EINA_UNUSED)
+{
+   e_desklock_create_callback_set(NULL);
+   e_desklock_destroy_callback_set(NULL);
+
+   eina_log_domain_unregister(_e_lokker_log_dom);
+   _e_lokker_log_dom = -1;
+
+   return 1;
+}
diff --git a/src/modules/lokker/e_mod_main.h b/src/modules/lokker/e_mod_main.h
new file mode 100644
index 0000000000..7b885254c1
--- /dev/null
+++ b/src/modules/lokker/e_mod_main.h
@@ -0,0 +1,24 @@
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "e.h"
+
+#undef DBG
+#undef INF
+#undef WRN
+#undef ERR
+#undef CRIT
+#define DBG(...)  EINA_LOG_DOM_DBG(_e_lokker_log_dom, __VA_ARGS__)
+#define INF(...)  EINA_LOG_DOM_INFO(_e_lokker_log_dom, __VA_ARGS__)
+#define WRN(...)  EINA_LOG_DOM_WARN(_e_lokker_log_dom, __VA_ARGS__)
+#define ERR(...)  EINA_LOG_DOM_ERR(_e_lokker_log_dom, __VA_ARGS__)
+#define CRIT(...) EINA_LOG_DOM_CRIT(_e_lokker_log_dom, __VA_ARGS__)
+
+EINTERN Eina_Bool lokker_lock(void);
+EINTERN void lokker_unlock(void);
+
+#endif
diff --git a/src/modules/lokker/lokker.c b/src/modules/lokker/lokker.c
new file mode 100644
index 0000000000..d42c0b9d29
--- /dev/null
+++ b/src/modules/lokker/lokker.c
@@ -0,0 +1,575 @@
+#include "e_mod_main.h"
+
+#define PASSWD_LEN                256
+
+typedef enum
+{
+   LOKKER_STATE_DEFAULT,
+   LOKKER_STATE_CHECKING,
+   LOKKER_STATE_INVALID,
+   LOKKER_STATE_LAST,
+} Lokker_State;
+
+typedef struct Lokker_Popup
+{
+   E_Zone *zone;
+   Evas_Object *comp_object;
+   Evas_Object *bg_object;
+   Evas_Object *login_box;
+} Lokker_Popup;
+
+typedef struct Lokker_Data
+{
+   Eina_List           *elock_wnd_list;
+   Eina_List           *handlers;
+   Ecore_Event_Handler *move_handler;
+   char                 passwd[PASSWD_LEN];
+   int                  state;
+   Eina_Bool            selected : 1;
+} Lokker_Data;
+
+static pid_t _auth_child_pid = -1;
+static Ecore_Event_Handler *_auth_child_exit_handler = NULL;
+static E_Zone *last_active_zone = NULL;
+
+static Lokker_Data *edd = NULL;
+
+static int
+_zone_count_get(void)
+{
+   int num = 0;
+   const Eina_List *l;
+   E_Comp *comp;
+
+   EINA_LIST_FOREACH(e_comp_list(), l, comp)
+     num += eina_list_count(comp->zones);
+
+   return num;
+}
+
+static void
+_lokker_state_set(int state)
+{
+   Eina_List *l;
+   Lokker_Popup *lp;
+   const char *signal_desklock, *text;
+   if (!edd) return;
+
+   edd->state = state;
+   if (state == LOKKER_STATE_CHECKING)
+     {
+        signal_desklock = "e,state,checking";
+        text = _("Authenticating...");
+     }
+   else if (state == LOKKER_STATE_INVALID)
+     {
+        signal_desklock = "e,state,invalid";
+        text = _("The password you entered is invalid. Try again.");
+     }
+   else
+     return;
+
+   EINA_LIST_FOREACH(edd->elock_wnd_list, l, lp)
+     {
+        edje_object_signal_emit(lp->login_box, signal_desklock, "e");
+        edje_object_signal_emit(lp->bg_object, signal_desklock, "e");
+        edje_object_part_text_set(lp->login_box, "e.text.title", text);
+     }
+}
+
+static void
+_text_passwd_update(void)
+{
+   int len, i;
+   char passwd_hidden[PASSWD_LEN] = "", *pp;
+   Lokker_Popup *lp;
+   Eina_List *l;
+
+   if (!edd) return;
+
+   len = eina_unicode_utf8_get_len(edd->passwd);
+   for (i = 0, pp = passwd_hidden; i < len; i++, pp++)
+     *pp = '*';
+   *pp = 0;
+
+   EINA_LIST_FOREACH(edd->elock_wnd_list, l, lp)
+     if (lp->login_box)
+       edje_object_part_text_set(lp->login_box, "e.text.password",
+                                 passwd_hidden);
+}
+
+static void
+_lokker_null(void)
+{
+   memset(edd->passwd, 0, sizeof(char) * PASSWD_LEN);
+   /* break compiler optimization */
+   if (edd->passwd[0] || edd->passwd[3])
+     fprintf(stderr, "ACK!\n");
+   _text_passwd_update();
+}
+
+
+static void
+_lokker_select(void)
+{
+   Lokker_Popup *lp;
+   Eina_List *l;
+   EINA_LIST_FOREACH(edd->elock_wnd_list, l, lp)
+     if (lp->login_box)
+       edje_object_signal_emit(lp->login_box, "e,state,selected", "e");
+   edd->selected = EINA_TRUE;
+}
+
+static void
+_lokker_unselect(void)
+{
+   Lokker_Popup *lp;
+   Eina_List *l;
+   EINA_LIST_FOREACH(edd->elock_wnd_list, l, lp)
+     if (lp->login_box)
+       edje_object_signal_emit(lp->login_box, "e,state,unselected", "e");
+   edd->selected = EINA_FALSE;
+}
+
+static void
+_lokker_backspace(void)
+{
+   int len, val, pos;
+
+   if (!edd) return;
+
+   len = strlen(edd->passwd);
+   if (len > 0)
+     {
+        pos = evas_string_char_prev_get(edd->passwd, len, &val);
+        if ((pos < len) && (pos >= 0))
+          {
+             edd->passwd[pos] = 0;
+             _text_passwd_update();
+          }
+     }
+}
+
+static void
+_lokker_delete(void)
+{
+   _lokker_backspace();
+}
+
+
+static void
+_text_login_box_add(Lokker_Popup *lp)
+{
+   int mw, mh;
+   E_Zone *zone, *current_zone;
+   int total_zone_num;
+   Evas *evas;
+
+   zone = lp->zone;
+   last_active_zone = current_zone = e_util_zone_current_get(e_manager_current_get());
+   total_zone_num = _zone_count_get();
+   if (total_zone_num > 1)
+     {
+        if ((e_config->desklock_login_box_zone == -2) && (zone != current_zone))
+          return;
+        if ((e_config->desklock_login_box_zone > -1) && (e_config->desklock_login_box_zone != (int)eina_list_count(edd->elock_wnd_list)))
+          return;
+     }
+
+   evas = evas_object_evas_get(lp->bg_object);
+   lp->login_box = edje_object_add(evas);
+   evas_object_name_set(lp->login_box, "desklock->login_box");
+   e_theme_edje_object_set(lp->login_box,
+                           "base/theme/desklock",
+                           "e/desklock/login_box");
+   edje_object_part_text_set(lp->login_box, "e.text.title",
+                             _("Please enter your unlock password"));
+   edje_object_size_min_calc(lp->login_box, &mw, &mh);
+   if (edje_object_part_exists(lp->bg_object, "e.swallow.login_box"))
+     {
+        edje_extern_object_min_size_set(lp->login_box, mw, mh);
+        edje_object_part_swallow(lp->bg_object, "e.swallow.login_box", lp->login_box);
+     }
+   else
+     {
+        evas_object_resize(lp->login_box, mw, mh);
+        e_comp_object_util_center_on(lp->login_box, lp->comp_object);
+        evas_object_show(lp->login_box);
+        evas_object_layer_set(lp->login_box, E_LAYER_DESKLOCK);
+        evas_object_stack_above(lp->login_box, lp->comp_object);
+     }
+
+   evas_object_clip_set(lp->login_box, lp->zone->bg_clip_object);
+}
+
+static void
+_lokker_popup_add(E_Zone *zone)
+{
+   Lokker_Popup *lp;
+   E_Config_Desklock_Background *cbg;
+   Eina_Stringshare *bg;
+   Evas *evas;
+
+   lp = E_NEW(Lokker_Popup, 1);
+   cbg = eina_list_nth(e_config->desklock_backgrounds, zone->num);
+   bg = cbg ? cbg->file : NULL;
+
+   lp->zone = zone;
+   evas = e_comp_get(zone)->evas;
+   evas_event_freeze(evas);
+   lp->bg_object = edje_object_add(evas);
+   evas_object_name_set(lp->bg_object, "desklock->bg_object");
+
+   if ((!bg) || (!strcmp(bg, "theme_desklock_background")))
+     {
+        e_theme_edje_object_set(lp->bg_object,
+                                "base/theme/desklock",
+                                "e/desklock/background");
+     }
+   else if (!strcmp(bg, "theme_background"))
+     {
+        e_theme_edje_object_set(lp->bg_object,
+                                "base/theme/backgrounds",
+                                "e/desktop/background");
+     }
+   else
+     {
+        Eina_Stringshare *f;
+
+        if (!strcmp(bg, "user_background"))
+          f = e_desklock_user_wallpaper_get(zone);
+        else
+          f = bg;
+
+        if (e_util_edje_collection_exists(f, "e/desklock/background"))
+          {
+             edje_object_file_set(lp->bg_object, f, "e/desklock/background");
+          }
+        else
+          {
+             if (!edje_object_file_set(lp->bg_object,
+                                       f, "e/desktop/background"))
+               {
+                  edje_object_file_set(lp->bg_object,
+                                       e_theme_edje_file_get("base/theme/desklock",
+                                                             "e/desklock/background"),
+                                       "e/desklock/background");
+               }
+          }
+     }
+
+   evas_object_move(lp->bg_object, zone->x, zone->y);
+   evas_object_resize(lp->bg_object, zone->w, zone->h);
+   evas_object_show(lp->bg_object);
+   lp->comp_object = e_comp_object_util_add(lp->bg_object, 0);
+   evas_object_layer_set(lp->comp_object, E_LAYER_DESKLOCK);
+   evas_object_clip_set(lp->comp_object, lp->zone->bg_clip_object);
+
+   _text_login_box_add(lp);
+
+   evas_event_thaw(evas);
+
+   edd->elock_wnd_list = eina_list_append(edd->elock_wnd_list, lp);
+}
+
+static void
+_lokker_popup_free(Lokker_Popup *lp)
+{
+   if (!lp) return;
+
+   evas_object_hide(lp->comp_object);
+   evas_object_del(lp->comp_object);
+   evas_object_del(lp->bg_object);
+   evas_object_del(lp->login_box);
+
+   free(lp);
+}
+
+static Eina_List *
+_lokker_popup_find(E_Zone *zone)
+{
+   Eina_List *l;
+   Lokker_Popup *lp;
+
+   EINA_LIST_FOREACH(edd->elock_wnd_list, l, lp)
+     if (lp->zone == zone) return l;
+   return NULL;
+}
+
+static Eina_Bool
+_lokker_cb_mouse_move(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
+{
+   Lokker_Popup *lp;
+   E_Zone *current_zone;
+   Eina_List *l;
+
+   current_zone = e_util_zone_current_get(e_manager_current_get());
+
+   if (current_zone == last_active_zone)
+     return ECORE_CALLBACK_PASS_ON;
+
+   EINA_LIST_FOREACH(edd->elock_wnd_list, l, lp)
+     {
+        if (!lp) continue;
+
+        if (lp->zone != current_zone)
+          {
+             if (lp->login_box) evas_object_hide(lp->login_box);
+             continue;
+          }
+        if (lp->login_box)
+          evas_object_show(lp->login_box);
+        else
+          _text_login_box_add(lp);
+     }
+   _text_passwd_update();
+   last_active_zone = current_zone;
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_lokker_cb_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
+{
+   Ecore_Exe_Event_Del *ev = event;
+
+   if (ev->pid != _auth_child_pid) return ECORE_CALLBACK_PASS_ON;
+
+   _auth_child_pid = -1;
+   /* ok */
+   if (ev->exit_code == 0)
+     {
+        /* security - null out passwd string once we are done with it */
+        _lokker_null();
+        e_desklock_hide();
+     }
+   /* error */
+   else if (ev->exit_code < 128)
+     {
+        /* security - null out passwd string once we are done with it */
+        _lokker_null();
+        e_desklock_hide();
+        e_util_dialog_show(_("Authentication System Error"),
+                           _("Authentication via PAM had errors setting up the<br>"
+                             "authentication session. The error code was <hilight>%i</hilight>.<br>"
+                             "This is bad and should not be happening. Please report this bug.")
+                           , ev->exit_code);
+     }
+   /* failed auth */
+   else
+     {
+        _lokker_state_set(LOKKER_STATE_INVALID);
+        /* security - null out passwd string once we are done with it */
+        _lokker_null();
+     }
+   E_FREE_FUNC(_auth_child_exit_handler, ecore_event_handler_del);
+   return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
+_lokker_cb_zone_add(void *data EINA_UNUSED,
+                        int type EINA_UNUSED,
+                        void *event)
+{
+   E_Event_Zone_Add *ev = event;
+   if (!edd) return ECORE_CALLBACK_PASS_ON;
+   if ((!edd->move_handler) && (e_config->desklock_login_box_zone == -2))
+     edd->move_handler = ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _lokker_cb_mouse_move, NULL);
+   if (!_lokker_popup_find(ev->zone)) _lokker_popup_add(ev->zone);
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_lokker_cb_zone_del(void *data EINA_UNUSED,
+                        int type EINA_UNUSED,
+                        void *event)
+{
+   E_Event_Zone_Del *ev = event;
+   Eina_List *l;
+   if (!edd) return ECORE_CALLBACK_PASS_ON;
+   if ((eina_list_count(e_util_comp_current_get()->zones) == 1) && (e_config->desklock_login_box_zone == -2))
+     edd->move_handler = ecore_event_handler_del(edd->move_handler);
+
+   l = _lokker_popup_find(ev->zone);
+   if (l)
+     {
+        _lokker_popup_free(l->data);
+        edd->elock_wnd_list = eina_list_remove_list(edd->elock_wnd_list, l);
+     }
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_lokker_cb_zone_move_resize(void *data EINA_UNUSED,
+                                int type EINA_UNUSED,
+                                void *event)
+{
+   Lokker_Popup *lp;
+   Eina_List *l;
+   E_Event_Zone_Move_Resize *ev = event;
+
+   if (!edd) return ECORE_CALLBACK_PASS_ON;
+   EINA_LIST_FOREACH(edd->elock_wnd_list, l, lp)
+     if (lp->zone == ev->zone)
+       {
+          evas_object_resize(lp->bg_object, ev->zone->w, ev->zone->h);
+          e_comp_object_util_center_on(lp->login_box, lp->comp_object);
+          break;
+       }
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static int
+_desklock_auth(char *passwd)
+{
+   _lokker_state_set(LOKKER_STATE_CHECKING);
+   _auth_child_pid = e_auth_begin(passwd);
+   if (_auth_child_pid > 0)
+     /* parent */
+     _auth_child_exit_handler =
+       ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _lokker_cb_exit, NULL);
+   else
+     _lokker_state_set(LOKKER_STATE_INVALID);
+   return (_auth_child_pid > 0);
+}
+
+static int
+_lokker_check_auth(void)
+{
+   if (!edd) return 0;
+#ifdef HAVE_PAM
+   if (e_config->desklock_auth_method == 0)
+     {
+        int ret;
+
+        ret = _desklock_auth(edd->passwd);
+        // passwd off in child proc now - null out from parent
+        _lokker_null();
+        return ret;
+     }
+   else if (e_config->desklock_auth_method == 1)
+     {
+#endif
+   if ((e_config->desklock_passwd) && (edd->passwd && edd->passwd[0]) &&
+       (e_config->desklock_passwd == eina_hash_djb2(edd->passwd, strlen(edd->passwd))))
+     {
+        /* password ok */
+        /* security - null out passwd string once we are done with it */
+        _lokker_null();
+        e_desklock_hide();
+        return 1;
+     }
+#ifdef HAVE_PAM
+}
+
+#endif
+   /* password is definitely wrong */
+   _lokker_state_set(LOKKER_STATE_INVALID);
+   _lokker_null();
+   return 0;
+}
+
+static Eina_Bool
+_lokker_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
+{
+   Ecore_Event_Key *ev = event;
+
+   if (edd->state == LOKKER_STATE_CHECKING) return ECORE_CALLBACK_DONE;
+
+   if (!strcmp(ev->key, "Escape"))
+     {
+        if (edd->selected)
+          {
+             _lokker_unselect();
+             return ECORE_CALLBACK_RENEW;
+          }
+     }
+   else if (!strcmp(ev->key, "KP_Enter"))
+     _lokker_check_auth();
+   else if (!strcmp(ev->key, "Return"))
+     _lokker_check_auth();
+   else if (!strcmp(ev->key, "BackSpace"))
+     {
+        if (edd->selected)
+          {
+             _lokker_null();
+             _lokker_unselect();
+             return ECORE_CALLBACK_RENEW;
+          }
+        _lokker_backspace();
+     }
+   else if (!strcmp(ev->key, "Delete"))
+     {
+        if (edd->selected)
+          {
+             _lokker_null();
+             _lokker_unselect();
+             return ECORE_CALLBACK_RENEW;
+          }
+        _lokker_delete();
+     }
+   else if ((!strcmp(ev->key, "u") &&
+             (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)))
+     _lokker_null();
+   else if ((!strcmp(ev->key, "a") &&
+             (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)))
+     _lokker_select();
+   else
+     {
+        /* here we have to grab a password */
+        if (ev->compose)
+          {
+             if (edd->selected)
+               {
+                  _lokker_null();
+                  _lokker_unselect();
+               }
+             if ((strlen(edd->passwd) < (PASSWD_LEN - strlen(ev->compose))))
+               {
+                  strcat(edd->passwd, ev->compose);
+                  _text_passwd_update();
+               }
+          }
+     }
+
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+EINTERN Eina_Bool
+lokker_lock(void)
+{
+   int total_zone_num = 0;
+   const Eina_List *l;
+   E_Comp *comp;
+
+   if (edd) return EINA_TRUE;
+   edd = E_NEW(Lokker_Data, 1);
+   if (!edd) return EINA_FALSE;
+
+   EINA_LIST_FOREACH(e_comp_list(), l, comp)
+     {
+        E_LIST_FOREACH(comp->zones, _lokker_popup_add);
+        total_zone_num += eina_list_count(comp->zones);
+     }
+
+   /* handlers */
+   E_LIST_HANDLER_APPEND(edd->handlers, ECORE_EVENT_KEY_DOWN, _lokker_cb_key_down, NULL);
+   E_LIST_HANDLER_APPEND(edd->handlers, E_EVENT_ZONE_ADD, _lokker_cb_zone_add, NULL);
+   E_LIST_HANDLER_APPEND(edd->handlers, E_EVENT_ZONE_DEL, _lokker_cb_zone_del, NULL);
+   E_LIST_HANDLER_APPEND(edd->handlers, E_EVENT_ZONE_MOVE_RESIZE, _lokker_cb_zone_move_resize, NULL);
+
+   if ((total_zone_num > 1) && (e_config->desklock_login_box_zone == -2))
+     edd->move_handler = ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _lokker_cb_mouse_move, NULL);
+
+   _text_passwd_update();
+   return EINA_TRUE;
+}
+
+EINTERN void
+lokker_unlock(void)
+{
+   E_FREE_LIST(edd->elock_wnd_list, _lokker_popup_free);
+   E_FREE_LIST(edd->handlers, ecore_event_handler_del);
+   if (edd->move_handler) ecore_event_handler_del(edd->move_handler);
+
+   E_FREE(edd);
+}
diff --git a/src/modules/lokker/module.desktop.in b/src/modules/lokker/module.desktop.in
new file mode 100644
index 0000000000..6a91b59717
--- /dev/null
+++ b/src/modules/lokker/module.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Link
+Name=Lokker
+Comment=Lock up your Enlightenment
+Icon=e-module-lokker
+X-Enlightenment-ModuleType=core