commit - 86ec92836b843680ddf12238b370436e883d437a
commit + ed95fb5f71dab4a4ea1809b6c88d63fedfce91a9
blob - bd3fe7736b6637d8e84f3c8588ba9e901d6d5063
blob + 7cc1676291c032cf1d849d8ae3185b1e481d28b4
--- frame.c
+++ frame.c
}
if (tohover != con->focus.hover && con->focus.hover != NULL)
- con->focus.hover->in_ops->mouse_unhover(con->focus.hover);
+ con->focus.hover->ops->mouse_unhover(con->focus.hover);
con->focus.hover = tohover;
if (tohover != NULL)
- tohover->in_ops->mouse_hover(tohover, x, y);
+ tohover->ops->mouse_hover(tohover, x, y);
}
static void
struct aui_container *con = (struct aui_container *)widget;
if (con->focus.hover) {
- con->focus.hover->in_ops->mouse_unhover(con->focus.hover);
+ con->focus.hover->ops->mouse_unhover(con->focus.hover);
con->focus.hover = NULL;
}
}
}
if (topress != con->focus.press && con->focus.press != NULL)
- con->focus.press->in_ops->mouse_release(con->focus.press, x, y, button);
+ con->focus.press->ops->mouse_release(con->focus.press, x, y, button);
con->focus.press = topress;
if (topress != NULL)
- topress->in_ops->mouse_press(topress, x, y, button);
+ topress->ops->mouse_press(topress, x, y, button);
}
static void
struct aui_container *con = (struct aui_container *)widget;
if (con->focus.press != NULL) {
- con->focus.press->in_ops->mouse_release(con->focus.press, x, y, button);
+ con->focus.press->ops->mouse_release(con->focus.press, x, y, button);
con->focus.press = NULL;
}
}
blob - 997759160218ddf2ff55d1e9695a54804b4cb3a6
blob + 73c2d50a0fe25487b2958c430bffdc2ff79a9416
--- layout.c
+++ layout.c
geom.x += dx;
geom.y += dy;
- child->in_ops->set_geometry(child, &geom);
+ child->ops->set_geometry(child, &geom);
switch (child->type) {
case WIDGET_TYPE_FRAME:
if (child->mapped == 0)
continue;
- struct aui_geometry min = child->in_ops->get_min_size(child);
+ struct aui_geometry min = child->ops->get_min_size(child);
rmap[child->gridpar.row] = 1;
cmap[child->gridpar.column] = 1;
if (child->mapped == 0)
continue;
- struct aui_geometry min = child->in_ops->get_min_size(child);
+ struct aui_geometry min = child->ops->get_min_size(child);
struct aui_geometry geom = { 0 };
int dx = (csize[child->gridpar.column] - min.width);
geom.width = min.width;
geom.height = min.height;
- child->in_ops->set_geometry(child, &geom);
+ child->ops->set_geometry(child, &geom);
}
free(rsize);
if (child->mapped == 0)
continue;
- struct aui_geometry cgeom = child->in_ops->get_min_size(child);
+ struct aui_geometry cgeom = child->ops->get_min_size(child);
switch (child->packpar.side) {
case AUI_SIDE_TOP:
case AUI_SIDE_BOTTOM:
if (child->mapped == 0)
continue;
- struct aui_geometry min = child->in_ops->get_min_size(child);
+ struct aui_geometry min = child->ops->get_min_size(child);
switch (child->packpar.side) {
case AUI_SIDE_TOP:
if (child->mapped == 0)
continue;
- struct aui_geometry min = child->in_ops->get_min_size(child);
+ struct aui_geometry min = child->ops->get_min_size(child);
struct aui_geometry *area = &child->packarea;
switch (child->packpar.fill) {
break;
}
- child->in_ops->set_geometry(child, &child->geom);
+ child->ops->set_geometry(child, &child->geom);
}
TAILQ_FOREACH(child, &widget->queue, entries) {
blob - cfee5f6224d955edc4c35a647d73c5094a7d5193
blob + e3f0ce9a1a18647c86c85a67bd9758de9a563e24
--- ui.c
+++ ui.c
struct aui_window *aw = ev->aw;
struct aui_widget *ww = (struct aui_widget *)aw;
- ww->in_ops->free(ww);
+ ww->ops->free(ww);
free((void *)qev);
break;
struct aui_event_mouse_motion *mev = (struct aui_event_mouse_motion *)ev;
struct aui_window *aw = ev->aw;
struct aui_widget *ww = (struct aui_widget *)aw;
- struct widget_ops *ops = ww->in_ops;
+ struct widget_ops *ops = ww->ops;
ops->mouse_hover(ww, mev->x, mev->y);
free((void *)mev);
struct aui_event_mouse_press *mpe = (struct aui_event_mouse_press *)ev;
struct aui_window *aw = ev->aw;
struct aui_widget *ww = (struct aui_widget *)aw;
- struct widget_ops *ops = ww->in_ops;
+ struct widget_ops *ops = ww->ops;
ops->mouse_press(ww, mpe->x, mpe->y, mpe->button);
free((void *)mpe);
struct aui_event_mouse_release *mre = (struct aui_event_mouse_release *)ev;
struct aui_window *aw = ev->aw;
struct aui_widget *ww = (struct aui_widget *)aw;
- struct widget_ops *ops = ww->in_ops;
+ struct widget_ops *ops = ww->ops;
ops->mouse_release(ww, mre->x, mre->y, mre->button);
free((void *)mre);
void
aui_destroy(struct aui_widget *widget)
{
- widget->in_ops->free(widget);
+ widget->ops->free(widget);
}
blob - bcc66e218787c447009041fffa14987e560db0b8
blob + a75e978fa3653449f0abf805f3abdfdfd0a5cea3
--- widget.c
+++ widget.c
memset(&widget->packpar, 0, sizeof(struct aui_packpar));
widget->type = type;
- widget->in_ops = ops;
+ widget->ops = ops;
}
void
blob - e8bf66dad05133110e600b2f51b6f4872c591f5c
blob + 16fc86b3515613a0f806806202e8806d70ea3f2d
--- widget.h
+++ widget.h
struct aui_geometry geom;
struct aui_window *window;
- struct widget_ops *in_ops;
+ struct widget_ops *ops;
struct aui_placepar placepar;
struct aui_gridpar gridpar;
blob - 8b4e7d1ce36c108e08792a4e6c43df901dce0393
blob + 1624ce25cb81e598e96d07101161d4cacd97214e
--- window.c
+++ window.c
}
if (tohover != con->focus.hover && con->focus.hover != NULL)
- con->focus.hover->in_ops->mouse_unhover(con->focus.hover);
+ con->focus.hover->ops->mouse_unhover(con->focus.hover);
con->focus.hover = tohover;
if (tohover != NULL)
- tohover->in_ops->mouse_hover(tohover, x, y);
+ tohover->ops->mouse_hover(tohover, x, y);
}
static void
}
if (topress != con->focus.press && con->focus.press != NULL)
- con->focus.press->in_ops->mouse_release(con->focus.press, x, y, button);
+ con->focus.press->ops->mouse_release(con->focus.press, x, y, button);
con->focus.press = topress;
if (topress != NULL)
- topress->in_ops->mouse_press(topress, x, y, button);
+ topress->ops->mouse_press(topress, x, y, button);
}
static void
struct aui_window *aw = (struct aui_window *)widget;
if (con->focus.press != NULL) {
- con->focus.press->in_ops->mouse_release(con->focus.press, x, y, button);
+ con->focus.press->ops->mouse_release(con->focus.press, x, y, button);
con->focus.press = NULL;
window_mouse_hover(widget, x, y);