diff --git a/cfg_new/gfxcfg.c b/cfg_new/gfxcfg.c index 182c1629..32269c8c 100644 --- a/cfg_new/gfxcfg.c +++ b/cfg_new/gfxcfg.c @@ -18,6 +18,11 @@ typedef uint8_t byte; typedef uint16_t word; typedef uint32_t dword; +// Modificateurs pour Touche +#define MOD_SHIFT 0x1000 +#define MOD_CTRL 0x2000 +#define MOD_ALT 0x4000 + #include "../clavier.h" /*** Constants ***/ @@ -218,51 +223,51 @@ bool Initialiser_config() Definir_option(4,"Faster scroll up", "Used to scroll upwards in the picture fast, either in magnify and normal", "mode.", - true,SDLK_UP|0x1000); /*Shift + Haut*/ + true,SDLK_UP|MOD_SHIFT); /*Shift + Haut*/ Definir_option(5,"Faster scroll down", "Used to scroll downwards in the picture fast, either in magnify and normal", "mode.", - true,SDLK_DOWN|0x1000); /*Shift + Bas*/ + true,SDLK_DOWN|MOD_SHIFT); /*Shift + Bas*/ Definir_option(6,"Faster scroll left", "Used to scroll to the left in the picture fast, either in magnify and normal", "mode.", - true,SDLK_LEFT|0x1000); /*Shift + Gauche*/ + true,SDLK_LEFT|MOD_SHIFT); /*Shift + Gauche*/ Definir_option(7,"Faster scroll right", "Used to scroll to the right in the picture fast, either in magnify and", "normal mode.", - true,SDLK_RIGHT|0x1000); /*Shift + Droite*/ + true,SDLK_RIGHT|MOD_SHIFT); /*Shift + Droite*/ Definir_option(8,"Slower scroll up", "Used to scroll upwards in the picture pixel by pixel, either in magnify and", "normal mode.", - true,SDLK_UP|0x4000); /*Alt + Haut*/ + true,SDLK_UP|MOD_ALT); /*Alt + Haut*/ Definir_option(9,"Slower scroll down", "Used to scroll downwards in the picture pixel by pixel, either in magnify and", "normal mode.", - true,SDLK_DOWN|0x4000); /*Alt + Bas*/ + true,SDLK_DOWN|MOD_ALT); /*Alt + Bas*/ Definir_option(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|0x4000); /*Alt + Gauche*/ + true,SDLK_LEFT|MOD_ALT); /*Alt + Gauche*/ Definir_option(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|0x4000); /*Alt + Droite*/ + true,SDLK_RIGHT|MOD_ALT); /*Alt + Droite*/ Definir_option(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|0x2000); /*Ctrl + Haut*/ + true,SDLK_UP|MOD_CTRL); /*Ctrl + Haut*/ Definir_option(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|0x2000); /*Ctrl + Bas*/ + true,SDLK_DOWN|MOD_CTRL); /*Ctrl + Bas*/ Definir_option(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|0x2000); /*Ctrl + Gauche*/ + true,SDLK_LEFT|MOD_CTRL); /*Ctrl + Gauche*/ Definir_option(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|0x2000); /*Ctrl + Droite*/ + true,SDLK_RIGHT|MOD_CTRL); /*Ctrl + Droite*/ Definir_option(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.", @@ -270,7 +275,7 @@ bool Initialiser_config() Definir_option(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|0x1000); /*Shift + Space*/ + true,SDLK_SPACE|MOD_SHIFT); /*Shift + Space*/ Definir_option(18,"Show/hide option menu", "Switch the tool bar display on/off.", "This hot-key cannot be removed.", @@ -290,7 +295,7 @@ bool Initialiser_config() Definir_option(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|0x1000); /*Shift + F4*/ + true,SDLK_F4|MOD_SHIFT); /*Shift + F4*/ Definir_option(23,"Freehand drawing", "Set the drawing mode to the classical freehand one.", "", @@ -298,11 +303,11 @@ bool Initialiser_config() Definir_option(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|0x1000); /*Shift + D*/ + true,SDLK_d|MOD_SHIFT); /*Shift + D*/ Definir_option(25,"Continuous freehand drawing", "Switch directly to continuous freehand drawing mode.", "", - true,SDLK_d|0x2000); /*Ctrl + D*/ + true,SDLK_d|MOD_CTRL); /*Ctrl + D*/ Definir_option(26,"Line", "Allows you to draw lines.", "", @@ -310,7 +315,7 @@ bool Initialiser_config() Definir_option(27,"Knotted lines", "Allows you to draw linked lines.", "This mode can also be called \"Polyline\".", - true,SDLK_l|0x1000); /*Shift + L*/ + true,SDLK_l|MOD_SHIFT); /*Shift + L*/ Definir_option(28,"Spray", "Allows you to spray brushes randomly in the picture.", "", @@ -318,7 +323,7 @@ bool Initialiser_config() Definir_option(29,"Spray menu", "Opens a menu in which you can configure the spray flow and size.", "", - true,SDLK_a|0x1000); /*Shift + A*/ + true,SDLK_a|MOD_SHIFT); /*Shift + A*/ Definir_option(30,"Flood-fill", "Allows you to fill an area of the picture made of pixels of the same color.", "", @@ -326,7 +331,7 @@ bool Initialiser_config() Definir_option(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|0x1000); /*Shift + F*/ + true,SDLK_f|MOD_SHIFT); /*Shift + F*/ Definir_option(31,"Bézier""s curves", "Allows you to draw Bézier""s curves.", "", @@ -334,7 +339,7 @@ bool Initialiser_config() Definir_option(32,"Bézier""s curve with 3 or 4 points", "Allows you to choose whether you want to draw Bézier""s curves with 3 or 4", "points.", - true,SDLK_i|0x1000); /*Shift + I*/ + true,SDLK_i|MOD_SHIFT); /*Shift + I*/ Definir_option(33,"Empty rectangle", "Allows you to draw a rectangle using the brush.", "", @@ -342,7 +347,7 @@ bool Initialiser_config() Definir_option(34,"Filled rectangle", "Allows you to draw a filled rectangle.", "", - true,SDLK_r|0x1000); /*Shift + R*/ + true,SDLK_r|MOD_SHIFT); /*Shift + R*/ Definir_option(35,"Empty circle", "Allows you to draw a circle using the brush.", "", @@ -350,15 +355,15 @@ bool Initialiser_config() Definir_option(36,"Empty ellipse", "Allows you to draw an ellipse using the brush.", "", - true,SDLK_c|0x2000); /*Ctrl + C*/ + true,SDLK_c|MOD_CTRL); /*Ctrl + C*/ Definir_option(37,"Filled circle", "Allows you to draw a filled circle.", "", - true,SDLK_c|0x1000); /*Shift + C*/ + true,SDLK_c|MOD_SHIFT); /*Shift + C*/ Definir_option(38,"Filled ellipse", "Allows you to draw a filled ellipse.", "", - true,SDLK_c|0x1000|0x2000); /*Shift + Ctrl + C*/ + true,SDLK_c|MOD_SHIFT|MOD_CTRL); /*Shift + Ctrl + C*/ Definir_option(39,"Empty polygon", "Allows you to draw a polygon using the brush.", "", @@ -366,31 +371,31 @@ bool Initialiser_config() Definir_option(40,"Empty \"polyform\"", "Allows you to draw a freehand polygon using the brush.", "", - true,SDLK_n|0x2000); /*Ctrl + N*/ + true,SDLK_n|MOD_CTRL); /*Ctrl + N*/ Definir_option(41,"Filled polygon", "Allows you to draw a filled polygon.", "", - true,SDLK_n|0x1000); /*Shift + N*/ + true,SDLK_n|MOD_SHIFT); /*Shift + N*/ Definir_option(42,"Filled \"polyform\"", "Allows you to draw a filled freehand polygon.", "", - true,SDLK_n|0x1000|0x2000); /*Shift + Ctrl + N*/ + true,SDLK_n|MOD_SHIFT|MOD_CTRL); /*Shift + Ctrl + N*/ Definir_option(43,"Rectangle with gradation", "Allows you to draw a rectangle with a color gradation.", "", - true,SDLK_r|0x4000); /*Alt + R*/ + true,SDLK_r|MOD_ALT); /*Alt + R*/ Definir_option(44,"Gradation menu", "Allows you to configure the way color gradations are calculated.", "", - true,SDLK_g|0x4000); /*Alt + G*/ + true,SDLK_g|MOD_ALT); /*Alt + G*/ Definir_option(45,"Sphere with gradation", "Allows you to draw a rectangle with a color gradation.", "", - true,SDLK_c|0x4000); /*Alt + C*/ + true,SDLK_c|MOD_ALT); /*Alt + C*/ Definir_option(46,"Ellipse with gradation", "Allows you to draw an ellipse filled with a color gradation.", "", - true,SDLK_c|0x1000|0x4000); /*Shift + Alt + C*/ + true,SDLK_c|MOD_SHIFT|MOD_ALT); /*Shift + Alt + C*/ Definir_option(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.", @@ -398,7 +403,7 @@ bool Initialiser_config() Definir_option(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|0x1000); /*Shift + Kpad5*/ + true,SDLK_KP5|MOD_SHIFT); /*Shift + Kpad5*/ Definir_option(49,"Drawing effects", "Opens a menu where you can enable/disable and configure the drawing effects", "listed below.", @@ -410,15 +415,15 @@ bool Initialiser_config() Definir_option(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|0x1000); /*Shift + F5*/ + true,SDLK_F5|MOD_SHIFT); /*Shift + F5*/ Definir_option(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|0x2000); /*Ctrl + F5*/ + true,SDLK_F5|MOD_CTRL); /*Ctrl + F5*/ Definir_option(132,"Quick-shade menu", "Opens a menu where you can define the parameters of the quick-shade mode.", "", - true,SDLK_F5|0x1000|0x2000); /*Shift + Ctrl + F5*/ + true,SDLK_F5|MOD_SHIFT|MOD_CTRL); /*Shift + Ctrl + F5*/ Definir_option(52,"Stencil mode", "Allows you to mask colors that must not be affected when you are drawing.", "", @@ -426,15 +431,15 @@ bool Initialiser_config() Definir_option(53,"Stencil menu", "Opens a menu where you can choose colors masked by the Stencil mode.", "", - true,SDLK_F6|0x1000); /*Shift + F6*/ + true,SDLK_F6|MOD_SHIFT); /*Shift + F6*/ Definir_option(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|0x4000); /*Alt + F6*/ + true,SDLK_F6|MOD_ALT); /*Alt + F6*/ Definir_option(55,"Mask menu", "Opens a menu where you can choose colors for the Mask mode.", "", - true,SDLK_F6|0x1000|0x4000); /*Shift + Alt + F6*/ + true,SDLK_F6|MOD_SHIFT|MOD_ALT); /*Shift + Alt + F6*/ Definir_option(56,"Grid mode", "Force the cursor to snap up grid points.", "", @@ -442,19 +447,19 @@ bool Initialiser_config() Definir_option(57,"Grid menu", "Open a menu where you can configure the grid used by Grid mode.", "", - true,SDLK_g|0x1000); /*Shift + G*/ + true,SDLK_g|MOD_SHIFT); /*Shift + G*/ Definir_option(58,"Sieve mode", "Only draws pixels on certain positions matching with a sieve.", "", - true,SDLK_g|0x2000); /*Ctrl + G*/ + true,SDLK_g|MOD_CTRL); /*Ctrl + G*/ Definir_option(59,"Sieve menu", "Opens a menu where you can configure the sieve.", "", - true,SDLK_g|0x1000|0x2000); /*Shift + Ctrl + G*/ + true,SDLK_g|MOD_SHIFT|MOD_CTRL); /*Shift + Ctrl + G*/ Definir_option(60,"Invert sieve", "Inverts the pattern defined in the Sieve menu.", "", - true,SDLK_g|0x2000|0x4000); /*Ctrl + Alt + G*/ + true,SDLK_g|MOD_CTRL|MOD_ALT); /*Ctrl + Alt + G*/ Definir_option(61,"Colorize mode", "Allows you to colorize the pixels on which your brush is pasted.", "This permits you to make transparency effects.", @@ -462,7 +467,7 @@ bool Initialiser_config() Definir_option(62,"Colorize menu", "Opens a menu where you can give the opacity percentage for Colorize mode.", "", - true,SDLK_F7|0x1000); /*Shift + F7*/ + true,SDLK_F7|MOD_SHIFT); /*Shift + F7*/ Definir_option(63,"Smooth mode", "Soften pixels on which your brush is pasted.", "", @@ -470,19 +475,19 @@ bool Initialiser_config() Definir_option(123,"Smooth menu", "Opens a menu where you can define the Smooth matrix.", "", - true,SDLK_F8|0x1000); /*Shift + F8*/ + true,SDLK_F8|MOD_SHIFT); /*Shift + F8*/ Definir_option(64,"Smear mode", "Smears the pixels when you move your brush on the picture.", "", - true,SDLK_F8|0x4000); /*Alt + F8*/ + true,SDLK_F8|MOD_ALT); /*Alt + F8*/ Definir_option(65,"Tiling mode", "Puts parts of the brush where you draw.", "", - true,SDLK_b|0x4000); /*Alt + B*/ + true,SDLK_b|MOD_ALT); /*Alt + B*/ Definir_option(66,"Tiling menu", "Opens a menu where you can configure the origin of the tiling.", "", - true,SDLK_b|0x1000|0x4000); /*Shift + Alt + B*/ + true,SDLK_b|MOD_SHIFT|MOD_ALT); /*Shift + Alt + B*/ Definir_option(67,"Classical brush grabbing", "Allows you to pick a brush defined within a rectangle.", "", @@ -490,11 +495,11 @@ bool Initialiser_config() Definir_option(68,"\"Lasso\" brush grabbing", "Allows you to pick a brush defined within a freehand polygon.", "", - true,SDLK_b|0x2000); /*Ctrl + B*/ + true,SDLK_b|MOD_CTRL); /*Ctrl + B*/ Definir_option(69,"Get previous brush back", "Restore the last user-defined brush.", "", - true,SDLK_b|0x1000); /*Shift + B*/ + true,SDLK_b|MOD_SHIFT); /*Shift + B*/ Definir_option(70,"Horizontal brush flipping", "Reverse brush horizontally.", "", @@ -510,7 +515,7 @@ bool Initialiser_config() Definir_option(73,"180ø brush rotation", "Rotate the user-defined brush by 180ø.", "", - true,SDLK_z|0x1000); /*Shift + Z*/ + true,SDLK_z|MOD_SHIFT); /*Shift + Z*/ Definir_option(74,"Strech brush", "Allows you to resize the user-defined brush.", "", @@ -518,7 +523,7 @@ bool Initialiser_config() Definir_option(75,"Distort brush", "Allows you to distort the user-defined brush.", "", - true,SDLK_s|0x1000); /*Shift + S*/ + true,SDLK_s|MOD_SHIFT); /*Shift + S*/ Definir_option(76,"Outline brush", "Outlines the user-defined brush with the fore color.", "", @@ -526,7 +531,7 @@ bool Initialiser_config() Definir_option(77,"Nibble brush", "Deletes the borders of the user-defined brush.", "This does the opposite of the Outline option.", - true,SDLK_o|0x1000); /*Shift + O*/ + true,SDLK_o|MOD_SHIFT); /*Shift + O*/ Definir_option(78,"Get colors from brush", "Copy colors of the spare page that are used in the brush.", "", @@ -546,7 +551,7 @@ bool Initialiser_config() Definir_option(82,"Swap foreground/background colors", "Invert foreground and background colors.", "", - true,SDLK_BACKQUOTE|0x1000); /*Shift + `~*/ + true,SDLK_BACKQUOTE|MOD_SHIFT); /*Shift + `~*/ Definir_option(83,"Magnifier mode", "Allows you to zoom into the picture.", "", @@ -554,7 +559,7 @@ bool Initialiser_config() Definir_option(84,"Zoom factor menu", "Opens a menu where you can choose a magnifying factor.", "", - true,SDLK_m|0x1000); /*Shift + M*/ + true,SDLK_m|MOD_SHIFT); /*Shift + M*/ Definir_option(85,"Zoom in", "Increase magnifying factor.", "", @@ -566,7 +571,7 @@ bool Initialiser_config() Definir_option(87,"Brush effects menu", "Opens a menu which proposes different effects on the user-defined brush.", "", - true,SDLK_b|0x2000|0x4000); /*Ctrl + Alt + B*/ + true,SDLK_b|MOD_CTRL|MOD_ALT); /*Ctrl + Alt + B*/ Definir_option(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.", @@ -578,7 +583,7 @@ bool Initialiser_config() Definir_option(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|0x1000); /*Shift + Enter*/ + false,SDLK_RETURN|MOD_SHIFT); /*Shift + Enter*/ Definir_option(91,"Help and credits", "Opens a window where you can get information about the program.", "", @@ -586,7 +591,7 @@ bool Initialiser_config() Definir_option(92,"Statistics", "Displays miscellaneous more or less useful information.", "", - true,SDLK_F1|0x1000); /*Shift + F1*/ + true,SDLK_F1|MOD_SHIFT); /*Shift + F1*/ Definir_option(93,"Jump to spare page", "Swap current page and spare page.", "", @@ -594,7 +599,7 @@ bool Initialiser_config() Definir_option(94,"Copy current page to spare page", "Copy current page to spare page.", "", - true,SDLK_TAB|0x1000); /*Shift + Tab*/ + true,SDLK_TAB|MOD_SHIFT); /*Shift + Tab*/ Definir_option(95,"Save picture as...", "Opens a file-selector that allows you to save your picture with a new", "path-name.", @@ -602,7 +607,7 @@ bool Initialiser_config() Definir_option(96,"Save picture", "Saves your picture with the last name you gave it.", "", - true,SDLK_F2|0x1000); /*Shift + F2*/ + true,SDLK_F2|MOD_SHIFT); /*Shift + F2*/ Definir_option(97,"Load picture", "Opens a file-selector that allows you to load a new picture.", "", @@ -610,19 +615,19 @@ bool Initialiser_config() Definir_option(98,"Re-load picture", "Re-load the current picture.", "This allows you to cancel modifications made since last saving.", - true,SDLK_F3|0x1000); /*Shift + F3*/ + true,SDLK_F3|MOD_SHIFT); /*Shift + F3*/ Definir_option(99,"Save brush", "Opens a file-selector that allows you to save your current user-defined", "brush.", - true,SDLK_F2|0x2000); /*Ctrl + F2*/ + true,SDLK_F2|MOD_CTRL); /*Ctrl + F2*/ Definir_option(100,"Load brush", "Opens a file-selector that allows you to load a brush.", "", - true,SDLK_F3|0x2000); /*Ctrl + F3*/ + true,SDLK_F3|MOD_CTRL); /*Ctrl + F3*/ Definir_option(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|0x1000); /*Shift + F10*/ + true,SDLK_F10|MOD_SHIFT); /*Shift + F10*/ Definir_option(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.", @@ -630,11 +635,11 @@ bool Initialiser_config() Definir_option(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|0x1000); /*Shift + U*/ + true,SDLK_u|MOD_SHIFT); /*Shift + U*/ Definir_option(133,"Kill", "Kills the current page. It actually removes the current page from the list", "of \"Undo\" pages.", - true,SDLK_DELETE|0x1000); /*Shift + Suppr*/ + true,SDLK_DELETE|MOD_SHIFT); /*Shift + Suppr*/ Definir_option(104,"Clear page", "Clears the picture with the first color of the palette (usually black).", "", @@ -642,7 +647,7 @@ bool Initialiser_config() Definir_option(105,"Clear page with backcolor", "Clears the picture with the backcolor.", "", - true,SDLK_BACKSPACE|0x1000); /*Shift + BackSpace*/ + true,SDLK_BACKSPACE|MOD_SHIFT); /*Shift + BackSpace*/ Definir_option(106,"Quit program", "Allows you to leave the program.", "If modifications were not saved, confirmation is asked.", @@ -654,11 +659,11 @@ bool Initialiser_config() Definir_option(125,"Secondary palette menu", "Opens a menu which allows you to define color series and some tagged colors.", "", - true,SDLK_p|0x1000); /*Shift + P*/ + true,SDLK_p|MOD_SHIFT); /*Shift + P*/ Definir_option(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|0x2000); /*Ctrl + P*/ + true,SDLK_p|MOD_CTRL); /*Ctrl + P*/ Definir_option(108,"Scroll palette to the left", "Scroll palette in the tool bar to the left, column by column.", "", @@ -670,31 +675,31 @@ bool Initialiser_config() Definir_option(110,"Scroll palette to the left faster", "Scroll palette in the tool bar to the left, 8 columns by 8 columns.", "", - true,SDLK_PAGEUP|0x1000); /*Shift + PgUp*/ + true,SDLK_PAGEUP|MOD_SHIFT); /*Shift + PgUp*/ Definir_option(111,"Scroll palette to the right faster", "Scroll palette in the tool bar to the right, 8 columns by 8 columns.", "", - true,SDLK_PAGEDOWN|0x1000); /*Shift + PgDn*/ + true,SDLK_PAGEDOWN|MOD_SHIFT); /*Shift + PgDn*/ Definir_option(112,"Center brush attachment point", "Set the attachement of the user-defined brush to its center.", "", - true,SDLK_KP5|0x2000); /*Ctrl + 5 (pavé numérique)*/ + true,SDLK_KP5|MOD_CTRL); /*Ctrl + 5 (pavé numérique)*/ Definir_option(113,"Top-left brush attachment point", "Set the attachement of the user-defined brush to its top-left corner.", "", - true,SDLK_HOME|0x2000); /*Ctrl + 7*/ + true,SDLK_HOME|MOD_CTRL); /*Ctrl + 7*/ Definir_option(114,"Top-right brush attachment point", "Set the attachement of the user-defined brush to its top-right corner.", "", - true,SDLK_PAGEUP|0x2000); /*Ctrl + 9*/ + true,SDLK_PAGEUP|MOD_CTRL); /*Ctrl + 9*/ Definir_option(115,"Bottom-left brush attachment point", "Set the attachement of the user-defined brush to its bottom-left corner.", "", - true,SDLK_END|0x2000); /*Ctrl + 1*/ + true,SDLK_END|MOD_CTRL); /*Ctrl + 1*/ Definir_option(116,"Bottom-right brush attachment point", "Set the attachement of the user-defined brush to its bottom-right corner.", "", - true,SDLK_PAGEDOWN|0x2000); /*Ctrl + 3*/ + true,SDLK_PAGEDOWN|MOD_CTRL); /*Ctrl + 3*/ Definir_option(117,"Next foreground color", "Set the foreground color to the next in the palette.", "", @@ -706,11 +711,11 @@ bool Initialiser_config() Definir_option(119,"Next background color", "Set the background color to the next in the palette.", "", - true,SDLK_RIGHTBRACKET|0x1000); /*Shift + ]*/ + true,SDLK_RIGHTBRACKET|MOD_SHIFT); /*Shift + ]*/ Definir_option(120,"Previous background color", "Set the background color to the previous in the palette.", "", - true,SDLK_LEFTBRACKET|0x1000); /*Shift + [*/ + true,SDLK_LEFTBRACKET|MOD_SHIFT); /*Shift + [*/ Definir_option(126,"Next user-defined forecolor", "Set the foreground color to the next in the user-defined color series.", "", @@ -722,11 +727,11 @@ bool Initialiser_config() Definir_option(128,"Next user-defined backcolor", "Set the background color to the next in the user-defined color series.", "", - true,SDLK_EQUALS|0x1000); /*Shift + "=+"*/ + true,SDLK_EQUALS|MOD_SHIFT); /*Shift + "=+"*/ Definir_option(129,"Previous user-defined backcolor", "Set the background color to the previous in the user-defined color series.", "", - true,SDLK_MINUS|0x1000); /*Shift + "-_" (")ø" en AZERTY*/ + true,SDLK_MINUS|MOD_SHIFT); /*Shift + "-_" (")ø" en AZERTY*/ Definir_option(121,"Shrink paintbrush", "Decrease the width of the paintbrush if it is special circle or square.", "",