[teklib-general] changeset in /hg/teklib/current: improved naming of structure me...
Timm S. Mueller
tmueller at neoscientists.org
Mon Jul 9 22:07:56 CEST 2007
changeset 8f46b95a8a87 in /hg/teklib/current
details: http://teklib.org:8001/hg/teklib/current?cmd=changeset;node=8f46b95a8a87
description:
improved naming of structure members and defines
diffs (truncated from 1293 to 300 lines):
diff -r e37e6aab0cde -r 8f46b95a8a87 src/visual/posix/visual_host.c
--- a/src/visual/posix/visual_host.c Fri Jun 22 09:11:27 2007 +0200
+++ b/src/visual/posix/visual_host.c Fri Jun 22 09:15:25 2007 +0200
@@ -268,6 +268,7 @@ static TVOID
static TVOID
drawrgb(TMOD_VIS *mod, VISUAL *v, TUINT *buf, TINT *rrect)
{
+ TAPTR exec = TGetExecBase(mod);
int w = rrect[2];
int h = rrect[3];
int totw = rrect[4];
@@ -329,7 +330,7 @@ drawrgb(TMOD_VIS *mod, VISUAL *v, TUINT
if (v->tempbuf)
{
- TExecFree(TExecBase, v->tempbuf);
+ TExecFree(exec, v->tempbuf);
v->tempbuf = NULL;
}
@@ -338,7 +339,7 @@ drawrgb(TMOD_VIS *mod, VISUAL *v, TUINT
(PIXFMT_RGB << 1) + 0))
{
/* formats differ, need tempbuf */
- v->tempbuf = TExecAlloc(TExecBase, mod->mmu,
+ v->tempbuf = TExecAlloc(exec, mod->vis_MMU,
w * h * (v->bpp << 3));
if (v->tempbuf == TNULL) okay = TFALSE;
}
@@ -370,7 +371,7 @@ drawrgb(TMOD_VIS *mod, VISUAL *v, TUINT
{
case (24 << 9) + (PIXFMT_RGB << 1) + 0:
if (v->shm)
- TExecCopyMem(TExecBase, buf, v->image->data, w*h*4);
+ TExecCopyMem(exec, buf, v->image->data, w*h*4);
else
v->image->data = (char *) buf;
break;
@@ -607,7 +608,7 @@ static TBOOL
static TBOOL
getnextevent(TMOD_VIS *mod, TIMSG *newimsg)
{
- VISUAL *v = mod->hostspecific;
+ VISUAL *v = mod->vis_HostSpecific;
XEvent ev;
KeySym keysym;
@@ -1071,9 +1072,9 @@ LOCAL TBOOL
LOCAL TBOOL
vis_init(TMOD_VIS *mod)
{
- VISUAL *v = TExecAlloc0(TExecBase, mod->mmu, sizeof(VISUAL));
+ VISUAL *v = TExecAlloc0(TGetExecBase(mod), mod->vis_MMU, sizeof(VISUAL));
if (v == TNULL) return TFALSE;
- mod->hostspecific = v;
+ mod->vis_HostSpecific = v;
TInitList(&v->imsgpool);
for (;;)
@@ -1084,7 +1085,7 @@ vis_init(TMOD_VIS *mod)
TUINT gcv_mask;
int pipefd[2];
- v->HalBase = TExecGetHALBase(TExecBase);
+ v->HalBase = TExecGetHALBase(TGetExecBase(mod));
THALInitLock(v->HalBase, &v->lock);
v->fd_sigpipe_read = -1;
@@ -1106,15 +1107,15 @@ vis_init(TMOD_VIS *mod)
v->visual = DefaultVisual(v->display, v->screen);
v->winwidth = (TINT)
- TGetTag(mod->inittags, TVisual_PixWidth, (TTAG) -1);
+ TGetTag(mod->vis_InitTags, TVisual_PixWidth, (TTAG) -1);
v->winheight = (TINT)
- TGetTag(mod->inittags, TVisual_PixHeight, (TTAG) -1);
+ TGetTag(mod->vis_InitTags, TVisual_PixHeight, (TTAG) -1);
v->winwidth = v->winwidth >= 0 ? v->winwidth : 600;
v->winheight = v->winheight >= 0 ? v->winheight : 400;
v->title = (TSTRPTR)
- TGetTag(mod->inittags, TVisual_Title, (TTAG) "TEKlib visual");
+ TGetTag(mod->vis_InitTags, TVisual_Title, (TTAG) "TEKlib visual");
v->flags = (ImageByteOrder(v->display) !=
(*(TUINT *) endiancheck == 0x11223344 ? MSBFirst : LSBFirst)) ?
@@ -1145,13 +1146,13 @@ vis_init(TMOD_VIS *mod)
v->sizehints->flags = 0;
v->sizehints->min_width = (TINT)
- TGetTag(mod->inittags, TVisual_MinWidth, (TTAG) -1);
+ TGetTag(mod->vis_InitTags, TVisual_MinWidth, (TTAG) -1);
v->sizehints->min_height = (TINT)
- TGetTag(mod->inittags, TVisual_MinHeight, (TTAG) -1);
+ TGetTag(mod->vis_InitTags, TVisual_MinHeight, (TTAG) -1);
v->sizehints->max_width = (TINT)
- TGetTag(mod->inittags, TVisual_MaxWidth, (TTAG) -1);
+ TGetTag(mod->vis_InitTags, TVisual_MaxWidth, (TTAG) -1);
v->sizehints->max_height = (TINT)
- TGetTag(mod->inittags, TVisual_MaxHeight, (TTAG) -1);
+ TGetTag(mod->vis_InitTags, TVisual_MaxHeight, (TTAG) -1);
if (v->sizehints->min_width >= 0 && v->sizehints->min_height >= 0)
v->sizehints->flags |= PMinSize;
if (v->sizehints->max_width >= 0 && v->sizehints->max_height >= 0)
@@ -1207,13 +1208,14 @@ LOCAL TVOID
LOCAL TVOID
vis_exit(TMOD_VIS *mod)
{
- VISUAL *v = mod->hostspecific;
+ VISUAL *v = mod->vis_HostSpecific;
if (v)
{
struct TNode *imsg;
- while ((imsg = TRemHead(&v->imsgpool))) TExecFree(TExecBase, imsg);
-
- TExecFree(TExecBase, v->tempbuf);
+ while ((imsg = TRemHead(&v->imsgpool)))
+ TExecFree(TGetExecBase(mod), imsg);
+
+ TExecFree(TGetExecBase(mod), v->tempbuf);
if (v->window)
XUnmapWindow(v->display, v->window);
if (v->gc)
@@ -1236,8 +1238,8 @@ vis_exit(TMOD_VIS *mod)
}
THALDestroyLock(v->HalBase, &v->lock);
- TExecFree(TExecBase, v);
- mod->hostspecific = TNULL;
+ TExecFree(TGetExecBase(mod), v);
+ mod->vis_HostSpecific = TNULL;
}
}
@@ -1246,7 +1248,7 @@ LOCAL void
LOCAL void
vis_wait(TMOD_VIS *mod)
{
- VISUAL *v = mod->hostspecific;
+ VISUAL *v = mod->vis_HostSpecific;
fd_set rset;
FD_ZERO(&rset);
@@ -1267,7 +1269,7 @@ vis_wait(TMOD_VIS *mod)
TIMSG *imsg = (TIMSG *) TRemHead(&v->imsgpool);
if (imsg == TNULL)
{
- imsg = TExecAllocMsg(TExecBase, sizeof(TIMSG));
+ imsg = TExecAllocMsg(TGetExecBase(mod), sizeof(TIMSG));
if (imsg == TNULL) break;
}
if (getnextevent(mod, imsg) == TFALSE)
@@ -1285,7 +1287,7 @@ LOCAL TVOID
LOCAL TVOID
vis_wake(TMOD_VIS *mod)
{
- VISUAL *v = mod->hostspecific;
+ VISUAL *v = mod->vis_HostSpecific;
char sig[1];
write(v->fd_sigpipe_write, &sig, 1);
}
@@ -1293,33 +1295,33 @@ vis_wake(TMOD_VIS *mod)
/*****************************************************************************/
LOCAL TVOID
-vis_docmd(TMOD_VIS *mod, TVREQ *req)
-{
- VISUAL *v = mod->hostspecific;
+vis_docmd(TMOD_VIS *mod, VISREQ *req)
+{
+ VISUAL *v = mod->vis_HostSpecific;
struct attrdata data;
struct THook hook;
switch (req->vis_Req.io_Command)
{
- case TVCMD_FLUSH:
+ case VISCMD_FLUSH:
XFlush(v->display);
break;
- case TVCMD_SETINPUT:
+ case VISCMD_SETINPUT:
setinputmask(mod, v, req->vis_Op.SetInput.Mask);
break;
- case TVCMD_CLEAR:
+ case VISCMD_CLEAR:
setfgpen(mod, v, req->vis_Op.Clear.Pen);
clear(mod, v);
break;
- case TVCMD_DRAWRGB:
+ case VISCMD_DRAWRGB:
drawrgb(mod, v, req->vis_Op.DrawRGB.Buf,
req->vis_Op.DrawRGB.RRect);
break;
- case TVCMD_GETATTRS:
+ case VISCMD_GETATTRS:
data.mod = mod;
data.v = v;
data.num = 0;
@@ -1328,7 +1330,7 @@ vis_docmd(TMOD_VIS *mod, TVREQ *req)
req->vis_Op.GetAttrs.Num = data.num;
break;
- case TVCMD_SETATTRS:
+ case VISCMD_SETATTRS:
data.mod = mod;
data.v = v;
data.num = 0;
@@ -1339,36 +1341,36 @@ vis_docmd(TMOD_VIS *mod, TVREQ *req)
XSetWMNormalHints(v->display, v->window, v->sizehints);
break;
- case TVCMD_ALLOCPEN:
+ case VISCMD_ALLOCPEN:
req->vis_Op.AllocPen.Pen =
allocpen(mod, v, req->vis_Op.AllocPen.RGB);
break;
- case TVCMD_FREEPEN:
+ case VISCMD_FREEPEN:
freepen(mod, v, req->vis_Op.FreePen.Pen);
break;
- case TVCMD_FRECT:
+ case VISCMD_FRECT:
setfgpen(mod, v, req->vis_Op.FRect.Pen);
frect(mod, v, req->vis_Op.FRect.Rect);
break;
- case TVCMD_RECT:
+ case VISCMD_RECT:
setfgpen(mod, v, req->vis_Op.Rect.Pen);
rect(mod, v, req->vis_Op.Rect.Rect);
break;
- case TVCMD_LINE:
+ case VISCMD_LINE:
setfgpen(mod, v, req->vis_Op.Line.Pen);
line(mod, v, req->vis_Op.Line.Rect);
break;
- case TVCMD_PLOT:
+ case VISCMD_PLOT:
setfgpen(mod, v, req->vis_Op.Plot.Pen);
plot(mod, v, req->vis_Op.Plot.X, req->vis_Op.Plot.Y);
break;
- case TVCMD_TEXT:
+ case VISCMD_TEXT:
setfgpen(mod, v, req->vis_Op.Text.FGPen);
if (req->vis_Op.Text.BGPen != TVPEN_UNDEFINED)
{
@@ -1381,12 +1383,12 @@ vis_docmd(TMOD_VIS *mod, TVREQ *req)
req->vis_Op.Text.Text, req->vis_Op.Text.Length);
break;
- case TVCMD_FPOLY:
+ case VISCMD_FPOLY:
setfgpen(mod, v, req->vis_Op.FPoly.Pen);
fpoly(mod, v, req->vis_Op.FPoly.Array, req->vis_Op.FPoly.Num);
break;
- case TVCMD_SCROLL:
+ case VISCMD_SCROLL:
scroll(mod, v, req->vis_Op.Scroll.SRect);
break;
}
diff -r e37e6aab0cde -r 8f46b95a8a87 src/visual/visual_api.c
--- a/src/visual/visual_api.c Fri Jun 22 09:11:27 2007 +0200
+++ b/src/visual/visual_api.c Fri Jun 22 09:15:25 2007 +0200
@@ -14,16 +14,16 @@ EXPORT TAPTR
EXPORT TAPTR
vis_getport(TMOD_VIS *mod)
{
- return mod->userport;
+ return mod->vis_UserPort;
}
/*****************************************************************************/
static TVOID
-vis_doasync(TMOD_VIS *mod, TVREQ *req)
-{
- TPutIO((struct TIORequest *) req);
- TAddTail(&mod->waitlist, (struct TNode *) req);
+vis_doasync(TMOD_VIS *mod, VISREQ *req)
+{
+ TExecPutIO(TGetExecBase(mod), (struct TIORequest *) req);
+ TAddTail(&mod->vis_WaitList, (struct TNode *) req);
}
/*****************************************************************************/
@@ -32,10 +32,10 @@ vis_allocpen(TMOD_VIS *mod, TUINT rgb)
vis_allocpen(TMOD_VIS *mod, TUINT rgb)
{
More information about the teklib-general
mailing list