m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support for ESC shortcut on GP2X (button X)

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@591 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2009-02-04 01:27:04 +00:00
parent aaec8fd8a5
commit da942a7021
9 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aide.c
View File

@ -270,7 +270,7 @@ void Fenetre_aide(int Section, const char *Sous_section)
Fenetre_Pos_Y+(Menu_Facteur_Y*18), Fenetre_Pos_Y+(Menu_Facteur_Y*18),
Menu_Facteur_X*272,Menu_Facteur_Y*130,CM_Noir); Menu_Facteur_X*272,Menu_Facteur_Y*130,CM_Noir);
Fenetre_Definir_bouton_normal(266,153,35,14,"Exit",0,1,SDLK_ESCAPE); // 1 Fenetre_Definir_bouton_normal(266,153,35,14,"Exit",0,1,TOUCHE_ESC); // 1
Fenetre_Definir_bouton_scroller(290,18,130,Nb_lignes, Fenetre_Definir_bouton_scroller(290,18,130,Nb_lignes,
16,Position_d_aide_en_cours); // 2 16,Position_d_aide_en_cours); // 2
@ -412,7 +412,7 @@ void Bouton_Stats(void)
Fenetre_Pos_Y+(Menu_Facteur_Y*18), Fenetre_Pos_Y+(Menu_Facteur_Y*18),
Menu_Facteur_X*292,Menu_Facteur_Y*130,CM_Noir); Menu_Facteur_X*292,Menu_Facteur_Y*130,CM_Noir);
Fenetre_Definir_bouton_normal(120,153,70,14,"OK",0,1,SDLK_ESCAPE); // 1 Fenetre_Definir_bouton_normal(120,153,70,14,"OK",0,1,TOUCHE_ESC); // 1
// Affichage du numéro de version // Affichage du numéro de version
Print_dans_fenetre(10,19,"Program version:",STATS_COULEUR_TITRES,CM_Noir); Print_dans_fenetre(10,19,"Program version:",STATS_COULEUR_TITRES,CM_Noir);

44
boutons.c
View File

@ -112,7 +112,7 @@ void Message_Non_disponible(void)
do do
Bouton_clicke=Fenetre_Bouton_clicke(); Bouton_clicke=Fenetre_Bouton_clicke();
while ((Bouton_clicke<=0) && (Touche!=SDLK_ESCAPE) && (Touche!=SDLK_o)); while ((Bouton_clicke<=0) && (Touche!=TOUCHE_ESC) && (Touche!=SDLK_o));
if(Bouton_clicke<=0) Touche=0; if(Bouton_clicke<=0) Touche=0;
@ -144,7 +144,7 @@ void Message_Memoire_insuffisante(void)
do do
Bouton_clicke=Fenetre_Bouton_clicke(); Bouton_clicke=Fenetre_Bouton_clicke();
while ((Bouton_clicke<=0) && (Touche!=SDLK_ESCAPE) && (Touche!=SDLK_o)); while ((Bouton_clicke<=0) && (Touche!=TOUCHE_ESC) && (Touche!=SDLK_o));
if(Bouton_clicke<=0) Touche=0; if(Bouton_clicke<=0) Touche=0;
Fermer_fenetre(); Fermer_fenetre();
@ -432,7 +432,7 @@ byte Bouton_Quitter_Routine_locale(void)
// On commence par afficher la fenêtre de QUIT // On commence par afficher la fenêtre de QUIT
Ouvrir_fenetre(160,84,"Quit ?"); Ouvrir_fenetre(160,84,"Quit ?");
Fenetre_Definir_bouton_normal(20,20,120,14,"Stay",0,1,SDLK_ESCAPE); // 1 Fenetre_Definir_bouton_normal(20,20,120,14,"Stay",0,1,TOUCHE_ESC); // 1
Fenetre_Definir_bouton_normal(20,40,120,14,"Save & quit",1,1,SDLK_s); // 2 Fenetre_Definir_bouton_normal(20,40,120,14,"Save & quit",1,1,SDLK_s); // 2
Fenetre_Definir_bouton_normal(20,60,120,14,"Discard (Quit)",1,1,SDLK_d);// 3 Fenetre_Definir_bouton_normal(20,60,120,14,"Discard (Quit)",1,1,SDLK_d);// 3
Display_Window(160,84); Display_Window(160,84);
@ -560,7 +560,7 @@ void Menu_Tag_couleurs(char * En_tete, byte * Table, byte * Mode, byte Cancel, c
if (Cancel) if (Cancel)
{ {
Fenetre_Definir_bouton_normal(91,129,78,14,"OK" ,0,1,SDLK_RETURN); // 4 Fenetre_Definir_bouton_normal(91,129,78,14,"OK" ,0,1,SDLK_RETURN); // 4
Fenetre_Definir_bouton_normal( 7,129,78,14,"Cancel",0,1,SDLK_ESCAPE); // 5 Fenetre_Definir_bouton_normal( 7,129,78,14,"Cancel",0,1,TOUCHE_ESC); // 5
// On enregistre la table dans un backup au cas où on ferait Cancel // On enregistre la table dans un backup au cas où on ferait Cancel
memcpy(Backup_table,Table,256); memcpy(Backup_table,Table,256);
} }
@ -851,7 +851,7 @@ void Bouton_Settings(void)
// Bouton Save // Bouton Save
Fenetre_Definir_bouton_normal(183,163, 51,14,"Save" ,0,1,SDLK_LAST); // 18 Fenetre_Definir_bouton_normal(183,163, 51,14,"Save" ,0,1,SDLK_LAST); // 18
// Bouton Close // Bouton Close
Fenetre_Definir_bouton_normal(250,163, 51,14,"Close" ,0,1,SDLK_ESCAPE); // 19 Fenetre_Definir_bouton_normal(250,163, 51,14,"Close" ,0,1,TOUCHE_ESC); // 19
// Jauges de sensibilité de la souris (X puis Y) // Jauges de sensibilité de la souris (X puis Y)
Fenetre_Definir_bouton_scroller(265,99,56,255,1,0); // 20 Fenetre_Definir_bouton_scroller(265,99,56,255,1,0); // 20
@ -1186,7 +1186,7 @@ void Bouton_Copy_page(void)
Fenetre_Definir_bouton_normal(10, 54,148,14,"Palette only" , 1,1,SDLK_p); // 3 Fenetre_Definir_bouton_normal(10, 54,148,14,"Palette only" , 1,1,SDLK_p); // 3
Fenetre_Definir_bouton_normal(10, 71,148,14,"Some colors only" , 6,1,SDLK_c); // 4 Fenetre_Definir_bouton_normal(10, 71,148,14,"Some colors only" , 6,1,SDLK_c); // 4
Fenetre_Definir_bouton_normal(10, 88,148,14,"Palette and remap",13,1,SDLK_r); // 5 Fenetre_Definir_bouton_normal(10, 88,148,14,"Palette and remap",13,1,SDLK_r); // 5
Fenetre_Definir_bouton_normal(44,114, 80,14,"Cancel" , 0,1,SDLK_ESCAPE); // 6 Fenetre_Definir_bouton_normal(44,114, 80,14,"Cancel" , 0,1,TOUCHE_ESC); // 6
Display_Window(168,137); Display_Window(168,137);
Afficher_curseur(); Afficher_curseur();
@ -1394,7 +1394,7 @@ void Bouton_Resol(void)
Print_dans_fenetre(196,170,"Unsupported" ,CM_Fonce,CM_Clair); Print_dans_fenetre(196,170,"Unsupported" ,CM_Fonce,CM_Clair);
Fenetre_Definir_bouton_normal(223, 18,67,14,"OK" ,0,1,SDLK_RETURN); // 1 Fenetre_Definir_bouton_normal(223, 18,67,14,"OK" ,0,1,SDLK_RETURN); // 1
Fenetre_Definir_bouton_normal(223, 35,67,14,"Cancel" ,0,1,SDLK_ESCAPE); // 2 Fenetre_Definir_bouton_normal(223, 35,67,14,"Cancel" ,0,1,TOUCHE_ESC); // 2
Fenetre_Definir_bouton_saisie( 60, 35,4); // 3 Fenetre_Definir_bouton_saisie( 60, 35,4); // 3
Bouton_saisie_Width=Fenetre_Liste_boutons_special; Bouton_saisie_Width=Fenetre_Liste_boutons_special;
@ -1699,7 +1699,7 @@ void Bouton_Dessin_Switch_mode(void)
/* NOUVEAU CODE AVEC POPUP (EN COURS DE TEST) *** /* NOUVEAU CODE AVEC POPUP (EN COURS DE TEST) ***
short Bouton_clicke; short Bouton_clicke;
Ouvrir_popup(16,Menu_Ordonnee/Menu_Facteur_X-32,18,50); Ouvrir_popup(16,Menu_Ordonnee/Menu_Facteur_X-32,18,50);
Fenetre_Definir_bouton_normal(1,1,16,16,"A",0,1,SDLK_ESCAPE); // 1 Fenetre_Definir_bouton_normal(1,1,16,16,"A",0,1,TOUCHE_ESC); // 1
Afficher_curseur(); Afficher_curseur();
UpdateRect(16*Menu_Facteur_X,Menu_Ordonnee-32*Menu_Facteur_X,18*Menu_Facteur_X,50*Menu_Facteur_X); UpdateRect(16*Menu_Facteur_X,Menu_Ordonnee-32*Menu_Facteur_X,18*Menu_Facteur_X,50*Menu_Facteur_X);
@ -1923,7 +1923,7 @@ void Bouton_Degrades(void)
Degrade_Dessiner_bouton_de_technique(8,92,Degrade_Tableau[Degrade_Courant].Technique); Degrade_Dessiner_bouton_de_technique(8,92,Degrade_Tableau[Degrade_Courant].Technique);
Fenetre_Definir_bouton_normal(178,112,51,14,"OK",0,1,SDLK_RETURN); // 6 Fenetre_Definir_bouton_normal(178,112,51,14,"OK",0,1,SDLK_RETURN); // 6
Fenetre_Definir_bouton_normal(123,112,51,14,"Cancel",0,1,SDLK_ESCAPE); // 7 Fenetre_Definir_bouton_normal(123,112,51,14,"Cancel",0,1,TOUCHE_ESC); // 7
Print_dans_fenetre(5,60,"MIX",CM_Fonce,CM_Clair); Print_dans_fenetre(5,60,"MIX",CM_Fonce,CM_Clair);
@ -2191,7 +2191,7 @@ void Bouton_Menu_pinceaux(void)
Fenetre_Afficher_cadre(8,21,294,107); Fenetre_Afficher_cadre(8,21,294,107);
Fenetre_Definir_bouton_normal(122,133,67,14,"Cancel",0,1,SDLK_ESCAPE); // 1 Fenetre_Definir_bouton_normal(122,133,67,14,"Cancel",0,1,TOUCHE_ESC); // 1
for (Indice=0; Indice<NB_SPRITES_PINCEAU; Indice++) for (Indice=0; Indice<NB_SPRITES_PINCEAU; Indice++)
{ {
@ -2508,7 +2508,7 @@ byte Bouton_Load_ou_Save(byte Load, byte Image)
Print_dans_fenetre(46,175+FILENAMESPACE,Principal_Commentaire,CM_Noir,CM_Clair); Print_dans_fenetre(46,175+FILENAMESPACE,Principal_Commentaire,CM_Noir,CM_Clair);
} }
Fenetre_Definir_bouton_normal(125,139+FILENAMESPACE,51,14,"Cancel",0,1,SDLK_ESCAPE); // 2 Fenetre_Definir_bouton_normal(125,139+FILENAMESPACE,51,14,"Cancel",0,1,TOUCHE_ESC); // 2
Fenetre_Definir_bouton_normal(125, 89+FILENAMESPACE,51,14,"Delete",0,1,SDLK_DELETE); // 3 Fenetre_Definir_bouton_normal(125, 89+FILENAMESPACE,51,14,"Delete",0,1,SDLK_DELETE); // 3
// Cadre autour des formats // Cadre autour des formats
@ -2644,7 +2644,7 @@ byte Bouton_Load_ou_Save(byte Load, byte Image)
{ {
SDL_PumpEvents(); SDL_PumpEvents();
Etat_Du_Clavier=SDL_GetKeyState(&Bidon); Etat_Du_Clavier=SDL_GetKeyState(&Bidon);
} while ((Etat_Du_Clavier[SDLK_y]==0) && (Etat_Du_Clavier[SDLK_n]==0) && (Etat_Du_Clavier[SDLK_ESCAPE]==0)); } while ((Etat_Du_Clavier[SDLK_y]==0) && (Etat_Du_Clavier[SDLK_n]==0) && (Etat_Du_Clavier[TOUCHE_ESC]==0));
// On efface la demande de confirmation // On efface la demande de confirmation
Block(Fenetre_Pos_X+127*Menu_Facteur_X,Fenetre_Pos_Y+(107+FILENAMESPACE)*Menu_Facteur_Y, Block(Fenetre_Pos_X+127*Menu_Facteur_X,Fenetre_Pos_Y+(107+FILENAMESPACE)*Menu_Facteur_Y,
@ -3885,7 +3885,7 @@ void Bouton_Menu_Loupe(void)
Ouvrir_fenetre(141,114,"Zoom factors"); Ouvrir_fenetre(141,114,"Zoom factors");
Fenetre_Definir_bouton_normal(45,88,51,14,"Cancel",0,1,SDLK_ESCAPE); // 1 Fenetre_Definir_bouton_normal(45,88,51,14,"Cancel",0,1,TOUCHE_ESC); // 1
Fenetre_Definir_bouton_normal( 9,25,27,14, "x2",0,Loupe_Facteur!= 2,SDLK_F1); // 2 Fenetre_Definir_bouton_normal( 9,25,27,14, "x2",0,Loupe_Facteur!= 2,SDLK_F1); // 2
Fenetre_Definir_bouton_normal( 41,25,27,14, "x3",0,Loupe_Facteur!= 3,SDLK_F2); // 3 Fenetre_Definir_bouton_normal( 41,25,27,14, "x3",0,Loupe_Facteur!= 3,SDLK_F2); // 3
@ -4009,7 +4009,7 @@ void Bouton_Menu_Grille(void)
Ouvrir_fenetre(133,98,"Grid"); Ouvrir_fenetre(133,98,"Grid");
Fenetre_Definir_bouton_normal(12,72,51,14,"Cancel",0,1,SDLK_ESCAPE); // 1 Fenetre_Definir_bouton_normal(12,72,51,14,"Cancel",0,1,TOUCHE_ESC); // 1
Fenetre_Definir_bouton_normal(70,72,51,14,"OK" ,0,1,SDLK_RETURN); // 2 Fenetre_Definir_bouton_normal(70,72,51,14,"OK" ,0,1,SDLK_RETURN); // 2
Print_dans_fenetre(19,26, "X:",CM_Fonce,CM_Clair); Print_dans_fenetre(19,26, "X:",CM_Fonce,CM_Clair);
@ -4159,7 +4159,7 @@ void Bouton_Brush_FX(void)
Fenetre_Afficher_cadre( 6,83,122,53); Fenetre_Afficher_cadre( 6,83,122,53);
Fenetre_Afficher_cadre(137,83,167,53); Fenetre_Afficher_cadre(137,83,167,53);
Fenetre_Definir_bouton_normal(236,141, 67,14,"Cancel" ,0,1,SDLK_ESCAPE); // 1 Fenetre_Definir_bouton_normal(236,141, 67,14,"Cancel" ,0,1,TOUCHE_ESC); // 1
Fenetre_Definir_bouton_normal( 19, 46, 27,14,"X\035" ,0,1,Config_Touche[SPECIAL_FLIP_X]); // 2 Fenetre_Definir_bouton_normal( 19, 46, 27,14,"X\035" ,0,1,Config_Touche[SPECIAL_FLIP_X]); // 2
Fenetre_Definir_bouton_normal( 19, 61, 27,14,"Y\022" ,0,1,Config_Touche[SPECIAL_FLIP_Y]); // 3 Fenetre_Definir_bouton_normal( 19, 61, 27,14,"Y\022" ,0,1,Config_Touche[SPECIAL_FLIP_Y]); // 3
Fenetre_Definir_bouton_normal( 58, 46, 37,14,"90°" ,0,1,Config_Touche[SPECIAL_ROTATE_90]); // 4 Fenetre_Definir_bouton_normal( 58, 46, 37,14,"90°" ,0,1,Config_Touche[SPECIAL_ROTATE_90]); // 4
@ -4355,7 +4355,7 @@ void Bouton_Smooth_Menu(void)
Ouvrir_fenetre(142,109,"Smooth"); Ouvrir_fenetre(142,109,"Smooth");
Fenetre_Definir_bouton_normal(82,59,53,14,"Cancel",0,1,SDLK_ESCAPE); // 1 Fenetre_Definir_bouton_normal(82,59,53,14,"Cancel",0,1,TOUCHE_ESC); // 1
Fenetre_Definir_bouton_normal(82,88,53,14,"OK" ,0,1,SDLK_RETURN); // 2 Fenetre_Definir_bouton_normal(82,88,53,14,"OK" ,0,1,SDLK_RETURN); // 2
Fenetre_Afficher_cadre(6,17,130,37); Fenetre_Afficher_cadre(6,17,130,37);
@ -4536,7 +4536,7 @@ void Bouton_Colorize_Menu(void)
Fenetre_Definir_bouton_normal(16,54,108,14,"Additive" ,2,1,SDLK_d); // 3 Fenetre_Definir_bouton_normal(16,54,108,14,"Additive" ,2,1,SDLK_d); // 3
Fenetre_Definir_bouton_normal(16,71,108,14,"Subtractive",1,1,SDLK_s); // 4 Fenetre_Definir_bouton_normal(16,71,108,14,"Subtractive",1,1,SDLK_s); // 4
Fenetre_Definir_bouton_normal(16,94, 51,14,"Cancel" ,0,1,SDLK_ESCAPE); // 5 Fenetre_Definir_bouton_normal(16,94, 51,14,"Cancel" ,0,1,TOUCHE_ESC); // 5
Fenetre_Definir_bouton_normal(73,94, 51,14,"OK" ,0,1,SDLK_RETURN); // 6 Fenetre_Definir_bouton_normal(73,94, 51,14,"OK" ,0,1,SDLK_RETURN); // 6
Num2str(Colorize_Opacite,Chaine,3); Num2str(Colorize_Opacite,Chaine,3);
@ -4626,7 +4626,7 @@ void Bouton_Tiling_Menu(void)
Ouvrir_fenetre(138,79,"Tiling"); Ouvrir_fenetre(138,79,"Tiling");
Fenetre_Definir_bouton_normal(13,55,51,14,"Cancel",0,1,SDLK_ESCAPE); // 1 Fenetre_Definir_bouton_normal(13,55,51,14,"Cancel",0,1,TOUCHE_ESC); // 1
Fenetre_Definir_bouton_normal(74,55,51,14,"OK" ,0,1,SDLK_RETURN); // 2 Fenetre_Definir_bouton_normal(74,55,51,14,"OK" ,0,1,SDLK_RETURN); // 2
Fenetre_Definir_bouton_saisie(91,21,4); // 3 Fenetre_Definir_bouton_saisie(91,21,4); // 3
Bouton_saisie_Decalage_X=Fenetre_Liste_boutons_special; Bouton_saisie_Decalage_X=Fenetre_Liste_boutons_special;
@ -4777,7 +4777,7 @@ void Bouton_Spray_Menu(void)
Ouvrir_fenetre(226,170,"Spray"); Ouvrir_fenetre(226,170,"Spray");
Fenetre_Definir_bouton_normal(110,148,51,14,"Cancel" ,0,1,SDLK_ESCAPE); // 1 Fenetre_Definir_bouton_normal(110,148,51,14,"Cancel" ,0,1,TOUCHE_ESC); // 1
Fenetre_Definir_bouton_normal(166,148,51,14,"OK" ,0,1,SDLK_RETURN); // 2 Fenetre_Definir_bouton_normal(166,148,51,14,"OK" ,0,1,SDLK_RETURN); // 2
Fenetre_Definir_bouton_scroller(178,62,74,50,1,49-Spray_Multi_flow[Couleur_selectionnee]); // 3 Fenetre_Definir_bouton_scroller(178,62,74,50,1,49-Spray_Multi_flow[Couleur_selectionnee]); // 3
@ -5231,7 +5231,7 @@ void Bouton_Trame_Menu(void)
Fenetre_Definir_bouton_special(143,69,80,80); // 1 Fenetre_Definir_bouton_special(143,69,80,80); // 1
Fenetre_Definir_bouton_normal(175,157,51,14,"Cancel",0,1,SDLK_ESCAPE); // 2 Fenetre_Definir_bouton_normal(175,157,51,14,"Cancel",0,1,TOUCHE_ESC); // 2
Fenetre_Definir_bouton_normal(230,157,51,14,"OK" ,0,1,SDLK_RETURN); // 3 Fenetre_Definir_bouton_normal(230,157,51,14,"OK" ,0,1,SDLK_RETURN); // 3
Fenetre_Definir_bouton_normal( 8,157,51,14,"Clear" ,1,1,SDLK_c); // 4 Fenetre_Definir_bouton_normal( 8,157,51,14,"Clear" ,1,1,SDLK_c); // 4
@ -5675,7 +5675,7 @@ void Bouton_Effets(void)
{ {
Bouton_clicke=Fenetre_Bouton_clicke(); Bouton_clicke=Fenetre_Bouton_clicke();
if (Touche==SDLK_ESCAPE) if (Touche==TOUCHE_ESC)
{ {
Bouton_clicke=11; Bouton_clicke=11;
Touche=0; Touche=0;
@ -5990,7 +5990,7 @@ void Bouton_Texte()
Fenetre_Afficher_cadre_creux(7, 105, 275, 52); Fenetre_Afficher_cadre_creux(7, 105, 275, 52);
Fenetre_Definir_bouton_normal(8,160,40,14,"OK",0,1,SDLK_RETURN); // 11 Fenetre_Definir_bouton_normal(8,160,40,14,"OK",0,1,SDLK_RETURN); // 11
Fenetre_Definir_bouton_normal(54,160,60,14,"Cancel",0,1,SDLK_ESCAPE); // 12 Fenetre_Definir_bouton_normal(54,160,60,14,"Cancel",0,1,TOUCHE_ESC); // 12
Display_Window(288,180); Display_Window(288,180);
// Chaine texte // Chaine texte

12
global.h
View File

@ -678,4 +678,16 @@ GFX2_GLOBAL fonction_lecteur Lit_pixel_de_sauvegarde;
********************/ ********************/
GFX2_GLOBAL SDL_Surface * Ecran_SDL; GFX2_GLOBAL SDL_Surface * Ecran_SDL;
GFX2_GLOBAL SDL_Joystick* joystick; GFX2_GLOBAL SDL_Joystick* joystick;
#define TOUCHE_MOUSEMIDDLE (SDLK_LAST+1)
#define TOUCHE_MOUSEWHEELUP (SDLK_LAST+2)
#define TOUCHE_MOUSEWHEELDOWN (SDLK_LAST+3)
#define TOUCHE_BUTTON (SDLK_LAST+4)
#ifdef __gp2x__
#define TOUCHE_ESC (TOUCHE_BUTTON+GP2X_BUTTON_X)
#else
#define TOUCHE_ESC SDLK_ESCAPE
#endif
#endif #endif

6
input.h
View File

@ -20,10 +20,4 @@
*/ */
void Gere_Evenement_SDL(SDL_Event * event); void Gere_Evenement_SDL(SDL_Event * event);
int Get_input(void); int Get_input(void);
#define TOUCHE_MOUSEMIDDLE (SDLK_LAST+1)
#define TOUCHE_MOUSEWHEELUP (SDLK_LAST+2)
#define TOUCHE_MOUSEWHEELDOWN (SDLK_LAST+3)
#define TOUCHE_BUTTON (SDLK_LAST+4)

4
moteur.c
View File

@ -1730,7 +1730,7 @@ short Attendre_click_dans_palette(struct Fenetre_Bouton_palette * Enreg)
} }
} }
if ((Mouse_K==A_DROITE) || (Touche==SDLK_ESCAPE)) if ((Mouse_K==A_DROITE) || (Touche==TOUCHE_ESC))
{ {
Attendre_fin_de_click(); Attendre_fin_de_click();
Effacer_curseur(); Effacer_curseur();
@ -1823,7 +1823,7 @@ void Recuperer_couleur_derriere_fenetre(byte * Couleur, byte * Click)
Ancien_X=Mouse_X; Ancien_X=Mouse_X;
Ancien_Y=Mouse_Y; Ancien_Y=Mouse_Y;
} while (!(Mouse_K || (Touche==SDLK_ESCAPE))); } while (!(Mouse_K || (Touche==TOUCHE_ESC)));
if (Mouse_K) if (Mouse_K)
{ {

4
palette.c
View File

@ -849,7 +849,7 @@ void Bouton_Palette(void)
Print_dans_fenetre(241,41,"to",CM_Fonce,CM_Clair); Print_dans_fenetre(241,41,"to",CM_Fonce,CM_Clair);
Fenetre_Definir_bouton_normal( 6,168,35,14,"Undo" ,1,1,SDLK_u); // 12 Fenetre_Definir_bouton_normal( 6,168,35,14,"Undo" ,1,1,SDLK_u); // 12
Fenetre_Definir_bouton_normal( 62,168,51,14,"Cancel",0,1,SDLK_ESCAPE); // 13 Fenetre_Definir_bouton_normal( 62,168,51,14,"Cancel",0,1,TOUCHE_ESC); // 13
Fenetre_Definir_bouton_normal(117,168,51,14,"OK" ,0,1,SDLK_RETURN); // 14 Fenetre_Definir_bouton_normal(117,168,51,14,"OK" ,0,1,SDLK_RETURN); // 14
Fenetre_Definir_bouton_normal(132,20,83,14,"Used: ???",4,1,SDLK_d);// 15 Fenetre_Definir_bouton_normal(132,20,83,14,"Used: ???",4,1,SDLK_d);// 15
@ -2087,7 +2087,7 @@ void Bouton_Palette_secondaire(void)
Fenetre_Definir_bouton_normal(10,20,180,14,"Colors for best match",12,1,SDLK_b); // 1 Fenetre_Definir_bouton_normal(10,20,180,14,"Colors for best match",12,1,SDLK_b); // 1
Fenetre_Definir_bouton_normal(10,37,180,14,"User's color series" ,14,0,SDLK_s); // 2 Fenetre_Definir_bouton_normal(10,37,180,14,"User's color series" ,14,0,SDLK_s); // 2
Fenetre_Definir_bouton_normal(60,60, 80,14,"Cancel" , 0,1,SDLK_ESCAPE); // 3 Fenetre_Definir_bouton_normal(60,60, 80,14,"Cancel" , 0,1,TOUCHE_ESC); // 3
UpdateRect(Fenetre_Pos_X,Fenetre_Pos_Y,Menu_Facteur_X*200,Menu_Facteur_Y*80); UpdateRect(Fenetre_Pos_X,Fenetre_Pos_Y,Menu_Facteur_X*200,Menu_Facteur_Y*80);

4
readline.c
View File

@ -178,7 +178,7 @@ byte Readline_ex(word Pos_X,word Pos_Y,char * Chaine,byte Taille_affichee,byte T
Taille_affichee*(Menu_Facteur_X<<3),(Menu_Facteur_Y<<3)); Taille_affichee*(Menu_Facteur_X<<3),(Menu_Facteur_Y<<3));
Flush_update(); Flush_update();
while ((Touche_lue!=SDLK_RETURN) && (Touche_lue!=SDLK_ESCAPE)) while ((Touche_lue!=SDLK_RETURN) && (Touche_lue!=TOUCHE_ESC))
{ {
Touche_lue=Get_key(); Touche_lue=Get_key();
switch (Touche_lue) switch (Touche_lue)
@ -258,7 +258,7 @@ byte Readline_ex(word Pos_X,word Pos_Y,char * Chaine,byte Taille_affichee,byte T
case SDLK_RETURN : case SDLK_RETURN :
break; break;
case SDLK_ESCAPE : case TOUCHE_ESC :
// On restaure la chaine initiale // On restaure la chaine initiale
strcpy(Chaine,Chaine_initiale); strcpy(Chaine,Chaine_initiale);
Taille=strlen(Chaine); Taille=strlen(Chaine);

6
shade.c
View File

@ -357,7 +357,7 @@ short Attendre_click_dans_shade()
Case_choisie=(((((Mouse_Y-Fenetre_Pos_Y)/Menu_Facteur_Y)-127)/7)<<6)+ Case_choisie=(((((Mouse_Y-Fenetre_Pos_Y)/Menu_Facteur_Y)-127)/7)<<6)+
((((Mouse_X-Fenetre_Pos_X)/Menu_Facteur_X)-8 )>>2); ((((Mouse_X-Fenetre_Pos_X)/Menu_Facteur_X)-8 )>>2);
if ((Mouse_K==A_DROITE) || (Touche==SDLK_ESCAPE)) if ((Mouse_K==A_DROITE) || (Touche==TOUCHE_ESC))
Case_choisie=512; // valeur indiquant que l'on n'a rien choisi Case_choisie=512; // valeur indiquant que l'on n'a rien choisi
} }
@ -471,7 +471,7 @@ int Menu_Shade(void)
Fenetre_Definir_bouton_special(8,127,256,53); // 3 Fenetre_Definir_bouton_special(8,127,256,53); // 3
// Déclaration & tracé des boutons de sortie // Déclaration & tracé des boutons de sortie
Fenetre_Definir_bouton_normal(207,17,51,14,"Cancel",0,1,SDLK_ESCAPE); // 4 Fenetre_Definir_bouton_normal(207,17,51,14,"Cancel",0,1,TOUCHE_ESC); // 4
Fenetre_Definir_bouton_normal(261,17,43,14,"OK" ,0,1,SDLK_RETURN); // 5 Fenetre_Definir_bouton_normal(261,17,43,14,"OK" ,0,1,SDLK_RETURN); // 5
// Déclaration & tracé des boutons de copie de shade // Déclaration & tracé des boutons de copie de shade
@ -1042,7 +1042,7 @@ void Bouton_Quick_shade_Menu(void)
Ouvrir_fenetre(142,56,"Quick-shade"); Ouvrir_fenetre(142,56,"Quick-shade");
Fenetre_Definir_bouton_normal(76,36,60,14,"OK",0,1,SDLK_RETURN); // 1 Fenetre_Definir_bouton_normal(76,36,60,14,"OK",0,1,SDLK_RETURN); // 1
Fenetre_Definir_bouton_normal( 6,36,60,14,"Cancel",0,1,SDLK_ESCAPE); // 2 Fenetre_Definir_bouton_normal( 6,36,60,14,"Cancel",0,1,TOUCHE_ESC); // 2
Fenetre_Definir_bouton_normal(76,18,60,14,"",0,1,SDLK_TAB); // 3 Fenetre_Definir_bouton_normal(76,18,60,14,"",0,1,SDLK_TAB); // 3
Afficher_mode_du_shade(83,21,Quick_shade_Loop); Afficher_mode_du_shade(83,21,Quick_shade_Loop);

4
windows.c
View File

@ -696,7 +696,7 @@ byte Demande_de_confirmation(char * Message)
{ {
Bouton_clicke=Fenetre_Bouton_clicke(); Bouton_clicke=Fenetre_Bouton_clicke();
if (Touche==SDLK_RETURN) Bouton_clicke=1; if (Touche==SDLK_RETURN) Bouton_clicke=1;
if (Touche==SDLK_ESCAPE) Bouton_clicke=2; if (Touche==TOUCHE_ESC) Bouton_clicke=2;
} }
while (Bouton_clicke<=0); while (Bouton_clicke<=0);
Touche=0; Touche=0;
@ -728,7 +728,7 @@ void Warning_message(char * Message)
do do
Bouton_clicke=Fenetre_Bouton_clicke(); Bouton_clicke=Fenetre_Bouton_clicke();
while ((Bouton_clicke<=0) && (Touche!=SDLK_ESCAPE) && (Touche!=SDLK_o)); while ((Bouton_clicke<=0) && (Touche!=TOUCHE_ESC) && (Touche!=SDLK_o));
Touche=0; Touche=0;
Fermer_fenetre(); Fermer_fenetre();