examples: Add examples_init () helper to clean up all examples

t-chaik · Oct 21, 2019 · eed432b · eed432b
1 parent 6dd72db
commit eed432b
Show file tree

Hide file tree

Showing 22 changed files with 120 additions and 623 deletions.
diff --git a/examples/cairo.c b/examples/cairo.c
@@ -108,34 +108,12 @@ resize_area (GthreeArea *area,
 int
 main (int argc, char *argv[])
 {
-  GtkWidget *window, *box, *hbox, *button, *area;
+  GtkWidget *window, *box, *area;
   GthreeScene *scene;
   GthreePerspectiveCamera *camera;
   graphene_point3d_t pos;
 
-#ifdef USE_GTK4
-  gtk_init ();
-#else
-  gtk_init (&argc, &argv);
-#endif
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "Cairo textures");
-  gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
-#ifdef USE_GTK3
-  gtk_container_set_border_width (GTK_CONTAINER (window), 12);
-#endif
-  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-  gtk_box_set_spacing (GTK_BOX (box), 6);
-  gtk_container_add (GTK_CONTAINER (window), box);
-  gtk_widget_show (box);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
-  gtk_box_set_spacing (GTK_BOX (hbox), 6);
-  gtk_container_add (GTK_CONTAINER (box), hbox);
-  gtk_widget_show (hbox);
+  window = examples_init ("Cairo textures", &box);
 
   scene = init_scene ();
   camera = gthree_perspective_camera_new (30, 1, 1, 10000);
@@ -148,17 +126,11 @@ main (int argc, char *argv[])
   g_signal_connect (area, "resize", G_CALLBACK (resize_area), camera);
   gtk_widget_set_hexpand (area, TRUE);
   gtk_widget_set_vexpand (area, TRUE);
-  gtk_container_add (GTK_CONTAINER (hbox), area);
+  gtk_container_add (GTK_CONTAINER (box), area);
   gtk_widget_show (area);
 
   gtk_widget_add_tick_callback (GTK_WIDGET (area), tick, area, NULL);
 
-  button = gtk_button_new_with_label ("Quit");
-  gtk_widget_set_hexpand (button, TRUE);
-  gtk_container_add (GTK_CONTAINER (box), button);
-  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
-  gtk_widget_show (button);
-
   gtk_widget_show (window);
 
   gtk_main ();

diff --git a/examples/cubes.c b/examples/cubes.c
@@ -266,34 +266,12 @@ resize_area (GthreeArea *area,
 int
 main (int argc, char *argv[])
 {
-  GtkWidget *window, *box, *hbox, *button, *area;
+  GtkWidget *window, *box, *area;
   GthreeScene *scene;
   GthreePerspectiveCamera *camera;
   graphene_point3d_t pos;
 
-#ifdef USE_GTK4
-  gtk_init ();
-#else
-  gtk_init (&argc, &argv);
-#endif
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "Cubes");
-  gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
-#ifdef USE_GTK3
-  gtk_container_set_border_width (GTK_CONTAINER (window), 12);
-#endif
-  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-  gtk_box_set_spacing (GTK_BOX (box), 6);
-  gtk_container_add (GTK_CONTAINER (window), box);
-  gtk_widget_show (box);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
-  gtk_box_set_spacing (GTK_BOX (hbox), 6);
-  gtk_container_add (GTK_CONTAINER (box), hbox);
-  gtk_widget_show (hbox);
+  window = examples_init ("Cubes", &box);
 
   scene = init_scene ();
   camera = gthree_perspective_camera_new (30, 1, 1, 10000);
@@ -306,17 +284,11 @@ main (int argc, char *argv[])
   g_signal_connect (area, "resize", G_CALLBACK (resize_area), camera);
   gtk_widget_set_hexpand (area, TRUE);
   gtk_widget_set_vexpand (area, TRUE);
-  gtk_container_add (GTK_CONTAINER (hbox), area);
+  gtk_container_add (GTK_CONTAINER (box), area);
   gtk_widget_show (area);
 
   gtk_widget_add_tick_callback (GTK_WIDGET (area), tick, area, NULL);
 
-  button = gtk_button_new_with_label ("Quit");
-  gtk_widget_set_hexpand (button, TRUE);
-  gtk_container_add (GTK_CONTAINER (box), button);
-  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
-  gtk_widget_show (button);
-
   gtk_widget_show (window);
 
   gtk_main ();

diff --git a/examples/effects.c b/examples/effects.c
@@ -288,31 +288,9 @@ pass_toggled (GtkToggleButton *toggle_button, GthreePass *pass)
 int
 main (int argc, char *argv[])
 {
-  GtkWidget *window, *box, *hbox, *button, *area, *check;
-
-#ifdef USE_GTK4
-  gtk_init ();
-#else
-  gtk_init (&argc, &argv);
-#endif
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "Effects");
-  gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
-#ifdef USE_GTK3
-  gtk_container_set_border_width (GTK_CONTAINER (window), 12);
-#endif
-  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-  gtk_box_set_spacing (GTK_BOX (box), 6);
-  gtk_container_add (GTK_CONTAINER (window), box);
-  gtk_widget_show (box);
+  GtkWidget *window, *box, *hbox, *area, *check;
 
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
-  gtk_box_set_spacing (GTK_BOX (hbox), 6);
-  gtk_container_add (GTK_CONTAINER (box), hbox);
-  gtk_widget_show (hbox);
+  window = examples_init ("Effects", &box);
 
   init_scene ();
   init_scene2 ();
@@ -323,7 +301,7 @@ main (int argc, char *argv[])
   g_signal_connect (area, "render", G_CALLBACK (render_area), NULL);
   gtk_widget_set_hexpand (area, TRUE);
   gtk_widget_set_vexpand (area, TRUE);
-  gtk_container_add (GTK_CONTAINER (hbox), area);
+  gtk_container_add (GTK_CONTAINER (box), area);
   gtk_widget_show (area);
 
   gtk_widget_add_tick_callback (GTK_WIDGET (area), tick, area, NULL);
@@ -363,12 +341,6 @@ main (int argc, char *argv[])
   gtk_widget_show (check);
   g_signal_connect (check, "toggled", G_CALLBACK (pass_toggled), greyscale_pass);
 
-  button = gtk_button_new_with_label ("Quit");
-  gtk_widget_set_hexpand (button, TRUE);
-  gtk_container_add (GTK_CONTAINER (box), button);
-  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
-  gtk_widget_show (button);
-
   gtk_widget_show (window);
 
   gtk_main ();

diff --git a/examples/envmap.c b/examples/envmap.c
@@ -137,33 +137,11 @@ resize_area (GthreeArea *area,
 int
 main (int argc, char *argv[])
 {
-  GtkWidget *window, *box, *hbox, *button, *area;
+  GtkWidget *window, *box, *area;
   GthreeScene *scene;
   graphene_point3d_t pos;
 
-#ifdef USE_GTK4
-  gtk_init ();
-#else
-  gtk_init (&argc, &argv);
-#endif
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "Environment map");
-  gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
-#ifdef USE_GTK3
-  gtk_container_set_border_width (GTK_CONTAINER (window), 12);
-#endif
-  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-  gtk_box_set_spacing (GTK_BOX (box), 6);
-  gtk_container_add (GTK_CONTAINER (window), box);
-  gtk_widget_show (box);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
-  gtk_box_set_spacing (GTK_BOX (hbox), 6);
-  gtk_container_add (GTK_CONTAINER (box), hbox);
-  gtk_widget_show (hbox);
+  window = examples_init ("Environment map", &box);
 
   scene = init_scene ();
   camera = gthree_perspective_camera_new (30, 1, 1, 5000);
@@ -176,17 +154,11 @@ main (int argc, char *argv[])
   g_signal_connect (area, "resize", G_CALLBACK (resize_area), camera);
   gtk_widget_set_hexpand (area, TRUE);
   gtk_widget_set_vexpand (area, TRUE);
-  gtk_container_add (GTK_CONTAINER (hbox), area);
+  gtk_container_add (GTK_CONTAINER (box), area);
   gtk_widget_show (area);
 
   gtk_widget_add_tick_callback (GTK_WIDGET (area), tick, area, NULL);
 
-  button = gtk_button_new_with_label ("Quit");
-  gtk_widget_set_hexpand (button, TRUE);
-  gtk_container_add (GTK_CONTAINER (box), button);
-  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
-  gtk_widget_show (button);
-
   gtk_widget_show (window);
 
   gtk_main ();

diff --git a/examples/gtklogo.c b/examples/gtklogo.c
@@ -233,34 +233,12 @@ resize_area (GthreeArea *area,
 int
 main (int argc, char *argv[])
 {
-  GtkWidget *window, *box, *hbox, *button, *area;
+  GtkWidget *window, *box, *area;
   GthreeScene *scene;
   GthreePerspectiveCamera *camera;
   graphene_point3d_t pos;
 
-#ifdef USE_GTK4
-  gtk_init ();
-#else
-  gtk_init (&argc, &argv);
-#endif
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
-  gtk_window_set_title (GTK_WINDOW (window), "GTK+ logo");
-#ifdef USE_GTK3
-  gtk_container_set_border_width (GTK_CONTAINER (window), 12);
-#endif
-  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-  gtk_box_set_spacing (GTK_BOX (box), 6);
-  gtk_container_add (GTK_CONTAINER (window), box);
-  gtk_widget_show (box);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
-  gtk_box_set_spacing (GTK_BOX (hbox), 6);
-  gtk_container_add (GTK_CONTAINER (box), hbox);
-  gtk_widget_show (hbox);
+  window = examples_init ("GTK+ logo", &box);
 
   scene = init_scene ();
   camera = gthree_perspective_camera_new (30, 1, 1, 10000);
@@ -273,17 +251,11 @@ main (int argc, char *argv[])
   g_signal_connect (area, "resize", G_CALLBACK (resize_area), camera);
   gtk_widget_set_hexpand (area, TRUE);
   gtk_widget_set_vexpand (area, TRUE);
-  gtk_container_add (GTK_CONTAINER (hbox), area);
+  gtk_container_add (GTK_CONTAINER (box), area);
   gtk_widget_show (area);
 
   gtk_widget_add_tick_callback (GTK_WIDGET (area), tick, area, NULL);
 
-  button = gtk_button_new_with_label ("Quit");
-  gtk_widget_set_hexpand (button, TRUE);
-  gtk_container_add (GTK_CONTAINER (box), button);
-  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
-  gtk_widget_show (button);
-
   gtk_widget_show (window);
 
   gtk_main ();

diff --git a/examples/interactive.c b/examples/interactive.c
@@ -214,33 +214,11 @@ resize_area (GthreeArea *area,
 int
 main (int argc, char *argv[])
 {
-  GtkWidget *window, *box, *hbox, *button, *area;
+  GtkWidget *window, *box, *area;
   GthreeScene *scene;
   graphene_point3d_t pos;
 
-#ifdef USE_GTK4
-  gtk_init ();
-#else
-  gtk_init (&argc, &argv);
-#endif
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "Interactive");
-  gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
-#ifdef USE_GTK3
-  gtk_container_set_border_width (GTK_CONTAINER (window), 12);
-#endif
-  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-  gtk_box_set_spacing (GTK_BOX (box), 6);
-  gtk_container_add (GTK_CONTAINER (window), box);
-  gtk_widget_show (box);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
-  gtk_box_set_spacing (GTK_BOX (hbox), 6);
-  gtk_container_add (GTK_CONTAINER (box), hbox);
-  gtk_widget_show (hbox);
+  window = examples_init ("Interactive", &box);
 
   scene = init_scene ();
   camera = gthree_perspective_camera_new (70, 1, 1, 10000);
@@ -253,17 +231,11 @@ main (int argc, char *argv[])
   g_signal_connect (area, "resize", G_CALLBACK (resize_area), camera);
   gtk_widget_set_hexpand (area, TRUE);
   gtk_widget_set_vexpand (area, TRUE);
-  gtk_container_add (GTK_CONTAINER (hbox), area);
+  gtk_container_add (GTK_CONTAINER (box), area);
   gtk_widget_show (area);
 
   gtk_widget_add_tick_callback (GTK_WIDGET (area), tick, area, NULL);
 
-  button = gtk_button_new_with_label ("Quit");
-  gtk_widget_set_hexpand (button, TRUE);
-  gtk_container_add (GTK_CONTAINER (box), button);
-  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
-  gtk_widget_show (button);
-
   gtk_widget_show (window);
 
   gtk_main ();

diff --git a/examples/materials.c b/examples/materials.c
@@ -346,48 +346,20 @@ resize_area (GthreeArea *area,
 int
 main (int argc, char *argv[])
 {
-  GtkWidget *window, *box, *hbox, *button, *area;
-
-#ifdef USE_GTK4
-  gtk_init ();
-#else
-  gtk_init (&argc, &argv);
-#endif
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "Materials");
-  gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
-#ifdef USE_GTK3
-  gtk_container_set_border_width (GTK_CONTAINER (window), 12);
-#endif
-  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-  gtk_box_set_spacing (GTK_BOX (box), 6);
-  gtk_container_add (GTK_CONTAINER (window), box);
-  gtk_widget_show (box);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
-  gtk_box_set_spacing (GTK_BOX (hbox), 6);
-  gtk_container_add (GTK_CONTAINER (box), hbox);
-  gtk_widget_show (hbox);
+  GtkWidget *window, *box, *area;
+
+  window = examples_init ("Materials", &box);
 
   init_scene ();
   area = gthree_area_new (scene, GTHREE_CAMERA (camera));
   g_signal_connect (area, "resize", G_CALLBACK (resize_area), NULL);
   gtk_widget_set_hexpand (area, TRUE);
   gtk_widget_set_vexpand (area, TRUE);
-  gtk_container_add (GTK_CONTAINER (hbox), area);
+  gtk_container_add (GTK_CONTAINER (box), area);
   gtk_widget_show (area);
 
   gtk_widget_add_tick_callback (GTK_WIDGET (area), tick, area, NULL);
 
-  button = gtk_button_new_with_label ("Quit");
-  gtk_widget_set_hexpand (button, TRUE);
-  gtk_container_add (GTK_CONTAINER (box), button);
-  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
-  gtk_widget_show (button);
-
   gtk_widget_show (window);
 
   gtk_main ();