gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-03 20:34:14 +01:00
Code Issues Projects Releases Wiki Activity

Text Selection 99% complete, replaceSelection added

Browse Source
This commit is contained in:
nwanua
2000-09-01 17:58:29 +00:00
parent f813ff12d4
commit cc3bbcaf4c
4 changed files with 2499 additions and 2188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
WINGs/WINGs.h
View File

@@ -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 { 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; } WMRulerMargins;
/* All indentation and tab markers are _relative_ to the left margin marker */
typedef void *WMHandlerID; typedef void *WMHandlerID;
@@ -1457,17 +1452,17 @@ void WMPrependTextStream(WMText *tPtr, char *text);
void WMAppendTextStream(WMText *tPtr, char *text); void WMAppendTextStream(WMText *tPtr, char *text);
/* free the returned text */ /* free the text */
char * WMGetTextStream(WMText *tPtr); char * WMGetTextStream(WMText *tPtr);
/* destroy the bag */ /* free the text */
WMBag * WMGetTextStreamObjects(WMText *tPtr);
/* free the returned text */
char * WMGetTextSelected(WMText *tPtr); char * WMGetTextSelected(WMText *tPtr);
/* destroy the bag */ /* destroy the bag */
WMBag * WMGetTextSelectedObjects(WMText *tPtr); WMBag * WMGetTextStreamIntoBag(WMText *tPtr);
/* destroy the bag */
WMBag * WMGetTextSelectedIntoBag(WMText *tPtr);
void *WMCreateTextBlockWithObject(WMWidget *w, char *description, void *WMCreateTextBlockWithObject(WMWidget *w, char *description,
WMColor *color, unsigned short first, unsigned short reserved); WMColor *color, unsigned short first, unsigned short reserved);
@@ -1480,12 +1475,12 @@ void *WMCreateTextBlockWithText(char *text, WMFont *font,
void WMSetTextBlockProperties(void *vtb, unsigned int first, void WMSetTextBlockProperties(void *vtb, unsigned int first,
unsigned int kanji, unsigned int underlined, int script, unsigned int kanji, unsigned int underlined, int script,
unsigned int marginN); WMRulerMargins margins);
void WMGetTextBlockProperties(void *vtb, unsigned int *first, void WMGetTextBlockProperties(void *vtb, unsigned int *first,
unsigned int *kanji, unsigned int *underlined, int *script, unsigned int *kanji, unsigned int *underlined, int *script,
unsigned int *marginN); WMRulerMargins *margins);
void WMSetTextSelectionColor(WMText *tPtr, WMColor *color); void WMSetTextSelectionColor(WMText *tPtr, WMColor *color);
void WMSetTextSelectionFont(WMText *tPtr, WMFont *font); void WMSetTextSelectionFont(WMText *tPtr, WMFont *font);

45
WINGs/testtext.c
View File

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

360
WINGs/wruler.c
View File

@@ -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 * Copyright (c) 1999-2000 Nwanua Elumeze
* *
@@ -26,27 +26,29 @@
typedef struct W_Ruler { typedef struct W_Ruler {
W_Class widgetClass; W_Class widgetClass;
W_View *view; W_View *view;
W_View *pview; /* the parent's view (for drawing the line) */ W_View *pview; /* the parent's view (for drawing the line) */
WMAction *moveAction; /* what to when while moving */ WMAction *moveAction; /* what to when while moving */
WMAction *releaseAction; /* what to do when released */ WMAction *releaseAction; /* what to do when released */
void *clientData; void *clientData;
GC fg, bg; GC fg, bg;
WMFont *font; WMFont *font;
WMRulerMargins margins; WMRulerMargins margins;
int offset; int offset;
int motion; /* the position of the _moving_ marker(s) */ int motion; /* the position of the _moving_ marker(s) */
int end; /* the last tick on the baseline (restrict markers to it) */ int end; /* the last tick on the baseline (restrict markers to it) */
Pixmap drawBuffer; Pixmap drawBuffer;
struct { struct {
unsigned int buttonPressed:1; unsigned int whichMarker:3;
unsigned int whichMarker:3; /* 0, 1, 2, 3, 4, 5, 6 */
/* 0, 1, 2, 3, 4, 5, 6 */ /* none, left, right, first, body, tabstop, first & body */
/* 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; } flags;
} Ruler; } Ruler;
@@ -66,10 +68,10 @@ drawLeftMarker(Ruler * rPtr)
{ {
XPoint points[4]; XPoint points[4];
int xpos = (rPtr->flags.whichMarker == 1 ? int xpos = (rPtr->flags.whichMarker == 1 ?
rPtr->motion : rPtr->margins.left); rPtr->motion : rPtr->margins.left);
XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer, XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer,
rPtr->fg, xpos, 8, xpos, 22); rPtr->fg, xpos, 8, xpos, 22);
points[0].x = xpos; points[0].x = xpos;
points[0].y = 1; points[0].y = 1;
points[1].x = points[0].x + 6; points[1].x = points[0].x + 6;
@@ -79,7 +81,7 @@ drawLeftMarker(Ruler * rPtr)
points[3].x = points[0].x; points[3].x = points[0].x;
points[3].y = 9; points[3].y = 9;
XFillPolygon(rPtr->view->screen->display, rPtr->drawBuffer, XFillPolygon(rPtr->view->screen->display, rPtr->drawBuffer,
rPtr->fg, points, 4, Convex, CoordModeOrigin); rPtr->fg, points, 4, Convex, CoordModeOrigin);
} }
@@ -96,10 +98,10 @@ static void drawRightMarker(Ruler * rPtr)
{ {
XPoint points[4]; XPoint points[4];
int xpos = (rPtr->flags.whichMarker == 2 ? int xpos = (rPtr->flags.whichMarker == 2 ?
rPtr->motion : rPtr->margins.right); rPtr->motion : rPtr->margins.right);
XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer, XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer,
rPtr->fg, xpos, 8, xpos, 22); rPtr->fg, xpos, 8, xpos, 22);
points[0].x = xpos + 1; points[0].x = xpos + 1;
points[0].y = 0; points[0].y = 0;
points[1].x = points[0].x - 6; points[1].x = points[0].x - 6;
@@ -109,7 +111,7 @@ static void drawRightMarker(Ruler * rPtr)
points[3].x = points[0].x; points[3].x = points[0].x;
points[3].y = 9; points[3].y = 9;
XFillPolygon(rPtr->view->screen->display, rPtr->drawBuffer, XFillPolygon(rPtr->view->screen->display, rPtr->drawBuffer,
rPtr->fg, points, 4, Convex, CoordModeOrigin); rPtr->fg, points, 4, Convex, CoordModeOrigin);
} }
@@ -122,24 +124,24 @@ static void drawRightMarker(Ruler * rPtr)
static void drawFirstMarker(Ruler * rPtr) static void drawFirstMarker(Ruler * rPtr)
{ {
int xpos = ((rPtr->flags.whichMarker == 3 || rPtr->flags.whichMarker == 6) ? int xpos = ((rPtr->flags.whichMarker == 3 || rPtr->flags.whichMarker == 6) ?
rPtr->motion : rPtr->margins.first); rPtr->motion : rPtr->margins.first);
XFillRectangle(rPtr->view->screen->display, rPtr->drawBuffer, XFillRectangle(rPtr->view->screen->display, rPtr->drawBuffer,
rPtr->fg, xpos - 5, 10, 11, 5); rPtr->fg, xpos - 5, 10, 11, 5);
XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer, XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer,
rPtr->fg, xpos, 12, xpos, 22); rPtr->fg, xpos, 12, xpos, 22);
} }
/* Marker for rest of body /* Marker for rest of body
_____ _____
\ / \ /
\./ \./
*/ */
static void drawBodyMarker(Ruler * rPtr) static void drawBodyMarker(Ruler * rPtr)
{ {
XPoint points[4]; XPoint points[4];
int xpos = ((rPtr->flags.whichMarker == 4 || rPtr->flags.whichMarker == 6) ? int xpos = ((rPtr->flags.whichMarker == 4 || rPtr->flags.whichMarker == 6) ?
rPtr->motion : rPtr->margins.body); rPtr->motion : rPtr->margins.body);
points[0].x = xpos - 5; points[0].x = xpos - 5;
points[0].y = 16; points[0].y = 16;
@@ -148,19 +150,23 @@ static void drawBodyMarker(Ruler * rPtr)
points[2].x = points[0].x + 5; points[2].x = points[0].x + 5;
points[2].y = 22; points[2].y = 22;
XFillPolygon(rPtr->view->screen->display, rPtr->drawBuffer, XFillPolygon(rPtr->view->screen->display, rPtr->drawBuffer,
rPtr->fg, points, 3, Convex, CoordModeOrigin); rPtr->fg, points, 3, Convex, CoordModeOrigin);
} }
static void createDrawBuffer(Ruler * rPtr) static void createDrawBuffer(Ruler * rPtr)
{ {
if(!rPtr->view->flags.realized)
return;
if (rPtr->drawBuffer) if (rPtr->drawBuffer)
XFreePixmap(rPtr->view->screen->display, rPtr->drawBuffer); XFreePixmap(rPtr->view->screen->display, rPtr->drawBuffer);
rPtr->drawBuffer = XCreatePixmap(rPtr->view->screen->display, rPtr->drawBuffer = XCreatePixmap(rPtr->view->screen->display,
rPtr->view->window, rPtr->view->size.width, 40, rPtr->view->window, rPtr->view->size.width, 40,
rPtr->view->screen->depth); rPtr->view->screen->depth);
XFillRectangle(rPtr->view->screen->display, rPtr->drawBuffer, XFillRectangle(rPtr->view->screen->display, rPtr->drawBuffer,
rPtr->bg, 0, 0, rPtr->view->size.width, 40); rPtr->bg, 0, 0, rPtr->view->size.width, 40);
} }
@@ -171,44 +177,47 @@ static void drawRulerOnPixmap(Ruler * rPtr)
int marks[9] = int marks[9] =
{11, 3, 5, 3, 7, 3, 5, 3}; {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, XFillRectangle(rPtr->view->screen->display, rPtr->drawBuffer,
rPtr->bg, 0, 0, rPtr->view->size.width, 40); rPtr->bg, 0, 0, rPtr->view->size.width, 40);
WMDrawString(rPtr->view->screen, rPtr->drawBuffer, rPtr->fg, WMDrawString(rPtr->view->screen, rPtr->drawBuffer, rPtr->fg,
rPtr->font, rPtr->margins.left + 2, 26, "0 inches", 10); rPtr->font, rPtr->margins.left + 2, 26, "0 inches", 10);
/* marker ticks */ /* marker ticks */
i = j = m = 0; i = j = m = 0;
w = rPtr->view->size.width - rPtr->margins.left; w = rPtr->view->size.width - rPtr->margins.left;
while (m < w) { while (m < w) {
XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer, XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer,
rPtr->fg, rPtr->margins.left + m, 23, rPtr->fg, rPtr->margins.left + m, 23,
rPtr->margins.left + m, marks[i % 8] + 23); rPtr->margins.left + m, marks[i % 8] + 23);
if (i != 0 && i % 8 == 0) { if (i != 0 && i % 8 == 0) {
if (j < 10) if (j < 10)
snprintf(c, 3, "%d", ++j); snprintf(c, 3, "%d", ++j);
else else
snprintf(c, 3, "%2d", ++j); snprintf(c, 3, "%2d", ++j);
WMDrawString(rPtr->view->screen, rPtr->drawBuffer, rPtr->fg, WMDrawString(rPtr->view->screen, rPtr->drawBuffer, rPtr->fg,
rPtr->font, rPtr->margins.left + 2 + m, 26, c, 2); rPtr->font, rPtr->margins.left + 2 + m, 26, c, 2);
} }
m = (++i) * 10; m = (++i) * 10;
} }
rPtr->end = rPtr->margins.left + m - 10; rPtr->end = rPtr->margins.left + m - 10;
if (rPtr->margins.right > rPtr->end) if (rPtr->margins.right > rPtr->end)
rPtr->margins.right = rPtr->end; rPtr->margins.right = rPtr->end;
/* base line */ /* base line */
XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer, rPtr->fg, XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer, rPtr->fg,
rPtr->margins.left, 22, rPtr->margins.left + m - 10, 22); rPtr->margins.left, 22, rPtr->margins.left + m - 10, 22);
drawLeftMarker(rPtr); drawLeftMarker(rPtr);
drawRightMarker(rPtr); drawRightMarker(rPtr);
drawFirstMarker(rPtr); drawFirstMarker(rPtr);
drawBodyMarker(rPtr); drawBodyMarker(rPtr);
rPtr->flags.redraw = False;
} }
@@ -216,12 +225,14 @@ static void paintRuler(Ruler * rPtr)
{ {
WMScreen *screen = rPtr->view->screen; WMScreen *screen = rPtr->view->screen;
if (1 || !rPtr->drawBuffer) { if (!rPtr->drawBuffer || !rPtr->view->flags.realized)
drawRulerOnPixmap(rPtr); return;
}
if (rPtr->flags.redraw)
drawRulerOnPixmap(rPtr);
XCopyArea(rPtr->view->screen->display, rPtr->drawBuffer, XCopyArea(rPtr->view->screen->display, rPtr->drawBuffer,
rPtr->view->window, rPtr->bg, 0, 0, rPtr->view->size.width, 40, rPtr->view->window, rPtr->bg, 0, 0, rPtr->view->size.width, 40,
0, 0); 0, 0);
} }
@@ -229,41 +240,41 @@ static Bool
verifyMarkerMove(Ruler * rPtr, int x) verifyMarkerMove(Ruler * rPtr, int x)
{ {
if (rPtr->flags.whichMarker < 1 || rPtr->flags.whichMarker > 6) if (rPtr->flags.whichMarker < 1 || rPtr->flags.whichMarker > 6)
return False; return False;
switch (rPtr->flags.whichMarker) { switch (rPtr->flags.whichMarker) {
case 1: case 1:
if (x > rPtr->margins.right - 10 || x < rPtr->offset || if (x > rPtr->margins.right - 10 || x < rPtr->offset ||
rPtr->margins.body + x > rPtr->margins.right - MIN_DOC_WIDTH || rPtr->margins.body + x > rPtr->margins.right - MIN_DOC_WIDTH ||
rPtr->margins.first + x > rPtr->margins.right - MIN_DOC_WIDTH) rPtr->margins.first + x > rPtr->margins.right - MIN_DOC_WIDTH)
return False; return False;
break; break;
case 2: case 2:
if (x < rPtr->margins.first + MIN_DOC_WIDTH || if (x < rPtr->margins.first + MIN_DOC_WIDTH ||
x < rPtr->margins.body + MIN_DOC_WIDTH || x < rPtr->margins.body + MIN_DOC_WIDTH ||
x < rPtr->margins.left + MIN_DOC_WIDTH || x < rPtr->margins.left + MIN_DOC_WIDTH ||
x > rPtr->end) /*rPtr->view->size.width) */ x > rPtr->end) /*rPtr->view->size.width) */
return False; return False;
break; break;
case 3: case 3:
if (x >= rPtr->margins.right - MIN_DOC_WIDTH || x < rPtr->margins.left) if (x >= rPtr->margins.right - MIN_DOC_WIDTH || x < rPtr->margins.left)
return False; return False;
break; break;
case 4: case 4:
if (x >= rPtr->margins.right - MIN_DOC_WIDTH || x < rPtr->margins.left) if (x >= rPtr->margins.right - MIN_DOC_WIDTH || x < rPtr->margins.left)
return False; return False;
break; break;
case 6: case 6:
if (x >= rPtr->margins.right - MIN_DOC_WIDTH || x < rPtr->margins.left) if (x >= rPtr->margins.right - MIN_DOC_WIDTH || x < rPtr->margins.left)
return False; return False;
break; break;
default: default:
return False; return False;
} }
rPtr->motion = x; rPtr->motion = x;
@@ -274,37 +285,37 @@ static Bool
static int whichMarker(Ruler * rPtr, int x, int y) static int whichMarker(Ruler * rPtr, int x, int y)
{ {
if (x < rPtr->offset || y > 22) if (x < rPtr->offset || y > 22)
return 0; return 0;
if (rPtr->margins.left - x >= -6 && y <= 9 if (rPtr->margins.left - x >= -6 && y <= 9
&& (rPtr->margins.left - x <= 0) && y >= 4) { && (rPtr->margins.left - x <= 0) && y >= 4) {
rPtr->motion = rPtr->margins.left; rPtr->motion = rPtr->margins.left;
return 1; return 1;
} }
if (rPtr->margins.right - x >= -1 && y <= 11 if (rPtr->margins.right - x >= -1 && y <= 11
&& rPtr->margins.right - x <= 5 && y >= 4) { && rPtr->margins.right - x <= 5 && y >= 4) {
rPtr->motion = rPtr->margins.right; rPtr->motion = rPtr->margins.right;
return 2; return 2;
} }
#if 0 #if 0
/* both first and body? */ /* both first and body? */
if (rPtr->margins.first - x <= 4 && rPtr->margins.first - x >= -5 if (rPtr->margins.first - x <= 4 && rPtr->margins.first - x >= -5
&& rPtr->margins.body - x <= 4 && rPtr->margins.body - x >= -5 && rPtr->margins.body - x <= 4 && rPtr->margins.body - x >= -5
&& y >= 15 && y <= 17) { && y >= 15 && y <= 17) {
rPtr->motion = rPtr->margins.first; rPtr->motion = rPtr->margins.first;
return 6; return 6;
} }
#endif #endif
if (rPtr->margins.first - x <= 4 && y <= 15 if (rPtr->margins.first - x <= 4 && y <= 15
&& rPtr->margins.first - x >= -5 && y >= 10) { && rPtr->margins.first - x >= -5 && y >= 10) {
rPtr->motion = rPtr->margins.first; rPtr->motion = rPtr->margins.first;
return 3; return 3;
} }
if (rPtr->margins.body - x <= 4 && y <= 21 && if (rPtr->margins.body - x <= 4 && y <= 21 &&
rPtr->margins.body - x >= -5 && y >= 17) { rPtr->margins.body - x >= -5 && y >= 17) {
rPtr->motion = rPtr->margins.body; rPtr->motion = rPtr->margins.body;
return 4; return 4;
} }
/* do tabs (5) */ /* do tabs (5) */
@@ -312,6 +323,16 @@ static int whichMarker(Ruler * rPtr, int x, int y)
return 0; 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) static void handleEvents(XEvent * event, void *data)
{ {
@@ -320,80 +341,73 @@ static void handleEvents(XEvent * event, void *data)
switch (event->type) { switch (event->type) {
case Expose: case Expose:
paintRuler(rPtr); rulerDidResize(rPtr->view->delegate, rPtr->view);
break; break;
case MotionNotify: case MotionNotify:
if (rPtr->flags.buttonPressed if (rPtr->flags.buttonPressed
&& (event->xmotion.state & Button1Mask)) { && (event->xmotion.state & Button1Mask)) {
if (verifyMarkerMove(rPtr, event->xmotion.x)) { if (verifyMarkerMove(rPtr, event->xmotion.x)) {
GC gc = WMColorGC(WMDarkGrayColor(rPtr->view->screen)); GC gc = WMColorGC(WMDarkGrayColor(rPtr->view->screen));
if (rPtr->moveAction) if (rPtr->moveAction)
(rPtr->moveAction) (rPtr, rPtr->clientData); (rPtr->moveAction) (rPtr, rPtr->clientData);
paintRuler(rPtr); rPtr->flags.redraw = True;
XSetLineAttributes(rPtr->view->screen->display, gc, 1, paintRuler(rPtr);
LineSolid, CapNotLast, JoinMiter); XSetLineAttributes(rPtr->view->screen->display, gc, 1,
XDrawLine(rPtr->pview->screen->display, LineSolid, CapNotLast, JoinMiter);
rPtr->pview->window, XDrawLine(rPtr->pview->screen->display,
gc, rPtr->motion + 1, 40, rPtr->pview->window,
rPtr->motion + 1, rPtr->pview->size.height - 5); gc, rPtr->motion + 1, 40,
} rPtr->motion + 1, rPtr->pview->size.height - 5);
} }
break; }
break;
case ButtonPress: case ButtonPress:
if (event->xbutton.button != Button1) if (event->xbutton.button != Button1)
return; return;
rPtr->flags.buttonPressed = True; rPtr->flags.buttonPressed = True;
rPtr->flags.whichMarker = rPtr->flags.whichMarker =
whichMarker(rPtr, event->xmotion.x, whichMarker(rPtr, event->xmotion.x,
event->xmotion.y); event->xmotion.y);
break; break;
case ButtonRelease: case ButtonRelease:
if (event->xbutton.button != Button1) if (event->xbutton.button != Button1)
return; return;
rPtr->flags.buttonPressed = False; rPtr->flags.buttonPressed = False;
switch (rPtr->flags.whichMarker) { switch (rPtr->flags.whichMarker) {
case 1:{ case 1:{
int change = rPtr->margins.left - rPtr->motion; int change = rPtr->margins.left - rPtr->motion;
rPtr->margins.first -= change; rPtr->margins.first -= change;
rPtr->margins.body -= change; rPtr->margins.body -= change;
rPtr->margins.left = rPtr->motion; rPtr->margins.left = rPtr->motion;
paintRuler(rPtr); rPtr->flags.redraw = True;
break; paintRuler(rPtr);
} break;
case 2: }
rPtr->margins.right = rPtr->motion; case 2:
break; rPtr->margins.right = rPtr->motion;
case 3: break;
rPtr->margins.first = rPtr->motion; case 3:
break; rPtr->margins.first = rPtr->motion;
case 4: break;
rPtr->margins.body = rPtr->motion; case 4:
break; rPtr->margins.body = rPtr->motion;
case 6: break;
rPtr->margins.first = rPtr->margins.body case 6:
= rPtr->motion; rPtr->margins.first = rPtr->margins.body
break; = rPtr->motion;
} break;
if (rPtr->releaseAction) }
(rPtr->releaseAction) (rPtr, rPtr->clientData); if (rPtr->releaseAction)
break; (rPtr->releaseAction) (rPtr, rPtr->clientData);
break;
} }
} }
static void rulerDidResize(W_ViewDelegate * self, WMView * view)
{
Ruler *rPtr = (Ruler *) view->self;
createDrawBuffer(rPtr);
paintRuler(rPtr);
}
W_ViewDelegate _RulerViewDelegate = W_ViewDelegate _RulerViewDelegate =
{ {
@@ -406,7 +420,7 @@ W_ViewDelegate _RulerViewDelegate =
WMRuler * WMRuler *
WMCreateRuler(WMWidget * parent) WMCreateRuler(WMWidget * parent)
{ {
Ruler *rPtr = wmalloc(sizeof(Ruler)); Ruler *rPtr = wmalloc(sizeof(Ruler));
unsigned int w = WMWidgetWidth(parent); unsigned int w = WMWidgetWidth(parent);
@@ -416,10 +430,12 @@ WMRuler *
rPtr->widgetClass = WC_Ruler; rPtr->widgetClass = WC_Ruler;
rPtr->view = W_CreateView(W_VIEW(parent)); rPtr->view = W_CreateView(W_VIEW(parent));
if (!rPtr->view) { if (!rPtr->view) {
free(rPtr); free(rPtr);
return NULL; return NULL;
} }
rPtr->view->self = rPtr; rPtr->view->self = rPtr;
rPtr->drawBuffer = (Pixmap) NULL; rPtr->drawBuffer = (Pixmap) NULL;
@@ -427,9 +443,9 @@ WMRuler *
W_ResizeView(rPtr->view, w, 40); W_ResizeView(rPtr->view, w, 40);
WMCreateEventHandler(rPtr->view, ExposureMask | StructureNotifyMask WMCreateEventHandler(rPtr->view, ExposureMask | StructureNotifyMask
| EnterWindowMask | LeaveWindowMask | FocusChangeMask | EnterWindowMask | LeaveWindowMask | FocusChangeMask
| ButtonReleaseMask | ButtonPressMask | KeyReleaseMask | ButtonReleaseMask | ButtonPressMask | KeyReleaseMask
| KeyPressMask | Button1MotionMask, handleEvents, rPtr); | KeyPressMask | Button1MotionMask, handleEvents, rPtr);
rPtr->view->delegate = &_RulerViewDelegate; rPtr->view->delegate = &_RulerViewDelegate;
@@ -442,9 +458,11 @@ WMRuler *
rPtr->margins.body = 22; rPtr->margins.body = 22;
rPtr->margins.first = 42; rPtr->margins.first = 42;
rPtr->margins.right = (w < 502 ? w : 502); rPtr->margins.right = (w < 502 ? w : 502);
rPtr->margins.tabs = NULL;
rPtr->flags.whichMarker = 0; /* none */ rPtr->flags.whichMarker = 0; /* none */
rPtr->flags.buttonPressed = False; rPtr->flags.buttonPressed = False;
rPtr->flags.redraw = True;
rPtr->moveAction = NULL; rPtr->moveAction = NULL;
rPtr->releaseAction = NULL; rPtr->releaseAction = NULL;
@@ -458,12 +476,13 @@ WMRuler *
void WMSetRulerMargins(WMRuler * rPtr, WMRulerMargins margins) void WMSetRulerMargins(WMRuler * rPtr, WMRulerMargins margins)
{ {
if (!rPtr) if (!rPtr)
return; return;
rPtr->margins.left = margins.left + rPtr->offset; rPtr->margins.left = margins.left + rPtr->offset;
rPtr->margins.right = margins.right + rPtr->offset; rPtr->margins.right = margins.right + rPtr->offset;
rPtr->margins.first = margins.first + rPtr->offset; rPtr->margins.first = margins.first + rPtr->offset;
rPtr->margins.body = margins.body + rPtr->offset; rPtr->margins.body = margins.body + rPtr->offset;
rPtr->margins.tabs = margins.tabs; /*for loop */ rPtr->margins.tabs = margins.tabs; /*for loop */
rPtr->flags.redraw = True;
paintRuler(rPtr); paintRuler(rPtr);
} }
@@ -474,8 +493,11 @@ WMGetRulerMargins(WMRuler * rPtr)
{ {
WMRulerMargins margins; WMRulerMargins margins;
if (!rPtr) if (!rPtr) {
return margins; margins.first = margins.body = margins.left = 0;
margins.right = 100;
return margins;
}
margins.left = rPtr->margins.left - rPtr->offset; margins.left = rPtr->margins.left - rPtr->offset;
margins.right = rPtr->margins.right - rPtr->offset; margins.right = rPtr->margins.right - rPtr->offset;
@@ -491,7 +513,7 @@ WMGetRulerMargins(WMRuler * rPtr)
void WMSetRulerOffset(WMRuler * rPtr, int pixels) void WMSetRulerOffset(WMRuler * rPtr, int pixels)
{ {
if (!rPtr || pixels < 0 || pixels + MIN_DOC_WIDTH >= rPtr->view->size.width) if (!rPtr || pixels < 0 || pixels + MIN_DOC_WIDTH >= rPtr->view->size.width)
return; return;
rPtr->offset = pixels; rPtr->offset = pixels;
/*rulerDidResize(rPtr, rPtr->view); */ /*rulerDidResize(rPtr, rPtr->view); */
} }
@@ -500,7 +522,7 @@ void WMSetRulerOffset(WMRuler * rPtr, int pixels)
int WMGetRulerOffset(WMRuler * rPtr) int WMGetRulerOffset(WMRuler * rPtr)
{ {
if (!rPtr) if (!rPtr)
return; return;
return rPtr->offset; return rPtr->offset;
} }
@@ -508,7 +530,7 @@ int WMGetRulerOffset(WMRuler * rPtr)
void WMSetRulerReleaseAction(WMRuler * rPtr, WMAction * action, void *clientData) void WMSetRulerReleaseAction(WMRuler * rPtr, WMAction * action, void *clientData)
{ {
if (!rPtr) if (!rPtr)
return; return;
rPtr->releaseAction = action; rPtr->releaseAction = action;
rPtr->clientData = clientData; rPtr->clientData = clientData;
@@ -518,7 +540,7 @@ void WMSetRulerReleaseAction(WMRuler * rPtr, WMAction * action, void *clientData
void WMSetRulerMoveAction(WMRuler * rPtr, WMAction * action, void *clientData) void WMSetRulerMoveAction(WMRuler * rPtr, WMAction * action, void *clientData)
{ {
if (!rPtr) if (!rPtr)
return; return;
rPtr->moveAction = action; rPtr->moveAction = action;
rPtr->clientData = clientData; rPtr->clientData = clientData;
@@ -529,7 +551,7 @@ void WMSetRulerMoveAction(WMRuler * rPtr, WMAction * action, void *clientData)
int WMGetReleasedRulerMargin(WMRuler * rPtr) int WMGetReleasedRulerMargin(WMRuler * rPtr)
{ {
if (!rPtr) if (!rPtr)
return 0; return 0;
return rPtr->flags.whichMarker; return rPtr->flags.whichMarker;
} }
@@ -538,6 +560,6 @@ int WMGetReleasedRulerMargin(WMRuler * rPtr)
int WMGetGrabbedRulerMargin(WMRuler * rPtr) int WMGetGrabbedRulerMargin(WMRuler * rPtr)
{ {
if (!rPtr) if (!rPtr)
return 0; return 0;
return rPtr->flags.whichMarker; return rPtr->flags.whichMarker;
} }

4243
WINGs/wtext.c
View File

File diff suppressed because it is too large Load Diff