diff --git a/Grafx2.xcodeproj/xx.pbxuser b/Grafx2.xcodeproj/xx.pbxuser index 8a2774d7..f217ee32 100644 --- a/Grafx2.xcodeproj/xx.pbxuser +++ b/Grafx2.xcodeproj/xx.pbxuser @@ -165,8 +165,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 261403593; - PBXWorkspaceStateSaveDate = 261403593; + PBXPerProjectTemplateStateSaveDate = 262786429; + PBXWorkspaceStateSaveDate = 262786429; }; sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */; userBuildSettings = { diff --git a/Grafx2.xcodeproj/xx.perspective b/Grafx2.xcodeproj/xx.perspective index f218db0c..35236725 100644 --- a/Grafx2.xcodeproj/xx.perspective +++ b/Grafx2.xcodeproj/xx.perspective @@ -498,7 +498,7 @@ 418 RubberWindowFrame - 52 -468 1092 651 0 0 1024 746 + 225 -383 1092 651 0 0 1024 746 Module PBXSmartGroupTreeModule @@ -537,7 +537,7 @@ Frame {{0, 0}, {652, 0}} RubberWindowFrame - 52 -468 1092 651 0 0 1024 746 + 225 -383 1092 651 0 0 1024 746 Module PBXNavigatorGroup @@ -568,7 +568,7 @@ Frame {{10, 27}, {652, 578}} RubberWindowFrame - 52 -468 1092 651 0 0 1024 746 + 225 -383 1092 651 0 0 1024 746 Module PBXBuildResultsModule @@ -829,7 +829,7 @@ /Users/xx/Grafx2/Grafx2.xcodeproj WindowString - 52 -468 1092 651 0 0 1024 746 + 225 -383 1092 651 0 0 1024 746 WindowTools diff --git a/graph.c b/graph.c index 1905d44f..56a77d19 100644 --- a/graph.c +++ b/graph.c @@ -978,7 +978,7 @@ void Fill_general(byte fill_color) // -- Tracer général d'un cercle vide ------------------------------------- -void Draw_empy_circle_general(short center_x,short center_y,short radius,byte color) +void Draw_empty_circle_general(short center_x,short center_y,short radius,byte color) { short start_x; short start_y; @@ -1039,19 +1039,19 @@ void Draw_empy_circle_general(short center_x,short center_y,short radius,byte co // -- Tracé définitif d'un cercle vide -- -void Draw_empy_circle_permanent(short center_x,short center_y,short radius,byte color) +void Draw_empty_circle_permanent(short center_x,short center_y,short radius,byte color) { Pixel_figure=Pixel_figure_permanent; - Draw_empy_circle_general(center_x,center_y,radius,color); + Draw_empty_circle_general(center_x,center_y,radius,color); Update_part_of_screen(center_x - radius, center_y - radius, 2* radius+1, 2*radius+1); } // -- Tracer la preview d'un cercle vide -- -void Draw_empy_circle_preview(short center_x,short center_y,short radius,byte color) +void Draw_empty_circle_preview(short center_x,short center_y,short radius,byte color) { Pixel_figure=Pixel_figure_preview; - Draw_empy_circle_general(center_x,center_y,radius,color); + Draw_empty_circle_general(center_x,center_y,radius,color); Update_part_of_screen(center_x - radius, center_y - radius, 2* radius+1, 2*radius+1); } @@ -1060,7 +1060,7 @@ void Draw_empy_circle_preview(short center_x,short center_y,short radius,byte co void Hide_empty_circle_preview(short center_x,short center_y,short radius) { Pixel_figure=Pixel_figure_clear_preview; - Draw_empy_circle_general(center_x,center_y,radius,0); + Draw_empty_circle_general(center_x,center_y,radius,0); Update_part_of_screen(center_x - radius, center_y - radius, 2* radius+1, 2*radius+1); } @@ -1102,7 +1102,7 @@ void Draw_filled_circle(short center_x,short center_y,short radius,byte color) // -- Tracer général d'une ellipse vide ----------------------------------- -void Draw_empy_ellipse_general(short center_x,short center_y,short horizontal_radius,short vertical_radius,byte color) +void Draw_empty_ellipse_general(short center_x,short center_y,short horizontal_radius,short vertical_radius,byte color) { short start_x; short start_y; @@ -1181,19 +1181,19 @@ void Draw_empy_ellipse_general(short center_x,short center_y,short horizontal_ra // -- Tracé définitif d'une ellipse vide -- -void Draw_empy_ellipse_permanent(short center_x,short center_y,short horizontal_radius,short vertical_radius,byte color) +void Draw_empty_ellipse_permanent(short center_x,short center_y,short horizontal_radius,short vertical_radius,byte color) { Pixel_figure=Pixel_figure_permanent; - Draw_empy_ellipse_general(center_x,center_y,horizontal_radius,vertical_radius,color); + Draw_empty_ellipse_general(center_x,center_y,horizontal_radius,vertical_radius,color); Update_part_of_screen(center_x - horizontal_radius, center_y - vertical_radius, 2* horizontal_radius+1, 2*vertical_radius+1); } // -- Tracer la preview d'une ellipse vide -- -void Draw_empy_ellipse_preview(short center_x,short center_y,short horizontal_radius,short vertical_radius,byte color) +void Draw_empty_ellipse_preview(short center_x,short center_y,short horizontal_radius,short vertical_radius,byte color) { Pixel_figure=Pixel_figure_preview; - Draw_empy_ellipse_general(center_x,center_y,horizontal_radius,vertical_radius,color); + Draw_empty_ellipse_general(center_x,center_y,horizontal_radius,vertical_radius,color); Update_part_of_screen(center_x - horizontal_radius, center_y - vertical_radius, 2* horizontal_radius+1, 2*vertical_radius +1); } @@ -1202,7 +1202,7 @@ void Draw_empy_ellipse_preview(short center_x,short center_y,short horizontal_ra void Hide_empty_ellipse_preview(short center_x,short center_y,short horizontal_radius,short vertical_radius) { Pixel_figure=Pixel_figure_clear_preview; - Draw_empy_ellipse_general(center_x,center_y,horizontal_radius,vertical_radius,0); + Draw_empty_ellipse_general(center_x,center_y,horizontal_radius,vertical_radius,0); Update_part_of_screen(center_x - horizontal_radius, center_y - vertical_radius, 2* horizontal_radius+1, 2*vertical_radius+1); } diff --git a/helpfile.h b/helpfile.h index 37dbf0b3..26b186ce 100644 --- a/helpfile.h +++ b/helpfile.h @@ -1,6 +1,7 @@ /* Grafx2 - The Ultimate 256-color bitmap paint program Copyright 2008 Yves Rizoud + Copyright 2009 Franck Charlet Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud) Grafx2 is free software; you can redistribute it and/or @@ -263,21 +264,22 @@ static const T_Help_table helptable_help[] = static const T_Help_table helptable_credits[] = { HELP_TITLE(" GRAFX2 IS CREATED BY") - HELP_BOLD (" SUNSET DESIGN") + HELP_TEXT ("") + HELP_BOLD (" SUNSET DESIGN") HELP_BOLD (" AUTHORS OF GRAFX2.0 BETA 96.5%") HELP_TEXT ("") HELP_TEXT (" Guillaume Dorme alias \"Robinson\" (code)") HELP_TEXT (" Karl Maritaud alias \"X-Man\" (code&gfx)") - HELP_TEXT (" (k.maritaud\100laposte.net)") + HELP_TEXT (" (k.maritaud\100laposte.net)") HELP_TEXT ("") - HELP_TEXT (" Re-licensed GrafX2 under the GPL in 2001") + HELP_TEXT (" Re-licensed GrafX2 under the GPL in 2001") HELP_TEXT ("") - HELP_BOLD (" THE GRAFX2 PROJECT TEAM") + HELP_BOLD (" THE GRAFX2 PROJECT TEAM") HELP_TEXT ("") HELP_TEXT (" Adrien Destugues (pulkomandy\100gmail.com)") HELP_TEXT (" Yves Rizoud (yrizoud\100gmail.com)") HELP_TEXT ("") - HELP_TEXT (" Got the source back to life in 2006") + HELP_TEXT (" Got the source back to life in 2006") HELP_TEXT ("") HELP_BOLD (" ART") HELP_TEXT ("") @@ -287,7 +289,9 @@ static const T_Help_table helptable_credits[] = HELP_TEXT ("") HELP_TEXT (" Pixelled all the graphics") HELP_TEXT ("") + HELP_TEXT ("") HELP_TITLE(" OTHER MACHINES PORTS") + HELP_TEXT ("") HELP_BOLD (" AMIGA OS 4 PORT") HELP_TEXT ("") HELP_TEXT (" Peter Gordon (pete\100petergordon.org.uk)") @@ -320,47 +324,51 @@ static const T_Help_table helptable_credits[] = HELP_TEXT ("") HELP_TEXT (" Made it work on your favourite toaster") HELP_TEXT ("") - HELP_BOLD(" BUGFINDERS") HELP_TEXT ("") - HELP_TEXT (" BDCIron Ced El Topo ") - HELP_TEXT (" fallenblood Frost Grimmy ") - HELP_TEXT (" Gürkan Sengün iLKke keito ") - HELP_TEXT (" kusma Lord Graga mind ") - HELP_TEXT (" MooZ richienyhus TeeEmCee ") - HELP_TEXT (" tempest Timo Kurrpa titus^Rab ") - HELP_TEXT (" Tobé 00ai99 00.rgb.studios") + HELP_TITLE(" BUGFINDERS") + HELP_TEXT ("") + HELP_TEXT (" BDCIron Ced El Topo ") + HELP_TEXT (" fallenblood Frost Grimmy ") + HELP_TEXT (" Gürkan Sengün iLKke keito ") + HELP_TEXT (" kusma Lord Graga mind ") + HELP_TEXT (" MooZ richienyhus TeeEmCee ") + HELP_TEXT (" tempest Timo Kurrpa titus^Rab ") + HELP_TEXT (" Tobé 00ai99 00.rgb.studios") + HELP_TEXT ("") + HELP_TEXT (" Posted the annoying bug reports.") HELP_TEXT ("") - HELP_TEXT (" Posted the annoying bugreports") HELP_TEXT ("") HELP_TITLE(" FILE FORMATS CREDITS") HELP_TEXT ("") - HELP_TEXT (" BMP : Microsoft") - HELP_TEXT (" CEL,KCF : K.O.S. (KISekae Set system)") - HELP_TEXT (" GIF : Compuserve") - HELP_TEXT (" IMG : Bivas (W. Wiedmann?)") - HELP_TEXT (" LBM : Electronic Arts") - HELP_TEXT (" PAL : ermmh... nobody (?)") - HELP_TEXT (" PCX : Z-Soft") - HELP_TEXT (" PI1,PC1 : Degas Elite") - HELP_TEXT (" PKM : Sunset Design") - HELP_TEXT (" PNG : ") - HELP_TEXT (" SCx : Colorix (?)") + HELP_TEXT (" BMP : Microsoft") + HELP_TEXT (" CEL,KCF : K.O.S. (KISekae Set system)") + HELP_TEXT (" GIF : Compuserve") + HELP_TEXT (" IMG : Bivas (W. Wiedmann?)") + HELP_TEXT (" LBM : Electronic Arts") + HELP_TEXT (" PAL : ermmh... nobody (?)") + HELP_TEXT (" PCX : Z-Soft") + HELP_TEXT (" PI1,PC1 : Degas Elite") + HELP_TEXT (" PKM : Sunset Design") + HELP_TEXT (" PNG : W3C") + HELP_TEXT (" SCx : Colorix (?)") HELP_TEXT ("") - HELP_TITLE (" OUR HOMEPAGE") // - HELP_TEXT ("") // - HELP_BOLD("http://grafx2.codegoogle.com") - HELP_TEXT ("") // - HELP_TEXT ("Please report any bug you may find there") HELP_TEXT ("") - HELP_TITLE (" GREETINGS") - HELP_TEXT ("") // - HELP_TEXT ("- To the Pouet.net BBS posters, the #CPC") - HELP_TEXT (" trolls and the bitfellas") - HELP_TEXT ("- To every people who makes the scene alive!") - HELP_TEXT ("- To all guys making nice pixelled pictures") + HELP_TITLE (" OUR HOMEPAGE") + HELP_TEXT ("") + HELP_BOLD (" http://grafx2.codegoogle.com") + HELP_TEXT ("") + HELP_TEXT (" Please report any bug you may find there") + HELP_TEXT ("") + HELP_TEXT ("") + HELP_TITLE (" GREETINGS") + HELP_TEXT ("") + HELP_TEXT (" To the Pouet.net BBS posters, the #CPC") + HELP_TEXT (" trolls and the bitfellas") + HELP_TEXT (" To every people who makes the scene alive!") + HELP_TEXT (" To all guys making nice pixelled pictures") HELP_TEXT (" (with or without GrafX2)") HELP_TEXT ("") - HELP_BOLD ("We send our best regards to...") + HELP_BOLD (" We send our best regards to...") HELP_TEXT ("") HELP_TEXT (" Access Filter Pink") HELP_TEXT (" Ace Fiver Pixel") @@ -411,40 +419,43 @@ static const T_Help_table helptable_credits[] = HELP_TEXT (" Fear Orome Z") HELP_TEXT (" Feather Pahladin Zeb") HELP_TEXT (" Fennec Phar Zebig") + HELP_TEXT ("") HELP_TEXT (" and all #pixel, #demofr and #coders.") HELP_TEXT ("") - HELP_TITLE (" SNAIL MAIL") + HELP_TEXT ("") + HELP_TITLE (" SNAIL MAIL") + HELP_TEXT ("") HELP_TEXT (" (From 2001, current status: unknown)") HELP_TEXT ("") - HELP_TEXT (" GUILLAUME DORME (Robinson)") - HELP_TEXT (" 15, rue de l'observatoire") - HELP_TEXT (" 87000 LIMOGES (FRANCE)") + HELP_TEXT (" GUILLAUME DORME (Robinson)") + HELP_TEXT (" 15, rue de l'observatoire") + HELP_TEXT (" 87000 LIMOGES (FRANCE)") HELP_TEXT ("") - HELP_TEXT (" KARL MARITAUD (X-Man)") - HELP_TEXT (" 10, rue de la Brasserie") - HELP_TEXT (" 87000 LIMOGES (FRANCE)") + HELP_TEXT (" KARL MARITAUD (X-Man)") + HELP_TEXT (" 10, rue de la Brasserie") + HELP_TEXT (" 87000 LIMOGES (FRANCE)") HELP_TEXT ("") HELP_TEXT ("") - HELP_TITLE(" THANKS") + HELP_TITLE(" THANKS") HELP_TEXT ("") - HELP_TEXT (" Some information taken from several docs") - HELP_TEXT (" (PCGPE, Intervue, PC Interdit...) gave us") - HELP_TEXT (" an invaluable help.") + HELP_TEXT (" Some information taken from several docs") + HELP_TEXT (" (PCGPE, Intervue, PC Interdit...)") + HELP_TEXT (" gave us an invaluable help.") HELP_TEXT ("") - HELP_TEXT (" Thanks to Shawn Hargreaves for his") - HELP_TEXT (" filled polygon routine from Allegro v2.2.") + HELP_TEXT (" Thanks to Shawn Hargreaves for his filled") + HELP_TEXT (" polygon routine from Allegro v2.2.") HELP_TEXT ("") - HELP_TEXT (" Thanks to Carlos \"Made\" Pardo for his") - HELP_TEXT (" great GrafX2 logo.") + HELP_TEXT (" Thanks to Carlos \"Made\" Pardo for his") + HELP_TEXT (" great GrafX2 logo.") HELP_TEXT ("") - HELP_TEXT (" This is our very first program compiled") - HELP_TEXT (" with the Gnu C Compiler.") - HELP_TEXT (" A thousand thanks to the authors of") - HELP_TEXT (" this compiler.") + HELP_TEXT (" This is our very first program compiled") + HELP_TEXT (" with the Gnu C Compiler.") + HELP_TEXT (" A thousand thanks to the authors of") + HELP_TEXT (" this compiler.") HELP_TEXT ("") - HELP_TEXT (" We also would like to thank all the") - HELP_TEXT (" people who gave us ideas to improve") - HELP_TEXT (" GrafX2.") + HELP_TEXT (" We also would like to thank all the") + HELP_TEXT (" people who gave us ideas to improve") + HELP_TEXT (" GrafX2.") HELP_TITLE("") }; static const T_Help_table helptable_paintbrush[] = diff --git a/init.c b/init.c index 649f83e0..9728093a 100644 --- a/init.c +++ b/init.c @@ -2,7 +2,7 @@ Copyright 2008 Peter Gordon Copyright 2008 Yves Rizoud - Copyright 2008 Franck Charlet + Copyright 2009 Franck Charlet Copyright 2007 Adrien Destugues Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud) @@ -1471,39 +1471,23 @@ void Init_operations(void) Init_operation(OPERATION_SCROLL,0,4, Scroll_0_4,1); - Init_operation(OPERATION_GRAD_CIRCLE,1,0, - Grad_circle_12_0,1); - Init_operation(OPERATION_GRAD_CIRCLE,2,0, - Grad_circle_12_0,1); - Init_operation(OPERATION_GRAD_CIRCLE,1,6, - Grad_circle_12_6,0); - Init_operation(OPERATION_GRAD_CIRCLE,2,6, - Grad_circle_12_6,0); - Init_operation(OPERATION_GRAD_CIRCLE,0,6, - Grad_circle_0_6,1); - Init_operation(OPERATION_GRAD_CIRCLE,1,8, - Grad_circle_12_8,0); - Init_operation(OPERATION_GRAD_CIRCLE,2,8, - Grad_circle_12_8,0); - Init_operation(OPERATION_GRAD_CIRCLE,0,8, - Grad_circle_or_ellipse_0_8,0); + Init_operation(OPERATION_GRAD_CIRCLE,1,0,Grad_circle_12_0,1); + Init_operation(OPERATION_GRAD_CIRCLE,2,0,Grad_circle_12_0,1); + Init_operation(OPERATION_GRAD_CIRCLE,1,6,Grad_circle_12_6,0); + Init_operation(OPERATION_GRAD_CIRCLE,2,6,Grad_circle_12_6,0); + Init_operation(OPERATION_GRAD_CIRCLE,0,6,Grad_circle_0_6,1); + Init_operation(OPERATION_GRAD_CIRCLE,1,8,Grad_circle_12_8,0); + Init_operation(OPERATION_GRAD_CIRCLE,2,8,Grad_circle_12_8,0); + Init_operation(OPERATION_GRAD_CIRCLE,0,8,Grad_circle_or_ellipse_0_8,0); - Init_operation(OPERATION_GRAD_ELLIPSE,0,8, - Grad_circle_or_ellipse_0_8,0); - Init_operation(OPERATION_GRAD_ELLIPSE,1,0, - Grad_ellipse_12_0,1); - Init_operation(OPERATION_GRAD_ELLIPSE,2,0, - Grad_ellipse_12_0,1); - Init_operation(OPERATION_GRAD_ELLIPSE,1,6, - Grad_ellipse_12_6,0); - Init_operation(OPERATION_GRAD_ELLIPSE,2,6, - Grad_ellipse_12_6,0); - Init_operation(OPERATION_GRAD_ELLIPSE,0,6, - Grad_ellipse_0_6,1); - Init_operation(OPERATION_GRAD_ELLIPSE,1,8, - Grad_ellipse_12_8,1); - Init_operation(OPERATION_GRAD_ELLIPSE,2,8, - Grad_ellipse_12_8,1); + Init_operation(OPERATION_GRAD_ELLIPSE,1,0,Grad_ellipse_12_0,1); + Init_operation(OPERATION_GRAD_ELLIPSE,2,0,Grad_ellipse_12_0,1); + Init_operation(OPERATION_GRAD_ELLIPSE,1,6,Grad_ellipse_12_6,0); + Init_operation(OPERATION_GRAD_ELLIPSE,2,6,Grad_ellipse_12_6,0); + Init_operation(OPERATION_GRAD_ELLIPSE,0,6,Grad_ellipse_0_6,1); + Init_operation(OPERATION_GRAD_ELLIPSE,1,8,Grad_ellipse_12_8,0); + Init_operation(OPERATION_GRAD_ELLIPSE,2,8,Grad_ellipse_12_8,0); + Init_operation(OPERATION_GRAD_ELLIPSE,0,8,Grad_circle_or_ellipse_0_8,0); Init_operation(OPERATION_GRAD_RECTANGLE,1,0,Grad_rectangle_12_0,0); Init_operation(OPERATION_GRAD_RECTANGLE,1,5,Grad_rectangle_12_5,0); diff --git a/operatio.c b/operatio.c index ee0d2bfc..c2bcf090 100644 --- a/operatio.c +++ b/operatio.c @@ -1,6 +1,7 @@ /* Grafx2 - The Ultimate 256-color bitmap paint program Copyright 2007 Adrien Destugues + Copyright 2009 Franck Charlet Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud) Grafx2 is free software; you can redistribute it and/or @@ -1016,7 +1017,7 @@ void Circle_12_5(void) Circle_limit=((Paintbrush_X-center_x)*(Paintbrush_X-center_x))+ ((Paintbrush_Y-center_y)*(Paintbrush_Y-center_y)); radius=sqrt(Circle_limit); - Draw_empy_circle_preview(center_x,center_y,radius,color); + Draw_empty_circle_preview(center_x,center_y,radius,color); Display_cursor(); } @@ -1058,7 +1059,7 @@ void Empty_circle_0_5(void) Paintbrush_shape=Paintbrush_shape_before_operation; - Draw_empy_circle_permanent(center_x,center_y,radius,color); + Draw_empty_circle_permanent(center_x,center_y,radius,color); if ( (Config.Coords_rel) && (Menu_is_visible) ) { @@ -1183,7 +1184,7 @@ void Ellipse_12_5(void) :center_x-Paintbrush_X; vertical_radius =(Paintbrush_Y>center_y)?Paintbrush_Y-center_y :center_y-Paintbrush_Y; - Draw_empy_ellipse_preview(center_x,center_y,horizontal_radius,vertical_radius,color); + Draw_empty_ellipse_preview(center_x,center_y,horizontal_radius,vertical_radius,color); Display_cursor(); } @@ -1227,7 +1228,7 @@ void Empty_ellipse_0_5(void) Paintbrush_shape=Paintbrush_shape_before_operation; - Draw_empy_ellipse_permanent(center_x,center_y,horizontal_radius,vertical_radius,color); + Draw_empty_ellipse_permanent(center_x,center_y,horizontal_radius,vertical_radius,color); if ( (Config.Coords_rel) && (Menu_is_visible) ) { @@ -3851,7 +3852,7 @@ void Grad_circle_12_6(void) Circle_limit=((Paintbrush_X-center_x)*(Paintbrush_X-center_x))+ ((Paintbrush_Y-center_y)*(Paintbrush_Y-center_y)); radius=sqrt(Circle_limit); - Draw_empy_circle_preview(center_x,center_y,radius,color); + Draw_empty_circle_preview(center_x,center_y,radius,color); Display_cursor(); } @@ -4102,7 +4103,7 @@ void Grad_ellipse_12_6(void) :center_x-Paintbrush_X; vertical_radius =(Paintbrush_Y>center_y)?Paintbrush_Y-center_y :center_y-Paintbrush_Y; - Draw_empy_ellipse_preview(center_x,center_y,horizontal_radius,vertical_radius,color); + Draw_empty_ellipse_preview(center_x,center_y,horizontal_radius,vertical_radius,color); Display_cursor(); } @@ -4218,6 +4219,7 @@ void Grad_ellipse_12_8(void) Operation_pop(&color); Operation_pop(&old_mouse_k); + Hide_cursor(); // On efface la croix XOR au centre de l'ellipse Draw_curve_cross(center_x,center_y); @@ -4233,6 +4235,8 @@ void Grad_ellipse_12_8(void) if (Mouse_K==old_mouse_k) Draw_grad_ellipse(center_x,center_y,horizontal_radius,vertical_radius,Paintbrush_X,Paintbrush_Y); + Display_cursor(); + Wait_end_of_click(); if ((Config.Coords_rel) && (Menu_is_visible))