changes to wmtext

WINGs/WINGs.h

@@ -193,17 +193,6 @@ enum {
 };
 
 
-typedef enum {
-    WRulerLeft=0,
-	WRulerBody, 
-	WRulerFirst, 
-	WRulerRight,
-	WRulerBoth,
-	WRulerDocLeft
-} WMRulerMarginType;
-
-
-
 /* drag operations */
 typedef enum {
     WDOperationNone,
@@ -395,16 +384,16 @@ typedef struct WMInputPanel {
 } WMInputPanel;
 
 
-/* WMRuler stuff */
-/* All indentation and tab markers are _relative_ to the left margin marker */
 
-/* a tabstop is a linked list of tabstops, each containing the position of the tabstop */
+/* WMRuler: a tabstop is a linked list of tabstops, 
+   each containing the position of the tabstop */
 
 typedef struct {
     int value;
     struct WMTabStops *next;
 } WMTabStops;
 
+/* All indentation and tab markers are _relative_ to the left margin marker */
 typedef struct {
     int left;		 /* left margin marker */
     int right;		 /* right margin marker */
@@ -414,9 +403,6 @@ typedef struct {
 } WMRulerMargins;
 
 
-
-
-
 typedef void *WMHandlerID;
 
 typedef void WMInputProc(int fd, int mask, void *clientData);
@@ -490,6 +476,26 @@ typedef struct WMTextFieldDelegate {
 } WMTextFieldDelegate;
 
 
+typedef struct WMTextDelegate {
+    void *data;
+    
+    void (*didBeginEditing)(struct WMTextDelegate *self,
+                WMNotification *notif);
+                
+    void (*didChange)(struct WMTextDelegate *self,
+              WMNotification *notif);
+              
+    void (*didEndEditing)(struct WMTextDelegate *self,
+              WMNotification *notif);
+              
+    Bool (*shouldBeginEditing)(struct WMTextDelegate *self,
+                   WMText *tPtr);
+                   
+    Bool (*shouldEndEditing)(struct WMTextDelegate *self,
+                 WMText *tPtr);
+} WMTextDelegate;
+
+
 
 typedef struct WMTabViewDelegate {
     void *data;
@@ -523,25 +529,6 @@ typedef struct WMSelectionProcs {
 } WMSelectionProcs;
 
 
-
-
-typedef void WMParseAction(WMWidget *self, void *clientData, short type);
-
-/* these are the things parsers (for text) do */
-
-typedef struct _parserActions {
-    void *(*createParagraph) (short fmargin, short bmargin,
-        short rmargin, short *tabstops, short numTabs, WMAlignment a);
-    void (*insertParagraph) (WMText *tPtr, void *para, Bool prepend);
-    void *(*createPChunk) (WMPixmap *pixmap, short script, ushort ul);
-    void *(*createTChunk) (char *text, short chars, WMFont *font, 
-        WMColor *color, short script, ushort ul);
-    void (*insertChunk) (WMText *tPtr, void *chunk, Bool prepend);
-} WMParserActions;
-
-
-
-
 typedef struct W_DraggingInfo WMDraggingInfo;
 
 
@@ -805,10 +792,6 @@ void WMUnmapWidget(WMWidget *w);
 
 void WMMapWidget(WMWidget *w);
 
-void WMRaiseWidget(WMWidget *w);
-
-void WMLowerWidget(WMWidget *w);
-
 void WMMoveWidget(WMWidget *w, int x, int y);
 
 void WMResizeWidget(WMWidget *w, unsigned int width, unsigned int height);
@@ -980,8 +963,6 @@ void WMSetLabelImage(WMLabel *lPtr, WMPixmap *image);
 
 WMPixmap *WMGetLabelImage(WMLabel *lPtr);
 
-char *WMGetLabelText(WMLabel *lPtr);
-
 void WMSetLabelImagePosition(WMLabel *lPtr, WMImagePosition position);
 	
 void WMSetLabelTextAlignment(WMLabel *lPtr, WMAlignment alignment);
@@ -1410,7 +1391,7 @@ WMRuler *WMCreateRuler (WMWidget *parent);
 
 void WMShowRulerTabs(WMRuler *rPtr, Bool Show);
 
-int WMGetRulerMargin(WMRuler *rPtr, int which);
+WMRulerMargins WMGetRulerMargins(WMRuler *rPtr);
 
 void WMSetRulerMargins(WMRuler *rPtr, WMRulerMargins margins);
 
@@ -1430,71 +1411,80 @@ void WMSetRulerReleaseAction(WMRuler *rPtr, WMAction *action, void *clientData);
 
 WMText *WMCreateText(WMWidget *parent);
 
-int WMGetTextParagraphs(WMText *tPtr);
-int WMGetTextCurrentParagraph(WMText *tPtr);
-void WMSetTextCurrentParagraph(WMText *tPtr, int current);
-void WMRemoveTextParagraph(WMText *tPtr, int which);
-
-int WMGetTextChunks(WMText *tPtr);
-int WMGetTextCurrentChunk(WMText *tPtr);
-void WMRemoveTextChunk(WMText *tPtr, int which);
-void WMSetTextCurrentChunk(WMText *tPtr, int current);
-
-void W_InsertText(WMText *tPtr, void *data, Bool prepend);
-#define WMAppendTextStream(t, d) W_InsertText(t, d, False)
-#define WMPrependTextStream(t, d) W_InsertText(t, d, True)
-
-
-void WMSetTextParser(WMText *tPtr, WMParseAction *parser);
-WMParserActions WMGetTextParserActions(WMText *tPtr);
-#if 0
-typedef enum {
-	WDPCreateParagraph=0, 
-	WDPInsertParagraph=1,
-	WDPCreateText=2,
-	WDPCreateImage=3,
-	WDPInsertChunk
-} WMDoParse;
-void WMDoTextParse(WMText *tPtr, short action);
-#endif
-
-char * WMGetTextAll(WMText *tPtr);
-void WMSetTextWriter(WMText *tPtr, WMParseAction *writer);
-
-void WMSetTextHasHorizontalScroller(WMText *tPtr, Bool flag);
-void WMSetTextHasVerticalScroller(WMText *tPtr, Bool flag);
-
 void WMRefreshText(WMText *tPtr, int vpos, int hpos);
+
 void WMFreezeText(WMText *tPtr); 
+
 void WMThawText(WMText *tPtr);
 
-void WMSetTextMonoFont(WMText *tPtr, Bool mono);
-Bool WMGetTextMonoFont(WMText *tPtr);
-void WMSetTextEditable(WMText *tPtr, Bool editable);
-Bool WMGetTextEditable(WMText *tPtr);
-void WMForceTextFocus(WMText *tPtr);
-
-void WMSetTextAlignment(WMText *tPtr, WMAlignment alignment);
-void WMIgnoreTextNewline(WMText *tPtr, Bool ignore);
-
-
 Bool WMScrollText(WMText *tPtr, int amount);
-Bool WMPageText(WMText *tPtr, Bool scrollUp);
 
+Bool WMPageText(WMText *tPtr, Bool direction);
+
+void WMSetTextHasHorizontalScroller(WMText *tPtr, Bool shouldhave);
+
+void WMSetTextHasVerticalScroller(WMText *tPtr, Bool shouldhave);
+
+void WMSetTextHasRuler(WMText *tPtr, Bool shouldhave);
 
 void WMShowTextRuler(WMText *tPtr, Bool show);
-Bool WMGetTextRulerShown(WMText *tPtr);
-void WMShowTextRulerTabs(WMText *tPtr, Bool show);
-void WMSetTextRulerMargin(WMText *tPtr, char which, short pixels);
-short WMGetTextRulerMargin(WMText *tPtr, char which);
 
-void WMSetTextUseFixedPitchFont(WMText *tPtr, Bool fixed);
+void WMSetTextUseMonoFont(WMText *tPtr, Bool mono);
-void WMSetTextDefaultColor(WMText *tPtr, WMColor *color);
+
+int WMGetTextUsesMonoFont(WMText *tPtr);
+
 void WMSetTextDefaultFont(WMText *tPtr, WMFont *font);
-void WMSetTextDefaultAlignment(WMText *tPtr, WMAlignment alignment);
+
+WMFont * WMGetTextDefaultFont(WMText *tPtr);
+
+void WMSetTextRelief(WMText *tPtr, WMReliefType relief);
+
+void WMSetTextForegroundColor(WMText *tPtr, WMColor *color);
+
 void WMSetTextBackgroundColor(WMText *tPtr, WMColor *color);
 
+void WMPrependTextStream(WMText *tPtr, char *text);
 
+void WMAppendTextStream(WMText *tPtr, char *text);
+
+WMData * WMGetTextSelected(WMText *tPtr);
+
+void *WMCreateTextBlockWithObject(WMWidget *w, char *description,
+    WMColor *color, unsigned short first, unsigned short reserved);
+    
+void *WMCreateTextBlockWithText(char *text, WMFont *font,
+    WMColor *color, unsigned short first, unsigned short length);
+    
+void WMSetTextBlockProperties(void *vtb, unsigned int first,
+    unsigned int kanji, unsigned int underlined, int script,
+    unsigned int marginN);
+    
+void WMGetTextBlockProperties(void *vtb, unsigned int *first,
+    unsigned int *kanji, unsigned int *underlined, int *script,
+    unsigned int *marginN);
+    
+
+/* parser related stuff... see how it can be done in testtext.c */
+
+void WMSetTextParser(WMText *tPtr, WMAction *parser);
+
+void WMSetTextWriter(WMText *tPtr, WMAction *writer);
+
+int WMGetTextInsertType(WMText *tPtr);
+
+int WMGetTextBlocks(WMText *tPtr);
+
+void WMSetCurrentTextBlock(WMText *tPtr, int current);
+
+int WMGetCurrentTextBlock(WMText *tPtr); 
+
+void WMPrependTextBlock(WMText *tPtr, void *vtb);
+
+void WMAppendTextBlock(WMText *tPtr, void *vtb);
+
+void *WMRemoveTextBlock(WMText *tPtr);
+
+void WMDestroyTextBlock(WMText *tPtr, void *vtb);
 
 /* ....................................................................... */
 
@@ -1528,8 +1518,6 @@ void WMSelectTabViewItemAtIndex(WMTabView *tPtr, int index);
 void WMSetTabViewDelegate(WMTabView *tPtr, WMTabViewDelegate *delegate);
 
 
-WMTabViewItem *WMCreateTabViewItem(int identifier, char *label);
-
 WMTabViewItem *WMCreateTabViewItemWithIdentifier(int identifier);
 
 int WMGetTabViewItemIdentifier(WMTabViewItem *item);

WINGs/testtext.c

@@ -1,11 +1,8 @@
-/* WINGsP.h should NEVER be included from user applications */
+#include "WINGs.h"
-#include <WINGsP.h>
+#include <stdio.h>
-#include <WINGs.h>
-#include <X11/Xlib.h>
-#include <fcntl.h>
-#include <unistd.h>
 
-#include <ctype.h>
+
+WMScreen	*scr;
 
 void
 wAbort()
@@ -14,12 +11,20 @@ wAbort()
 }
 
 
-void
+void Close(WMWidget *self, void *client)
-Close(WMWidget *self, void *client)
 {
 	exit(0);
 }
 
+extern WMFont * WMGetFontPlain(WMScreen *scrPtr, WMFont *font);
+
+extern WMFont * WMGetFontBold(WMScreen *scrPtr, WMFont *font);
+
+extern WMFont * WMGetFontItalic(WMScreen *scrPtr, WMFont *font);
+
+extern WMFont * WMGetFontOfSize(WMScreen *scrPtr, WMFont *font, int size);
+
+
 
 
 /* =============== a rudimentary HTML parser ======================= */
@@ -70,12 +75,10 @@ mystrcasecmp(const unsigned char *s1, const unsigned char *s2)
 	 
 
 typedef struct _currentFormat {
-    void *para;
 	WMBag *fonts;
 	WMBag *colors;
 	WMColor *ccolor;
 	WMFont *cfont;
-    WMParserActions actions;
 	//WMBag *aligns; // for tables...
 	/* the following are "nested" 
 		i.e.:  <b><b><i></b><b></i>   
@@ -112,11 +115,12 @@ getArg(char *t, short type, void *arg)
 }
 #endif
 	
-void
+void parseToken(WMText *tPtr, char *token, short tk)
-parseToken(WMText *tPtr, char *token, short tk)
 {
 	short mode=0; /* 0 starts, 1 closes */
-    WMScreen	*scr = (W_VIEW(tPtr))->screen;
+	int first = True;
+	void *tb= NULL;
+	int prepend = WMGetTextInsertType(tPtr);
 
 	while(*token && isspace(*(token))) token++;
 	if(*token == '/') {
@@ -152,20 +156,17 @@ parseToken(WMText *tPtr, char *token, short tk)
 						WMGetBagItemCount(cfmt.fonts)-1); 
 				} break;
 			case 'p': 
-            cfmt.para = (cfmt.actions.createParagraph) (cfmt.fmargin, cfmt.bmargin,
+				first = True;
-                                                        WMWidgetWidth(tPtr)-30, NULL, 0, cfmt.align);
+				tb = WMCreateTextBlockWithText(NULL, cfmt.cfont, 	
-            (cfmt.actions.insertParagraph) (tPtr, cfmt.para, cfmt.type);
+					cfmt.ccolor, first, 0);
-            cfmt.para = (cfmt.actions.createParagraph) (cfmt.fmargin, cfmt.bmargin,
+				WMSetTextBlockProperties(tb, first, False, (cfmt.u?1:0), 0, 0);
-                                                        WMWidgetWidth(tPtr)-30, NULL, 0, cfmt.align);
+				WMAppendTextBlock(tPtr, tb);
-            (cfmt.actions.insertParagraph) (tPtr, cfmt.para, cfmt.type);
 				break;
 			case 'u': cfmt.u = !mode; break;
 		}
 	} else { /* the <HTML> tag is, as far as I'm concerned, useless */
 		if(mystrcasecmp(token, "br")) {
-            cfmt.para = (cfmt.actions.createParagraph) (cfmt.fmargin, cfmt.bmargin,
+				first = True;
-                                                        WMWidgetWidth(tPtr)-30, NULL, 0, cfmt.align);
-            (cfmt.actions.insertParagraph) (tPtr, cfmt.para, cfmt.type);
 		}
 		else if(mystrcasecmp(token, "ul")) {
 			if(mode) { 
@@ -176,16 +177,16 @@ parseToken(WMText *tPtr, char *token, short tk)
 				cfmt.fmargin = cfmt.bmargin-10;
 			} else cfmt.fmargin = cfmt.bmargin = 0;
 		} else if(mystrcasecmp(token, "li")) {
-            cfmt.para = (cfmt.actions.createParagraph) (cfmt.fmargin, cfmt.bmargin,
+				first = True;
-                                                        WMWidgetWidth(tPtr)-30, NULL, 0, cfmt.align);
+//change margins... create a new margin....
-            (cfmt.actions.insertParagraph) (tPtr, cfmt.para, cfmt.type);
+			//(cfmt.fmargin, cfmt.bmargin, 
 		} else if(mystrcasecmp(token, "align"))
 			;//printf("align");
 		else if(mystrcasecmp(token, "img"))  {
 			if(!mode) {
 				char *mark=NULL;
 				WMPixmap *pixmap; 
-                void *chunk;
+				WMLabel *l;
 				token+=3;
 				while(isspace(*(token))) token++;
 				do { 
@@ -201,8 +202,18 @@ parseToken(WMText *tPtr, char *token, short tk)
 				iptr = img;
 				 if(*img == '\"') { img[strlen(img)-1] = 0; iptr++;}
 				pixmap = WMCreatePixmapFromFile(scr, iptr);
-                                chunk = (cfmt.actions.createPChunk)(pixmap, 0, False);
+				if(pixmap) {
-                                (cfmt.actions.insertChunk) (tPtr, chunk, False);
+					l = WMCreateLabel(tPtr);
+					WMResizeWidget(l, 48, 48);
+					WMSetLabelRelief(l, WRFlat);
+					WMSetLabelImagePosition(l, WIPImageOnly);
+					WMSetLabelImage(l, pixmap); 
+					tb = WMCreateTextBlockWithObject(l, 
+						iptr, cfmt.ccolor, first, 0);
+					WMSetTextBlockProperties(tb, first, 
+						False, (cfmt.u?1:0), 0, 0);
+					WMAppendTextBlock(tPtr, tb);
+				}
 				printf("[%s]\n", iptr);
 				} } break; } } while(*(token++));
 			} 	
@@ -220,9 +231,8 @@ parseToken(WMText *tPtr, char *token, short tk)
 printf("center\n");
 			if(mode) cfmt.align = WALeft;
 			else cfmt.align = WACenter;
-            cfmt.para = (cfmt.actions.createParagraph) (cfmt.fmargin, cfmt.bmargin,
+				first = True;
-                                                        WMWidgetWidth(tPtr)-30, NULL, 0, cfmt.align);
+//change margins...
-            (cfmt.actions.insertParagraph) (tPtr, cfmt.para, cfmt.type);
 		}
 	}
 		
@@ -251,32 +261,29 @@ parseToken(WMText *tPtr, char *token, short tk)
 	//printf("parse token  (%s)[%s]\n", mode?"close":"open", token); 
 }
 	
-void
+void HTMLParser(WMWidget *w, void *clientData)
-HTMLParser(WMWidget *w, void *clientData, short type)
 {
 	static short init=1;  /* have we been here at least once before? */
     char *stream = (char *) clientData;
 	WMText *tPtr = (WMText *)w;
-    WMScreen	*scr;
+	void *tb = NULL;
-    void *chunk;
 	char c;
 	#define MAX_TOKEN_SIZE 255
 	char token[MAX_TOKEN_SIZE+1];
 	#define MAX_TEXT_SIZE 1023
 	char text[MAX_TEXT_SIZE+1];
 	short mode=0;
-    short tk=0, txt=0;
+	short tk=0, textlen=0;
 	short wasspace=0;
+	int first = False;
 
     if(!tPtr || !stream)
         return;
 
-    scr = (W_VIEW(tPtr))->screen;
+	cfmt.type = WMGetTextInsertType(tPtr);
-    cfmt.type = type;
+	if(1||init) {
-    if(init) {
-        cfmt.actions = WMGetTextParserActions(tPtr);
 		cfmt.fonts = WMCreateBag(4); /* there sould always be at least 1 font... */
-        cfmt.cfont = WMSystemFontOfSize(scr, 12);
+		cfmt.cfont = WMGetTextDefaultFont(tPtr);
 		WMPutInBag(cfmt.fonts, (void *)cfmt.cfont);
 		cfmt.colors = WMCreateBag(4);
 		cfmt.ccolor = WMBlackColor(scr);
@@ -284,13 +291,10 @@ HTMLParser(WMWidget *w, void *clientData, short type)
 		cfmt.i = cfmt.b = cfmt.u = cfmt.ul = 0;
 		cfmt.align = WALeft;
 		cfmt.fmargin = cfmt.bmargin = 0;
-        cfmt.para = (cfmt.actions.createParagraph) (cfmt.fmargin, cfmt.bmargin,
-                                                    WMWidgetWidth(tPtr)-30, NULL, 0, cfmt.align);
-        (cfmt.actions.insertParagraph) (tPtr, cfmt.para, cfmt.type);
 		init = 0;
 	}
 
-#if 1
+#if 0
 	if(strlen(stream) == 1 && stream[0] == '\n') { 
 		/* sometimes if the text entered is a single char AND is a newline, 
 			the user prolly typed it */
@@ -318,14 +322,15 @@ HTMLParser(WMWidget *w, void *clientData, short type)
 
 		if(c == '<'  && !mode) { 
 			mode=1;
-            if(txt>0) {
+			if(textlen>0) { 
-                text[txt] = 0;
+				text[textlen] = 0;
-                chunk = (cfmt.actions.createTChunk)(text, txt, cfmt.cfont,
+				tb = WMCreateTextBlockWithText(text, cfmt.cfont,
-                                                    cfmt.ccolor, 0, (cfmt.u?1:0));
+					 cfmt.ccolor, first, textlen);
-                (cfmt.actions.insertChunk) (tPtr, chunk, cfmt.type);
+				WMSetTextBlockProperties(tb, first, False, (cfmt.u?1:0), 0, 0);
+				WMAppendTextBlock(tPtr, tb);
 //printf("%s\n", text);
 			}
-            txt = 0;
+			textlen = 0;
 		} else if(c == '>' && mode) {
 			token[tk] = 0;
 			if(tk>0) parseToken(tPtr, token, tk);
@@ -334,21 +339,22 @@ HTMLParser(WMWidget *w, void *clientData, short type)
 		} else {
 			if(mode) {
 				if(tk < MAX_TOKEN_SIZE) token[tk++] = c;
-            } else if(txt < MAX_TEXT_SIZE) text[txt++] = c;
+			} else if(textlen < MAX_TEXT_SIZE) text[textlen++] = c;
 		}
 	}
 
 	if(tk>0) { token[tk] = 0; parseToken(tPtr, token, tk);}
-    if(txt>0) {
+	if(textlen>0) {
-        text[txt] = 0;
+		text[textlen] = 0;
 		//printf("%s\n", text);
-        chunk = (cfmt.actions.createTChunk)(text, txt,
+		tb = WMCreateTextBlockWithText(text, 
 			(WMFont *)WMGetFromBag(cfmt.fonts, 
 				WMGetBagItemCount(cfmt.fonts)-1), 
 			(WMColor *)WMGetFromBag(cfmt.colors,
 				WMGetBagItemCount(cfmt.colors)-1), 
-                                            0, (cfmt.u?1:0));
+			first, textlen);
-        (cfmt.actions.insertChunk) (tPtr, chunk, cfmt.type);
+		WMSetTextBlockProperties(tb, first, False, (cfmt.u?1:0), 0, 0);
+		WMAppendTextBlock(tPtr, tb);
 	}
 		
 }
@@ -356,43 +362,32 @@ HTMLParser(WMWidget *w, void *clientData, short type)
 
 /* ================= the driver ================== */
 
-WMWidget *win;
+static void
-WMText *text;
+buttonPressCB(WMWidget *w, void *client)
-
-void
-NotificationObserver(void *self, WMNotification *notif)
 {
-    void *object = WMGetNotificationObject(notif);
+	WMText *tPtr = (WMText *)client;
-    unsigned short w = WMWidgetWidth(win);
+	WMAppendTextStream(tPtr, NULL);
-    unsigned short h = WMWidgetHeight(win);
+	WMAppendTextStream(tPtr, 
-
+		"<p><b>You</b> just <i>had</i> to press that button, didn't you? "
-    if (WMGetNotificationName(notif) == WMViewSizeDidChangeNotification) {
+		"Well, this sort of thing is bound to happen when you go about "
-        if (object == WMWidgetView(win)) {
+		" pressing buttons :-)"
-            WMResizeWidget(text, w-20, h-20);
+		"<p><p>Cheers, <p><p><u>Nwanua</u>"); 
-        }
+	WMRefreshText(tPtr, 0, 0);
-    }
-
-    {static int i=0;
-        switch(i++) {
-        case 0: WMSetTextHasHorizontalScroller(text, False); break;
-        case 1: WMSetTextHasVerticalScroller(text, False); break;
-        case 2: WMSetTextHasVerticalScroller(text, True); break;
-        case 3: WMSetTextHasHorizontalScroller(text, True); break;
-        default: i=0;
-        }
-    }
 }
 
 int
 main(int argc, char **argv)
 {
 	Display		*dpy;
-    WMScreen	*scr;
+	WMWidget		*win;
+	WMText 		*text;
+	WMRulerMargins margins;
+	void *tb = NULL;
 
 
 	WMInitializeApplication("WMText", &argc, argv);
 	dpy = XOpenDisplay(NULL);
-    if(!dpy) exit(1);
+	if(!dpy) { printf("no display? *sniff*  :~( "); exit(1);}
 
 	scr = WMCreateSimpleApplicationScreen(dpy);
 
@@ -405,31 +400,155 @@ main(int argc, char **argv)
 
 	text = WMCreateText(win);
 	WMRealizeWidget(text);
+	//WMSetTextHasHorizontalScroller(text, True);
 	WMResizeWidget(text, 480, 280);
 	WMMoveWidget(text, 10, 10);
-    WMSetTextUseFixedPitchFont(text, False);
+	WMSetTextRelief(text, WRSunken);
-    WMSetTextMonoFont(text, False);
+	WMSetTextHasVerticalScroller(text, True);
+	WMSetTextUseMonoFont(text, !True);
 	WMSetTextParser(text, HTMLParser);
+#if 0
+	WMSetTextUseFixedPitchFont(text, False);
+	WMSetTextHasRuler(text, True);
+	WMShowTextRuler(text, True);
+	WMSetTextHasVerticalScroller(text, True);
+	//WMSetTextHasHorizontalScroller(text, True);
 	WMSetTextEditable(text, True);
 	WMFreezeText(text);
-    if(1){
+#endif
-        FILE *f = fopen("./wm.html", "r");
+
-        char data[1024];
+	//margins = WMGetTextRulerMargins(text);
-        if(f) {
+
-            while(fgets(data, 1022,f))
+
-                WMAppendTextStream(text, data);
+
-            fclose(f);
+
-        } else {
+	WMAppendTextStream(text, 
-            WMAppendTextStream(text, "<i>can't</i> open the <u>wm.html</u> file, but here's a <B>text <I>stream <img src=foo.bar></I><BR>that</B> <U>needs</U> parsing");
+"<p><img src=logo.xpm></i> \
+<b><i>WINGs</b></i> is a <i>small</i> widget set with \
+a <u>very</u> nice look and feel. Its API is <i>inspired</i> \
+and its implementation borrows some ideas from interesting places.\
+<p><p>
+The library is limited and its design is a little sloppy, \
+so it's not intended to build large or complex applications, just 
+<i>small</i> and complex ones. <b>:-)</b>\
+<p><p> Apart from the usual buttons and labels, it has some \
+interesting widgets like this list widget: ");
+
+	{
+		WMList *list = WMCreateList(text);
+		char t[20];
+		int i;
+		
+		WMResizeWidget(list, 60, 60);
+		for (i=0; i<7; i++) {
+		    sprintf(t, "Item %i", i);
+		    WMAddListItem(list, t);
 	    }
+
+		tb = WMCreateTextBlockWithObject(list, "{a list object or somesuch}", 
+			WMBlackColor(scr), False, 0);
+		WMAppendTextBlock(text, tb);
+    
 	}
 
 
-    //WMPrependTextStream(text, "this is prepended\n");
+	WMAppendTextStream(text, "  a colour well such as this one: ");
-    //WMAppendTextStream(text, "blueplanet.rtf");
+	{
+		WMColorWell *well;
+		well = WMCreateColorWell(text);
+		WMResizeWidget(well, 60, 40);
+		WMSetColorWellColor(well, 
+			WMCreateRGBColor(scr, 0, 0, 0x8888, True));
+		tb = WMCreateTextBlockWithObject(well, "{a button object}", 
+			WMBlackColor(scr), False, 0);
+		WMAppendTextBlock(text, tb);
+	}
+
+	WMAppendTextStream(text, 
+		",  as well as a text widget: ");
+
+	{
+		WMText *te = WMCreateText(text);
+		WMRealizeWidget(te);
+		WMResizeWidget(te, 120, 90);
+		WMSetTextParser(te, HTMLParser);
+		WMSetTextRelief(te, WRFlat);
+	//	WMSetTextBackgroundColor(te, WMCreateNamedColor(scr, "Red", False)); 
+		WMSetTextDefaultFont(te, WMSystemFontOfSize(scr, 10));
+		WMAppendTextStream(te, "into which you can easily embed other "
+			"<i><b>WINGs</b></i> objects (such as this one), "
+			" without breaking a sweat (type in here)");
+		tb = WMCreateTextBlockWithObject(te, "{a text object}", 
+			WMBlackColor(scr), False, 0);
+		WMAppendTextBlock(text, tb);
+		WMSetTextHasVerticalScroller(te, False);
+    	WMRefreshText(te, 0, 0);
+	}
+
+ {
+        WMText *te = WMCreateText(text);
+        WMRealizeWidget(te);
+        WMResizeWidget(te, 120, 90);
+        WMSetTextParser(te, HTMLParser);
+        WMSetTextRelief(te, WRFlat);
+    //  WMSetTextBackgroundColor(te, WMCreateNamedColor(scr, "Red", False)); 
+        WMSetTextDefaultFont(te, WMSystemFontOfSize(scr, 10));
+        WMAppendTextStream(te, "I always wanted to be able to have "
+			"a <i>multi-column</i> text editor in Unix for my reports, "
+			" now all I have to do is wait for <u>someone</u> to code it :-P");
+        tb = WMCreateTextBlockWithObject(te, "{a text object}", 
+            WMBlackColor(scr), False, 0);
+        WMAppendTextBlock(text, tb);
+        WMSetTextHasVerticalScroller(te, False);
+        WMRefreshText(te, 0, 0);
+    }
 
 
-    WMThawText(text);
+
+		
+		
+	WMAppendTextStream(text, 
+" .<p><p> Not bad eh? \
+<p><p> Since <i><b>WINGs</b></i> is \
+written in C and is sort of \
+low-level, it is \
+small and faster than say, Motif or even Athena (just you try 
+embedding and clicking on buttons");
+
+	{
+		WMButton *b = WMCreateCommandButton(text);
+		WMSetButtonText(b, "like me");
+		WMSetButtonAction(b, buttonPressCB, text);
+		WMResizeWidget(b, 60, 15);
+		tb = WMCreateTextBlockWithObject(b, "{a button object}", 
+			WMBlackColor(scr), False, 0);
+		WMAppendTextBlock(text, tb);
+	}
+
+	WMAppendTextStream(text, 
+"  with those other tool-kits :-). <p><p>Knowing Xlib will help you to \
+workaround some of its limitations, although you'll probably be able to \
+write something like a trivial tic-tac-toe game ");
+
+	{
+		WMTextField *t = WMCreateTextField(text);
+		WMInsertTextFieldText(t, "or an interesting text editor", 0);
+		WMResizeWidget(t, 160, 20);
+		WMSetTextFieldBordered(t, True);
+		WMSetTextFieldBeveled(t, True);
+		tb = WMCreateTextBlockWithObject(t, "{a textfield object}", 
+			WMGrayColor(scr), False, 0);
+		WMAppendTextBlock(text, tb);
+	}
+
+
+	WMAppendTextStream(text, " without knowing much Xlib. "
+		"<p><p>(BTW, don't  <i>press</i> that button that is <u>screeming</u>"
+		" to be pressed!");
+
+
+
+//	WMThawText(text);
     WMRefreshText(text, 0, 0);
 
 /*
@@ -441,5 +560,6 @@ main(int argc, char **argv)
 	WMMapWidget(win);
 
 	WMScreenMainLoop(scr);
+	return 0;
 }