From f96a9855c0cf9ea5fa672256cf887950c1444bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GIBERT?= Date: Wed, 6 Dec 2017 08:28:30 +0100 Subject: [PATCH] Kernel 0.9.1 : GUI, Clipping...BugFix --- .Floppies/A2OSX.BUILD.po | Bin 819200 -> 819200 bytes .Floppies/A2OSX.SRC.po | Bin 819200 -> 819200 bytes LIB/LIBGUI.S.CLIP.txt | 3 ++- SBIN/GUI.S.txt | 31 ++++++++++++++++++++----------- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 979fa32dfe250882aa9c7ad15f75b2984786f780..4cb7d288531c76490a4d497a43c381e80042ac37 100644 GIT binary patch delta 2093 zcmZ`)eQZ-z6o2h&M>obO$e`3Y?%hY<4r8MZ2^A#_9T5zd$&11urGP{yx%$Z zcYZzZocp}q0f7{7+vV)}2Z|FA1$Bwg(^A5M;1Ns@Al|i%i!MhNE5cI(F z+8bJpc24WnGIKVKU;A=C%4yFT&Uq4YvnDPlTD!9q#isKRMBd?fq-g;OtRYH!^WN$Z zu&-#ZHi!2|UJP+_ zAceHk!y$0#Y%#5Rf(E9ykB%O>RPQP=Y@X2rKUjzK*0h^x$HgsNTz|C0uzYF{#B)hb zR&=hW>I!<;0~L2$iUE=prhfUvaC%hkA(HO82;CCR}3#=5J)25X`WLYqQ z^}yOz%3~1jhiZ)J2i^z{#UP@_dWA0A&I7>Wg2UUXbKm$5%rCbfMG`B6RY)!>N%PV^Y`hqXvUw zH7d${(nbpCvou7H($h3TFVcQGB_lOMQTSZaWFvviI0F1p(qt!rLt+}) z>eC)Iqso}!qot(598g=xk^8g^8dvp2QTKoU{g#cIX1b#|iV;B1_*uCF`P z$SyvQe3y1Gji<{+1kJ*r=1u%JT5gKZ{jWP2-NI>&FKSR)?DiMz9oC5PpSgI1vJuLE zrfih*3zR7t{1?g$87Ru8x6ZOoO|n`o~QReZ(QV4ZQb*ZMp5;uU=C9D96`U%{7t7d+Soyc42BvJu3@R>*0@iLDf) zSlfzZww(yx1wI5j5gY=XTM5O))CvekOjZJO}pU*8b#P-HAR?3 zhD~B3%%t;Nts|wj$ZqejW51`cT#YZ#tSY(W2^oJK{!geN*ZpV4F zgM_WsybFS9xL|6Yr@0mV4T8isIfyTCI+$o@~^;4Ia1{z(anV*iX vHW?e&nvC_A_o!K?x_#!$s^4w$yUl)gg5N#G@3#2eiGFvI-#xX_ot*zC!248z delta 2081 zcmZ`)eN0nV6o0QD2nbl6lZp)P73t&fA)TAqi<=P*%M{&o>ipVA-u{>&OVpW|%w#65 z&0GihqX|~yDC2g>GI1z=?2l!*X}V-t;x+}rnANSNdeD$um=al6^inJ$hR$89aFA;Yhq8nP)8!fT{ z(agutFZuSL9fdO_{ck7PNh(P;y-YRRaoZK!HQVd9Pw5wQ?n1g~KOBG)5QGR+DDNm< z<*E`>78Y!o{OvC|T5zFYyg-GbMN>aJT6^*($*S=ngg@dXq_vm?Du~q8w$B>`c7fKP zr*(le;;*TaEj!KvI|UW2M5#Sf#!dqJ8s2BcN>dI#H3K_`u2S9gIj|0NEmrt*q;&}) z%PB7CO4 zf~v8lwElS-nAJ5gar}l~t(LdVj=)vRnAV5kVW_)sL?2}D&Rv9jRC6$dwO~mgqH`CSOnI!QyzuT zAb2rm5O@qiL*T`*A>acL8V2tGuwhVxQnX5t;94y>f-*Y<934^gyAX~@%nc5tc0o8N zXi89vG*`kObpr+jConB2p_kysRhaIA7G4bz$*$JLjqB?35L`3C7$AtN7h(*;=9m}a znXxE@jj@=}W!-fM*nr@0_GsKSnSuN3DM*pZYG5@|6tY@qsT8{~57Y?_buhWDa3j!C znaU1BT_LNV-m09}f&Cfo!F>*kM10&;FH(gBD@t%ar8{e;oV7ad05~2K)~@~gUqPX| zuAnp}3ri|wVMS4v3#(BDtMv;1ud3W9sG2TF&BF${<6(m#wReR_mL-cpk_t&D$)ZK{ z2=&mD^c=lHuhV`yNF|BSC#_Zz*oG~@7m(I05@;0N@F5G()`0(&4~#E4dT9ME>ZUHz zWDXe5kmJA5TD*v)ga)N1>Eo={01c!PW0zPhxVFzrNj@?UJFNF&w=ukx=aTQTk7V;4 zeGx%(F{o_?zf3)*`27F6)6gxPmiPjGjCw9lJF-r+ny($X@bVyfANVNjLUa_cF?A>^+EPGx_isO< z>zkwtdEhT>+&YL3L0gJfH%0f3L1qj+rbTxK^in60U2=q?L>p{LTU0$yPqT{+g z(bcGA82E^;Zv=dskWSY!27FxCGM?x|j2i$R*P%G@{zr6oCfS5MWI}l(LY{825zq@r ze#$5J@_7TK`yjr-fkufB!WFp2i6=R3M!&NUuZnKm@E8(CSinDUALt?X@|~CT5H!x} zA!u-n#SvXluqk3B`dF+E@b!$DnxE>5gFtjetpbPVX~*>+pewg_}M` zySXt%{#(>;8nYN1Qw$<(x||{`Sr41WM3_nAg-UmZuRJTOJ1cAmX0Sqq7bzAaxnTOo5D*4wB4Wff@wsSPOGLl9dd=qHVa+y1^z)5@Av8%;RO YIFfM8z>$n21xG55nH{S(rd=%g2U9;%DF6Tf diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po index 091b48721375ede984333e7fa66f1495e7db0a54..3017f45166f9f6ec707fa2dd451073ed6ba61559 100644 GIT binary patch delta 3124 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 GIQ?IvA(ET` diff --git a/LIB/LIBGUI.S.CLIP.txt b/LIB/LIBGUI.S.CLIP.txt index 039433a5..e0d3085d 100644 --- a/LIB/LIBGUI.S.CLIP.txt +++ b/LIB/LIBGUI.S.CLIP.txt @@ -41,7 +41,7 @@ CLIP.BitBlt lda CB.Cache+S.CB.DstX >SCMPAX GC.Cache+S.GC.X1 bpl .1 DestX Inside X1-X2, go check if X1+W fit in -* S.CB.DstX before S.GC.X1: D=S.GC.X1-S.CB.DstX, S.CB.SrcW-=D, S.CB.DstX=0, S.CB.X1+=D +* S.CB.DstX before S.GC.X1: D=S.GC.X1-S.CB.DstX, S.CB.SrcW-=D, S.CB.DstX=+=D, S.CB.X1+=D lda GC.Cache+S.GC.X1 Compute D.... sec @@ -101,6 +101,7 @@ CLIP.BitBlt.Y lda CB.Cache+S.CB.DstY pha >SCMPAX GC.Cache+S.GC.Y2 DestY after Y2....exit bmi .10 + pla sec rts diff --git a/SBIN/GUI.S.txt b/SBIN/GUI.S.txt index 7b7c60a8..23ef978e 100644 --- a/SBIN/GUI.S.txt +++ b/SBIN/GUI.S.txt @@ -111,16 +111,16 @@ CS.RUN lda A2osX.ASCREEN GUI screen active ? .1 bit #S.MOUSE.S.CLK beq .4 -* >LDA.G CUR.T -* inc -* inc -* cmp #CUR.T.WAIT+2 -* bne .2 -* -* lda #CUR.T.ARROW -* -*.2 >STA.G CUR.T -* >LIBCALL hLIBGUI,LIBGUI.SetCursor.A + >LDA.G CUR.T + inc + inc + cmp #CUR.T.WAIT+2 + bne .2 + + lda #CUR.T.ARROW + +.2 >STA.G CUR.T + >LIBCALL hLIBGUI,LIBGUI.SetCursor.A lda MouseData+S.MOUSE.X1 sta CB.BitBlt+S.CB.DstX @@ -183,12 +183,21 @@ MouseData .BS S.MOUSE CB.Rect .DA #S.CB.CMD.FILLRECT .DA #S.CB.OP.SET .DA #S.CB.MODE.C16 - .DA #2 + .DA #1 .DA 0 X1 .DA 0 Y1 .DA 559 X2 .DA 191 Y2 + .DA #S.CB.CMD.FILLRECT + .DA #S.CB.OP.SET + .DA #S.CB.MODE.C16 + .DA #0 + .DA 50 X1 + .DA 50 Y1 + .DA 449 X2 + .DA 149 Y2 + .DA #0 *-------------------------------------- CB.BitBlt .DA #S.CB.CMD.BITBLT