From ab2fb9f9c5d16f60847225608a9b21156659d210 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Mon, 5 May 2014 03:48:09 +1000 Subject: winFang no longer depends on ourGlobals. --- src/extantz/chat.c | 5 +++-- src/extantz/extantz.c | 2 +- src/extantz/files.c | 5 +++-- src/extantz/winFang.c | 9 ++++----- src/extantz/winFang.h | 9 +++------ src/extantz/woMan.c | 5 +++-- 6 files changed, 17 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/extantz/chat.c b/src/extantz/chat.c index 2155541..e0aa9da 100644 --- a/src/extantz/chat.c +++ b/src/extantz/chat.c @@ -16,7 +16,8 @@ winFang *chat_add(globals *ourGlobals) Widget *wid; Evas_Object *bx, *en; - me = winFangAdd(ourGlobals); + me = winFangAdd(ourGlobals->win); + eina_clist_add_head(&ourGlobals->winFangs, &me->node); bx = eo_add(ELM_OBJ_BOX_CLASS, me->win, evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), @@ -46,6 +47,6 @@ winFang *chat_add(globals *ourGlobals) evas_object_show(bx); eo_unref(bx); - winFangComplete(ourGlobals, me, 30, 500, ourGlobals->win_w / 3, ourGlobals->win_h / 3); + winFangComplete(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 8956bbf..efe3748 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c @@ -510,7 +510,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) EINA_CLIST_FOR_EACH_ENTRY(win, &ourGlobals.winFangs, winFang, node) { - winFangDel(&ourGlobals, win); + winFangDel(win); } eo_unref(ourGlobals.bx); evas_object_del(ourGlobals.win); diff --git a/src/extantz/files.c b/src/extantz/files.c index c0867c6..6743deb 100644 --- a/src/extantz/files.c +++ b/src/extantz/files.c @@ -146,7 +146,8 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa Widget *wid; Evas_Object *bx, *vbox, *fs, *bt, *rd = NULL, *rdg = NULL, *hoversel; - me = winFangAdd(ourGlobals); + me = winFangAdd(ourGlobals->win); + eina_clist_add_head(&ourGlobals->winFangs, &me->node); bx = eo_add(ELM_OBJ_BOX_CLASS, me->win, elm_obj_box_homogeneous_set(EINA_FALSE), @@ -277,7 +278,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa eo_unref(vbox); eo_unref(bx); - winFangComplete(ourGlobals, me, ourGlobals->win_w - 380, ourGlobals->win_w - 530, 350, 500); + winFangComplete(me, ourGlobals->win_w - 380, ourGlobals->win_w - 530, 350, 500); winFangHide(me); return me; } diff --git a/src/extantz/winFang.c b/src/extantz/winFang.c index 3c4cc22..830b84e 100644 --- a/src/extantz/winFang.c +++ b/src/extantz/winFang.c @@ -67,19 +67,18 @@ void winFangShow(winFang *win) evas_object_show(win->hand[i]); } -winFang *winFangAdd(globals *ourGlobals) +winFang *winFangAdd(Evas_Object *parent) { winFang *result; Evas_Object *bg; result = calloc(1, sizeof(winFang)); - eina_clist_add_head(&ourGlobals->winFangs, &result->node); eina_clist_init(&result->widgets); // In theory this should create an EWS window, in practice, I'm not seeing any difference. // Guess I'll have to implement my own internal window manager. I don't think a basic one will be that hard. Famous last words. // elm_config_engine_set("ews"); - result->win = elm_win_add(ourGlobals->win, "inlined", ELM_WIN_INLINED_IMAGE); + result->win = elm_win_add(parent, "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(result->win), EVAS_CALLBACK_MOUSE_DOWN, _cb_mouse_down_elm, NULL); @@ -96,7 +95,7 @@ winFang *winFangAdd(globals *ourGlobals) return result; } -void winFangComplete(globals *ourGlobals, winFang *win, int x, int y, int w, int h) +void winFangComplete(winFang *win, int x, int y, int w, int h) { Evas_Object *obj = elm_win_inlined_image_object_get(win->win); Evas_Object *obj2 = evas_object_evas_get(obj); @@ -150,7 +149,7 @@ void winFangComplete(globals *ourGlobals, winFang *win, int x, int y, int w, int } } -void winFangDel(globals *ourGlobals, winFang *win) +void winFangDel(winFang *win) { Widget *wid; diff --git a/src/extantz/winFang.h b/src/extantz/winFang.h index cc61847..49c7889 100644 --- a/src/extantz/winFang.h +++ b/src/extantz/winFang.h @@ -1,9 +1,6 @@ #include -// Forward references. -typedef struct _globals globals; - typedef struct _winFang { Evas_Object *win; @@ -33,10 +30,10 @@ typedef struct _Widget Evas_Smart_Cb on_del; } Widget; -winFang *winFangAdd(globals *ourGlobals); -void winFangComplete(globals *ourGlobals, winFang *win, int x, int y, int w, int h); +winFang *winFangAdd(Evas_Object *parent); +void winFangComplete(winFang *win, int x, int y, int w, int h); void winFangHide(winFang *win); void winFangShow(winFang *win); -void winFangDel(globals *ourGlobals, winFang *win); +void winFangDel(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 fe2e3f2..b5a4f50 100644 --- a/src/extantz/woMan.c +++ b/src/extantz/woMan.c @@ -159,7 +159,8 @@ winFang *woMan_add(globals *ourGlobals) char buf[PATH_MAX]; int i; - me = winFangAdd(ourGlobals); + me = winFangAdd(ourGlobals->win); + eina_clist_add_head(&ourGlobals->winFangs, &me->node); bx = elm_box_add(me->win); elm_win_resize_object_add(me->win, bx); @@ -286,6 +287,6 @@ winFang *woMan_add(globals *ourGlobals) eo_unref(bt); evas_object_show(bx); - winFangComplete(ourGlobals, me, 30, 30, ourGlobals->win_w / 3, ourGlobals->win_h / 3); + winFangComplete(me, 30, 30, ourGlobals->win_w / 3, ourGlobals->win_h / 3); return me; } -- cgit v1.1