Much, see ChangeLog

This commit is contained in:
Matthew Allum
2005-05-14 10:19:39 +00:00
parent 24cefa8d2a
commit 3838ffe065
18 changed files with 354 additions and 115 deletions

View File

@ -1,4 +1,4 @@
noinst_PROGRAMS = scratch photos player
noinst_PROGRAMS = scratch photos player select
scratch_SOURCES = scratch.c
scratch_CFLAGS = $(CLTR_CFLAGS) $(GST_CFLAGS) $(GCONF_CFLAGS)
@ -24,4 +24,12 @@ player_LDFLAGS = \
$(GCONF_LIBS) \
$(top_builddir)/clutter/libclutter.la
select_SOURCES = select.c
select_CFLAGS = $(CLTR_CFLAGS) $(GST_CFLAGS) $(GCONF_CFLAGS)
select_LDFLAGS = \
$(CLTR_LIBS) \
$(GST_LIBS) \
$(GCONF_LIBS) \
$(top_builddir)/clutter/libclutter.la

View File

@ -53,9 +53,7 @@ main (int argc, char *argv[])
{
CltrWidget *win, *video, *label;
CltrFont *font;
PixbufPixel col = { 0xff, 0xff, 0xff, 0x66 };
pixel_set_vals(&col, 0x00, 0x00, 0x00, 0x99);
PixbufPixel col = { 0x66, 0x00, 0x00, 0x99 };
cltr_init (&argc, &argv);
@ -64,7 +62,7 @@ main (int argc, char *argv[])
exit (-1);
}
font = font_new("Sans bold 96");
font = font_new("Baubau 72");
win = cltr_window_new(800, 600);
@ -74,9 +72,9 @@ main (int argc, char *argv[])
cltr_widget_add_child(win, video, 0, 0);
label = cltr_label_new("hello world", font, &col);
label = cltr_label_new("Clutter", font, &col);
cltr_widget_add_child(win, label, 100, 300);
cltr_widget_add_child(win, label, 10, 400);
cltr_window_on_xevent(CLTR_WINDOW(win), handle_xevent, video);

View File

@ -84,11 +84,8 @@ main(int argc, char **argv)
cltr_widget_add_child(win, test2, 400, 300);
*/
list = cltr_list_new(640,480,640, 160);
cltr_widget_add_child(win, list, 0, 0);
cltr_window_focus_widget(CLTR_WINDOW(win), list);
cltr_window_focus_widget(CLTR_WINDOW(win), test);
cltr_widget_show_all(win);

65
examples/select.c Normal file
View File

@ -0,0 +1,65 @@
#include <clutter/cltr.h>
int
usage(char *progname)
{
fprintf(stderr, "Usage ... check source for now\n");
exit(-1);
}
int
main(int argc, char **argv)
{
int i;
CltrWidget *win = NULL, *list = NULL;
CltrFont *font = NULL;
PixbufPixel col = { 0xff, 0, 0, 0xff };
gchar *img_path = NULL;
gboolean want_fullscreen = FALSE;
gint cols = 3;
cltr_init(&argc, &argv);
for (i = 1; i < argc; i++)
{
if (!strcmp ("--image-path", argv[i]) || !strcmp ("-i", argv[i]))
{
if (++i>=argc) usage (argv[0]);
img_path = argv[i];
continue;
}
if (!strcmp ("--cols", argv[i]) || !strcmp ("-c", argv[i]))
{
if (++i>=argc) usage (argv[0]);
cols = atoi(argv[i]);
continue;
}
if (!strcmp ("-fs", argv[i]) || !strcmp ("--fullscreen", argv[i]))
{
want_fullscreen = TRUE;
continue;
}
if (!strcmp("--help", argv[i]) || !strcmp("-h", argv[i]))
{
usage(argv[0]);
}
usage(argv[0]);
}
win = cltr_window_new(800, 600);
if (want_fullscreen)
cltr_window_set_fullscreen(CLTR_WINDOW(win));
list = cltr_list_new(800, 600, 800, 600/5);
cltr_widget_add_child(win, list, 0, 0);
cltr_window_focus_widget(CLTR_WINDOW(win), list);
cltr_widget_show_all(win);
cltr_main_loop();
}