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

Nightly update (ISO SHA-1 0c4684d)

Browse Source
This commit is contained in:
TempleOS-bot committed 2017-01-26 00:27:26 -05:00
1 parent b650d335ae
commit 5b8305130b
43 files changed
+183 -179
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

TempleOSCD/Adam/Gr/GrEnd.HC
+7 -7
View File
@@ -10,20 +10,20 @@ U0 CtrlAltZ(I64 sc)
CtrlAltCBSet('Z',&CtrlAltZ,"Cmd /Zoom In",
"Cmd /Zoom Out");
U0 Scrn2Clipboard(I64)
U0 Scrn2Clip(I64)
{
CDC *dc=DCScrnCapture;
U8 *elems=DC2Sprite(dc);
Bool unlock_doc=DocLock(sys_clipboard_doc);
ClipboardDel;
DocSprite(sys_clipboard_doc,elems);
Bool unlock_doc=DocLock(sys_clip_doc);
ClipDel;
DocSprite(sys_clip_doc,elems);
if (unlock_doc)
DocUnlock(sys_clipboard_doc);
DocUnlock(sys_clip_doc);
Free(elems);
DCDel(dc);
}
U0 CtrlAltS(I64)
{
Spawn(&Scrn2Clipboard);
Spawn(&Scrn2Clip);
}
CtrlAltCBSet('S',&CtrlAltS,"Cmd /Scrn Shot to Clipboard");
CtrlAltCBSet('S',&CtrlAltS,"Cmd /Scrn Shot to Clip");
TempleOSCD/Adam/Gr/SpriteBitMap.HC
+24 -24
View File
@@ -75,10 +75,10 @@ I64 PopUpSpriteBitMap(CColorROPU32 color,I64 width)
"$$MU-UL,\"Flood Fill Not Color\",LE=SPBM_FLOOD_FILL_NOT$$\n"
"$$MU-UL,\"PolyLine\",LE=SPBM_POLYLINE$$\n"
"$$MU-UL,\"PolyPoint\",LE=SPBM_POLYPT$$\n"
"\n$$MU-UL,\"Copy to Clipboard\",LE=SPBM_COPY$$\n"
"$$MU-UL,\"Delete to Clipboard\",LE=SPBM_DELETE$$\n"
"$$MU-UL,\"Paste Clipboard\",LE=SPBM_PASTE$$\n"
"$$MU-UL,\"Paste Transparent Clipboard\",LE=SPBM_PASTE_TRANSPARENT$$\n"
"\n$$MU-UL,\"Copy to Clip\",LE=SPBM_COPY$$\n"
"$$MU-UL,\"Delete to Clip\",LE=SPBM_DELETE$$\n"
"$$MU-UL,\"Paste Clip\",LE=SPBM_PASTE$$\n"
"$$MU-UL,\"Paste Transparent Clip\",LE=SPBM_PASTE_TRANSPARENT$$\n"
"\n$$MU-UL,\"Save BMP File\",LE=SPBM_SAVE_BMP$$\n"
"$$MU-UL,\"Save GR File\",LE=SPBM_SAVE_GRA$$\n"
"\n$$MU-UL,\"Undo\",LE=SPBM_UNDO$$\n"
@@ -208,7 +208,7 @@ I64 SpriteBitMapEd(CDoc *,CDocEntry *doc_e,CDC *dc,I64 *_xx1,I64 *_yy1,
U8 *st=NULL;
CEdFileName filename;
CDC *img=*_img,
*clipboard=NULL,*undo=NULL,*dc2;
*clip=NULL,*undo=NULL,*dc2;
SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
doc_e->de_flags|=DOCEF_DONT_DRAW;
@@ -390,14 +390,14 @@ bm_menu:
break;
case SPBM_PASTE:
case SPBM_PASTE_TRANSPARENT:
if (clipboard) {
if (clip) {
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
if (mode==SPBM_PASTE) {
clipboard->flags|=DCF_NO_TRANSPARENTS;
GrBlot(dc,arg1,arg2,clipboard);
clipboard->flags&=~DCF_NO_TRANSPARENTS;
clip->flags|=DCF_NO_TRANSPARENTS;
GrBlot(dc,arg1,arg2,clip);
clip->flags&=~DCF_NO_TRANSPARENTS;
} else {
dc2=DCCopy(clipboard);
dc2=DCCopy(clip);
DCColorChg(dc2,bkcolor);
GrBlot(dc,arg1,arg2,dc2);
DCDel(dc2);
@@ -517,14 +517,14 @@ bm_menu:
break;
case SPBM_PASTE:
case SPBM_PASTE_TRANSPARENT:
if (clipboard) {
if (clip) {
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
if (mode==SPBM_PASTE) {
clipboard->flags|=DCF_NO_TRANSPARENTS;
GrBlot(dc,arg1,arg2,clipboard);
clipboard->flags&=~DCF_NO_TRANSPARENTS;
clip->flags|=DCF_NO_TRANSPARENTS;
GrBlot(dc,arg1,arg2,clip);
clip->flags&=~DCF_NO_TRANSPARENTS;
} else {
dc2=DCCopy(clipboard);
dc2=DCCopy(clip);
DCColorChg(dc2,bkcolor);
GrBlot(dc,arg1,arg2,dc2);
DCDel(dc2);
@@ -611,9 +611,9 @@ bm_menu:
y11=arg2;
y22=y1;
}
DCDel(clipboard);
clipboard=DCExt(img,x11-xx1,y11-yy1,x22-xx1,y22-yy1);
clipboard->bkcolor=bkcolor;
DCDel(clip);
clip=DCExt(img,x11-xx1,y11-yy1,x22-xx1,y22-yy1);
clip->bkcolor=bkcolor;
if (mode==SPBM_DELETE) {
img->color=bkcolor;
GrRect(img,x11-xx1,y11-yy1,x22-x11+1,y22-y11+1);
@@ -629,14 +629,14 @@ bm_menu:
break;
case SPBM_PASTE:
case SPBM_PASTE_TRANSPARENT:
if (clipboard) {
if (clip) {
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
if (mode==SPBM_PASTE) {
clipboard->flags|=DCF_NO_TRANSPARENTS;
GrBlot(img,arg1-xx1,arg2-yy1,clipboard);
clipboard->flags&=~DCF_NO_TRANSPARENTS;
clip->flags|=DCF_NO_TRANSPARENTS;
GrBlot(img,arg1-xx1,arg2-yy1,clip);
clip->flags&=~DCF_NO_TRANSPARENTS;
} else {
dc2=DCCopy(clipboard);
dc2=DCCopy(clip);
DCColorChg(dc2,bkcolor);
GrBlot(img,arg1-xx1,arg2-yy1,dc2);
DCDel(dc2);
@@ -665,7 +665,7 @@ bm_menu:
bm_key_up_done:
GetMsg(,,1<<MSG_KEY_UP);
bm_done:
DCDel(clipboard);
DCDel(clip);
DCDel(undo);
Free(st);
DCFill(dc);
TempleOSCD/Adam/Gr/SpriteEd.HC
+9 -9
View File
@@ -724,7 +724,7 @@ Bool SpriteEdText(CSprite **_head,I64 *_cur_elem_num)
#define SPED_SET_ORIGIN 10
#define SPED_SHIFT_SUB_ORIGIN 11
#define SPED_TEXT_ED 12
#define SPED_INS_CLIPBOARD 13
#define SPED_INS_CLIP 13
#define SPED_MAIN_MENU 14
#define SPED_EXIT 15
@@ -733,7 +733,7 @@ U0 GrInit3()
DefineLstLoad("ST_SPRITE_ED_MENU","Select/Unselect All\0 \0Select\0"
"Select Rects\0Unselect\0Unselect Rects\0Shift Points\0Shift Rects\0"
"Shift Selected\0Transform Selected\0Set Origin\0"
"Insert Shift SubOrigin\0Edit as Text\0Insert Clipboard\0Main Menu\0");
"Insert Shift SubOrigin\0Edit as Text\0Insert Clip\0Main Menu\0");
}
GrInit3;
@@ -757,7 +757,7 @@ I64 PopUpSpriteEd(CSprite **_head,I64 *_cur_elem_num)
"$$MU-UL,\"Set Origin\",LE=SPED_SET_ORIGIN$$\n"
"$$MU-UL,\"Insert Shift SubOrigin\",LE=SPED_SHIFT_SUB_ORIGIN$$\n\n"
"$$MU-UL,\"Edit as Text\",LE=SPED_TEXT_ED$$\n"
"$$MU-UL,\"Insert Clipboard Sprite's\",LE=SPED_INS_CLIPBOARD$$\n\n"
"$$MU-UL,\"Insert Clip Sprite's\",LE=SPED_INS_CLIP$$\n\n"
"$$PURPLE$$$$MU-UL,\"+] Sprite Main Menu\",LE=SPED_MAIN_MENU$$$$LTBLUE$$\n"
"$$MU-UL,\"Exit Sprite\",LE=SPED_EXIT$$\n"
"$$MU-UL,\"Abort Sprite\",LE=DOCM_CANCEL$$");
@@ -1218,17 +1218,17 @@ I64 SpriteEd(CDoc *doc,CDocEntry *doc_ce,I64 x,I64 y,
} while (msg_code!=MSG_MS_L_UP);
*_cur_elem_num+=1;
break;
case SPED_INS_CLIPBOARD:
RegOneTimePopUp(ARf_CSPRITE_INS_CLIPBOARD,
case SPED_INS_CLIP:
RegOneTimePopUp(ARf_CSPRITE_INS_CLIP,
"You will probably want to shift around\n"
"the location of element groups. Use\n"
"'Insert shift sub-origin' after picking the\n"
"element to insert before. Or,\n"
"use 'shift points'.\n");
insert_pt=SpriteSetSettings(,*_head,*_cur_elem_num);
unlock=DocLock(sys_clipboard_doc);
doc_e2=sys_clipboard_doc->head.next;
while (doc_e2!=sys_clipboard_doc) {
unlock=DocLock(sys_clip_doc);
doc_e2=sys_clip_doc->head.next;
while (doc_e2!=sys_clip_doc) {
if (doc_e2->type_u8==DOCT_SPRITE) {
head2=Sprite2SpriteQue(doc_e2->bin_data->data);
if (head2->next!=head2) {
@@ -1249,7 +1249,7 @@ I64 SpriteEd(CDoc *doc,CDocEntry *doc_ce,I64 x,I64 y,
doc_e2=doc_e2->next;
}
if (unlock)
DocUnlock(sys_clipboard_doc);
DocUnlock(sys_clip_doc);
SpriteEdUpdate(doc,doc_ce,*_head);
break;
case SPED_TEXT_ED:
TempleOSCD/Adam/Gr/SpriteMesh.HC
+33 -33
View File
@@ -588,33 +588,33 @@ U0 MeshCursorW(CMeshFrame *e,CTask *task,I64 *_x,I64 *_y,I64 *_z)
*_x=x; *_y=y; *_z=z;
}
CMeshEdVertex sys_clipboard_vertex_head;
CMeshEdTri sys_clipboard_tri_head;
CMeshEdVertex sys_clip_vertex_head;
CMeshEdTri sys_clip_tri_head;
U0 MeshClipboardInit()
U0 MeshClipInit()
{
QueInit(&sys_clipboard_vertex_head);
QueInit(&sys_clipboard_tri_head);
QueInit(&sys_clip_vertex_head);
QueInit(&sys_clip_tri_head);
}
U0 MeshClipboardRst()
U0 MeshClipRst()
{
QueDel(&sys_clipboard_vertex_head,TRUE);
QueDel(&sys_clipboard_tri_head,TRUE);
MeshClipboardInit;
QueDel(&sys_clip_vertex_head,TRUE);
QueDel(&sys_clip_tri_head,TRUE);
MeshClipInit;
}
U0 MeshClipboardCopy(CMeshFrame *e)
U0 MeshClipCopy(CMeshFrame *e)
{
CMeshEdVertex *tmpv=e->vertex_head.next,*tmpv2;
CMeshEdTri *tmpt=e->tri_head.next,*tmpt2;
MeshClipboardRst;
MeshClipRst;
while (tmpv!=&e->vertex_head) {
if (tmpv->flags&VF_SEL) {
tmpv->copy=tmpv2=ACAlloc(sizeof(CMeshEdVertex));
MemCpy(&tmpv2->p,&tmpv->p,sizeof(CD3I32));
QueIns(tmpv2,sys_clipboard_vertex_head.last);
QueIns(tmpv2,sys_clip_vertex_head.last);
tmpv->flags|=VF_COPIED;
tmpv->flags&=~VF_SEL;
} else {
@@ -631,7 +631,7 @@ U0 MeshClipboardCopy(CMeshFrame *e)
tmpt2->t[1]=tmpt->t[1]->copy;
tmpt2->t[2]=tmpt->t[2]->copy;
tmpt2->mt.color=tmpt->mt.color;
QueIns(tmpt2,sys_clipboard_tri_head.last);
QueIns(tmpt2,sys_clip_tri_head.last);
tmpt->flags|=TF_COPIED;
tmpt->flags&=~TF_SEL;
} else
@@ -640,11 +640,11 @@ U0 MeshClipboardCopy(CMeshFrame *e)
}
}
U0 MeshClipboardCut(CMeshFrame *e)
U0 MeshClipCut(CMeshFrame *e)
{
CMeshEdVertex *tmpv=e->vertex_head.next,*tmpv1;
CMeshEdTri *tmpt=e->tri_head.next,*tmpt1;
MeshClipboardCopy(e);
MeshClipCopy(e);
while (tmpt!=&e->tri_head) {
tmpt1=tmpt->next;
if (tmpt->flags&TF_COPIED)
@@ -659,8 +659,8 @@ U0 MeshClipboardCut(CMeshFrame *e)
}
}
U0 MeshClipboardDel(CMeshFrame *e)
{//Technically not clipboard
U0 MeshClipDel(CMeshFrame *e)
{//Technically not clip
CMeshEdVertex *tmpv=e->vertex_head.next,*tmpv1;
CMeshEdTri *tmpt=e->tri_head.next,*tmpt1;
while (tmpt!=&e->tri_head) {
@@ -677,14 +677,14 @@ U0 MeshClipboardDel(CMeshFrame *e)
}
}
U0 MeshClipboardPaste(CMeshFrame *e)
U0 MeshClipPaste(CMeshFrame *e)
{
CMeshEdVertex *tmpv2=sys_clipboard_vertex_head.next,*tmpv;
CMeshEdTri *tmpt2=sys_clipboard_tri_head.next,*tmpt;
CMeshEdVertex *tmpv2=sys_clip_vertex_head.next,*tmpv;
CMeshEdTri *tmpt2=sys_clip_tri_head.next,*tmpt;
MeshVertexSelAll(e,FALSE);
MeshTriSelAll(e,FALSE);
while (tmpv2!=&sys_clipboard_vertex_head) {
while (tmpv2!=&sys_clip_vertex_head) {
tmpv2->copy=tmpv=CAlloc(sizeof(CMeshEdVertex));
MemCpy(&tmpv->p,&tmpv2->p,sizeof(CD3I32));
QueIns(tmpv,e->vertex_head.last);
@@ -692,7 +692,7 @@ U0 MeshClipboardPaste(CMeshFrame *e)
tmpv2=tmpv2->next;
}
while (tmpt2!=&sys_clipboard_tri_head) {
while (tmpt2!=&sys_clip_tri_head) {
tmpt=MeshTriNew(e,tmpt2->mt.color,tmpt2->t[0]->copy,
tmpt2->t[1]->copy,tmpt2->t[2]->copy);
tmpt->flags|=TF_SEL;
@@ -700,7 +700,7 @@ U0 MeshClipboardPaste(CMeshFrame *e)
}
}
MeshClipboardInit;
MeshClipInit;
U0 DrawIt(CTask *task,CDC *dc)
{
@@ -1088,10 +1088,10 @@ me_restart:
switch (arg2.u8[0]) {
case SC_DELETE:
if (arg2&SCF_SHIFT)
goto me_clipboard_cut;
goto me_clip_cut;
else {
if (MeshSelCnt(&e))
MeshClipboardDel(&e);
MeshClipDel(&e);
else if (e.ed_mode!='t')
MeshVertexDel(&e,MeshVertexFindScrPt(&e,
ms.presnap.x-Fs->pix_left-Fs->scroll_x,
@@ -1103,9 +1103,9 @@ me_restart:
break;
case SC_INS:
if (arg2&SCF_CTRL)
goto me_clipboard_copy;
goto me_clip_copy;
else if (arg2&SCF_SHIFT)
goto me_clipboard_paste;
goto me_clip_paste;
}
break;
case CH_BACKSPACE:
@@ -1209,27 +1209,27 @@ me_chain:
WinBorder(Bt(&Fs->display_flags,DISPLAYf_NO_BORDER));
break;
case CH_CTRLC:
me_clipboard_copy:
me_clip_copy:
if (e.ed_mode=='t') {
Beep;Beep;
} else
MeshClipboardCopy(&e);
MeshClipCopy(&e);
break;
case CH_CTRLV:
me_clipboard_paste:
me_clip_paste:
if (e.ed_mode=='t') {
Beep;Beep;
} else {
MeshClipboardPaste(&e);
MeshClipPaste(&e);
e.ed_mode='m';
}
break;
case CH_CTRLX:
me_clipboard_cut:
me_clip_cut:
if (e.ed_mode=='t') {
Beep;Beep;
} else
MeshClipboardCut(&e);
MeshClipCut(&e);
break;
case CH_SHIFT_ESC:
save_and_exit=FALSE;