From f1e8d99abc7eb921150b7d16fb908a87789054ad Mon Sep 17 00:00:00 2001 From: nakst <> Date: Wed, 29 Dec 2021 11:58:10 +0000 Subject: [PATCH] start bold bitmap sans; resize window bugfix; add testing instructions --- README.md | 8 ++++++++ kernel/windows.cpp | 8 ++++++-- res/Fonts/Bitmap Sans Bold 9.font | Bin 0 -> 1555 bytes res/Fonts/Bitmap Sans Regular 9.font | Bin 2975 -> 3011 bytes util/build.c | 1 + 5 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 res/Fonts/Bitmap Sans Bold 9.font diff --git a/README.md b/README.md index c0fb79f..9ffaa99 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,14 @@ Alternatively, visit the forums (not very active): https://essence.handmade.netw To support development, you can donate to my Patreon: https://www.patreon.com/nakst. +## Testing + +You can download and test the latest nightly build from https://github.com/nakst/build-essence/releases. Download and extract `Essence.tar.xz`. If you are using VirtualBox, import `Essence.ova`. If you are using Qemu, run + + qemu-kvm -drive file=drive,format=raw -m 2048 -smp 2 || qemu-system-x86_64 -enable-kvm -drive file=drive,format=raw -m 2048 -smp 2 + +These builds are configured to run on emulators only, to make testing easier. Builds for real hardware are coming soon :) + ## Building See `help/Building.md` for a description of how to build and test the system. diff --git a/kernel/windows.cpp b/kernel/windows.cpp index caba62e..a0c38b3 100644 --- a/kernel/windows.cpp +++ b/kernel/windows.cpp @@ -272,9 +272,13 @@ void SendMessageToWindow(Window *window, EsMessage *message) { } else if (message->type == ES_MSG_KEY_DOWN || message->type == ES_MSG_KEY_UP) { window->embed->owner->messageQueue.SendMessage(window->embed->apiWindow, message); - if (message->keyboard.modifiers & (ES_MODIFIER_CTRL | ES_MODIFIER_ALT | ES_MODIFIER_FLAG | ES_MODIFIER_ALT_GR)) { + if ((message->keyboard.modifiers & (ES_MODIFIER_CTRL | ES_MODIFIER_ALT | ES_MODIFIER_FLAG | ES_MODIFIER_ALT_GR)) + || message->keyboard.scancode == ES_SCANCODE_LEFT_CTRL || message->keyboard.scancode == ES_SCANCODE_RIGHT_CTRL + || message->keyboard.scancode == ES_SCANCODE_LEFT_SHIFT || message->keyboard.scancode == ES_SCANCODE_RIGHT_SHIFT + || message->keyboard.scancode == ES_SCANCODE_LEFT_ALT || message->keyboard.scancode == ES_SCANCODE_RIGHT_ALT + || message->keyboard.scancode == ES_SCANCODE_LEFT_FLAG || message->keyboard.scancode == ES_SCANCODE_RIGHT_FLAG) { // Additionally send the keyboard input message to the embed parent - // if Ctrl, Alt or Flag were held. + // if Ctrl, Alt or Flag were held, or this is a modifier change message. // (Otherwise don't, to avoid increasing typing latency.) window->owner->messageQueue.SendMessage(window->apiWindow, message); } diff --git a/res/Fonts/Bitmap Sans Bold 9.font b/res/Fonts/Bitmap Sans Bold 9.font new file mode 100644 index 0000000000000000000000000000000000000000..03f0bb6d6398878c4878003c83813ddf7901825a GIT binary patch literal 1555 zcmZA0yK59d9Ki8OCbzqZYt}*}kYm@sARG*A3PX~shEL8|vno1i%u*vzI**U|_>~XXE;rIK^V`pc-KKRowwr%ec9imeR zajAnp(>xK-`&=2e)80$^Hm)(Ok9+;3Q`)(5ZibBcHa8H{*lue+y{e(`ki}X1iNA^u+}L?vCN6Ph>baMW7xP8H;LuO ze9lGjF6X$JXo(BN0(RBd=D3frYc^M(=XTcn1e>(RRtm{3Jj14pZRRdv*R2(~o#G{S z!&u3DLjmi3g-u&)?!g;u#<929Y>NfrJ$BQvkJy~GlKJL5@dc|{E4~j;e8X-T)BB>o z%|QIbZnxC)#BXfgvA@_IYsGo?L<76)#FZHAUW)}{E4E;*IhXp7ZgnALxtykHJg7rGMv0XCWMX@{=*e1^<%?OCk(FhUXId16run4!KFPWYt-7+ZzTQ|{ zTgfISX71N&S**({6`R2bD5n&eN*B#DW5!Cxm5Pe1MZK^HS20mcv|QFjm0WJy;93={ z<}^1NLXa7Trg+Rv7*;DiVd%+fTp3hqkR&~TN+>TC18Bu#Rpqf;%1GBOtP(e)m1Ki- z^Mqe4Q$Mi4&GkuHU(>C(U)L+fFGl)bu3~CSeH`>eV;RLgkkRgOt2%pEN(ClQxkjG1 LtjAA!SWNN{+Fy-C literal 0 HcmV?d00001 diff --git a/res/Fonts/Bitmap Sans Regular 9.font b/res/Fonts/Bitmap Sans Regular 9.font index ee96c7e920c97e8eb2caa996d987409988c11dc7..fc14672a298eb91df3692bd4c5ac125b69c4fdd4 100644 GIT binary patch literal 3011 zcmZA3UyL1790%~n9L$$l*tm)d5W(-)r@gSvIPZ3SHLrYRa6jxeEA9YnLfQZMI|{qqSUHDIz$Ptw z8Meh(ndetwcUW<6z@{vF8+NBv_g&asmYs)9TXjE%-EG-tu(mNh*Cc%j+iKZYux-Z5 zK7S3{ZrQi6dyHW^A!w!5&;P zfwwEE1?yPtjlv#UisN}8X#;GhF`Q!0k+cOT4_k3tVUJk01GdYuU9d-$NwZdC+6S98 zaeA#vItbfs#T|n^W=!YBr<1Tf$~ecoUkN$|d)&m8`@tF5US+ zHfP1X3EOAIy#w2C#hrsaY2rL&&qcN_z~-05N%{`uY#}U&d z*wd!2&J`xc6+{P(>2)4a1barAUcVtmU4=bsOpiC92JDb!SHli3GfDlhBbKd(9W}9lgi3(UQDmUPQkj^__==q-=nu+r>(eiu$PqaSC;3RL+`LP~Wel1v?m7vL`LCs`^zM{rq5(=3sdIF52Db0MmHon)el8cCj}+=Pev z+yp$!nyCzg!0X0S(FsTN1S06kiE_7+R@@*$%Sd&z*gUv#t!P#%HKe8}&>lBg?Q3zj zTYc56z>!t)Nc@W2lw#Zwn~I_}j+>}e6rmnk7;?uw&&?v=b^RzagU=@?=jJ+{cDv{w z92^;0Uo^Q=Q8d-V5LBt*YNWPCT}M0)k?;_aBXyKnSG7c%^Q3>K@Erwv zUW~iA%@uQGkW=WIjtHDMj^|0~mT$xLVpN!bCn?%(B9eQNRnZ5Lp%<+1B+GG$q=u@k zaz2#ro%b?+-@M;k{{D64G%1_S@b9TQu$Xig_)4cs-@xCoHXkdlJI13VRyt( cFHdO4iLsvIxY2N3S#K@Y>wU=jMVbEaAE6J-sQ>@~ literal 2975 zcmZA3Uu+ab90%~G6Xeny7SgVDz@~564TBQmKC>E_EYEc9g zurCr4qcJ8vnCPQVhDXDbF+PwO6AUjVYT^SiCdBBA#^{65^ZT2bt#tO2C%c%Ao(Z-K7+7ATLfcKGy!XBQ)rFgK25>~ zY+QtrTW!GxZCr>lpoH46At!DQHf+trDcT2HXX|>XCvc7Pu=Uosf9w}vBaVFm8?|Qo zC+Q+=1FX|A;|i@7*v;A$ z#?Rx8=?ZMzv7ceLIQBd2R>%H^O*kfT^ENrw1-s3$9@wN~IqY`F*2AV88;9MYEx<^5 z9)vUryHoEQ^Dtkwz@~LvXvZ7SR@i1(rxRcXa1JER!nQbZyI?JC|L1QH>@I8N9NG_? zaqKYcZfoUyISSkA#2tribL=#1yHoc~*bc|uhRr&4--q4f*hjFoH8a-~eGI$TvGcH< z*2+GA3ftw_XR!OMasDD?@gi)uwK6Z4VD~%r4eSAHsVHYbw(I9sAI&ovLeU44Q9(8OQ_Lw$h*J?sL zVEb*HS*wb6!wxucdtnEynY;va0QR^x&M`l)1RaDuVdKi@!6DcoZGoNRAuYn5v~i}r zn3iA*PTUFDVJB`G_LLKM7WTA_lgOTrY+ZmYu8LFiIqVsyy)R+UYK!bzRdgA4#F`mL zLf^xlvvp0bV)_ww)S6l6G5rF2UYl9J5k~zR>;-FPydnJsd(p9fU`wk^QE(m6F~_=K zFInT!N?c3$v3Fp@+JvslPv3W8>tO$OI7|HA^5{L-RsEvoCx&^Se*p6bZ~)=!a;`sw4QUJY z?*P8~@(gdwB=kmto9T2A9|VJgt?uqt9Luy3r1g3umCZ&YsgI6kVH}6OaomGC{Cwv4 zSzGe+hL3sOaLMa}OI{0H^8Dv=(Uv?v_?YiMm!9c}5T5YtCcMZCq|BxCJW&-wDZMAs z%xtL)aT;5mX0@7BO~KQKUXS> zetj{7RJw6A(mke+V;+b|d6>wS-pc&zTBwIUCP^Y?CNl8}na?)7DZx@EIE&Leohsgz&d7hfi*(1NEmwA+tJ?nPGR6ldrKD?H6|93rWaZmXObs+I zuAK>{axE>J&F}+MZ}_QZy1+*!UFHP7C)>PrUC$TR^CLA~62dlD>(V1CJ5f$ceuVJF zQ{h(>`l-7bax1+(CME6m{Cu;yDocK@CtKMT=7pKGa-}<*GmqU9!@UXCRFX6rzOU-d Oll6KZ@_kj+uKWk%#L5!@ diff --git a/util/build.c b/util/build.c index 151caf5..747cc9e 100644 --- a/util/build.c +++ b/util/build.c @@ -107,6 +107,7 @@ BuildFont fonts[] = { { "Bitmap Sans", "", "Sans", "Latn", (FontFile []) { { "4", "Bitmap Sans Regular 9.font" }, + { "7", "Bitmap Sans Bold 9.font" }, {}, } },