From fa4bbacf3a4fd7921e527bde9c2278348aa6073e Mon Sep 17 00:00:00 2001
From: InvisibleUp <invisibleup@outlook.com>
Date: Wed, 1 Jul 2020 22:11:38 -0400
Subject: [PATCH] Start implementing "config mode" graphics

I still need to re-do most of the rendering system to throw out all the
jank, but this feels like a half-decent start imo.

Yes, every page is just a separate .png file. I'm lazy. That works.
---
 gfx/bootdlg/base.png                      | Bin 0 -> 3843 bytes
 gfx/bootdlg/model.png                     | Bin 0 -> 3897 bytes
 gfx/bootdlg/model_se30.png                | Bin 0 -> 2845 bytes
 gfx/bootdlg/start.png                     | Bin 0 -> 3296 bytes
 meson.build                               |  48 +++---
 src/HW/SCREEN/SCRNMAPR.c                  |  53 +++++++
 src/HW/SCREEN/SCRNMAPR.h                  | 181 ++--------------------
 src/UI/CONFIGM.c                          |  22 +++
 src/UI/CONFIGM.h                          |  11 ++
 src/UI/{ => _deprecated}/WIN32/DBGLOG.c   |   0
 src/UI/{ => _deprecated}/WIN32/INTLKBRD.c |   0
 src/UI/{ => _deprecated}/WIN32/KEYBOARD.c |   0
 src/UI/{ => _deprecated}/WIN32/OSGLUWIN.c |   0
 src/UI/{ => _deprecated}/WIN32/OSGLUWIN.h |   0
 src/UI/{ => _deprecated}/WIN32/SOUND.c    |   0
 src/UI/{ => _deprecated}/WIN32/SOUND.h    |   0
 src/UI/{ => _deprecated}/WIN32/TIMEDATE.c |   0
 17 files changed, 120 insertions(+), 195 deletions(-)
 create mode 100644 gfx/bootdlg/base.png
 create mode 100644 gfx/bootdlg/model.png
 create mode 100644 gfx/bootdlg/model_se30.png
 create mode 100644 gfx/bootdlg/start.png
 create mode 100644 src/HW/SCREEN/SCRNMAPR.c
 create mode 100644 src/UI/CONFIGM.c
 create mode 100644 src/UI/CONFIGM.h
 rename src/UI/{ => _deprecated}/WIN32/DBGLOG.c (100%)
 rename src/UI/{ => _deprecated}/WIN32/INTLKBRD.c (100%)
 rename src/UI/{ => _deprecated}/WIN32/KEYBOARD.c (100%)
 rename src/UI/{ => _deprecated}/WIN32/OSGLUWIN.c (100%)
 rename src/UI/{ => _deprecated}/WIN32/OSGLUWIN.h (100%)
 rename src/UI/{ => _deprecated}/WIN32/SOUND.c (100%)
 rename src/UI/{ => _deprecated}/WIN32/SOUND.h (100%)
 rename src/UI/{ => _deprecated}/WIN32/TIMEDATE.c (100%)

diff --git a/gfx/bootdlg/base.png b/gfx/bootdlg/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..77e8761eb10c7c1960be4e97299adabbc545a821
GIT binary patch
literal 3843
zcmai13p`a>7hmUG$LmTeT_!hFlayy~8IL;?Jw#NZ5VtX*?xzTetDKr%64g|Cqa>!h
z8icr<lCCM^l`s^yB+28-`|aE3R@3**@0;KE`<=($`>eh9TI>H`YwZ(ew|?~``5E#6
zFlp@?i;Vy{YGMwu(&(kJdTs>j`0iY}(r%}_JAn4tfU~CS3hk7SHQu(e)S2$D<Xdc4
zbmQnv%}A%?`j%G7+!u3mY@BATEwnkQ?D(+ghDh_l;L^d#{?lEiOMO4Zf;~zc)Z6$b
z$L5A*-L&1Mh5Ryp_J9k=O0C2{cq+Lw$K<Nj)4M}USM)|IeJgc_I`fFlpLK3+9B<TQ
z<J_W^F1;UIYZgk&UnwLx8XtAjbJm&IUTfIv{gD57PSP#q6SgPZuPLqx(eZ!LvizZC
zOo3F7%f2aRENpXXpX^dgpSnCO;Y8f+4cq_dIdS#KQr?cs-KxpHM#Zy_e*05mB6pg!
z%j5aZOVUg8Eef-aEDBN`^R|EZ`v!}!yoDQesy4?ZolB|kj9u_<JTyAeY;i~6<avi0
z9Lq+o!4D%G!MmV>glI=|#$f|0^F{Z?o$LJ?Z`C+C^{Sp|hl|VgY)m0#-=PXm=hs#%
z<tu;jpE;Nf(mhm{X?a0s*`1uzJ@YiPY;65y*y`9hdyPK_8HsJ4Z+u@hrXvjGeAaCB
z1JIvC-`M_m^L+>@qqP>_+wZUIc-67DK8ZzcnAbE?&>a17=lL6X_^hqJY)`MYK6XFM
z-FXZPPC6}Y`Z(D0<B}N>tKxj4KeqK9mjS~IVqs%ERp>>JHkrgB%;m`nNsj=qgHx;G
zP;UVMiE||rH(&tDKo8D{KwOChRkT`#mpzg=i2CIQXj)?Mc#2eh{xV_6Q4B&H%*?Y&
zT8=YG^rbfoY6}+vC_Qc#!WJc<Y6(&KLhv+Q!E%9X-?_aER-n3{X&ao0+^td1B6Z|R
zcaR=C%^)ikhrNYRyUz5!N=%C?T8ZG^w0u~-kcBjm(gtTs>OR52Wb;*vRUE944V<*K
z1p(j1n|s#dNMLYsa76q>QZHZf=?tEhDPS{@NdPVmkpKKeVYMvux-p!dZ0aO@2GnwQ
z6)C?KfMFme8)!i4#58@V5xXMg@2_lC1(3A|C*gJ`l`AJ`P8_vOEw!pwgNEzw$Bd;#
zC2}L38RMm^kt2+2GSnGLA9Tsg@b)VGJO)hRah|>ZGT)Hk21W3Ma$6{5fHv(%3vK8h
z$2iEn1lK(z(iJLeq6$izBi<z}aw?~-)Q9yG3}oXL*v0SV)iBZqCX={Q9^|?DjX$s%
zN2_4+oVFvo-^g&V!9aGmD|qIqhvP7tMOO1M1!u4pflnS}D*{L@fMoZ?Tns0XcaR^t
zWP|5Y$(zfoSK&ZtiUPpO4GjG-9|aWX5J{_q^dip?+)Fx`>(C5kMYyR<R_kE-9#!V6
zqcz=pUoH%D{b&-H*B=<&l;X{#YWZXQ6)17w)5+=z8t)|OBYA4EMY3?7$tiY+Rjy~z
zXEJ)<shJFbLrCvLv=h1zh0p^bLxZCYS?%%fbgt^ejNBQxK|6_kX|&Ry2I(RqxNQTs
z!w+TFWb_L%nQF;n+c4l@@BQ%wg8V%8TeW!;<FexEP^t@M{(a^30;tv!N67`Z#o^~n
z;4Ffo_5fzISAnWiH$(e$O3Nb7lzAdkTU5x`sf;t@)(0~t>YAL&bd7q(jF><+?29`7
zopfyfV!hM#!3L3P^lk{Xt=H$%iXweu>DT90?foyUFYroCqYb02Lr#}S(+^~^FO%vC
zoZGdyqUuS5>uAGKd9W}5y`CTyLiE)1rE7ombb#Rcuzd&)8o8#$+f4rzVVe3=_wvb*
zUQI^b3wMV~mGMp~{mTplo0qAyC^rjF3nUoO9%G(sBF!!HR0V2$$gddfZ@mR+D~Gl<
z+>Xpu24o1p4=k7qprs2aLagnO0FTLW9Kem5f~s)v(1+v!{C($cQp*P}B|-avpFJm%
z2zf|XCTrRUTZ*T>J=b0l<|}qLKakrvr!2IkALEt^#sv>dm;go&C|)`vvFyE>3|L%6
zrU@Zr7$vdynV`UDk!w|v4g|_++EC~w*VR{N{S*vq1rYUOO`8hXMQ?Hz?vBK~w*B-r
zwP^lHFyvy{O*YXhaLy52w40=j7#z-3stsgOmoMV#-iLhO9(bT^2#&VH&)7>#1mH1L
zb`L=GfuPho(Kg?=uaM?o$U-~Xbozk?(RE@2m<7)yE5)WwL-!9J=c$2GrnG|ZTq<OC
zKJQ0|rAX9l|6Hnf_R9FOT;6g<-GdF~bpuut4#Td`dJy_PK2z+jjJi$ahs00w>EI6y
z@EjMt93Dz;!N>}E&OjjJ<>J@x3f#qyii9{q{j^yrUObR*K4cssg=QPJt|EYleZE}1
zIS9CQxE*3zpC~`w?dKWv+K;Suv^73=hh2^J!!yO>W6y=NfZ9q>0@&?zHb(`(v9nLy
zj8fERLj4!dXvSF{{t{7NW9v(+#2GsCnXfl9XA+3z@_$j$HpQbfTD3-f&u;{`7cXBF
zQ}9IW-<P&D^1&jfe5d7XIOT#eX1Ne_?_O(uHXF$IL~MY98$|Brgwwo=31@r?Vq^gw
z7#gl}@d?<1Z%{K-=-G>NE9pcft{uAoS^b@Q3Lt9CxwnJ;04_boL|ZT))+e^dq1q<_
zjC%|>e2Z#DfjW~79y(BXo$x6d8cmr3obz~jFbkCmB&gbA44%5y?R^YG9_BL>;8Gf(
z@RejD-}kr(5f2gan3*&sr3e$H;iX77Lem55ngYPq0n{bsm?YX$(+=~Rc^xrh8VgWf
z;Kbr0U79dY^nh2!FXG)R#<;ift}A`x?4ZLT-RGOy!o%b0h4%^3$(dU|O(-{BK!^9=
z(V&|7zYg8;=vdKjGLX=J8wIyA$q0{V=5^RyVPo7-O!b2mIW$|;*HU@(uvO#T<SR}Z
zGGJOmb_Ft$4t#5OSGu*V;{Y4^k>P!+?rr0+5mL)Ix{EizV9C%PQ$?6Po%DQ+r$zPm
zgym<*)^3tRe#vf)@D@Zx6+Nx<9PJ;*F8vBe@)SA4*>$dCb&b5TfaXWdCxy6Snd^k>
zHWjirakP@B9Y2~W%or8)yC7cGuG>soPsa-K3A(<94&AC}eHr^CgmQ`mGz7>4xE7S#
zkgKu;xkB*A>9WQPRGGylHU8E=^Kx%k-vJ9fl<S6gqw5_fJG*C0l9CikqmG5Z!ocEM
zy_0Z0le9!$q})5xK^KQh_dp?lMRl`z)AqIX)M$;|ZTK1Cl^vWKnu^MD+fqF@p4yyO
znyoR<g)a`ufQ3FP0f$fdC~$VZ2~C&*)EYn0c_Ezd@9OAd#L}k+#g`27cX?6}M3ZIE
zM1#(Q&gaJWvN*$;nIw>x<*77B+<K4K8QV^t2J>w=MiZRGn4DJqqpiFE#8i0>#m8#H
zWymneI{Q;4q*EqU2k>GQxuJ)lX2!@N`%8Qc$X;>$Vp+QLSfE0AiRI8rj~Yx7ni48f
zTLF37+RuQ@4Apt10pPI!W{HWkWvzD!B=b;A&@@zr0h+g>*Ahyu(g&dK;ax5cc&q1!
z_<I+ZOGA<h88tLI(bU#*TI-nqk5RANm={0O^LmpHnoVA2{!`UW=!nnvOCGQE8^~x$
zqSaB>%I<AD)iY*u1*y>d@p6iKaNbmIvf{1OJspj_K>3nTvu*n`%oHIw3ESRD*xg~o
z*Eo)>iM9WxQrwcIY?iwos01d-$J$?}JJQtA+G-<MR@F_w6qFl<(CZ+>zJN|Mh80hw
z$TdXlNE>9h%;9#tA4By$fW_$$XSVDK3Qb`E$M(BB+my*sW5^WOs260~X^%xm71Ts)
zATKf<mc`lT(E&$Y4W9(u!?@CpfZMeGk{Cp<&n+%}D3pw$)P!1p)owKR%jx4khwmHy
zHB1Y9E%X1Y^*P)9J?@d{KP6{@J@GlBBxMP;C7~k;HV&5NO;;;=Od^Ep)z{dP)G$c}
zLyy>tFShRFGpJm@63J;ItY%eb%wz9B=r38S*OP<$G<_&RN3mXeU^BXIOe9sRK;9;B
zT1|);L~Mqjdi)iAga%kY9~xUfZ0AYAa4M!3hvtP^J!=__lmSsBE>b10YEAT3g;&R9
zd1GF$+8Wnk*+Dz1H^RU6AP6`Fm&ad$(k;RLZ7TOBO7OC-&>foUZB8c$O)t5$1IQY!
z1>k6o`mt{_axvpQW7|id>m%;d_6jia-af;xN5U`g035kR!$f;u@<TFXWuyeFPaTv&
oIhY~+TT_vUT=oBdVD$UUS+}!vn$$MFLh`WIa=k^$58T851}Ori`~Uy|

literal 0
HcmV?d00001

diff --git a/gfx/bootdlg/model.png b/gfx/bootdlg/model.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c787f784f428a540c31ea3c76a5989907c501a1
GIT binary patch
literal 3897
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

literal 0
HcmV?d00001

diff --git a/gfx/bootdlg/model_se30.png b/gfx/bootdlg/model_se30.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a9bb3e5aac42139aa7a859404d49e6e048a2206
GIT binary patch
literal 2845
zcmds(dpMM78^G_GahNbn2b8n4ODj@XLqiiuq!J}*WlAC<p^(G8mM9XoP?1BVY(!rr
z6`4hc4@JnxVURRo9m*kLX7-uc?Yi1+ul>G1zQ4Zby58$~-}gTK?)!e8=Y3DvZLuOr
zC`bSR$$H~@djLGT#W@ni(4=bhO#*uGKWJfLchJoZKr8uZvgxL3yG1eG`8Jl?%7Nq~
zPwgJ%q+C{eop<z|eO`-%qsvbnd9pt(_O;I|lhBnG6@T%l_!ma@^`4*Ah;eGKdsdEl
zCogF5k<e+%^b1g7hq9|HIC%SZdVX^X*w*#G+HSw+-^H~#LD6dJ*e+YG`kNg63kD{S
z8#H#<Q)?`XpC9$fEzUNUB2JLE>Zd=b38)#+Vab(SQJ>n_L{3Lj9uHtOcg=T(M=bnd
z;?pL*26uU|o;Vk;Q&_5}edKI#2E|Lky_J$!X6<w<HBC#VSs^lNh5bhJn7Gy7)0vhT
z|FYEg9^KRu9^bZ1Cbu#{f?^z}m29-Z>%x7nb4QyDXQZ~*bn+XTUtIl`JJP$XkvkZY
zl}qzfy|%-2^kd7omj`W3w5;?ZZ}Y|GdZU4t`EsUWOV=>_H#<1UVAoyf?_N2U*{A(@
zdzp*4nJ&ho>iNk`-1v0M>({=yc~5<s7k1%dt(c2nTD9_l@8Kz7*&wcnnlR6A<E{Vz
zT@As73%;`U7<#wOdi}cX!R^Cc@xFtUMWS}p`+R<#N>}nyciTC9I<-92z~<@+b3)p!
zinC2DN#x~!GO#BS$8aUtp7Q699+SX&6GJ>=ff_#jM2oP(@SVBdxb&QxJYXmk5&m)F
zw6o1xr`mUm0G3nDAMKVbso=@sfH@|QCj*$dU6a7!0TW|ReT!6pgoyzTXoPGW4WJP`
z0qGck0_L7IglL-ZjNSbVMSR&F4Ts~@XH*hky?o{dF&xkb;}+)F0yz1#`Bm7xJu+Wt
z248#3P%U+yDi9NTC%UW13xcVg3;E$|&CjtBj{pl<=p8CFFhqL>+v|3v04F5#6ovo=
zA+%7b5wicI$o#?+OF?>{0sfNhAJ{Y~krX74d^1aKHnj*U9g~pqwmiIRb-9p3jHWeS
zhTbYbPJQ1}K;<$JC@BC*Kq*EeV1Q^)oZm%XkV`3QZzc()D1CucsHA}G1%@bJf#E-h
z$hA~mVTjKFe~BpciJW0Bp8*hg{-28YUqtyEfW3Y1g{U5eFiWPdVRVcKH*ykPXu83!
zlasG3s%0HBN?9G3ad4guZ3;XABXjDF4j$wqwuzFkBC#Hm3<8bS!`2+mWd!P2Q$Hpe
zR*W1o9#BC-vKshRN$wp8C?Zq_UTPn{HciGKBJtlV;j<s8m}=~w7C%F#dr!+mnBJ9q
zTFFb<$=1;xZ*upSWqh+J`1yyI<Hz}(Zud^avl5kKL5r8W{1PGQVbWA7;kyXHVMCgn
z>b+baixL?Hb6}2A!~r#WnlHgiA8I|r<>;oX9B-6{(;PDFs^EZ9ct!uLii-zhNwq4y
z%Ddc!<~x7XxXvMq6(LElcyyYT7$l7Y)F&up8pE4wwWxQ($Igou0H<=-np7K3yU_?)
z9Kpt!Yl|Uzi<;<<UP8hWwO9a3s5?*f*=Yd38M?nT^HXHc$p8==Is5>e&`qnf+yV9(
zbQIB00LLCBz@h`-Mx8PIoj*0CqwOaRv?^m@^($eK4FSl@!H7c^(Rc8dE_{5h4uXA*
z$)c3idX=yt6pzWd=K_TWYfIIuoFkvthoY>%I7yiL(>j2Ohg2P2L9uoq0HzlOz_c;I
z1sIC}-4nGJl}^Csbm43hvXoPt>-haZk#m{knA3EY<z=lraVobipRe5IJF*%Ph7|<n
zb6?QeX6zejitIb3dmr$+hhK!ZG1!L%J76wbc4O=W?{F)}jIGO<xW{ERMP^FM-I)~&
zWs3uSpB=?{a<sZCVmeJXG;pJuOFySwoDvq%F3L3DcmE=9|D)nPm9Av{anuBE!7ofs
zWClU_c`d;|vA|N^eRxLwRf<Mz3;)n_dS+thOjuY~;>X1F5Y}UBj5#Q&T7-$-P!=ii
z(&(|}$4VJieqhyGW6;0ub)RAw>d_aaL9BoW_<EA>OE?$#@{>00ZMw3Enh3oV73oi7
zF4brgIL_BD4!u*{P(Hki#qA%isSP_tIIwM)ly1%mcWzfjebXaONNL6w@y5vdv-g5r
z^SX@!Mba{7Z!cp=5uNUlrXP*Dy1T|isjF@+8@@GqRt$PBSNR&Aj~IE`C>0%3ccPwU
zZZSqo$!-dr)nKHuxm35ZyAjGHpdF#ykvebZv@SnQo5XG67PuId56T7)g%=jZ?A8r<
zTk9N^i-W}r@Mg+~Zfe-oJ1yt<R`v%6Ee>Y*7uom(vz$++&c17Vh|Xc3D<L2Io>&oP
zI>z1)*hw#Be6OAzg%<Yk^`SMA#ZwlLTSdFwEeepScupx+9zdm=*y4C!Uwq#PC3N_%
z=mGZC)>*xMlZ=Ug+q~MW1M0nKfzQ#smt>e~G84*Fd!stC!lju;nz*UX#LO(WsXkQk
zKZc*Q$9nvmXC~gf(?LZ;#)@Xg_V_-w{q!a@)QAQ#GTEJ+4dJ7%{1rNB3G(f0Z}yt7
zldeS>;qjh3X96Cs(ogbFi$9_6cz?@iy7XjWTytHFB58*<e+!#Pq(6^av!Azie~kZt
z$pBxKn|!(P=4F*tE2_PDijqsl@W5QIUAxV~vxUi>2yLx;d@{*l_Mz!0EY|GuKwsB_
zD1DNQsqEZ$vkP$0^PW(wNnviK%p=q1yr`LBv)$3D)9d_t-_Dc8K9HrAU5l0RCzV;J
zF7f$;<ykqs5Bq(CT5Sg^8t{^E*ITNGql5>&v0X_&i_mR}W5)&mjQ=O2v$JyLncFGV
SF_cw;jI1rUtiNGS|M53~wc95E

literal 0
HcmV?d00001

diff --git a/gfx/bootdlg/start.png b/gfx/bootdlg/start.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff3a9a03f3ebb5614d81003e43aefb33d3e460e2
GIT binary patch
literal 3296
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
J6~B@a{sB(2E^7b)

literal 0
HcmV?d00001

diff --git a/meson.build b/meson.build
index afca2e3..6a4f9a0 100644
--- a/meson.build
+++ b/meson.build
@@ -38,7 +38,7 @@ conf = configuration_data({
 	# Enable about dialog
 	'NeedDoAboutMsg': 1,
 	# Enable Control Mode (options menu)
-	'UseControlKeys': 1,
+	'UseControlKeys': 0,
 	# Include international characters for Control Mode
 	'NeedIntlChars': 0,
 	# Force keyboard to match Mac layout on Windows
@@ -131,34 +131,22 @@ MAC_SRC = {
 }
 
 # User interface definitions
-UI_SRC = {
-	'WIN32': [
-		'src/UI/COMOSGLU.c',
-		'src/UI/CONTROLM.c',
-		'src/UI/WIN32/DBGLOG.c',
-		'src/UI/WIN32/INTLKBRD.c',
-		'src/UI/WIN32/KEYBOARD.c',
-		'src/UI/WIN32/OSGLUWIN.c',
-		'src/UI/WIN32/SOUND.c',
-		'src/UI/WIN32/TIMEDATE.c',
-		'rsrc/WIN32/main.rc',
-	],
-	'SDL2': [
-		'src/UI/COMOSGLU.c',
-		'src/UI/CONTROLM.c',
-		'src/UI/SDL2/OSGLUSD2.c',
-		#'src/UI/SDL2/CLIPBRD.c',
-		'src/UI/SDL2/DBGLOG.c',
-		'src/UI/SDL2/DRIVES.c',
-		'src/UI/SDL2/INTL.c',
-		'src/UI/SDL2/KEYBOARD.c',
-		'src/UI/SDL2/MOUSE.c',
-		'src/UI/SDL2/ROM.c',
-		'src/UI/SDL2/SOUND.c',
-		'src/UI/SDL2/TIMEDATE.c',
-		'src/UI/SDL2/VIDEO.c',
-	]
-}
+UI_SRC = [
+	'src/UI/COMOSGLU.c',
+	'src/UI/CONTROLM.c',
+	'src/UI/CONFIGM.c',
+	'src/UI/SDL2/OSGLUSD2.c',
+	#'src/UI/SDL2/CLIPBRD.c',
+	'src/UI/SDL2/DBGLOG.c',
+	'src/UI/SDL2/DRIVES.c',
+	'src/UI/SDL2/INTL.c',
+	'src/UI/SDL2/KEYBOARD.c',
+	'src/UI/SDL2/MOUSE.c',
+	'src/UI/SDL2/ROM.c',
+	'src/UI/SDL2/SOUND.c',
+	'src/UI/SDL2/TIMEDATE.c',
+	'src/UI/SDL2/VIDEO.c',
+]
 
 EMU_SRC = [
 	'src/PROGMAIN.c',
@@ -177,7 +165,7 @@ EMU_INC = include_directories([
 # Just gonna do an SDL2 Mac Plus for now
 executable(
 	'microvmac',
-	sources: MAC_SRC['Plus'] + UI_SRC['SDL2'] + EMU_SRC,
+	sources: MAC_SRC['Plus'] + UI_SRC + EMU_SRC,
 	dependencies: [lSDL2],
 	include_directories: EMU_INC,
 )
diff --git a/src/HW/SCREEN/SCRNMAPR.c b/src/HW/SCREEN/SCRNMAPR.c
new file mode 100644
index 0000000..792c45a
--- /dev/null
+++ b/src/HW/SCREEN/SCRNMAPR.c
@@ -0,0 +1,53 @@
+/*
+	HW/SCREEN/SCRNMAPR.h
+
+	Copyright (C) 2012 Paul C. Pratt
+
+	You can redistribute this file and/or modify it under the terms
+	of version 2 of the GNU General Public License as published by
+	the Free Software Foundation.  You should have received a copy
+	of the license along with this file; see the file COPYING.
+
+	This file is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	license for more details.
+*/
+
+/*
+	SCReeN MAPpeR
+*/
+
+#include "SCRNMAPR.h"
+#include <assert.h>
+
+void ScrnMapr_DoMap(
+    rect_t region, rect_t bounds,
+    const color_t *src, color_t *dst,
+	uint8_t src_depth, uint8_t dst_depth,
+    const color_t *map, uint8_t scale
+) {
+	/* check of parameters */
+	assert(src_depth >= 0);
+	assert(src_depth <= 3);
+	assert(dst_depth >= src_depth);
+
+	/* define variables */
+	int x, y, sx, sy; // loop vars
+	uint16_t line_width = bounds.right - bounds.left;
+
+	for (y = region.top; y < region.bottom; y += 1)
+	{
+		for (sy = 0; sy < scale - 1; sy += 1)
+		{
+			for (x = region.left; x < region.right; x += 1)
+			{
+				color_t color = src[(y+sy)*line_width + x];
+				for (sx = 0; sx < scale - 1; sx += 1)
+				{
+					dst[(y+sy)*line_width + x*scale + sx] = map[color];
+				}
+			}
+		}
+	}
+}
diff --git a/src/HW/SCREEN/SCRNMAPR.h b/src/HW/SCREEN/SCRNMAPR.h
index 282ed56..59316f2 100644
--- a/src/HW/SCREEN/SCRNMAPR.h
+++ b/src/HW/SCREEN/SCRNMAPR.h
@@ -1,168 +1,19 @@
-/*
-	HW/SCREEN/SCRNMAPR.h
+/* SCRNMAPR.h */
+#include <stdint.h>
+#pragma once
 
-	Copyright (C) 2012 Paul C. Pratt
+typedef struct {
+    uint16_t top;
+    uint16_t left;
+    uint16_t right;
+    uint16_t bottom;
+} rect_t;
 
-	You can redistribute this file and/or modify it under the terms
-	of version 2 of the GNU General Public License as published by
-	the Free Software Foundation.  You should have received a copy
-	of the license along with this file; see the file COPYING.
+typedef uint32_t color_t;
 
-	This file is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	license for more details.
-*/
-
-/*
-	SCReeN MAPpeR
-*/
-
-/* required arguments for this template */
-
-#ifndef ScrnMapr_DoMap /* procedure to be created by this template */
-#error "ScrnMapr_DoMap not defined"
-#endif
-#ifndef ScrnMapr_Src
-#error "ScrnMapr_Src not defined"
-#endif
-#ifndef ScrnMapr_Dst
-#error "ScrnMapr_Dst not defined"
-#endif
-#ifndef ScrnMapr_SrcDepth
-#error "ScrnMapr_SrcDepth not defined"
-#endif
-#ifndef ScrnMapr_DstDepth
-#error "ScrnMapr_DstDepth not defined"
-#endif
-#ifndef ScrnMapr_Map
-#error "ScrnMapr_Map not defined"
-#endif
-
-/* optional argument for this template */
-
-#ifndef ScrnMapr_Scale
-#define ScrnMapr_Scale 1
-#endif
-
-/* check of parameters */
-
-#if (ScrnMapr_SrcDepth < 0) || (ScrnMapr_SrcDepth > 3)
-#error "bad ScrnMapr_SrcDepth"
-#endif
-
-#if (ScrnMapr_DstDepth < ScrnMapr_SrcDepth)
-#error "bad ScrnMapr_Dst"
-#endif
-
-/* calculate a few things local to this template */
-
-#define ScrnMapr_MapElSz \
-	(ScrnMapr_Scale << (ScrnMapr_DstDepth - ScrnMapr_SrcDepth))
-
-#if 0 == (ScrnMapr_MapElSz & 3)
-#define ScrnMapr_TranT uint32_t
-#define ScrnMapr_TranLn2Sz 2
-#elif 0 == (ScrnMapr_MapElSz & 1)
-#define ScrnMapr_TranT uint16_t
-#define ScrnMapr_TranLn2Sz 1
-#else
-#define ScrnMapr_TranT uint8_t
-#define ScrnMapr_TranLn2Sz 0
-#endif
-
-#define ScrnMapr_TranN (ScrnMapr_MapElSz >> ScrnMapr_TranLn2Sz)
-
-#define ScrnMapr_ScrnWB (vMacScreenWidth >> (3 - ScrnMapr_SrcDepth))
-
-/* now define the procedure */
-
-LOCALPROC ScrnMapr_DoMap(int16_t top, int16_t left,
-	int16_t bottom, int16_t right)
-{
-	int i;
-	int j;
-#if (ScrnMapr_TranN > 4) || (ScrnMapr_Scale > 2)
-	int k;
-#endif
-	uint32_t t0;
-	ScrnMapr_TranT *pMap;
-#if ScrnMapr_Scale > 1
-	ScrnMapr_TranT *p3;
-#endif
-
-	uint16_t leftB = left >> (3 - ScrnMapr_SrcDepth);
-	uint16_t rightB = (right + (1 << (3 - ScrnMapr_SrcDepth)) - 1)
-		>> (3 - ScrnMapr_SrcDepth);
-	uint16_t jn = rightB - leftB;
-	uint16_t SrcSkip = ScrnMapr_ScrnWB - jn;
-	uint8_t *pSrc = ((uint8_t *)ScrnMapr_Src)
-		+ leftB + ScrnMapr_ScrnWB * (uint32_t)top;
-	ScrnMapr_TranT *pDst = ((ScrnMapr_TranT *)ScrnMapr_Dst)
-		+ ((leftB + ScrnMapr_ScrnWB * ScrnMapr_Scale * (uint32_t)top)
-			* ScrnMapr_TranN);
-	uint32_t DstSkip = SrcSkip * ScrnMapr_TranN;
-
-	for (i = bottom - top; --i >= 0; ) {
-#if ScrnMapr_Scale > 1
-		p3 = pDst;
-#endif
-
-		for (j = jn; --j >= 0; ) {
-			t0 = *pSrc++;
-			pMap =
-				&((ScrnMapr_TranT *)ScrnMapr_Map)[t0 * ScrnMapr_TranN];
-
-#if ScrnMapr_TranN > 4
-			for (k = ScrnMapr_TranN; --k >= 0; ) {
-				*pDst++ = *pMap++;
-			}
-#else
-
-#if ScrnMapr_TranN >= 2
-			*pDst++ = *pMap++;
-#endif
-#if ScrnMapr_TranN >= 3
-			*pDst++ = *pMap++;
-#endif
-#if ScrnMapr_TranN >= 4
-			*pDst++ = *pMap++;
-#endif
-			*pDst++ = *pMap;
-
-#endif /* ! ScrnMapr_TranN > 4 */
-
-		}
-		pSrc += SrcSkip;
-		pDst += DstSkip;
-
-#if ScrnMapr_Scale > 1
-#if ScrnMapr_Scale > 2
-		for (k = ScrnMapr_Scale - 1; --k >= 0; )
-#endif
-		{
-			pMap = p3;
-			for (j = ScrnMapr_TranN * jn; --j >= 0; ) {
-				*pDst++ = *pMap++;
-			}
-			pDst += DstSkip;
-		}
-#endif /* ScrnMapr_Scale > 1 */
-	}
-}
-
-/* undefine template locals and parameters */
-
-#undef ScrnMapr_ScrnWB
-#undef ScrnMapr_TranN
-#undef ScrnMapr_TranLn2Sz
-#undef ScrnMapr_TranT
-#undef ScrnMapr_MapElSz
-
-#undef ScrnMapr_DoMap
-#undef ScrnMapr_Src
-#undef ScrnMapr_Dst
-#undef ScrnMapr_SrcDepth
-#undef ScrnMapr_DstDepth
-#undef ScrnMapr_Map
-#undef ScrnMapr_Scale
+// Copy a rectangular bitmap region, scaling and converting color depth as needed
+void ScrnMapr_DoMap(
+    rect_t bounds,
+    const uint8_t *src, uint8_t *dst, uint8_t src_depth, uint8_t dst_depth,
+    const uint8_t *map, uint8_t scale
+);
diff --git a/src/UI/CONFIGM.c b/src/UI/CONFIGM.c
new file mode 100644
index 0000000..eb86726
--- /dev/null
+++ b/src/UI/CONFIGM.c
@@ -0,0 +1,22 @@
+/*
+ * CONFIG Mode
+ * 
+ * A replacement for Control Mode, with prettier grapgics and actual settings
+ * 
+ */
+
+#include <SDL2.h> // everything else is deprecated now
+#include <stdlib.h>
+#include <stdint.h>
+#include "CONFIGM.h"
+#include "UI/SDL2/OSGLUSD2.h"
+
+/* -- Public Functions -- */
+
+void ConfigMode_Tick()
+{
+	// Get the screen context and just draw something there for now
+	
+	SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
+	SDL_RenderDrawRect(renderer, {.x = 16, .y = 16, .w = 128, .h = 128});
+}
diff --git a/src/UI/CONFIGM.h b/src/UI/CONFIGM.h
new file mode 100644
index 0000000..d5dbe1e
--- /dev/null
+++ b/src/UI/CONFIGM.h
@@ -0,0 +1,11 @@
+/*
+ * CONFIG Mode
+ * 
+ * A replacement for Control Mode, with prettier grapgics and actual settings
+ * 
+ */
+
+/* -- functions -- */
+
+// Run this once every frame, I guess
+void ConfigMode_Tick();
diff --git a/src/UI/WIN32/DBGLOG.c b/src/UI/_deprecated/WIN32/DBGLOG.c
similarity index 100%
rename from src/UI/WIN32/DBGLOG.c
rename to src/UI/_deprecated/WIN32/DBGLOG.c
diff --git a/src/UI/WIN32/INTLKBRD.c b/src/UI/_deprecated/WIN32/INTLKBRD.c
similarity index 100%
rename from src/UI/WIN32/INTLKBRD.c
rename to src/UI/_deprecated/WIN32/INTLKBRD.c
diff --git a/src/UI/WIN32/KEYBOARD.c b/src/UI/_deprecated/WIN32/KEYBOARD.c
similarity index 100%
rename from src/UI/WIN32/KEYBOARD.c
rename to src/UI/_deprecated/WIN32/KEYBOARD.c
diff --git a/src/UI/WIN32/OSGLUWIN.c b/src/UI/_deprecated/WIN32/OSGLUWIN.c
similarity index 100%
rename from src/UI/WIN32/OSGLUWIN.c
rename to src/UI/_deprecated/WIN32/OSGLUWIN.c
diff --git a/src/UI/WIN32/OSGLUWIN.h b/src/UI/_deprecated/WIN32/OSGLUWIN.h
similarity index 100%
rename from src/UI/WIN32/OSGLUWIN.h
rename to src/UI/_deprecated/WIN32/OSGLUWIN.h
diff --git a/src/UI/WIN32/SOUND.c b/src/UI/_deprecated/WIN32/SOUND.c
similarity index 100%
rename from src/UI/WIN32/SOUND.c
rename to src/UI/_deprecated/WIN32/SOUND.c
diff --git a/src/UI/WIN32/SOUND.h b/src/UI/_deprecated/WIN32/SOUND.h
similarity index 100%
rename from src/UI/WIN32/SOUND.h
rename to src/UI/_deprecated/WIN32/SOUND.h
diff --git a/src/UI/WIN32/TIMEDATE.c b/src/UI/_deprecated/WIN32/TIMEDATE.c
similarity index 100%
rename from src/UI/WIN32/TIMEDATE.c
rename to src/UI/_deprecated/WIN32/TIMEDATE.c