fangWin -> winFang and related changes.

8 files changed, 124 insertions, 101 deletions

diff --git a/src/extantz/build.lua b/src/extantz/build.lua
index 8a02b55..2b6d615 100755
--- a/src/extantz/build.lua
+++ b/src/extantz/build.lua
@@ -17,10 +17,13 @@ CFLAGS  = CFLAGS  .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/inc
 LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux'
 libs    = libs    .. ' -lIrrlicht -lGL -lbz2'
 
-removeFiles(dir, {'../../extantz', 'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'camera.o', 'Evas_3D_demo.o', 'fangWin.o', 'chat.o', 'files.o', 'woMan.o', '../../media/extantz.edj'})
+removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'})
+removeFiles(dir, {'../../extantz', 'camera.o', 'winFang.o', 'chat.o', 'files.o', 'woMan.o'})
 
 runCommand('edje_cc',           dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../media/extantz.edj')
 runCommand('Irrlicht files',    dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS)
 runCommand(nil,                 dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS)
 runCommand(nil,                 dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS)
-compileFiles('../../extantz',   dir, {'gears', 'ephysics_demo', 'camera', 'Evas_3D_demo', 'fangWin', 'chat', 'files', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o')
+runCommand('C libraries',       dir, 'gcc ' .. CFLAGS .. ' -fPIC -c winFang.c')
+runCommand(nil,                 dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libwinFang.so -o ' .. lib_d .. '/libwinFang.so winFang.o')
+compileFiles('../../extantz',   dir, {'gears', 'ephysics_demo', 'camera', 'Evas_3D_demo', 'chat', 'files', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o -lwinFang')
diff --git a/src/extantz/chat.c b/src/extantz/chat.c
index e814842..2155541 100644
--- a/src/extantz/chat.c
+++ b/src/extantz/chat.c
@@ -5,18 +5,18 @@
 //   The bug is that editable entry widgets cause the app to hang on exit.
 void _on_entry_del(void *data, Evas_Object *obj, void *event_info)
 {
-//  fangWin *me = data;
+//  winFang *me = data;
 
   elm_entry_editable_set(obj, EINA_FALSE);
 }
 
-fangWin *chat_add(globals *ourGlobals)
+winFang *chat_add(globals *ourGlobals)
 {
-  fangWin *me;
+  winFang *me;
   Widget  *wid;
   Evas_Object *bx, *en;
 
-  me = fang_win_add(ourGlobals);
+  me = winFangAdd(ourGlobals);
 
   bx = eo_add(ELM_OBJ_BOX_CLASS, me->win,
     evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
@@ -46,6 +46,6 @@ fangWin *chat_add(globals *ourGlobals)
   evas_object_show(bx);
   eo_unref(bx);
 
-  fang_win_complete(ourGlobals, me, 30, 500, ourGlobals->win_w / 3, ourGlobals->win_h / 3);
+  winFangComplete(ourGlobals, me, 30, 500, ourGlobals->win_w / 3, ourGlobals->win_h / 3);
   return me;
 }
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index ef493b8..679a47e 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -328,12 +328,65 @@ static void makeMainMenu(globals *ourGlobals)
     evas_object_show(tb);
 }
 
+// Elm inlined image windows needs this to change focus on mouse click.
+// Evas style event callback.
+static void _cb_mouse_down_elm(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+{
+    Evas_Event_Mouse_Down *ev = event_info;
+
+    if (1 == ev->button)
+        elm_object_focus_set(obj, EINA_TRUE);
+}
+
+void overlay_add(globals *ourGlobals)
+{
+  GLData *gld = &ourGlobals->gld;
+  Evas_Object *bg;
+
+  // There are many reasons for this window.
+  // The first is to cover the GL and provide something to click on to change focus.
+  // The second is to provide something to click on for all the GL type clicking stuff that needs to be done.  In other words, no click through, we catch the clicks here.
+  //   So we can probably avoid the following issue -
+  //     How to do click through?  evas_object_pass_events_set(rectangle, EINA_TRUE), and maybe need to do that to the underlaying window to?
+  //     Though if the rectangle is entirely transparent, or even hidden, events might pass through anyway.
+  //   Gotta have click through on the parts where there's no other window.
+  // The third is to have the other windows live here.
+  //   This idea doesn't work, as it breaks the damn focus again.
+  //   Don't think it's needed anyway.
+  // While on the subject of layers, need a HUD layer of some sort, but Irrlicht might support that itself.
+
+  gld->winwin = elm_win_add(ourGlobals->win, "inlined", ELM_WIN_INLINED_IMAGE);
+  // On mouse down we try to shift focus to the backing image, this seems to be the correct thing to force focus onto it's widgets.
+  // According to the Elm inlined image window example, this is what's needed to.
+  evas_object_event_callback_add(elm_win_inlined_image_object_get(gld->winwin), EVAS_CALLBACK_MOUSE_DOWN, _cb_mouse_down_elm, NULL);
+  // In this code, we are making our own camera, so grab it's input when we are focused.
+  cameraAdd(ourGlobals, gld->winwin);
+
+  elm_win_alpha_set(gld->winwin, EINA_TRUE);
+  // Apparently transparent is not good enough for ELM backgrounds, so make it a rectangle.
+  // Apparently coz ELM prefers stuff to have edjes.  A bit over the top if all I want is a transparent rectangle.
+  bg = evas_object_rectangle_add(evas_object_evas_get(gld->winwin));
+  evas_object_color_set(bg, 0, 0, 0, 0);
+  evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+  elm_win_resize_object_add(gld->winwin, bg);
+  evas_object_show(bg);
+
+  // image object for win is unlinked to its pos/size - so manual control
+  // this allows also for using map and other things with it.
+  evas_object_move(elm_win_inlined_image_object_get(gld->winwin), 0, 0);
+  // Odd, it needs to be resized twice.  WTF?
+  evas_object_resize(gld->winwin, ourGlobals->win_w, ourGlobals->win_h);
+  evas_object_resize(elm_win_inlined_image_object_get(gld->winwin), ourGlobals->win_w, ourGlobals->win_h);
+  evas_object_show(gld->winwin);
+}
+
+
 EAPI_MAIN int elm_main(int argc, char **argv)
 {
     Evas_Object *obj;
     EPhysics_World *world;
     GLData *gld = NULL;
-    fangWin *chat = NULL, *woMan = NULL;
+    winFang *chat = NULL, *woMan = NULL;
     char buf[PATH_MAX];
 //    Eina_Bool gotWebKit = elm_need_web();     // Initialise ewebkit if it exists, or return EINA_FALSE if it don't.
 
@@ -452,9 +505,9 @@ EAPI_MAIN int elm_main(int argc, char **argv)
     {
         Evas_3D_Demo_fini(&ourGlobals);
         eo_unref(ourGlobals.tb);
-        fang_win_del(&ourGlobals, ourGlobals.files);
-        fang_win_del(&ourGlobals, chat);
-        fang_win_del(&ourGlobals, woMan);
+        winFangDel(&ourGlobals, ourGlobals.files);
+        winFangDel(&ourGlobals, chat);
+        winFangDel(&ourGlobals, woMan);
         eo_unref(ourGlobals.bx);
         evas_object_del(ourGlobals.win);
     }
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h
index a4001c7..046f099 100644
--- a/src/extantz/extantz.h
+++ b/src/extantz/extantz.h
@@ -10,6 +10,7 @@
 #include <Evas_GL.h>
 #include <EPhysics.h>
 #include "extantzCamera.h"
+#include "winFang.h"
 
 
 #ifdef GL_GLES
@@ -123,27 +124,7 @@ typedef struct
     short       x, y, z;
 } ezLandmark;
 
-typedef struct _fangWin
-{
-  Evas_Object   *win;
-  Eina_Clist    widgets;
-  void          *data;
-  Evas_Smart_Cb on_del;
-} fangWin;
 
-typedef struct _Widget
-{
-  char          magic[8];
-  Evas_Object   *obj;
-  Eina_Clist    node;
-  char          *label, *look, *action, *help;
-  // foreground / background colour
-  // thing
-  // types {}
-  // skangCoord x, y, w, h
-  void          *data;
-  Evas_Smart_Cb on_del;
-} Widget;
 
 typedef struct _Scene_Data
 {
@@ -244,7 +225,7 @@ typedef struct _globals
 
   Eina_Clist    windows;
 
-  fangWin       *files;
+  winFang       *files;
 } globals;
 
 extern globals ourGlobals;
@@ -265,22 +246,18 @@ EAPI void drawIrr_end(globals *ourGlobals);
 EAPI void finishIrr(globals *ourGlobals);
 #endif
 
+void overlay_add(globals *ourGlobals);
+
 EAPI void Evas_3D_Demo_add(globals *ourGlobals);
 Eina_Bool _animate_scene(globals *ourGlobals);
 void Evas_3D_Demo_fini(globals *ourGlobals);
 
 void cameraAdd(globals *ourGlobals, Evas_Object *win);
 
-fangWin *fang_win_add(globals *ourGlobals);
-void fang_win_complete(globals *ourGlobals, fangWin *win, int x, int y, int w, int h);
-void fang_win_del(globals *ourGlobals, fangWin *win);
-void overlay_add(globals *ourGlobals);
-Widget *widgetAdd(fangWin *win, const Eo_Class *klass, Evas_Object *parent, char *title);
-
-fangWin *chat_add(globals *ourGlobals);
-fangWin *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save);
-void     filesShow(fangWin *me, Evas_Smart_Cb func, void *data);
-fangWin *woMan_add(globals *ourGlobals);
+winFang *chat_add(globals *ourGlobals);
+winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save);
+void     filesShow(winFang *me, Evas_Smart_Cb func, void *data);
+winFang *woMan_add(globals *ourGlobals);
 
 
 #ifdef __cplusplus
diff --git a/src/extantz/files.c b/src/extantz/files.c
index 816894f..ff76dff 100644
--- a/src/extantz/files.c
+++ b/src/extantz/files.c
@@ -60,7 +60,7 @@ static void _big_icon_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *ev
 
 static void my_fileselector_activated(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-  fangWin *me = data;
+  winFang *me = data;
   Evas_Object *fs = me->data;
 
    if (elm_fileselector_multi_select_get(fs))
@@ -85,7 +85,7 @@ static void my_fileselector_activated(void *data, Evas_Object *obj EINA_UNUSED,
 
 static void _CANCEL_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-  fangWin *me = data;
+  winFang *me = data;
 
   evas_object_hide(me->win);
 }
@@ -140,13 +140,13 @@ void _on_fs_del(void *data, Evas_Object *obj, void *event_info)
   elm_entry_editable_set(obj, EINA_FALSE);
 }
 
-fangWin *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save)
+winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save)
 {
-  fangWin *me;
+  winFang *me;
   Widget  *wid;
   Evas_Object *bx, *vbox, *fs, *bt, *rd = NULL, *rdg = NULL, *hoversel;
 
-  me = fang_win_add(ourGlobals);
+  me = winFangAdd(ourGlobals);
 
   bx = eo_add(ELM_OBJ_BOX_CLASS, me->win,
     elm_obj_box_homogeneous_set(EINA_FALSE),
@@ -277,12 +277,12 @@ fangWin *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
   eo_unref(vbox);
   eo_unref(bx);
 
-  fang_win_complete(ourGlobals, me, ourGlobals->win_w - 380, ourGlobals->win_w - 530, 350, 500);
+  winFangComplete(ourGlobals, me, ourGlobals->win_w - 380, ourGlobals->win_w - 530, 350, 500);
   evas_object_hide(me->win);
   return me;
 }
 
-void filesShow(fangWin *me, Evas_Smart_Cb func, void *data)
+void filesShow(winFang *me, Evas_Smart_Cb func, void *data)
 {
   Evas_Object *fs = me->data;
 
diff --git a/src/extantz/fangWin.c b/src/extantz/winFang.c
index 88a5c00..0f0328f 100644
--- a/src/extantz/fangWin.c
+++ b/src/extantz/winFang.c
@@ -76,12 +76,12 @@ static void create_handles(Evas_Object *obj)
      }
 }
 
-fangWin *fang_win_add(globals *ourGlobals)
+winFang *winFangAdd(globals *ourGlobals)
 {
-  fangWin *result;
+  winFang *result;
   Evas_Object *bg;
 
-  result = calloc(1, sizeof(fangWin));
+  result = calloc(1, sizeof(winFang));
   eina_clist_init(&result->widgets);
 
   // In theory this should create an EWS window, in practice, I'm not seeing any difference.
@@ -104,7 +104,7 @@ fangWin *fang_win_add(globals *ourGlobals)
   return result;
 }
 
-void fang_win_complete(globals *ourGlobals, fangWin *win, int x, int y, int w, int h)
+void winFangComplete(globals *ourGlobals, winFang *win, int x, int y, int w, int h)
 {
   // image object for win is unlinked to its pos/size - so manual control
   // this allows also for using map and other things with it.
@@ -116,7 +116,7 @@ void fang_win_complete(globals *ourGlobals, fangWin *win, int x, int y, int w, i
   create_handles(elm_win_inlined_image_object_get(win->win));
 }
 
-void fang_win_del(globals *ourGlobals, fangWin *win)
+void winFangDel(globals *ourGlobals, winFang *win)
 {
   Widget *wid;
 
@@ -132,49 +132,7 @@ void fang_win_del(globals *ourGlobals, fangWin *win)
   evas_object_del(win->win);
 }
 
-void overlay_add(globals *ourGlobals)
-{
-  GLData *gld = &ourGlobals->gld;
-  Evas_Object *bg;
-
-  // There are many reasons for this window.
-  // The first is to cover the GL and provide something to click on to change focus.
-  // The second is to provide something to click on for all the GL type clicking stuff that needs to be done.  In other words, no click through, we catch the clicks here.
-  //   So we can probably avoid the following issue -
-  //     How to do click through?  evas_object_pass_events_set(rectangle, EINA_TRUE), and maybe need to do that to the underlaying window to?
-  //     Though if the rectangle is entirely transparent, or even hidden, events might pass through anyway.
-  //   Gotta have click through on the parts where there's no other window.
-  // The third is to have the other windows live here.
-  //   This idea doesn't work, as it breaks the damn focus again.
-  //   Don't think it's needed anyway.
-  // While on the subject of layers, need a HUD layer of some sort, but Irrlicht might support that itself.
-
-  gld->winwin = elm_win_add(ourGlobals->win, "inlined", ELM_WIN_INLINED_IMAGE);
-  // On mouse down we try to shift focus to the backing image, this seems to be the correct thing to force focus onto it's widgets.
-  // According to the Elm inlined image window example, this is what's needed to.
-  evas_object_event_callback_add(elm_win_inlined_image_object_get(gld->winwin), EVAS_CALLBACK_MOUSE_DOWN, _cb_mouse_down_elm, NULL);
-  // In this code, we are making our own camera, so grab it's input when we are focused.
-  cameraAdd(ourGlobals, gld->winwin);
-
-  elm_win_alpha_set(gld->winwin, EINA_TRUE);
-  // Apparently transparent is not good enough for ELM backgrounds, so make it a rectangle.
-  // Apparently coz ELM prefers stuff to have edjes.  A bit over the top if all I want is a transparent rectangle.
-  bg = evas_object_rectangle_add(evas_object_evas_get(gld->winwin));
-  evas_object_color_set(bg, 0, 0, 0, 0);
-  evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-  elm_win_resize_object_add(gld->winwin, bg);
-  evas_object_show(bg);
-
-  // image object for win is unlinked to its pos/size - so manual control
-  // this allows also for using map and other things with it.
-  evas_object_move(elm_win_inlined_image_object_get(gld->winwin), 0, 0);
-  // Odd, it needs to be resized twice.  WTF?
-  evas_object_resize(gld->winwin, ourGlobals->win_w, ourGlobals->win_h);
-  evas_object_resize(elm_win_inlined_image_object_get(gld->winwin), ourGlobals->win_w, ourGlobals->win_h);
-  evas_object_show(gld->winwin);
-}
-
-Widget *widgetAdd(fangWin *win, const Eo_Class *klass, Evas_Object *parent, char *title)
+Widget *widgetAdd(winFang *win, const Eo_Class *klass, Evas_Object *parent, char *title)
 {
   Widget *result;
 
diff --git a/src/extantz/winFang.h b/src/extantz/winFang.h
new file mode 100644
index 0000000..8749be5
--- /dev/null
+++ b/src/extantz/winFang.h
@@ -0,0 +1,32 @@
+#include <Elementary.h>
+
+
+// Forward references.
+typedef struct _globals globals;
+
+typedef struct _winFang
+{
+  Evas_Object   *win;
+  Eina_Clist    widgets;
+  void          *data;
+  Evas_Smart_Cb on_del;
+} winFang;
+
+typedef struct _Widget
+{
+  char          magic[8];
+  Evas_Object   *obj;
+  Eina_Clist    node;
+  char          *label, *look, *action, *help;
+  // foreground / background colour
+  // thing
+  // types {}
+  // skangCoord x, y, w, h
+  void          *data;
+  Evas_Smart_Cb on_del;
+} Widget;
+
+winFang *winFangAdd(globals *ourGlobals);
+void winFangComplete(globals *ourGlobals, winFang *win, int x, int y, int w, int h);
+void winFangDel(globals *ourGlobals, winFang *win);
+Widget *widgetAdd(winFang *win, const Eo_Class *klass, Evas_Object *parent, char *title);
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c
index 0a3456b..fe2e3f2 100644
--- a/src/extantz/woMan.c
+++ b/src/extantz/woMan.c
@@ -151,15 +151,15 @@ static void _grid_sel_cb(void *data, Evas_Object *obj, void *event_info)
 }
 
 
-fangWin *woMan_add(globals *ourGlobals)
+winFang *woMan_add(globals *ourGlobals)
 {
-    fangWin *me;
+    winFang *me;
     Evas_Object *bx, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu;
     Elm_Object_Item *tb_it, *menu_it, *tab_it;
     char buf[PATH_MAX];
     int i;
 
-    me = fang_win_add(ourGlobals);
+    me = winFangAdd(ourGlobals);
 
     bx = elm_box_add(me->win);
     elm_win_resize_object_add(me->win, bx);
@@ -286,6 +286,6 @@ fangWin *woMan_add(globals *ourGlobals)
     eo_unref(bt);
     evas_object_show(bx);
 
-    fang_win_complete(ourGlobals, me, 30, 30, ourGlobals->win_w / 3, ourGlobals->win_h / 3);
+    winFangComplete(ourGlobals, me, 30, 30, ourGlobals->win_w / 3, ourGlobals->win_h / 3);
     return me;
 }