From 6583ffe32161badbe7c08ae4824b9d1aafc29c09 Mon Sep 17 00:00:00 2001 From: xmm15 Date: Sun, 16 Feb 2020 00:25:32 -0600 Subject: [PATCH] evt -> event --- src/0000Boot/0000Kernel.BIN.C | Bin 190448 -> 190448 bytes src/Apps/Psalmody/PsalmodyMain.CC | 8 +- src/Compiler/Compiler.BIN | Bin 194048 -> 194048 bytes src/Demo/Lectures/Optimization.CC | 2 +- src/Doc/Charter.DD | 23 +- src/Doc/Glossary.DD | 17 +- src/Kernel.BIN.C | Bin 190368 -> 190368 bytes src/Kernel/Kernel.MAP | 680 +++++++++++++++--------------- src/Kernel/KernelA.HH | 2 +- src/Kernel/KernelC.HH | 2 +- src/Kernel/SerialDev/Keyboard.CC | 2 +- src/Kernel/SerialDev/Mouse.CC | 6 +- src/Tmp/MyDistro.iso | Bin 38930432 -> 38928384 bytes src/Zenith/AutoComplete/ACTask.CC | 2 +- src/Zenith/DolDoc/DocPutKey.CC | 2 +- src/Zenith/God/GodDoodle.CC | 2 +- src/Zenith/God/HolySpirit.CC | 4 +- src/Zenith/Win.CC | 4 +- 18 files changed, 361 insertions(+), 395 deletions(-) diff --git a/src/0000Boot/0000Kernel.BIN.C b/src/0000Boot/0000Kernel.BIN.C index 7ec9ae888fcff3c852f9e682f77780fbf391ffa0..31849ad9269b3d97ccb75d926471fe7f66e05418 100755 GIT binary patch delta 334 zcmexxp8Laj?g=LB(=WuaXghIlUdVEhc{2|STRh{O&BDnM$}G)$rZG;w&?mCFxvhYa zC4MiESKp~PS)#+3No2xg-wr>Pn9UFslV7)qPCn5Q$82bByjio8i4m%Rv2k-vmkBFl z(dLc)Vzw+Rwn3HOKhwcdxE088w2|1{e0BymQ}Bz)g>9mnjc$HrV){36v*w*DR%Va? zrJI*Mv`b=C+y2y*^Ou zqxkkU=}Zn{EEOfzT-!g?GEL=UPBpNd?oiDnwtZd?(<8<0Q`a%&$crkQGBS84rTFHT W7N@$FrRJ4{Wag%B|9_V0y(9qL#edBJ delta 329 zcmexxp8Laj?g=LBG5v=awVk*(FJ!sMyqSlEEuL}3X5r)rWtRRu(-PjLi@glV7)qPCn5QH#w|bbh35l2dF$_-{zVw6IMos z%^Um0Y+1H!gQ~uNrh}z+E0E)8BeA*p>flags; @@ -477,7 +477,7 @@ mo_got_message: col=0; break; case MESSAGE_KEY_DOWN: - evt_time=tS; + event_time=tS; if ('0'<=arg1<='9') { psm_octave=arg1-'0'; PsmMenu(psm_octave); @@ -722,7 +722,7 @@ mo_got_message: } break; case MESSAGE_KEY_UP: - evt_time=tS; + event_time=tS; break; case MESSAGE_MS_MOVE: if (arg2>18*FONT_HEIGHT) @@ -757,7 +757,7 @@ mo_got_message: music.tempo=4.4*tempo_state.tempo/TEMPO_RANGE+0.5; music.stacatto_factor=0.88*tempo_state.stacatto/TEMPO_RANGE+0.12; tmpn->duration=PsmConvertDuration( - music.tempo*(evt_time-note_down_time)); + music.tempo*(event_time-note_down_time)); PsmSetWidth(tmpn); QueueInsert(tmpn,psm.cur_note->last); } diff --git a/src/Compiler/Compiler.BIN b/src/Compiler/Compiler.BIN index b395cf53fa7bbc0e7e826f30a989020d77b8b56a..a1ed2b0072300e42a40196c6ae7dfbd68d2d2fc7 100755 GIT binary patch delta 37 tcmZp8!`<+Pdqe+Irf-urPkfr6$v9&>qd#LlBV$i{VF2Uy!T_fJr2tdL5HkP( delta 37 tcmZp8!`<+Pdqe+ICZ@@oCqB*3WL&YG(VsD&k#S~wVF2Uy!T_fJr2sqQ4_yEN diff --git a/src/Demo/Lectures/Optimization.CC b/src/Demo/Lectures/Optimization.CC index 33f7fa58..cd870e3b 100755 --- a/src/Demo/Lectures/Optimization.CC +++ b/src/Demo/Lectures/Optimization.CC @@ -37,7 +37,7 @@ _WELL_OPTIMIZED1:: _WELL_OPTIMIZED2:: //Unrolled XOR RAX,RAX - MOV RCX,SAMPLES-1 + MOV RCX,SAMPLES-1 @@05: ADD RAX,RCX DEC RCX ADD RAX,RCX diff --git a/src/Doc/Charter.DD b/src/Doc/Charter.DD index 0e92ab0e..a1d02ae6 100755 --- a/src/Doc/Charter.DD +++ b/src/Doc/Charter.DD @@ -1,25 +1,6 @@ $FG,5$$WW,1$$TX+CX,"ZenithOS Charter"$$FG$ -Why did they make Solomon's Temple? It was a direction to look, to focus on, a special place for meditation, to do offerings, a community center, a home to God's beauty, that encouraged love of God. People cherished God's temple, beautifying it with gold and all fine things to show love of God, as great $TX,"cathedrals",HTML="https://www.youtube.com/watch?v=xkfmK-CLvcc"$ were decorated with astounding, awe-striking intricate art and gargoyles, incredible devotion to God with hours of effort, toiling and slaving-away for the glory of God, for families with children to see $TX,"stained-glass",HTML="https://www.youtube.com/watch?v=t8g1e-JLrhM"$ windows and tomes with ridiculously elaborate $TX,"calligraphy",HTML="https://www.youtube.com/watch?v=Oa8gMb0YC68"$ to show love of God, from a people who did little else but show love toward God, lived in dire conditions by today's standards, yet with so much difficulty scraping-by, found the time to devote $TX,"even all free-time",HTML="https://www.youtube.com/watch?v=tZw5V4XuUIo"$ to God! - - -1 Kings 6:21 (King James) - -$ID,5$6:21 So Solomon overlaid the house within with pure gold: and he made -a partition by the chains of gold before the $FG,4$oracle$FG$; and he overlaid -it with gold. - -6:22 And the whole house he overlaid with gold, until he had finished -all the house: also the whole altar that was by the $FG,4$oracle$FG$ he overlaid -with gold. - -6:23 And within the $FG,4$oracle$FG$ he made two cherubims of olive tree, each -ten cubits high. -$ID,-5$ - -* ZenithOS is God's official temple. Just like Solomon's temple, this is a community focal point where offerings are made and God's oracle is consulted. - -* God said $FG,2$640x480 16 color$FG$ graphics is a covenant like circumcision. Children will do offerings. Think of 16 colors like the Simpson's cartoons. In the future, even if one GPU were universal, we would still keep 640x480 16 color and not use GPU acceleration. Graphics operations should be transparent, not hidden in a GPU. +* God said $FG,2$640x480 16 color$FG$ graphics is a covenant like circumcision. Children will do offerings. Think of 16 colors like the Simpson's cartoons. In the future, even if one GPU were universal, we would still keep 640x480 16 color and not use GPU acceleration. Graphics operations should be transparent, not hidden in a GPU. * God said to use a single-voice 8-bit signed MIDI-like sample for sound. God does not want death screams, perhaps, because God has PTSD or soldiers have PTSD. (Imagine wounded on battlefields.) @@ -31,7 +12,7 @@ $ID,-5$ * Low line count is the highest good, so it is easy to learn the whole thing. Users should see the light at the end of the tunnel. One file system, for example, is better than many file systems. -* There is a limit of 100,000 lines of code for all time, not including applications and demos. $FG,4$Code comments count$FG$, however. Currently, there are $TX,"81,494",D="DD_TEMPLEOS_LOC"$ lines of code. $FG,4$3rd party libraries are banned$FG$ because they circumvent the intent of this limit. The vision is a Commodore 64 ROM -- a fixed core API that is the only dependency of applications. Dependency on components and libraries creates a hell that is no longer blissful. +* There is a limit of 100,000 lines of code for all time, not including applications and demos. $FG,4$Code comments count$FG$, however. Currently, there are $TX,"80,849",D="DD_TEMPLEOS_LOC"$ lines of code. $FG,4$3rd party libraries are banned$FG$ because they circumvent the intent of this limit. The vision is a Commodore 64 ROM -- a fixed core API that is the only dependency of applications. Dependency on components and libraries creates a hell that is no longer blissful. * The metric for resolving all ZenithOS code governance issues is how fast the compiler compiles itself and the kernel with $LK,"BootHDIns",A="MN:BootHDIns"$(). The $LK,"CosmiC",A="FI:::/Doc/CosmiC.DD"$ language should be changed to optimize this metric, as I did when I changed type casting from prefix standard C to postfix $LK,"CosmiC",A="FI:::/Doc/CosmiC.DD"$, but we need a rule to prevent degenerating into a brainfuck language. diff --git a/src/Doc/Glossary.DD b/src/Doc/Glossary.DD index f6acbb47..a8d4c664 100755 --- a/src/Doc/Glossary.DD +++ b/src/Doc/Glossary.DD @@ -1,4 +1,4 @@ -$WW,1$$FG,5$$TX+CX,"Glossery"$$FG$ +$WW,1$$FG,5$$TX+CX,"Glossary"$$FG$ $TR,"Abbreviations"$ $ID,2$$FG,2$Abs$FG$ Absolute @@ -20,11 +20,7 @@ $FG,2$Blk$FG$ Block $FG,2$Bmp$FG$ BitMap $FG,2$Bttn$FG$ Button $FG,2$Buf$FG$ Buffer -$FG,2$Bwd$FG$ Backward $FG,2$CB$FG$ Call-Back, Code Block -$FG,2$Config$FG$ Config -$FG,2$Change$FG$ Change -$FG,2$Check$FG$ Check $FG,2$Clip$FG$ Clipboard $FG,2$Clus$FG$ Cluster $FG,2$Cmd$FG$ Command @@ -34,14 +30,11 @@ $FG,2$Const$FG$ Consant $FG,2$Cont$FG$ Continue $FG,2$Ctrl$FG$ Control. The ctrl key is indicated with "$FG,2$^$FG$" in documentation. $FG,2$Cur$FG$ Current -$FG,2$Convert$FG$ Convert -$FG,2$Debug$FG$ Debug $FG,2$Dbl$FG$ Double $FG,2$DC$FG$ Device Context $FG,2$Del$FG$ Delete $FG,2$Desc$FG$ Descriptor, Description $FG,2$Dev$FG$ Device -$FG,2$Default$FG$ Default $FG,2$Dir$FG$ Directory, Direction $FG,2$Div$FG$ Divide $FG,2$Doc$FG$ Document @@ -56,13 +49,11 @@ $FG,2$Exe$FG$ Execute $FG,2$Ext$FG$ Extern, Extended, Extract $FG,2$Feat$FG$ Feature $FG,2$FG$FG$ Foreground -$FG,2$Format$FG$ Format $FG,2$Fwd$FG$ Forward $FG,2$FPS$FG$ Frames per Second, First Person Shooter $FG,2$fp_$FG$ Function ptr $FG,2$Fun$FG$ Function $FG,2$Gen$FG$ Generate -$FG,2$Global$FG$ Global $FG,2$Gr$FG$ Graphic $FG,2$Hndlr$FG$ Handler $FG,2$IDE$FG$ Integrated Drive Electronics, Integrated Development Environment @@ -91,8 +82,6 @@ $FG,2$Mgr$FG$ Manager $FG,2$Mid$FG$ Middle $FG,2$Mon$FG$ Month $FG,2$MP$FG$ MultiProcessor -$FG,2$Mouse$FG$ Mouse -$FG,2$Message$FG$ Message $FG,2$Num$FG$ Number $FG,2$Obj$FG$ Object $FG,2$Occ$FG$ Occurrence @@ -118,7 +107,6 @@ $FG,2$Queue$FG$ Queue $FG,2$Rand$FG$ Random $FG,2$Ref$FG$ Reference $FG,2$Reg$FG$ Register, Registry, Regular -$FG,2$Remove$FG$ Remove $FG,2$Rep$FG$ Report, Repeat $FG,2$Res$FG$ Result $FG,2$Rev$FG$ Reverse, Reversed @@ -127,7 +115,6 @@ $FG,2$Reset$FG$ Reset $FG,2$Rot$FG$ Rotation $FG,2$Rx$FG$ Receive $FG,2$Sched$FG$ Sceduler -$FG,2$Screen$FG$ Screen $FG,2$Sec$FG$ Second, Secondary $FG,2$Sect$FG$ Sector $FG,2$Sel$FG$ Select, Selected @@ -135,11 +122,9 @@ $FG,2$Seq$FG$ Sequence $FG,2$Sound$FG$ Sound $FG,2$SP$FG$ SingleProcessor $FG,2$Src$FG$ Source -$FG,2$Server$FG$ Server $FG,2$Stat$FG$ Status, Statistic $FG,2$Std$FG$ Standard $FG,2$Stack$FG$ Stack -$FG,2$Statement$FG$ Statement $FG,2$Str$FG$ String $FG,2$Sym$FG$ Symbol $FG,2$Sync$FG$ Synchronization diff --git a/src/Kernel.BIN.C b/src/Kernel.BIN.C index bfb5ddc176c9c666140703e3ae34cef41e2b8227..cfb830113e3bf82c6b26cedac528029a159e63d3 100755 GIT binary patch delta 497 zcmZ2*o_oQ0?g=LB_l`%iXghIlUdVEhc{2~o{Yb|C&2M7WSeZPgZWc){kY()H+}g07 znR)7D#>s}3lA8lsq?uR@=K^^b`b0K2w-qq5@XrJC>N^!DOLQ1BzL@OO;m^W01)^Z` z>o(ENCpwZDA>vHI6E@d&&6H!DJ6U|?aW=XA4%Ko0Ob3g?G$6;( zMq+dG*%{o-e0+S<8LJsZHXGgi%EYvliVsS=vQeyG;d;E+= zOpKGa2MPf_$MmOT`!i=oIROxZErjtEKO@8B1udf6*-{wg*jfH`0NwQZrR;XsY{qlK zOcSHFi`Fx47hwiD6&MuTA5Uh~R-bIwz`^3t{KjDVg$^ds?fSbJRfL(oPu?DSj?svn znT?HYde>D(PbS8w$q#=EPY+ni$h!RPRYo<&S=-4HPT#&eh-sn-lcx3bi2;ma+f&k+&bV!NUB{FoFREk^nz?zWM+F delta 495 zcmZ2*o_oQ0?g=LBB}eu#YCCanUdVEhc{2~o{YXaV&2M7WSegELY!*o_kY%*l+}g07 znb~tP<77ii$;|;R(o8JR1Ax2>eIlEi+X@(2js^mG^__~7B|3~5KTY=O@MqcM4pA`q zb(`qs6CKHn5OF3>m(8_ZGvycqCyTE<&gSOt92y+I`N_)1N-W&oP#yQrbg*0l+2&{? zvAOx|3~sPR`Zs?tG3jYe*1S{BR-CO@l32WX*_}TuEDS)fdD%lBE*3{0AI{C+UMI0L zx=v>NB0ag}vks%%=|7*PyFI0&90!}X=b93y!{?OV-XXh`}RN~pudzx} zW-o}Fw?CfDsIAVUprBA2>e2niqxp@&^a~wKqTBU%GpYzPt##iXdXCYEof+uX>0MVD zJ((K#CO`ZwJUw73BkS_FR~gk9{kFgR&FC-77m`?NVfuxAh { {6{G{K{Z{l{{{{{{{{{{{{{{{{e|j|j||||||||||H    H +--2!4AJ&5S"66WZc #&+R# lp2@F$DLYɐΐސ%p 2BQQXXXK&h#9vvvww#w%w.w0w0w3wOwwwwwwwww'$gl`y`ydytyyy(d ! !!!*!7!D!Q!i!}!!!!!!!!!!!!!"!")"="D"D"N")|9IaIaSa`aqa{aaaaaaaaaaaaaaaaaab*X§էߧ+05HJJT,D, Q Q!Q1Q8QMQTQ[Q\QdQ-X---445;.P -.499JNSS[/ $(HHHHH0ɛś؛ -9DPY֜ '*@1<R]KK]m2 ZZ^3<ȈЈ؈ۈ44ajJJJJ=KMKZKnKrKtK54MVIIIIJ-J:JNJSJUJ6ss',?DIcxzW7$8 PT^^btv9 ^^h{:,YY YYY+Y1Y6Y;8SjSjsj~jjjjjjjj<8%**4<Pemprv= >\6?4***.@4u~LLLLULeLqLLLLA ..2UYB4C@:FQQQQQQQQQDXl~YcYckcncyc~cccccccccccdE:Z b b#b.b3b>BXZMHQzQzqz~zzzzzzzzzzNHyyyyyyz%z+z8zAzBzNzO P Qd^^^^^^^^^^_'_0_7_[_d_k_w_y_RMMNN7NFNQN`NmNNNNNNNNNNNNOOOO O>OQOZOkOrOrOOOS,P-9]]rz!<>>PPbii{T +.499JNSS[/ $(HHHHH0ɛś؛ -9DPY֜ '*@1<R]KK]m2 ZZ^3<ȈЈ؈ۈ44ajJJJJ=KMKZKnKrKtK54MVIIIIJ-J:JNJSJUJ6ss',?DIcxzW7$8 PT^^btv9 ^^h{:,YY YYY+Y1Y6Y;8SjSjsj~jjjjjjjj<8%**4<Pemprv= >\6?4***.@4u~LLLLULeLqLLLLA ..2UYB4C@:FQQQQQQQQQDXl~YcYckcncyc~cccccccccccdE:Z b b#b.b3b>BXZLHQzQzqz~zzzzzzzzzzMHyyyyyyz%z+z8zAzBzNzN O Pd^^^^^^^^^^_'_0_7_[_d_k_w_y_QMMNN7NFNQN`NmNNNNNNNNNNNNOOOO O>OQOZOkOrOrOOOR,P-9]]rz!<>>PPbii{S  -$1>JQZm%(((4UZ]ccf{U0&TT]]tVdKiKiYi^inisiiiiiiiiiiiiW8 ..........X sTsT|TTTYLp^^$^)^0^0^O^r^y^^^^^^^ZDIeIecezeeeeee[4ktxKxKKKKKKKLL\4W`XJXJ`JnJJJJJJJ]8^x]wnnnnooooOoOoRoToToYoYo[o[o[o]o]o]ofoioloyo_Y#3FSf*9Lit| "1F`ks~~~` {CC]oya{?{????@T@a@c@{@{@@@@@@A!A(A-A7AdAkAmArAuAb4LLLLLLLMMMc$+0dCiڪڪ&22:clqz}«ƫ"2e<$/ȩԩީ fCWCWWWfWuWWWWWWWWW XX(X6XDXRXrXhX~XXXXXXXXXXXYYYGY]YnYnYvYyYYgrrɁف',<EZ`dvh@nz\\iqti(ajj}ÃԃF]v҄܄"-;BPPZs…ą΅jD/<nnwk,K5K5O5|55555l<bm!),:>BPTYmLCC_fmy˕ڕn8SXSXiXvXXXXXXoKoQ,appPZjēɓԓړq3 +$1>JQZm%(((4UZ]ccf{T0&TT]]tUdKiKiYi^inisiiiiiiiiiiiiV8 ..........W sTsT|TTTXLp^^$^)^0^0^O^r^y^^^^^^^YDIeIecezeeeeeeZ4ktxKxKKKKKKKLL[4W`XJXJ`JnJJJJJJJ\8]x]wnnnnooooOoOoRoToToYoYo[o[o[o]o]o]ofoioloyo^Y#3FSf*9Lit| "1F`ks~~~_ {CC]oy`{?{????@T@a@c@{@{@@@@@@A!A(A-A7AdAkAmArAuAa4LLLLLLLMMMb$+0cCiڪڪ&22:clqz}«ƫ"2d<$/ȩԩީ eCWCWWWfWuWWWWWWWWW XX(X6XDXRXrXhX~XXXXXXXXXXXYYYGY]YnYnYvYyYYfrrɁف',<EZ`dvg@nz\\iqth(ajj}ÃԃF]v҄܄"-;BPPZs…ą΅iD/<nnwj,K5K5O5|55555k<bm!),:>BPTYlLCC_fmy˕ڕm8SXSXiXvXXXXXXnKoQ,apoPZjēɓԓړp3     - ! 9 N N W q x               rd7:HHQ\adtsH<J~~t4NN\jr}uLs||||||||}},}C}Z}q}}}}}}}}}}}}~ ~~!~:~G~M~P~Z~vcjjjj kkk(kIkSkSkikuk|kkkkkkkkkkkkw(ddd&d1d9d>dx0lt&&4CNTVV\y<KV`x`xixsxxxxxxxxz4nn#)@EKY]y !;BPbbuw"{`iiiiiijj$j/j:jUTUXUXU\UdU6[@@ZbfnzĆˆІ $')04B81;+66AEEK02:KK_j|Kveeeeeeeee -fff*fNf]fdfkf|f~ffffffffffffffg,vvD V8Y8YRYUY[YgYiYxYYYYYYYYZZ.Z7Z7Z7ZDZ}ZZZZZZZZZ[["[i[{[[[[[[[[\ + ! 9 N N W q x               qd7:HHQ\adtrH<J~~s4NN\jr}tLs||||||||}},}C}Z}q}}}}}}}}}}}}~ ~~!~:~G~M~P~Z~ucjjjj kkk(kIkSkSkikuk|kkkkkkkkkkkkv(ddd&d1d9d>dw0lt&&4CNTVV\x<KV`x`xixsxxxxxxxxy4nn#)@EKY]y !;BPbbuw"z`iiiiiijj$j/j:jUTUXUXU\UdU6[@@ZbfnzĆˆІ $')04B81;+66AEEK02:KK_j|Kveeeeeeeee +fff*fNf]fdfkf|f~ffffffffffffffg,vvD V8Y8YRYUY[YgYiYxYYYYYYYYZZ.Z7Z7Z7ZDZ}ZZZZZZZZZ[["[i[{[[[[[[[[\ \ -\\\\(\+\+\7\C\\\h\q\|\\\\\\\\\\\(]P,<``Ǐҏ؏ݏߏ4#XHXHaHvHvHHHHH VVdms85?ʤʤڤ -" -5.29@M[dgmsz˅΅хمޅ  '90HPVVdrzll&l.l:lOlOlelml}llllllllllllllm#m)m1mzGzjztzzzzzzzzzzzzzzz{{{{{"{.{@{M{S{`{k{p{v{{{{{{{{8;M;MZM\MmMrMMMMMMMMMMMNN NNNNN N)N8N>N>N>NENVN@%ɠ T66Z]kk$@E%+0`p !!!%1H##%3D"/̉щщtk3k3s33333334 44#4-4;4Q4g4i444444X{kJkJJJJJJJJJJJJJJJ@"$$*,tt!tDt/tTtZt~t8{ +\\\\(\+\+\7\C\\\h\q\|\\\\\\\\\\\(]P,<``Ǐҏ؏ݏߏ4#XHXHaHvHvHHHHH VVdms85?ʤʤڤ +" +5.29@M[dgmsz˅΅хمޅ  '90HPVVdrzll&l.l:lOlOlelml}llllllllllllllm#m)m1mzGzjztzzzzzzzzzzzzzzz{{{{{"{.{@{M{S{`{k{p{v{{{{{{{{8;M;MZM\MmMrMMMMMMMMMMMNN NNNNN N)N8N>N>N>NENVN@%ɠ T66Z]kk$@E%+0`p !!!%1H##%3D"/̉щщtk3k3s33333334 44#4-4;4Q4g4i444444X{kJkJJJJJJJJJJJJJJJ@"$$*,tt!tDt/tTtZt~t8{  -<HJJ8>HpIpI~IIIIIIII<x +<HJJ8>HpIpI~IIIIIIII<x  -%3:>AELp`226Mˀڀ@ cc~d2999999::#:2:F:^:v:::::: ;1;6;O;d;;;;;;:< < <Y<j<q<<<<<<<= =I=W========>>%>5>V>>i>q>\>>>>>?4?U?_?v?~?i???????@@)@B@[@v@@@@@@@@AA*AHALAJAAAAAAABB2B2BBZBXBBBBBBCC[C,C*CzCzCCCCCCCCCCCCC,szyyyyyyyzTdddddeee e.e2e4e>eFe4 **>MR`ciqH66?T]ikm||$$$$%% %%%%%7%<%<%N%S%S%e%j%j%|%%%%%%%%%%%%%%%%&&&&-&4&=&L&&a~ >>DBR -LtZ~Z~n~{~~~~~~~~~~~~~T#.Q_ioy~66HN\\y0:GPRXag"uuuv v v&v7v?vCvOv`vmvsvvvyv|vvvvvvvvvvvvvvvH .'3;Xgmp|P]m %;JcLĀπ-6;McSqVV1V6VBVBVNVVV^ViVrVzVVVVVVVVVVV ' 3 C V c v            +%3:>AELp`226Mˀڀ@ cc~d2999999::#:2:F:^:v:::::: ;1;6;O;d;;;;;;:< < <Y<j<q<<<<<<<= =I=W========>>%>5>V>>i>q>\>>>>>?4?U?_?v?~?i???????@@)@B@[@v@@@@@@@@AA*AHALAJAAAAAAABB2B2BBZBXBBBBBBCC[C,C*CzCzCCCCCCCCCCCCC,szyyyyyyyzTdddddeee e.e2e4e>eFe4 **>MR`ciqH66?T]ikm||$$$$%% %%%%%7%<%<%N%S%S%e%j%j%|%%%%%%%%%%%%%%%%&&&&-&4&=&L&&a~ >>DBR +LtZ~Z~n~{~~~~~~~~~~~~~T#.Q_ioy~66HN\\y0:GPRXag"uuuv v v&v7v?vCvOv`vmvsvvvyv|vvvvvvvvvvvvvvvH .'3;Xgmp|P]m %;JcLĀπ-6;McSqVV1V6VBVBVNVVV^ViVrVzVVVVVVVVVVV ' 3 C V c v            - F J @@ -2874,37 +2874,37 @@ fff*fNf]fdfkf|f~f    -,z((2,fm##17COSY,W^sIsIIIIIIIHҁҁہ%048;dBBKcn˂KKK!K;KJKwKKKKKKKKKKKKKK L&L-L-L?LKLOLYL0LKTKTgTvT{TTTTTTTTTTTTTTTUUUU UU .2+0'FԢ$NRrt|ʣԣۣ (D`go a]a]j]w]|]T}         ",6@>Nl| "):??{{Ş̞̞ڞ+2AT`wyğП؟$;BHKa4&/SSS TT)T1T;T=TJT4S   A L ] q            & 6 6 6 I N O  85{{ʐސ'+.0BPT^bkq$).HHHHHH, +((BE]hxǎَ͎͎  $2@EGG]Lnn 3766:GI`+R+R/RKRZRlRqR{RRRRR S S:SJSOSOSdS`p q qq/q8qKqZq_qrqqqqqqq rGn 5^p{+++=DDVf )556E6m6666)7l7n7|7777777788.8>8S8l8s8z88884MMMMUMeMqMMMMn[[szˋҋ݋ $/38<GMPSX_iy@/; $0=CFI[0'<NY:::;*;:;K;Z;t;;;;k-25@CH^p{<MMMMMMMMMNN} '.7NNSUUY[[_ffk{LQ`µµ˵˵ڵ%)).$ k k%kAk 8<NNXkp !,]##+3AZis ,>R  00>>CG$FFFF -GG7GPGPG\GmGxGGGGGGGGGGGGGH6HPHUHZHxv%%%%%%%%%&&&&"&4&Z&b&k&k&q&&&&&D&&*.{A{AAAAAAAAAAA BB5BGBNBNBdBqBqBBBBBBBBB@nz $W]]i0**8PD ),< +,z((2,fm##17COSY,W^sIsIIIIIIIHҁҁہ%048;dBBKcn˂KKK!K;KJKwKKKKKKKKKKKKKK L&L-L-L?LKLOLYL0LKTKTgTvT{TTTTTTTTTTTTTTTUUUU UU .2+0'FԢ$NRrt|ʣԣۣ (D`go a]a]j]w]|]T}         ",6@>Nl| "):??{{Ş̞̞ڞ+2AT`wyğП؟$;BHKa4&/SSS TT)T1T;T=TJT4S   A L ] q            & 6 6 6 I N O  85{{ʐސ'+.0BPT^bkq$).HHHHHH, +((BE]hxǎَ͎͎  $2@EGG]Lnn 3766:GI`+R+R/RKRZRlRqR{RRRRR S S:SJSOSOSdS`p q qq/q8qKqZq_qrqqqqqqq rGn 5^p{+++=DDVf )556E6m6666)7l7n7|7777777788.8>8S8l8s8z88884MMMMUMeMqMMMMn[[szˋҋ݋ $/38<GMPSX_iy@/; $0=CFI[0'<NY:::;*;:;K;Z;t;;;;k-25@CH^p{<MMMMMMMMMNN} '.7NNSUUY[[_ffk{LQ`µµ˵˵ڵ%)).$ k k%kAk 8<NNXkp !,]##+3AZis ,>R  00>>CG$FFFF +GG7GPGPG\GmGxGGGGGGGGGGGGGH6HPHUHZHxv%%%%%%%%%&&&&"&4&Z&b&k&k&q&&&&&D&&*.{A{AAAAAAAAAAA BB5BGBNBNBdBqBqBBBBBBBBB@nz $W]]i0**8PD ),<       -  * 3 G n            ) LLLLLLM MM&M&M)M4Mʏ܏܏!!!2=DHPT\bhhky|2Bk{ $*-8 1GJSH=K%>SY__giL \CkCkKkVkhknkvkkkkkkkkk l.lflklkl}lllllllllmmm"m/m4mCmwm~mmmmmmmmmmmm nn n&n3n>nDnOnOnUn^ninyn~nnnnnnnn@Zf;;;;;;;;;;;,zz(%SSSSSSS<+ + = I _ y     $cccccclAX .G`itʔՔޔ ((*$ss|  -TTTTTX<6<6J6S6_6e6h6m6s6v6{6{666666Dh-{-{---------....%.D.M.O.n.w.w.w.|.........///$/$/-/////8/:/:/C/E/E/J/L/L/Q/Q/Q/U/p///////////0 0$0/0E0U0w0000000000L1L[[ov{4(ƃ4,~~LWWWWWWWWWWWWWx744CYbqxx{| +  * 3 G n            ) LLLLLLM MM&M&M)M4Mʏ܏܏!!!2=DHPT\bhhky|2Bk{ $*-8 1GJSH=K%>SY__giL \CkCkKkVkhknkvkkkkkkkkk l.lflklkl}lllllllllmmm"m/m4mCmwm~mmmmmmmmmmmm nn n&n3n>nDnOnOnUn^ninyn~nnnnnnnn@Zf;;;;;;;;;;;,zz(%SSSSSSS<+ + = I _ y     $cccccclAX .G`itʔՔޔ ((*$ss|  +TTTTTX<6<6J6S6_6e6h6m6s6v6{6{666666Dh-{-{---------....%.D.M.O.n.w.w.w.|.........///$/$/-/////8/:/:/C/E/E/J/L/L/Q/Q/Q/U/p///////////0 0$0/0E0U0w0000000000L1L[[ov{4(ƃ4,~~LWWWWWWWWWWWWWx744CYbqxx{| k&&GI`it̯ׯگ '*BRU[^qưư !$<PU[^cvޱޱޱ"1FX}ղ )++C__}³³ڳ59;;?Wuyy˴Ҵ״״ +OVXXfnҵ#E9]|Զ޶)99o}ķӷܷܷ )FU[px˸͸(6??KOOXgppy˹244LchhӺӺߺ -68T_z||˻ӻ$)JTToyʼҼܼܼ8CCCW`d{ѽ۽?PVmu )@JOe}}οҿ CWu &8DHHHHLQQ\`x%***59Qhrw:@`rz|)+GR\fm3Ge|'166Neo14FX]]u#(((DX[m *2;@@@ev|з)9\Dv¸ŸѸss  "q4GPƓܓ!Djjvǁ́ҁ|zzƂՂڂ"48NX -*-/7PAQ::;; ;);/;4;R;T;b;h;k;y;TrCC\fv~ Qmr}@ zz0-51hhhhhhhhhhhhhhi i iii$i'i0i1i1i=i?iKiX766TZaqx")+8::J[^`ln)+24@@TXXn [N[N{NNNNNNNNNNNNOO#O.O?OMOWOWOWOgO -$nVV VV*V/VCV`VyVVVVVV:WJU[fiqD<INNb~`*>88888 999)9)979?9M9U9U99999992Z"FQ`l9;;MMUUau}}P~~ !3335GN0SpSpip|ppppp<al22@QY]inrx8gq;;;< <<<(<(<+<\  3>Rc.Id XQwQwqw~wwwwwwwwwww, -G6Øɘݘ . <S_s|ƙ)1CFFFFR  Hxgxggggggggghhh)h.h2h;hTh`h`h{hhhhhhhhhii i!i/iZi5iiitiiiiiiiiiiiiiiijL$*/577=<{††І%3  GKR|R|a|~||!lҘ&(<EIXkqxʙ֙&3DW]Ěښ -$HT_fls|"===$=$=3=?=F=L=L=V=_=_=e=i=l=v==================#   $}}}}} ~~#~5~C~U~Z~`~e~|~~~~~~~~~~~~)9=bbqsy&*-18CYn}ƀ̀̀Ӏ -%,&ŖʖϖԖٖޖ-GT]bgluŗŗʗڗ@uzƘƘ+7NW^jvřʙ'(ttuu#u)u1u(¯¯Яدݯ .6>INdqz˰Ұ'HPcs±ұ <GVfv)4________`*p !zzz{{{{ {<{r{{{{{+ $++3ENns(>TVbx +AAIS_u,8u^^l{-80:#Knz.,```````/0 ЄЄބ -0,8?1@-9eQeQuQ~QQQQQQ2,XgXgaglgngngsg3\mzz 41`1`A`H`[`g``````````aaa'a-a3a6a=aEa5F!*?hz &&8@[[[mtt6X```````aaaa#a1a0?<qqqqrr+r2rHrNrTrr@Tct#>DDDDJAPss}_B(MS  !3<>CH!bbp|D'Jddddddddde ee'e0e7e;e;eAeGe_ehenewe|e|e|eeeEX444444444455555FOpeeeeefff=f=f\f^f^f}ffffffffffffgg!gTgGHBBS_cowH<#(08HT^I4KqKq_qqqzqqqqqqJ4Yb::CKWhs{KZ ,KWkou !'9999<AFL`djuyL"".=JNXnn~һһһڻ""4M?HHHHHHHHI&I+I>IKIPITIeIIIIIIIIIJN`{{ǖӖזߖO6xTxTTTTTTTTU U!U)U/UJU[fiqD<INNb~`*>88888 999)9)979?9M9U9U99999992Z"FQ`l9;;MMUUau}}P~~ !3335GN0SpSpip|ppppp<al22@QY]inrx8gq;;;< <<<(<(<+<\  3>Rc.Id XQwQwqw~wwwwwwwwwww, +G6Øɘݘ . <S_s|ƙ)1CFFFFR  Hxgxggggggggghhh)h.h2h;hTh`h`h{hhhhhhhhhii i!i/iZi5iiitiiiiiiiiiiiiiiijL$*/577=<{††І%3 GKR|R|a|~|| lҘ&(<EIXkqxʙ֙&3DW]Ěښ +$HT_fls|!===$=$=3=?=F=L=L=V=_=_=e=i=l=v=================="   #}}}}} ~~#~5~C~U~Z~`~e~|~~~~~~~~~~~~)9=bbqsy&*-18CYn}ƀ̀̀Ӏ +$,%ŖʖϖԖٖޖ-GT]bgluŗŗʗڗ@uzƘƘ+7NW^jvřʙ&(ttuu#u)u1u'¯¯Яدݯ .6>INdqz˰Ұ'HPcs±ұ <GVfv(4________`)p !zzz{{{{ {<{r{{{{{* $++3ENns(>TVbx +AAIS_u+8u^^l{,80:#Knz-,```````.0 ЄЄބ +/,8?0@-9eQeQuQ~QQQQQQ1,XgXgaglgngngsg2\mzz 31`1`A`H`[`g``````````aaa'a-a3a6a=aEa4F!*?hz &&8@[[[mtt5X```````aaaa#a1a<qqqqrr+r2rHrNrTrr?Tct#>DDDDJ@Pss}_A(MS  !3<>BH!bbp|C'Jddddddddde ee'e0e7e;e;eAeGe_ehenewe|e|e|eeeDX444444444455555EOpeeeeefff=f=f\f^f^f}ffffffffffffgg!gTgFHBBS_cowG<#(08HT^H4KqKq_qqqzqqqqqqI4Yb::CKWhs{JZ ,KWkou !'9999<AFL`djuyK"".=JNXnn~һһһڻ""4L?HHHHHHHHI&I+I>IKIPITIeIIIIIIIIIJM`{{ǖӖזߖN6xTxTTTTTTTTU U!U)U/U2O2g2i2i2k2puJJd|+ĮƮԮ .9HXdfsQr.rHrbrfrxrrrrrrrrrrrss-s@sIs]sasgspsvssssssssssssssssttt/t6t8ttlƲϲ+:GRoгڳHWe(](]<]Q][]o]x]}]]]]]]`UiQQQQQQQ RRRR)R,&&&&&& ' '''''E'Z'f'''''''(6(S(p((((());)X)u)))))*#*@*]*z******** +y-("(  ] ]]]$], RTTTTTTTUUUU"U$U(U8UFUVUaUfUfUmUmUxUxUUUUUUUUUUUUUUUUUUUUUUUUV VVP22222222333 313H3`3b3X=`k,"49jpHȇ͇͇Ӈ8[L[LwLLLLLL(\\dn@22@Bdqqu{0022:H\j;;;;;<<<<<"<8&&&&&&'''P:Jwwwx xxx"x%x%x9xFxLxOx[x6666666677 7 7H7K7N7P7c7f7i7q7w7|7|777777777777778pĩĩީ ;;AJSU^giirêȪȪȪѪڪߪߪ.00>B 8 8(8.888;8;8D8O8Y8c8o8q8w8~88888888888888888888888889LJJX[gqwן۟ߟ8ak#,%&+4sssssst diff --git a/src/Kernel/KernelA.HH b/src/Kernel/KernelA.HH index 38f64753..e3f00f62 100755 --- a/src/Kernel/KernelA.HH +++ b/src/Kernel/KernelA.HH @@ -2989,7 +2989,7 @@ public class CMouseHardStateGlobals Bool bttns[5], has_wheel, has_ext_bttns, - evt, //Private + event, //Private installed, //Private install_in_progress, //Private irqs_working; //Private diff --git a/src/Kernel/KernelC.HH b/src/Kernel/KernelC.HH index e42208f2..e30cacec 100755 --- a/src/Kernel/KernelC.HH +++ b/src/Kernel/KernelC.HH @@ -523,7 +523,7 @@ public extern I64 GetKey(I64 *_scan_code=NULL,Bool echo=FALSE, public extern I64 GetS(U8 *buf,I64 size,Bool allow_ext=TRUE); public extern U8 *GetStr(U8 *message=NULL,U8 *default=NULL,I64 flags=0); extern U0 KbdInit(); -public extern I64 KbdMouseEvtTime(); +public extern I64 KbdMouseEventTime(); extern U0 KbdMouseHandler(Bool poll_kbd,Bool poll_mouse); extern U0 KbdMouseInit(); extern I64 KbdMessagesQueue(); diff --git a/src/Kernel/SerialDev/Keyboard.CC b/src/Kernel/SerialDev/Keyboard.CC index 184d3ffe..5fb40410 100755 --- a/src/Kernel/SerialDev/Keyboard.CC +++ b/src/Kernel/SerialDev/Keyboard.CC @@ -483,7 +483,7 @@ I64 KbdMessagesQueue() return message_code; } -I64 KbdMouseEvtTime() +I64 KbdMouseEventTime() {//Timestamp of last key or mouse event. if (mouse_hard.timestamp>kbd.timestamp) return mouse_hard.timestamp; diff --git a/src/Kernel/SerialDev/Mouse.CC b/src/Kernel/SerialDev/Mouse.CC index 31c6e3b0..6e8da827 100755 --- a/src/Kernel/SerialDev/Mouse.CC +++ b/src/Kernel/SerialDev/Mouse.CC @@ -222,12 +222,12 @@ U0 MouseHardSetPost() if (mouse_hard.pos.x!=mouse_hard_last.pos.x || mouse_hard.pos.y!=mouse_hard_last.pos.y || mouse_hard.pos.z!=mouse_hard_last.pos.z) { - mouse_hard.evt=TRUE; + mouse_hard.event=TRUE; MouseHardSpeedSet; } else for (i=0;i<5;i++) if (mouse_hard.bttns[i]!=mouse_hard_last.bttns[i]) { - mouse_hard.evt=TRUE; + mouse_hard.event=TRUE; break; } } @@ -305,7 +305,7 @@ Bool MouseHardDriverInstall(I64 dummy=0) //can be spawned OutU8(0xA1,InU8(0xA1)&~0x10); KbdMouseReset; mouse_hard.install_attempts++; - mouse_hard.installed=mouse_hard.evt=i; + mouse_hard.installed=mouse_hard.event=i; mouse_hard.install_in_progress=FALSE; return mouse_hard.installed; } diff --git a/src/Tmp/MyDistro.iso b/src/Tmp/MyDistro.iso index f7a60d85157ae198d84dd4539d22ec3b57bfe73a..4e2ac574d4b8fe05864acd2d8c512dbbb0717e37 100755 GIT binary patch delta 14975 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 APXGV_ diff --git a/src/Zenith/AutoComplete/ACTask.CC b/src/Zenith/AutoComplete/ACTask.CC index 8b8f1854..c71d7e51 100755 --- a/src/Zenith/AutoComplete/ACTask.CC +++ b/src/Zenith/AutoComplete/ACTask.CC @@ -227,7 +227,7 @@ U0 ACTask(I64) ac.cur_word=NULL; while (TRUE) { if (scan_code&(SCF_CTRL|SCF_ALT) || - GetTSC>KbdMouseEvtTime+counts.time_stamp_freq>>1) { + GetTSC>KbdMouseEventTime+counts.time_stamp_freq>>1) { last_scan_code=scan_code; scan_code=kbd.scan_code; } diff --git a/src/Zenith/DolDoc/DocPutKey.CC b/src/Zenith/DolDoc/DocPutKey.CC index 13c453dd..fd02ecc1 100755 --- a/src/Zenith/DolDoc/DocPutKey.CC +++ b/src/Zenith/DolDoc/DocPutKey.CC @@ -348,7 +348,7 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0) } else { //$LK,"::/Zenith/God/HSNotes.DD"$ FifoU8Flush(god.fifo); - GodBitsIns(GOD_GOOD_BITS,KbdMouseEvtTime>>GOD_BAD_BITS); + GodBitsIns(GOD_GOOD_BITS,KbdMouseEventTime>>GOD_BAD_BITS); if (sc&SCF_SHIFT) GodBiblePassage; else diff --git a/src/Zenith/God/GodDoodle.CC b/src/Zenith/God/GodDoodle.CC index 2b3e1956..ae23362d 100755 --- a/src/Zenith/God/GodDoodle.CC +++ b/src/Zenith/God/GodDoodle.CC @@ -87,7 +87,7 @@ I64 GodDoodleBits(I64 num_bits) } else if ('0'<=god.doodle_ch<='9') GodDoodleSmooth(god.doodle_ch-'0'); else - GodDoodleBitsIns(GOD_GOOD_BITS,KbdMouseEvtTime>>GOD_BAD_BITS); + GodDoodleBitsIns(GOD_GOOD_BITS,KbdMouseEventTime>>GOD_BAD_BITS); } } return res; diff --git a/src/Zenith/God/HolySpirit.CC b/src/Zenith/God/HolySpirit.CC index d90ecba9..048840ff 100755 --- a/src/Zenith/God/HolySpirit.CC +++ b/src/Zenith/God/HolySpirit.CC @@ -9,7 +9,7 @@ U8 *TimeStampCB(CDoc *,CDocEntry *,CTask *mem_task) U8 *KbdMouseTimeCB(CDoc *,CDocEntry *,CTask *mem_task) { U8 *st=MAlloc(64,mem_task); - StrPrint(st,"%X",KbdMouseEvtTime>>GOD_BAD_BITS); + StrPrint(st,"%X",KbdMouseEventTime>>GOD_BAD_BITS); return st; } @@ -36,7 +36,7 @@ I64 GodPick(U8 *message=NULL) "a random num from a timer.\n",message); PopUpTimerOk(st,"\n\nThe $LK+PU,"Holy Spirit",A="FI:::/Zenith/God/HSNotes.DD"$ can puppet you.\n\n"); Free(st); - return KbdMouseEvtTime>>GOD_BAD_BITS; + return KbdMouseEventTime>>GOD_BAD_BITS; } public U0 GodBitsIns(I64 num_bits,I64 n) diff --git a/src/Zenith/Win.CC b/src/Zenith/Win.CC index cfa9bc12..3c8ea3e5 100755 --- a/src/Zenith/Win.CC +++ b/src/Zenith/Win.CC @@ -222,10 +222,10 @@ U0 WinMouseUpdate() Bool set=FALSE; if (mouse_hard.installed) { mouse.has_wheel=mouse_hard.has_wheel; - if (mouse_hard.evt) { + if (mouse_hard.event) { MouseUpdate(mouse_hard.pos.x,mouse_hard.pos.y,mouse_hard.pos.z, mouse_hard.bttns[0],mouse_hard.bttns[1]); - mouse_hard.evt=FALSE; + mouse_hard.event=FALSE; set=TRUE; } }