From 5a80cdae44e5294ab2b551ffc1165414703951c4 Mon Sep 17 00:00:00 2001 From: Yves Rizoud Date: Mon, 2 Feb 2009 23:09:06 +0000 Subject: [PATCH] Fixed the double icons having their diagonal not shaded on selection. Fixed the Ellipse / Grad ellipse icon graphics (were quite off-centered) Some tidy-up of input.c git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@584 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- boutons.c | 12 ----- gfx2gui.gif | Bin 21080 -> 21032 bytes input.c | 138 +++++++++++++++++++++++++++------------------------- moteur.c | 19 ++++++++ windows.c | 16 ++++-- 5 files changed, 102 insertions(+), 83 deletions(-) diff --git a/boutons.c b/boutons.c index 04292653..38d6ffa0 100644 --- a/boutons.c +++ b/boutons.c @@ -1749,7 +1749,6 @@ void Bouton_Rectangle_plein(void) void Bouton_Cercle_vide(void) { Effacer_curseur(); - Afficher_sprite_dans_menu(BOUTON_CERCLES,10); Demarrer_pile_operation(OPERATION_CERCLE_VIDE); Afficher_curseur(); } @@ -1758,7 +1757,6 @@ void Bouton_Cercle_vide(void) void Bouton_Ellipse_vide(void) { Effacer_curseur(); - Afficher_sprite_dans_menu(BOUTON_CERCLES,11); Demarrer_pile_operation(OPERATION_ELLIPSE_VIDE); Afficher_curseur(); } @@ -1767,7 +1765,6 @@ void Bouton_Ellipse_vide(void) void Bouton_Cercle_plein(void) { Effacer_curseur(); - Afficher_sprite_dans_menu(BOUTON_CERCLES,10); Demarrer_pile_operation(OPERATION_CERCLE_PLEIN); Afficher_curseur(); } @@ -1776,7 +1773,6 @@ void Bouton_Cercle_plein(void) void Bouton_Ellipse_pleine(void) { Effacer_curseur(); - Afficher_sprite_dans_menu(BOUTON_CERCLES,11); Demarrer_pile_operation(OPERATION_ELLIPSE_PLEINE); Afficher_curseur(); } @@ -2107,7 +2103,6 @@ void Bouton_Degrades(void) void Bouton_Cercle_degrade(void) { Effacer_curseur(); - Afficher_sprite_dans_menu(BOUTON_SPHERES,16); Demarrer_pile_operation(OPERATION_CERCLE_DEGRADE); Afficher_curseur(); } @@ -2116,7 +2111,6 @@ void Bouton_Cercle_degrade(void) void Bouton_Ellipse_degrade(void) { Effacer_curseur(); - Afficher_sprite_dans_menu(BOUTON_SPHERES,17); Demarrer_pile_operation(OPERATION_ELLIPSE_DEGRADEE); Afficher_curseur(); } @@ -2137,7 +2131,6 @@ void Bouton_Fill(void) if (Operation_en_cours!=OPERATION_FILL) { Effacer_curseur(); - Afficher_sprite_dans_menu(BOUTON_FLOODFILL,14); if (Operation_en_cours!=OPERATION_REMPLACER) { @@ -2159,7 +2152,6 @@ void Bouton_Remplacer(void) if (Operation_en_cours!=OPERATION_REMPLACER) { Effacer_curseur(); - Afficher_sprite_dans_menu(BOUTON_FLOODFILL,15); if (Operation_en_cours!=OPERATION_FILL) { Pinceau_Forme_avant_fill=Pinceau_Forme; @@ -5538,7 +5530,6 @@ void Bouton_Trame_Menu(void) void Bouton_Polygone(void) { Effacer_curseur(); - Afficher_sprite_dans_menu(BOUTON_POLYGONES,12); Demarrer_pile_operation(OPERATION_POLYGONE); Afficher_curseur(); } @@ -5547,7 +5538,6 @@ void Bouton_Polygone(void) void Bouton_Polyform(void) { Effacer_curseur(); - Afficher_sprite_dans_menu(BOUTON_POLYGONES,13); Demarrer_pile_operation(OPERATION_POLYFORM); Afficher_curseur(); } @@ -5556,7 +5546,6 @@ void Bouton_Polyform(void) void Bouton_Polyfill(void) { Effacer_curseur(); - Afficher_sprite_dans_menu(BOUTON_POLYGONES,12); Demarrer_pile_operation(OPERATION_POLYFILL); Afficher_curseur(); } @@ -5565,7 +5554,6 @@ void Bouton_Polyfill(void) void Bouton_Filled_polyform(void) { Effacer_curseur(); - Afficher_sprite_dans_menu(BOUTON_POLYGONES,13); Demarrer_pile_operation(OPERATION_FILLED_POLYFORM); Afficher_curseur(); } diff --git a/gfx2gui.gif b/gfx2gui.gif index 6bede6aa0fdcbbd6a61d3baf0be0c388ba57c04a..e68c3dcb095f7c2b47a53f4d112b58a5eb6bff67 100644 GIT binary patch delta 16250 zcmV-=KZU^9qyea;0kAd`e=tgoo@~d-=VJd8J)Hbkrz|>jtV*@A%A@73D_S^qNjUtb zo~vv&ae1M{q%}~g%E3x!%GSs{BFr(`%l%WFcT9Aw2C2}dL>B_1?c*yr8ar;p%mx^$ z!HQ9BdWM1)tnl(Qu$(VP#L3mOQ@=XSO*w4lT$Zj!$juzdO1VLof4MYe8l!qeI^k)P z;YcCK{5h*>L>@BDssv2`?2h$JRL5*u32M&4*;YQfuDu3rf_bDN(`#;OC|BvA$Z^p9 zr$$t{ZAJO91v$+0Ui@qA%s9d`@8FYJtGMjg}}V`i8v*P=|oUnm(h+gRO(vGW|xBBiV^UZUov- z6o);J{mqL7%lSje&yCG#1gxhDK?VIog#3_MjWj%%%FzF9o+vFA9(|!Kw1pq-bxwU% z_($G^g4((ae?2-nsfPlUW@LIi&DKTT&Fvc9(ye;^t!30*V8W!7?R?MLJ($J<+;1w$ z;27HYY(e^|e>FWH_$Qu|*Pck^EPFJmJvH3AtVB?$o=PN7WBsP!=Gp4%-~BCUE8c13 zsmrKJ%)VUP(k*-@P1T0&YdOx<3ntlAKEH2$wZrCu+M6u1QbGV>;jMY1C(6RkgAw5_seWzBAKAk4hKYKo2ZQ?i1 zNci*E8;#+l721eg<=Op^9A3x4?Lu8{$+}uVyKQxL|7vxEOf40Gg~8nD6&RLQ7^-bz zZZ!(qf0s_xQVz}yuH~Oy=%6mFlla3ZE

QznZzG}!j`Np<> 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 delta 16299 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 diff --git a/input.c b/input.c index 3df365a3..0faab8d0 100644 --- a/input.c +++ b/input.c @@ -28,8 +28,8 @@ #include "windows.h" #include "erreurs.h" -void Handle_Window_Resize(SDL_Event* event); -void Handle_Window_Exit(SDL_Event* event); +void Handle_Window_Resize(SDL_ResizeEvent event); +void Handle_Window_Exit(SDL_QuitEvent event); byte Directional_up; byte Directional_up_right; @@ -114,42 +114,42 @@ void Gere_Evenement_SDL(SDL_Event * event) // Redimensionnement fenetre if (event->type == SDL_VIDEORESIZE ) { - Handle_Window_Resize(event); + Handle_Window_Resize(event->resize); } // Fermeture if (event->type == SDL_QUIT ) { - Handle_Window_Exit(event); + Handle_Window_Exit(event->quit); } } // WM events management -void Handle_Window_Resize(SDL_Event* event) +void Handle_Window_Resize(SDL_ResizeEvent event) { - Resize_Largeur = event->resize.w; - Resize_Hauteur = event->resize.h; + Resize_Largeur = event.w; + Resize_Hauteur = event.h; } -void Handle_Window_Exit(SDL_Event* event) +void Handle_Window_Exit(__attribute__((unused)) SDL_QuitEvent event) { Quit_demande = 1; } // Mouse events management -int Handle_Mouse_Move(SDL_Event* event) +int Handle_Mouse_Move(SDL_MouseMotionEvent event) { - INPUT_Nouveau_Mouse_X = event->motion.x/Pixel_width; - INPUT_Nouveau_Mouse_Y = event->motion.y/Pixel_height; + INPUT_Nouveau_Mouse_X = event.x/Pixel_width; + INPUT_Nouveau_Mouse_Y = event.y/Pixel_height; return Move_cursor_with_constraints(); } -void Handle_Mouse_Click(SDL_Event* event) +void Handle_Mouse_Click(SDL_MouseButtonEvent event) { - switch(event->button.button) + switch(event.button) { case SDL_BUTTON_LEFT: INPUT_Nouveau_Mouse_K |= 1; @@ -169,9 +169,9 @@ void Handle_Mouse_Click(SDL_Event* event) Move_cursor_with_constraints(); } -void Handle_Mouse_Release(SDL_Event* event) +void Handle_Mouse_Release(SDL_MouseButtonEvent event) { - switch(event->button.button) + switch(event.button) { case SDL_BUTTON_LEFT: INPUT_Nouveau_Mouse_K &= ~1; @@ -190,11 +190,11 @@ void Handle_Mouse_Release(SDL_Event* event) // Keyboard management -int Handle_Key_Press(SDL_Event* event) +int Handle_Key_Press(SDL_KeyboardEvent event) { //Appui sur une touche du clavier - Touche = Conversion_Touche(event->key.keysym); - Touche_ANSI = Conversion_ANSI(event->key.keysym); + Touche = Conversion_Touche(event.keysym); + Touche_ANSI = Conversion_ANSI(event.keysym); if(Touche == Config_Touche[SPECIAL_MOUSE_UP]) { @@ -260,12 +260,12 @@ int Handle_Key_Press(SDL_Event* event) return 0; } -void Handle_Key_Release(SDL_Event* event) +void Handle_Key_Release(SDL_KeyboardEvent event) { int Modifieur; - int ToucheR = Conversion_Touche(event->key.keysym) & 0x0FFF; + int ToucheR = Conversion_Touche(event.keysym) & 0x0FFF; - switch(event->key.keysym.sym) + switch(event.keysym.sym) { case SDLK_RSHIFT: case SDLK_LSHIFT: @@ -319,46 +319,48 @@ void Handle_Key_Release(SDL_Event* event) // Joystick management -void Handle_Joystick_Press(SDL_Event* event) +void Handle_Joystick_Press(SDL_JoyButtonEvent event) { - if (event->jbutton.which==0) // joystick number 0 + if (event.which==0) // joystick number 0 { #ifdef __gp2x__ - switch(event->jbutton.button) + switch(event.button) { - case 0: + #ifndef NO_JOYCURSOR + case GP2X_BUTTON_UP: Directional_up=1; break; - case 7: + case GP2X_BUTTON_UPRIGHT: Directional_up_right=1; break; - case 6: + case GP2X_BUTTON_RIGHT: Directional_right=1; break; - case 5: + case GP2X_BUTTON_DOWNRIGHT: Directional_down_right=1; break; - case 4: + case GP2X_BUTTON_DOWN: Directional_down=1; break; - case 3: + case GP2X_BUTTON_DOWNLEFT: Directional_down_left=1; break; - case 2: + case GP2X_BUTTON_LEFT: Directional_left=1; break; - case 1: + case GP2X_BUTTON_UPLEFT: Directional_up_left=1; break; - case 12: // A + #endif + case GP2X_BUTTON_A: // A INPUT_Nouveau_Mouse_K=1; break; - case 13: // B + case GP2X_BUTTON_B: // B INPUT_Nouveau_Mouse_K=2; break; } #else - switch(event->jbutton.button) + switch(event.button) { case 0: // A INPUT_Nouveau_Mouse_K=1; @@ -371,46 +373,46 @@ void Handle_Joystick_Press(SDL_Event* event) } } -void Handle_Joystick_Release(SDL_Event* event) +void Handle_Joystick_Release(SDL_JoyButtonEvent event) { - if (event->jbutton.which==0) // joystick number 0 + if (event.which==0) // joystick number 0 { #ifdef __gp2x__ - switch(event->jbutton.button) + switch(event.button) { - case 0: + case GP2X_BUTTON_UP: Directional_up=0; break; - case 7: + case GP2X_BUTTON_UPRIGHT: Directional_up_right=0; break; - case 6: + case GP2X_BUTTON_RIGHT: Directional_right=0; break; - case 5: + case GP2X_BUTTON_DOWNRIGHT: Directional_down_right=0; break; - case 4: + case GP2X_BUTTON_DOWN: Directional_down=0; break; - case 3: + case GP2X_BUTTON_DOWNLEFT: Directional_down_left=0; break; - case 2: + case GP2X_BUTTON_LEFT: Directional_left=0; break; - case 1: + case GP2X_BUTTON_UPLEFT: Directional_up_left=0; break; - case 12: // A + case GP2X_BUTTON_A: // A INPUT_Nouveau_Mouse_K &= ~1; break; - case 13: // B + case GP2X_BUTTON_B: // B INPUT_Nouveau_Mouse_K &= ~2; break; } #else - switch(event->jbutton.button) + switch(event.button) { case 0: // A INPUT_Nouveau_Mouse_K &= ~1; @@ -423,30 +425,32 @@ void Handle_Joystick_Release(SDL_Event* event) } } -void Handle_Joystick_Movement(SDL_Event* event) +void Handle_Joystick_Movement(SDL_JoyAxisEvent event) { - if (event->jaxis.which==0) // joystick number 0 + if (event.which==0) // joystick number 0 { - if (event->jaxis.axis==0) // X + #ifndef NO_JOYCURSOR + if (event.axis==0) // X { Directional_right=Directional_left=0; - if (event->jaxis.value<-1000) + if (event.value<-1000) { Directional_left=1; } - else if (event->jaxis.value>1000) + else if (event.value>1000) Directional_right=1; } - else if (event->jaxis.axis==1) // Y + else if (event.axis==1) // Y { Directional_up=Directional_down=0; - if (event->jaxis.value<-1000) + if (event.value<-1000) { Directional_up=1; } - else if (event->jaxis.value>1000) + else if (event.value>1000) Directional_down=1; } + #endif } } @@ -468,50 +472,50 @@ int Get_input(void) switch(event.type) { case SDL_VIDEORESIZE: - Handle_Window_Resize(&event); + Handle_Window_Resize(event.resize); User_Feedback_Required = 1; break; case SDL_QUIT: - Handle_Window_Exit(&event); + Handle_Window_Exit(event.quit); User_Feedback_Required = 1; break; case SDL_MOUSEMOTION: - User_Feedback_Required = Handle_Mouse_Move(&event); + User_Feedback_Required = Handle_Mouse_Move(event.motion); break; case SDL_MOUSEBUTTONDOWN: - Handle_Mouse_Click(&event); + Handle_Mouse_Click(event.button); User_Feedback_Required = 1; break; case SDL_MOUSEBUTTONUP: - Handle_Mouse_Release(&event); + Handle_Mouse_Release(event.button); User_Feedback_Required = 1; break; case SDL_KEYDOWN: - Handle_Key_Press(&event); + Handle_Key_Press(event.key); User_Feedback_Required = 1; break; case SDL_KEYUP: - Handle_Key_Release(&event); + Handle_Key_Release(event.key); break; case SDL_JOYBUTTONUP: - Handle_Joystick_Release(&event); + Handle_Joystick_Release(event.jbutton); User_Feedback_Required = 1; break; case SDL_JOYBUTTONDOWN: - Handle_Joystick_Press(&event); + Handle_Joystick_Press(event.jbutton); User_Feedback_Required = 1; break; case SDL_JOYAXISMOTION: - Handle_Joystick_Movement(&event); + Handle_Joystick_Movement(event.jaxis); break; default: diff --git a/moteur.c b/moteur.c index c641eea0..3948740e 100644 --- a/moteur.c +++ b/moteur.c @@ -347,9 +347,28 @@ void Enclencher_bouton(int Numero,byte Click) { int Famille; int Curseur; + int Icone; Effacer_curseur(); + // Certains boutons ont deux icones + Icone=-1; + switch(Numero) + { + case BOUTON_POLYGONES: + case BOUTON_POLYFILL: + Icone=12;break; + case BOUTON_FLOODFILL: + Icone=14;break; + case BOUTON_CERCLES: + case BOUTON_FILLCERC: + Icone=10;break; + case BOUTON_SPHERES: + Icone=16;break; + } + if (Icone!=-1) + Afficher_sprite_dans_menu(Numero,Icone+(Click==A_DROITE)); + // On note déjà la famille du bouton (La "Famiglia" c'est sacré) Famille=Bouton[Numero].Famille; diff --git a/windows.c b/windows.c index 22fdd499..e99a715f 100644 --- a/windows.c +++ b/windows.c @@ -747,12 +747,20 @@ void Afficher_sprite_dans_menu(int Numero_bouton,int Numero_sprite) word Pos_menu_Y; byte Couleur; - for (Pos_Y=0,Pos_menu_Y=Bouton[Numero_bouton].Decalage_Y+1;Pos_Y