mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Create a gtk window
It doesn't *do* anything, but some day it will. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
19e670a23b
commit
0ca546b31e
2 changed files with 35 additions and 6 deletions
5
Makefile
5
Makefile
|
@ -2,10 +2,11 @@ CC=gcc
|
||||||
CFLAGS=-Wall -Wno-pointer-sign -g
|
CFLAGS=-Wall -Wno-pointer-sign -g
|
||||||
|
|
||||||
parse: main.o parse.o
|
parse: main.o parse.o
|
||||||
$(CC) $(LDLAGS) -o parse main.o parse.o `xml2-config --libs`
|
$(CC) $(LDLAGS) -o parse main.o parse.o `xml2-config --libs` \
|
||||||
|
`pkg-config --libs gtk+-2.0`
|
||||||
|
|
||||||
parse.o: parse.c dive.h
|
parse.o: parse.c dive.h
|
||||||
$(CC) $(CFLAGS) -c `xml2-config --cflags` parse.c
|
$(CC) $(CFLAGS) -c `xml2-config --cflags` parse.c
|
||||||
|
|
||||||
main.o: main.c dive.h
|
main.o: main.c dive.h
|
||||||
$(CC) $(CFLAGS) -c main.c
|
$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0` -c main.c
|
||||||
|
|
36
main.c
36
main.c
|
@ -1,6 +1,9 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
#include <gtk/gtk.h>
|
||||||
|
#include <gdk/gdk.h>
|
||||||
|
#include <cairo.h>
|
||||||
|
|
||||||
#include "dive.h"
|
#include "dive.h"
|
||||||
|
|
||||||
|
@ -43,13 +46,13 @@ static int sortfn(const void *_a, const void *_b)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This doesn't really report anything at all. We just sort the
|
||||||
|
* dives, the GUI does the reporting
|
||||||
|
*/
|
||||||
static void report_dives(void)
|
static void report_dives(void)
|
||||||
{
|
{
|
||||||
int i;
|
|
||||||
|
|
||||||
qsort(dive_table.dives, dive_table.nr, sizeof(struct dive *), sortfn);
|
qsort(dive_table.dives, dive_table.nr, sizeof(struct dive *), sortfn);
|
||||||
for (i = 0; i < dive_table.nr; i++)
|
|
||||||
show_dive(i+1, dive_table.dives[i]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void parse_argument(const char *arg)
|
static void parse_argument(const char *arg)
|
||||||
|
@ -68,12 +71,28 @@ static void parse_argument(const char *arg)
|
||||||
} while (*++p);
|
} while (*++p);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void on_destroy(GtkWidget* w, gpointer data)
|
||||||
|
{
|
||||||
|
gtk_main_quit();
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean on_expose(GtkWidget* w, GdkEventExpose* e, gpointer data)
|
||||||
|
{
|
||||||
|
cairo_t* cr;
|
||||||
|
cr = gdk_cairo_create(w->window);
|
||||||
|
cairo_destroy(cr);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
GtkWidget* win;
|
||||||
|
|
||||||
parse_xml_init();
|
parse_xml_init();
|
||||||
|
|
||||||
|
gtk_init(&argc, &argv);
|
||||||
|
|
||||||
for (i = 1; i < argc; i++) {
|
for (i = 1; i < argc; i++) {
|
||||||
const char *a = argv[i];
|
const char *a = argv[i];
|
||||||
|
|
||||||
|
@ -83,7 +102,16 @@ int main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
parse_xml_file(a);
|
parse_xml_file(a);
|
||||||
}
|
}
|
||||||
|
|
||||||
report_dives();
|
report_dives();
|
||||||
|
|
||||||
|
win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
||||||
|
g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL);
|
||||||
|
g_signal_connect(G_OBJECT(win), "expose-event", G_CALLBACK(on_expose), NULL);
|
||||||
|
gtk_widget_set_app_paintable(win, TRUE);
|
||||||
|
gtk_widget_show_all(win);
|
||||||
|
|
||||||
|
gtk_main();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue