Cleaned up some code.

diff --git a/src/gtetrinet.c b/src/gtetrinet.c
index 4109d8c05d4aa397893eb6775b2b24c213ff58d5..545e6b8231c26a178a676c0d86eb42869f6b5dc1 100644 (file)
--- a/src/gtetrinet.c
+++ b/src/gtetrinet.c
@@ -109,7 +109,7 @@ int main (int argc, char *argv[])
     gtk_container_set_border_width (GTK_CONTAINER(pfields), 0);
     gtk_container_add (GTK_CONTAINER(pfields), page);
     gtk_widget_show (pfields);
-    gtk_object_set_data( GTK_OBJECT(page), "title", "Playing Fields");
+    gtk_object_set_data( GTK_OBJECT(page), "title", "Playing Fields"); // FIXME
     label = pixmapdata_label (fields_xpm, "Playing Fields");
     gtk_widget_show (label);
     gtk_notebook_append_page (GTK_NOTEBOOK(notebook), pfields, label);
@@ -120,7 +120,7 @@ int main (int argc, char *argv[])
     gtk_container_set_border_width (GTK_CONTAINER(box), 0);
     gtk_container_add (GTK_CONTAINER(box), page);
     gtk_widget_show (box);
-    gtk_object_set_data( GTK_OBJECT(page), "title", "Partyline");
+    gtk_object_set_data( GTK_OBJECT(page), "title", "Partyline"); // FIXME
     label = pixmapdata_label (partyline_xpm, "Partyline");
     gtk_widget_show (label);
     gtk_notebook_append_page (GTK_NOTEBOOK(notebook), box, label);
@@ -131,7 +131,7 @@ int main (int argc, char *argv[])
     gtk_container_set_border_width (GTK_CONTAINER(box), 0);
     gtk_container_add (GTK_CONTAINER(box), page);
     gtk_widget_show (box);
-    gtk_object_set_data( GTK_OBJECT(page), "title", "Winlist");
+    gtk_object_set_data( GTK_OBJECT(page), "title", "Winlist"); // FIXME
     label = pixmapdata_label (winlist_xpm, "Winlist");
     gtk_widget_show (label);
     gtk_notebook_append_page (GTK_NOTEBOOK(notebook), box, label);
@@ -234,7 +234,7 @@ gint keypress (GtkWidget *widget, GdkEventKey *key)
 
         arg.name = "title";
         gtk_object_getv( GTK_OBJECT(widget), 1, &arg );
-        game_area =  !strcmp( GTK_VALUE_STRING(arg), "Playing Fields" );
+        game_area =  !strcmp( GTK_VALUE_STRING(arg), "Playing Fields" ); // FIXME
         g_free( GTK_VALUE_STRING(arg) );
     }
 
@@ -282,6 +282,9 @@ gint keyrelease (GtkWidget *widget, GdkEventKey *key)
     return FALSE;
 }
 
+/*
+ TODO: make this switch between detached pages too
+ */
 int gtetrinet_key (int keyval)
 {
     switch (keyval)
@@ -297,3 +300,81 @@ int gtetrinet_key (int keyval)
     }
     return TRUE;
 }
+
+/* funky page detach stuff */
+
+/* Type to hold primary widget and its label in the notebook page */
+typedef struct {
+    GtkWidget *parent;
+    GtkWidget *widget;
+    int pageNo;
+} WidgetPageData;
+
+void destroy_page_window (GtkWidget *window, gpointer data)
+{
+    WidgetPageData *pageData = (WidgetPageData *)data;
+
+    /* Put widget back into a page */
+    gtk_widget_reparent (pageData->widget, pageData->parent);
+
+    /* Select it */
+    gtk_notebook_set_page (GTK_NOTEBOOK(notebook), pageData->pageNo);
+
+    /* Free return data */
+    g_free (data);
+}
+
+void move_current_page_to_window (void)
+{
+    WidgetPageData *pageData;
+    GtkWidget *page, *child, *newWindow;
+    GList *dlist;
+    gint pageNo;
+    char *title;
+
+    /* Extract current page's widget & it's parent from the notebook */
+    pageNo = gtk_notebook_get_current_page (GTK_NOTEBOOK(notebook));
+    page   = gtk_notebook_get_nth_page (GTK_NOTEBOOK(notebook), pageNo );
+    dlist  = gtk_container_children (GTK_CONTAINER(page));
+    if (!dlist ||  !(dlist->data))
+    {
+        /* Must already be a window */
+        if (dlist)
+           g_list_free (dlist);
+        return;
+    }
+    child = (GtkWidget *)dlist->data;
+    g_list_free (dlist);
+
+    /* Create new window for widget, plus container, etc. */
+    newWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    title = gtk_object_get_data(GTK_OBJECT(child), "title");
+    if (!title)
+        title = "GTetrinet";
+    gtk_window_set_title (GTK_WINDOW (newWindow), title);
+    gtk_container_set_border_width (GTK_CONTAINER (newWindow), 0);
+
+    /* Attach key events to window */
+    gtk_signal_connect (GTK_OBJECT(newWindow), "key_press_event",
+                        GTK_SIGNAL_FUNC(keypress), NULL);
+    gtk_signal_connect (GTK_OBJECT(newWindow), "key_release_event",
+                        GTK_SIGNAL_FUNC(keyrelease), NULL);
+    gtk_widget_set_events (newWindow, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
+    gtk_window_set_policy (GTK_WINDOW(newWindow), FALSE, TRUE, FALSE);
+
+    /* Create store to point us back to page for later */
+    pageData = g_new( WidgetPageData, 1 );
+    pageData->parent = page;
+    pageData->widget = child;
+    pageData->pageNo = pageNo;
+
+    /* Move main widget to window */
+    gtk_widget_reparent (child, newWindow);
+
+    /* Pass ID of parent (to put widget back) to window's destroy */
+    gtk_signal_connect (GTK_OBJECT(newWindow), "destroy",
+                        GTK_SIGNAL_FUNC(destroy_page_window),
+                        (gpointer)(pageData));
+
+    gtk_widget_show_all( newWindow );
+}

diff --git a/src/gtetrinet.h b/src/gtetrinet.h
index 32fdbedb2fc52e4803ab1dc315b9316a28bd8529..2eb0063f783f8865dcd2b0a81cda400706633a40 100644 (file)
--- a/src/gtetrinet.h
+++ b/src/gtetrinet.h
@@ -5,5 +5,4 @@
 extern void destroymain (GtkWidget *widget, gpointer data);
 extern gint keypress (GtkWidget *widget, GdkEventKey *key);
 extern gint keyrelease (GtkWidget *widget, GdkEventKey *key);
-
-extern GtkWidget *notebook;
+extern void move_current_page_to_window (void);

diff --git a/src/misc.c b/src/misc.c
index b61bb7079913fafb2953f428403961592f1f1033..a1c374777593d6d433cb9d184bed6ad250080608 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -25,14 +25,6 @@
 #include "gtetrinet.h"
 
 
-/* Type to hold primary widget and it's label in the notebook page */
-typedef struct {
-    GtkWidget *parent;
-    GtkWidget *widget;
-    gint       pageNo;
-} WidgetPageData;
-
-
 /* a left aligned label */
 GtkWidget *leftlabel_new (char *str)
 {
@@ -199,73 +191,3 @@ GtkWidget *pixmap_label (GdkPixmap *pm, GdkBitmap *mask, char *str)
     gtk_box_pack_start (GTK_BOX(box), widget, TRUE, TRUE, 0);
     return box;
 }
-
-void destroy_page_window (GtkWidget *window, gpointer data)
-{
-    WidgetPageData *pageData = (WidgetPageData *)data;
-
-    /* Put widget back into a page */
-    gtk_widget_reparent (pageData->widget, pageData->parent);
-
-    /* Select it */
-    gtk_notebook_set_page (GTK_NOTEBOOK(notebook), pageData->pageNo);
-
-    /* Free return data */
-    g_free (data);
-}
-
-void move_current_page_to_window (void)
-{
-    WidgetPageData *pageData;
-    GtkWidget *page, *child, *newWindow;
-    GList *dlist;
-    gint pageNo;
-    char *title;
-
-    /* Extract current page's widget & it's parent from the notebook */
-    pageNo = gtk_notebook_get_current_page (GTK_NOTEBOOK(notebook));
-    page   = gtk_notebook_get_nth_page (GTK_NOTEBOOK(notebook), pageNo );
-    dlist  = gtk_container_children (GTK_CONTAINER(page));
-    if (!dlist ||  !(dlist->data))
-    {
-        /* Must already be a window */
-        if (dlist)
-           g_list_free (dlist);
-        return;
-    }
-    child = (GtkWidget *)dlist->data;
-    g_list_free (dlist);
-
-    /* Create new window for widget, plus container, etc. */
-    newWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    title = gtk_object_get_data(child, "title");
-    if (!title)
-        title = "GTetrinet";
-    gtk_window_set_title (GTK_WINDOW (newWindow), title);
-    gtk_container_set_border_width (GTK_CONTAINER (newWindow), 0);
-
-    /* Attach key events to window */
-    gtk_signal_connect (GTK_OBJECT(newWindow), "key_press_event",
-                        GTK_SIGNAL_FUNC(keypress), NULL);
-    gtk_signal_connect (GTK_OBJECT(newWindow), "key_release_event",
-                        GTK_SIGNAL_FUNC(keyrelease), NULL);
-    gtk_widget_set_events (newWindow, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
-    gtk_window_set_policy (GTK_WINDOW(newWindow), FALSE, TRUE, FALSE);
-
-    /* Create store to point us back to page for later */
-    pageData = g_new( WidgetPageData, 1 );
-    pageData->parent = page;
-    pageData->widget = child;
-    pageData->pageNo = pageNo;
-
-    /* Move main widget to window */
-    gtk_widget_reparent (child, newWindow);
-
-    /* Pass ID of parent (to put widget back) to window's destroy */
-    gtk_signal_connect (GTK_OBJECT(newWindow), "destroy",
-                        GTK_SIGNAL_FUNC(destroy_page_window),
-                        (gpointer)(pageData));
-
-    gtk_widget_show_all( newWindow );
-}
-

diff --git a/src/misc.h b/src/misc.h
index 3373ef559f4e6be0716c3605696cde92cd31574d..7a247a67479deae6973c7cc794d21ab2585381e7 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -8,4 +8,3 @@ extern void textbox_addtext (GtkText *textbox, unsigned char *text);
 extern void adjust_bottom (GtkAdjustment *adj);
 extern char *nocolor (char *str);
 extern GtkWidget *pixmap_label (GdkPixmap *pm, GdkBitmap *mask, char *str);
-extern void move_current_page_to_window (void);