[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright Makefile config.mk ACE-desktop/Makefi...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright Makefile config.mk ACE-desktop/Makefi... |
|
Date: |
Sun, 04 Feb 2007 04:44:24 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/02/04 04:44:24
Modified files:
. : Makefile config.mk
ACE-desktop : Makefile
gshedit : Makefile
gtkshell : gtkshell.c gtkshell.h main.c
Added files:
gshedit : main.c
gshterm : Makefile main.c
Removed files:
ACE-desktop : config.mk configure
Log message:
Added the gshedit and gshterm utilities, based on gtksourceview
and libvte, respectively. Make ACE-desktop use the base build system.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/Makefile?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/config.mk?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/Makefile?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/config.mk?cvsroot=antiright&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/configure?cvsroot=antiright&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/gshedit/Makefile?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gshedit/main.c?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/Makefile?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/main.c?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/main.c?cvsroot=antiright&r1=1.2&r2=1.3
Patches:
Index: Makefile
===================================================================
RCS file: /sources/antiright/antiright/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Makefile 1 Feb 2007 20:45:49 -0000 1.5
+++ Makefile 4 Feb 2007 04:44:24 -0000 1.6
@@ -29,10 +29,16 @@
all:
cd libantiright && $(MAKE)
cd gtkshell && $(MAKE)
+ cd gshterm && $(MAKE)
+ cd gshedit && $(MAKE)
+ cd ACE-desktop && $(MAKE)
clean:
cd libantiright && $(MAKE) clean
cd gtkshell && $(MAKE) clean
+ cd gshterm && $(MAKE) clean
+ cd gshedit && $(MAKE) clean
+ cd ACE-desktop && $(MAKE) clean
distclean: clean
rm config.mk
@@ -61,6 +67,9 @@
$(INSTALL_DATA) doc/INSTALL $(docdir)/antiright
$(INSTALL_DATA) doc/HACKING $(docdir)/antiright
cd gtkshell && $(MAKE) install
+ cd gshterm && $(MAKE) install
+ cd gshedit && $(MAKE) install
+ cd ACE-desktop && $(MAKE) install
tarball: distclean
cd .. && tar czf antiright-$(VERSION).tar.gz antiright
Index: config.mk
===================================================================
RCS file: /sources/antiright/antiright/config.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- config.mk 12 Aug 2006 03:52:48 -0000 1.1
+++ config.mk 4 Feb 2007 04:44:24 -0000 1.2
@@ -1,8 +1,9 @@
# Local Build Configuration
-PREFIX=/usr/local
+VERSION=2.99.4
+PREFIX=/usr/local/stow/antiright
INCLUDE= -I/usr/pkg/include -I/usr/local/include -I/usr/X11R6/include
LIBDIR= -L/usr/pkg/lib -L/usr/local/lib -L/usr/X11R6/lib
-ICONDIR=
-CPPFLAGS=
-DEFS= -DPACKAGE_STRING='"AntiRight_3.0"' -DPREFIX='"/usr/local"' -D_GNU_SOURCE
-RESDIR=
+DEFS= -DPACKAGE_STRING='"AntiRight_2.99.4"'
-DPREFIX='"/usr/local/stow/antiright"' -D_GNU_SOURCE
+MAKE=/usr/bin/make
+INSTALL=/usr/bin/install
+CFLAGS=
Index: ACE-desktop/Makefile
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ACE-desktop/Makefile 3 Feb 2007 20:11:14 -0000 1.1
+++ ACE-desktop/Makefile 4 Feb 2007 04:44:24 -0000 1.2
@@ -22,7 +22,7 @@
#
###############################################################################
-include config.mk
+include ../config.mk
all: dateload.o
Index: gshedit/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gshedit/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gshedit/Makefile 1 Feb 2007 20:45:49 -0000 1.1
+++ gshedit/Makefile 4 Feb 2007 04:44:24 -0000 1.2
@@ -1,20 +1,18 @@
include ../config.mk
#CFLAGS+=`pkg-config --cflags gtk+-2.0` -g3 -Wall -W -Werror
-CFLAGS+=`pkg-config --cflags gtk+-2.0` $(DEFS)
-LDFLAGS+=-L../libantiright -lantiright
-LDFLAGS+=`pkg-config --libs gtk+-2.0`
+CFLAGS+=`pkg-config --cflags gtksourceview-1.0`
+CFLAGS+=`pkg-config --cflags gtk+-2.0` $(DEFS) -I../libantiright -I../gtkshell
+LDFLAGS+=-L../libantiright -L../gtkshell
+LDFLAGS+=`pkg-config --libs gtksourceview-1.0`
+LDFLAGS+=`pkg-config --libs gtk+-2.0` -lgtkshell -lantiright
-objects=gtkshell.o arguments.o options.o callbacks.o updated.o\
- label.o button.o text.o updated_label.o updated_progress.o\
- updated_options.o add_options.o option_options.o dialog_options.o\
- file_dialog.o
-all: $(objects) main.o
- cc -o gtkshell $(objects) main.o $(LDFLAGS)
- ar rcs libgtkshell.a $(objects)
+objects=main.o
+all: $(objects)
+ cc -o gshedit $(objects) $(LDFLAGS)
clean:
- rm -f gtkshell *.o libgtkshell.a
+ rm -f gshedit *.o
install:
- install gtkshell $(PREFIX)/bin
+ install gshedit $(PREFIX)/bin
Index: gtkshell/gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/gtkshell.c 1 Feb 2007 20:45:49 -0000 1.1
+++ gtkshell/gtkshell.c 4 Feb 2007 04:44:24 -0000 1.2
@@ -24,6 +24,73 @@
extern unsigned int gsh_rows;
extern unsigned int gsh_row;
+GtkWidget *scrolled_window;
+gboolean gsh_dont_scroll=FALSE;
+extern char *gsh_geometry;
+
+void
+gsh_setup_scrolled_window()
+{
+ scrolled_window=gtk_scrolled_window_new(NULL,NULL);
+ gtk_scrolled_window_set_policy(
+ GTK_SCROLLED_WINDOW(scrolled_window),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type(
+ GTK_SCROLLED_WINDOW(scrolled_window),
+ GTK_SHADOW_OUT);
+ gtk_container_add(GTK_CONTAINER(gsh_window),
+ scrolled_window);
+ gtk_widget_show(scrolled_window);
+
+}
+
+void
+gsh_setup_containers()
+{
+ gsh_hbox = gtk_hbox_new(FALSE, 2);
+
+ if(!gsh_dont_scroll)
+ {
+ gsh_setup_scrolled_window();
+ gtk_scrolled_window_add_with_viewport(
+ GTK_SCROLLED_WINDOW(scrolled_window),
+ gsh_hbox);
+ }
+ else
+ {
+ gtk_container_add(GTK_CONTAINER(gsh_window),
+ gsh_hbox);
+ }
+
+ gtk_widget_show(gsh_hbox);
+ gsh_vbox = gtk_vbox_new(FALSE, 2);
+ gtk_container_add(GTK_CONTAINER(gsh_hbox), gsh_vbox);
+ gtk_widget_show(gsh_vbox);
+}
+
+void
+gsh_set_geometry()
+{
+ assert(gsh_geometry);
+ gtk_window_parse_geometry(GTK_WINDOW(gsh_window),
+ gsh_geometry);
+}
+void
+gsh_check_and_set_geometry()
+{
+ if(gsh_geometry!=NULL)
+ {
+ gsh_set_geometry();
+ free(gsh_geometry);
+ }
+ else
+ {
+ asprintf(&gsh_geometry, "500x300");
+ gsh_set_geometry();
+ free(gsh_geometry);
+ }
+
+}
void
gsh_manage(GtkWidget *widget)
@@ -37,3 +104,19 @@
#endif
}
+GtkWidget *
+gsh_create_main_window()
+{
+ GtkWidget *window;
+
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
+ g_signal_connect (window, "delete-event",
+ G_CALLBACK (gtk_main_quit), NULL);
+ g_signal_connect (window, "destroy",
+ G_CALLBACK (gtk_main_quit), NULL);
+
+ return(window);
+}
+
+
Index: gtkshell/gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/gtkshell.h 1 Feb 2007 20:45:49 -0000 1.1
+++ gtkshell/gtkshell.h 4 Feb 2007 04:44:24 -0000 1.2
@@ -50,5 +50,20 @@
void
gsh_manage(GtkWidget *widget);
+void
+gsh_setup_scrolled_window();
+
+void
+gsh_setup_containers();
+
+void
+gsh_set_geometry();
+
+void
+gsh_check_and_set_geometry();
+
+GtkWidget *
+gsh_create_main_window();
#endif
+
Index: gtkshell/main.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/main.c 1 Feb 2007 20:45:49 -0000 1.2
+++ gtkshell/main.c 4 Feb 2007 04:44:24 -0000 1.3
@@ -22,84 +22,14 @@
#include "gtkshell.h"
-GtkWidget *scrolled_window;
-extern char *gsh_geometry;
-gboolean gsh_dont_scroll=FALSE;
-
-void
-gsh_setup_scrolled_window()
-{
- scrolled_window=gtk_scrolled_window_new(NULL,NULL);
- gtk_scrolled_window_set_policy(
- GTK_SCROLLED_WINDOW(scrolled_window),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_set_shadow_type(
- GTK_SCROLLED_WINDOW(scrolled_window),
- GTK_SHADOW_OUT);
- gtk_container_add(GTK_CONTAINER(gsh_window),
- scrolled_window);
- gtk_widget_show(scrolled_window);
-
-}
-
-void
-gsh_setup_containers()
-{
- gsh_hbox = gtk_hbox_new(FALSE, 2);
-
- if(!gsh_dont_scroll)
- {
- gsh_setup_scrolled_window();
- gtk_scrolled_window_add_with_viewport(
- GTK_SCROLLED_WINDOW(scrolled_window),
- gsh_hbox);
- }
- else
- {
- gtk_container_add(GTK_CONTAINER(gsh_window),
- gsh_hbox);
- }
-
- gtk_widget_show(gsh_hbox);
- gsh_vbox = gtk_vbox_new(FALSE, 2);
- gtk_container_add(GTK_CONTAINER(gsh_hbox), gsh_vbox);
- gtk_widget_show(gsh_vbox);
-}
-
-void
-gsh_set_geometry()
-{
- assert(gsh_geometry);
- gtk_window_parse_geometry(GTK_WINDOW(gsh_window),
- gsh_geometry);
-}
-void
-gsh_check_and_set_geometry()
-{
- if(gsh_geometry!=NULL)
- {
- gsh_set_geometry();
- free(gsh_geometry);
- }
- else
- {
- asprintf(&gsh_geometry, "500x300");
- gsh_set_geometry();
- free(gsh_geometry);
- }
-
-}
+extern gboolean gsh_dont_scroll;
int
main(int argc, char **argv)
{
gtk_init(&argc, &argv);
- gsh_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- g_signal_connect (gsh_window, "delete-event",
- G_CALLBACK (gtk_main_quit), NULL);
- g_signal_connect (gsh_window, "destroy",
- G_CALLBACK (gtk_main_quit), NULL);
+ gsh_window=gsh_create_main_window();
if(((argc > 1) && (strlen(argv[1]) == 3))
&& !strncmp(argv[1], "-os", 3))
@@ -117,3 +47,4 @@
return (0);
}
+
Index: gshedit/main.c
===================================================================
RCS file: gshedit/main.c
diff -N gshedit/main.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gshedit/main.c 4 Feb 2007 04:44:24 -0000 1.1
@@ -0,0 +1,277 @@
+/*
+ AntiRight
+ (c) 2002-2006 Jeffrey Bedard
+ address@hidden
+
+ This file is part of AntiRight.
+
+ AntiRight is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ AntiRight is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with AntiRight; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+*/
+
+#include <gtkshell.h>
+#include <gtksourceview/gtksourceview.h>
+#include <gtksourceview/gtksourcebuffer.h>
+
+extern char *gsh_geometry;
+GtkWidget *gshedit_widget;
+GtkWidget *gshedit_scrolled_window;
+GtkSourceBuffer *gshedit_buffer;
+GtkSourceTagTable *gshedit_tags;
+
+void
+gshedit_set_font(gchar *font)
+{
+ PangoFontDescription *font_description;
+
+ font_description=pango_font_description_from_string(font);
+ gtk_widget_modify_font(gshedit_widget, font_description);
+ pango_font_description_free(font_description);
+}
+
+void
+gshedit_set_text_options(GtkWidget *text)
+{
+ gshedit_set_font("Mono 12");
+
+ gtk_source_view_set_show_line_numbers(GTK_SOURCE_VIEW(text), TRUE);
+ gtk_source_view_set_show_line_markers(GTK_SOURCE_VIEW(text), TRUE);
+ gtk_source_view_set_tabs_width(GTK_SOURCE_VIEW(text), 8);
+ gtk_source_view_set_auto_indent(GTK_SOURCE_VIEW(text), TRUE);
+ gtk_source_view_set_margin(GTK_SOURCE_VIEW(text), 80);
+ gtk_source_view_set_show_margin(GTK_SOURCE_VIEW(text), TRUE);
+ gtk_source_view_set_highlight_current_line(GTK_SOURCE_VIEW(text), TRUE);
+ gtk_source_view_set_smart_home_end(GTK_SOURCE_VIEW(text), TRUE);
+}
+
+GtkWidget *
+gshedit_new_text(GtkWidget *parent)
+{
+ GtkWidget *text;
+
+ gshedit_tags=gtk_source_tag_table_new();
+ gshedit_buffer=gtk_source_buffer_new(gshedit_tags);
+ text=gtk_source_view_new_with_buffer(gshedit_buffer);
+
+ gshedit_set_text_options(text);
+
+ gtk_container_add(GTK_CONTAINER(parent), text);
+ gtk_widget_show(text);
+
+ return(text);
+}
+GtkWidget *
+gshedit_setup_scrolled_window(GtkWidget *parent)
+{
+ GtkWidget *scroll;
+
+ scroll=gtk_scrolled_window_new(NULL,NULL);
+ gtk_container_add(GTK_CONTAINER(parent), scroll);
+ gtk_widget_show(scroll);
+
+ return(scroll);
+}
+
+GtkWidget *
+gshedit_menu_button(GtkWidget *parent, gchar *label)
+{
+ GtkWidget *item;
+ item=gtk_menu_item_new_with_mnemonic(label);
+ gtk_menu_append(GTK_MENU(parent), item);
+ gtk_widget_show(item);
+
+ return(item);
+}
+GtkWidget *
+gshedit_submenu(GtkWidget *menu_item)
+{
+ GtkWidget *menu;
+
+ menu=gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), menu);
+ gtk_widget_show(menu);
+
+ return(menu);
+}
+void
+gshedit_open_cb(GtkWidget *widget, gpointer data)
+{
+ char *filename;
+
+ filename=antiright_pipe_read("gtkshell -df");
+ free(filename);
+}
+void
+gshedit_save_as_cb(GtkWidget *widget, gpointer data)
+{
+ char *filename;
+
+ filename=antiright_pipe_read("gtkshell -ds");
+ free(filename);
+}
+void
+gshedit_save_cb(GtkWidget *widget, gpointer data)
+{
+}
+void
+gshedit_exit_cb(GtkWidget *widget, gpointer data)
+{
+ exit(0);
+}
+void
+gshedit_font_cb(GtkWidget *widget, gpointer data)
+{
+ char *font;
+
+ font=antiright_pipe_read("gtkshell -dF");
+ gshedit_set_font(font);
+ free(font);
+}
+
+void
+gshedit_setup_file_menu(GtkWidget *file_menu)
+{
+ GtkWidget *menu;
+ GtkWidget *item;
+
+ menu=gshedit_submenu(file_menu);
+
+ item=gshedit_menu_button(menu, "Open");
+ g_signal_connect(G_OBJECT(item), "activate",
+ G_CALLBACK(gshedit_open_cb), NULL);
+ item=gshedit_menu_button(menu, "Save");
+ g_signal_connect(G_OBJECT(item), "activate",
+ G_CALLBACK(gshedit_save_cb), NULL);
+ item=gshedit_menu_button(menu, "Save As...");
+ g_signal_connect(G_OBJECT(item), "activate",
+ G_CALLBACK(gshedit_save_as_cb), NULL);
+ item=gshedit_menu_button(menu, "Exit");
+ g_signal_connect(G_OBJECT(item), "activate",
+ G_CALLBACK(gshedit_exit_cb), NULL);
+
+}
+void
+gshedit_setup_edit_menu(GtkWidget *edit_menu)
+{
+ GtkWidget *menu;
+ GtkWidget *item;
+
+ menu=gshedit_submenu(edit_menu);
+
+ item=gshedit_menu_button(menu, "Search/Replace...");
+}
+void
+gshedit_setup_view_menu(GtkWidget *view_menu)
+{
+ GtkWidget *menu;
+ GtkWidget *item;
+
+ menu=gshedit_submenu(view_menu);
+
+ item=gshedit_menu_button(menu, "Change Font...");
+ g_signal_connect(G_OBJECT(item), "activate",
+ G_CALLBACK(gshedit_font_cb), NULL);
+}
+void
+gshedit_setup_help_menu(GtkWidget *help_menu)
+{
+ GtkWidget *menu;
+ GtkWidget *item;
+
+ menu=gshedit_submenu(help_menu);
+
+ item=gshedit_menu_button(menu, "Manual");
+ item=gshedit_menu_button(menu, "About");
+
+}
+void
+gshedit_setup_menus(GtkWidget *menubar)
+{
+ GtkWidget *file_menu, *edit_menu, *view_menu, *help_menu;
+
+ file_menu=gtk_menu_item_new_with_mnemonic("File");
+ gtk_menu_bar_append(GTK_MENU_BAR(menubar), file_menu);
+ gshedit_setup_file_menu(file_menu);
+ gtk_widget_show(file_menu);
+
+ edit_menu=gtk_menu_item_new_with_mnemonic("Edit");
+ gtk_menu_bar_append(GTK_MENU_BAR(menubar), edit_menu);
+ gshedit_setup_edit_menu(edit_menu);
+ gtk_widget_show(edit_menu);
+
+ view_menu=gtk_menu_item_new_with_mnemonic("View");
+ gtk_menu_bar_append(GTK_MENU_BAR(menubar), view_menu);
+ gshedit_setup_view_menu(view_menu);
+ gtk_widget_show(view_menu);
+
+ help_menu=gtk_menu_item_new_with_mnemonic("Help");
+ gtk_menu_item_set_right_justified(GTK_MENU_ITEM(help_menu), TRUE);
+ gtk_menu_bar_append(GTK_MENU_BAR(menubar), help_menu);
+ gshedit_setup_help_menu(help_menu);
+ gtk_widget_show(help_menu);
+}
+
+GtkWidget *
+gshedit_setup_menubar(GtkWidget *parent)
+{
+ GtkWidget *menubar;
+
+ menubar=gtk_menu_bar_new();
+ gtk_container_add(GTK_CONTAINER(parent), menubar);
+
+ gshedit_setup_menus(menubar);
+
+ gtk_widget_show(menubar);
+
+ return(menubar);
+}
+
+
+int
+main(int argc, char **argv)
+{
+ GtkWidget *vbox;
+ GtkWidget *menubar;
+
+ gtk_init(&argc, &argv);
+
+ gsh_window = gsh_create_main_window();
+
+ asprintf(&gsh_geometry, "1000x800");
+ gsh_check_and_set_geometry();
+
+ vbox=gtk_vbox_new(FALSE, 2);
+ gtk_container_add(GTK_CONTAINER(gsh_window), vbox);
+ gtk_widget_show(vbox);
+
+ menubar=gshedit_setup_menubar(vbox);
+
+ gshedit_scrolled_window=gshedit_setup_scrolled_window(vbox);
+
+ gtk_box_set_child_packing(
+ GTK_BOX(vbox), menubar,
+ FALSE, FALSE, 2, GTK_PACK_START);
+ gtk_box_set_child_packing(
+ GTK_BOX(vbox), gshedit_scrolled_window,
+ TRUE, TRUE, 2, GTK_PACK_END);
+
+ gshedit_widget=gshedit_new_text(gshedit_scrolled_window);
+
+ gtk_widget_show(gsh_window);
+
+ gtk_main();
+
+ return(0);
+}
+
Index: gshterm/Makefile
===================================================================
RCS file: gshterm/Makefile
diff -N gshterm/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gshterm/Makefile 4 Feb 2007 04:44:24 -0000 1.1
@@ -0,0 +1,18 @@
+include ../config.mk
+
+#CFLAGS+=`pkg-config --cflags gtk+-2.0` -g3 -Wall -W -Werror
+CFLAGS+=`pkg-config --cflags gtk+-2.0` $(DEFS) -I../libantiright -I../gtkshell
+CFLAGS+=`pkg-config --cflags vte` -g3
+LDFLAGS+=-L../libantiright -L../gtkshell
+LDFLAGS+=`pkg-config --libs gtk+-2.0` -lgtkshell -lantiright
+LDFLAGS+=`pkg-config --libs vte`
+
+objects=main.o
+all: $(objects)
+ cc -o gshterm $(objects) $(LDFLAGS)
+
+clean:
+ rm -f gshterm *.o
+install:
+ install gshterm $(PREFIX)/bin
+
Index: gshterm/main.c
===================================================================
RCS file: gshterm/main.c
diff -N gshterm/main.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gshterm/main.c 4 Feb 2007 04:44:24 -0000 1.1
@@ -0,0 +1,105 @@
+/*
+ AntiRight
+ (c) 2002-2006 Jeffrey Bedard
+ address@hidden
+
+ This file is part of AntiRight.
+
+ AntiRight is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ AntiRight is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with AntiRight; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+*/
+
+#include <gtkshell.h>
+#include <vte/vte.h>
+#include <unistd.h>
+
+extern char *gsh_geometry;
+GtkWidget *terminal;
+
+void
+gshterm_exit_cb(GtkWidget *widget, gpointer data)
+{
+ char *sys_command;
+
+ asprintf(&sys_command, "rm -f %s", data);
+ system(sys_command);
+ free(sys_command);
+ exit(0);
+}
+
+int
+main(int argc, char **argv)
+{
+ unsigned int counter;
+ gboolean exec_reached;
+ char *command=""; /* Initialize to empty for
+ the first concatenation. */
+ char *sys_command;
+ char *script_name;
+ pid_t pid;
+
+ exec_reached=FALSE;
+
+ gtk_init(&argc, &argv);
+ gsh_window=gsh_create_main_window();
+ gsh_check_and_set_geometry();
+
+ terminal=vte_terminal_new();
+ gtk_container_add(GTK_CONTAINER(gsh_window), terminal);
+ vte_terminal_set_size(VTE_TERMINAL(terminal), 80, 32);
+ vte_terminal_set_allow_bold(VTE_TERMINAL(terminal), TRUE);
+ gtk_widget_show(terminal);
+
+ for(counter=1; counter < argc; counter++)
+ {
+ if(exec_reached)
+ asprintf(&command, "%s %s ", command, argv[counter]);
+ else if(!strncmp(argv[counter], "-e", 2))
+ exec_reached=TRUE;
+ }
+
+ puts(command);
+ pid=getpid();
+
+ /* This is a workaround for vte's fscking up of option arrays. */
+
+ asprintf(&script_name, "/tmp/gshterm.%d", (int)pid);
+ asprintf(&sys_command, "echo '#!/bin/sh' > %s", script_name);
+ system(sys_command);
+ free(sys_command);
+ asprintf(&sys_command, "echo %s >> %s", command, script_name);
+ free(command);
+ system(sys_command);
+ free(sys_command);
+ asprintf(&sys_command, "chmod +x %s", script_name);
+ system(sys_command);
+ free(sys_command);
+
+ g_signal_connect(G_OBJECT(terminal), "child-exited",
+ G_CALLBACK(gshterm_exit_cb), script_name);
+
+ /* SCRIPT_NAME is left allocated as it is needed
+ by the exit callback. */
+
+ vte_terminal_fork_command(
+ VTE_TERMINAL(terminal), script_name, NULL, NULL, NULL,
+ TRUE, TRUE, TRUE);
+
+ gtk_widget_show(gsh_window);
+
+ gtk_main();
+
+ return(0);
+}
+
Index: ACE-desktop/config.mk
===================================================================
RCS file: ACE-desktop/config.mk
diff -N ACE-desktop/config.mk
--- ACE-desktop/config.mk 3 Feb 2007 20:11:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-# Local Build Configuration
-VERSION=2.99.4
-PREFIX=/usr/local/stow/ACE-desktop
-INCLUDE= -I/usr/pkg/include -I/usr/local/include -I/usr/X11R6/include
-LIBDIR= -L/usr/pkg/lib -L/usr/local/lib -L/usr/X11R6/lib
-ICONDIR=
-CPPFLAGS=
-DEFS= -DPACKAGE_STRING='"AntiRight_2.99.4"'
-DPREFIX='"/usr/local/stow/ACE-desktop"' -D_GNU_SOURCE
-RESDIR=
-INSTALL=/usr/bin/install
Index: ACE-desktop/configure
===================================================================
RCS file: ACE-desktop/configure
diff -N ACE-desktop/configure
--- ACE-desktop/configure 3 Feb 2007 20:11:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-###############################################################################
-#
-# AntiRight
-# (c) 2004-2006 Jeffrey Bedard
-# address@hidden
-#
-# This file is part of AntiRight.
-#
-# AntiRight is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# AntiRight is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with AntiRight; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
-#
-###############################################################################
-
-VERSION=2.99.4
-
-for arg in $@; do
- if [ "$arg" = "-d" ]; then
- echo 'Configuring with debug options...'
- CFLAGS="-g3 -Wall -W -Werror -DDEBUG"
- elif [ "$arg" = "-s" ]; then
- PREFIX=~/opt/ACE-Desktop
- elif [ "$arg" = "-S" ]; then
- PREFIX=/usr/local/stow/ACE-desktop
- fi
-done
-
-DEFS="$DEFS -DPACKAGE_STRING='\"AntiRight_$VERSION\"'"
-
-
-if [ "$PREFIX" = "" ]; then
- PREFIX=/usr/local
-fi
-DEFS="$DEFS -DPREFIX='\"$PREFIX\"'"
-
-
-INCLUDE="$INCLUDE -I/usr/pkg/include -I/usr/local/include -I/usr/X11R6/include"
-LIBDIR="$LIBDIR -L/usr/pkg/lib -L/usr/local/lib -L/usr/X11R6/lib"
-
-INSTALL=/usr/bin/install
-DEFS="$DEFS -D_GNU_SOURCE"
-echo Prefix is $PREFIX
-echo "# Local Build Configuration" > config.mk
-echo "VERSION=$VERSION" >> config.mk
-echo "PREFIX=$PREFIX" >> config.mk
-echo "INCLUDE=$INCLUDE" >> config.mk
-echo "LIBDIR=$LIBDIR" >> config.mk
-echo "ICONDIR=$ICONDIR" >> config.mk
-echo "CPPFLAGS=$CPPFLAGS" >> config.mk
-echo "DEFS=$DEFS" >> config.mk
-echo "RESDIR=$RESDIR" >> config.mk
-echo "INSTALL=$INSTALL" >> config.mk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright Makefile config.mk ACE-desktop/Makefi...,
Jeffrey Bedard <=