[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright gshterm/command_line.c gshterm/gshter...
From: |
Jeffrey Bedard |
Subject: |
[Antiright-devel] antiright gshterm/command_line.c gshterm/gshter... |
Date: |
Fri, 23 Feb 2007 22:52:37 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/02/23 22:52:36
Modified files:
gshterm : command_line.c gshterm.c main.c script.c
libantiright : string.h
Log message:
Fixed a bug in gshterm command construction involving an inverse
boolean condition. Changed asprintf instances to ar_asprintf.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/command_line.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/gshterm.c?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/main.c?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/script.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/string.h?cvsroot=antiright&r1=1.2&r2=1.3
Patches:
Index: gshterm/command_line.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/command_line.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gshterm/command_line.c 20 Feb 2007 04:29:43 -0000 1.3
+++ gshterm/command_line.c 23 Feb 2007 22:52:36 -0000 1.4
@@ -22,9 +22,6 @@
#include "gshterm.h"
-extern char *gsh_geometry;
-char *gshterm_font = NULL;
-
char *
gshterm_construct_command (struct GSHTerm * term, int argc, char **argv)
{
@@ -33,9 +30,9 @@
command = ""; /* Initialize to empty for the first
concatenation. */
- if (!gshterm_construct_command_from_args (
+ ARIFNB(gshterm_construct_command_from_args (
term, argc, argv, &command))
- asprintf (&command, "/bin/sh");
+ ar_asprintf (&command, "/bin/sh");
return (command);
}
@@ -56,10 +53,10 @@
return TRUE;
break;
case 'f':
- asprintf (&term->font, arg);
+ ar_asprintf (&term->font, arg);
break;
case 'g':
- asprintf (&term->gsh->geometry, arg);
+ ar_asprintf (&term->gsh->geometry, arg);
break;
default:
g_printerr ("unknown option: %c\n", option);
@@ -81,7 +78,7 @@
for (counter = 1, exec_reached = FALSE; counter < argc; counter++)
{
if (exec_reached)
- asprintf (command, "%s %s ", *command, argv[counter]);
+ ar_asprintf (command, "%s %s ", *command, argv[counter]);
else if (argv[counter][0] == '-')
exec_reached = gshterm_handle_command_line_option (
term, argv[counter][1], argv[counter + 1]);
Index: gshterm/gshterm.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/gshterm.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gshterm/gshterm.c 20 Feb 2007 04:29:43 -0000 1.7
+++ gshterm/gshterm.c 23 Feb 2007 22:52:36 -0000 1.8
@@ -29,10 +29,14 @@
vte_terminal_set_allow_bold (VTE_TERMINAL (term->widget), TRUE);
vte_terminal_set_backspace_binding (VTE_TERMINAL (term->widget),
VTE_ERASE_ASCII_BACKSPACE);
- if (!term->font)
- asprintf (&term->font, "Mono 18");
+
+ ARIFNP(term->font)
+ ar_asprintf (&term->font, "Mono 14");
+
vte_terminal_set_font_from_string (VTE_TERMINAL (term->widget), term->font);
free (term->font);
+ term->font=NULL;
+
vte_terminal_set_background_transparent (
VTE_TERMINAL (term->widget), TRUE);
}
Index: gshterm/main.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gshterm/main.c 23 Feb 2007 21:23:26 -0000 1.9
+++ gshterm/main.c 23 Feb 2007 22:52:36 -0000 1.10
@@ -36,8 +36,8 @@
term->gsh = gsh_init (argc, argv);
#ifdef DEBUG
- assert (term->gsh);
- assert (term->gsh->window);
+ ARPASSERT (term->gsh);
+ ARPASSERT (term->gsh->window);
#endif /* DEBUG */
term->script = gshterm_command_script (
@@ -71,8 +71,8 @@
gtk_widget_show (term->gsh->window);
- //g_free (term->gsh);
- //g_free (term);
+ g_free (term->gsh);
+ g_free (term);
gtk_main ();
Index: gshterm/script.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/script.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gshterm/script.c 23 Feb 2007 21:23:26 -0000 1.3
+++ gshterm/script.c 23 Feb 2007 22:52:36 -0000 1.4
@@ -36,15 +36,15 @@
pid = getpid ();
- asprintf (&script_name, "/tmp/gshterm.%d", (int) pid);
+ ar_asprintf (&script_name, "/tmp/gshterm.%d", (int) pid);
sysprintf ("echo '#!/bin/sh' > %s", script_name);
sysprintf ("echo %s >> %s", command, script_name);
free (command);
sysprintf ("chmod +x %s", script_name);
- sysprintf ("cat %s", script_name);
#ifdef DEBUG
+ sysprintf ("cat %s", script_name);
ARBUG("end gshterm_command_script()");
#endif /* DEBUG */
Index: libantiright/string.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/string.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libantiright/string.h 20 Feb 2007 04:29:43 -0000 1.2
+++ libantiright/string.h 23 Feb 2007 22:52:36 -0000 1.3
@@ -22,6 +22,10 @@
#ifndef LIBAR_STRING_H
#define LIBAR_STRING_H
+
+gint
+ ar_asprintf(gchar **string, const gchar *format, ...);
+
char *
antiright_beautified_label (char *current_argument_string);
/* char* */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright gshterm/command_line.c gshterm/gshter...,
Jeffrey Bedard <=