From 78df30d844c7c6b4be6ba0ce66e332f197763396 Mon Sep 17 00:00:00 2001
From: Yves Rizoud <yrizoud@gmail.com>
Date: Tue, 16 Dec 2008 19:26:19 +0000
Subject: [PATCH] Fix broken characters >127 in the help window. Fix broken
 characters >127 in normal fonts. (Pkm: I unsigned the characters during gcc
 port, please don't re-sign them :) Got rid of OEM->ANSI character translation
 in normal text. Now displays the nice '...' character for filenames that dont
 fit windows/menus. (dev) Added a sample Amstrad CPC picture with wide pixels.
 Remember to run grafx2 with '/wide'

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@394 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 aide.c                    |   4 +--
 const.h                   |   1 +
 dat/FONTE1.FNT            | Bin 2048 -> 2048 bytes
 dat/FONTE2.FNT            | Bin 2048 -> 2048 bytes
 dat/FONTS.PKM             | Bin 38138 -> 38130 bytes
 dat/MAKEFNT.BAT           |  36 +++++++++++++-------------
 files.c                   |   4 +--
 gfx2.dat                  | Bin 78440 -> 78440 bytes
 graph.c                   |  53 ++++++++++++++------------------------
 pic-samples/cpc_mode0.gif | Bin 0 -> 7357 bytes
 10 files changed, 42 insertions(+), 56 deletions(-)
 create mode 100644 pic-samples/cpc_mode0.gif

diff --git a/aide.c b/aide.c
index 079c3842..c5685336 100644
--- a/aide.c
+++ b/aide.c
@@ -90,7 +90,7 @@ void Afficher_aide(void)
   short  Largeur;             // Largeur physique d'une ligne de texte
   char   TypeLigne;           // N: Normale, T: Titre, S: Sous-titre
                               // -: Ligne inférieur de sous-titre
-  const char * Ligne;
+  const unsigned char * Ligne;
   char   Buffer[44];          // Buffer texte utilisé pour formater les noms de 
                               // raccourcis clavier
   short  Position_lien=0;     // Position du premier caractère "variable"
@@ -122,7 +122,7 @@ void Afficher_aide(void)
     else if (TypeLigne == 'K')
     {
       const char *Lien;
-      Position_lien = strstr(Ligne,"%s") - Ligne;
+      Position_lien = (unsigned char *)strstr(Ligne,"%s") - Ligne;
       Lien=Valeur_Raccourci_Clavier(Table_d_aide[Section_d_aide_en_cours].Table_aide[Ligne_de_depart + Indice_de_ligne].valeur);
       Taille_lien=strlen(Lien);
       sprintf(Buffer, Ligne, Lien);
diff --git a/const.h b/const.h
index 106b40df..353f3dfe 100644
--- a/const.h
+++ b/const.h
@@ -69,6 +69,7 @@
 // Caractères présents dans les deux fontes
 #define CARACTERE_TRIANGLE_DROIT  16
 #define CARACTERE_TRIANGLE_GAUCHE 17
+#define CARACTERE_SUSPENSION      '…'
 
 // On impose à l'allocation dynamique des pages de backups de conserver un
 // minimum de 256 Ko pour que le reste du programme puisse continuer à
diff --git a/dat/FONTE1.FNT b/dat/FONTE1.FNT
index c2fa61f9926763237f11be35343258ea558b6434..d61fa3a576bb02a36090c43c3eda4724c4dced35 100644
GIT binary patch
delta 1039
zcmYL{J7^n05QYa~gb6|%BE=TLTyX>!DYg*D5`=M~LPZJ}BDhF#q&PxYj0zKkS@y07
zsY19iMF=KUaAi`2AWT?XTp@(ZkirC2u2Q53#)UXC57}8EecG9wnSW-tjLPVEqu9wp
z6S5tErmpJ-cxjzMSE+$ge|T^0PjSE)qR2(KnD`I$biuyi=e>A*av!Ym!L?TaItwAw
z;H&CGRr&w<Z|ew)JBQYa6Dg(FMbkBJiyLRy0!{!Tx9|38|M%H=Ox%tJndwXcRHxnU
zD74tG-%k(j>fAP(Lyip=bU>B@MGJoiS%$7Ht*1J}8Z&EWc%-(*Ve@o~zixRt>UVCy
zT8THq*{9jifZBMFY@w-_Sex|N*R)zp7H$qtzMSAWmXG~|N)lF~l*iN_mQhyH;Fl48
zkaQii(lqtYLkWI9pC8@pqD9N70AjtVA<mBD7_G)yi|JvMq-in&c=PtXeldU7BHHuU
z-SdYFbMx||g>6iVP&>$s!@IAcvu3m{`?DjV1)*8nclN4PReeNjz;HFustK#mfYL%^
zg%*T(vocwYiczz%!UgDp4KB~G^V~syAFi%{U4T|t5QQl%G*)<UCS*bArz;%f0FUj(
zk1P8P<1mclgjk68476`P&FRu%5}U-t6KtTU7j=DEV!^hrJr!hPLFTJVAr=(-wh-WV
z&(o_0AA+X|xVi}<m`H+&B$S8~F!-)8zYvA--WEi39I8idv6#{XRw$VQuvJPZ!~ou-
spLsU{dNBBUS_7PbE7udCMrZ<_M$JSeOt$;B3%k=N)7>R(ioNar0e0wDMgRZ+

delta 1039
zcmYLIziS&Y6#gi|^$-%_NmK3NhTE#47!4-rkRfB1LPq1Ebhsg7DB{k9(y0{FsY588
z^H+!tq7;)cWC*2G$xxb`LWXeH?@2O!^67g&KE3yJ_q<d~^>wRp!TaF!2`YpTYG~s^
z=N)Y21~u&p35`x@%Y;DfeXUQ(i+u7Tl9z3(wVp8#sLWt=Lg9rjfO!NP7VP|k?*RN6
z)vFqNN2|xx>WdsC!$CR_WP*tF$3~4N#0CWhF4D-0VIqsp=QFLJ8FOmp9YSTDatiHr
zyS`ip?2w>!)5?wGO|?lK5@R84Qh^u8c%%m6@B5#Z$S;JQMViylCwzr8Us8Avw?zTo
zfB0;wZ|`;l-~9Oaggg<9imEC`z+o|+7R@1Wv01M!(&{hbQvan*YO6#k%kq{_$x;sq
zH~!mU42YA$aJFxU4<yqi0L3h=C_vk!#A+-S^<I$DZ~TH{i&NssKUQNZO!!<15hnXW
z!2TpT?$QD7cR4P8Nh68M@-F(BuE~xv7bYPWjOWTS=2a{=js;R-sg&crp!AhH%NK+6
zr}`{%RMa-hZkE1p`c!yve|~<ykT1Fp;bz$d{w=&mSBV643!}|~L)v^_uh*xTPN((4
zFM+o=$`}rgvIhs;c%DZc^PHW9>Mv%m&8hHFb)UKl7`m&gD>uR3+;@Jy2isIKWC7^n
z;)v87ks96(EX#wt9T1;xZ^z-0&6r<+kTkEwspJp3D8v%s`6%+)usa;Cj*cccE-19^
PmY&RF*jh^*MxEO~1ROyK

diff --git a/dat/FONTE2.FNT b/dat/FONTE2.FNT
index ba632692380f6ee7acc51019272f42dd466f748f..3893c9486de563a60667ebc8e68371f1e2da2e03 100644
GIT binary patch
delta 1039
zcmYL{J!l&-6o4Nl7*k9*LI({Y+;9XB9W<Cjlp|yaB}0b}rg-RZlp;!b1P>t`LFhb`
zPNjJ4&>?gxnL>wBOeiA54aRsZ9!l_(sY8bnGMJ<9Np>n@e}3=j{c9KvqqB{2FL$-e
z_W<gus%r2@${aR@$b|UgWyE<fKo6qGM07mqAIM_rZ3kbT#l7=~fXX`4Tms14xm<!B
zjXsS=_J90!p1|_nAf@nugpjMG>5A**$|$b^69A#yuIaP<_eHPA>_l0v+691UH=Aui
z8vOR-;^;olx={_98Z7xjI06J8`pxp3OgmB*GN&A4#4%l|P#J2TZ~3oTTpV`WcYqlD
z)xr4l_&|Z!*iLpxwUr<yTi#YT8lJvzb$tHyobLJZsecej;;RtCQfLc{C?E3R7ZH7k
zybeBTn%b9c2zD}=oIcnjjSQm#h-FJcoS(%pX%!+;csNYbG&ux#_x_`NJ^9dJ;?>*D
ztKF%(doycL8-vnS26AO+_Z75Pj5<NSJPkzH?!K}Ws7~gY_WSjGehry+<SqtM)Nbi&
z5YoCkXQ+T6BLvcBm6QXr2PzDlf+__YjMleW8|e1o=Jt99Qcz+lOvpfmfk&5t2!Xu9
zOanZ|+0PsNPJVjj_r#MDc_L`f)^p8Ehe50o6%SxLEq75@%b^rS+f<ek1}Y3Z`DL1x
z^av|`ClKKGmgQGXg*eL-$aGDe3mK>|5NSrN=Lyie@)Kb41ejP7>7Bu`cx0y2f+w(~
zQrUr8<bZ+X;AOIVa$vRtKNxyFjf^H>hV19{LQ)heocz4Jo`Bcerg8hl(_()CEuPTq
Hq-p*Eo%~GH

delta 1039
zcmYLHv1%MK5PbyWTw(0Rl?s!);t1PCg;`V_b_y3R(*&+Oj<BRq;mRCA>>ehh3c;jG
z;UcxaVo4!FI9wVRCZu!`;;oE}u$woMjy&0VGo#VG(cUbxW%hNWo|H}FojS27z4sNA
zo|IkVVC-Vc(YJ`KRb-P#2Appybz*GHw}`CO+BZt;1?#{lHGx)<E%x@`R30Xu2-g&>
znnwx(zjv$i3dMBV-Q4_?i_Uw-6SF|@8E2<X3I?|D{_1qoNdpp(4{@OAY&KEq8N1N4
z4&EA<xeV=1ySiF=Y%@Wrx@80LMM}pG$w7!53hqyFTb3or<>~DT>4UhW=M>ZlKOsNJ
zOM>rk8wBv-;}>nez26po`{UCS<_WMnwsyP=9FL1)Tpt6M>-G9FuKqHt>_6IQwwV}t
zp5O65r_^KQb^LA+4kSqMIQe&jM<z2Qgp5^MF@Uy?g|ne}w0mKqU&n>Tm!O=-_%IvN
zV8It6L>e7R0uDzpa33#lzfb29moic)&+kK=<?0m3lQ0vKV7Qm(p>9UGVGxMIqLj{i
zVd*P%mL3M_FY6QJs+euUPD0<;eH5NQTwFZNu~$5|rT@F^yl)6}R^ZXiwbJtrsK2jP
zs|AXpsOHTQcz2s=&B4jc(GfQe4zD^6(Ak-{e>fs~A^EV~=gtBHcYS^BMmU%?T{Am?
zsjU|PU058EiX&2?F`I_+;BGd_Pq((h@W`h1FF=wMpT()<AJlj(o`ClQ<Y&XqU~vBG
W)d<ruLEmhs(IgxjW5|PGbNdHB=Q7R!

diff --git a/dat/FONTS.PKM b/dat/FONTS.PKM
index 35abfaaeb45089e55729e46a6bc3c212242e0078..c19072b0ea475125d9e6c2e626c5158465c3bbcb 100644
GIT binary patch
delta 75
zcmeyhlIhb*rVV_|>?%wv8JQRvHqSTqWS*?R%Ck9(%|V2jnSp)tMk#4Vb_RYh+<aMj
RgFaZa%UcN{y4lCw0|4Ch5pn<k

delta 87
zcmeyglIhn<rVV_|><ldDnV1;$CJTm%Zr)&Q!aP}lm1lDnn}Y~DKR*KqZC)!S%?Rh5
Tm)@Wc=QMdMA!JtjxO)Hqwlou7

diff --git a/dat/MAKEFNT.BAT b/dat/MAKEFNT.BAT
index b7a0885a..56125f6c 100644
--- a/dat/MAKEFNT.BAT
+++ b/dat/MAKEFNT.BAT
@@ -1,21 +1,21 @@
-@  Grafx2 - The Ultimate 256-color bitmap paint program
-@
-@  Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud)
-@
-@  Grafx2 is free software; you can redistribute it and/or
-@  modify it under the terms of the GNU General Public License
-@  as published by the Free Software Foundation; version 2
-@  of the License.
-@
-@  Grafx2 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
-@  GNU General Public License for more details.
-@
-@  You should have received a copy of the GNU General Public License
-@  along with Grafx2; if not, see <http://www.gnu.org/licenses/> or
-@  write to the Free Software Foundation, Inc.,
-@  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+@rem  Grafx2 - The Ultimate 256-color bitmap paint program
+@rem
+@rem  Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud)
+@rem
+@rem  Grafx2 is free software; you can redistribute it and/or
+@rem  modify it under the terms of the GNU General Public License
+@rem  as published by the Free Software Foundation; version 2
+@rem  of the License.
+@rem
+@rem  Grafx2 is distributed in the hope that it will be useful,
+@rem  but WITHOUT ANY WARRANTY; without even the implied warranty of
+@rem  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+@rem  GNU General Public License for more details.
+@rem
+@rem  You should have received a copy of the GNU General Public License
+@rem  along with Grafx2; if not, see <http://www.gnu.org/licenses/> or
+@rem  write to the Free Software Foundation, Inc.,
+@rem  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 @echo off
 img2fnt fonts fonte1
diff --git a/files.c b/files.c
index cda38ca2..f04d1c7a 100644
--- a/files.c
+++ b/files.c
@@ -118,7 +118,7 @@ char * Nom_formate(char * Nom, int Type)
       Resultat[Curseur]=Nom[Curseur];
     // Un caractère spécial pour indiquer que l'affichage est tronqué
     if (Curseur >= 12)
-      Resultat[11]=CARACTERE_TRIANGLE_DROIT;
+      Resultat[11]=CARACTERE_SUSPENSION;
   }
   else
   {
@@ -131,7 +131,7 @@ char * Nom_formate(char * Nom, int Type)
     }
     // Un caractère spécial pour indiquer que l'affichage est tronqué
     if (Curseur > 8)
-      Resultat[7]=CARACTERE_TRIANGLE_DROIT;
+      Resultat[7]=CARACTERE_SUSPENSION;
     // On recherche le dernier point dans le reste du nom
     for (Pos_DernierPoint = Curseur; Nom[Curseur]!='\0'; Curseur++)
       if (Nom[Curseur]=='.')
diff --git a/gfx2.dat b/gfx2.dat
index 3c7d94661958d81c123c57ebb4a1bb47c699baaf..1b89fd3751c5cb849e5df844efc72a770a428e01 100644
GIT binary patch
delta 2088
zcmeH|KWI}y9LImg5Q>Bnio*@1WO$Se4mX6yA&=6bNC$@wK{7ZzL>?kX$<UTqj(Z)%
zNhILnAR@X*aR?Trgd&d)ZwMiybSNc5DIFXfq;v=mf4}=B4YYzFj$X+7<bL<=et+)n
zo73a`>2bcj{xMz%lPn1r0J1bqGjL7H5T=C)g!tk5S|9KL)Sy%{C2WrP3uLqB#+E*;
zlxy2JK`Wb>!Vo})NfJu1t=8*S%TCrG`(efx15ygNkPvd@)E{x|Tp8soU>LyRR!yDy
zKkwIS#7Zd$Rj~;miiJW^phbWA+FrfzGfp&u2osFy1#SWaHGBqPh(mKyHf4xDI$C$|
zl~gN($<tfzYX<G*YVjPj=J{%=^RBa`K;&n=IW*09T6;5YEX(B_UEpeM`_neQ=fcPQ
zL3o~vLI{gXTNsqWEh_w=gdZer2Q}aK?So_sY`5FpyfKXy$)y4)%P9%v@NKz_R;9JZ
z<zd<LeQz1y+4EQOQTIiTsP~^v@6Y$t`Qv^L(`dv=Y9Lew_dbQ<h@}em_coatm}+ES
zSZNJgtv6^*aJpznktM?<10k78Gc_=AXSuQxBgUAOX7)hF&S0YGEQ$<N>u_>*)CVch
zAqFNSQ)%Yv9@7Pc<FtiA1aMpTzn$n^oQKogJSIAFeFwBp-HT|`p;1<zDmO5JIPInB
z;TAe9*wm6kM|9}8amYl6Y_Bi@zRy@X)nJpvQUy$!B^)r30wz+RM67_qbA{_OF)-KH
zF%bvW#4Xe7HK_ta44Ecis<a>zC%8V2J6=?P4h){2T!0lYTcZk4B2)oOrFO(f9G%@3
zOtRR#+gu#L6x$2t{dzn9Ukq?Vx$%jm=YKK41Bc=;5rf(4Lz{xC1de{ao*f(<K@eRQ
z1Dl+?t8hgOl#~s36^L{dh&@oTpdbHE3?e-8bcOCX@>QTa$@a@)Fzd(jI!cEq2F;>z
zV!%|IIT3@Ay~3P`0SclMgCL?yFC<fGrp6lmQ4H`;=P$${z?4u9uZRJqN`YVjSPWc$
WT!G(;L4TuQUS7Mtxbt~;=gBXVi>vVf

delta 2075
zcmeHHziSjh6n>cFydoq^swskZ#Uk4|ML4Ed5{ncm(+F1{hb$ITq%oW_?uH;%B8N5>
z!9O5a1cG3>SPUXZ%8=p+7D28MvsJhv?E1Z#JuDQ#R(*T7-@G^9`!TaKZ+g*~UNnv#
zzRiryb8Ey7X|mR)B&4xrZb)g<OrdM?D1}EAc_d2nJQX|OIX-v}!K-y8goqJ`Fo;PC
zkIb{BCB$LOkg&{Wc}YZHSJF{R>)WI2(dZ33f?<d&U_=0iu)9K~0Js7fn#R$<bJIX1
z?e}9LZb><m{gSL!CNKdNXT|trY-tGuA+my3>{cqIuMp@G3F#B8_2?QS0)DwVKcRX<
zP?@6{L1G762=y)m>o5%n(X;2TrT*}AiSfaw7dOCTp_NeUaD`|q>~_O!i|BCv+&lD7
zb?BbphZKHT1U!hMXo`P?R5Oor`?TdI*a*RNtxsDskYQq=08t7a5EYpZ9JE=(xMGA<
zb2}sJY~*=wZwGA*5bzEs0(3T*KpP!zxbzNqU)J+%=P(>7iY}cU;j-Eg)rmo<6FR>r
za&ZHsYr6zKF=wjhD@LxXuB=`daeYBm3%l~LsAaj9s>&*#cyM)aa5dmBI<|JQS6W<)
zJf~8#SSkln$N>&%_HjHO52@Sjrh|Ns=<y_w5(g(xo11vSAFc**_V=y+MsXsC%qLyG
zEHzQfoSvSV4z2g|GViaG$}}G`OH{fCM<m4&Nhw!Nh4h5CY65RAF1o|RFDXA0F-c%q
zIF<O32t(Fb;O~S#8!fk5qwVbu^+E`A)exQ7O)I5<uNn)%@sp$3LKY{!5ok(K5I2H2
z@r_`(Xxu&XD1}EAdE{&08-eF*ESmkKnCl7^4}Z}JR@d&Q+z4VuZUkvQgX6prbbGz>
z?Ckt^jR2Lp#^8`I{>d&kg1FWJf7S^6ihgbcyd{SBd6FavW3oFL6M4F+^ZjoGxQTyD
WBUtU;)``9Try9Z5@w@lOkG=zk^?hLg

diff --git a/graph.c b/graph.c
index e19defa2..98ac65a6 100644
--- a/graph.c
+++ b/graph.c
@@ -1571,25 +1571,6 @@ void Afficher_menu(void)
   }
 }
 
-// Table de conversion ANSI->OEM
-// Les deux fontes générales sont en encodage OEM
-unsigned char Caractere_OEM[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 
- 63, 63, 39, 159, 34, 46, 197, 206, 94, 37, 83, 60, 79, 63, 90, 63, 
- 63, 39, 39, 34, 34, 7, 45, 45, 126, 84, 115, 62, 111, 63, 122, 89, 
- 255, 173, 189, 156, 207, 190, 221, 245, 249, 184, 166, 174, 170, 240, 169, 238, 
- 248, 241, 253, 252, 239, 230, 244, 250, 247, 251, 167, 175, 172, 171, 243, 168, 
- 183, 181, 182, 199, 142, 143, 146, 128, 212, 144, 210, 211, 222, 214, 215, 216, 
- 209, 165, 227, 224, 226, 229, 153, 158, 157, 235, 233, 234, 154, 237, 232, 225, 
- 133, 160, 131, 198, 132, 134, 145, 135, 138, 130, 136, 137, 141, 161, 140, 139, 
- 208, 164, 149, 162, 147, 228, 148, 246, 155, 151, 163, 150, 129, 236, 231}; 
-
 // -- Affichage de texte -----------------------------------------------------
 
   // -- Afficher une chaîne n'importe où à l'écran --
@@ -1597,9 +1578,9 @@ unsigned char Caractere_OEM[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
 void Print_general(short X,short Y,char * Chaine,byte Couleur_texte,byte Couleur_fond)
 {
   word  Indice;
-  short Pos_X;
-  short Pos_Y;
-  short Caractere;
+  int Pos_X;
+  int Pos_Y;
+  byte *Caractere;
   short Reel_X;
   short Reel_Y;
   byte Repeat_Menu_Facteur_X;
@@ -1611,10 +1592,11 @@ void Print_general(short X,short Y,char * Chaine,byte Couleur_texte,byte Couleur
     Reel_X=0; // Position dans le buffer
     for (Indice=0;Chaine[Indice]!='\0';Indice++)
     {
-      Caractere=(Chaine[Indice])<<6;
+      // Pointeur sur le premier pixel du caractère
+      Caractere=Fonte+(((unsigned char)Chaine[Indice])<<6);
       for (Pos_X=0;Pos_X<8<<3;Pos_X+=1<<3)
         for (Repeat_Menu_Facteur_X=0;Repeat_Menu_Facteur_X<Menu_Facteur_X*Pixel_width;Repeat_Menu_Facteur_X++)
-          Buffer_de_ligne_horizontale[Reel_X++]=Fonte[Caractere+Pos_X+Pos_Y]?Couleur_texte:Couleur_fond;
+          Buffer_de_ligne_horizontale[Reel_X++]=*(Caractere+Pos_X+Pos_Y)?Couleur_texte:Couleur_fond;
     }
     for (Repeat_Menu_Facteur_Y=0;Repeat_Menu_Facteur_Y<Menu_Facteur_Y;Repeat_Menu_Facteur_Y++)
       Afficher_ligne_fast(X,Reel_Y++,Indice*Menu_Facteur_X*8,Buffer_de_ligne_horizontale);
@@ -1626,14 +1608,16 @@ void Print_general(short X,short Y,char * Chaine,byte Couleur_texte,byte Couleur
 void Print_char_dans_fenetre(short Pos_X,short Pos_Y,unsigned char Caractere,byte Couleur_texte,byte Couleur_fond)
 {
   short X,Y;
+  byte *Carac;
   Pos_X=(Pos_X*Menu_Facteur_X)+Fenetre_Pos_X;
   Pos_Y=(Pos_Y*Menu_Facteur_Y)+Fenetre_Pos_Y;
-
+  // Premier pixel du caractère
+  Carac=Fonte + (Caractere<<6);
   for (X=0;X<8;X++)
     for (Y=0;Y<8;Y++)
       Block(Pos_X+(X*Menu_Facteur_X), Pos_Y+(Y*Menu_Facteur_Y),
             Menu_Facteur_X, Menu_Facteur_Y,
-            (*(Fonte+(*(Caractere_OEM+Caractere)<<6)+(X<<3)+Y)?Couleur_texte:Couleur_fond));
+            (*(Carac+(X<<3)+Y)?Couleur_texte:Couleur_fond));
 }
 
   // -- Afficher un caractère sans fond dans une fenêtre --
@@ -1648,7 +1632,7 @@ void Print_char_transparent_dans_fenetre(short Pos_X,short Pos_Y,unsigned char C
   for (X=0;X<8;X++)
     for (Y=0;Y<8;Y++)
     {
-      if (*(Fonte+(*(Caractere_OEM+Caractere)<<6)+(X<<3)+Y))
+      if (*(Fonte+((int)Caractere<<6)+(X<<3)+Y))
         Block(Pos_X+(X*Menu_Facteur_X), Pos_Y+(Y*Menu_Facteur_Y),
               Menu_Facteur_X, Menu_Facteur_Y, Couleur);
     }
@@ -1662,10 +1646,9 @@ void Print_dans_fenetre_limite(short X,short Y,char * Chaine,byte Taille,byte Co
   strncpy(Chaine_affichee, Chaine, Taille);
   Chaine_affichee[Taille]='\0';
   
-  if (strlen(Chaine_affichee) > Taille)
+  if (strlen(Chaine) > Taille)
   {
-    Chaine_affichee[Taille-1]=CARACTERE_TRIANGLE_DROIT;
-    Chaine_affichee[Taille]='\0';
+    Chaine_affichee[Taille-1]=CARACTERE_SUSPENSION;
   }
   Print_dans_fenetre(X, Y, Chaine_affichee, Couleur_texte, Couleur_fond);
 }
@@ -1727,15 +1710,17 @@ void Print_coordonnees(void)
 void Print_nom_fichier(void)
 {
   short Debut_X;
-  
+  char Nom_affiche[12+1];
+  int Taille_nom;
   if (Menu_visible)
   {
     // Si le nom de fichier fait plus de 12 caractères, on n'affiche que les 12 derniers
-    char * Nom_affiche = Principal_Nom_fichier;
-    int Taille_nom =strlen(Principal_Nom_fichier);
+    strncpy(Nom_affiche,Principal_Nom_fichier,12);
+    Taille_nom=strlen(Principal_Nom_fichier);
+    Nom_affiche[12]='\0';
     if (Taille_nom>12)
     {
-      Nom_affiche=Principal_Nom_fichier + Taille_nom - 12;
+      Nom_affiche[11]=CARACTERE_SUSPENSION;
       Taille_nom = 12;
     }
     
diff --git a/pic-samples/cpc_mode0.gif b/pic-samples/cpc_mode0.gif
new file mode 100644
index 0000000000000000000000000000000000000000..569bbe758ba3bba64c000f86c98934b32761f577
GIT binary patch
literal 7357
zcmeHq=Tj37(`_hH1yQ7fNR=+Vqktg2D+W-I-cjj<9v}&j1VbkYozOxFO+xPwiWCtE
zARvk~1u05Xe|dk;d++@x?mXwi?wOt0+1WF5J{%*Hhw5ssC4fUf9^n4~3jk06{}wD3
zfTjFD`Y-zrrC<RRESB=`_<!+#H~!oHtHA#k3dsEDi~o3mo`C|OV&FF>lnf*>uuDB9
z5lV-kY$B#u<EFBabZ#ZTkEEvZv5eaf()dl9E5@@V>}sEmH{&Mr<lQH*CM}h3G3p_E
zAIDp&W{P!_m;_8)tLMs%v!tF)wARd5S(lp@nzq$0;DIfEs}m}B68}BL29Q7XCpUWx
zq={ipWt>|4Cu<Fv^A0|?M||yE;A;<D?~FXVY?J2p003NR)aBF9zqt_*97>jd&gH+3
zBNfabF$E!BGZ@);P65qe&v~>}1ZxLp0u4RXsSm01K_#HM&HD>ywbN<fdTSJATIXrx
z%ayTcb}MK8i=b^mHFhBU{OD)XyBhDYpl8t$2QH0IDA#@zYM&Fn&J}a@#dd?vzW1fy
zO#esz;F5aRs=bkN`uFbzYOFYc>hoD~{9hKI=in>UktJYOMIWGB>Hv;2h0_tZk;3P;
z;|k>o<}QK>B6mt5;*dz;)V8Q(0k;STP7!#}I8X%PzmzY6ybBI1&(NY?`U2M%9xX>1
z?x}kKZ^s(WhMj&rBWKyM(u(C+Iy&I89fEnp9Gt*QxO^Aqny>j@AQR6lZ<go%005D(
ziV866+h6#qx8M$TFy$-<kV}=8UqZ#^=ab!dvGlpjUKQ=4m)aSoOHFOzD2a<Z-OUYz
zbUaKb41+L96^5ko?zwi#itAEQ0|<Wj#!kvaZ5?4cZ7=Y>!sSjwz&=R2)?G|j5-`a0
zNQTe{0^wa35q?tD)EZ{q0fc8<-`ZN-oc!_cYxDZ4v*Y;Wh{KuEK^@uQ(S^h;@JbLh
zeRb7A_B_uin&!pwu2*5?gu{04MWx|-&+<FJmjiK9r^_8zG2ae}`9(MaO%7{l!pMT5
zCSg<-6x!HIGsm;vQab2~p}A6p-LDg0Uy&c)8I1{=Y^3T3&`_^pm8S2^KXn)rP%%3u
z;lSTT+v4eJf0meW@nSsPdSy<A6a-}}{k64TtIRAqtg5^hyx48*6Io~6CWCJ6S52(k
zno{(2Gm%wW@GDl4?2Zt8-Cp)`p5pC6#yHXn&9bu~Q5(!+AD`zY`_po}B>&A>e4c0`
zNB)xiz&UCY`{JNu3*m2o_A4)?<K4xDse=6Kiq|gp8pc?)zSqf~VS`6k*Z2>nsj9R>
z`YCeVKZaKhqC=0{s$!0(F!U~<BaOc9pKtrrdVU=*^xjUqrV6`#b^~(lpYxSGL7|In
z%nz4P={Jp^e{+=qKmR#ioca9sU@RjZVj*m@Nx4t`{537Hf{N}ifzJFn71z#vaVl0b
zPbNDwiFSagND}OmSwg2o(z^<JX_0VZQ5m45kMuQ7#wZFg+W824&L*VX2^C^?F@C@q
z?q^yPY|EOJ^5E(2EL8iCP%{NPKO}VU8m9k<^F|WMz|wHr^mn3L+m4Fi9Ya*wF|{3M
zqtA%cG(O$wXBj7sdsNYM&Y2$r96V?nRc^L%d+`y-yue_jw)_hDDs)O<1!lw%w}~*P
z-UQMvDYe~He2voIoMF`<8K?%MlHnC1JSHaks=f-&L!$3{y+kdAWwYXbZ;Godnb@W^
zXP4e&mw2Kv@d%V@;a1}$^ILq<`dC)6Wf&(rV>{{m?l`aWr>A`4g&0!e;67ZdGA>iH
zX@upVU>Yv2SgK*+E0={X9b(veqoF}G*mF*AvQ!(3(g=1u!1_>a$BA=V>g*}lWTZZ-
zdgR@?r1CH;HSO!Sy>W^a=&~iWaD01?R+E6(RZ?<iLLYIWyV^dTl-PUt{1Bb!N;_ax
z&7ZPa{3*$k9Gsm^Dlal_g3cm?e}d*jYE11WZ1+4`)7kc`O}rW35lVkVf5lIk{T09W
zOOK&ym$~*@$oOQ&hp#0#SHVBJ6@8PDp}D{P_iXJ%7i#T&s;p#v?9G<%i>X*A7HUg9
z;@MefzBOKF@_9~11TCL>^sfG=<kmw?A3c?}5u?Z+>t~XY13i|9jf5i`niEr@L246%
zkSJ1<=Gz@rxp4E0whX2_%tIVyhs|k-D))5_fk+UiObZIXlU+S+P0d`a_4kGzPss2G
z>Q||RFj+s;<!mNpRHb36?6cXci+2T=fwzGvSGoF(KPtGP;I?(LMvI+OGrE!(uF`TK
z2$LJVp+cl(loM=s8oLL|>zZHKGhs<z+|oSEKpNDd`Wa{P?@3nPOK%hsV;nbOvaM1G
ztMgX6wBK<a&La09gF_gfp1;Y=sWv#2<kEg#Kk+ClOu@r#A$+B(P`T2x)5{GqzQMGg
zS>66qK4m+2gJCG=#Xt2h#iKOQUKE!iO;nRgj>#7<`;*aEu}uz4UGB%=O$_ESS!;;#
zOVZ8S$Ngb4K0K4aww=XsVNh_ae8u`H)5QepSpZ5)(W$&sDTm>DLP_RTH|BwzBHnvw
zpW6XmGob~PN>=Ck*8|@bjs`Dk5GJtv$9OB{#cG*^aJg^*f=_Q-LoOT{Qg#&MEO+;E
zfPa5MZy4^eW`ORn!oy#qHP99(%F6ecf&ycIzbF48%an2A7ubR~&vH8oT5Z0l3`zNq
zjGz&00xWU9e7<vD6$4@;a`+MKGa9a61UB&_WFS7k<38wpjeVm<PV7qgUd}?p1fk$p
z%Ldou=m!C*ZNm?59{m2fIJ_XI(C%>J#`=}RgnX+-7Z@NiZ6JOh5~vV=Y{47T9=)_5
zr$*N1^pM3XOdZ||QAiB%O!9UZ|DK#Vq{3$jQ|d0HH@X{mp;eU3YOtYv>6F-KZik%d
z*fgNzwCKvx1ZMRu4ODG~$?!dRo}_E>kh-Q7*RE-&Jo&VIj;=E*0)MM$@#Eb6cHwkH
zKryC^$#$kUbk-FeYUBK5FT)vBh^k$Kuf(jKhC4RtF|RxOFMjv5(x_d*hx<(`jNB~H
zoN7V<D>*RR!DG>JXSV`+vm7fe^!J>)-g2k(pUX$bHLjS{J-M2Zqq-NQ-MJ_gWZo5~
zzyIMZm)Wg6WAb+cRbSK&y|nu~B4!PB5wYs2?^{*8bgv%TPKv(aFtxBrD!X>k&7KkB
z^2K1fwLF#V`Qk+vyPyQsn^kkR^`8OXiY`vVdw;yR@$r;l{i2ILda(Ra^$tb!g3j?C
z<#Znj-1!mrsdelywc+jyw_=UUeWT-_fuGMCn+5$6{4}Q-bM`ORle>A|OEyM${i%xo
zM<h0$J$#m4l?j$WM~rV+Ot?}V%SLp*Y2=Y<s8Bc<pKR;FED?JPmLNci6(&a=LgU4K
zMEUc<g6d$ch+y?6N^__XiJb)HYOo+fw2FG7m`{=pDM@-KNskmy6aL~?bD|0`LY4&9
zsZO@w25WAE@4%8ejZ&By+-W%d>o=}jxO*5YCb~t0JXeQUazPF&)j%O}hhC6pWXNWf
zjNxN7#OU=zMK5{+fcYg<K~>^*duSLrCXNJ60LJBk)wtMUM6Os^eq_=w@G>POE|jEv
z+5})pfHD&x7iXaAZRMW!)B+Mubp#ZW4=G|uQ@#;i41AIE#MM_JS^xzbEdy*Hr?}gv
zSNo(ZOF)R^_;@8r9~h+j9ID0*2dl%2$?o8kkj&AP)H7L@LwL5a9M~uBj~asf1VMyG
z(ki^{BO`{}y_bnl3wq=tgUa_2kBuhyEj?t;X9O%S^(!p?&?o(v!M#3MfrgAY0A>*A
z0p~t1z8h!out#C8-{@{vQY%-|poh@xNL_V^p^xIulZgJOT1_nr0zFr|&In*<ROMTW
zF1q17MkgS6JzDDvfU#fc2N^o-lPMvQaXSxs;e)!Gpm_DALNR6MwL%n3o)I>X?>K2F
zAcR7U4gv~u5;i43(7bGf4+3hF+6jd)Mxm;R(He|7U&pe4+51e12|)&6k@*1E(##Q9
zYUfT?010N5n)N&cU{?cByMPdgxvbT>E~MbS(fdjgFS7G9HSLmk3(_BP=gTg|@Q>$O
zf5{Cp$pQPuWx?{3mNL3wzSdVnjU`Yl@{(#wGU_`hqzQbQK3IbhP>>o6EzP$}%_wt-
z!F8aEe9=^Q#Ed1_Tz6v=YLcuXFlr=Olq6eys%UyD+BYB5V}e%ih+VrQ(e2<_m?Nf0
zN)duWnO>@~FX=}3qJ`R(V@c?|>X+$JS$#z42a2ztbw{C_PuwiTY33sB2YsH}g>2e+
z9O3x&-*eRQE+#KBgaMF8p8)vB1i<hKz%VOvW`e%xfc(-(d?so4UePLk2*5-@9MvFP
zVYwYkiR_o5`~}5txv(^crRVtxj7AuKbm>QMX;oyHNOMYKWKl+0yj&Wh`aE&THv-34
z&JlHo{yBic5H1HQzXvKLld$(iT%VF+!S8rws<Bsg63uI~6~ra1eG9{G6j`KISS_I*
zON3u9DB9eLzd09^dgs=16&QNM-3?Ufd5H{7t>g^JdL{V+y8Sw^voh2#Mp=yu)am-%
zQQbzdl5R695a`hzfdl)Mq%rWU*W@!$E~{*7abZuY)#zVVjY&WCdZlO2)-;xIs{;k2
zLSzF|qw)(%)1W02Y$Z&!^t!b*Qni{qiEU~c_qT#;Mxw5FR9K{O=SD&!tJR`N_$VSi
z=NwL}P*=uV*8_s~F5|l#;XU**mFyw<cLHtpvRE`?uEOd_oweOeb^Xiul1}{ca(#tn
zL!?j4)%=)_6C<EeeUD^Hv5CYb3^K0Sm>b!+uGu(Q+js;nOty_(8fx&|YS>bfxT&5`
zrxmTZixH}Ya-QH<F7dQYgwYGa4XLVQ`Z!i$f-|RYG^|M+Nbpi;%YkLsP1G}7FQT_;
zK6jABT{HogUwy&l$>~R>P{O0+zeRbb5f0A8B%<^GAvLofwJ3Jf-kfYXeiE+<jxsd?
za{bP{NlY$Vz{5=2IP}`AecLo9W8~3KsH$IGH+m(I6|F6ic%6*o(869bPVja@`L2}H
zFz^^eCVms;SBMA>;VQQENx5wdKC7-{<0~^G;;gpu|Hcldm3E|0@T4#yJ|a|W2lPOq
zLr<$V7lXQQ-0`rhLna+FYm^-BmCQ>Fi?0eJ?I!ENI&-3lHzwPo@dykbQ3u@#^zn9N
zh+uE>7tE2ku~*g`UFZgs%)`G4cIaN+&KO!L4>*V1pZ6F4LYzAl+hT-;cfh#q&|s%r
zr;C)uXoV%MyvG!t%nat#5S*X*8$@9~JhM7=FS?uNRck~+Z#9tZ5U+gPmA3M*7s>uo
zOT6^RIGtz$ueYyT;K6m}XVI89UkS*eih=(*jU!55zqW1ZBHUgy+5euDut}EE)kGG+
z(r?MMbKnOAV+OW&Ja)MUZeShDxB95ZD_O3-K7my$24rZGGBk{a)c^EFPDWlCZ;GIc
z?1@ew7!~tsBm$#`J;|^63Wg24hfi~DWH;41sfN>3#qSkl$t@Ll@n(s2W;)0WIcq04
zO|>bmJe_8b?0y*T#2LO}mTi$f@G!XCEVci|RCXx;pr-`TcTC6rV+2sU^a`*i*f;NM
zR4y1!3ZZ-~O#9x|6BfWxHhSkxl}lBrV?e%f`1sl)8jw1UNG;^Rk0%$TW*4|WTrNvC
ztl_9b9WkNmuc|_0z>T};c=pMsa10X{=D8vs>-jRL4oe!J7``ZgO<;zvPIWp=4ZtTk
zfv-5WvE}KZ*SvxsOyQEa%NPHsDf$-aqu*wv7VhJ*nPDTZn~L}cyx<SjPZ&oSC#E&b
zhZxX9r@k4oU1P^}B@duZM#h~|6Lwr?ah#yCiJeemNDdXtthnP0{j<`0=qKZ&W!v51
z`v#BRn3it@%qcO=sQA5Q%%3yqp8JeVFh~=QU=A1=#zAT!?Yu2^ofQG5I8~+^%gc9>
z6h=}EZ)9}m(_pchAiqj8_o~#0){u#LU0DhJ!pi%FRar6f2_c|;e2q66tS!5cfv!es
zRzE>h%j+!EjJcat4YF-md`}r1X{`~69rj$Q{RD#gtrixg-J1Es8$8%${p?MXBexR6
zBFY=zQJdUei=RUO>jJW30c-|@JW~XG3Vj!kXs@@^61sS51a0uvL4M!`Y-!f6N;O=J
zXD*<;A;Uu7$|1v54WbumN5f&SzcmU?F2e>If7NExKNa{vC6>0&jqgT#^FN`|3XH|B
z7=sAH((&wkWp~rNt@v;!qd<AEfO)g41}3&kz-A+&0;ife$1>~2+u|bJdWRDIk%14g
zO?J40{pbhm{Klo~nj>%RxyIVja%H83R<CtUy48;O`sCr-WucYpjdc_0$ScF*Ec@=M
z%o&wLu$^?4gHxXvx$Qa;)DRsB`PC*D%*oD0;vm(~1K;?h_q_Cf)0%7g1+o#~pZLJO
z-IBI&hTl{rtkXI_*&2u%@FQLc0&fagzGYkm`Ga3@Ce4{csXurdwoepGcc7%B&w$OQ
z&SW*<<~JNSD9Oe;4&dSnFt~-@;_h5M{la(sRmZT&=W3!|WJ+9DXS3Fp8`380hBK?Y
zBw-HlL@vbvW-gTI9~kj9h}aE6dQ3Pr4|i>ERdWy8%7Tjkw$5*-D0sh0`VX!;bI#&D
zi{?G^cvw!j0$CclkPfuFX+?88)83LTORhI#CoO~nnz=Z7#@F{<t8e6O)Hmj|n5VK^
zR7ODT-tLFUOU(5^j_|+IMR%X(_7(NZPA)3Qh}_R2`?>xb2Zu=HggxLMcmTWOgfw;-
zw2&L)$D%;y`!8u0)scH2;}k!L-StthDxMqcjT^f6?EAN(A-dIrskp~_tU<eL`Lth$
zT+6ISn@SprqOH0i=I~+q%O9t38AE!p1(rh_elt6)fsm)pg?N!Q^QhKZ)?7q`8~>>P
z=-L<ikvCD3x*hiVsq+Bg{UF{k%cbm>+Jj-=M`d!YY!@6jDBWX&xMgSG)uW^X!F5P7
zHupBy<e*RP7X?7(oF%L7Pd@1~ixU!;Dm3KR<8|>TnUWKB>*JWK1!FS#i8x>D$}hcg
z`8YTne!wQM8T0`DwOMAW)w~FfJtfLGaDyS7ipwqEKV9#e(R1HWw_JNVJv9!W8gVF^
z?8aEJ^3l(39lqO2YdY^UFV!h`nT>hi65^Qu=&g`WQTW)~^}36KYiE$YfTQ3Y*Xg;k
zgXf6J6ukorK2Nr9b%*=kFMoU=rauqmll*$5C|o*ojs{g>vS;9lXQ4nxGjVIm)GXlc
z><^<^ro!1#7g+<Bp8@7)T$;0xU$gE%*!CVx(>|VKpfJ4S{##DJ_jgs0ms^F;e~iqj
z^G<k>mmQ(ZGxAsZS$%gO?lH@}giZ}w^ezbT&&f64DLOU)HQ+XI_LE*RBg+j2-F~4V
z2#cViwuEkfKY)vwj$48)!4S^N7|efR^94*pX9A*?w65r<V&!Mc=b76ur>D{63@CV2
zWq@Q&(yt)eZP--M^4#0>VgGDe#2X6=;8hWQm}u>!3bbyP8Yr@DS*tL44p>4n47nk=
zTX*M?w3*X7rjNFs(d*6gwo1Ga8Arx0A%|;k0&F^hk8)WE#7cK0Qu26z*QR9i4ePb}
zuW&Yzw*}^6mTN#B`S<WR1$~ao4uuB=?5<ER3a`_S=W_dF^r(+ht1h`hE8>HB*Oo!K
z9L14N+ty=a3&3Xm{;KYl{}LIsO;_X;vHLZ?$1cxb=f~kjV;i$!!||8k8fp4_@x{M>
z{G2rNcFYsdjy_17n3&eNtl+(?_;=z#1`*fnf33He_BOos5{r@VA17=5=>O+WS77U@
zYV9lz#j0)Ix5;TRAq&t8O~)}jNn+Ffo$WXwi(!4=)c3152{n4FSh!Y*V>gp|h|Xvp
zUz;a`CRB)vO_|~VhgnTSrJ129ZCS>T<0hY)MUE$gx6yTy%JbSm_v+*>{o5|dG4qO}
zoD<R(+9w`nR(D-v*sV5vq?Bstg!}{EQugQ!t2@b}!aJSpIhu`{v$wj^o6J^|?CKt}
z#J;C8%;06XvkdY_^jTj=2fb&J1S{7+dDgZ+ONj}v8#PKfX0a@=wWt=titjbFHOI)p
z5*}Zh#9N{ha6wD0y7M_kmCE%Q^S*-Aa=O-t$G%N|SKwD|XAGXsS)O`nS+0uS&5>xm
zJ>RO@i~Mxu(7>oiW#=8ezgyV-5RON)ike*d&mRk~S`g<_{(8!+nHzdAugKgNHFXJ%
zh&g=^V-;a63w%I#LD)^RJsrxj;8eSR&Hn^-PdOy8pl47%$XfaMW2fX8N!XE-EXMZ@
z*y&LyC8e<XdYVmPGeL1r`S(4qOG8SQ!YQ$BYgy58CoBbGp)(qa@b@hVka4PM(fPnW
zRyDwMRi0Q24pG8iU-@nu2VI^z82)*%GS{cVtgX;?<u3N+l;*0xK1zM$+caVK&2rmV
zbBdGBgx;yc$tSt9h?N<&vzRxIfBn1k)n55KwvGhK{m`r&jE#M_r10l`_{mFXw$1X3
z4CM$!lUWd93*P1M;b!cW=)SfL_q7X=(wUj1-SlVoE@|=WcOxTL%jJLFYNsXp#b8u2
z-v3qR=ksZKdzaFEwiw~^_tdwML$A8>qn+R8B{cqcN_{d^z0(E&^<bx_V@sqn|3t<9
zNOL3Vg<Ity&ou0jTCIn#gx+{bS$RXK=x?8`B!Qc*40`9e?DkW>!@LD&71^ESRT&GK
z6Z?`sI2FFFS&1-B`)`pFk^;*nR{ED|Pd?h0w#6D+Z@Rm&7oHnPJhVx(t8n9}k2I9=
zvPpN^bmQtdH<X9iz}-dNdEQ1oRIao^_<OkXt)4$rAGJY-RJaT5M;d8w*<?g-x(oh2
iH`1lEeVrugA;c18Y#?rnO84*(5x6imroMd}p!Gj6CgLvu

literal 0
HcmV?d00001