From 8ff96c07d16b504f973623f05a7c4823a88b7ba9 Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Wed, 23 Dec 2009 00:39:24 +0000
Subject: [PATCH] Separate illume mode toggle into it's own gadget. This makes
 illume2 that much cleaner. Remove mode icon from illume2 edj. Remove gadcon
 files from illume2 (in own gadget now). Modify illume2 e.cfg to include
 illume-mode-toggle gadget and reorder gadgets.

SVN revision: 44671
---
 config/illume-home/e.src                      |  78 +++---------------
 configure.ac                                  |   2 +
 src/modules/Makefile.am                       |   3 +-
 src/modules/illume-mode-toggle/Makefile.am    |  29 +++++++
 .../e-module-illume-mode-toggle.edj           | Bin 0 -> 7377 bytes
 .../e_mod_main.c}                             |  72 +++++++++-------
 src/modules/illume-mode-toggle/e_mod_main.h   |  10 +++
 .../illume-mode-toggle/module.desktop.in      |   6 ++
 src/modules/illume2/Makefile.am               |   4 +-
 src/modules/illume2/e-module-illume2.edj      | Bin 12359 -> 10097 bytes
 src/modules/illume2/e_mod_gadcon.h            |   7 --
 src/modules/illume2/e_mod_main.c              |   8 --
 x-ui.sh                                       |   6 +-
 13 files changed, 106 insertions(+), 119 deletions(-)
 create mode 100644 src/modules/illume-mode-toggle/Makefile.am
 create mode 100644 src/modules/illume-mode-toggle/e-module-illume-mode-toggle.edj
 rename src/modules/{illume2/e_mod_gadcon.c => illume-mode-toggle/e_mod_main.c} (74%)
 create mode 100644 src/modules/illume-mode-toggle/e_mod_main.h
 create mode 100644 src/modules/illume-mode-toggle/module.desktop.in
 delete mode 100644 src/modules/illume2/e_mod_gadcon.h

diff --git a/config/illume-home/e.src b/config/illume-home/e.src
index 245295166..812ed876b 100644
--- a/config/illume-home/e.src
+++ b/config/illume-home/e.src
@@ -32,6 +32,14 @@ group "E_Config" struct {
   value "evas_engine_zone" int: 0;
   value "use_composite" int: 0;
   value "language" string: "en_US.UTF-8";
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "illume-mode-toggle";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 0;
+      value "priority" int: 0;
+    }
+  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "illume-indicator";
@@ -1695,17 +1703,10 @@ group "E_Config" struct {
           value "resizable" uchar: 0;
         }
       }
-    }
-  }
-  group "gadcons" list {
-    group "E_Config_Gadcon" struct {
-      value "name" string: "illume-indicator";
-      value "id" int: 2;
-      value "zone" int: 1;
       group "clients" list {
         group "E_Config_Gadcon_Client" struct {
-          value "name" string: "illume-home";
-          value "id" string: "illume-home.0";
+          value "name" string: "illume-mode-toggle";
+          value "id" string: "illume-mode-toggle.0";
           value "geom.pos" int: 0;
           value "geom.size" int: 32;
           value "geom.res" int: 800;
@@ -1713,64 +1714,7 @@ group "E_Config" struct {
           value "geom.pos_y" double: 0.0000000000000000000000000;
           value "geom.size_w" double: 0.0000000000000000000000000;
           value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 1;
-          value "state_info.flags" int: 0;
-          value "style" string: "plain";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "battery";
-          value "id" string: "battery";
-          value "geom.pos" int: 800;
-          value "geom.size" int: 80;
-          value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 4;
-          value "state_info.flags" int: 0;
-          value "style" string: "plain";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "configuration";
-          value "id" string: "configuration";
-          value "geom.pos" int: 800;
-          value "geom.size" int: 80;
-          value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 5;
-          value "state_info.flags" int: 0;
-          value "style" string: "plain";
-          value "orient" int: 0;
-          value "autoscroll" uchar: 0;
-          value "resizable" uchar: 0;
-        }
-      }
-      group "clients" list {
-        group "E_Config_Gadcon_Client" struct {
-          value "name" string: "illume-kbd-toggle";
-          value "id" string: "illume-kbd-toggle.0";
-          value "geom.pos" int: 0;
-          value "geom.size" int: 32;
-          value "geom.res" int: 800;
-          value "geom.pos_x" double: 0.0000000000000000000000000;
-          value "geom.pos_y" double: 0.0000000000000000000000000;
-          value "geom.size_w" double: 0.0000000000000000000000000;
-          value "geom.size_h" double: 0.0000000000000000000000000;
-          value "state_info.seq" int: 3;
+          value "state_info.seq" int: 2;
           value "state_info.flags" int: 0;
           value "style" string: "plain";
           value "orient" int: 0;
diff --git a/configure.ac b/configure.ac
index 7c3fa9378..99aab4fe6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -619,6 +619,8 @@ src/modules/illume-indicator/Makefile
 src/modules/illume-indicator/module.desktop
 src/modules/illume-kbd-toggle/Makefile
 src/modules/illume-kbd-toggle/module.desktop
+src/modules/illume-mode-toggle/Makefile
+src/modules/illume-mode-toggle/module.desktop
 src/modules/syscon/Makefile
 src/modules/syscon/module.desktop
 src/modules/everything/Makefile
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 48030920d..ff7364404 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -239,7 +239,7 @@ SUBDIRS += connman
 endif
 
 if USE_MODULE_ILLUME
-SUBDIRS += illume illume2 illume-home illume-softkey illume-keyboard illume-indicator illume-kbd-toggle
+SUBDIRS += illume illume2 illume-home illume-softkey illume-keyboard illume-indicator illume-kbd-toggle illume-mode-toggle
 endif
 
 if USE_MODULE_SYSCON
@@ -322,6 +322,7 @@ illume-softkey \
 illume-keyboard \
 illume-indicator \
 illume-kbd-toggle \
+illume-mode-toggle \
 syscon \
 everything \
 systray
diff --git a/src/modules/illume-mode-toggle/Makefile.am b/src/modules/illume-mode-toggle/Makefile.am
new file mode 100644
index 000000000..d0155e685
--- /dev/null
+++ b/src/modules/illume-mode-toggle/Makefile.am
@@ -0,0 +1,29 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume-mode-toggle
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h
+
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/illume-mode-toggle/e-module-illume-mode-toggle.edj b/src/modules/illume-mode-toggle/e-module-illume-mode-toggle.edj
new file mode 100644
index 0000000000000000000000000000000000000000..88a723dafe5971c4f8c2d54abc6b0cd578f78fd1
GIT binary patch
literal 7377
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

literal 0
HcmV?d00001

diff --git a/src/modules/illume2/e_mod_gadcon.c b/src/modules/illume-mode-toggle/e_mod_main.c
similarity index 74%
rename from src/modules/illume2/e_mod_gadcon.c
rename to src/modules/illume-mode-toggle/e_mod_main.c
index 2288f2218..93f03c9eb 100644
--- a/src/modules/illume2/e_mod_gadcon.c
+++ b/src/modules/illume-mode-toggle/e_mod_main.c
@@ -1,6 +1,5 @@
 #include "e.h"
 #include "e_mod_main.h"
-#include "e_mod_config.h"
 
 /* local structures */
 typedef struct _Instance Instance;
@@ -17,19 +16,46 @@ static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
 static char *_gc_label(E_Gadcon_Client_Class *cc);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *cc);
-static void _btn_cb_click(void *data, void *data2);
+static void _cb_btn_click(void *data, void *data2);
 
 /* local variables */
 static Eina_List *instances = NULL;
+static const char *mod_dir = NULL;
 
 static const E_Gadcon_Client_Class _gc_class = 
 {
-   GADCON_CLIENT_CLASS_VERSION, "illume2", 
+   GADCON_CLIENT_CLASS_VERSION, "illume-mode-toggle", 
      { _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL, 
-          e_gadcon_site_is_not_toolbar 
+          e_gadcon_site_is_not_toolbar
      }, E_GADCON_CLIENT_STYLE_PLAIN
 };
 
+/* public functions */
+EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Illume Mode Toggle" };
+
+EAPI void *
+e_modapi_init(E_Module *m) 
+{
+   mod_dir = eina_stringshare_add(m->dir);
+   e_gadcon_provider_register(&_gc_class);
+   return m;
+}
+
+EAPI int 
+e_modapi_shutdown(E_Module *m) 
+{
+   e_gadcon_provider_unregister(&_gc_class);
+   if (mod_dir) eina_stringshare_del(mod_dir);
+   mod_dir = NULL;
+   return 1;
+}
+
+EAPI int 
+e_modapi_save(E_Module *m) 
+{
+   return 1;
+}
+
 /* local functions */
 static E_Gadcon_Client *
 _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style) 
@@ -38,13 +64,12 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    Evas_Object *icon;
    char buff[PATH_MAX];
 
-   snprintf(buff, sizeof(buff), "%s/e-module-illume2.edj", il_cfg->mod_dir);
-
+   snprintf(buff, sizeof(buff), "%s/e-module-illume-mode-toggle.edj", mod_dir);
    inst = E_NEW(Instance, 1);
    inst->o_btn = e_widget_button_add(gc->evas, NULL, NULL, 
-                                     _btn_cb_click, inst, NULL);
+                                     _cb_btn_click, inst, NULL);
    icon = e_icon_add(evas_object_evas_get(inst->o_btn));
-   e_icon_file_edje_set(icon, buff, "btn_icon");
+   e_icon_file_edje_set(icon, buff, "icon");
    e_widget_button_icon_set(inst->o_btn, icon);
 
    inst->gcc = e_gadcon_client_new(gc, name, id, style, inst->o_btn);
@@ -75,7 +100,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
 static char *
 _gc_label(E_Gadcon_Client_Class *cc) 
 {
-   return _("Illume2");
+   return _("Illume-Mode-Toggle");
 }
 
 static Evas_Object *
@@ -84,7 +109,7 @@ _gc_icon(E_Gadcon_Client_Class *cc, Evas *evas)
    Evas_Object *o;
    char buff[PATH_MAX];
 
-   snprintf(buff, sizeof(buff), "%s/e-module-illume2.edj", il_cfg->mod_dir);
+   snprintf(buff, sizeof(buff), "%s/e-module-illume-mode-toggle.edj", mod_dir);
    o = edje_object_add(evas);
    edje_object_file_set(o, buff, "icon");
    return o;
@@ -101,32 +126,17 @@ _gc_id_new(E_Gadcon_Client_Class *cc)
 }
 
 static void 
-_btn_cb_click(void *data, void *data2) 
+_cb_btn_click(void *data, void *data2) 
 {
    Ecore_X_Window xwin;
    Ecore_X_Illume_Mode mode;
 
-   if (il_cfg->policy.mode.dual) 
-     mode = ECORE_X_ILLUME_MODE_SINGLE;
-   else 
-     mode = ECORE_X_ILLUME_MODE_DUAL;
-
    xwin = ecore_x_window_root_first_get();
+   mode = ecore_x_e_illume_mode_get(xwin);
+   if (mode <= ECORE_X_ILLUME_MODE_SINGLE)
+     mode = ECORE_X_ILLUME_MODE_DUAL;
+   else
+     mode = ECORE_X_ILLUME_MODE_SINGLE;
    ecore_x_e_illume_mode_set(xwin, mode);
    ecore_x_e_illume_mode_send(xwin, mode);
 }
-
-/* public functions */
-int 
-e_mod_gadcon_init(void) 
-{
-   e_gadcon_provider_register(&_gc_class);
-   return 1;
-}
-
-int 
-e_mod_gadcon_shutdown(void) 
-{
-   e_gadcon_provider_unregister(&_gc_class);
-   return 1;
-}
diff --git a/src/modules/illume-mode-toggle/e_mod_main.h b/src/modules/illume-mode-toggle/e_mod_main.h
new file mode 100644
index 000000000..f884cc0aa
--- /dev/null
+++ b/src/modules/illume-mode-toggle/e_mod_main.h
@@ -0,0 +1,10 @@
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+EAPI extern E_Module_Api e_modapi;
+
+EAPI void *e_modapi_init(E_Module *m);
+EAPI int e_modapi_shutdown(E_Module *m);
+EAPI int e_modapi_save(E_Module *m);
+
+#endif
diff --git a/src/modules/illume-mode-toggle/module.desktop.in b/src/modules/illume-mode-toggle/module.desktop.in
new file mode 100644
index 000000000..93d1795bb
--- /dev/null
+++ b/src/modules/illume-mode-toggle/module.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Link
+Name=Illume-Mode-Toggle
+Icon=e-module-illume-mode-toggle
+X-Enlightenment-ModuleType=system
+Comment=<title>Illume Mode Toggle for Embedded</title>
diff --git a/src/modules/illume2/Makefile.am b/src/modules/illume2/Makefile.am
index 9704abfaa..916e1704c 100644
--- a/src/modules/illume2/Makefile.am
+++ b/src/modules/illume2/Makefile.am
@@ -38,9 +38,7 @@ module_la_SOURCES      = e_mod_main.h \
                          e_mod_policy.h \
                          e_mod_policy.c \
                          e_mod_policy_settings.h \
-                         e_mod_policy_settings.c \
-                         e_mod_gadcon.h \
-                         e_mod_gadcon.c
+                         e_mod_policy_settings.c
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
diff --git a/src/modules/illume2/e-module-illume2.edj b/src/modules/illume2/e-module-illume2.edj
index 0853076b4c3c7d3186ff07c54a74590019f43f1c..d958437393b7e42be7c1666dd6be752d1a20a066 100644
GIT binary patch
literal 10097
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

literal 12359
zcmai)2|SeD7x)LEk}aVK^_I7t$}U@JeM{O!F%1S|8_i(GI;2t*ty=8u67nKs86pxP
z+1Ejq?E5-q{^uE^ck=uHKmX_Rxz0J?=iYPgJ@?%6$S2t@;e99+iXYlD6iWOa3dNNN
z=1~+%@FFlFXj~|i<XIGo*L=PS+5%e!4W6~BD3pl6d=n%BVDs&tU|1>Jk0)@pAB8)h
zub6Lw0U%dFgGV6@`tL%amOO!ZBLE0OgLxIdfpiD;7NA(rm(Oz)H`pnlFNLPTga;%q
zuq=?s8f4fE)+|^6HquX*&0w4$tc|q}KQ=oCtR9#MVj~aeA;5Y-^34+#I|OWqJywO?
zZw4407_#O=Y<2;*jI4u)V=NXJvUh1{(d>Sgfo%dCS>JXxs{^J8wg@yQHj@XY3${2k
z8#bE&b_Q%DCR^AH_9bKnHZNi$59lqxEI`W76Bf${b_3Wl4ps*2E-*Q0?(DJPTj)L5
z!qB4F49-W03N|vYE1Nw7Rs=TZyjy@FafWk2U1Ikm1N*V4AF_{HVEpVpFb*XH4A#wx
zDTU1+0P6!LgxJUfI^>2B#GlpgE}QLz<s$jad2SnlA?G8=8aO`|)+H<jY$dd-&>-KC
zeF|>}DZtT>089-Sa&Gt7b6f{@3hbpE{ni3ASu|D~7@Yh3-q>Tozpy>96&z#RfkABk
z@CW%L>;sJRj2;2Ixv1ZLV92>~t|b5%+$C0CMY89GI15L!nIuRg9+1nzF(5f(1#u8g
zKo~R}do1LsFmm5m{XimT?*l9YVbJjGe!9SN!DgK$n?dY^zaR{n3!8ZXgM9m=AB+>O
z2F4kCs3XFyix>$QD-VD>v;FA<L-K(0{=!`qLDtD)Adz+Yf{C0tXAVK^L^dM~+5@&f
z9$>0qFGp<T0Uc_Nh~5GNi98#C{R0xYtGC$w;695WdBC|A*n@~IFwS|0fgxv(%zKtS
z)&dyh)*tgi4HLPuz(B$}Q0sv`1qnHVI?f(@3D|RlAvW@Wei7KaMeGDH<SaS+c>>E`
z#GsEzAuwUKFF(-N07K4*Gj}2GB5fS~kaIo>4E8ramOUQsk0>A%d@oRDY!(d+u{qCt
z1egRc*1YU~#=xKk{=q_lDK8oeaS??aoc9M(584u7$Qg0YQ3>oUFwT9zJr%_OLvkh@
z8mtYK1<Vd4=iT}R4Efd}HQS!OzBynXi~7O-MUj}X#)8y_2KPWT5F}^pA$For+x}qP
zz>qa?_8S29Y7xr;hTK)oem%g_7BL#I+(oPt*w;l2IU}S#BQZeg#}Q~yA4Ho#BIjhs
z-tQJ*utpYp2vQu{XJDfUL;4^O=m&r?7O^5Ixyu%@BfwTIVi4bza=<ui_GVyEKmTBG
zpI2%C<IESxm6eBqtzxfZ1?XJB;6AYG9@J6PHfSBda3GQQx7mGTfVqH;B<nS3XlTEH
zA@>sUABEhz)6jZ>MIsCthdiL)0EWa~a-Oi54=|+Gu^7l5(CUCe{O8AlL}J?j4DrF~
z4}6KO28PsYPxc(|fhi)4V-Bc^Vh4dC`*;jZ37Q%(<Qv7xagfLu_;!n#fn?PokYdn+
zK-e!Z_8hXn+<|e{KcqYIo#bS&FEJPo3x@|J60<kJqCj%iI%FU52!j>|jR36zSSCo$
zItjH!tYi_B0oDjif;|Tk57>hk)QLax0M1GbSp#SO#X$-nxy(673NXkS)>;pM<blQu
z49N%9SdcI$lJ~1rK`wkh>_ATihQwJESqt)j{tcKBNbz~XVqmXAVk*YLz5}BG<6NH}
zumE73bto2C2r$k#ZvYmxz(8t3>j3r^Bp)=Wg(zES)4(7<{+PoRSjHkY4y<4igY#Ym
zYh>jjGCvX{IHy%e>=$xK4)lG%x<PWr^e(U|V5}H`gxo`I0TcNhgY`Qh$V<>*4)K*B
zS$7&Fj6?3FIO2EVcMBZoBw+F&7xL5@bf`_@NM0|T5t7GnFU560F4R~g<`5Tg)?Hwq
z&uw6kf8wV=F5E#+(6PXfxfa%U5_Iq-?g)~z-oyEbLkxfS+YI`0U>+bB_JQmP@dx*x
zRXY)1%PjEr_E-yN9Nv+rxD$nQz*u96in|t+ohZ)tyHHq5TP&K0cOh6{(N=gzX9tWE
zCnL@qRycd?yk=nm4ji1oCZJrg1R_j>vch7VT?kk-*eD0QrHefljkCZzDmXb>qp*(7
z1UD3W0%tcT?1JuuAz&O(I7`$4WCcf%Wuo`v2(WTI!3}+YH4GVy!xB+AdwUlL><)~R
z6OrZg|2AZPgJ??}0fkIH@Ad?S;EdM)9gzQ-z}(r9wbcJlZ;qI;CSc8f5Q&L7hKNNu
zVjQq2*50sIR<HpGf(sFg#=64#i6{cr3F5P0;jA6;5GpHsj5QHOw7`H5Cp^y48B0Jz
z=)iyo;9xM0h{ib*aX>8WaZYGwJQ_lUc*WR5Uq_7d{BfZjun-~(BFYkLg>kWWMiHIi
zl>%!;JIOnpw(VpSSB$+27UhZ~;>=-6c%`6@yu{eUf)vPX>4vhxk+GHvB(}6cIp7?@
zLVkjdAtO5cv;n7BCm6;OZs2Yg%NfxLcCP@vQ5d$00oU^?Y|IMsgMhW)r2s!L&Nx>r
zn!Lz%o44^+Rz$4x!dte*euuMM;GnVC?nVAMZ1#Ijf4dbp{q0s*@W;~J=CcSO${bIy
z#1a(j7Zk#R;=G`kFDQ<9G+YpS2%5dU0?`4Fcea_=o$y37>=hQwdWD!6bK-)@@rHvg
zj6u!<+%1e@o5&cpii}xM9j)O|=ck7_V=U)&R!YKk#}gC?ND70rW=nIn#LP<w*@D9E
zv0H)NWw!#mkJ3UPr3Eia3w@NJk299+tU$!M!%aXmD;#ouzg4$+6;fk?BI*LgkbhH9
z*>oW_Sw7|s_8T~|`GPX<6ilSg9}EkZhKM7gtO*!P99%=>M1SkZHG)9?2f+9vDS!9;
z^M%`@5x>*w&;GyjixYDsCHW6G954R#|2t6^_y6tR98XqQh|+($8>A&!!3kq&iF34u
zJIZOzznj0#2uCzmlrsiuf`Sd+0dI|U#6s<2lLg=N?|&ZwtM`BY=ie^aZXBg_KbB}g
zz&RnGqJ{c|wgiT<Bw(yrUdaEcNGX9V`2ETP@8XE0&~M=OpUUdXVbAwn1gvn5P)05P
z8#P~#5rlkK+~(^o5sQ2*=XD1tpg4ON_TL^*@R@=d?nJ;lv4TbVPqksItg1NQVZJo7
z_Ke0m+Pk6bT`=hR7|h$O567a9(){P+kMF|#0sUDxS+^Ux{$%#mwf--SIFlQ?aAXdQ
zf-f$?f+g*7MEF3=8)%k+eDUWsa=qz8?C~XgMXrU4Y;08=7#MI2+`fIFlshmZBcu14
zI?DP=M1;&thr_8Sj8mp(6W)5b+PnG}cW%gkB=X6MRKg$&4BN+>wh-nl<L5j(l=Plb
ziz4`>|2{S`e6LIo7a_4EdeiFl`}KlOd=<Se5+ve_xm)4gQARkJ9v&}$#Cjm*biCnS
z%B^IZ`&oiP_a*H9^}oB(?5Tgpu?Hcj(EG}<0Yz_i@TR=%30d`8^tD}ofYJ>m93{l+
z<;FuMs!s7%RR<$xS3gifPrgahOZvy`@aKRVfk!Uhw0fBEApZgG+-&id>?>*a(gM<+
zj#Y}(tZcZ^+wEN?@c0amEO~=L!Ep=xv(l$UgHclwBdMo6rMEb28Yq94?`ke>TJU&#
z_rdPH-3Pk!mdq{XS?af1>1qV#s_4~|IO~w1T~gEPSHv*fn3b62xz{YhUQH4XCcV`;
zDrpm>(5EHygZsAE-5`gXW>MGxboA8O0Q7T7%kcPIzF$onvo2H)s*Y#qkCSjS9!qDJ
z@^2o!^L6dXCl*_Y`%*{OhD#<--%~|Lk3Lmx5oxLL8R$-6%6ho#k@J-mA51))GN4n`
zS5d`A3kP^wfB5JcC%0eiXUM#}1it|y4Su_2H4wiaGFN~25xmTSRoC)X+~p2j&9ySX
z<b6)SD$J?`OepUVQ!=9KNQ6Im`+zk`JKf#){EJ?FLW=WPMC3c2t_V%jDu<>KkBN6O
z-+Vjuh*28lYi)#-`JeLqubIQF^bOuuQ>d+TvqtKRr<3kMM&@-s_1$t(wsLiohJI6{
zIgfl3xXTXlt#!&>Mw+Ov&OKkbmVZh|fL5sH8<Ruw9purywWL&#|Dx0GYV;T_>m`ry
z5VxW2+FMF)&pRKHNTeb?CnX_8_hW0MX!(99Gun~cc0QLoXExyz@;_$Km>&*p>LH6u
zA!9D`IPK)WPenW8@%Mdc-ZE2(g?9QpVPugU0j-!0U7{>;SUPdw32o55<c4PRRldv|
zu>t-99hy(zxKn3m=ih6V4y5`<x@W2==iKDy%Dg1_rbG8)V;9}k%PV}vl1Y17muwPj
zZg`!K<TuKCfe%b0Bcmd{O4FY$<tXb>rnk^jueS`enc3ewd30$hTJor3wP}g&Ga;8b
zFDAol_s$Y(G}rMxO!KA#i~};Z3`GTnd%hTkprBLzv}CWsh+@x)QHr;B#EKQ8cpIM|
zrOdiI<J~*Q=AE}r_r}an+})opyrrHeB{BjuE5|2){@l1`btiOt9ZpFc_>1{WNQGHg
zSXh*^lL@Qsrw6)7PD{GHnby_R{D<%Qw3>1bt_%Gx;|ukT{x@c8D~7$WEzJ9j`+k0Y
zmg{;HW(-#dI$aN{pW8G>Hke8H`7xuM+iJf|%4~w{q}=hr!NE;Dt#02bHa0#=&d2y)
zajVP<Z<<TZEgqjdL^Gw8<+N<@CFXG%4QPjrwM;~=(X^dx(HYRSZp=U#=Zke(4je5&
zbzSF)SMZrcPtv?3cRJH@NA=<uM7p(*`5@2SWaV)=f@GAO(&Q5FZX+Z)>O88~=cu38
z96~8}&*g_E26s}P@Z>QwnOIvqUUAKhI~{g3omtqf{-OS9|8(nr8Bo>!=829L*vS{A
zq@1&+F{K7g?=lO#94XOj6&Kz|5p_8>X+~Ste9J3mmm8zLuI>omKK*R|elo;fDa}ro
zl33c#oMSxd@9(!<Hx)?LT`fghA@ftOf%#YUH>HEwh2i2ZZz#;h`uczPKFxljK%zxI
zpO&*2J~P+S*m#U1(2ptmWqRmIiHUbP&h9Sdr2kXq`1rWxrN_uvSH|a$f%HJlN_s+E
zocuxpQ9pi!1D}H<tD{qDDc~DzY<z^n_j$?znVy-9%*?R=@%{4U%m48WDfc@$sqf$4
z`R$v`aDU4vD=XVHKl6hT-Cw$*y^sgUp&JG;V$;*pE!Po@#?WvLS0ITHz|c<|c*Z<Y
zi5ZhSK7+TQQv~U<WXVgxU(vq8S^U?DopXv#9esu~_}Mbs-l&QCxzsUc7i091wl32z
zyjKKGmR-XWCM}fq#%=4+GycKpl5$^ul}YN7Ca*}vmUJ$~7Hz#by6{9|w#UZENvb#V
zFk>#!%wN+Mv|3MU*>xA6UZ3<E&2|GfR|oIng8K2vKyl}L7utc_S%>zXUhAf~l3o{>
zh;IEl{weaVu3V^Yr0(dNY)QXz@BddZLrUEcUWm@46Ow%xsjzxbPm%WjsIU#olB>?H
z;dNTZv;Pd=!;|~<_G2qoS029l*WtX9gP}?3C!X?)<^9X`Z{=6Ml-%vbr}o8FmaJ4c
zy`fcpYsU#GtF4x=+E9!J>TGjv!-c3fgQmD06DIFGS}5vWeRKVTd-AGwe5k$kZMprq
zOG(_J;x@_LWw^c1XC0g=GJ9OLY(gDAXb}BnT-EV4rlc(AFL%}(3Ce1be?{%}3mHuQ
zaa?Vpw`Q=uKedGs;E>uh@hmR2*?n(UX?WR})x!2;>J72fxDWNVm`EM3w?lCUgJn(o
zvu6jY-edCK+MMXm94$S|WX#1jXL%TXkLm#-9`|-fY9nE<$L-g-{jN(RA9~GB#JSdC
zAKCWRCaN%o_ugja`0~^Y4_3t*-KL~EHoZL_t{GRNzDJq-uK#;ecZ9abxnc6{K{Jp3
zlptO0A(A1zcbfF8;^o&%2U7}tr0T5vg=B*A0}Jm@R;68Tf7_bpZ`2k{8KD+X3S~&|
zhFcsn`nL|_TPgcD6xPdn6<N4xU&`^ZO>J_GooMzLlwwBf`^UE{stt9C(NFUTFp2dR
z#{}(@^le+TV`fv-gV$>Odyd)dLv`QGnDXFbmT;*sp76XScMaScXQuPrI#Yc4ewR75
zE5f7NbDiW+S70?g!?oX}HPY?0;Og%=<P@9{0j=dGO-ZK~%6hzO#}DMSG#-8~tL<J1
ztL&k)>c$%ISC!trMidNjC7^X;`_qm;-We^yJjE<wVj0`U6Q<;t%Ig`{cCpC~rFoQt
z-=r<H8g^L>KFA!DQixqn3Y%=9Fu&5(tV$l+=HC$Q&5V*LfBnv{MAF%=$nR`@#j6kF
z!?*bAjw?zI6g89<O*@<_{`=+@v$PA7C69MKug6p8-rf}3R85FB3v9c2O6;q<k5GL;
zNQ14%>B^{xjLWYg#tp*v_@-954>yxqykhl*G+sR2jr~W(ZRDqI#fu}%=e%Ae!qo+z
zg|Vg&dN*}?P;C;MUcK?9dph26IjYu}=a%|BNVDgGMUaM7U0+?&phn;OJlQ82L@Sr>
zX#Z-honA9zw)M%ls>+ztu{=WRQLlKt3WDX(qeX8{K7Z>qQP&lnNt}IWob<G!I%c@g
zNopwMV!8Dm<LNCb7tABaO&<MpNGP$>-#zf8MbKOPq9|Qcok<@}(3$>uKQu^tqSh{0
zXQo@avozeJFieAZZu*fOsVr0t|Cv5L`lxI4ZBnUb@5na4KtJAG#VdY(@79pMX(j6S
z?5i=57yhU3vpliRhwN2i?I*{d#?(pMnR89Hi<i2BA<|fW<<+ZKp^vs3|J(PL*2R@=
z#ILNrX{h<pmCC@Zd#8Cia$nJWs}l{Ig}jW1`cZ`~yy~>Eh8&d^FEi;Vip6{9UlkWd
z24_C!@^UefpZinG9QO7UuCG%QZaAamL(P=*NPm(kBaSZ9*3OZnL|&)3(N5DZe;S|h
z;hQQHDkfhsvKb5YA$c;Chf2GyR2C(Ap3}Ot!f*?wp&K*zb+23Gbd2=`AtQ6+l>4Pj
za{KlWax52N+S+#tEw)|2=1zi|e5HX_FtrP(M=j>=cbhzvyO%2xYnU>ZWXwNQHse^_
zSM{NECdIHbu1QzcQz>Wqo)4cjzj?$A$-AfCIBhEE0>S$Tfw~1_7NMM8twPV@Y36sQ
zuN!*euCdAPwW#s7@vc1#r4ZHSy$98v4?GDZnpJ7rg@vP6y*b&Vlkk@0tge(JM_T)}
zrER8APv(5G&3C~glb@$A{xnTF{cd{y9-WQ{s@Y<ejIdICr!+XaElZZxI&WS^F>dd-
zG5e~eJ6r6V*nZppymTs=q8RmUl1C#)j-XfS-{vwsy0s>gbdZ)FxrFXRrDhpE66U8{
z#bLgEw-GLHpg-q}Ibd8f$oxfnk>e@fd?~Z7qkc<njBmPc>NgxczTjH(J$lAkqx$bX
z$vK<)ldq-L?+Z;>VtnZME=jAhT0ddw4&RlteMdgDQTtl?sN2*Patup`I?kq`C>Evl
zulZ`GxD7Q>0+I?B!w94;@q{q=H^;#!nUu0UQcg{Cle|6am@#{8Pj2YZyQ$q0<6)dS
z5IbNzI`n4v%B~R}M$7V_1<QPEZ^}o|n|D)9#flVygaq95`?UF+U&pBaiY_RxyZBf;
zf1}GCVd++`nGlWO!KuO9xtp#i^3k_e_cY%0O_b6dKrj6_JA5$1I{$u);_{KMhg+m2
zX-A~f+cX9#Dnps7!=*E1v+u(@d^Ky|q@U=klJaiP2(#|@vh-ora9_@=nHp9(*V1u)
zhW5k7rPZH{TI`qk;qcpx0(~vUwB`d>w|^RS#fGXk`Sm?1i1q9IG;vYvQSImx?fCKL
zZ9MdEMN`tGVa@Ec5#QN6bF^LYfg2JY^RG)VyLVKe`^vV+_Qzf)1=Bvh^3wSs<o2`C
z?n+qnKz?xNK8Ag;W|V<SLD=g7tf9`x5bcKE#o?c4cXsy;2dN&M)T!ro`BYnVS+fXt
z<JcqlD#^6Y2-WU~UU)%rMUIO`>$BPn$L5r-wnHjKs~h|%UQNYy#|C-)QhBG^-8?VZ
zYcUgZ);f3++If60d+!`drFTfW3Es6m*&QAzCnIpk!H1Ne<r7r@?B(D@1HIPF<$Znx
z_1$FHfuZmj3(w4e*v3_)i!E|PAL(TLP{caxHA&}v52}B)&Ux~8e9Yak{NfDW`U?IV
zx=p|S=}qO+z}MeboKA|<K7pPbyQ>t+V<tnxhqayXna$vd9LUn9iM>C*`D1xNjjyaN
zuVZquKm9Omnw#=S$L3fWX^Gr&PYNdIk%KA!XETG7lgSQQqZNAnc|~dYD5DlrG2z7P
zYD+r5sPT>w3<lc%>Rk6hJ>&1eX;b@@(aszX<qny-DNk$KM?=PL+1~XG`(n-WnfR>N
z{b5bVAIxeL?>W=bcJb1!1Ytrm>G9(?!6R3V%%sy4BFqme>F|3OtWlKuSl03~u7+3n
zfxx&|db~mVkbP;$WP90%i^3rvUmMu%XijBrr4MfxvAaw@n-iKw&E!p3da*0`UWU12
ze2$U!eQEWP8;{-59^-=*=PBwL__faEq|!65jqeX{p-Rmv)eTg6v^1JW6xEGe&e1+m
z%vWTZq=nSeGQXzFt4k7Fhy~~oJ%#pTVl|C<qPqPy&-LE@;;)Z3AolXh^%=Y246I~r
z0@p@GntYwDo|&Gr{UpFmA3sEN+i_?*V`!{NJ50by@{mQLC_3AJCDB8wv12LoM(pHJ
zP0;yXfuDZ6)QRqwX=~;lX>(CcVs%V~$qAL(iK#6GEoMfMZHlrZLPi$5&RM*;IqX*8
zLOWa57L+ja_XKUv7l)5S*<Jay9`&Mjo89fuO!FY>E)D4<MODda4_b_EdHtk$q(x!k
zw1K(Ybg*@+h1N*U`JA-;^30mBHU4q~dvr763tH_Xlm_*mjFO`(Nh-dw%~d+(#-Un2
z@m|BLnr%-_mkgG)zw`e`M&wYK>MMy=0~0IT;v+iMdbKOP(i4QWhE;{kJ|7(j(fB4?
zU{;#lBwP3-C@VfITj{tpl|~nS$~4KWHNK;S?|L=ydE)v+e)X3Lf#lsr6({1mLuEbJ
z>ymRDHy$*O2u@ba-@Bu6wO~(rvD{z-y50hp<kWT2PQosg5aJh_<ZW$II*wB73Z*Rn
zYCIX~M@^=MNHkV*KWakDs!L7=O{P50dKRp-q3hXLiuG=ZnPMfA@|^UmEziDY>uE(E
z<8gatbzZ;CQNhh@rwUDJ*d?2UqfOpidDQxG!7r_hp$rYZ!GzqFD-C{Be$o==(t#C>
zI_{QSmr0`~5#vFm6#c&(X0xs;)bKh-t2N!eY4~ovn-W!}>_h?|ueYM8p%iU%X&f;+
zKl|Nqc&~<ar;D|y=P{z!P5o9ot%7Tc@dXa_v?vnE$?*N|^WyYvX{o%-c>VOw>@KZA
z?LoUk9`$iGSJ6{fCFr@5p4}z2-o|rdp|{lQ<w6TplhrmSz81@RCtrn;E#CF*+StQT
zWyQ-1VYiEF^WP7B=GwGsP+&k<cB!m=ZqImB<7ikHQ;dw>Q@_o<+uv~PD6u)pPwVv2
z{KHwIN-3YbzcuUa*eq)!L!mdFRtkUpg=99l=a$L-2KNE2qR?xTroO}C&DWHUztLHx
zwN|U*%Ap!RLK!h)GGekfg(f`L9V|q*T5BHdSni`+bz)qpE1>If!aLJq#(9}q5#~&i
zj7sD5gWBS8`tj5UrJjdKGlBZU(_)tk1v^x7>m{_#`PY&hY=2oCX-)a%XrQjU&);3p
z#$=FpPC~9xYPBT(E3b8LY3+24mVBhzb=}~h0FAOW*OExoCR}i8_fc#2AK?r_Qa;*~
z96}0gxt#OTrrgB;B3k-MO=q{A!>e=^4Q|u>4?L6!x?!D0{u4a%l0EGS=((CMpVc?d
zPVXqn#A)aJFwa=ejHTH6)#FPiLqjGje?0Sjn$X;%FL-Y9XRd><)|;B>W`VerD1J)n
z!3dAdgK<I0v0@*qwxkMQFPuA)HT&0WR%`lh=fSO+y<Um~o$FQJI;Ez1dtVY#i;QvT
zR7-EJXTD@y*!G62(_k<rvU;}X#;9?MkC1Y;obF>Daxj13rm0ij66oZ3rdEYireN|>
z+qi(HbMg-dk2IxklV_A3&i<>Z@gQ-o=)l})#>`bUDrM{YbBR_deDA%*XE$Bo7Z-la
zqm7r{NqQ5>Xb>=|Z>UWQwW~Vsa<IiVXvRjXK>koA)?&xUp_@;0ljz*ewu}$vO<{u?
znw{epel+fwCY?@G?9%A}VM^)oY~5a6oj+k+y?vynQSniS*OS?5$ys;BG(};Xml9JB
zk=`S@6c3E)7Dby@HMEDahvd_Z6vNSsAdT8u^2zKQ!MlDGe&i~t8_$WIK7RT>eI&@e
z-D~EpuI=!zy+J0yU4{Ra=GK{PV&XsBB!0S(U2I_{VHoBl*6yAiN6i@2AYL`utEPEg
z_sg=;8xwP#M=iW68k)Z}|6ml?7c&lP^$GS_+^VTN7nB!VEZXHcJmL{CN)4Nf_-Stx
zmssGey8p+&{4aLt?rBeACVxozy9;lp%*=Xn@of9&3nfFUu4`38JhCJX@DJMhUGMSF
zjJoFjOws*|XxA0xXzH#Q>4Gk;E9m?}*{`+Xr-y~Ja!5|WK@oYu@gqS6p4P&peuSrT
z!yN{0w#N#rZWYWpyQNk~b>|2l5J=y9!Rx!Rx3~d0|8bu#u03_l%+RgX-;1VlrNo{x
zrFQ3QmysoO2ixB4aIg&>XzSg+65Xt9EneD_kvQ@`QD6J@>)EXImxV+>i70BD@YB@-
zrndrB3l7V*^J=bP&d|(8Pd8<F6lT<yhp48+319rIN1ag%nxJK_j|-5{`L$w(--4^1
z+hR%kj-8D0=*G!9`Z*<PXNYW9Ok}5-TySEdy-nurw0LIqW{Y=B<%v!E=8`%*dR^z5
zmLBh~Dx8_px)8<?SobKkZqeV%_g=|ZB0TW^%k|HGz1)Gk!tj?S_ccN}PoiF1`+K{E
zo_R$*V^kH}6JZ?M)cWuA(&3F)-`B~s>o)JZ7;0COdJ+A^P8U7x8PbXW_jT^|W%s=@
zf5KnTU-SBQFWa|N;!gWD!qs(G|GJ7fpO%cCP6`usd~Ih^5#iDQpx3lqPJTy)CEm~C
z#evX1%*LA!J24vVFF)sYF8TJ>{4d+1`y7fs%70GC-(r%{cBW0aJ~G~TOVNW6uCSNJ
zDZ`yQd>tj#+FMJ%zq{9UDp9M=bEQ#~amTieyAC|9VweXgu2+y(*r1?Rx@6?+o$P<i
zr7w#&CD?M^f1Asb@Uo~D*Ed*cEHf>$3T?>X3&3xDX^{Wz>BCwH`{z}w@AJwnby(WJ
zROWG%ShPU2w1s>5kHB*Oaz%%-l{$JG<n}xLwPO8>4Y$^%Io*0bW)_4yS5^3n+o1ef
z_zR1f7m0@76AgX{DC-X=t<pU-JUVt|d%4QgUs-`KNH=FpUwIq7VQe*^2x4R~JXpt5
zPj+lgGQhfayAC`b^--0p=-l8e`=e8=?X*<+8n2nM#Mc5>j~*lH<M1~J^O<t~Z64<6
zx%H=t<la|2=c2S&bso?^eAE*D!yfBD-;wM4PiY^`*Ap?oh|{@3^k=Tx$R{cp(9}ym
z>GbuNUd!>m+jN8QVvPU%`I+I<O$Hk^vdGINRE1WI?jBVYwlXu@UYmDPB$IFN9m&9+
z=GI4CNqhVw`8_?`dY&J>b<KQ7VOnRV_~UiY=RAL<89E*p?>g)d_rljnnp>~x%{jkA
zsD|jYH@q?B8@-CwNqL)8pDEg3y!DD_O6JGab@!H*jkMeJEGLBK{;Eqai-|pAA$Th?
z<5~M!oevZ08PDv@oenuKk2dj>Z;nd-+s`@ZQ+fHTYHyjHN)a{vdFRcuH1h;;>9^Mz
zSc%W9JD3rkVY)G<3{QUP=;SB(PtOtsqngi;=nT!9XKt_a>^wX=_;E<DU52EqT5u`p
zv5kY!Y6}PKG(JdIrLaqXu3)X{YCilA9(pOco;Wdd9EY*IBw}^xlGDUcXD6ycPhmA`
zx@4V>*s8p#k`pR=-e0-aeG|aqxhk|oT-{N3I<Ev|pm4`GjvD(u<}K1vz3O&JXOC1Q
zPpj;ePQrZ~g%UYIJ(Hzh6}T#{oS0p4r|&dZ1>I(1xYcRXdN1ztja;ahbsP5oAJRd&
AhyVZp

diff --git a/src/modules/illume2/e_mod_gadcon.h b/src/modules/illume2/e_mod_gadcon.h
deleted file mode 100644
index 0bcdcd527..000000000
--- a/src/modules/illume2/e_mod_gadcon.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef E_MOD_GADCON_H
-#define E_MOD_GADCON_H
-
-int e_mod_gadcon_init(void);
-int e_mod_gadcon_shutdown(void);
-
-#endif
diff --git a/src/modules/illume2/e_mod_main.c b/src/modules/illume2/e_mod_main.c
index a41a98159..91f12fdba 100644
--- a/src/modules/illume2/e_mod_main.c
+++ b/src/modules/illume2/e_mod_main.c
@@ -3,7 +3,6 @@
 #include "e_mod_config.h"
 #include "e_mod_layout.h"
 #include "e_kbd.h"
-#include "e_mod_gadcon.h"
 
 /* local variables */
 static E_Kbd *kbd = NULL;
@@ -23,10 +22,6 @@ e_modapi_init(E_Module *m)
    /* init the config subsystem */
    if (!il_config_init(m)) return NULL;
 
-   /* init the gadcon subsystem for adding a "button" to any gadget container
-    * which will allow easy switching between policy app modes */
-   e_mod_gadcon_init();
-
    /* set up the virtual keyboard */
    e_kbd_init(m);
 
@@ -60,9 +55,6 @@ e_modapi_shutdown(E_Module *m)
    /* shutdown the kbd subsystem */
    e_kbd_shutdown();
 
-   /* shutdown the gadget subsystem */
-   e_mod_gadcon_shutdown();
-
    /* shutdown the config subsystem */
    il_config_shutdown();
 
diff --git a/x-ui.sh b/x-ui.sh
index f94b4c52b..abd620370 100755
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -5,8 +5,8 @@
 #Xephyr :1 -noreset -ac -br -dpi 186 -screen 272x480x16 &
 #Xephyr :1 -noreset -ac -br -dpi 186 -screen 480x272x16 &
 #Xephyr :1 -noreset -ac -br -dpi 181 -screen 320x320x16 &
-Xephyr :1 -noreset -ac -br -dpi 183 -screen 320x480x16 -host-cursor &
-#Xephyr :1 -noreset -ac -br -dpi 183 -screen 480x320x16 -host-cursor &
+#Xephyr :1 -noreset -ac -br -dpi 183 -screen 320x480x16 -host-cursor &
+Xephyr :1 -noreset -ac -br -dpi 183 -screen 480x320x16 -host-cursor &
 #Xephyr :1 -noreset -ac -br -dpi 183 -screen 480x800x16 &
 #Xephyr :1 -noreset -ac -br -dpi 183 -screen 800x480x16 &
 #Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x640x16 &
@@ -25,3 +25,5 @@ enlightenment_start \
 -no-precache \
 -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it \
 -profile illume-home
+#-fake-xinerama-screen 480x320+0+0 \
+#-fake-xinerama-screen 480x320+480+0