From 12e69c5ce603cd2d55a099c95d8380d4d4119562 Mon Sep 17 00:00:00 2001 From: xmm15 Date: Wed, 19 Feb 2020 21:38:04 -0600 Subject: [PATCH] Added several more palettes --- src/0000Boot/0000Kernel.BIN.C | Bin 189888 -> 189888 bytes src/Compiler/Compiler.BIN | Bin 194240 -> 194240 bytes src/Home/MakeHome.CC | 13 ---- src/Kernel.BIN.C | Bin 189808 -> 189808 bytes src/Tmp/Zenith-Latest.iso | Bin 38942720 -> 38944768 bytes src/Zenith/DevInfo.CC | 3 +- src/Zenith/Gr/GrAsm.CC | 2 +- src/Zenith/Gr/GrInitB.CC | 2 +- src/Zenith/Gr/GrPalette.CC | 130 +++++++++++++++++++++++++++------- 9 files changed, 109 insertions(+), 41 deletions(-) delete mode 100755 src/Home/MakeHome.CC diff --git a/src/0000Boot/0000Kernel.BIN.C b/src/0000Boot/0000Kernel.BIN.C index 7432eb06c826cfb648b8d47d1aaad50a09e190a2..e4787d323580abf02a5d95411733b57f52511a92 100755 GIT binary patch delta 332 zcmX?bn)|?M?g=LBy!Er6={a$4UdVEhc{2}-T?%9FX77yuylf0$usNV?C--EPFu~1I zO*EesQ)GlFV0^s!NxP8(o1LApHJ8Hl4NXjomlmERFo4n_JFB1d9X73L| zOpFSf<32s%nY`(f$mX#BHB8gXW-|&+E(_w@{)v&%$(TJSzdXJmBXPU6DdR>y#)R!} zof(&zGp^V^rJC`SHA`wrTKx2aEGDV#HQO20g&BpmFFD0%%+3sS|MXiI89kZ%KTMsT XFUu&t-S!frh!Rst;`ZP#jJY2HV5WKC delta 321 zcmV-H0lxmg%L~BE3y?GiU2cEYEMz?Py?w1rOurtp;km+)-? z7?U4{Ob2ykb!ACzbF*@WAprqkleC3T0pzpfhcX}rARuyObaj`of&vw@F{mao1^FwM z0RWRRl^2t9+Fb@_ASh#RZL`+e%nbx%Z)9b&rs%T<0Yj5o??(k|DLV=vlm6}&lf3VZ z0z*r)OYjl`0b#RV^5hHwE|UR36SG$Td;$Y5005I`QXRMQ0RciYmtb T7q>mq0Tdzv8%VcP^Z{-0d$fBO diff --git a/src/Compiler/Compiler.BIN b/src/Compiler/Compiler.BIN index 1594933fc826b8b826c3cb9ad0b6166939c99c2a..b6a2504e875c51dc7336aade1c2ccdab4afdceaf 100755 GIT binary patch delta 54 zcmX@`mixe4?hVVIGCEIQ@pS%VAyv`IG0#j`7=U2&lxHm&jPJHf`ZMM;GTrBH?+Ret K-W9-PwhRE7KNax+ delta 56 zcmX@`mixe4?hVVIGRjR}@pL|Gafv2_-ejL=E-WC%<|)rwG8kWNm-J`MXJlgFY3~YP L+};(yWVQ?dzt|QT diff --git a/src/Home/MakeHome.CC b/src/Home/MakeHome.CC deleted file mode 100755 index 742a91fa..00000000 --- a/src/Home/MakeHome.CC +++ /dev/null @@ -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("..");; diff --git a/src/Kernel.BIN.C b/src/Kernel.BIN.C index c1d0d27b41829570fdbe0772c5dd6988a3d23656..2849bf32d93bf58235463800067dd5183848fb30 100755 GIT binary patch delta 549 zcmZ8dT}V@57(Va!o#R@Y$5MCB`eVb0V&%_tQ8$@2D@lf9Yh4sB48uUG3nhdaYB9Tr z;raY%hi(!ftc%F#L%&#tLPfM7T4011MGzuo=PU`5F0wOWH{HF@1JBR<;1%bWaVuPx*2Z(vSGTZ+A2t8#U zliE(&BZuf;L!r}VprBbc8@K$YnXW5p1c9~Y%MrA)_;OGZ3)cFVDR8mO?@x+USHucu zGCY-m@Jrj^rK)#!fx?gPg>nb(^ALWf2~rq;uO{3KLdv|zk8k@3AJ0OAb$eAT5JS1NysWr1HluG~h<-2@lkuIWK->RdcqX&h$TE C(9(MV delta 552 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,"Unused\0RAM\0Device",tmpmr->base,tmpmr->base+tmpmr->size-1; tmpmr=tmpmr->next; } @@ -261,6 +261,7 @@ public U0 MemBIOSRep() m20++; } } + '\n'; } public U0 MemPageRep() diff --git a/src/Zenith/Gr/GrAsm.CC b/src/Zenith/Gr/GrAsm.CC index 4cfb1059..fb3d7806 100755 --- a/src/Zenith/Gr/GrAsm.CC +++ b/src/Zenith/Gr/GrAsm.CC @@ -22,7 +22,7 @@ _GR_UPDATE_LINE64:: JE @@10 MOV U64 [RDI],RAX XLATB - ROR RAX,8 + ROR RAX,8 XLATB ROR RAX,8 XLATB diff --git a/src/Zenith/Gr/GrInitB.CC b/src/Zenith/Gr/GrInitB.CC index 2d4f2569..ee100821 100755 --- a/src/Zenith/Gr/GrInitB.CC +++ b/src/Zenith/Gr/GrInitB.CC @@ -168,7 +168,7 @@ U0 GrInit2() HashDefineListAdd("ST_SPRITE_ELEM_CODES",SPHT_ELEM_CODE,gr.sprite_hash); gr.screen_zoom=1; - PaletteSetGruvboxLight; + PaletteSetDark; gr.to_8_bits =MAlloc(256*sizeof(I64)); gr.to_8_colors=MAlloc(256*sizeof(I64)); diff --git a/src/Zenith/Gr/GrPalette.CC b/src/Zenith/Gr/GrPalette.CC index 2528c7ff..080a863d 100755 --- a/src/Zenith/Gr/GrPalette.CC +++ b/src/Zenith/Gr/GrPalette.CC @@ -3,37 +3,41 @@ public U8 gr_rainbow_10[10] = {BLACK,BROWN,RED,LTRED,YELLOW,GREEN,BLUE,PURPLE,LT DefineListLoad("ST_RAINBOW_10","BLACK\0BROWN\0RED\0LTRED\0YELLOW\0GREEN\0BLUE\0PURPLE\0LTGRAY\0WHITE\0"); -public CBGR48 gr_palette_std[COLORS_NUM]={ -0x000000000000,0x00000000AAAA,0x0000AAAA0000,0x0000AAAAAAAA, -0xAAAA00000000,0xAAAA0000AAAA,0xAAAA55550000,0xAAAAAAAAAAAA, -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 -}; - -public CBGR24 gr_palette_gray[COLORS_NUM] = { - 0x000000, 0x111111, 0x222222, 0x333333, 0x444444, 0x555555, 0x666666, 0x777777, - 0x888888, 0x999999, 0xAAAAAA, 0xBBBBBB, 0xCCCCCC, 0xDDDDDD, 0xEEEEEE, 0xFFFFFF -}; - public U0 GrPaletteGet(CBGR24 *bgr24) {//16 colors MemCopy(bgr24, &gr_palette, sizeof(CBGR24) * 16); } -public U0 GrPaletteSet(CBGR48 *bgr24) +public U0 GrPaletteSet(CBGR24 *bgr24) {//16 colors MemCopy(&gr_palette, bgr24, sizeof(CBGR24) * 16); } +//legacy +public CBGR48 gr_palette_std[COLORS_NUM]={ +0x000000000000,0x00000000AAAA,0x0000AAAA0000,0x0000AAAAAAAA, +0xAAAA00000000,0xAAAA0000AAAA,0xAAAA55550000,0xAAAAAAAAAAAA, +0x555555555555,0x55555555FFFF,0x5555FFFF5555,0x5555FFFFFFFF, +0xFFFF55555555,0xFFFF5555FFFF,0xFFFFFFFF5555,0xFFFFFFFFFFFF}; + +public CBGR24 gr32_palette_std[COLORS_NUM]={ + 0x000000, 0x0000AA, 0x00AA00, 0x00AAAA, 0xAA0000, 0xAA00AA, 0xAA5500, 0xAAAAAA, + 0x555555, 0x5555FF, 0x55FF55, 0x55FFFF, 0xFF5555, 0xFF55FF, 0xFFFF55, 0xFFFFFF +}; + +public U0 PaletteSetStd(Bool persistent=TRUE) +{//Activate std palette. + GrPaletteSet(gr32_palette_std); + VGAFlush; + if (persistent) + fp_set_std_palette = &PaletteSetStd; +} + +public CBGR24 gr_palette_gray[COLORS_NUM] = { + 0x000000, 0x111111, 0x222222, 0x333333, 0x444444, 0x555555, 0x666666, 0x777777, + 0x888888, 0x999999, 0xAAAAAA, 0xBBBBBB, 0xCCCCCC, 0xDDDDDD, 0xEEEEEE, 0xFFFFFF +}; + public U0 PaletteSetGray(Bool persistent=TRUE) {//Activate gray palette. GrPaletteSet(gr_palette_gray); @@ -42,21 +46,97 @@ public U0 PaletteSetGray(Bool persistent=TRUE) fp_set_std_palette = &PaletteSetGray; } +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 U0 PaletteSetGruvboxLight(Bool persistent=TRUE) -{//Activate std palette. +{//Activate gruvbox light palette. GrPaletteSet(gr_palette_gruvbox_light); VGAFlush; if (persistent) - fp_set_std_palette = &PaletteSetGruvboxLight; + fp_set_std_palette = &PaletteSetGruvboxLight; } +public CBGR24 gr_palette_pastel[COLORS_NUM]={ + 0xE8E8D3, 0x8197BF, 0x19CB00, 0x668799, 0xCF6A4C, 0x8787AF, 0xFAD07A, 0x525252, + 0x888888, 0xACCAFF, 0x23FD00, 0x80BFAF, 0xFF9D80, 0xC4C4FF, 0xFFEFBF, 0x151515 +}; public U0 PaletteSetPastel(Bool persistent=TRUE) -{//Activate std palette. +{//Activate pastel palette. GrPaletteSet(gr_palette_pastel); VGAFlush; if (persistent) fp_set_std_palette = &PaletteSetPastel; } +public CBGR24 gr_palette_monokai[COLORS_NUM]={ + 0x272822, 0x01549E, 0x74AA04, 0x1A83A6, 0xA70334, 0x89569C, 0xB6B649, 0xCACACA, + 0x7C7C7C, 0x0373F5, 0x8DD006, 0x58C2E5, 0xF3044B, 0xA87DB8, 0xCCCC81, 0xFFFFFF +}; + +public U0 PaletteSetMonokai(Bool persistent=TRUE) +{//Activate monokai palette. + GrPaletteSet(gr_palette_monokai); + VGAFlush; + if (persistent) + fp_set_std_palette = &PaletteSetMonokai; +} + +public CBGR24 gr_palette_dark[COLORS_NUM] = { + 0xFFFFFF, 0x6095C5, 0x6D9E3F, 0x3BA275, 0xD370A3, 0xAC7BDE, 0xB58858, 0x686868, + 0x404040, 0x98CBFE, 0xA3D572, 0x75DAA5, 0xFFA7DA, 0xE5B0FF, 0xEFBD8B, 0x232323 +}; + +public U0 PaletteSetDark(Bool persistent=TRUE) +{//Activate dark palette. + GrPaletteSet(gr_palette_dark); + VGAFlush; + if (persistent) + fp_set_std_palette = &PaletteSetDark; +} + +public CBGR24 gr_palette_smooth[COLORS_NUM] = { + 0xDDDDDD, 0x4E9FB1, 0xA0CF5D, 0x42717B, 0xD23D3D, 0x8542FF, 0xF39D21, 0x404040, + 0x707070, 0x7DC1CF, 0xB8D68C, 0x6D878D, 0xE84F4F, 0x9B64FB, 0xE1AA5D, 0x151515 +}; + +public U0 PaletteSetSmooth(Bool persistent=TRUE) +{//Activate dark palette. + GrPaletteSet(gr_palette_smooth); + VGAFlush; + if (persistent) + fp_set_std_palette = &PaletteSetSmooth; +} + +public CBGR24 gr_palette_dorado[COLORS_NUM]= { + 0xFFFFFF, 0x5879AF, 0x468459, 0x008592, 0xA9635D, 0x9C6594, 0x84763D, 0x4E4E4E, + 0x777777, 0xB3D1FF, 0x9DDEAF, 0x79E0ED, 0xFFBBB2, 0xFABDF0, 0xE0CE91, 0x292929 +}; + +public U0 PaletteSetDorado(Bool persistent=TRUE) +{//Activate dark palette. + GrPaletteSet(gr_palette_dorado); + VGAFlush; + if (persistent) + fp_set_std_palette = &PaletteSetDorado; +} + +public CBGR24 gr_palette_euphrasia[COLORS_NUM] = { + 0x1C2027, 0x355C9A, 0x38912B, 0x258F8F, 0xA62A3E, 0x7C4F9F, 0xB27D12, 0x666666, + 0xC0C0C0, 0x45A3E6, 0x93C724, 0x60C6C8, 0xF04758, 0xC953EF, 0xDDB62B, 0xFFFFFF +}; + + +public U0 PaletteSetEuphrasia(Bool persistent=TRUE) +{//Activate dark palette. + GrPaletteSet(gr_palette_euphrasia); + VGAFlush; + if (persistent) + fp_set_std_palette = &PaletteSetEuphrasia; +} + + +PaletteSetEuphrasia; \ No newline at end of file