gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-04-27 19:23:31 +02:00
Code Issues Projects Releases Wiki Activity

Gaaah!

Browse Source 
This thing is completely broken! There are functions that take a
completely different set of arguments than the ones currently used to call
them. There are even functions that are not defined anywhere but
called from wtext.c

Please fix it before re-enabling it in Makefile.am
This commit is contained in:
dan
2000-07-06 01:28:13 +00:00
parent fcab535c38
commit 4cb5649545
4 changed files with 430 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WINGs/Makefile.am
+1 -3
View File
@@ -13,7 +13,7 @@ include_HEADERS = WINGs.h WUtil.h WINGsP.h
bin_SCRIPTS = get-wings-flags get-wutil-flags
noinst_PROGRAMS = wtest wmquery wmfile fontl testmywidget testcolorpanel\
connect puzzle testtext
connect puzzle #testtext
lib_LIBRARIES = libWINGs.a libWUtil.a
@@ -65,13 +65,11 @@ libWINGs_a_SOURCES = \
wpixmap.c \
wpopupbutton.c \
wprogressindicator.c \
wruler.c \
wscroller.c \
wscrollview.c \
wslider.c \
wsplitview.c \
wtabview.c \
wtext.c \
wtextfield.c \
wwindow.c \
wview.c \
WINGs/testtext.c
+8 -4
View File
@@ -14,7 +14,8 @@ wAbort()
}
void Close(WMWidget *self, void *client)
void
Close(WMWidget *self, void *client)
{
exit(0);
}
@@ -111,7 +112,8 @@ getArg(char *t, short type, void *arg)
}
#endif
void parseToken(WMText *tPtr, char *token, short tk)
void
parseToken(WMText *tPtr, char *token, short tk)
{
short mode=0; /* 0 starts, 1 closes */
WMScreen *scr = (W_VIEW(tPtr))->screen;
@@ -249,7 +251,8 @@ printf("center\n");
//printf("parse token (%s)[%s]\n", mode?"close":"open", token);
}
void HTMLParser(WMWidget *w, void *clientData, short type)
void
HTMLParser(WMWidget *w, void *clientData, short type)
{
static short init=1; /* have we been here at least once before? */
char *stream = (char *) clientData;
@@ -356,7 +359,8 @@ void HTMLParser(WMWidget *w, void *clientData, short type)
WMWidget *win;
WMText *text;
void NotificationObserver(void *self, WMNotification *notif)
void
NotificationObserver(void *self, WMNotification *notif)
{
void *object = WMGetNotificationObject(notif);
unsigned short w = WMWidgetWidth(win);
WINGs/wruler.c
+47 -30
View File
@@ -40,7 +40,9 @@ typedef struct W_Ruler {
| \
|__\
|
| */
|
*/
static void
drawLeftMarker(Ruler *rPtr)
{
@@ -62,14 +64,16 @@ drawLeftMarker(Ruler *rPtr)
rPtr->fg, points, 4, Convex, CoordModeOrigin);
}
/* Marker for right margin
/|
/ |
/__|
|
| */
|
*/
static void
drawRightMarker(Ruler *rPtr)
{
@@ -95,7 +99,9 @@ drawRightMarker(Ruler *rPtr)
/* Marker for first line only
_____
|___|
| */
|
*/
static void
drawFirstMarker(Ruler *rPtr)
{
@@ -110,7 +116,8 @@ drawFirstMarker(Ruler *rPtr)
/* Marker for rest of body
_____
\ /
\./ */
\./
*/
static void
drawBodyMarker(Ruler *rPtr)
{
@@ -127,6 +134,7 @@ drawBodyMarker(Ruler *rPtr)
rPtr->fg, points, 3, Convex, CoordModeOrigin);
}
static void
createDrawBuffer(Ruler *rPtr)
{
@@ -139,6 +147,7 @@ createDrawBuffer(Ruler *rPtr)
rPtr->bg, 0, 0, rPtr->view->size.width, 40);
}
static void
drawRulerOnPixmap(Ruler *rPtr)
{
@@ -152,9 +161,8 @@ if(!rPtr->drawBuffer)
XFillRectangle(rPtr->view->screen->display, rPtr->drawBuffer,
rPtr->bg, 0, 0, rPtr->view->size.width, 40);
WMDrawString(rPtr->view->screen, rPtr->drawBuffer,
rPtr->fg, rPtr->font, rPtr->margins.left+2, 26, "0 inches", 10);
WMDrawString(rPtr->view->screen, rPtr->drawBuffer, rPtr->fg,
rPtr->font, rPtr->margins.left+2, 26, "0 inches", 10);
/* marker ticks */
i=j=m=0;
@@ -168,8 +176,8 @@ while(m < w) {
snprintf(c,3,"%d",++j);
else
snprintf(c,3,"%2d",++j);
WMDrawString(rPtr->view->screen, rPtr->drawBuffer,
rPtr->fg, rPtr->font, rPtr->margins.left+2+m, 26, c, 2);
WMDrawString(rPtr->view->screen, rPtr->drawBuffer, rPtr->fg,
rPtr->font, rPtr->margins.left+2+m, 26, c, 2);
}
m = (++i)*10;
}
@@ -178,8 +186,8 @@ rPtr->end = rPtr->margins.left+m-10;
if(rPtr->margins.right > rPtr->end)
rPtr->margins.right = rPtr->end;
/* base line */
XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer,
rPtr->fg, rPtr->margins.left, 22, rPtr->margins.left+m-10, 22);
XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer, rPtr->fg,
rPtr->margins.left, 22, rPtr->margins.left+m-10, 22);
drawLeftMarker(rPtr);
drawRightMarker(rPtr);
@@ -187,11 +195,12 @@ drawFirstMarker(rPtr);
drawBodyMarker(rPtr);
}
static void
paintRuler(Ruler *rPtr)
{
WMScreen *screen = rPtr->view->screen;
if(1||!rPtr->drawBuffer) { //first exposure
if(1||!rPtr->drawBuffer) {
drawRulerOnPixmap(rPtr);
}
@@ -200,6 +209,7 @@ paintRuler(Ruler *rPtr)
0, 0);
}
static Bool
verifyMarkerMove(Ruler *rPtr, int x)
{
@@ -208,40 +218,37 @@ verifyMarkerMove(Ruler *rPtr, int x)
switch(rPtr->flags.whichMarker) {
case 1:
if( x > rPtr->margins.right - 10
|| rPtr->margins.body + x > rPtr->margins.right-MIN_DOC_WIDTH
|| rPtr->margins.first + x > rPtr->margins.right-MIN_DOC_WIDTH
|| x < rPtr->offset)
if(x > rPtr->margins.right - 10 || x < rPtr->offset ||
rPtr->margins.body + x > rPtr->margins.right-MIN_DOC_WIDTH ||
rPtr->margins.first + x > rPtr->margins.right-MIN_DOC_WIDTH)
return False;
break;
case 2:
if( x < rPtr->margins.first+MIN_DOC_WIDTH
|| x < rPtr->margins.body+MIN_DOC_WIDTH
|| x < rPtr->margins.left+MIN_DOC_WIDTH
|| x > rPtr->end) //rPtr->view->size.width)
if(x < rPtr->margins.first+MIN_DOC_WIDTH ||
x < rPtr->margins.body+MIN_DOC_WIDTH ||
x < rPtr->margins.left+MIN_DOC_WIDTH ||
x > rPtr->end) /*rPtr->view->size.width)*/
return False;
break;
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;
break;
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;
break;
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;
break;
default: return False;
default:
return False;
}
rPtr->motion = x;
@@ -439,15 +446,17 @@ WMSetRulerMargins(WMRuler *rPtr, WMRulerMargins margins)
rPtr->margins.right = margins.right + rPtr->offset;
rPtr->margins.first = margins.first + rPtr->offset;
rPtr->margins.body = margins.body + rPtr->offset;
rPtr->margins.tabs = margins.tabs; //for loop
rPtr->margins.tabs = margins.tabs; /*for loop*/
paintRuler(rPtr);
}
WMRulerMargins
WMGetRulerMargins(WMRuler *rPtr)
{
WMRulerMargins margins;
if(!rPtr)
return margins;
@@ -455,21 +464,23 @@ WMGetRulerMargins(WMRuler *rPtr)
margins.right = rPtr->margins.right - rPtr->offset;
margins.first = rPtr->margins.first - rPtr->offset;
margins.body = rPtr->margins.body - rPtr->offset;
//for
/*for*/
margins.tabs = rPtr->margins.tabs;
return rPtr->margins;
}
void
WMSetRulerOffset(WMRuler *rPtr, int pixels)
{
if(!rPtr || pixels<0 || pixels+MIN_DOC_WIDTH>=rPtr->view->size.width)
return;
rPtr->offset = pixels;
//rulerDidResize(rPtr, rPtr->view);
/*rulerDidResize(rPtr, rPtr->view);*/
}
int
WMGetRulerOffset(WMRuler *rPtr)
{
@@ -478,6 +489,7 @@ WMGetRulerOffset(WMRuler *rPtr)
return rPtr->offset;
}
void
WMSetRulerReleaseAction(WMRuler *rPtr, WMAction *action, void *clientData)
{
@@ -488,6 +500,7 @@ WMSetRulerReleaseAction(WMRuler *rPtr, WMAction *action, void *clientData)
rPtr->clientData = clientData;
}
void
WMSetRulerMoveAction(WMRuler *rPtr, WMAction *action, void *clientData)
{
@@ -498,6 +511,7 @@ WMSetRulerMoveAction(WMRuler *rPtr, WMAction *action, void *clientData)
rPtr->clientData = clientData;
}
/* _which_ one was released */
int
WMGetReleasedRulerMargin(WMRuler *rPtr)
@@ -507,6 +521,7 @@ WMGetReleasedRulerMargin(WMRuler *rPtr)
return rPtr->flags.whichMarker;
}
/* _which_ one is being grabbed */
int
WMGetGrabbedRulerMargin(WMRuler *rPtr)
@@ -515,3 +530,5 @@ WMGetGrabbedRulerMargin(WMRuler *rPtr)
return 0;
return rPtr->flags.whichMarker;
}
WINGs/wtext.c
+10 -10
View File
@@ -280,7 +280,7 @@ chunkSelectionRect(Text *tPtr, Paragraph *para, MyTextItems item,
if(type == 1 && item.chunk->type == ctText) { /* partial coverage */
lm = 2+WMGetRulerMargin(tPtr->ruler, WRulerDocLeft);
lm = 2+WMGetRulerMargins(tPtr->ruler, WRulerDocLeft);
/* even I am still confused, so don't ask please */
if( (item.x+j+lm >= tPtr->sRect.pos.x &&
item.x+j+lm <= tPtr->sRect.pos.x+tPtr->sRect.size.width)
@@ -571,8 +571,8 @@ putParagraphOnPixmap(Text *tPtr, Paragraph *para, Bool draw)
if(!tPtr->view->flags.realized || !para) return 0;
where.x = 0, where.y =0, nitems = 0;
m.left = WMGetRulerMargin(tPtr->ruler, WRulerDocLeft);
m.right = WMGetRulerMargin(tPtr->ruler, WRulerRight) - m.left;
m.left = WMGetRulerMargins(tPtr->ruler, WRulerDocLeft);
m.right = WMGetRulerMargins(tPtr->ruler, WRulerRight) - m.left;
m.first = para->fmargin, m.body = para->bmargin;
if(draw) {
@@ -669,9 +669,9 @@ calcParaExtents(Text *tPtr, Paragraph *para)
para->bmargin = 0;
para->rmargin = tPtr->visibleW;
} else {
para->width = WMGetRulerMargin(tPtr->ruler, WRulerRight) -
WMIN(para->fmargin, para->bmargin)
- WMGetRulerOffset(tPtr->ruler);
para->width = WMGetRulerMargins(tPtr->ruler, WRulerRight) -
WMIN(para->fmargin, para->bmargin) -
WMGetRulerOffset(tPtr->ruler);
}
if(!para->chunks)
@@ -728,8 +728,8 @@ calcDocExtents(Text *tPtr)
if(tPtr->monoFont) {
tPtr->docWidth = tPtr->visibleW;
} else {
tPtr->docWidth = WMGetRulerMargin(tPtr->ruler, WRulerRight) -
WMGetRulerMargin(tPtr->ruler, WRulerDocLeft);
tPtr->docWidth = WMGetRulerMargins(tPtr->ruler, WRulerRight) -
WMGetRulerMargins(tPtr->ruler, WRulerDocLeft);
}
tPtr->docHeight = 0;
para = tPtr->paragraphs;
@@ -2382,7 +2382,7 @@ WMSetTextRulerMargin(WMText *tPtr, char which, short pixels)
{
if(!tPtr) return;
if(tPtr->monoFont) return;
WMSetRulerMargin(tPtr->ruler, which, pixels);
WMSetRulerMargins(tPtr->ruler, which, pixels);
WMRefreshText(tPtr, tPtr->vpos, tPtr->hpos);
}
@@ -2392,7 +2392,7 @@ WMGetTextRulerMargin(WMText *tPtr, char which)
if(!tPtr) return 0;
if(tPtr->monoFont)
return 0;
return WMGetRulerMargin(tPtr->ruler, which);
return WMGetRulerMargins(tPtr->ruler, which);
}