tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2025-04-18 05:38:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Zenith 1.0. FastReboot with Shift+Alt+Del

Browse source 
MemBIOSRep improvements
Added gruvbox light palette
This commit is contained in:
xmm15 2020-02-19 18:34:27 -06:00
parent e4a4fe667c
commit fcd1560d88
17 changed files with 1760 additions and 1721 deletions

BIN
src/0000Boot/0000Kernel.BIN.C
View file

Binary file not shown.

BIN
src/Compiler/Compiler.BIN
View file

Binary file not shown.

4
src/Demo/Graphics/PoleZeros.CC
View file

@ -105,9 +105,9 @@ U0 PoleZeros()
SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS-WIF_SELF_BORDER;
GrPaletteSet(gr_palette_gray);
GrPaletteColorSet(15,0xFFFF00000000); //White is red
gr_palette[WHITE] = 0xFF0000; //White is red
AutoComplete;
AutoComplete;
WinBorder;
WinMax;
DocClear;

10
src/Doc/StandBy.DD
View file

@ -16,11 +16,11 @@ $FG,2$ <ALT-M>$FG$ Max Window
$FG,2$ <ALT-H>$FG$ Horz Tile
$FG,2$ <ALT-V>$FG$ Vert Tile
$FG,2$ <CTRL-L>$FG$ Text Menu
$FG,2$<CTRL-ALT-N>$FG$ Close AC
$FG,2$<CTRL-ALT-N>$FG$ Close AC
$FG,4$$TX+CX+L+PU+UL,"Tongues",A="::/Zenith/God/HSNotes.DD"$$FG$
$FG,4$$TX+CX,"(Works Everywhere)"$$FG$
$FG,2$ <F7> $FG$God Word
$FG,2$<SHIFT-F7> $FG$God Passage
$FG,2$ <F6> $FG$God Song
$FG,2$<SHIFT-F6> $FG$God Doodle
$FG,2$ <F7> $FG$God Word
$FG,2$<SHIFT-F7> $FG$ God Passage
$FG,2$ <F6> $FG$ God Song
$FG,2$<SHIFT-F6> $FG$ God Doodle

13
src/Home/MakeHome.CC
View file

@ -1,13 +0,0 @@
Cd(__DIR__);;
//If these are not present in /Home, it uses the version in the root dir. You
//can make your own, modified, version of these files in your /Home directory.
#include "~/HomeLocalize"
#include "/Zenith/Boot/MakeBoot"
#include "/Zenith/Utils/MakeUtils"
#include "~/HomeWrappers"
MapFileLoad("::/Kernel/Kernel");
MapFileLoad("::/Compiler/Compiler");
#include "~/HomeKeyPlugIns"
#include "~/HomeSys"
Cd("..");;

2
src/HomeSys.CC
View file

@ -33,4 +33,4 @@ U0 StartUpTasks()
StartUpTasks;
"\nZenithOS V%5.3f\t%D %T\n\n",sys_os_version,sys_compile_time,sys_compile_time;
"\nZenithOS V %5.3f\t%D %T\n\n",sys_os_version,sys_compile_time,sys_compile_time;

BIN
src/Kernel.BIN.C
View file

Binary file not shown.

4
src/Kernel/KGlobals.CC
View file

@ -9,10 +9,10 @@ CTask *zenith_task;
I64 sys_num_spawned_tasks;
CTask *sys_winmgr_task,*sys_task_being_screen_updated;
U8 *rev_bits_table; //Table with U8 bits reversed
U8 *rev_bits_table; //Table with U8 bits reversed
CDate local_time_offset;
F64 *pow10_I64,
sys_os_version=0.10;
sys_os_version=1.000;
CAutoCompleteDictGlobals acd;
CAutoCompleteGlobals ac;

3342
src/Kernel/Kernel.MAP
View file

File diff suppressed because it is too large Load diff

9
src/Kernel/KernelA.HH
View file

@ -386,7 +386,14 @@ class CSysLimitBase
#help_index "Memory/Info"
#define MEM_E820_ENTRIES_NUM 48
class CMemE820
#define MEM_E820t_USABLE 1
#define MEM_E820t_RESERVED 2
#define MEM_E820t_ACPI 3
#define MEM_E820t_ACPI_NVS 4
#define MEM_E820t_BAD_MEM 5
#define MEM_E820t_PERM_MEM 7
class CMemE820
{
U8 *base;
I64 len;

2
src/Kernel/Memory/BlkPool.CC
View file

@ -47,7 +47,7 @@ U0 BlkPoolsInit()
if (code_heap_limit<total) {
while (m20->type) {
if (m20->type==1) {
if (m20->type==MEM_E820t_USABLE) {
lo=m20->base;
hi=m20->base+m20->len;
if (lo<code_heap_limit) {

2
src/Kernel/Memory/MemPhysical.CC
View file

@ -158,7 +158,7 @@ I64 BIOSTotalMem()
r20=0;
if (m20->type) {
while (m20->type) {
if (m20->type==1)
if (m20->type==MEM_E820t_USABLE)
r20+=m20->len;
m20++;
}

20
src/Once.CC
View file

@ -39,17 +39,17 @@ U0 Tmp()
case BOOT_SRC_HARDDRIVE:
"$$PURPLE$$$$TX+CX,\"Tip of the Day\"$$$$FG$$\n";
TipOfDay;
// Type("::/Doc/Customize.DD");
// if (FileFind("::/Misc/Tour")) {
// "\nTake Tour";
// if (YorN) {
// DocBottom;
// Cd("::/Misc/Tour");
// InFile("Tour");
// }
// }
Type("::/Doc/Customize.DD");
if (FileFind("::/Misc/Tour")) {
"\nTake Tour";
if (YorN) {
DocBottom;
Cd("::/Misc/Tour");
InFile("Tour");
}
}
break;
}
}
PaletteSetPastel;
Tmp;


BIN
src/Tmp/Zenith-Latest.iso
View file

Binary file not shown.

54
src/Zenith/DevInfo.CC
View file

@ -208,32 +208,56 @@ public U0 PCIRep()
#help_index "Info;Memory/Info"
public U0 MemBIOSRep()
{//Report the memory ranges reported by the BIOS at boot.
U16 *m01=MEM_E801;
CMemE820 *m20=MEM_E820;
U16 *m01 = MEM_E801;
CMemE820 *m20 = MEM_E820;
CMemRange *tmpmr;
"Standard Addresses\n"
"000A0000-000BFFFF VGA\n"
"$$PURPLE$$Standard Addresses$$FG$$\n"
"FEE00000-FEE00FFF See $$LK,\"APIC\",A=\"MN:LAPIC_BASE\"$$\n\n"
"32 Bit Device Mem\n";
"$$PURPLE$$VBE Linear Framebuffer$$FG$$\n"
"%08X-%08X See $$LK,\"VBE Mode\",A=\"FF:::/Kernel/KernelA.HH,framebuffer\"$$\n", text.fb_alias,
text.fb_alias(U8 *) + text.buffer_size - 1;
"\n$$PURPLE$$32 Bit Device Mem$$FG$$\n";
while (LBts(&sys_semas[SEMA_DEV_MEM],0))
Yield;
tmpmr=dev.mem32_head.next;
while (tmpmr!=&dev.mem32_head) {
"%02X:%016X-%016X\n",
tmpmr->type,tmpmr->base,tmpmr->base+tmpmr->size-1;
"%z:%08X-%08X\n",
tmpmr->type,"Unused\0RAM\0Device",tmpmr->base,tmpmr->base+tmpmr->size-1;
tmpmr=tmpmr->next;
}
LBtr(&sys_semas[SEMA_DEV_MEM],0);
"\nBIOS Memory Report 15:E801\n"
"01:0000000000000000-%016X\n",0x100000+m01[0]<<10-1;
"01:0000000001000000-%016X\n",SYS_16MEG_AREA_LIMIT+m01[1]<<16-1;
"\n$$PURPLE$$BIOS Memory Report 15:E801$$FG$$\n"
"0000000000000000-%016X\n", 0x100000 + m01[0] << 10 - 1;
"0000000001000000-%016X\n", SYS_16MEG_AREA_LIMIT + m01[1] << 16 - 1;
if (m20->type) {
'\n';
"BIOS Memory Report 15:E820\n";
while (m20->type) {
"%02X:%016X-%016X\n",m20->type,m20->base,m20->base+m20->len-1;
if (m20->type)
{
"\n$$PURPLE$$BIOS Memory Report 15:E820$$FG$$\n";
while (m20->type)
{
"$$RED$$";
switch[m20->type] //nobound switch. very unlikely BIOS messed something up.
{
case MEM_E820t_USABLE:
"$$GREEN$$Usable: ";
break;
case MEM_E820t_RESERVED:
"Reserved: ";
break;
case MEM_E820t_ACPI:
case MEM_E820t_ACPI_NVS:
"ACPI: ";
break;
case MEM_E820t_BAD_MEM:
"Bad memory: ";
break;
case MEM_E820t_PERM_MEM:
"Perm memory: ";
}
"$$FG$$%016X-%016X\n", m20->base, m20->base + m20->len - 1;
m20++;
}
}

2
src/Zenith/Gr/GrInitB.CC
View file

@ -168,7 +168,7 @@ U0 GrInit2()
HashDefineListAdd("ST_SPRITE_ELEM_CODES",SPHT_ELEM_CODE,gr.sprite_hash);
gr.screen_zoom=1;
PaletteSetPastel;
PaletteSetGruvboxLight;
gr.to_8_bits =MAlloc(256*sizeof(I64));
gr.to_8_colors=MAlloc(256*sizeof(I64));

17
src/Zenith/Gr/GrPalette.CC
View file

@ -9,6 +9,11 @@ public CBGR48 gr_palette_std[COLORS_NUM]={
0x555555555555,0x55555555FFFF,0x5555FFFF5555,0x5555FFFFFFFF,
0xFFFF55555555,0xFFFF5555FFFF,0xFFFFFFFF5555,0xFFFFFFFFFFFF};
public CBGR24 gr_palette_gruvbox_light[COLORS_NUM] = {
0x3C3836, 0x076678, 0x79740E, 0x427B58, 0x9D0006, 0x8F3F71, 0xB57614, 0x928374,
0x7C6F64, 0x458588, 0x98971A, 0x689D6A, 0xCC241D, 0xB16286, 0xD79921, 0xFBF1C7
};
public CBGR24 gr_palette_pastel[COLORS_NUM]={
0xE8E8D3, 0x8197BF, 0x19CB00, 0x668799, 0xCF6A4C, 0x8787AF, 0xFAD07A, 0x525252,
0x888888, 0xACCAFF, 0x23FD00, 0x80BFAF, 0xFF9D80, 0xC4C4FF, 0xFFEFBF, 0x151515
@ -36,6 +41,17 @@ public U0 PaletteSetGray(Bool persistent=TRUE)
if (persistent)
fp_set_std_palette = &PaletteSetGray;
}
public U0 PaletteSetGruvboxLight(Bool persistent=TRUE)
{//Activate std palette.
GrPaletteSet(gr_palette_gruvbox_light);
VGAFlush;
if (persistent)
fp_set_std_palette = &PaletteSetGruvboxLight;
}
public U0 PaletteSetPastel(Bool persistent=TRUE)
{//Activate std palette.
GrPaletteSet(gr_palette_pastel);
@ -44,4 +60,3 @@ public U0 PaletteSetPastel(Bool persistent=TRUE)
fp_set_std_palette = &PaletteSetPastel;
}