beautify with frames

1 files changed, 17 insertions, 8 deletions

diff --git a/vnc.c b/vnc.c
index c1130e5..ac236ab 100644
--- a/vnc.c
+++ b/vnc.c
@@ -544,7 +544,7 @@ static GdkFilterReturn event_filter(GdkXEvent *gdkxevent, GdkEvent *gtkevent,
 GtkWidget *vnc_open(char *hostname, int tcpport, unsigned long flags,
 		    int debug_level)
 {
-    GtkWidget *vbox, *hbox;
+    GtkWidget *vbox, *hbox, *frame;
     char *argv[] = { "vnc-client", NULL, NULL };
     int argc = sizeof(argv)/sizeof(argv[0]) -1;
     struct vnc_window *vnc;
@@ -630,10 +630,6 @@ GtkWidget *vnc_open(char *hostname, int tcpport, unsigned long flags,
     vnc->line = gtk_label_new("status line");
     vnc->kbd  = gtk_label_new("keyboard mode");
     vnc->res  = gtk_label_new("vnc screen resolution");
-    gtk_misc_set_alignment(GTK_MISC(vnc->line), 0, 0.5);
-    gtk_misc_set_padding(GTK_MISC(vnc->line), 3, 3);
-    gtk_misc_set_padding(GTK_MISC(vnc->kbd), 3, 3);
-    gtk_misc_set_padding(GTK_MISC(vnc->res), 3, 3);
 
     /* packing */
     vbox = gtk_vbox_new(FALSE, 0);
@@ -641,9 +637,22 @@ GtkWidget *vnc_open(char *hostname, int tcpport, unsigned long flags,
     gtk_container_add(GTK_CONTAINER(vnc->win), vbox);
     gtk_box_pack_start(GTK_BOX(vbox), vnc->draw, TRUE, TRUE, 0);
     gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
-    gtk_box_pack_start(GTK_BOX(hbox), vnc->line, TRUE, TRUE, 0);
-    gtk_box_pack_end(GTK_BOX(hbox), vnc->kbd, FALSE, TRUE, 0);
-    gtk_box_pack_end(GTK_BOX(hbox), vnc->res, FALSE, TRUE, 0);
+
+    frame = gtk_frame_new(NULL);
+    gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0);
+    gtk_container_add(GTK_CONTAINER(frame), vnc->line);
+    gtk_misc_set_alignment(GTK_MISC(vnc->line), 0, 0.5);
+    gtk_misc_set_padding(GTK_MISC(vnc->line), 3, 1);
+
+    frame = gtk_frame_new(NULL);
+    gtk_box_pack_end(GTK_BOX(hbox), frame, FALSE, TRUE, 0);
+    gtk_container_add(GTK_CONTAINER(frame), vnc->kbd);
+    gtk_misc_set_padding(GTK_MISC(vnc->kbd), 3, 1);
+
+    frame = gtk_frame_new(NULL);
+    gtk_box_pack_end(GTK_BOX(hbox), frame, FALSE, TRUE, 0);
+    gtk_container_add(GTK_CONTAINER(frame), vnc->res);
+    gtk_misc_set_padding(GTK_MISC(vnc->res), 3, 1);
 
     /* show window */
     gtk_widget_show_all(vnc->win);