Rijn/TempleOS-Rijn
1
1 Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

TempleOSCDV4.12.ISO

Browse Source
This commit is contained in:
Terry A. Davis authored and minexew committed 2018-09-08 21:47:56 +02:00
1 parent 93ca216483
commit b84bbff6db
381 files changed
+18356 -18798
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Adam/Gr/GrBitMap.HC
+36 -36
View File
@@ -83,7 +83,7 @@ public I64 GrBlot(CDC *dc=gr.dc,I64 x,I64 y,CDC *img)
CColorROPU32 color,c,old_color;
CTask *win_task;
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
win_task=dc->win_task;
x+=win_task->scroll_x;
y+=win_task->scroll_y;
@@ -98,7 +98,7 @@ public I64 GrBlot(CDC *dc=gr.dc,I64 x,I64 y,CDC *img)
h1=0;
w2=img->width;
h2=img->height;
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
x+=win_task->pix_left;
y+=win_task->pix_top;
}
@@ -109,7 +109,7 @@ public I64 GrBlot(CDC *dc=gr.dc,I64 x,I64 y,CDC *img)
dc->nearest_sprite_elem_num=dc->cur_sprite_elem_num;
}
}
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
if (x+w1<0) w1=-x;
if (x+w2>win_task->pix_right+1)
w2=win_task->pix_right+1-x;
@@ -165,7 +165,7 @@ public I64 GrBlot(CDC *dc=gr.dc,I64 x,I64 y,CDC *img)
case ROPB_MONO:
color_mask=gr.to_8_colors[color.c0.color];
if (img->flags&DCF_NO_TRANSPARENTS) {
if (!(dc->flags & DCF_SCREEN_BITMAP) || dc->flags&DCF_ON_TOP)
if (!(dc->flags & DCF_SCRN_BITMAP) || dc->flags&DCF_ON_TOP)
win_z_buf_ptr=NULL;
else {
win_z_num=win_task->win_z_num;
@@ -273,7 +273,7 @@ public I64 GrBlot(CDC *dc=gr.dc,I64 x,I64 y,CDC *img)
}
} else {
k=h1*img->width_internal;
if (!(dc->flags & DCF_SCREEN_BITMAP) || dc->flags&DCF_ON_TOP) {
if (!(dc->flags & DCF_SCRN_BITMAP) || dc->flags&DCF_ON_TOP) {
for (j=h1;j<h2;j++) {
for (i=w1;i<w2;i++)
if (img->body[k+i])
@@ -318,7 +318,7 @@ public I64 GrBlot(CDC *dc=gr.dc,I64 x,I64 y,CDC *img)
break;
case ROPB_EQU:
if (img->flags&DCF_NO_TRANSPARENTS) {
if (!(dc->flags & DCF_SCREEN_BITMAP) || dc->flags&DCF_ON_TOP)
if (!(dc->flags & DCF_SCRN_BITMAP) || dc->flags&DCF_ON_TOP)
win_z_buf_ptr=NULL;
else {
win_z_num=win_task->win_z_num;
@@ -423,7 +423,7 @@ public I64 GrBlot(CDC *dc=gr.dc,I64 x,I64 y,CDC *img)
} else {
here1a:
k=h1*img->width_internal;
if (!(dc->flags & DCF_SCREEN_BITMAP) || dc->flags&DCF_ON_TOP) {
if (!(dc->flags & DCF_SCRN_BITMAP) || dc->flags&DCF_ON_TOP) {
for (j=h1;j<h2;j++) {
for (i=w1;i<w2;i++) {
c=img->body[k+i];
@@ -477,7 +477,7 @@ here1a:
break;
case ROPB_XOR:
if (img->flags&DCF_NO_TRANSPARENTS) {
if (!(dc->flags & DCF_SCREEN_BITMAP) || dc->flags&DCF_ON_TOP)
if (!(dc->flags & DCF_SCRN_BITMAP) || dc->flags&DCF_ON_TOP)
win_z_buf_ptr=NULL;
else {
win_z_num=win_task->win_z_num;
@@ -625,7 +625,7 @@ public CDC *DCExt(CDC *dc=gr.dc,I64 x1,I64 y1,I64 x2,I64 y2,
CTask *win_task;
if (x1>x2) SwapI64(&x1,&x2);
if (y1>y2) SwapI64(&y1,&y2);
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
win_task=dc->win_task;
x1+=win_task->pix_left+win_task->scroll_x;
y1+=win_task->pix_top +win_task->scroll_y;
@@ -648,7 +648,7 @@ public I64 GrPutChar(CDC *dc=gr.dc,I64 x,I64 y,U8 ch)
CColorROPU32 color,c;
CTask *win_task;
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
win_task=dc->win_task;
x+=win_task->scroll_x;
y+=win_task->scroll_y;
@@ -665,7 +665,7 @@ public I64 GrPutChar(CDC *dc=gr.dc,I64 x,I64 y,U8 ch)
w2=FONT_WIDTH;
h2=FONT_HEIGHT;
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
x+=win_task->pix_left;
y+=win_task->pix_top;
}
@@ -676,7 +676,7 @@ public I64 GrPutChar(CDC *dc=gr.dc,I64 x,I64 y,U8 ch)
dc->nearest_sprite_elem_num=dc->cur_sprite_elem_num;
}
}
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
if (x+w1<0) w1=-x;
if (x+w2>win_task->pix_right+1)
w2=win_task->pix_right+1-x;
@@ -729,7 +729,7 @@ public I64 GrPutChar(CDC *dc=gr.dc,I64 x,I64 y,U8 ch)
color_mask=gr.to_8_colors[color.c0.color];
k1=x+w1;
kk1=(h1+y)*dc->width_internal+k1;
if (!(dc->flags & DCF_SCREEN_BITMAP) || dc->flags&DCF_ON_TOP) {
if (!(dc->flags & DCF_SCRN_BITMAP) || dc->flags&DCF_ON_TOP) {
if (leading_pixels) {
dst=dc->body+kk1&~7;
src=font_ptr;
@@ -937,7 +937,7 @@ public I64 GrRect(CDC *dc=gr.dc,I64 x,I64 y,I64 w,I64 h)
Bool dither,probability_dither;
CTask *win_task;
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
win_task=dc->win_task;
x+=win_task->scroll_x;
y+=win_task->scroll_y;
@@ -954,7 +954,7 @@ public I64 GrRect(CDC *dc=gr.dc,I64 x,I64 y,I64 w,I64 h)
w2=w;
h2=h;
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
x+=win_task->pix_left;
y+=win_task->pix_top;
}
@@ -968,7 +968,7 @@ public I64 GrRect(CDC *dc=gr.dc,I64 x,I64 y,I64 w,I64 h)
dc->nearest_sprite_elem_num=dc->cur_sprite_elem_num;
}
}
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
if (x+w1<0) w1=-x;
if (x+w2>win_task->pix_right+1)
w2=win_task->pix_right+1-x;
@@ -1028,7 +1028,7 @@ public I64 GrRect(CDC *dc=gr.dc,I64 x,I64 y,I64 w,I64 h)
}
res+=dc->collision_cnt;
} else {
if (!(dc->flags & DCF_SCREEN_BITMAP) || dc->flags&DCF_ON_TOP)
if (!(dc->flags & DCF_SCRN_BITMAP) || dc->flags&DCF_ON_TOP)
win_z_buf_ptr=NULL;
else {
win_z_num=win_task->win_z_num;
@@ -1380,7 +1380,7 @@ I64 GrRayLenMinus(CDC *dc,I64 x,I64 y)
Bool not_color=ToBool(dc->flags&DCF_FILL_NOT_COLOR);
CTask *win_task;
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
win_task=dc->win_task;
x+=win_task->scroll_x;
y+=win_task->scroll_y;
@@ -1389,7 +1389,7 @@ I64 GrRayLenMinus(CDC *dc,I64 x,I64 y)
y3=y;
if (x3<0 || y3<0)
goto gr_done;
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
x3+=win_task->pix_left;
y3+=win_task->pix_top;
if (!(0<=x3<=win_task->pix_right) || !(0<=y3<=win_task->pix_bottom) ||
@@ -1404,7 +1404,7 @@ I64 GrRayLenMinus(CDC *dc,I64 x,I64 y)
while (TRUE) {
x3=x;
if (x3&(FONT_WIDTH-1)==FONT_WIDTH-1) {
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
if (x3<0) break;
x3+=win_task->pix_left;
if (!(0<=x3<=win_task->pix_right) || x3>=dc->width ||
@@ -1413,7 +1413,7 @@ I64 GrRayLenMinus(CDC *dc,I64 x,I64 y)
} else
if (!(0<=x3<dc->width))
break;
} else if (dc->flags & DCF_SCREEN_BITMAP)
} else if (dc->flags & DCF_SCRN_BITMAP)
x3+=win_task->pix_left;
dst=dst2+x3;
c=*dst;
@@ -1447,7 +1447,7 @@ I64 GrRayLen(CDC *dc,I64 *x1,I64 y,I64 z=0,I32 *db=NULL)
I32 *db2;
CTask *win_task;
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
win_task=dc->win_task;
x+=win_task->scroll_x;
y+=win_task->scroll_y;
@@ -1458,7 +1458,7 @@ I64 GrRayLen(CDC *dc,I64 *x1,I64 y,I64 z=0,I32 *db=NULL)
y3=y;
if (x3<0 || y3<0)
goto gr_done;
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
x3+=win_task->pix_left;
y3+=win_task->pix_top;
if (!(0<=x3<=win_task->pix_right) || !(0<=y3<=win_task->pix_bottom) ||
@@ -1487,7 +1487,7 @@ I64 GrRayLen(CDC *dc,I64 *x1,I64 y,I64 z=0,I32 *db=NULL)
while (TRUE) {
x3=x;
if (!(x3&(FONT_WIDTH-1))) {
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
if (x3<0) break;
x3+=win_task->pix_left;
if (!(0<=x3<=win_task->pix_right) || x3>=dc->width ||
@@ -1497,7 +1497,7 @@ I64 GrRayLen(CDC *dc,I64 *x1,I64 y,I64 z=0,I32 *db=NULL)
if (!(0<=x3<dc->width))
break;
}
} else if (dc->flags & DCF_SCREEN_BITMAP)
} else if (dc->flags & DCF_SCRN_BITMAP)
x3+=win_task->pix_left;
dst=dst2+x3;
@@ -1558,7 +1558,7 @@ I64 GrRayLen(CDC *dc,I64 *x1,I64 y,I64 z=0,I32 *db=NULL)
} else
break;
}
if (dc->flags & DCF_SCREEN_BITMAP)
if (dc->flags & DCF_SCRN_BITMAP)
*x1=x-1-win_task->scroll_x;
else
*x1=x-1;
@@ -1566,7 +1566,7 @@ I64 GrRayLen(CDC *dc,I64 *x1,I64 y,I64 z=0,I32 *db=NULL)
while (TRUE) {
x3=x;
if (x3&(FONT_WIDTH-1)==FONT_WIDTH-1) {
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
if (x3<0) break;
x3+=win_task->pix_left;
if (!(0<=x3<=win_task->pix_right) || x3>=dc->width ||
@@ -1575,7 +1575,7 @@ I64 GrRayLen(CDC *dc,I64 *x1,I64 y,I64 z=0,I32 *db=NULL)
} else
if (!(0<=x3<dc->width))
break;
} else if (dc->flags & DCF_SCREEN_BITMAP)
} else if (dc->flags & DCF_SCRN_BITMAP)
x3+=win_task->pix_left;
dst=dst2+x3;
@@ -1656,7 +1656,7 @@ public I64 GrHLine(CDC *dc=gr.dc,I64 x1,I64 x2,I64 y,I64 z1=0,I64 z2=0)
return GrRect(dc,x1,y,x2-x1+1,1);
}
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
win_task=dc->win_task;
x1+=win_task->scroll_x;
x2+=win_task->scroll_x;
@@ -1685,7 +1685,7 @@ public I64 GrHLine(CDC *dc=gr.dc,I64 x1,I64 x2,I64 y,I64 z1=0,I64 z2=0)
} else
i=0;
j=0;
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
x1+=win_task->pix_left;
x2+=win_task->pix_left;
if (x1>win_task->pix_right)
@@ -1731,7 +1731,7 @@ public I64 GrHLine(CDC *dc=gr.dc,I64 x1,I64 x2,I64 y,I64 z1=0,I64 z2=0)
if (dc->flags & DCF_DONT_DRAW)
goto gr_done;
if (!(dc->flags & DCF_SCREEN_BITMAP) ||
if (!(dc->flags & DCF_SCRN_BITMAP) ||
win_task->next_task==sys_winmgr_task ||
dc->flags&DCF_ON_TOP || !IsPixCovered0(win_task,x1,y))
char_clear=TRUE;
@@ -1799,7 +1799,7 @@ public I64 GrHLine(CDC *dc=gr.dc,I64 x1,I64 x2,I64 y,I64 z1=0,I64 z2=0)
db++;
z+=dz;
if (!(x1&(FONT_WIDTH-1)) && x1<=x2) {
if (!(dc->flags & DCF_SCREEN_BITMAP)||
if (!(dc->flags & DCF_SCRN_BITMAP)||
win_task->next_task==sys_winmgr_task ||
dc->flags&DCF_ON_TOP || !IsPixCovered0(win_task,x1,y))
char_clear=TRUE;
@@ -1827,7 +1827,7 @@ public I64 GrVLine(CDC *dc=gr.dc,I64 x,I64 y1,I64 y2,I64 z1=0,I64 z2=0)
return GrRect(dc,x,y1,1,y2-y1+1);
}
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
win_task=dc->win_task;
x +=win_task->scroll_x;
y1+=win_task->scroll_y;
@@ -1856,7 +1856,7 @@ public I64 GrVLine(CDC *dc=gr.dc,I64 x,I64 y1,I64 y2,I64 z1=0,I64 z2=0)
} else
i=0;
j=0;
if (dc->flags & DCF_SCREEN_BITMAP) {
if (dc->flags & DCF_SCRN_BITMAP) {
y1+=win_task->pix_top;
y2+=win_task->pix_top;
if (y1>win_task->pix_bottom)
@@ -1902,7 +1902,7 @@ public I64 GrVLine(CDC *dc=gr.dc,I64 x,I64 y1,I64 y2,I64 z1=0,I64 z2=0)
if (dc->flags & DCF_DONT_DRAW)
goto gr_done;
if (!(dc->flags & DCF_SCREEN_BITMAP) ||
if (!(dc->flags & DCF_SCRN_BITMAP) ||
win_task->next_task==sys_winmgr_task ||
dc->flags&DCF_ON_TOP || !IsPixCovered0(win_task,x,y1))
char_clear=TRUE;
@@ -1970,7 +1970,7 @@ public I64 GrVLine(CDC *dc=gr.dc,I64 x,I64 y1,I64 y2,I64 z1=0,I64 z2=0)
db+=dc->width_internal;
z+=dz;
if (!(y1&(FONT_HEIGHT-1)) && y1<=y2) {
if (!(dc->flags & DCF_SCREEN_BITMAP)||
if (!(dc->flags & DCF_SCRN_BITMAP)||
win_task->next_task==sys_winmgr_task ||
dc->flags&DCF_ON_TOP || !IsPixCovered0(win_task,x,y1))
char_clear=TRUE;