diff -c tk-1.3/Makefile tk/Makefile *** tk-1.3/Makefile Tue Nov 5 13:49:30 1991 --- tk/Makefile Thu Nov 21 16:27:32 1991 *************** *** 24,36 **** TCL_DIR = tcl XLIB = -lX11 CC = cc ! CFLAGS = -I. -I$(TCL_DIR) -g -DTK_VERSION=\"1.3/\" LIBS = libtk.a $(TCL_DIR)/libtcl.a WIDGOBJS = tkButton.o tkEntry.o tkFrame.o tkListbox.o \ tkMenu.o tkMenubutton.o tkMessage.o tkScale.o \ ! tkScrollbar.o OBJS = tk3d.o tkArgv.o tkAtom.o tkBind.o tkBitmap.o \ tkCmds.o tkColor.o tkConfig.o tkCursor.o tkError.o \ --- 24,36 ---- TCL_DIR = tcl XLIB = -lX11 CC = cc ! CFLAGS = -I. -I$(TCL_DIR) -g -DTK_VERSION=\"1.3\" LIBS = libtk.a $(TCL_DIR)/libtcl.a WIDGOBJS = tkButton.o tkEntry.o tkFrame.o tkListbox.o \ tkMenu.o tkMenubutton.o tkMessage.o tkScale.o \ ! tkScrollbar.o tkText.o OBJS = tk3d.o tkArgv.o tkAtom.o tkBind.o tkBitmap.o \ tkCmds.o tkColor.o tkConfig.o tkCursor.o tkError.o \ *************** *** 40,46 **** WIDGSRCS = tkButton.c tkEntry.c tkFrame.c tkListbox.c \ tkMenu.c tkMenubutton.c tkMessage.c tkScale.c \ ! tkScrollbar.c SRCS = tk3d.c tkArgv.c tkAtom.c tkBind.c tkBitmap.c \ tkCmds.o tkColor.c tkConfig.c tkCursor.c tkError.c \ --- 40,46 ---- WIDGSRCS = tkButton.c tkEntry.c tkFrame.c tkListbox.c \ tkMenu.c tkMenubutton.c tkMessage.c tkScale.c \ ! tkScrollbar.c tkText.c SRCS = tk3d.c tkArgv.c tkAtom.c tkBind.c tkBitmap.c \ tkCmds.o tkColor.c tkConfig.c tkCursor.c tkError.c \ Common subdirectories: tk-1.3/bitmaps and tk/bitmaps diff -c tk-1.3/default.h tk/default.h *** tk-1.3/default.h Sun Oct 6 16:29:12 1991 --- tk/default.h Fri Nov 8 12:28:50 1991 *************** *** 235,239 **** --- 235,267 ---- #define DEF_SCROLLBAR_REPEAT_INTERVAL "100" #define DEF_SCROLLBAR_WIDTH "15" + /* + * Defaults for text: + */ + + #define DEF_TEXT_BG_COLOR BISQUE1 + #define DEF_TEXT_BG_MONO WHITE + #define DEF_TEXT_BORDER_WIDTH "2" + #define DEF_TEXT_CURSOR_BG BLACK + #define DEF_TEXT_CURSOR_BD_COLOR "1" + #define DEF_TEXT_CURSOR_BD_MONO "0" + #define DEF_TEXT_CURSOR_OFF_TIME "300" + #define DEF_TEXT_CURSOR_ON_TIME "600" + #define DEF_TEXT_CURSOR_WIDTH "2" + #define DEF_TEXT_FONT "*-Helvetica-Medium-R-Normal-*-120-*" + #define DEF_TEXT_FG BLACK + #define DEF_TEXT_HEIGHT "1" + #define DEF_TEXT_RELIEF "flat" + #define DEF_TEXT_SCROLL_H_COMMAND ((char *) NULL) + #define DEF_TEXT_SCROLL_V_COMMAND ((char *) NULL) + #define DEF_TEXT_SELECT_COLOR LIGHTBLUE2 + #define DEF_TEXT_SELECT_MONO BLACK + #define DEF_TEXT_SELECT_BD_COLOR "1" + #define DEF_TEXT_SELECT_BD_MONO "0" + #define DEF_TEXT_SELECT_FG_COLOR BLACK + #define DEF_TEXT_SELECT_FG_MONO WHITE + #define DEF_TEXT_WRAP "word" + #define DEF_TEXT_WIDTH "20" + #endif /* _DEFAULT */ Common subdirectories: tk-1.3/demos and tk/demos Common subdirectories: tk-1.3/doc and tk/doc Common subdirectories: tk-1.3/tcl and tk/tcl Only in tk: test.text diff -c tk-1.3/tk.h tk/tk.h *** tk-1.3/tk.h Sun Oct 27 19:13:27 1991 --- tk/tk.h Mon Nov 11 15:37:40 1991 *************** *** 127,134 **** #define TK_CONFIG_BORDER 9 #define TK_CONFIG_RELIEF 10 #define TK_CONFIG_CURSOR 11 ! #define TK_CONFIG_SYNONYM 12 ! #define TK_CONFIG_END 13 /* * Macro to use to fill in "offset" fields of Tk_ConfigInfos. --- 127,135 ---- #define TK_CONFIG_BORDER 9 #define TK_CONFIG_RELIEF 10 #define TK_CONFIG_CURSOR 11 ! #define TK_CONFIG_WRAP 12 ! #define TK_CONFIG_SYNONYM 13 ! #define TK_CONFIG_END 14 /* * Macro to use to fill in "offset" fields of Tk_ConfigInfos. *************** *** 177,182 **** --- 178,192 ---- #define TK_RELIEF_SUNKEN 4 /* + * Wrap mode values returned by Tk_GetWrapMode: + */ + + #define TK_WRAP_NONE 1 + #define TK_WRAP_CHAR 2 + #define TK_WRAP_WORD 3 + #define TK_WRAP_FIXED 4 + + /* * Special EnterNotify/LeaveNotify "mode" for use in events * generated by tkShare.c. Pick a high enough value that it's * unlikely to conflict with existing values (like NotifyNormal) *************** *** 449,454 **** --- 459,467 ---- extern int Tk_GetSelection _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Atom target, Tk_GetSelProc *proc, ClientData clientData)); + extern int Tk_GetWrapMode _ANSI_ARGS_((Tcl_Interp *interp, + char *name, + int *wrapPtr)); extern Tk_Uid Tk_GetUid _ANSI_ARGS_((char *string)); extern void Tk_HandleEvent _ANSI_ARGS_((XEvent *eventPtr)); extern Atom Tk_InternAtom _ANSI_ARGS_((Tk_Window tkwin, *************** *** 470,475 **** --- 483,489 ---- extern char * Tk_NameOfFontStruct _ANSI_ARGS_(( XFontStruct *fontStructPtr)); extern char * Tk_NameOfRelief _ANSI_ARGS_((int relief)); + extern char * Tk_NameOfWrapMode _ANSI_ARGS_((int wrap)); extern Tk_Window Tk_NameToWindow _ANSI_ARGS_((Tcl_Interp *interp, char *pathName, Tk_Window tkwin)); extern void Tk_OwnSelection _ANSI_ARGS_((Tk_Window tkwin, *************** *** 552,557 **** --- 566,573 ---- extern int Tk_SelectionCmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); extern int Tk_SendCmd _ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, int argc, char **argv)); + extern int Tk_TextCmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); extern int Tk_UpdateCmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); diff -c tk-1.3/tkConfig.c tk/tkConfig.c *** tk-1.3/tkConfig.c Thu Oct 31 13:49:22 1991 --- tk/tkConfig.c Fri Nov 8 12:29:08 1991 *************** *** 459,464 **** --- 459,469 ---- return TCL_ERROR; } break; + case TK_CONFIG_WRAP: + if (Tk_GetWrapMode(interp, uid, (int *) ptr) != TCL_OK) { + return TCL_ERROR; + } + break; case TK_CONFIG_CURSOR: { Cursor new, old; *************** *** 678,683 **** --- 683,691 ---- } case TK_CONFIG_RELIEF: argv[4] = Tk_NameOfRelief(*((int *) ptr)); + break; + case TK_CONFIG_WRAP: + argv[4] = Tk_NameOfWrapMode(*((int *) ptr)); break; case TK_CONFIG_CURSOR: { Cursor cursor = *((Cursor *) ptr); Only in tk: tkText.c diff -c tk-1.3/tkWindow.c tk/tkWindow.c *** tk-1.3/tkWindow.c Sun Nov 3 14:07:39 1991 --- tk/tkWindow.c Fri Nov 8 12:29:12 1991 *************** *** 119,124 **** --- 119,125 ---- {"radiobutton", Tk_ButtonCmd}, {"scale", Tk_ScaleCmd}, {"scrollbar", Tk_ScrollbarCmd}, + {"text", Tk_TextCmd}, {"toplevel", Tk_FrameCmd}, {(char *) NULL, (int (*)()) NULL} };