diff options
author | David Walter Seikel | 2014-05-03 18:33:58 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-03 18:33:58 +1000 |
commit | 3c0fb329ecc4a719bd8d80257298d08f80b1bfd3 (patch) | |
tree | a0bb12ea6772588b90b0d26c855aeb802b6e56c3 /src/extantz/woMan.c | |
parent | Remove Evas_3d example stuff from GuiLua, now that it's in extantz. (diff) | |
download | SledjHamr-3c0fb329ecc4a719bd8d80257298d08f80b1bfd3.zip SledjHamr-3c0fb329ecc4a719bd8d80257298d08f80b1bfd3.tar.gz SledjHamr-3c0fb329ecc4a719bd8d80257298d08f80b1bfd3.tar.bz2 SledjHamr-3c0fb329ecc4a719bd8d80257298d08f80b1bfd3.tar.xz |
Move non GL_View stuff from gld -> ourGlobals. Plus some white space fixes.
Diffstat (limited to '')
-rw-r--r-- | src/extantz/woMan.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c index 3bb42fe..bef449c 100644 --- a/src/extantz/woMan.c +++ b/src/extantz/woMan.c | |||
@@ -139,27 +139,28 @@ static Evas_Object *_viewer_content_get(void *data, Evas_Object *obj, const char | |||
139 | 139 | ||
140 | static void _grid_sel_cb(void *data, Evas_Object *obj, void *event_info) | 140 | static void _grid_sel_cb(void *data, Evas_Object *obj, void *event_info) |
141 | { | 141 | { |
142 | ezGrid *thisGrid = data; | 142 | // ezGrid *thisGrid = data; |
143 | GLData *gld = thisGrid->gld; | 143 | // GLData *gld = thisGrid->gld; |
144 | char buf[PATH_MAX]; | 144 | // char buf[PATH_MAX]; |
145 | 145 | ||
146 | // sprintf(buf, "dillo -f -g '%dx%d+%d+%d' %s &", gld->win_w - (gld->win_w / 5), gld->win_h - 30, gld->win_w / 5, gld->win_y, thisGrid->splashPage); | 146 | // sprintf(buf, "dillo -f -g '%dx%d+%d+%d' %s &", gld->win_w - (gld->win_w / 5), gld->win_h - 30, gld->win_w / 5, gld->win_y, thisGrid->splashPage); |
147 | sprintf(buf, "uzbl -g '%dx%d+%d+%d' -u %s &", gld->win_w - (gld->win_w / 5), gld->win_h - 30, gld->win_w / 5, gld->win_y, thisGrid->splashPage); | 147 | // sprintf(buf, "uzbl -g '%dx%d+%d+%d' -u %s &", gld->win_w - (gld->win_w / 5), gld->win_h - 30, gld->win_w / 5, gld->win_y, thisGrid->splashPage); |
148 | printf("%s ### genlist obj [%p], item pointer [%p]\n", buf, obj, event_info); | 148 | // printf("%s ### genlist obj [%p], item pointer [%p]\n", buf, obj, event_info); |
149 | // comment this out for now, busy dealing with input stuff, don't want to trigger this multiple times. | 149 | // comment this out for now, busy dealing with input stuff, don't want to trigger this multiple times. |
150 | // system(buf); | 150 | // system(buf); |
151 | } | 151 | } |
152 | 152 | ||
153 | 153 | ||
154 | void woMan_add(GLData *gld) | 154 | void woMan_add(globals *ourGlobals) |
155 | { | 155 | { |
156 | GLData *gld = &ourGlobals->gld; | ||
156 | // Evas_Object *win, *bg, *bx, *ic, *bb, *av, *en, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; | 157 | // Evas_Object *win, *bg, *bx, *ic, *bb, *av, *en, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; |
157 | Evas_Object *win, *bx, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; | 158 | Evas_Object *win, *bx, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; |
158 | Elm_Object_Item *tb_it, *menu_it, *tab_it; | 159 | Elm_Object_Item *tb_it, *menu_it, *tab_it; |
159 | char buf[PATH_MAX]; | 160 | char buf[PATH_MAX]; |
160 | int i; | 161 | int i; |
161 | 162 | ||
162 | win = fang_win_add(gld); | 163 | win = fang_win_add(ourGlobals); |
163 | 164 | ||
164 | bx = elm_box_add(win); | 165 | bx = elm_box_add(win); |
165 | elm_win_resize_object_add(win, bx); | 166 | elm_win_resize_object_add(win, bx); |
@@ -287,5 +288,5 @@ void woMan_add(GLData *gld) | |||
287 | eo_unref(bt); | 288 | eo_unref(bt); |
288 | evas_object_show(bx); | 289 | evas_object_show(bx); |
289 | 290 | ||
290 | fang_win_complete(gld, win, 30, 30, gld->win_w / 3, gld->win_h / 3); | 291 | fang_win_complete(ourGlobals, win, 30, 30, ourGlobals->win_w / 3, ourGlobals->win_h / 3); |
291 | } | 292 | } |