Fixed layout of text entry widget to fixed height

[grrobot] / src / grrobot.c

diff --git a/src/grrobot.c b/src/grrobot.c
index 95f4363a64bcdac8d3a1a733ee6dca65bc11ddea..d9bf0484e26ae26adbea5424b2ac67b01661f28e 100644 (file)
--- a/src/grrobot.c
+++ b/src/grrobot.c
@@ -55,7 +55,7 @@ grr_game_read_notices (grr_game_t *game);
 
 static GSource *
 grr_game_notices_source_new (grr_game_t *game);
-    
+
 int 
 main (int argc, char **argv)
 {
@@ -190,6 +190,15 @@ grr_game_read_notices (grr_game_t *game)
                                      0.0, FALSE, 0.0, 0.0);
 
        notice = rr_client_parse_notice (game->client, notice_s);
+       if (notice == NULL) {
+           int i;
+           fprintf (stderr, "Failed to parse notice: ");
+           for (i=0; notice_s[i]; i++)
+               fprintf (stderr, " %s", notice_s[i]);
+           fprintf (stderr, "\n");
+           return;
+       }
+
        switch (notice->type) {
        case RR_NOTICE_USER:
        case RR_NOTICE_QUIT:
@@ -286,51 +295,54 @@ grr_game_start_gui (grr_game_t *game)
                      G_CALLBACK (exit), NULL);
     gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-    vpaned = gtk_vpaned_new ();
-    gtk_container_set_border_width (GTK_CONTAINER (vpaned), 5);
-    gtk_container_add (GTK_CONTAINER (window), vpaned);
+    vbox = gtk_vbox_new (FALSE, 1);
+    gtk_container_add (GTK_CONTAINER (window), vbox);
     {
-       board_frame = gtk_aspect_frame_new (NULL, 0.5, 0.5, 1.0, FALSE);
-       gtk_paned_pack1 (GTK_PANED (vpaned), board_frame, TRUE, TRUE);
+       game->board_view = grr_board_view_new (game->board);
+       grr_board_view_set_client (GRR_BOARD_VIEW (game->board_view), game->client);
+       game->message_buffer = gtk_text_buffer_new (NULL);
+       game->message_view = gtk_text_view_new_with_buffer (game->message_buffer);
+       game->command_entry = gtk_entry_new ();
+
+       vpaned = gtk_vpaned_new ();
+       gtk_container_set_border_width (GTK_CONTAINER (vpaned), 0);
+       gtk_box_pack_start (GTK_BOX (vbox), vpaned,
+                           TRUE, TRUE, 0);
+       gtk_container_add (GTK_CONTAINER (vbox), vpaned);
        {
-           game->board_view = grr_board_view_new (game->board);
-           grr_board_view_set_client (GRR_BOARD_VIEW (game->board_view),
-                                      game->client);
+           board_frame = gtk_aspect_frame_new (NULL, 0.5, 0.5, 1.0, FALSE);
+           gtk_paned_pack1 (GTK_PANED (vpaned), board_frame, TRUE, TRUE);
+           {
+               gtk_container_add (GTK_CONTAINER (board_frame), game->board_view);
+               gtk_widget_show (game->board_view);
+           }
+           gtk_widget_show (board_frame);
 
-           gtk_container_add (GTK_CONTAINER (board_frame), game->board_view);
-           gtk_widget_show (game->board_view);
-       }
-       gtk_widget_show (board_frame);
-
-       vbox = gtk_vbox_new (FALSE, 1);
-       gtk_paned_pack2 (GTK_PANED (vpaned), vbox, FALSE, TRUE);
-       {
            sw = gtk_scrolled_window_new (NULL, NULL);
            gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                            GTK_POLICY_NEVER,
                                            GTK_POLICY_AUTOMATIC);
-           gtk_container_add (GTK_CONTAINER (vbox), sw);
+           gtk_paned_pack2 (GTK_PANED (vpaned), sw, FALSE, TRUE);
+           {
+               message_view = game->message_view;
+               gtk_text_view_set_editable (GTK_TEXT_VIEW (message_view), FALSE);
+               gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (message_view), FALSE);
+               gtk_container_add (GTK_CONTAINER (sw), message_view);
+               gtk_widget_show (message_view);
+           }
            gtk_widget_show (sw);
-
-           game->message_buffer = gtk_text_buffer_new (NULL);
-           game->message_view = gtk_text_view_new_with_buffer (game->message_buffer);
-           message_view = game->message_view;
-           gtk_text_view_set_editable (GTK_TEXT_VIEW (message_view), FALSE);
-           gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (message_view), FALSE);
-           gtk_container_add (GTK_CONTAINER (sw), message_view);
-           gtk_widget_show (message_view);
-
-           game->command_entry = gtk_entry_new ();
-           command_entry = game->command_entry;
-           gtk_container_add (GTK_CONTAINER (vbox), command_entry);
-           gtk_widget_show (command_entry);
-           g_signal_connect (G_OBJECT (command_entry), "activate",
-                             G_CALLBACK (grr_game_entry_callback),
-                             (gpointer) game);
        }
-       gtk_widget_show (vbox);
+       gtk_widget_show (vpaned);
+
+       command_entry = game->command_entry;
+       gtk_box_pack_end (GTK_BOX (vbox), command_entry,
+                         FALSE, FALSE, 0);
+       gtk_widget_show (command_entry);
+       g_signal_connect (G_OBJECT (command_entry), "activate",
+                         G_CALLBACK (grr_game_entry_callback),
+                         (gpointer) game);
     }
-    gtk_widget_show (vpaned);
+    gtk_widget_show (vbox);
 
     gtk_widget_show (window);