[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright ./COPYING ./Makefile.in ./configure l...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright ./COPYING ./Makefile.in ./configure l... |
|
Date: |
Wed, 18 Aug 2004 20:35:44 -0400 |
CVSROOT: /cvsroot/antiright
Module name: antiright
Branch:
Changes by: Jeffrey Bedard <address@hidden> 04/08/19 00:31:32
Modified files:
. : COPYING Makefile.in configure
lib : button.c library.h menubar.c
src : AntiRight
src/arshell : dialog.c textedit.c
src/bitmaps : www.xpm
Added files:
. : README
Removed files:
doc : README
Log message:
Moved README to root of source tree. Added a games menu and renamed
the "Popular Applications" menu to the "Applications" menu. Restored the
www.xpm icon as it is easilly corruptable by modifications.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/README.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/COPYING.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/Makefile.in.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/configure.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/button.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/library.h.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/lib/menubar.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/AntiRight.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/dialog.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/textedit.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/bitmaps/www.xpm.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: antiright/COPYING
diff -u antiright/COPYING:1.8 antiright/COPYING:1.9
--- antiright/COPYING:1.8 Mon Aug 16 17:27:05 2004
+++ antiright/COPYING Thu Aug 19 00:31:31 2004
@@ -338,3 +338,4 @@
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
+
Index: antiright/Makefile.in
diff -u antiright/Makefile.in:1.24 antiright/Makefile.in:1.25
--- antiright/Makefile.in:1.24 Mon Aug 16 17:27:05 2004
+++ antiright/Makefile.in Thu Aug 19 00:31:31 2004
@@ -25,7 +25,7 @@
# The above line is where variables will be defined.
CFLAGS += $(INCLUDE) $(DEFS)
-programs=arshell arshell-x arcd vdesk
+programs=arshell arcd vdesk
all: $(programs)
lib-objects=lib/button.o lib/drawing.o lib/edit.o lib/form.o lib/frame.o\
@@ -46,11 +46,6 @@
$(CC) $(arshell-objects) $(CFLAGS) $(INCLUDE)\
$(LIBDIR) $(LIBS) -o arshell
-arshell-x-objects=src/arshell-x/arshell-x.o lib/util.o
-arshell-x:$(arshell-x-objects)
- $(CC) $(arshell-x-objects) $(CFLAGS) $(INCLUDE)\
- $(LIBDIR) -lX11 -o arshell-x
-
vdesk-objects=src/vdesk/vdesk.o
vdesk: $(vdesk-objects)
$(CC) -o vdesk $(vdesk-objects) $(CFLAGS) $(INCLUDE) $(LIBDIR) -lX11
@@ -71,12 +66,11 @@
man5dir=$(mandir)/man5
datadir=$(PREFIX)/share
docdir=$(datadir)/doc
-bitmapdir=/usr/X11R6/include/X11/bitmaps/antiright
install: all
$(INSTALL_DIR) $(bindir) $(man1dir) $(man2dir) $(docdir)/antiright\
- $(datadir)/antiright /usr/X11R6/lib/X11/app-defaults $(bitmapdir)
- $(INSTALL_DATA) src/AntiRight /usr/X11R6/lib/X11/app-defaults
+ $(datadir)/antiright $(RESDIR) $(ICONDIR)
+ $(INSTALL_DATA) src/AntiRight $(RESDIR)
$(INSTALL_DATA) src/system.antiright $(datadir)/antiright/
$(INSTALL_PROGRAM) $(programs) $(bindir)
$(INSTALL_SCRIPT) src/ACE src/AR src/ARO src/antiright-mail.awk\
@@ -90,8 +84,8 @@
$(INSTALL_DATA) doc/INSTALL $(docdir)/antiright
$(INSTALL_DATA) doc/HACKING $(docdir)/antiright
$(INSTALL_DATA) ChangeLog $(docdir)/antiright
- $(INSTALL_DATA) src/bitmaps/*.xbm $(bitmapdir)
- $(INSTALL_DATA) src/bitmaps/*.xpm $(bitmapdir)
+ $(INSTALL_DATA) src/bitmaps/*.xbm $(ICONDIR)
+ $(INSTALL_DATA) src/bitmaps/*.xpm $(ICONDIR)
tarball: distclean
cd .. && tar czf antiright-$(VERSION).tar.gz antiright
@@ -99,3 +93,4 @@
cd .. && find antiright | zip antiright-$(VERSION).zip -@
bzball:
cd .. && tar cjf antiright-$(VERSION).tar.gz antiright
+fulldist: tarball zip bzball
Index: antiright/configure
diff -u antiright/configure:1.37 antiright/configure:1.38
--- antiright/configure:1.37 Wed Aug 18 23:57:56 2004
+++ antiright/configure Thu Aug 19 00:31:31 2004
@@ -79,12 +79,12 @@
INCLUDE=$INCLUDE\\
LIBDIR=$LIBDIR\\
LIBS=$LIBS\\
+ ICONDIR=$ICONDIR\\
CPPFLAGS=$CPPFLAGS\\
CFLAGS=$CFLAGS\\
DEFS=$DEFS\\
RESDIR=$RESDIR\\
VERSION=$VERSION\\
- INSTALL=$(which install)\\
- " Makefile > sed.tmp.$$
+ INSTALL=$(which install)" Makefile > sed.tmp.$$
# Commit change to the Makefile.
mv sed.tmp.$$ Makefile
Index: antiright/lib/button.c
diff -u antiright/lib/button.c:1.5 antiright/lib/button.c:1.6
--- antiright/lib/button.c:1.5 Mon Aug 16 17:27:05 2004
+++ antiright/lib/button.c Thu Aug 19 00:31:31 2004
@@ -35,8 +35,9 @@
XtCallbackProc callback,
XtPointer client_data)
{
+ Widget button_widget;
antiright_set(XmNpacking, XmPACK_TIGHT);
- Widget button_widget=XmCreatePushButton(parent_widget, name, ARARGS);
+ button_widget=XmCreatePushButton(parent_widget, name, ARARGS);
XtManageChild(button_widget);
XtAddCallback(button_widget, XmNactivateCallback, callback, client_data);
if(client_data != NULL & antiright.arm_status)
Index: antiright/lib/library.h
diff -u antiright/lib/library.h:1.7 antiright/lib/library.h:1.8
--- antiright/lib/library.h:1.7 Mon Aug 16 17:27:05 2004
+++ antiright/lib/library.h Thu Aug 19 00:31:31 2004
@@ -163,6 +163,9 @@
printf("%s: %d\n", __FILE__, __LINE__); \
fflush(stdout); \
} \
-
+
+Widget
+antiright_widget(Widget parent, WidgetClass widget_class);
+
#endif /* AR_LIBRARY_H */
Index: antiright/lib/menubar.c
diff -u antiright/lib/menubar.c:1.7 antiright/lib/menubar.c:1.8
--- antiright/lib/menubar.c:1.7 Wed Aug 18 23:58:45 2004
+++ antiright/lib/menubar.c Thu Aug 19 00:31:32 2004
@@ -219,9 +219,95 @@
}
void
-antiright_setup_popular_applications_menu(Widget parent)
+antiright_setup_games_menu(Widget parent)
{
- Widget submenu_widget=antiright_menu(parent, "Popular Applications");
+ Widget submenu_widget=antiright_menu(parent, "Games");
+ antiright_button(submenu_widget,
+ "Adventure",
+ antiright_system_cb,
+ "xterm -e /usr/games/adventure &");
+ antiright_button(submenu_widget,
+ "Arithmetic",
+ antiright_system_cb,
+ "xterm -e /usr/games/arithmetic &");
+ antiright_button(submenu_widget,
+ "Air Traffic Command",
+ antiright_system_cb,
+ "xterm -e /usr/games/atc &");
+ antiright_button(submenu_widget,
+ "Battlestar",
+ antiright_system_cb,
+ "xterm -e /games/battlestar &");
+ antiright_button(submenu_widget,
+ "Boggle",
+ antiright_system_cb,
+ "xterm -e /usr/games/boggle &");
+ antiright_button(submenu_widget,
+ "Canfield",
+ antiright_system_cb,
+ "xterm -e /usr/games/canfield &");
+ antiright_button(submenu_widget,
+ "Cribbage",
+ antiright_system_cb,
+ "xterm -e /usr/games/cribbage &");
+ antiright_button(submenu_widget,
+ "Fish",
+ antiright_system_cb,
+ "xterm -e /usr/games/fish &");
+ antiright_button(submenu_widget,
+ "Gomoku",
+ antiright_system_cb,
+ "xterm -e /usr/games/gomoku &");
+ antiright_button(submenu_widget,
+ "Hangman",
+ antiright_system_cb,
+ "xterm -e /usr/games/hangman &");
+ antiright_button(submenu_widget,
+ "Mille",
+ antiright_system_cb,
+ "xterm -e /usr/games/mille &");
+ antiright_button(submenu_widget,
+ "Phantasia",
+ antiright_system_cb,
+ "xterm -e/usr/games/ phantasia &");
+ antiright_button(submenu_widget,
+ "Quiz",
+ antiright_system_cb,
+ "xterm -e /usr/games/quiz &");
+ antiright_button(submenu_widget,
+ "Robots",
+ antiright_system_cb,
+ "xterm -e /usr/games/robots &");
+ antiright_button(submenu_widget,
+ "Rogue",
+ antiright_system_cb,
+ "xterm -e /usr/games/rogue &");
+ antiright_button(submenu_widget,
+ "Sail",
+ antiright_system_cb,
+ "xterm -e /usr/games/sail &");
+ antiright_button(submenu_widget,
+ "Tetris",
+ antiright_system_cb,
+ "xterm -e /usr/games/tetris &");
+ antiright_button(submenu_widget,
+ "Trek",
+ antiright_system_cb,
+ "xterm -e /usr/games/trek &");
+ antiright_button(submenu_widget,
+ "Worm",
+ antiright_system_cb,
+ "xterm -e /usr/games/worm &");
+ antiright_button(submenu_widget,
+ "Wump",
+ antiright_system_cb,
+ "xterm -e /usr/games/wump &");
+}
+
+void
+antiright_setup_applications_menu(Widget parent)
+{
+ Widget submenu_widget=antiright_menu(parent, "Applications");
antiright_button(submenu_widget,
"Firefox",
antiright_system_cb,
@@ -287,7 +373,8 @@
antiright_button(menubar->view_widget, "Themes Panel",
antiright_system_cb, "ACE -A Theme_Panel");
antiright_separator(menubar->view_widget);
- antiright_setup_popular_applications_menu(menubar->view_widget);
+ antiright_setup_applications_menu(menubar->view_widget);
+ antiright_setup_games_menu(menubar->view_widget);
}
void
Index: antiright/src/AntiRight
diff -u antiright/src/AntiRight:1.3 antiright/src/AntiRight:1.4
--- antiright/src/AntiRight:1.3 Mon Aug 16 17:27:05 2004
+++ antiright/src/AntiRight Thu Aug 19 00:31:32 2004
@@ -119,7 +119,6 @@
*ACE Panel.accelerator: Alt<Key>P
*ACE Panel.acceleratorText: Alt-P
*ACE Panel.labelString: ACE Panel...
-*Applications.mnemonic: Alt<Key>P
*Network Panel.mnemonic: N
*Network Panel.accelerator: Alt<Key>N
*Network Panel.acceleratorText: Alt-N
Index: antiright/src/arshell/dialog.c
diff -u antiright/src/arshell/dialog.c:1.3 antiright/src/arshell/dialog.c:1.4
--- antiright/src/arshell/dialog.c:1.3 Mon Aug 16 17:27:05 2004
+++ antiright/src/arshell/dialog.c Thu Aug 19 00:31:32 2004
@@ -163,6 +163,15 @@
}
void
+arshell_setup_prompt_dialog_callbacks(Widget dialog)
+{
+ XtAddCallback(dialog, XmNokCallback, arshell_prompt_cb, NULL);
+ XtAddCallback(dialog, XmNcancelCallback, arshell_dialog_cb, NULL);
+ XtAddCallback(dialog, XmNhelpCallback, antiright_help_cb,
+ "This_is_an_application_request_for_user_input.");
+}
+
+void
arshell_prompt_dialog(int *counter_int, char **argv)
{
Widget dialog;
@@ -178,10 +187,7 @@
XtUnmanageChild(child);
child=XmSelectionBoxGetChild(dialog, XmDIALOG_LIST_LABEL);
XtUnmanageChild(child);
- XtAddCallback(dialog, XmNokCallback, arshell_prompt_cb, NULL);
- XtAddCallback(dialog, XmNcancelCallback, arshell_dialog_cb, NULL);
- XtAddCallback(dialog, XmNhelpCallback, antiright_help_cb,
- "This_is_an_application_request_for_user_input.");
+ arshell_setup_prompt_dialog_callbacks(dialog);
XtManageChild(dialog);
ARCLARG;
XmStringFree(motif_string);
@@ -202,16 +208,22 @@
}
void
+arshell_setup_file_selection_dialog_callbacks(Widget dialog)
+{
+ XtAddCallback(dialog, XmNokCallback, arshell_file_select_cb, NULL);
+ XtAddCallback(dialog, XmNcancelCallback, arshell_dialog_cb, NULL);
+ XtAddCallback(dialog, XmNhelpCallback, antiright_help_cb,
+ "Use_this_dialog_to_select_a_file.");
+}
+
+void
arshell_file_select_dialog()
{
Widget dialog;
ARCLARG;
dialog=XmCreateFileSelectionBox(arshell.gui.widgets.row, "dialog",
antiright.arguments, antiright.arguments_int);
- XtAddCallback(dialog, XmNokCallback, arshell_file_select_cb, NULL);
- XtAddCallback(dialog, XmNcancelCallback, arshell_dialog_cb, NULL);
- XtAddCallback(dialog, XmNhelpCallback, antiright_help_cb,
- "Use_this_dialog_to_select_a_file.");
+ arshell_setup_file_selection_dialog_callbacks(dialog);
XtManageChild(dialog);
ARCLARG;
}
Index: antiright/src/arshell/textedit.c
diff -u antiright/src/arshell/textedit.c:1.11
antiright/src/arshell/textedit.c:1.12
--- antiright/src/arshell/textedit.c:1.11 Mon Aug 16 17:27:05 2004
+++ antiright/src/arshell/textedit.c Thu Aug 19 00:31:32 2004
@@ -65,7 +65,8 @@
font_struct=XLoadQueryFont(antiright.display, font_string);
if(font_struct!=NULL)
{
- XmFontList font_list=XmFontListCreate(font_struct,
XmSTRING_DEFAULT_CHARSET);
+ XmFontList font_list=XmFontListCreate(font_struct,
+ XmSTRING_DEFAULT_CHARSET);
ARCLARG;
antiright_set(XmNfontList, (XtArgVal)font_list);
antiright_set_values(arshell.gui.widgets.work);
@@ -74,7 +75,8 @@
}
else
{
- antiright_system("arshell -ADm 'The entered font was not found. '
&");
+ antiright_system
+ ("arshell -ADm 'The entered font was not found. ' &");
}
}
free(font_string);
@@ -223,6 +225,24 @@
arshell_verified_status(call_data);
}
void
+arshell_setup_work_area_callbacks()
+{
+ XtAddCallback(arshell.gui.widgets.work, XmNvalueChangedCallback,
+ arshell_value_changed_cb, NULL);
+ XtAddCallback(arshell.gui.widgets.work, XmNmodifyVerifyCallback,
+ arshell_modify_verify_cb, NULL);
+ XtAddCallback(arshell.gui.widgets.work, XmNmotionVerifyCallback,
+ arshell_motion_verify_cb, NULL);
+}
+void
+arshell_work_area_pixmap_hack()
+{
+ char *icon;
+ asprintf(&icon, "%s/handtoface.xpm", ICONDIR);
+ antiright_set_bitmap_from_file(antiright.parent_widget, icon);
+ free(icon);
+}
+void
arshell_create_text_work_area()
{
arshell_set_work_area_arguments();
@@ -231,19 +251,9 @@
antiright.arguments_int);
XtManageChild(arshell.gui.widgets.work);
antiright_defined_popup_menu(arshell.gui.widgets.work);
- XtAddCallback(arshell.gui.widgets.work, XmNvalueChangedCallback,
- arshell_value_changed_cb, NULL);
- XtAddCallback(arshell.gui.widgets.work, XmNmodifyVerifyCallback,
- arshell_modify_verify_cb, NULL);
- XtAddCallback(arshell.gui.widgets.work, XmNmotionVerifyCallback,
- arshell_motion_verify_cb, NULL);
+ arshell_setup_work_area_callbacks();
arshell_setup_work_menubar();
- {
- char *icon;
- asprintf(&icon, "%s/handtoface.xpm", ICONDIR);
- antiright_set_bitmap_from_file(antiright.parent_widget, icon);
- free(icon);
- }
+ arshell_work_area_pixmap_hack();
}
void
@@ -254,15 +264,19 @@
antiright_form_positions(0, 100, 0, 25);
antiright_label(form_widget, label_string);
}
-
-Widget
-arshell_create_default_text_field(Widget parent_widget, char* return_string)
+void
+arshell_set_text_field_arguments()
{
- Widget text_widget;
ARCLARG;
antiright_form_positions(0, 100, 25, 100);
antiright_set(XmNeditMode, XmSINGLE_LINE_EDIT);
antiright_set(XmNscrollHorizontal, False);
+}
+Widget
+arshell_create_default_text_field(Widget parent_widget, char* return_string)
+{
+ Widget text_widget;
+ arshell_set_text_field_arguments();
text_widget=XmCreateText(parent_widget, "text_widget",
antiright.arguments, antiright.arguments_int);
assert(text_widget!=NULL);
Index: antiright/src/bitmaps/www.xpm
diff -u antiright/src/bitmaps/www.xpm:1.1 antiright/src/bitmaps/www.xpm:1.2
--- antiright/src/bitmaps/www.xpm:1.1 Mon Aug 16 18:11:46 2004
+++ antiright/src/bitmaps/www.xpm Thu Aug 19 00:31:32 2004
@@ -1,22 +1,3 @@
-/*
- * Launcher the ultimate Motif application starter.
- * Copyright (C) 2000 Ali Akcaagac
- *
- * This program 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.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
/* XPM */
static char * www_xpm[] = {
"32 32 33 1",
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright ./COPYING ./Makefile.in ./configure l...,
Jeffrey Bedard <=