[Antiright-devel] antiright ./Makefile.in ./configure src/arcd/ar...

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 04/08/28 01:16:43

Modified files:
        .              : Makefile.in configure 
        src/arcd       : arcd.c 
        src/arshell    : arguments.c arguments.h arshell.h 
Added files:
        src/arshell    : interface_file.c interface_file.h 

Log message:
        Added support for interface files using yetanotherclib's parsing 
functions.  The file format is that of a standard yaclib parser input file, its 
grammar defined in interface_file.c.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/Makefile.in.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/configure.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arcd/arcd.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/interface_file.c?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/interface_file.h?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/arguments.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/arguments.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/arshell/arshell.h.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: antiright/Makefile.in
diff -u antiright/Makefile.in:1.26 antiright/Makefile.in:1.27
--- antiright/Makefile.in:1.26  Wed Aug 25 23:50:18 2004
+++ antiright/Makefile.in       Sat Aug 28 01:16:42 2004
@@ -24,7 +24,7 @@
 # The following line is where variables will be defined.  
 
 # The above line is where variables will be defined. 
-CFLAGS += $(INCLUDE) $(DEFS)
+CFLAGS += $(INCLUDE) $(DEFS) -Wall -W -g 
 programs=arshell arcd vdesk
 all: $(programs)
 
@@ -35,20 +35,20 @@
 
 arcd-objects=src/arcd/arcd.o $(lib-objects)
 arcd: $(arcd-objects)
-       $(CC) -o arcd $(arcd-objects) $(CFLAGS) $(INCLUDE) $(LIBDIR) $(LIBS)
+       $(CC) -o arcd $(arcd-objects) $(CFLAGS) $(LIBDIR) $(LIBS)
 
 arshell-objects=src/arshell/arshell.o src/arshell/arguments.o\
         src/arshell/textedit.o src/arshell/arshell-util.o\
         src/arshell/color.o src/arshell/dialog.o src/arshell/menubar.o\
        src/arshell/update.o src/arshell/layout.o src/arshell/main.o\
-       src/arshell/search.o src/arshell/file.o $(lib-objects)
+       src/arshell/search.o src/arshell/file.o src/arshell/interface_file.o\
+       $(lib-objects)
 arshell:$(arshell-objects)
-       $(CC) $(arshell-objects) $(CFLAGS) $(INCLUDE)\
-        $(LIBDIR) $(LIBS) -o arshell
+       $(CC) $(arshell-objects) $(CFLAGS) $(LIBDIR) $(LIBS) -o arshell
 
 vdesk-objects=src/vdesk/vdesk.o
 vdesk: $(vdesk-objects)
-       $(CC) -o vdesk $(vdesk-objects) $(CFLAGS) $(INCLUDE) $(LIBDIR) -lX11
+       $(CC) -o vdesk $(vdesk-objects) $(CFLAGS) $(LIBDIR) -lX11
 
 clean:
        rm -f `find . | grep '.o$$'` $(programs)
Index: antiright/configure
diff -u antiright/configure:1.40 antiright/configure:1.41
--- antiright/configure:1.40    Wed Aug 25 23:45:52 2004
+++ antiright/configure Sat Aug 28 01:16:42 2004
@@ -88,7 +88,12 @@
     DEFS="$DEFS -DHAVE_XLT"
 fi
 
-LIBS="$LIBS -lXm -lXt -lX11"
+if [ -f /usr/local/lib/libyaclib.so ] || [ -f /usr/lib/libyaclib.so ]; then
+    LIBS="$LIBS -lyaclib"
+    DEFS="$DEFS -DHAVE_YACLIB"
+fi
+
+LIBS="$LIBS -lXm -lXt -lX11 -lm"
 DEFS="$DEFS -D_GNU_SOURCE"
 
 ed <<EOF Makefile 1> /dev/null 2> /dev/null 
Index: antiright/src/arcd/arcd.c
diff -u antiright/src/arcd/arcd.c:1.4 antiright/src/arcd/arcd.c:1.5
--- antiright/src/arcd/arcd.c:1.4       Thu Aug 26 15:57:34 2004
+++ antiright/src/arcd/arcd.c   Sat Aug 28 01:16:43 2004
@@ -25,16 +25,17 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#ifdef HAVE_LINUX_CDROM_H
-#include <linux/cdrom.h>
-#endif
-
 #ifdef HAVE_LIBCDAUDIO
 #include <cdaudio.h>
+#else
+#ifdef HAVE_LINUX_CDROM_H
+#include <linux/cdrom.h>
+#endif /* HAVE_LINUX_CDROM_H  */
 #endif /* HAVE_LIBCDAUDIO  */
 
 /* CD-ROM file descriptor id.  */
-int arcd_file_descriptor;
+int arcd_file_descriptor=0;
+#ifndef HAVE_LIBCDAUDIO
 /* Track list structure.  */
 #ifdef HAVE_LINUX_CDROM_H
 struct cdrom_tochdr arcd_track_list;
@@ -43,6 +44,7 @@
 #ifdef HAVE_LINUX_CDROM_H
 struct cdrom_ti arcd_tracks;
 #endif /* HAVE_LINUX_CDROM_H  */
+#endif /* not HAVE_LIBCDAUDIO  */
 
 void
 arcd_setup_file_descriptor()
@@ -57,11 +59,13 @@
 initialize_cdrom()
 {
   arcd_setup_file_descriptor();
+#ifndef HAVE_LIBCDAUDIO
 #ifdef HAVE_LINUX_CDROM_H
   ioctl(arcd_file_descriptor, CDROMREADTOCHDR, &arcd_track_list);
   arcd_tracks.cdti_trk0=arcd_track_list.cdth_trk0;
   arcd_tracks.cdti_trk1=arcd_track_list.cdth_trk1;
 #endif /* HAVE_LINUX_CDROM_H  */
+#endif /* not HAVE_LIBCDAUDIO  */
 }
 void
 arcd_play()
@@ -147,12 +151,32 @@
       {
        switch(argv[counter_int][1])
          {
+         case 'c':
+#ifdef HAVE_LIBCDAUDIO
+           initialize_cdrom();
+           cd_close(arcd_file_descriptor);
+#else
+#ifdef HAVE_LINUX_CDROM_H
+           arcd_initialized_command(CDROMCLOSETRAY);
+#endif /* HAVE_LINUX_CDROM_H  */
+#endif /* HAVE_LIBCDAUDIO  */
+           break;
+         case 'e':
+#ifdef HAVE_LIBCDAUDIO
+           initialize_cdrom();
+           cd_eject(arcd_file_descriptor);
+#else
+#ifdef HAVE_LINUX_CDROM_H
+           arcd_initialized_command(CDROMEJECT);
+#endif /* HAVE_LINUX_CDROM_H  */
+#endif /* HAVE_LIBCDAUDIO  */
+           break;
          case 'P': /* This pauses play.  */
 #ifdef HAVE_LIBCDAUDIO
+           initialize_cdrom();
            cd_pause(arcd_file_descriptor);
 #else
 #ifdef HAVE_LINUX_CDROM_H
-           initialize_cdrom();
            arcd_initialized_command(CDROMPAUSE);
 #endif /* HAVE_LINUX_CDROM_H  */
 #endif /* HAVE_LIBCDAUDIO  */
@@ -188,9 +212,11 @@
            break;
          }
       }
-
   if(argc==1)
     arcd_usage();
-  
+  if(arcd_file_descriptor!=0)
+    {
+      cd_finish(arcd_file_descriptor);
+    }
   return(0);
 }
Index: antiright/src/arshell/arguments.c
diff -u antiright/src/arshell/arguments.c:1.8 
antiright/src/arshell/arguments.c:1.9
--- antiright/src/arshell/arguments.c:1.8       Mon Aug 23 01:15:56 2004
+++ antiright/src/arshell/arguments.c   Sat Aug 28 01:16:43 2004
@@ -117,6 +117,12 @@
     case 'E': /* Exit when a button is pressed.  */
       arshell.flags.exit_on_action=True;
       break;
+#ifdef HAVE_YACLIB
+    case 'f': /* Load an arshell interface definition file.  */
+      (*counter_int)++;
+      arshell_parse_interface_file(argv[(*counter_int)]);
+      break;
+#endif /* HAVE_YACLIB  */
     case 'p': /* Input pipe operations.  */
       arshell_set_work_area_from_stdin();
       break;
Index: antiright/src/arshell/arguments.h
diff -u antiright/src/arshell/arguments.h:1.4 
antiright/src/arshell/arguments.h:1.5
--- antiright/src/arshell/arguments.h:1.4       Mon Aug  9 22:45:02 2004
+++ antiright/src/arshell/arguments.h   Sat Aug 28 01:16:43 2004
@@ -29,4 +29,7 @@
 Widget
 arshell_progress_bar(Widget parent);
 
+void
+arshell_transparency_hack();
+
 #endif /* AR_ARGUMENTS_H  */
Index: antiright/src/arshell/arshell.h
diff -u antiright/src/arshell/arshell.h:1.10 
antiright/src/arshell/arshell.h:1.11
--- antiright/src/arshell/arshell.h:1.10        Mon Aug 23 01:15:56 2004
+++ antiright/src/arshell/arshell.h     Sat Aug 28 01:16:43 2004
@@ -34,6 +34,7 @@
 #include "layout.h"
 #include "search.h"
 #include "file.h"
+#include "interface_file.h"
 
 struct arshell_flags_struct
 {