Text Selection 99% complete, replaceSelection added

WINGs/WINGs.h

@@ -385,22 +385,17 @@ typedef struct WMInputPanel {
 
 
 
-/* WMRuler: a tabstop is a linked list of tabstops, 
-   each containing the position of the tabstop */
 
+/* WMRuler: */
 typedef struct {
-    int value;
+    unsigned int *tabs;     /* a growable array of tabstops */
-    struct WMTabStops *next;
+    unsigned short ntabstops:4; /* how many there are */
-} WMTabStops;
+    unsigned short left:15; /* left margin marker */
-
+    unsigned short right:15;    /* right margin marker */
-/* All indentation and tab markers are _relative_ to the left margin marker */
+    unsigned short first:15;    /* indentation marker for first line only */
-typedef struct {
+    unsigned short body:15; /* body indentation marker */
-    int left;		 /* left margin marker */
-    int right;		 /* right margin marker */
-    int first;		 /* indentation marker for first line only */
-    int body;		 /* body indentation marker */
-    WMTabStops *tabs;
 } WMRulerMargins;
+/* All indentation and tab markers are _relative_ to the left margin marker */
 
 
 typedef void *WMHandlerID;
@@ -1457,17 +1452,17 @@ void WMPrependTextStream(WMText *tPtr, char *text);
 
 void WMAppendTextStream(WMText *tPtr, char *text);
 
-/* free the returned text */
+/* free the text */
 char * WMGetTextStream(WMText *tPtr);
 
-/* destroy the bag */
+/* free the text */
-WMBag * WMGetTextStreamObjects(WMText *tPtr);
-
-/* free the returned text */
 char * WMGetTextSelected(WMText *tPtr);
 
 /* destroy the bag */
-WMBag * WMGetTextSelectedObjects(WMText *tPtr);
+WMBag * WMGetTextStreamIntoBag(WMText *tPtr);
+
+/* destroy the bag */
+WMBag * WMGetTextSelectedIntoBag(WMText *tPtr);
 
 void *WMCreateTextBlockWithObject(WMWidget *w, char *description,
     WMColor *color, unsigned short first, unsigned short reserved);
@@ -1480,11 +1475,11 @@ void *WMCreateTextBlockWithText(char *text, WMFont *font,
     
 void WMSetTextBlockProperties(void *vtb, unsigned int first,
     unsigned int kanji, unsigned int underlined, int script,
-    unsigned int marginN);
+	WMRulerMargins margins);
     
 void WMGetTextBlockProperties(void *vtb, unsigned int *first,
     unsigned int *kanji, unsigned int *underlined, int *script,
-    unsigned int *marginN);
+	WMRulerMargins *margins);
 
 void WMSetTextSelectionColor(WMText *tPtr, WMColor *color);
 

WINGs/testtext.c

@@ -65,7 +65,7 @@ mystrcasecmp(const unsigned char *s1, const unsigned char *s2)
 {
 	if (!*s1 || !*s2) return 0;
 	while (*s2 != '\0') {
-		if (TOLOWER (*s1) != TOLOWER (*s2)) 
+		if (TOLOWER (*s1) != TOLOWER (*s2)) /* true if *s1 == 0 ! */
 			return 0;
 		s1++;
 		s2++;
@@ -79,6 +79,7 @@ typedef struct _currentFormat {
 	WMBag *colors;
 	WMColor *ccolor;
 	WMFont *cfont;
+	WMRulerMargins margins;
 	//WMBag *aligns; // for tables...
 	/* the following are "nested" 
 		i.e.:  <b><b><i></b><b></i>   
@@ -133,7 +134,6 @@ void parseToken(WMText *tPtr, char *token, short tk)
 	/* nice and fast for small tokens... no need for too much brain 
 		power here */
 		switch(TOLOWER(*token)) {
-
 			case 'i': 
 				if(!mode) {
 					cfmt.cfont = WMGetFontItalic(scr, cfmt.cfont);
@@ -145,7 +145,6 @@ void parseToken(WMText *tPtr, char *token, short tk)
 			 		cfmt.cfont = (WMFont *)WMGetFromBag(cfmt.fonts,
 						WMGetBagItemCount(cfmt.fonts)-1); 
 				} break;
-
 			case 'b': 
 				if(!mode) {
 					cfmt.cfont = WMGetFontBold(scr, cfmt.cfont);
@@ -161,8 +160,8 @@ void parseToken(WMText *tPtr, char *token, short tk)
 				cfmt.first = True;
 				tb = WMCreateTextBlockWithText(NULL, cfmt.cfont, 	
 					cfmt.ccolor, cfmt.first, 0);
-				WMSetTextBlockProperties(tb, cfmt.first, False, (cfmt.u?1:0), 0, 0);
+				WMSetTextBlockProperties(tb, cfmt.first, False, (cfmt.u?1:0), 0, cfmt.margins);
-				WMAppendTextBlock(tPtr, tb);
+				//WMAppendTextBlock(tPtr, tb);
 				cfmt.first = False;
 				break;
 			case 'u': cfmt.u = !mode; break;
@@ -195,7 +194,7 @@ void parseToken(WMText *tPtr, char *token, short tk)
 				switch(TOLOWER(*token)) {
 				case 's': 		
 				if(TOLOWER(*(1+token)) == 'r' && TOLOWER(*(2+token)) == 'c') {
-				mark = (char *)strchr(token, '='); 
+				mark = strchr(token, '='); 
 				if(mark) {
 				char img[256], *iptr;
 				token = mark+1;
@@ -208,7 +207,7 @@ void parseToken(WMText *tPtr, char *token, short tk)
 					tb = WMCreateTextBlockWithPixmap(pixmap, 
 						iptr, cfmt.ccolor, cfmt.first, 0);
 					WMSetTextBlockProperties(tb, cfmt.first, 
-						False, (cfmt.u?1:0), 0, 0);
+						False, (cfmt.u?1:0), 0, cfmt.margins);
 					WMAppendTextBlock(tPtr, tb);
 					cfmt.first = False;
 				}
@@ -291,29 +290,42 @@ void HTMLParser(WMWidget *w, void *clientData)
 		init = 0;
 	}
 
+#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 */
+		cfmt.para = (cfmt.actions.createParagraph) (cfmt.fmargin, cfmt.bmargin, 
+			WMWidgetWidth(tPtr)-30, NULL, 0, cfmt.align);
+		(cfmt.actions.insertParagraph) (tPtr, cfmt.para, cfmt.type);
+		return;
+	}   
+#endif
+
+
+/*
+*/
 
 	while( (c=*(stream++))) {
+//printf("%c", c);
 		if(c == '\n' || c =='\t')
 			//c = ' '; //continue;
 			continue;
-
 		if(c == ' ') {
 			if(wasspace) 
 				continue;
 			wasspace = 1;
-		} else 
+		}else wasspace = 0;
-			wasspace = 0;
 
 		if(c == '<'  && !mode) { 
-			mode = 1;
+			mode=1;
-
 			if(textlen>0) { 
 				text[textlen] = 0;
 				tb = WMCreateTextBlockWithText(text, cfmt.cfont,
 					 cfmt.ccolor, cfmt.first, textlen);
-				WMSetTextBlockProperties(tb, cfmt.first, False, (cfmt.u?1:0), 0, 0);
+				WMSetTextBlockProperties(tb, cfmt.first, False, (cfmt.u?1:0), 0, cfmt.margins);
 				WMAppendTextBlock(tPtr, tb);
 				cfmt.first = False;
+//printf("%s\n", text);
 			}
 			textlen = 0;
 		} else if(c == '>' && mode) {
@@ -338,7 +350,7 @@ void HTMLParser(WMWidget *w, void *clientData)
 			(WMColor *)WMGetFromBag(cfmt.colors,
 				WMGetBagItemCount(cfmt.colors)-1), 
 			cfmt.first, textlen);
-		WMSetTextBlockProperties(tb, cfmt.first, False, (cfmt.u?1:0), 0, 0);
+		WMSetTextBlockProperties(tb, cfmt.first, False, (cfmt.u?1:0), 0, cfmt.margins);
 		WMAppendTextBlock(tPtr, tb);
 		cfmt.first = False;
 	}
@@ -399,9 +411,9 @@ main(int argc, char **argv)
 	WMSetTextUsesMonoFont(text, !True);
 	WMSetTextParser(text, HTMLParser);
 #if 0
+	WMShowTextRuler(text, True);
 	WMSetTextUseFixedPitchFont(text, False);
 	WMSetTextHasRuler(text, True);
-	WMShowTextRuler(text, True);
 	WMSetTextHasVerticalScroller(text, True);
 	//WMSetTextHasHorizontalScroller(text, True);
 	WMFreezeText(text);
@@ -472,7 +484,8 @@ interesting widgets like this list widget: ");
 		tb = WMCreateTextBlockWithObject(te, "{a text object}", 
 			WMBlackColor(scr), False, 0);
 		WMAppendTextBlock(text, tb);
-		WMSetTextHasVerticalScroller(te, False);
+		WMSetTextHasVerticalScroller(te, True);
+		WMSetTextHasHorizontalScroller(te, True);
     	WMRefreshText(te, 0, 0);
 	}
 

WINGs/wruler.c

@@ -1,5 +1,5 @@
 /*
- *  WINGs WMRuler nifty ruler widget for WINGs  (OK, for WMText ;-) 
+ *  WINGs WMRuler: nifty ruler widget for WINGs :-) 
  *
  *  Copyright (c) 1999-2000 Nwanua Elumeze
  *
@@ -42,11 +42,13 @@ typedef struct W_Ruler {
     Pixmap drawBuffer;
 
     struct {
-	unsigned int buttonPressed:1;
         unsigned int whichMarker:3;
         /*    0,    1,     2,     3,    4,       5,            6 */
         /* none, left, right, first, body, tabstop, first & body */
-	unsigned int RESERVED:28;
+
+        unsigned int buttonPressed:1;
+        unsigned int redraw:1;
+        unsigned int RESERVED:27;
     } flags;
 } Ruler;
 
@@ -154,8 +156,12 @@ static void drawBodyMarker(Ruler * rPtr)
 
 static void createDrawBuffer(Ruler * rPtr)
 {
+    if(!rPtr->view->flags.realized)
+        return;
+
     if (rPtr->drawBuffer)
     XFreePixmap(rPtr->view->screen->display, rPtr->drawBuffer);
+
     rPtr->drawBuffer = XCreatePixmap(rPtr->view->screen->display,
               rPtr->view->window, rPtr->view->size.width, 40,
                      rPtr->view->screen->depth);
@@ -171,8 +177,9 @@ static void drawRulerOnPixmap(Ruler * rPtr)
     int marks[9] =
     {11, 3, 5, 3, 7, 3, 5, 3};
 
-    if (!rPtr->drawBuffer)
+    if (!rPtr->drawBuffer || !rPtr->view->flags.realized)
-	createDrawBuffer(rPtr);
+        return;
+        
 
     XFillRectangle(rPtr->view->screen->display, rPtr->drawBuffer,
            rPtr->bg, 0, 0, rPtr->view->size.width, 40);
@@ -209,6 +216,8 @@ static void drawRulerOnPixmap(Ruler * rPtr)
     drawRightMarker(rPtr);
     drawFirstMarker(rPtr);
     drawBodyMarker(rPtr);
+
+    rPtr->flags.redraw = False;
 }
 
 
@@ -216,9 +225,11 @@ static void paintRuler(Ruler * rPtr)
 {
     WMScreen *screen = rPtr->view->screen;
 
-    if (1 || !rPtr->drawBuffer) {
+    if (!rPtr->drawBuffer || !rPtr->view->flags.realized)
+        return;
+
+    if (rPtr->flags.redraw)
         drawRulerOnPixmap(rPtr);
-    }
     XCopyArea(rPtr->view->screen->display, rPtr->drawBuffer,
       rPtr->view->window, rPtr->bg, 0, 0, rPtr->view->size.width, 40,
           0, 0);
@@ -312,6 +323,16 @@ static int whichMarker(Ruler * rPtr, int x, int y)
     return 0;
 }
 
+static void rulerDidResize(W_ViewDelegate * self, WMView * view)
+{
+    Ruler *rPtr = (Ruler *) view->self;
+
+    createDrawBuffer(rPtr);
+    rPtr->flags.redraw = True;
+    paintRuler(rPtr);
+
+}
+
 
 static void handleEvents(XEvent * event, void *data)
 {
@@ -320,7 +341,7 @@ static void handleEvents(XEvent * event, void *data)
 
     switch (event->type) {
       case Expose:
-	  paintRuler(rPtr);
+        rulerDidResize(rPtr->view->delegate, rPtr->view); 
       break;
 
       case MotionNotify:
@@ -331,6 +352,7 @@ static void handleEvents(XEvent * event, void *data)
 
           if (rPtr->moveAction)
               (rPtr->moveAction) (rPtr, rPtr->clientData);
+          rPtr->flags.redraw = True;
           paintRuler(rPtr);
           XSetLineAttributes(rPtr->view->screen->display, gc, 1,
                      LineSolid, CapNotLast, JoinMiter);
@@ -362,6 +384,7 @@ static void handleEvents(XEvent * event, void *data)
             rPtr->margins.first -= change;
             rPtr->margins.body -= change;
             rPtr->margins.left = rPtr->motion;
+            rPtr->flags.redraw = True;
             paintRuler(rPtr);
             break;
         }
@@ -385,15 +408,6 @@ static void handleEvents(XEvent * event, void *data)
     }
 }
 
-static void rulerDidResize(W_ViewDelegate * self, WMView * view)
-{
-    Ruler *rPtr = (Ruler *) view->self;
-
-    createDrawBuffer(rPtr);
-    paintRuler(rPtr);
-
-}
-
 
 W_ViewDelegate _RulerViewDelegate =
 {
@@ -406,7 +420,7 @@ W_ViewDelegate _RulerViewDelegate =
 
 
 WMRuler *
- WMCreateRuler(WMWidget * parent)
+WMCreateRuler(WMWidget * parent)
 {
     Ruler *rPtr = wmalloc(sizeof(Ruler));
     unsigned int w = WMWidgetWidth(parent);
@@ -416,10 +430,12 @@ WMRuler *
     rPtr->widgetClass = WC_Ruler;
 
     rPtr->view = W_CreateView(W_VIEW(parent));
+
     if (!rPtr->view) {
         free(rPtr);
         return NULL;
     }
+
     rPtr->view->self = rPtr;
 
     rPtr->drawBuffer = (Pixmap) NULL;
@@ -442,9 +458,11 @@ WMRuler *
     rPtr->margins.body = 22;
     rPtr->margins.first = 42;
     rPtr->margins.right = (w < 502 ? w : 502);
+    rPtr->margins.tabs = NULL;
 
     rPtr->flags.whichMarker = 0;    /* none */
     rPtr->flags.buttonPressed = False;
+    rPtr->flags.redraw = True;
 
     rPtr->moveAction = NULL;
     rPtr->releaseAction = NULL;
@@ -464,6 +482,7 @@ void WMSetRulerMargins(WMRuler * rPtr, WMRulerMargins margins)
     rPtr->margins.first = margins.first + rPtr->offset;
     rPtr->margins.body = margins.body + rPtr->offset;
     rPtr->margins.tabs = margins.tabs;    /*for loop */
+    rPtr->flags.redraw = True;
     paintRuler(rPtr);
 
 }
@@ -474,8 +493,11 @@ WMGetRulerMargins(WMRuler * rPtr)
 {
     WMRulerMargins margins;
 
-    if (!rPtr)
+    if (!rPtr) { 
+        margins.first = margins.body = margins.left = 0;
+        margins.right = 100;
         return margins;
+    }
 
     margins.left = rPtr->margins.left - rPtr->offset;
     margins.right = rPtr->margins.right - rPtr->offset;