aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.c6
-rw-r--r--vis.c14
-rw-r--r--vis.h6
3 files changed, 12 insertions, 14 deletions
diff --git a/main.c b/main.c
index b055761..843fb0d 100644
--- a/main.c
+++ b/main.c
@@ -2186,9 +2186,9 @@ static void signal_handler(int signum, siginfo_t *siginfo, void *context) {
int main(int argc, char *argv[]) {
VisEvent event = {
- .vis_init = vis_lua_init,
- .vis_start = vis_lua_start,
- .vis_quit = vis_lua_quit,
+ .init = vis_lua_init,
+ .start = vis_lua_start,
+ .quit = vis_lua_quit,
.file_open = vis_lua_file_open,
.file_save_pre = vis_lua_file_save_pre,
.file_save_post = vis_lua_file_save_post,
diff --git a/vis.c b/vis.c
index cf69a51..63cfa1c 100644
--- a/vis.c
+++ b/vis.c
@@ -40,8 +40,8 @@ bool vis_event_emit(Vis *vis, enum VisEvents id, ...) {
if (!vis->initialized) {
vis->initialized = true;
vis->ui->init(vis->ui, vis);
- if (vis->event && vis->event->vis_init)
- vis->event->vis_init(vis);
+ if (vis->event && vis->event->init)
+ vis->event->init(vis);
}
va_list ap;
@@ -50,12 +50,10 @@ bool vis_event_emit(Vis *vis, enum VisEvents id, ...) {
switch (id) {
case VIS_EVENT_INIT:
- if (vis->event->vis_init)
- vis->event->vis_init(vis);
break;
case VIS_EVENT_START:
- if (vis->event->vis_start)
- vis->event->vis_start(vis);
+ if (vis->event->start)
+ vis->event->start(vis);
break;
case VIS_EVENT_FILE_OPEN:
case VIS_EVENT_FILE_SAVE_PRE:
@@ -102,8 +100,8 @@ bool vis_event_emit(Vis *vis, enum VisEvents id, ...) {
break;
}
case VIS_EVENT_QUIT:
- if (vis->event->vis_quit)
- vis->event->vis_quit(vis);
+ if (vis->event->quit)
+ vis->event->quit(vis);
break;
}
diff --git a/vis.h b/vis.h
index 4f1fd29..13f5454 100644
--- a/vis.h
+++ b/vis.h
@@ -28,9 +28,9 @@ typedef struct Win Win;
#endif
typedef struct {
- void (*vis_init)(Vis*);
- void (*vis_start)(Vis*);
- void (*vis_quit)(Vis*);
+ void (*init)(Vis*);
+ void (*start)(Vis*);
+ void (*quit)(Vis*);
void (*file_open)(Vis*, File*);
bool (*file_save_pre)(Vis*, File*, const char *path);
void (*file_save_post)(Vis*, File*, const char *path);