[Antiright-devel] antiright/gshterm gshterm.c gshterm.h

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/02/17 23:59:37

Modified files:
        gshterm        : gshterm.c gshterm.h 

Log message:
        Pass GSHTerm struct through parameters instead of widget.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/gshterm.c?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/gshterm.h?cvsroot=antiright&r1=1.3&r2=1.4

Patches:
Index: gshterm.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/gshterm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gshterm.c   13 Feb 2007 03:23:28 -0000      1.5
+++ gshterm.c   17 Feb 2007 23:59:37 -0000      1.6
@@ -22,40 +22,35 @@
 
 #include "gshterm.h"
 
-extern char *gshterm_font;
-
 void
-gshterm_set_terminal_options(GtkWidget *terminal)
+gshterm_set_terminal_options(struct GSHTerm *term)
 {
-       vte_terminal_set_size(VTE_TERMINAL(terminal), 80, 32);
-       vte_terminal_set_allow_bold(VTE_TERMINAL(terminal), TRUE);
-       vte_terminal_set_backspace_binding(VTE_TERMINAL(terminal),
+       vte_terminal_set_size(VTE_TERMINAL(term->widget), 80, 32);
+       vte_terminal_set_allow_bold(VTE_TERMINAL(term->widget), TRUE);
+       vte_terminal_set_backspace_binding(VTE_TERMINAL(term->widget),
                VTE_ERASE_ASCII_BACKSPACE);
-       if(!gshterm_font)
-               asprintf(&gshterm_font, "Mono 18");
-       vte_terminal_set_font_from_string(VTE_TERMINAL(terminal), gshterm_font);
-       free(gshterm_font);
+       if(!term->font)
+               asprintf(&term->font, "Mono 18");
+       vte_terminal_set_font_from_string(VTE_TERMINAL(term->widget), 
term->font);
+       free(term->font);
        vte_terminal_set_background_transparent(
-               VTE_TERMINAL(terminal), TRUE);
+               VTE_TERMINAL(term->widget), TRUE);
 }
 
-GtkWidget*
+struct GSHTerm *
 gshterm_setup_terminal(struct GSHTerm *term)
 {
-       GtkWidget *terminal;
-
 #ifdef DEBUG
        assert(term);
        assert(term->gsh);
        assert(term->gsh->window);
 #endif /* DEBUG */
 
-       terminal=vte_terminal_new();
-       gtk_container_add(GTK_CONTAINER(term->gsh->window), terminal);
-       gshterm_set_terminal_options(terminal);
-       gtk_widget_show(terminal);
-       term->widget=terminal;
-       return(terminal);
+       term->widget=vte_terminal_new();
+       gtk_container_add(GTK_CONTAINER(term->gsh->window), term->widget);
+       gshterm_set_terminal_options(term);
+       gtk_widget_show(term->widget);
+       return(term);
 }
 
 

Index: gshterm.h
===================================================================
RCS file: /sources/antiright/antiright/gshterm/gshterm.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gshterm.h   13 Feb 2007 03:23:28 -0000      1.3
+++ gshterm.h   17 Feb 2007 23:59:37 -0000      1.4
@@ -36,17 +36,12 @@
 
 #include "command_line.h"
 #include "script.h"
+#include "exit.h"
 
 void
-gshterm_delete_tmp(gpointer data);
+gshterm_set_terminal_options(struct GSHTerm *term);
 
-void
-gshterm_exit_cb(GtkWidget *widget, gpointer data);
-
-void
-gshterm_set_terminal_options(GtkWidget *terminal);
-
-GtkWidget *
+struct GSHTerm *
 gshterm_setup_terminal();
 
 #endif