projects
/
rodin
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Automake tweaking
[rodin/chimara.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 978f788252eb5cb6c533aa5b063219510cc830e5..63983489e19b2a4d3fa469378b33cddf603fd8d4 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-42,9
+42,6
@@
#include "callbacks.h"
#include "error.h"
#include "callbacks.h"
#include "error.h"
-#include "event.h"
-#include "abort.h"
-#include "glk.h"
#include "chimara-glk.h"
/* Global pointers to widgets */
#include "chimara-glk.h"
/* Global pointers to widgets */
@@
-52,6
+49,18
@@
GtkBuilder *builder = NULL;
GtkWidget *window = NULL;
GtkWidget *glk = NULL;
GtkWidget *window = NULL;
GtkWidget *glk = NULL;
+static void
+on_started(ChimaraGlk *glk)
+{
+ g_printerr("Started!\n");
+}
+
+static void
+on_stopped(ChimaraGlk *glk)
+{
+ g_printerr("Stopped!\n");
+}
+
static void
create_window(void)
{
static void
create_window(void)
{
@@
-63,6
+72,8
@@
create_window(void)
gtk_builder_connect_signals(builder, NULL);
glk = chimara_glk_new();
gtk_builder_connect_signals(builder, NULL);
glk = chimara_glk_new();
+ g_signal_connect(glk, "started", G_CALLBACK(on_started), NULL);
+ g_signal_connect(glk, "stopped", G_CALLBACK(on_stopped), NULL);
GtkBox *vbox = GTK_BOX( gtk_builder_get_object(builder, "vbox") );
if(vbox == NULL)
GtkBox *vbox = GTK_BOX( gtk_builder_get_object(builder, "vbox") );
if(vbox == NULL)
@@
-104,7
+115,7
@@
main(int argc, char *argv[])
g_object_unref( G_OBJECT(builder) );
g_object_unref( G_OBJECT(builder) );
- if( !chimara_glk_run(CHIMARA_GLK(glk), &error) ) {
+ if( !chimara_glk_run(CHIMARA_GLK(glk),
".libs/model.so",
&error) ) {
error_dialog(GTK_WINDOW(window), error, "Error starting Glk library: ");
return 1;
}
error_dialog(GTK_WINDOW(window), error, "Error starting Glk library: ");
return 1;
}
@@
-113,7
+124,7
@@
main(int argc, char *argv[])
gtk_main();
gdk_threads_leave();
gtk_main();
gdk_threads_leave();
-
signal_abort(
);
+
chimara_glk_stop(CHIMARA_GLK(glk)
);
chimara_glk_wait(CHIMARA_GLK(glk));
return 0;
chimara_glk_wait(CHIMARA_GLK(glk));
return 0;