From 2e2cd8073de1312929cde5af84626abae7fd5b88 Mon Sep 17 00:00:00 2001
From: Yves Rizoud <yrizoud@gmail.com>
Date: Sat, 7 Feb 2009 01:44:23 +0000
Subject: [PATCH] Safety in Help text GUI image change: Added more characters
 in help font. Shortcuts: Change internal "no key" value from FFFF to 0000

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@608 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 aide.c      |  18 +++-
 gfx2.cfg    | Bin 10062 -> 10062 bytes
 gfx2gui.gif | Bin 21032 -> 21494 bytes
 hotkeys.h   | 262 ++++++++++++++++++++++++++--------------------------
 init.c      |  14 +--
 input.c     |   3 +
 6 files changed, 154 insertions(+), 143 deletions(-)

diff --git a/aide.c b/aide.c
index b80eca2f..c100f54e 100644
--- a/aide.c
+++ b/aide.c
@@ -69,11 +69,14 @@ const char * Valeur_Raccourci_Clavier(word NumeroRaccourci)
     return "(Problem)";
   else
   {
-    if (Pointeur[0] == 0 || Pointeur[0] == 0xFFFF)
+    if (Pointeur[0] == 0 && Pointeur[1] == 0)
       return "None";
+    if (Pointeur[0] != 0 && Pointeur[1] == 0)
+      return Nom_touche(Pointeur[0]);
+    if (Pointeur[0] == 0 && Pointeur[1] != 0)
+      return Nom_touche(Pointeur[1]);
+      
     strcpy(Noms_raccourcis, Nom_touche(Pointeur[0]));
-    if (Pointeur[1] == 0 || Pointeur[1] == 0xFFFF)
-      return Noms_raccourcis;
     strcat(Noms_raccourcis, " ");
     strcat(Noms_raccourcis, Nom_touche(Pointeur[1]));
     return Noms_raccourcis;
@@ -100,7 +103,7 @@ void Afficher_aide(void)
   char   TypeLigne;           // N: Normale, T: Titre, S: Sous-titre
                               // -: Ligne inférieur de sous-titre
   const char * Ligne;
-  char   Buffer[44];          // Buffer texte utilisé pour formater les noms de 
+  char   Buffer[45];          // Buffer texte utilisé pour formater les noms de 
                               // raccourcis clavier
   short  Position_lien=0;     // Position du premier caractère "variable"
   short  Taille_lien=0;       // Taille de la partie variable
@@ -134,7 +137,12 @@ void Afficher_aide(void)
       Position_lien = 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);
+      snprintf(Buffer, 44, Ligne, Lien);
+      if (strlen(Ligne)+Taille_lien-2>44)
+      {
+        Buffer[43]=CARACTERE_SUSPENSION;
+        Buffer[44]='\0';
+      }
       Ligne = Buffer;
     }
     
diff --git a/gfx2.cfg b/gfx2.cfg
index e41d2509b06a0e259e282cd25e9c69a55586efd1..573037827d33442c677cfabe340def4e63eb5b77 100644
GIT binary patch
literal 10062
zcmeI2|67w)0L4FdGKC6tUlhh*dk6R>6GAgHQv*dbGetAah#VU-H5hY%A(@uhAKHK7
zhu``edhhn^Jm)#P_rCW%=e+l)_sZP03=J6H1GxZ!yqKXV?x7&|kjp`qyttR5xQ~L^
zOKt}G$crCP6hEXOenhSY{p7{{6vYD+#DgSw4U&V9XDmR0QL)Gy^+Sxv4>RJ*11zfy
zvh2tb%T60&Ri(_T$}mgv5tif?R^+c(kym*tPk1V?(Up(Vm5<SskJC)x2u+ovG^gMg
zZS~`{)jy`KeuB38Cv>ObBrS1*rZ`D+9zG@O4yVYv!&5v4PE%3&jEc(NRBG^!$|*QQ
zRsD0S>Sw9Wz!y~Sz&TpZ`jVE{I!`NsuV{J23$*HRk;GY-NSyUGHTmz<<kQq#VTQ&u
zT&CepuIvWJER6)N(r~powpFh2QoPQN_zgSiH`tJW%ZB_W>+<hdm)~OC^>1@ToaZ<7
zJJiLy)cyB+)|d_VSd;(2{%|$ir$5Yv2Q(b?Bb$zVXu|Ll{f=2+$aQ{Z$lWg52>69Q
z^+%M|>y*`(7?w8}mNzNaFymqIF=Hw#Y&omNmb3ohjrhcVVWPeAXFQkxN=N*Ij>=m)
z33g)8HP<MKZ3bOuos!rg>&nkLEOr?bHy98%DT!O|5ni}!yz@m@+h#$0Z35WE3Gq)Z
zs{F--_|h(*r;}pv(a0rMIcJ3nR`-yV9k8k;D_XXiBUZBNxWo#MTD@^AchssKw_+!(
z)=8J2v`U02OLW@uoUtfpEyy{Gao$2)a2uB_0AbqDFB|r(A<r4^bwj;jm^Tgamf;cR
zjqR>+-7}{9JTRJvMzUZOi$?Is5p|7kX!x>5uW0ZSEq$hytJ>DyEkx*OR9AyGHRgqe
zY<t5yR_~QozutW`L;OYuq67bRz+)gj714p{Kx!R`CqO&_qXTJnAf5nePCwpzbReDp
zu>;Y8G&>MafHbEc?>#yYPk`8g=s=nsh$ldr(~tKa9SFWC<0+8tPY)sOpX|T?{|fBw
aBV<CR$6weNTi=_}gT7whRoZ=93El(xp@EqI

literal 10062
zcmeI2=T=ie6otPVh$bpZija_y+)%`Zg1w<2O$8OOi)ct95rq%~C}P3-pgzfQFMs(A
z-U*9u?X{UXnb~t@ela>R8KML|O%U_UJmO-Aq}W74Y$g^n3lkT2kra265F^A!%%a4_
zJtW1wB*cBh3T7?D#r-7310=*&e9U6_t!8n$J+lN|Vv-&C2kDe<qf?dJsmMuD(a1Cv
z->icbIT=>uWLcE%WKlZDlJqB*r1LCG`z%WrXh?U_knW}|-9y<o>!mE`5aj{0K5Ft0
zQ<Hy$n*5{G<R7CkY<8Tg*iTtJL3zgPBw?*^fUs6L$V<#lk&|<poSYxz3T8ja4Vs-H
zFaIog`RB-wn4Kp-Yj%OEW?iJJ@47_QH@i$#-*|;;(QF7`v##Q6)-?*!A1O!=Q&5Ew
zO2cN?DQP96Ixw>_N~$nUN!2FUk~7H%@dn%CO}6FVVqJQQb?Ir=q;In(eTN>^ze}$;
z!+ZI&6va7;`s+Pb8T0P5D*b@{-njRW7H`6PM5$=@m<^45LW}s67LA#wLv^0fq17%B
zmH(Wm{1;^87s<$9Br9DaD_tg2FsqOiU(zjSiA~L_vZ-0W*b!e5k+V!h`ZaH*-%uAn
zQ<w9dx^K2ZN;OwWi#1ZJvqoC16ISK7w22K;;yUf(25E7V1=V@Sy!f64Roh}-{KAl&
z9s0$u49WRMzxaXUa<(}kdJu~Fv=Spuf+PoNqn#9KI>?ZvlN@>Qd<t~YO%J^sqL0HI
z;V8#cs$YdpYQzA8oZ>WRILkTCbAgLo;xbpXjH_JJh+#&!&M0GyGr=S`xXCT1nC3Qj
zxT_H}%reJ4?(=|$JmN7=c&d#((-xoeLL-X0EG1oliW+uF?e|KT<TY<}omSQUYZ_5k
zxDB<*hK}H!T475~w9Q98@tH5Wnt1NVCEybHHvv5Z?pC-2Tmpejz`X$O1#}4nIRW<q
z1o`yc-dzIj1#ms!5(shv?ga?)>AStV1l$YYdcY+R<OJLc5aiQ$dv^(VG%19Df12@v
j{t5s7|9fCp6ffk3n)U1Lc3mF{DT8Q4|Em=Fd-i_-W{!rU

diff --git a/gfx2gui.gif b/gfx2gui.gif
index e68c3dcb095f7c2b47a53f4d112b58a5eb6bff67..09cc16b43edc04aed05ca685da5c18b0f6d95bd6 100644
GIT binary patch
delta 5111
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
ZTB@g-s;k<nuNtefTC2C(r~?8306P=GO`ZS%

delta 4646
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

diff --git a/hotkeys.h b/hotkeys.h
index 3cc70b1a..c257635c 100644
--- a/hotkeys.h
+++ b/hotkeys.h
@@ -41,609 +41,609 @@ S_ConfigTouche ConfigTouche[] = {
   "This hotkey cannot be removed.",
   false,
   SDLK_UP, // HAUT
-  0xFFFF},
+  0},
   {1,
   "Scroll down",
   "Scrolls the picture down, both in magnify and normal mode.",
   "This hotkey cannot be removed.",
   false,
   SDLK_DOWN, // BAS
-  0xFFFF},
+  0},
   {2,
   "Scroll left",
   "Scrolls the picture to the left, both in magnify and normal mode.",
   "This hotkey cannot be removed.",
   false,
   SDLK_LEFT, // GAUCHE
-  0xFFFF},
+  0},
   {3,
   "Scroll right",
   "Scrolls the picture to the right, both in magnify and normal mode.",
   "This hotkey cannot be removed.",
   false,
   SDLK_RIGHT, // DROITE
-  0xFFFF},
+  0},
   {4,
   "Faster scroll up",
   "Used to scroll upwards in the picture fast, either in magnify and normal",
   "mode.",
   true,
   SDLK_UP|MOD_SHIFT, // Shift + Haut
-  0xFFFF},
+  0},
   {5,
   "Faster scroll down",
   "Used to scroll downwards in the picture fast, either in magnify and normal",
   "mode.",
   true,
   SDLK_DOWN|MOD_SHIFT, // Shift + Bas
-  0xFFFF},
+  0},
   {6,
   "Faster scroll left",
   "Used to scroll to the left in the picture fast, either in magnify and normal",
   "mode.",
   true,
   SDLK_LEFT|MOD_SHIFT, // Shift + Gauche
-  0xFFFF},
+  0},
   {7,
   "Faster scroll right",
   "Used to scroll to the right in the picture fast, either in magnify and",
   "normal mode.",
   true,
   SDLK_RIGHT|MOD_SHIFT, // Shift + Droite
-  0xFFFF},
+  0},
   {8,
   "Slower scroll up",
   "Used to scroll upwards in the picture pixel by pixel, either in magnify and",
   "normal mode.",
   true,
   SDLK_UP|MOD_ALT, // Alt + Haut
-  0xFFFF},
+  0},
   {9,
   "Slower scroll down",
   "Used to scroll downwards in the picture pixel by pixel, either in magnify and",
   "normal mode.",
   true,
   SDLK_DOWN|MOD_ALT, // Alt + Bas
-  0xFFFF},
+  0},
   {10,
   "Slower scroll left",
   "Used to scroll to the left in the picture pixel by pixel, either in magnify",
   "and normal mode.",
   true,
   SDLK_LEFT|MOD_ALT, // Alt + Gauche
-  0xFFFF},
+  0},
   {11,
   "Slower scroll right",
   "Used to scroll to the right in the picture pixel by pixel, either in magnify",
   "and normal mode.",
   true,
   SDLK_RIGHT|MOD_ALT, // Alt + Droite
-  0xFFFF},
+  0},
   {12,
   "Move mouse cursor 1 pixel up",
   "Used to simulate a very small mouse deplacement upwards.",
   "It""s very useful when you want a ultra-high precision.",
   true,
   SDLK_UP|MOD_CTRL, // Ctrl + Haut
-  0xFFFF},
+  0},
   {13,
   "Move mouse cursor 1 pixel down",
   "Used to simulate a very small mouse deplacement downwards.",
   "It""s very useful when you want a ultra-high precision.",
   true,
   SDLK_DOWN|MOD_CTRL, // Ctrl + Bas
-  0xFFFF},
+  0},
   {14,
   "Move mouse cursor 1 pixel left",
   "Used to simulate a very small mouse deplacement to the left.",
   "It""s very useful when you want a ultra-high precision.",
   true,
   SDLK_LEFT|MOD_CTRL, // Ctrl + Gauche
-  0xFFFF},
+  0},
   {15,
   "Move mouse cursor 1 pixel right",
   "Used to simulate a very small mouse deplacement to the right.",
   "It""s very useful when you want a ultra-high precision.",
   true,
   SDLK_RIGHT|MOD_CTRL, // Ctrl + Droite
-  0xFFFF},
+  0},
   {16,
   "Simulate left mouse click",
   "Used to simulate a click with the left mouse button..",
   "It""s very useful when you want a ultra-high precision.",
   true,
   SDLK_SPACE, // Space
-  0xFFFF},
+  0},
   {17,
   "Simulate right mouse click",
   "Used to simulate a click with the right mouse button..",
   "It""s very useful when you want a ultra-high precision.",
   true,
   SDLK_SPACE|MOD_SHIFT, // Shift + Space
-  0xFFFF},
+  0},
   {18,
   "Show/hide option menu",
   "Switch the tool bar display on/off.",
   "This hot-key cannot be removed.",
   false,
   SDLK_F10, // F10
-  0xFFFF},
+  0},
   {19,
   "Show/hide cursor",
   "Switch the cursor display on/off.",
   "This only works on the \"small cross\" and \"hand\" cursors.",
   true,
   SDLK_F9, // F9
-  0xFFFF},
+  0},
   {20,
   "Set paintbrush to 1 pixel",
   "Useful when you want to use a \"single-pixel-brush\".",
   "",
   true,
   SDLK_DELETE, // Del
-  0xFFFF},
+  0},
   {21,
   "Paintbrush choice",
   "Opens a menu where you can choose a paintbrush out of 24 predefined ones.",
   "",
   true,
   SDLK_F4, // F4
-  0xFFFF},
+  0},
   {22,
   "Monochrome brush",
   "Turn your current user-defined brush into a single colored one.",
   "All non-transparent colors are set to current foreground color.",
   true,
   SDLK_F4|MOD_SHIFT, // Shift + F4
-  0xFFFF},
+  0},
   {23,
   "Freehand drawing",
   "Set the drawing mode to the classical freehand one.",
   "",
   true,
   SDLK_d, // D
-  0xFFFF},
+  0},
   {24,
   "Switch freehand drawing mode",
   "Switch between the 3 ways to use freehand drawing.",
   "These modes are: continuous, discontinuous and point by point.",
   true,
   SDLK_d|MOD_SHIFT, // Shift + D
-  0xFFFF},
+  0},
   {25,
   "Continuous freehand drawing",
   "Switch directly to continuous freehand drawing mode.",
   "",
   true,
   SDLK_d|MOD_CTRL, // Ctrl + D
-  0xFFFF},
+  0},
   {26,
   "Line",
   "Allows you to draw lines.",
   "",
   true,
   SDLK_l, // L
-  0xFFFF},
+  0},
   {27,
   "Knotted lines",
   "Allows you to draw linked lines.",
   "This mode can also be called \"Polyline\".",
   true,
   SDLK_l|MOD_SHIFT, // Shift + L
-  0xFFFF},
+  0},
   {28,
   "Spray",
   "Allows you to spray brushes randomly in the picture.",
   "",
   true,
   SDLK_a, // A (Q en AZERTY)
-  0xFFFF},
+  0},
   {29,
   "Spray menu",
   "Opens a menu in which you can configure the spray flow and size.",
   "",
   true,
   SDLK_a|MOD_SHIFT, // Shift + A
-  0xFFFF},
+  0},
   {30,
   "Flood-fill",
   "Allows you to fill an area of the picture made of pixels of the same color.",
   "",
   true,
   SDLK_f, // F
-  0xFFFF},
+  0},
   {124,
   "Replace color",
   "Allows you to replace all the pixels of the color pointed by the mouse with",
   "the fore-color or the back-color.",
   true,
   SDLK_f|MOD_SHIFT, // Shift + F
-  0xFFFF},
+  0},
   {31,
   "Bezier""s curves",
   "Allows you to draw Bezier""s curves.",
   "",
   true,
   SDLK_i, // I
-  0xFFFF},
+  0},
   {32,
   "Bezier""s curve with 3 or 4 points",
   "Allows you to choose whether you want to draw Bezier""s curves with 3 or 4",
   "points.",
   true,
   SDLK_i|MOD_SHIFT, // Shift + I
-  0xFFFF},
+  0},
   {33,
   "Empty rectangle",
   "Allows you to draw a rectangle using the brush.",
   "",
   true,
   SDLK_r, // R
-  0xFFFF},
+  0},
   {34,
   "Filled rectangle",
   "Allows you to draw a filled rectangle.",
   "",
   true,
   SDLK_r|MOD_SHIFT, // Shift + R
-  0xFFFF},
+  0},
   {35,
   "Empty circle",
   "Allows you to draw a circle using the brush.",
   "",
   true,
   SDLK_c, // C
-  0xFFFF},
+  0},
   {36,
   "Empty ellipse",
   "Allows you to draw an ellipse using the brush.",
   "",
   true,
   SDLK_c|MOD_CTRL, // Ctrl + C
-  0xFFFF},
+  0},
   {37,
   "Filled circle",
   "Allows you to draw a filled circle.",
   "",
   true,
   SDLK_c|MOD_SHIFT, // Shift + C
-  0xFFFF},
+  0},
   {38,
   "Filled ellipse",
   "Allows you to draw a filled ellipse.",
   "",
   true,
   SDLK_c|MOD_SHIFT|MOD_CTRL, // Shift + Ctrl + C
-  0xFFFF},
+  0},
   {39,
   "Empty polygon",
   "Allows you to draw a polygon using the brush.",
   "",
   true,
   SDLK_n, // N
-  0xFFFF},
+  0},
   {40,
   "Empty \"polyform\"",
   "Allows you to draw a freehand polygon using the brush.",
   "",
   true,
   SDLK_n|MOD_CTRL, // Ctrl + N
-  0xFFFF},
+  0},
   {41,
   "Filled polygon",
   "Allows you to draw a filled polygon.",
   "",
   true,
   SDLK_n|MOD_SHIFT, // Shift + N
-  0xFFFF},
+  0},
   {42,
   "Filled \"polyform\"",
   "Allows you to draw a filled freehand polygon.",
   "",
   true,
   SDLK_n|MOD_SHIFT|MOD_CTRL, // Shift + Ctrl + N
-  0xFFFF},
+  0},
   {43,
   "Rectangle with gradation",
   "Allows you to draw a rectangle with a color gradation.",
   "",
   true,
   SDLK_r|MOD_ALT, // Alt + R
-  0xFFFF},
+  0},
   {44,
   "Gradation menu",
   "Allows you to configure the way color gradations are calculated.",
   "",
   true,
   SDLK_g|MOD_ALT, // Alt + G
-  0xFFFF},
+  0},
   {45,
   "Sphere with gradation",
   "Allows you to draw a rectangle with a color gradation.",
   "",
   true,
   SDLK_c|MOD_ALT, // Alt + C
-  0xFFFF},
+  0},
   {46,
   "Ellipse with gradation",
   "Allows you to draw an ellipse filled with a color gradation.",
   "",
   true,
   SDLK_c|MOD_SHIFT|MOD_ALT, // Shift + Alt + C
-  0xFFFF},
+  0},
   {47,
   "Adjust picture",
   "Allows you to move the whole picture in order to re-center it.",
   "Notice that what gets out from a side reappears on the other.",
   true,
   SDLK_KP5, // Kpad5
-  0xFFFF},
+  0},
   {48,
   "Flip/shrink picture menu",
   "Opens a menu which allows you to flip the picture horizontally/vertically or",
   "to shrink it to half-scale horizontally and/or vertically.",
   true,
   SDLK_KP5|MOD_SHIFT, // Shift + Kpad5
-  0xFFFF},
+  0},
   {49,
   "Drawing effects",
   "Opens a menu where you can enable/disable and configure the drawing effects",
   "listed below.",
   true,
   SDLK_e, // E
-  0xFFFF},
+  0},
   {50,
   "Shade mode",
   "Allows you to shade or lighten some pixels of the picture belonging to a",
   "color range, in addition of any drawing tool.",
   true,
   SDLK_F5, // F5
-  0xFFFF},
+  0},
   {51,
   "Shade menu",
   "Opens a menu where you can choose color ranges to use with the Shade mode.",
   "This menu also contains parameters used both in Shade and Quick-shade modes.",
   true,
   SDLK_F5|MOD_SHIFT, // Shift + F5
-  0xFFFF},
+  0},
   {131,
   "Quick-shade mode",
   "Does the same thing as shade mode with a simpler method (faster to define",
   "but a bit less powerful).",
   true,
   SDLK_F5|MOD_CTRL, // Ctrl + F5
-  0xFFFF},
+  0},
   {132,
   "Quick-shade menu",
   "Opens a menu where you can define the parameters of the quick-shade mode.",
   "",
   true,
   SDLK_F5|MOD_SHIFT|MOD_CTRL, // Shift + Ctrl + F5
-  0xFFFF},
+  0},
   {52,
   "Stencil mode",
   "Allows you to mask colors that must not be affected when you are drawing.",
   "",
   true,
   SDLK_F6, // F6
-  0xFFFF},
+  0},
   {53,
   "Stencil menu",
   "Opens a menu where you can choose colors masked by the Stencil mode.",
   "",
   true,
   SDLK_F6|MOD_SHIFT, // Shift + F6
-  0xFFFF},
+  0},
   {54,
   "Mask mode",
   "Allows you to mask colors of the spare page that will keep you from ",
   "drawing. This mode should be called \"True stencil\".",
   true,
   SDLK_F6|MOD_ALT, // Alt + F6
-  0xFFFF},
+  0},
   {55,
   "Mask menu",
   "Opens a menu where you can choose colors for the Mask mode.",
   "",
   true,
   SDLK_F6|MOD_SHIFT|MOD_ALT, // Shift + Alt + F6
-  0xFFFF},
+  0},
   {56,
   "Grid mode",
   "Force the cursor to snap up grid points.",
   "",
   true,
   SDLK_g, // G
-  0xFFFF},
+  0},
   {57,
   "Grid menu",
   "Open a menu where you can configure the grid used by Grid mode.",
   "",
   true,
   SDLK_g|MOD_SHIFT, // Shift + G
-  0xFFFF},
+  0},
   {58,
   "Sieve mode",
   "Only draws pixels on certain positions matching with a sieve.",
   "",
   true,
   SDLK_g|MOD_CTRL, // Ctrl + G
-  0xFFFF},
+  0},
   {59,
   "Sieve menu",
   "Opens a menu where you can configure the sieve.",
   "",
   true,
   SDLK_g|MOD_SHIFT|MOD_CTRL, // Shift + Ctrl + G
-  0xFFFF},
+  0},
   {60,
   "Invert sieve",
   "Inverts the pattern defined in the Sieve menu.",
   "",
   true,
   SDLK_g|MOD_CTRL|MOD_ALT, // Ctrl + Alt + G
-  0xFFFF},
+  0},
   {61,
   "Colorize mode",
   "Allows you to colorize the pixels on which your brush is pasted.",
   "This permits you to make transparency effects.",
   true,
   SDLK_F7, // F7
-  0xFFFF},
+  0},
   {62,
   "Colorize menu",
   "Opens a menu where you can give the opacity percentage for Colorize mode.",
   "",
   true,
   SDLK_F7|MOD_SHIFT, // Shift + F7
-  0xFFFF},
+  0},
   {63,
   "Smooth mode",
   "Soften pixels on which your brush is pasted.",
   "",
   true,
   SDLK_F8, // F8
-  0xFFFF},
+  0},
   {123,
   "Smooth menu",
   "Opens a menu where you can define the Smooth matrix.",
   "",
   true,
   SDLK_F8|MOD_SHIFT, // Shift + F8
-  0xFFFF},
+  0},
   {64,
   "Smear mode",
   "Smears the pixels when you move your brush on the picture.",
   "",
   true,
   SDLK_F8|MOD_ALT, // Alt + F8
-  0xFFFF},
+  0},
   {65,
   "Tiling mode",
   "Puts parts of the brush where you draw.",
   "",
   true,
   SDLK_b|MOD_ALT, // Alt + B
-  0xFFFF},
+  0},
   {66,
   "Tiling menu",
   "Opens a menu where you can configure the origin of the tiling.",
   "",
   true,
   SDLK_b|MOD_SHIFT|MOD_ALT, // Shift + Alt + B
-  0xFFFF},
+  0},
   {67,
   "Classical brush grabbing",
   "Allows you to pick a brush defined within a rectangle.",
   "",
   true,
   SDLK_b, // B
-  0xFFFF},
+  0},
   {68,
   "\"Lasso\" brush grabbing",
   "Allows you to pick a brush defined within a freehand polygon.",
   "",
   true,
   SDLK_b|MOD_CTRL, // Ctrl + B
-  0xFFFF},
+  0},
   {69,
   "Get previous brush back",
   "Restore the last user-defined brush.",
   "",
   true,
   SDLK_b|MOD_SHIFT, // Shift + B
-  0xFFFF},
+  0},
   {70,
   "Horizontal brush flipping",
   "Reverse brush horizontally.",
   "",
   true,
   SDLK_x, // X
-  0xFFFF},
+  0},
   {71,
   "Vertical brush flipping",
   "Reverse brush vertically.",
   "",
   true,
   SDLK_y, // Y
-  0xFFFF},
+  0},
   {72,
   "90ø brush rotation",
   "Rotate the user-defined brush by 90ø (counter-clockwise).",
   "",
   true,
   SDLK_z, // Z (W en AZERTY)
-  0xFFFF},
+  0},
   {73,
   "180ø brush rotation",
   "Rotate the user-defined brush by 180ø.",
   "",
   true,
   SDLK_z|MOD_SHIFT, // Shift + Z
-  0xFFFF},
+  0},
   {74,
   "Strech brush",
   "Allows you to resize the user-defined brush.",
   "",
   true,
   SDLK_s, // S
-  0xFFFF},
+  0},
   {75,
   "Distort brush",
   "Allows you to distort the user-defined brush.",
   "",
   true,
   SDLK_s|MOD_SHIFT, // Shift + S
-  0xFFFF},
+  0},
   {76,
   "Outline brush",
   "Outlines the user-defined brush with the fore color.",
   "",
   true,
   SDLK_o, // O
-  0xFFFF},
+  0},
   {77,
   "Nibble brush",
   "Deletes the borders of the user-defined brush.",
   "This does the opposite of the Outline option.",
   true,
   SDLK_o|MOD_SHIFT, // Shift + O
-  0xFFFF},
+  0},
   {78,
   "Get colors from brush",
   "Copy colors of the spare page that are used in the brush.",
   "",
   true,
   SDLK_F11, // F11
-  0xFFFF},
+  0},
   {79,
   "Recolorize brush",
   "Recolorize pixels of the user-defined brush in order to get a brush which",
   "looks like the one grabbed in the spare page.",
   true,
   SDLK_F12, // F12
-  0xFFFF},
+  0},
   {80,
   "Rotate by any angle",
   "Rotate the brush by an angle that you can define.",
   "",
   true,
   SDLK_w, // W (Z en AZERTY)
-  0xFFFF},
+  0},
   {81,
   "Pipette",
   "Allows you to copy the color of a pixel in the picture into the foreground",
   "or background color.",
   true,
   SDLK_BACKQUOTE, // `~ (Touche sous le Esc - ² en AZERTY)
-  0xFFFF},
+  0},
   {82,
   "Swap foreground/background colors",
   "Invert foreground and background colors.",
   "",
   true,
   SDLK_BACKQUOTE|MOD_SHIFT, // Shift + `~
-  0xFFFF},
+  0},
   {83,
   "Magnifier mode",
   "Allows you to zoom into the picture.",
@@ -657,7 +657,7 @@ S_ConfigTouche ConfigTouche[] = {
   "",
   true,
   SDLK_m|MOD_SHIFT, // Shift + M
-  0xFFFF},
+  0},
   {85,
   "Zoom in",
   "Increase magnifying factor.",
@@ -678,299 +678,299 @@ S_ConfigTouche ConfigTouche[] = {
   "",
   true,
   SDLK_b|MOD_CTRL|MOD_ALT, // Ctrl + Alt + B
-  0xFFFF},
+  0},
   {88,
   "Text",
   "Opens a menu which permits you to type in a character string and to choose a",
   "font, and then creates a new user-defined brush fitting to your choices.",
   true,
   SDLK_t, // T
-  0xFFFF},
+  0},
   {89,
   "Screen resolution menu",
   "Opens a menu where you can choose the dimensions of the screen in which you",
   "want to draw among the numerous X and SVGA proposed modes.",
   true,
   SDLK_RETURN, // Enter
-  0xFFFF},
+  0},
   {90,
   "\"Safety\" resolution",
   "Set resolution to 320x200. This can be useful if you choosed a resolution",
   "that is not supported by your monitor and video card. Cannot be removed.",
   false,
   SDLK_RETURN|MOD_SHIFT, // Shift + Enter
-  0xFFFF},
+  0},
   {91,
   "Help and credits",
   "Opens a window where you can get information about the program.",
   "",
   true,
   SDLK_F1, // F1
-  0xFFFF},
+  0},
   {92,
   "Statistics",
   "Displays miscellaneous more or less useful information.",
   "",
   true,
   SDLK_F1|MOD_SHIFT, // Shift + F1
-  0xFFFF},
+  0},
   {93,
   "Jump to spare page",
   "Swap current page and spare page.",
   "",
   true,
   SDLK_TAB, // Tab
-  0xFFFF},
+  0},
   {94,
   "Copy current page to spare page",
   "Copy current page to spare page.",
   "",
   true,
   SDLK_TAB|MOD_SHIFT, // Shift + Tab
-  0xFFFF},
+  0},
   {95,
   "Save picture as...",
   "Opens a file-selector that allows you to save your picture with a new",
   "path-name.",
   true,
   SDLK_F2, // F2
-  0xFFFF},
+  0},
   {96,
   "Save picture",
   "Saves your picture with the last name you gave it.",
   "",
   true,
   SDLK_F2|MOD_SHIFT, // Shift + F2
-  0xFFFF},
+  0},
   {97,
   "Load picture",
   "Opens a file-selector that allows you to load a new picture.",
   "",
   true,
   SDLK_F3, // F3
-  0xFFFF},
+  0},
   {98,
   "Re-load picture",
   "Re-load the current picture.",
   "This allows you to cancel modifications made since last saving.",
   true,
   SDLK_F3|MOD_SHIFT, // Shift + F3
-  0xFFFF},
+  0},
   {99,
   "Save brush",
   "Opens a file-selector that allows you to save your current user-defined",
   "brush.",
   true,
   SDLK_F2|MOD_CTRL, // Ctrl + F2
-  0xFFFF},
+  0},
   {100,
   "Load brush",
   "Opens a file-selector that allows you to load a brush.",
   "",
   true,
   SDLK_F3|MOD_CTRL, // Ctrl + F3
-  0xFFFF},
+  0},
   {101,
   "Settings",
   "Opens a menu which permits you to set the dimension of your picture, and to",
   "modify some parameters of the program.",
   true,
   SDLK_F10|MOD_SHIFT, // Shift + F10
-  0xFFFF},
+  0},
   {102,
   "Undo (Oops!)",
   "Cancel the last action which modified the picture. This has no effect after",
   "a jump to the spare page, loading a picture or modifying its size.",
   true,
   SDLK_u, // U
-  0xFFFF},
+  0},
   {103,
   "Redo",
   "Redo the last undone action. This has no effect after a jump to the spare",
   "page, loading a picture or modifying its size.",
   true,
   SDLK_u|MOD_SHIFT, // Shift + U
-  0xFFFF},
+  0},
   {133,
   "Kill",
   "Kills the current page. It actually removes the current page from the list",
   "of \"Undo\" pages.",
   true,
   SDLK_DELETE|MOD_SHIFT, // Shift + Suppr
-  0xFFFF},
+  0},
   {104,
   "Clear page",
   "Clears the picture with the first color of the palette (usually black).",
   "",
   true,
   SDLK_BACKSPACE, // BackSpace
-  0xFFFF},
+  0},
   {105,
   "Clear page with backcolor",
   "Clears the picture with the backcolor.",
   "",
   true,
   SDLK_BACKSPACE|MOD_SHIFT, // Shift + BackSpace
-  0xFFFF},
+  0},
   {106,
   "Quit program",
   "Allows you to leave the program.",
   "If modifications were not saved, confirmation is asked.",
   false,
   SDLK_q, // Q (A en AZERTY)
-  0xFFFF},
+  0},
   {107,
   "Palette menu",
   "Opens a menu which allows you to modify the current palette.",
   "",
   true,
   SDLK_p, // P
-  0xFFFF},
+  0},
   {125,
   "Secondary palette menu",
   "Opens a menu which allows you to define color series and some tagged colors.",
   "",
   true,
   SDLK_p|MOD_SHIFT, // Shift + P
-  0xFFFF},
+  0},
   {130,
   "Exclude colors menu",
   "Opens a menu which allows you to define the colors you don""t want to use in",
   "modes such as Smooth and Transparency, or when remapping a brush.",
   true,
   SDLK_p|MOD_CTRL, // Ctrl + P
-  0xFFFF},
+  0},
   {108,
   "Scroll palette to the left",
   "Scroll palette in the tool bar to the left, column by column.",
   "",
   true,
   SDLK_PAGEUP, // PgUp
-  0xFFFF},
+  0},
   {109,
   "Scroll palette to the right",
   "Scroll palette in the tool bar to the right, column by column.",
   "",
   true,
   SDLK_PAGEDOWN, // PgDn
-  0xFFFF},
+  0},
   {110,
   "Scroll palette to the left faster",
   "Scroll palette in the tool bar to the left, 8 columns by 8 columns.",
   "",
   true,
   SDLK_PAGEUP|MOD_SHIFT, // Shift + PgUp
-  0xFFFF},
+  0},
   {111,
   "Scroll palette to the right faster",
   "Scroll palette in the tool bar to the right, 8 columns by 8 columns.",
   "",
   true,
   SDLK_PAGEDOWN|MOD_SHIFT, // Shift + PgDn
-  0xFFFF},
+  0},
   {112,
   "Center brush attachment point",
   "Set the attachement of the user-defined brush to its center.",
   "",
   true,
   SDLK_KP5|MOD_CTRL, // Ctrl + 5 (pavé numérique)
-  0xFFFF},
+  0},
   {113,
   "Top-left brush attachment point",
   "Set the attachement of the user-defined brush to its top-left corner.",
   "",
   true,
   SDLK_HOME|MOD_CTRL, // Ctrl + 7
-  0xFFFF},
+  0},
   {114,
   "Top-right brush attachment point",
   "Set the attachement of the user-defined brush to its top-right corner.",
   "",
   true,
   SDLK_PAGEUP|MOD_CTRL, // Ctrl + 9
-  0xFFFF},
+  0},
   {115,
   "Bottom-left brush attachment point",
   "Set the attachement of the user-defined brush to its bottom-left corner.",
   "",
   true,
   SDLK_END|MOD_CTRL, // Ctrl + 1
-  0xFFFF},
+  0},
   {116,
   "Bottom-right brush attachment point",
   "Set the attachement of the user-defined brush to its bottom-right corner.",
   "",
   true,
   SDLK_PAGEDOWN|MOD_CTRL, // Ctrl + 3
-  0xFFFF},
+  0},
   {117,
   "Next foreground color",
   "Set the foreground color to the next in the palette.",
   "",
   true,
   SDLK_RIGHTBRACKET, // ] (0x en AZERTY)
-  0xFFFF},
+  0},
   {118,
   "Previous foreground color",
   "Set the foreground color to the previous in the palette.",
   "",
   true,
   SDLK_LEFTBRACKET, // [ (^ en AZERTY)
-  0xFFFF},
+  0},
   {119,
   "Next background color",
   "Set the background color to the next in the palette.",
   "",
   true,
   SDLK_RIGHTBRACKET|MOD_SHIFT, // Shift + ]
-  0xFFFF},
+  0},
   {120,
   "Previous background color",
   "Set the background color to the previous in the palette.",
   "",
   true,
   SDLK_LEFTBRACKET|MOD_SHIFT, // Shift + [
-  0xFFFF},
+  0},
   {126,
   "Next user-defined forecolor",
   "Set the foreground color to the next in the user-defined color series.",
   "",
   true,
   SDLK_EQUALS, // "=+"
-  0xFFFF},
+  0},
   {127,
   "Previous user-defined forecolor",
   "Set the foreground color to the previous in the user-defined color series.",
   "",
   true,
   SDLK_MINUS, // "-_" (")ø" en AZERTY
-  0xFFFF},
+  0},
   {128,
   "Next user-defined backcolor",
   "Set the background color to the next in the user-defined color series.",
   "",
   true,
   SDLK_EQUALS|MOD_SHIFT, // Shift + "=+"
-  0xFFFF},
+  0},
   {129,
   "Previous user-defined backcolor",
   "Set the background color to the previous in the user-defined color series.",
   "",
   true,
   SDLK_MINUS|MOD_SHIFT, // Shift + "-_" (")ø" en AZERTY
-  0xFFFF},
+  0},
   {121,
   "Shrink paintbrush",
   "Decrease the width of the paintbrush if it is special circle or square.",
   "",
   true,
   SDLK_COMMA, // , < (;. en AZERTY)
-  0xFFFF},
+  0},
   {122,
   "Enlarge paintbrush",
   "Increase the width of the paintbrush if it is special circle or square.",
   "",
   true,
   SDLK_PERIOD, // .> (:/ en AZERTY)
-  0xFFFF},
+  0},
 };
diff --git a/init.c b/init.c
index 706fce41..f1af2bc3 100644
--- a/init.c
+++ b/init.c
@@ -886,10 +886,10 @@ void Initialisation_des_boutons(void)
 
   for (Indice_bouton=0;Indice_bouton<NB_BOUTONS;Indice_bouton++)
   {
-    Bouton[Indice_bouton].Raccourci_gauche[0]=0xFFFF;
-    Bouton[Indice_bouton].Raccourci_gauche[1]=0xFFFF;
-    Bouton[Indice_bouton].Raccourci_droite[0]=0xFFFF;
-    Bouton[Indice_bouton].Raccourci_droite[1]=0xFFFF;
+    Bouton[Indice_bouton].Raccourci_gauche[0]=0;
+    Bouton[Indice_bouton].Raccourci_gauche[1]=0;
+    Bouton[Indice_bouton].Raccourci_droite[0]=0;
+    Bouton[Indice_bouton].Raccourci_droite[1]=0;
     Initialiser_bouton(Indice_bouton,
                        0,0,
                        1,1,
@@ -1951,7 +1951,7 @@ int Charger_CFG(int Tout_charger)
     && (CFG_Header.Version2== 0)
     && (CFG_Header.Beta1== 97))
   {
-    // Les touches 00FF (pas de touche) sont a comprendre comme 0xFFFF
+    // Les touches 00FF (pas de touche) sont a comprendre comme 0x0000
     Conversion_touches = 2;
   }
   // Version SDL
@@ -1985,9 +1985,9 @@ int Charger_CFG(int Tout_charger)
               else if (Conversion_touches==2)
               {
                 if (CFG_Infos_touche.Touche == 0x00FF)
-                  CFG_Infos_touche.Touche = 0xFFFF;
+                  CFG_Infos_touche.Touche = 0x0000;
                 if (CFG_Infos_touche.Touche2 == 0x00FF)
-                  CFG_Infos_touche.Touche2 = 0xFFFF;
+                  CFG_Infos_touche.Touche2 = 0x0000;
               }
               
               for (Indice2=0;
diff --git a/input.c b/input.c
index ce2d9b91..fcd9aeb5 100644
--- a/input.c
+++ b/input.c
@@ -54,6 +54,9 @@ short Button_clic_droit=0; // Button number that serves as right-click
 
 int Est_Raccourci(word Touche, word Fonction)
 {
+  if (Touche == 0)
+    return 0;
+    
   if (Fonction & 0x100)
   {
     if (Bouton[Fonction&0xFF].Raccourci_gauche[0]==Touche)