X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tclmain.c;h=376e56feaa312bfac842d6e851733216a2e3ba8d;hb=f25d0ab1672bff45ed845baf786f23aac60ca243;hp=7e5ae24619365d8b36900401eee1c0e197861515;hpb=184be1f49bc141230b8dfdd11dfb2acf538d1858;p=ir-tcl-moved-to-github.git diff --git a/tclmain.c b/tclmain.c index 7e5ae24..376e56f 100644 --- a/tclmain.c +++ b/tclmain.c @@ -1,10 +1,45 @@ /* * IR toolkit for tcl/tk * (c) Index Data 1995 + * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: tclmain.c,v $ - * Revision 1.5 1995-03-20 08:53:30 adam + * Revision 1.14 1995-09-21 13:11:53 adam + * Support of dynamic loading. + * Test script uses load command if necessary. + * + * Revision 1.13 1995/08/28 12:21:22 adam + * Removed lines and list as synonyms of list in MARC extractron. + * Configure searches also for tk4.0 / tcl7.4. + * + * Revision 1.12 1995/08/28 11:07:16 adam + * Minor changes. + * + * Revision 1.11 1995/08/03 13:23:02 adam + * Request queue. + * + * Revision 1.10 1995/06/30 12:39:28 adam + * Bug fix: loadFile didn't set record type. + * The MARC routines are a little less strict in the interpretation. + * Script display.tcl replaces the old marc.tcl. + * New interactive script: shell.tcl. + * + * Revision 1.9 1995/06/26 10:20:20 adam + * ir-tk works like wish. + * + * Revision 1.8 1995/06/21 15:16:44 adam + * More work on configuration. + * + * Revision 1.7 1995/06/21 11:04:54 adam + * Uses GNU autoconf 2.3. + * Install procedure implemented. + * boook bitmaps moved to sub directory bitmaps. + * + * Revision 1.6 1995/05/29 08:44:28 adam + * Work on delete of objects. + * + * Revision 1.5 1995/03/20 08:53:30 adam * Event loop in tclmain.c rewritten. New method searchStatus. * * Revision 1.4 1995/03/17 07:50:31 adam @@ -12,22 +47,25 @@ * */ +#include #include #include +#ifdef _AIX +#include +#endif #include -#include #include - +#include #include "ir-tcl.h" static char *fileName = NULL; /* select(2) callbacks */ struct callback { - void (*r_handle)(void *p); - void (*w_handle)(void *p); - void (*x_handle)(void *p); + void (*r_handle)(ClientData); + void (*w_handle)(ClientData); + void (*x_handle)(ClientData); void *obj; }; #define MAX_CALLBACK 200 @@ -41,7 +79,7 @@ int Tcl_AppInit (Tcl_Interp *interp) { if (Tcl_Init(interp) == TCL_ERROR) return TCL_ERROR; - if (ir_tcl_init(interp) == TCL_ERROR) + if (Irtcl_Init(interp) == TCL_ERROR) return TCL_ERROR; return TCL_OK; } @@ -75,11 +113,34 @@ int main (int argc, char **argv) exit (1); tcl_mainloop (interp, 0); } - else + else if (isatty(0)) { + Tcl_SetVar (interp, "tcl_interactive", "1", TCL_GLOBAL_ONLY); tcl_mainloop (interp, 1); } + else + { + Tcl_DString command; + char input_buf[1024]; + int count; + + printf ("xx\n"); + Tcl_DStringInit (&command); + while (fgets (input_buf, 1024, stdin)) + { + count = strlen(input_buf); + Tcl_DStringAppend (&command, input_buf, count); + if (Tcl_CommandComplete (Tcl_DStringValue (&command))) + { + int code = Tcl_Eval (interp, Tcl_DStringValue (&command)); + Tcl_DStringFree (&command); + if (code) + printf ("Error: %s\n", interp->result); + } + } + tcl_mainloop (interp, 0); + } exit (0); } @@ -97,7 +158,7 @@ void tcl_mainloop (Tcl_Interp *interp, int interactive) if (interactive) { Tcl_DStringInit (&command); - printf ("[TCL]"); fflush (stdout); + printf ("%% "); fflush (stdout); } while (1) { @@ -154,8 +215,8 @@ void tcl_mainloop (Tcl_Interp *interp, int interactive) } if (interactive && FD_ISSET(0, &fdset_tcl_r)) { - char input_buf[256]; - int count = read (0, input_buf, 256); + char input_buf[1024]; + int count = read (0, input_buf, 1024); if (count <= 0) exit (0); @@ -165,10 +226,10 @@ void tcl_mainloop (Tcl_Interp *interp, int interactive) int code = Tcl_Eval (interp, Tcl_DStringValue (&command)); Tcl_DStringFree (&command); if (code) - printf ("[ERR:%s]\n", interp->result); - else - printf ("[RES:%s]\n", interp->result); - printf ("[TCL]"); fflush (stdout); + printf ("Error: %s\n", interp->result); + else if (*interp->result) + printf ("%s\n", interp->result); + printf ("%% "); fflush (stdout); } } }