Scrn -> Screen

This commit is contained in:
xmm15 2020-02-15 17:19:08 -06:00
parent ee7d6771ed
commit 9a0c43d8b4
50 changed files with 659 additions and 659 deletions

Binary file not shown.

View File

@ -19,7 +19,7 @@ This uses four types of output
4) The Fs->next_ctrl for the tempo/stacatto sliders.
See $LK,"GrUpdateTaskWin",A="MN:GrUpdateTaskWin"$(), $LK,"GrUpdateTasks",A="MN:GrUpdateTasks"$() and $LK,"GrUpdateScrn",A="MN:GrUpdateScrn"$().
See $LK,"GrUpdateTaskWin",A="MN:GrUpdateTaskWin"$(), $LK,"GrUpdateTasks",A="MN:GrUpdateTasks"$() and $LK,"GrUpdateScreen",A="MN:GrUpdateScreen"$().
$WW,1$$WW,0$*/
#define PSMT_HEAD 0

Binary file not shown.

View File

@ -38,8 +38,8 @@ U0 StartUpTasks()
}
if (DriveIsWritable(':')) {
DelTree("::/Tmp/ScrnShots");
DirMk("::/Tmp/ScrnShots");
DelTree("::/Tmp/ScreenShots");
DirMk("::/Tmp/ScreenShots");
}
StartUpTasks;

Binary file not shown.

View File

@ -64,7 +64,7 @@ U0 DistroPrep()
DelTree("/Tmp");
DirMk("/Tmp");
DirMk("/Tmp/ScrnShots");
DirMk("/Tmp/ScreenShots");
Touch("/PersonalMenu.DD","+T");
Touch("/Home/PersonalMenu.DD","+T");

View File

@ -16,8 +16,8 @@ I64 CopyVideo()
return res;
}
#help_index "ScrnCast/TOS"
U0 DelScrnShots()
#help_index "ScreenCast/TOS"
U0 DelScreenShots()
{
Bool old_silent=Silent;
DelTree("B:/Tmp");
@ -37,12 +37,12 @@ public U0 FrameGrabberToggle(Bool sync_tone,Bool tos_theme,
last_time=tS;
if (fg_on) {
fg_on=FALSE;
ScrnCast(OFF);
ScreenCast(OFF);
User("CopyVideo;Exit;\n");
} else {
DelScrnShots;
DelScreenShots;
fg_on=TRUE;
ScrnCast(ON,just_audio);
ScreenCast(ON,just_audio);
if (sync_tone) {Beep;}
if (tos_theme) {User("ExeFile(\"~/TOS/TOSTheme\");Exit;\n");}
}

View File

@ -29,7 +29,7 @@ U0 SrcExample()
}
SrcExample;
//See $LK,"::/Demo/ScrnCodes.HC"$, $LK,"::/Demo/Graphics/CharAnimation.HC"$,
//See $LK,"::/Demo/ScreenCodes.HC"$, $LK,"::/Demo/Graphics/CharAnimation.HC"$,
//$LK,"::/Demo/Games/CharDemo.HC"$ and $LK,"::/Demo/Graphics/FontEd.HC"$.
//See $LK,"char_bmp_alpha",A="MN:char_bmp_alpha"$ and $LK,"char_bmp_alpha_numeric",A="MN:char_bmp_alpha_numeric"$.

View File

@ -158,7 +158,7 @@ U0 DrawIt(CTask *task,CDC *dc)
Mat4x4MulXYZ(dc->r,&xh,&yh,&zh);
Mat4x4TranslationEqu(dc->r,xh,yh,zh);
//Scrn to world
//Screen to world
s2w=Mat4x4IdentNew(task);
Mat4x4RotX(s2w,-ã/2);
Mat4x4RotZ(s2w,-man_é-ã/2);

View File

@ -793,7 +793,7 @@ U0 FlatTops()
PopUpOk("$$GREEN$${Left-Mouse}$$FG$$\t\tChange Course\n"
"$$GREEN$${Right-Mouse}$$FG$$\t\tLaunch Squadron\n"
"$$GREEN$${Right-Double-Mouse}$$FG$$\tReturn Squadron\n"
"$$GREEN$${Ctrl-Left Grab}$$FG$$\tScroll Scrn\n");
"$$GREEN$${Ctrl-Left Grab}$$FG$$\tScroll Screen\n");
MenuPush(
"File {"
" Abort(,CH_SHIFT_ESC);"

View File

@ -17,7 +17,7 @@ U0 StadiumGen()
gr.fp_final_scrn_update=NULL;
Refresh(2,TRUE);
dc2=DCScrnCapture;
dc2=DCScreenCapture;
dc=DCExt(dc2,0,FONT_HEIGHT,GR_WIDTH,GR_HEIGHT);
DCDel(dc2);

View File

@ -592,7 +592,7 @@ U0 MPDrawIt(CTask *task,CDC *dc)
Mat4x4RotZ(dc->r,roll);
DCMat4x4Set(dc,dc->r);
//Scrn to world coordinates
//Screen to world coordinates
//This gives us the vects for stepping through the grid in
//the direction the plane is facing. we step horizontally and vertically
@ -969,7 +969,7 @@ U0 AnimateTask(I64)
ms=1000*(tS-t0);
t0=tS;
if (!game_tf) {
//Scrn to world coordinates
//Screen to world coordinates
s2w=Mat4x4IdentNew;
Mat4x4RotZ(s2w,-roll);
Mat4x4RotX(s2w,-è);

View File

@ -1,6 +1,6 @@
U8 *old_font=text.font;
// See $LK,"::/Kernel/FontStd.HC"$, $LK,"::/Demo/ScrnCodes.HC"$,
// See $LK,"::/Kernel/FontStd.HC"$, $LK,"::/Demo/ScreenCodes.HC"$,
//$LK,"::/Demo/ExtChars.HC"$, and $LK,"::/Demo/Graphics/FontEd.HC"$.
U64 waves[4]={

Binary file not shown.

View File

@ -15,7 +15,7 @@ and cut and paste the code into $LK,"::/Kernel/FontStd.HC"$.
You will need to recompile Kernel by calling $LK,"BootHDIns",A="MN:BootHDIns"$().
See $LK,"::/Demo/ExtChars.HC"$, $LK,"::/Demo/Games/CharDemo.HC"$,
$LK,"::/Demo/Graphics/CharAnimation.HC"$ and $LK,"::/Demo/ScrnCodes.HC"$.
$LK,"::/Demo/Graphics/CharAnimation.HC"$ and $LK,"::/Demo/ScreenCodes.HC"$.
*/
#define BLOW_UP_CHAR_X (18*FONT_WIDTH)

View File

@ -4,10 +4,10 @@ U0 Main()
{
"Capture scrn...\n";
PressAKey;
GRScrnCaptureWrite("~/DemoScrnShot");
GRScreenCaptureWrite("~/DemoScreenShot");
"View captured scrn...\n";
PressAKey;
GRScrnCaptureRead("~/DemoScrnShot");
GRScreenCaptureRead("~/DemoScreenShot");
PressAKey;
DCFill;
}

View File

@ -128,5 +128,5 @@ This bit tells ZenithOS to update whole scrn.
MiniGrLibDemo;
//See $LK,"RawPutChar",A="MN:RawPutChar"$() for text.
//See $LK,"::/Demo/Lectures/ScrnMemory.HC"$ for color.
//See $LK,"::/Demo/Lectures/ScreenMemory.HC"$ for color.
//See $LK,"::/Demo/Lectures/GraphicsCPULoad.HC"$.

View File

@ -3,7 +3,7 @@
U0 PlotXY(I64 x,I64 y)
{
//Scrn bits are revd
//Screen bits are revd
LBts(text.vga_alias,y*GR_WIDTH+x^7);
}

View File

@ -15,7 +15,7 @@ U0 DrawIt(CTask *task,CDC *)
TextChar(task,,(i&15)*2,(i/16)*2,i+BLACK<<12+WHITE<<8);
}
U0 ScrnCodes()
U0 ScreenCodes()
{
SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
DocClear;
@ -24,4 +24,4 @@ U0 ScrnCodes()
SettingsPop;
}
ScrnCodes;
ScreenCodes;

View File

@ -32,7 +32,7 @@ $LK,"::/Demo/Games/Digits.HC"$
$LK,"::/Demo/Progress.HC"$ //has some ASM, just ignore
$LK,"::/Demo/Graphics/Symmetry.HC"$
$LK,"::/Demo/Graphics/Blot.HC"$
$LK,"::/Demo/Graphics/ScrnCapture.HC"$
$LK,"::/Demo/Graphics/ScreenCapture.HC"$
$LK,"::/Demo/Graphics/EdSprite.HC"$
$LK,"::/Demo/PullDownMenu.HC"$
$LK,"::/Demo/Graphics/Palette.HC"$
@ -55,7 +55,7 @@ $LK,"::/Demo/Graphics/SpritePlot3D.HC"$
$LK,"::/Demo/Graphics/Balloon.HC"$
$LK,"::/Demo/Graphics/RotateTank.HC"$
$LK,"::/Demo/Games/Wenceslas.HC"$
$LK,"::/Demo/ScrnCodes.HC"$
$LK,"::/Demo/ScreenCodes.HC"$
$LK,"::/Demo/Graphics/PanText.HC"$
$LK,"::/Demo/Graphics/CharAnimation.HC"$
$LK,"::/Demo/Games/Maze.HC"$

View File

@ -127,7 +127,7 @@ $FG,2$Rst$FG$ Reset
$FG,2$Rot$FG$ Rotation
$FG,2$Rx$FG$ Receive
$FG,2$Sched$FG$ Sceduler
$FG,2$Scrn$FG$ Screen
$FG,2$Screen$FG$ Screen
$FG,2$Sec$FG$ Second, Secondary
$FG,2$Sect$FG$ Sector
$FG,2$Sel$FG$ Select, Selected

Binary file not shown.

Binary file not shown.

View File

@ -1,6 +1,6 @@
$WW,1$$LK,"gr.text_base",A="MN:CGrGlbls"$ must be updated 30fps in your Fs->draw_it() callback. You probably want $LK,"GrPrint",A="MN:GrPrint"$() or just $LK,"Print",A="MN:Print"$(). The $LK,"DolDoc",A="FI:::/Doc/DolDocOverview.DD"$ code takes care of plotting text to $LK,"gr.text_base",A="MN:CGrGlbls"$.
Bits 0-7 8-Bit ASCII Scrn Code
Bits 0-7 8-Bit ASCII Screen Code
Bits 8-11 Foreground $LK,"color",A="MN:BLACK"$
Bits 12-15 Background $LK,"color",A="MN:BLACK"$
Bits 16-20 Signed X pos shift val

View File

@ -4,7 +4,7 @@ If a feature cannot be made to work correctly and consistently, professional com
The PCI bus interface is what modern hardware uses. Before PCI, life was simple and devices used I/O ports. After studying $LK,"PCI Interrupts",A="FI:::/Demo/Lectures/PCIInterrupts.HC"$ and attempting to do a HDAudio driver, I came to realize that modern PCI devices require ten times more code and I cannot even come close to making them work on everyone's machine because with PCI devices there are several models to worry about, unlike with the older ISA bus devices which can be done with one driver.
Currently, I have no PCI drivers. My drivers use I/O ports and operate in ISA bus mode. At this point, I only have one driver for each type of device and it is delightfully simple that way. I have one $LK,"keyboard",A="FI:::/Kernel/SerialDev/Keyboard.HC"$ driver, one $LK,"mouse",A="FI:::/Kernel/SerialDev/Mouse.HC"$ driver, one $LK,"ATA hard drive",A="FI:::/Kernel/BlkDev/DiskATA.HC"$ driver, one $LK,"ATAPI CD/DVD",A="FI:::/Kernel/BlkDev/DiskATA.HC"$ driver, one $LK,"VGA 640x480 16 color",A="FI:::/Zenith/Gr/GrScrn.HC"$ video driver and one $LK,"PC Speaker",A="MN:Snd"$ driver. I use the $LK,"PIT and HPET timers",A="MN:TimersInit"$ and $LK,"PIC Interrupt Controller",A="MN:IntsInit"$. I use IRQ0 for timer, IRQ1 for keyboard, and IRQ12 for mouse. If IRQ12 is not firing, I am able to poll the mouse.
Currently, I have no PCI drivers. My drivers use I/O ports and operate in ISA bus mode. At this point, I only have one driver for each type of device and it is delightfully simple that way. I have one $LK,"keyboard",A="FI:::/Kernel/SerialDev/Keyboard.HC"$ driver, one $LK,"mouse",A="FI:::/Kernel/SerialDev/Mouse.HC"$ driver, one $LK,"ATA hard drive",A="FI:::/Kernel/BlkDev/DiskATA.HC"$ driver, one $LK,"ATAPI CD/DVD",A="FI:::/Kernel/BlkDev/DiskATA.HC"$ driver, one $LK,"VGA 640x480 16 color",A="FI:::/Zenith/Gr/GrScreen.HC"$ video driver and one $LK,"PC Speaker",A="MN:Snd"$ driver. I use the $LK,"PIT and HPET timers",A="MN:TimersInit"$ and $LK,"PIC Interrupt Controller",A="MN:IntsInit"$. I use IRQ0 for timer, IRQ1 for keyboard, and IRQ12 for mouse. If IRQ12 is not firing, I am able to poll the mouse.
In the CPU department, I have state of the art 64-bit $LK,"long mode",A="FI:::/Kernel/KStart64.HC"$ with $LK,"multicore",A="FI:::/Kernel/MultiProc.HC"$ support. I use the $LK,"APIC",A="MN:MPAPICInit"$ and start-up $LK,"multicore",A="MN:Core0StartMP"$ operation.

View File

@ -34,7 +34,7 @@ U0 MakeMyISO(U8 *_out_iso_filename)
//Del("/Distro/Zenith/AutoComplete/ACDefs.DATA");
CopyTree("/Downloads","/Distro/Downloads"); //You can leave this out.
DirMk("/Distro/Tmp");
DirMk("/Distro/Tmp/ScrnShots");
DirMk("/Distro/Tmp/ScreenShots");
RedSeaISO(out_iso_filename,"/Distro","/Distro" BOOT_DIR_KERNEL_BIN_C);
//If CD-ROM use MT_CD instead of MT_DVD.

Binary file not shown.

View File

@ -4,7 +4,7 @@ U0 RawPutChar(I64 ch)
See $LK,"GrUpdateTextFG",A="MN:GrUpdateTextFG"$ for
the normal scrn text output routine.
See also $LK,"GrUpdateScrn",A="MN:GrUpdateScrn"$().
See also $LK,"GrUpdateScreen",A="MN:GrUpdateScreen"$().
*/
I64 i,row,col;
U8 *ptr,*ptr1,*ptr2;

View File

@ -26,7 +26,7 @@ CMsStateGlbls ms,ms_last;
CKbdStateGlbls kbd;
CKeyDevGlbls keydev;
CMsHardStateGlbls ms_hard,ms_hard_last;
CScrnCastGlbls scrncast;
CScreenCastGlbls scrncast;
CTextGlbls text;
U8 *(*fp_getstr2)(I64 flags=0);

View File

@ -203,7 +203,7 @@ U0 Snd(I8 ona=0)
}
}
Bool ScrnCast(Bool val=ON,Bool just_audio=FALSE,U8 *print_fmt="B:/Tmp/%X.GR")
Bool ScreenCast(Bool val=ON,Bool just_audio=FALSE,U8 *print_fmt="B:/Tmp/%X.GR")
{//WinMgr saves GR files to a dir.
Bool old_val;
scrncast.just_audio=just_audio;

File diff suppressed because one or more lines are too long

View File

@ -3771,7 +3771,7 @@ class CKeyDevGlbls
};
#help_index "Snd"
#help_index "ScrnCast;Snd/AU Files"
#help_index "ScreenCast;Snd/AU Files"
public class CAUData
{//Fmt of AU files
CDate cdt;
@ -3785,7 +3785,7 @@ class CSndData
I8 ona;
};
public class CScrnCastGlbls
public class CScreenCastGlbls
{
CSndData snd_head;
CDate t0_now;

View File

@ -664,10 +664,10 @@ public extern U8 *IntEntryGet(I64 irq);
public extern U8 *IntEntrySet(I64 irq,
U0 (*fp_new_hndlr)(),I64 type=IDTET_IRQ,I64 dpl=0);
#help_index "ScrnCast;Cmd Line (Typically)"
public extern Bool ScrnCast(Bool val=ON,Bool just_audio=FALSE,
#help_index "ScreenCast;Cmd Line (Typically)"
public extern Bool ScreenCast(Bool val=ON,Bool just_audio=FALSE,
U8 *print_fmt="B:/Tmp/%X.GR")
public extern CScrnCastGlbls scrncast;
public extern CScreenCastGlbls scrncast;
#help_index "Snd"
#help_file "::/Doc/Snd"

View File

@ -34,7 +34,7 @@ U0 MakeMyISO(U8 *_out_iso_filename)
//Del("/Distro/Zenith/AutoComplete/ACDefs.DATA");
CopyTree("/Downloads","/Distro/Downloads"); //You can leave this out.
DirMk("/Distro/Tmp");
DirMk("/Distro/Tmp/ScrnShots");
DirMk("/Distro/Tmp/ScreenShots");
RedSeaISO(out_iso_filename,"/Distro","/Distro" BOOT_DIR_KERNEL_BIN_C);
//If CD-ROM use MT_CD instead of MT_DVD.

View File

@ -3,7 +3,7 @@ U0 InstallDrive(U8 drv_let)
U8 *st;
ExePrint("CopyTree(\"::/\",\"%C:/\");",drv_let);
ExePrint("DirMk(\"%C:/Tmp\");",drv_let);
ExePrint("DirMk(\"%C:/Tmp/ScrnShots\");",drv_let);
ExePrint("DirMk(\"%C:/Tmp/ScreenShots\");",drv_let);
ExePrint("DirMk(\"%C:/Home\");",drv_let);
st=MStrPrint("%C:/Home/DoDistro.HC",drv_let);

View File

@ -266,10 +266,10 @@ U0 DoBSpline()
DeathWait(&task,TRUE);
}
U0 DoScrnCapture()
U0 DoScreenCapture()
{
CTask *task=User;
XTalkWait(task,"#include \"::/Demo/Graphics/ScrnCapture\";\n");
XTalkWait(task,"#include \"::/Demo/Graphics/ScreenCapture\";\n");
Sleep(500);
PostMsgWait(task,MSG_KEY_DOWN_UP,CH_SPACE,0);
Sleep(500);
@ -277,7 +277,7 @@ U0 DoScrnCapture()
Sleep(750);
PostMsgWait(task,MSG_KEY_DOWN_UP,CH_SPACE,0);
DeathWait(&task,TRUE);
Del("~/DemoScrnShot.GR*");
Del("~/DemoScreenShot.GR*");
}
U0 DoStadium()
@ -1592,7 +1592,7 @@ U0 OSTestSuite()
TS("BSpline"); DoBSpline;
TS("GrModels"); DoGrModels;
TS("Blot"); TSFileChar("::/Demo/Graphics/Blot",1800);
TS("ScrnCapture"); if (DriveIsWritable('~')) DoScrnCapture;
TS("ScreenCapture"); if (DriveIsWritable('~')) DoScreenCapture;
TS("Grid"); DoGrid;
TS("Pick"); DoPick;
TS("Pick3D"); DoPick3D;
@ -1633,7 +1633,7 @@ U0 OSTestSuite()
TS("FPrintF"); if (DriveIsWritable('~')) DoFPrintF;
TS("SerializeTree"); TSFile("::/Demo/Disk/SerializeTree");
TS("Exceptions"); DoExceptions;
TS("ScrnDCodes"); TSFileChar("::/Demo/ScrnCodes");
TS("ScreenDCodes"); TSFileChar("::/Demo/ScreenCodes");
TS("ExtChars"); TSFile("::/Demo/ExtChars");
TS("PanText"); TSFile("::/Demo/Graphics/PanText",0);
TS("CharAnimation"); TSFile("::/Demo/Graphics/CharAnimation");

Binary file not shown.

View File

@ -321,8 +321,8 @@ public U0 DrawWaitMs(CDC *dc,I64 x,I64 y)
dc->color=old_color;
}
#help_index "Graphics/GR Files;Graphics/Scrn"
public Bool GRScrnCaptureRead(U8 *filename,CDC *dc=gr.dc,I64 x=0,I64 y=0)
#help_index "Graphics/GR Files;Graphics/Screen"
public Bool GRScreenCaptureRead(U8 *filename,CDC *dc=gr.dc,I64 x=0,I64 y=0)
{//GrBlot ZenithOS GR File to dc,x,y.
CDC *dc2;
if (dc2=GRRead(filename)) {
@ -334,10 +334,10 @@ public Bool GRScrnCaptureRead(U8 *filename,CDC *dc=gr.dc,I64 x=0,I64 y=0)
return FALSE;
}
public I64 GRScrnCaptureWrite(U8 *filename,Bool include_zoom=TRUE)
public I64 GRScreenCaptureWrite(U8 *filename,Bool include_zoom=TRUE)
{//Capture scrn to a ZenithOS GR File.
I64 size;
CDC *dc=DCScrnCapture(include_zoom);
CDC *dc=DCScreenCapture(include_zoom);
size=GRWrite(filename,dc,DCSF_COMPRESSED|DCSF_PALETTE_GET);
DCDel(dc);
return size;

View File

@ -413,8 +413,8 @@ public U0 DocGR(CDoc *doc=NULL,U8 *filename)
DCDel(dc);
}
#help_index "Graphics/Device Contexts;Graphics/Scrn"
public CDC *DCScrnCapture(Bool include_zoom=TRUE,CTask *task=NULL)
#help_index "Graphics/Device Contexts;Graphics/Screen"
public CDC *DCScreenCapture(Bool include_zoom=TRUE,CTask *task=NULL)
{//Capture scrn to a device context.
CDC *dc;
U8 *dst;

View File

@ -1,4 +1,4 @@
#help_index "Graphics/Scrn"
#help_index "Graphics/Screen"
U0 CtrlAltZ(I64 sc)
{
@ -10,9 +10,9 @@ U0 CtrlAltZ(I64 sc)
CtrlAltCBSet('Z',&CtrlAltZ,"Cmd/Zoom In",
"Cmd/Zoom Out");
U0 Scrn2Clip(I64)
U0 Screen2Clip(I64)
{
CDC *dc=DCScrnCapture;
CDC *dc=DCScreenCapture;
U8 *elems=DC2Sprite(dc);
Bool unlock_doc=DocLock(sys_clip_doc);
ClipDel;
@ -24,6 +24,6 @@ U0 Scrn2Clip(I64)
}
U0 CtrlAltS(I64)
{
Spawn(&Scrn2Clip);
Spawn(&Screen2Clip);
}
CtrlAltCBSet('S',&CtrlAltS,"Cmd/Scrn Shot to Clip");
CtrlAltCBSet('S',&CtrlAltS,"Cmd/Screen Shot to Clip");

View File

@ -1,4 +1,4 @@
#help_index "Graphics/Scrn"
#help_index "Graphics/Screen"
U0 GrSetUpTables()
{
@ -93,7 +93,7 @@ U0 GrSetUpTables()
}
}
#help_index "Graphics/Scrn;Windows"
#help_index "Graphics/Screen;Windows"
U0 WinZBufFill(CTask *task)
{//Not public

View File

@ -1,4 +1,4 @@
#help_index "Graphics/Scrn"
#help_index "Graphics/Screen"
U0 GrUpdateTaskODEs(CTask *task)
{
@ -121,7 +121,7 @@ public U0 GrScaleZoom(F64 scale)
GrFixZoomScale;
}
U0 GrZoomInScrn()
U0 GrZoomInScreen()
{
GrFixZoomScale;
I64 plane,row,col,k,l,
@ -370,7 +370,7 @@ U0 GrUpdateVGAGraphics()
if (gr.scrn_zoom==1)
src=gr.dc1->body;
else {
GrZoomInScrn;
GrZoomInScreen;
src=gr.zoomed_dc->body;
}
dst=gr.scrn_image->body;
@ -395,8 +395,8 @@ U0 GrUpdateVGAGraphics()
}
}
U0 GrUpdateScrn()
{//Called by the Window Manager $LK,"HERE",A="FF:::/Zenith/WinMgr.HC,GrUpdateScrn"$, 30 times a second.
U0 GrUpdateScreen()
{//Called by the Window Manager $LK,"HERE",A="FF:::/Zenith/WinMgr.HC,GrUpdateScreen"$, 30 times a second.
CDC *dc;
if (!Bt(&sys_run_level,RLf_VGA)) //if text mode
GrUpdateTasks;

View File

@ -1,4 +1,4 @@
#help_index "ScrnCast;Graphics/Device Contexts;Graphics/GR Files"
#help_index "ScreenCast;Graphics/Device Contexts;Graphics/GR Files"
#define MV_FILE_MAX 0x007FF000
@ -57,7 +57,7 @@ public I64 GR2MV(U8 *print_fmt="VID%03d.MV",
return file_num;
}
#help_index "ScrnCast;Snd/AU Files"
#help_index "ScreenCast;Snd/AU Files"
public U0 SndShift(CSndData *head,F64 dt=0)
{//Shift CSndData in time.
CSndData *tmpsd,*tmpsd1;

View File

@ -232,7 +232,7 @@ I64 SpriteBitMapEd(CDoc *,CDocEntry *doc_e,CDC *dc,I64 *_xx1,I64 *_yy1,
res=SPE_CONT;
goto bm_key_up_done;
case 'c': //eye-dropper
dc2=DCScrnCapture(FALSE);
dc2=DCScreenCapture(FALSE);
color=GrPeek(dc2,ms.pos.x,ms.pos.y)^15;//Mouse cursor is XORed.
DCDel(dc2);
break;

View File

@ -43,8 +43,8 @@ I64 PopUpSpriteMain(CSprite **_head,I64 *_cur_elem_num,
"$$MU-UL,\"BSpline3\",LE=SPT_BSPLINE3$$\n"
"$$MU-UL,\"BSpline2 Closed\",LE=SPT_BSPLINE2_CLOSED$$\n"
"$$MU-UL,\"BSpline3 Closed\",LE=SPT_BSPLINE3_CLOSED$$\n"
"$$MU-UL,\"Insert Scrn-Captured BitMap\",LE=SPT_INS_SCRN_BITMAP$$\n"
"$$MU-UL,\"Insert Transparent Scrn-Captured BitMap\","
"$$MU-UL,\"Insert Screen-Captured BitMap\",LE=SPT_INS_SCRN_BITMAP$$\n"
"$$MU-UL,\"Insert Transparent Screen-Captured BitMap\","
"LE=SPT_INS_TRANSPARENT_SCRN_BITMAP$$\n"
"$$PURPLE$$$$MU-UL,\"+] Create or Edit 3D Mesh\",LE=SPT_MESH$$\n"
"$$MU-UL,\"+] Create or Edit Shiftable 3D Mesh\","
@ -101,7 +101,7 @@ Bool PopUpExtents(I64 *_x1,I64 *_x2,I64 *_y1,I64 *_y2)
return res;
}
U0 SpriteScrnInit(CDC *dc,I64,I64)
U0 SpriteScreenInit(CDC *dc,I64,I64)
{
//Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.HC"$.
I64 xx,yy,old_pen_width=dc->thick;
@ -136,7 +136,7 @@ CSprite *SMLine(CDC *dc,I64 x,I64 y,I64 arg1,I64 arg2,CColorROPU32 color)
dc->color=color&COLORROP_NO_ROP0_MASK;
GrLine3(dc,x1,y1,0,x2,y2,0);
msg_code=GetMsg(&arg1,&arg2,1<<MSG_MS_L_UP+1<<MSG_MS_MOVE);
SpriteScrnInit(dc,x,y);
SpriteScreenInit(dc,x,y);
x2=arg1; y2=arg2;
} while (msg_code!=MSG_MS_L_UP);
dc->color=color&COLORROP_NO_ROP0_MASK;
@ -158,7 +158,7 @@ CSprite *SMArrow(CDC *dc,I64 x,I64 y,I64 arg1,I64 arg2,CColorROPU32 color)
dc->color=color&COLORROP_NO_ROP0_MASK;
GrArrow3(dc,x1,y1,0,x2,y2,0);
msg_code=GetMsg(&arg1,&arg2,1<<MSG_MS_L_UP+1<<MSG_MS_MOVE);
SpriteScrnInit(dc,x,y);
SpriteScreenInit(dc,x,y);
x2=arg1; y2=arg2;
} while (msg_code!=MSG_MS_L_UP);
dc->color=color&COLORROP_NO_ROP0_MASK;
@ -184,7 +184,7 @@ CSprite *SMPlanarSymmetry(CDC *dc,I64 x,I64 y,I64 arg1,I64 arg2)
dc->color=ROPF_DITHER+WHITE<<16+BLACK;
GrLine3(dc,x1,y1,0,x2,y2,0);
msg_code=GetMsg(&arg1,&arg2,1<<MSG_MS_L_UP+1<<MSG_MS_MOVE);
SpriteScrnInit(dc,x,y);
SpriteScreenInit(dc,x,y);
x2=arg1; y2=arg2;
} while (msg_code!=MSG_MS_L_UP);
dc->flags=old_flags&DCF_SYMMETRY|dc->flags&~DCF_SYMMETRY;
@ -207,7 +207,7 @@ CSprite *SMRect(CDC *dc,I64 x,I64 y,I64 arg1,I64 arg2,CColorROPU32 color)
dc->color=color&COLORROP_NO_ROP0_MASK;
GrRect3(dc,xx1,yy1,0,xx2-xx1,yy2-yy1);
msg_code=GetMsg(&arg1,&arg2,1<<MSG_MS_L_UP+1<<MSG_MS_MOVE);
SpriteScrnInit(dc,x,y);
SpriteScreenInit(dc,x,y);
x2=arg1; y2=arg2;
if (x2<x1) {
xx1=x2; xx2=x1;
@ -231,7 +231,7 @@ CSprite *SMRect(CDC *dc,I64 x,I64 y,I64 arg1,I64 arg2,CColorROPU32 color)
return res;
}
CSprite *SMScrnBitMap(I64 eletype,CDC *dc,CDC *dc2,I64 x,I64 y,
CSprite *SMScreenBitMap(I64 eletype,CDC *dc,CDC *dc2,I64 x,I64 y,
I64 arg1,I64 arg2,CColorROPU32 bm_bkcolor)
{
I64 i,msg_code,x1=arg1,y1=arg2,x2=arg1,y2=arg2,
@ -245,7 +245,7 @@ CSprite *SMScrnBitMap(I64 eletype,CDC *dc,CDC *dc2,I64 x,I64 y,
GrBorder(dc2,xx1+Fs->pix_left+Fs->scroll_x,yy1+Fs->pix_top+Fs->scroll_y,
xx2+Fs->pix_left+Fs->scroll_x,yy2+Fs->pix_top+Fs->scroll_y);
msg_code=GetMsg(&arg1,&arg2,1<<MSG_MS_L_UP+1<<MSG_MS_MOVE);
SpriteScrnInit(dc,x,y);
SpriteScreenInit(dc,x,y);
x2=arg1; y2=arg2;
if (x2<x1) {
xx1=x2; xx2=x1;
@ -265,12 +265,12 @@ CSprite *SMScrnBitMap(I64 eletype,CDC *dc,CDC *dc2,I64 x,I64 y,
res->pwhu.height=yy2-yy1;
res->pwhu.x1=0;
res->pwhu.y1=0;
SpriteScrnInit(dc,x,y);
SpriteScreenInit(dc,x,y);
i=gr.scrn_zoom;
GrScaleZoom(1.0/i);
Refresh(2,TRUE);
dc3=DCScrnCapture;
dc3=DCScreenCapture;
img=DCExt(dc3,Fs->pix_left+Fs->scroll_x+xx1,Fs->pix_top+Fs->scroll_y+yy1,
Fs->pix_left+Fs->scroll_x+xx2-1,Fs->pix_top+Fs->scroll_y+yy2-1);
if (eletype==SPT_INS_TRANSPARENT_SCRN_BITMAP)
@ -293,7 +293,7 @@ CSprite *SMCircle(CDC *dc,I64 x,I64 y,I64 arg1,I64 arg2,CColorROPU32 color)
dc->color=color&COLORROP_NO_ROP0_MASK;
GrCircle3(dc,x1,y1,0,Sqrt(SqrI64(x1-x2)+SqrI64(y1-y2)));
msg_code=GetMsg(&arg1,&arg2,1<<MSG_MS_L_UP+1<<MSG_MS_MOVE);
SpriteScrnInit(dc,x,y);
SpriteScreenInit(dc,x,y);
x2=arg1; y2=arg2;
} while (msg_code!=MSG_MS_L_UP);
dc->color=color&COLORROP_NO_ROP0_MASK;
@ -315,7 +315,7 @@ CSprite *SMEllipse(CDC *dc,I64 x,I64 y,I64 arg1,I64 arg2,CColorROPU32 color)
dc->color=color&COLORROP_NO_ROP0_MASK;
GrEllipse3(dc,(x1+x2)>>1,(y1+y2)>>1,0,AbsI64(x1-x2)>>1,AbsI64(y1-y2)>>1);
msg_code=GetMsg(&arg1,&arg2,1<<MSG_MS_L_UP+1<<MSG_MS_MOVE);
SpriteScrnInit(dc,x,y);
SpriteScreenInit(dc,x,y);
x2=arg1; y2=arg2;
} while (msg_code!=MSG_MS_L_UP);
res=CAlloc(SpriteElemQueuedBaseSize(SPT_ELLIPSE));
@ -337,7 +337,7 @@ CSprite *SMEllipse(CDC *dc,I64 x,I64 y,I64 arg1,I64 arg2,CColorROPU32 color)
GrEllipse3(dc,res->pwha.x1+x,res->pwha.y1+y,0,
res->pwha.width,res->pwha.height,res->pwha.angle);
msg_code=GetMsg(&arg1,&arg2,1<<MSG_MS_L_UP+1<<MSG_MS_MOVE);
SpriteScrnInit(dc,x,y);
SpriteScreenInit(dc,x,y);
x2=arg1; y2=arg2;
} while (msg_code!=MSG_MS_L_UP);
angle1=Arg(x2-(res->pwha.x1+x),y2-(res->pwha.y1+y));
@ -362,7 +362,7 @@ CSprite *SMPolygon(CDC *dc,I64 x,I64 y,I64 arg1,I64 arg2,I64 sides,
GrRegPoly3(dc,(x1+x2)>>1,(y1+y2)>>1,0,
AbsI64(x1-x2)>>1,AbsI64(y1-y2)>>1,sides);
msg_code=GetMsg(&arg1,&arg2,1<<MSG_MS_L_UP+1<<MSG_MS_MOVE);
SpriteScrnInit(dc,x,y);
SpriteScreenInit(dc,x,y);
x2=arg1; y2=arg2;
} while (msg_code!=MSG_MS_L_UP);
res=CAlloc(SpriteElemQueuedBaseSize(SPT_POLYGON));
@ -386,7 +386,7 @@ CSprite *SMPolygon(CDC *dc,I64 x,I64 y,I64 arg1,I64 arg2,I64 sides,
res->pwhas.width,res->pwhas.height,
res->pwhas.sides,res->pwhas.angle);
msg_code=GetMsg(&arg1,&arg2,1<<MSG_MS_L_UP+1<<MSG_MS_MOVE);
SpriteScrnInit(dc,x,y);
SpriteScreenInit(dc,x,y);
x2=arg1; y2=arg2;
} while (msg_code!=MSG_MS_L_UP);
angle1=Arg(x2-(res->pwhas.x1+x),y2-(res->pwhas.y1+y));
@ -567,7 +567,7 @@ U0 SMTextFamily(I64 eletype,CDoc *doc,CDocEntry *doc_ce,CSprite *head,CDC *dc,
case SPT_TEXT_DIAMOND: GrTextDiamond3(dc,x1,y1,0,st); break;
}
msg_code=GetMsg(&arg1,&arg2,1<<MSG_MS_L_UP+1<<MSG_MS_MOVE);
SpriteScrnInit(dc,x,y);
SpriteScreenInit(dc,x,y);
x1=arg1; y1=arg2;
} while (msg_code!=MSG_MS_L_UP);
tmpg=CAlloc(SpriteElemQueuedBaseSize(eletype)+StrLen(st)+1);
@ -602,7 +602,7 @@ I64 SMBitMap(I64 eletype,CDoc *doc,CDocEntry *doc_ce,CSprite *head,
dc->color=ROPF_DITHER+WHITE<<16+BLACK;
GrBorder(dc,xx1,yy1,xx2,yy2);
msg_code=GetMsg(&arg1,&arg2,1<<MSG_MS_L_UP+1<<MSG_MS_MOVE);
SpriteScrnInit(dc,x,y);
SpriteScreenInit(dc,x,y);
x2=arg1; y2=arg2;
if (x2<x1) {
xx1=x2; xx2=x1;
@ -797,10 +797,10 @@ U0 SMTaskTitleSet(I64 eletype)
Fs->title_src=TTS_CONST; //Violates TTS_LOCKED_CONST
switch (eletype) {
case SPT_INS_SCRN_BITMAP:
StrCpy(Fs->task_title,"Insert Scrn BitMap");
StrCpy(Fs->task_title,"Insert Screen BitMap");
break;
case SPT_INS_TRANSPARENT_SCRN_BITMAP:
StrCpy(Fs->task_title,"Insert Transparent Scrn BitMap");
StrCpy(Fs->task_title,"Insert Transparent Screen BitMap");
break;
default:
if (eletype>=0)
@ -1029,7 +1029,7 @@ I64 SpriteMainEd(CDoc *doc)
insert_pt=SpriteSetSettings(dc,head,cur_elem_num,xx,yy,
&color,&thick,&x,&y);
x+=xx; y+=yy;
SpriteScrnInit(dc,x,y);
SpriteScreenInit(dc,x,y);
if (eletype==SPT_EXIT) {
res=SPE_EXIT;
goto ei_done;
@ -1048,7 +1048,7 @@ I64 SpriteMainEd(CDoc *doc)
res=SPE_ABORT;
goto ei_done;
case 'c': //eye-dropper
dc3=DCScrnCapture(FALSE);
dc3=DCScreenCapture(FALSE);
color=GrPeek(dc3,ms.pos.x,ms.pos.y)^15;//Mouse cursor is XORed.
DCDel(dc3);
tmpg=CAlloc(SpriteElemQueuedBaseSize(SPT_COLOR));
@ -1097,7 +1097,7 @@ I64 SpriteMainEd(CDoc *doc)
break;
case SPT_INS_SCRN_BITMAP:
case SPT_INS_TRANSPARENT_SCRN_BITMAP:
tmpg=SMScrnBitMap(eletype,dc,dc2,x,y,arg1,arg2,bm_bkcolor);
tmpg=SMScreenBitMap(eletype,dc,dc2,x,y,arg1,arg2,bm_bkcolor);
eletype=SPT_MENU;
break;
case SPT_CIRCLE:

View File

@ -13,7 +13,7 @@ class CMeshEdVertex
CD3I32 p; //World coordinates of the point.
U0 end;
CD3I32 p0,
pt; //Transformed coordinates. (Scrn)
pt; //Transformed coordinates. (Screen)
I32 num,flags;
};
@ -42,7 +42,7 @@ class CMeshFrame
F64 view_scale;
CDC *dc;
I32 *depth_buf;
I64 *w2s,*s2w; //Scrn-to-world and world-to-scrn transform matrices.
I64 *w2s,*s2w; //Screen-to-world and world-to-scrn transform matrices.
I64 vertex_cnt,tri_cnt; //Set by MeshSize
CMeshEdVertex vertex_head,*cur_vertex,*chain_pred;
CMeshEdTri tri_head,*cur_tri;
@ -74,7 +74,7 @@ CMeshEdTri *MeshTriNew(CMeshFrame *e,CColorROPU32 color,
}
CMeshEdVertex *MeshVertexFindScrPt(CMeshFrame *e,I64 x,I64 y)
{//Scrn coordinates
{//Screen coordinates
CMeshEdVertex *res=NULL,*tmpv=e->vertex_head.next;
I64 dd,dz,best_dd=I64_MAX,best_dz=I64_MAX;
while (tmpv!=&e->vertex_head) {
@ -534,7 +534,7 @@ I64 *MeshW2S(CMeshFrame *e,CTask *task)
}
I64 *MeshS2W(CMeshFrame *e,CTask *task)
{//Scrn to world coordinate transform matrix.
{//Screen to world coordinate transform matrix.
CCtrl *c=CtrlFindUnique(task,CTRLT_VIEWING_ANGLES);
CViewAngles *s=c->state;
I64 *r=Mat4x4IdentNew(task);

View File

@ -14,7 +14,7 @@ I64 PenBrushesSize()
return res;
}
I64 ScrnZoomTablesSize()
I64 ScreenZoomTablesSize()
{
I64 res=0,i;
for (i=1;i<=GR_SCRN_ZOOM_MAX;i++)
@ -135,7 +135,7 @@ Bool MemRepTask(CTask *task,Bool override_validate=FALSE)
if (task==sys_winmgr_task) {
"gr.pen_brushes\t:%010X\n",PenBrushesSize;
"gr.scrn_zoom_tbles\t:%010X\n",ScrnZoomTablesSize;
"gr.scrn_zoom_tbles\t:%010X\n",ScreenZoomTablesSize;
"scrncast.dc\t:%010X\n",DCSize(scrncast.dc);
"scrncast.dc2_alias\t:%010X\n",DCSize(scrncast.dc2_alias);
} else if (task==zenith_task) {

View File

@ -268,7 +268,7 @@ I64 WinMgrSleep(Bool flush_msgs=FALSE)
winmgr.ideal_refresh_tS+=WINMGR_PERIOD;
timeout_val=cnts.jiffies+(winmgr.ideal_refresh_tS-tS)*JIFFY_FREQ;
LBts(&sys_semas[SEMA_REFRESH_IN_PROGRESS],0);
GrUpdateScrn;
GrUpdateScreen;
LBtr(&sys_semas[SEMA_REFRESH_IN_PROGRESS],0);
if (scrncast.record && !scrncast.just_audio) {
cdt=scrncast.t0_now(I64)+ToI64(CDATE_FREQ*(tS-scrncast.t0_tS));

View File

@ -567,7 +567,7 @@ U0 FMRightClick()
U8 *fm_ms_str=NULL;
U0 (*fp_old_final_scrn_update)(CDC *dc);
U0 FMFinalScrnUpdate(CDC *dc)
U0 FMFinalScreenUpdate(CDC *dc)
{
if (fm_ms_str) {
dc->color=LTRED;
@ -611,7 +611,7 @@ public U8 *FileMgr(I64 mode=FM_NORMAL,CTask *mem_task=NULL)
case MSG_MS_L_DOWN:
doc_ce=doc->cur_entry;
fm_ms_str=doc_ce->tag;
gr.fp_final_scrn_update=&FMFinalScrnUpdate;
gr.fp_final_scrn_update=&FMFinalScreenUpdate;
break;
case MSG_MS_L_UP:
if (doc_ce) {

View File

@ -565,7 +565,7 @@ U0 ODERK5OneStep(CMathODE *ode)
F64 ode_alloced_factor=0.75;
U0 ODEsUpdate(CTask *task)
{/* This routine is called by the $LK,"window mgr",A="FF:::/Zenith/Gr/GrScrn.HC,ODEsUpdate"$on a continuous
{/* This routine is called by the $LK,"window mgr",A="FF:::/Zenith/Gr/GrScreen.HC,ODEsUpdate"$on a continuous
basis to allow real-time simulation.It is intended
to provide ress good enough for games.It uses a runge-kutta
integrator which is a better algorithm than doing it with Euler.