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

MOD_CTRL => GFX2_MOD_CTRL, etc.

Browse Source
This commit is contained in:
Thomas Bernard 2019-02-01 20:03:06 +01:00
parent e7bb7c8684
commit 4283fde82a
15 changed files with 194 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/brush_ops.c
View File

@ -962,7 +962,7 @@ void Rotate_brush_1_5(void)
// On corrige les coordonnées de la ligne si la touche shift est appuyée... // On corrige les coordonnées de la ligne si la touche shift est appuyée...
cursor_x = Paintbrush_X; cursor_x = Paintbrush_X;
cursor_y = Paintbrush_Y; cursor_y = Paintbrush_Y;
if(Get_Key_modifiers() & MOD_SHIFT) if(Get_Key_modifiers() & GFX2_MOD_SHIFT)
Clamp_coordinates_regular_angle(Brush_rotation_center_X,Brush_rotation_center_Y,&cursor_x,&cursor_y); Clamp_coordinates_regular_angle(Brush_rotation_center_X,Brush_rotation_center_Y,&cursor_x,&cursor_y);
if ( (cursor_x!=old_x) || (cursor_y!=old_y) || (prev_state!=2) ) if ( (cursor_x!=old_x) || (cursor_y!=old_y) || (prev_state!=2) )
@ -1033,7 +1033,7 @@ void Rotate_brush_0_5(void)
// On corrige les coordonnées de la ligne si la touche shift est appuyée... // On corrige les coordonnées de la ligne si la touche shift est appuyée...
cursor_x = Paintbrush_X; cursor_x = Paintbrush_X;
cursor_y = Paintbrush_Y; cursor_y = Paintbrush_Y;
if(Get_Key_modifiers() & MOD_SHIFT) if(Get_Key_modifiers() & GFX2_MOD_SHIFT)
Clamp_coordinates_regular_angle(Brush_rotation_center_X,Brush_rotation_center_Y,&cursor_x,&cursor_y); Clamp_coordinates_regular_angle(Brush_rotation_center_X,Brush_rotation_center_Y,&cursor_x,&cursor_y);
if ((cursor_x!=old_x) || (cursor_y!=old_y) || (prev_state!=3)) if ((cursor_x!=old_x) || (cursor_y!=old_y) || (prev_state!=3))

6
src/buttons.c
View File

@ -786,8 +786,8 @@ const T_Lookup Lookup_MouseSpeed[] = {
const T_Lookup Lookup_SwapButtons[] = { const T_Lookup Lookup_SwapButtons[] = {
{"None",0}, {"None",0},
{"Control",MOD_CTRL}, {"Control",GFX2_MOD_CTRL},
{"Alt",MOD_ALT}, {"Alt",GFX2_MOD_ALT},
{NULL,-1}, {NULL,-1},
}; };
@ -2588,7 +2588,7 @@ void Button_Gradients(int btn)
Window_set_normal_button(8,20,15,14, Window_set_normal_button(8,20,15,14,
(Main.backups->Pages->Gradients->Range[Current_gradient].Inverse)?"\033":"\032",0,1,KEY_TAB); // 4 (Main.backups->Pages->Gradients->Range[Current_gradient].Inverse)?"\033":"\032",0,1,KEY_TAB); // 4
// Technique // Technique
Window_set_normal_button(8,90,15,14,"",0,1,KEY_TAB|MOD_SHIFT); // 5 Window_set_normal_button(8,90,15,14,"",0,1,KEY_TAB|GFX2_MOD_SHIFT); // 5
Draw_button_gradient_style(8,90,Main.backups->Pages->Gradients->Range[Current_gradient].Technique); Draw_button_gradient_style(8,90,Main.backups->Pages->Gradients->Range[Current_gradient].Technique);
Window_set_normal_button(178,128+12,51,14,"OK",0,1,KEY_RETURN); // 6 Window_set_normal_button(178,128+12,51,14,"OK",0,1,KEY_RETURN); // 6

8
src/buttons_effects.c
View File

@ -1735,10 +1735,10 @@ void Button_Sieve_menu(void)
Window_set_normal_button( 8,46,131,14,"Get from brush" ,1,1,KEY_g); // 6 Window_set_normal_button( 8,46,131,14,"Get from brush" ,1,1,KEY_g); // 6
Window_set_normal_button(142,46,139,14,"Transfer to brush",1,1,KEY_t); // 7 Window_set_normal_button(142,46,139,14,"Transfer to brush",1,1,KEY_t); // 7
Window_set_normal_button(109,114,11,11,"\030",0,1,KEY_UP|MOD_SHIFT); // 8 Window_set_normal_button(109,114,11,11,"\030",0,1,KEY_UP|GFX2_MOD_SHIFT); // 8
Window_set_normal_button(109,138,11,11,"\031",0,1,KEY_DOWN|MOD_SHIFT); // 9 Window_set_normal_button(109,138,11,11,"\031",0,1,KEY_DOWN|GFX2_MOD_SHIFT); // 9
Window_set_normal_button( 97,126,11,11,"\033",0,1,KEY_LEFT|MOD_SHIFT); // 10 Window_set_normal_button( 97,126,11,11,"\033",0,1,KEY_LEFT|GFX2_MOD_SHIFT); // 10
Window_set_normal_button(121,126,11,11,"\032",0,1,KEY_RIGHT|MOD_SHIFT); // 11 Window_set_normal_button(121,126,11,11,"\032",0,1,KEY_RIGHT|GFX2_MOD_SHIFT); // 11
button_bg_color = Window_set_normal_button(109,126,11,11,"" ,0,1,KEY_INSERT); // 12 button_bg_color = Window_set_normal_button(109,126,11,11,"" ,0,1,KEY_INSERT); // 12
Window_rectangle(button_bg_color->Pos_X+2, Window_rectangle(button_bg_color->Pos_X+2,
button_bg_color->Pos_Y+2, button_bg_color->Pos_Y+2,

2
src/engine.c
View File

@ -3289,7 +3289,7 @@ short Window_get_button_shortcut(void)
T_Normal_button * temp; T_Normal_button * temp;
T_Special_button * temp2; T_Special_button * temp2;
if (Key & MOD_SHIFT) if (Key & GFX2_MOD_SHIFT)
Window_attribute1=RIGHT_SIDE; Window_attribute1=RIGHT_SIDE;
else else
Window_attribute1=LEFT_SIDE; Window_attribute1=LEFT_SIDE;

23
src/global.h
View File

@ -104,30 +104,15 @@ GFX2_GLOBAL char Key_Text[32];
#endif #endif
// Keyboard modifiers // Keyboard modifiers
// (Name conflict with windows.h)
#ifdef WIN32
// first include windows.h so it's done and won't overwrite our
// MOD_SHIFT, etc. afterward
#include <windows.h>
#endif
#ifdef MOD_SHIFT
#undef MOD_SHIFT
#endif
#ifdef MOD_CTRL
#undef MOD_CTRL
#endif
#ifdef MOD_ALT
#undef MOD_ALT
#endif
/// Key modifier for SHIFT key. Used as mask in ::Key, for example. /// Key modifier for SHIFT key. Used as mask in ::Key, for example.
#define MOD_SHIFT 0x1000 #define GFX2_MOD_SHIFT 0x1000
/// Key modifier for CONTROL key. Used as mask in ::Key, for example. /// Key modifier for CONTROL key. Used as mask in ::Key, for example.
#define MOD_CTRL 0x2000 #define GFX2_MOD_CTRL 0x2000
/// Key modifier for ALT key. Used as mask in ::Key, for example. /// Key modifier for ALT key. Used as mask in ::Key, for example.
#define MOD_ALT 0x4000 #define GFX2_MOD_ALT 0x4000
/// Key modifier for META key. Used as mask in ::Key, for example. /// Key modifier for META key. Used as mask in ::Key, for example.
#define MOD_META 0x8000 #define GFX2_MOD_META 0x8000
/// Boolean set to true when the OS/window manager requests the application to close. ie: [X] button /// Boolean set to true when the OS/window manager requests the application to close. ie: [X] button
GFX2_GLOBAL byte Quit_is_required; GFX2_GLOBAL byte Quit_is_required;

224
src/hotkeys.c
View File

@ -63,9 +63,9 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
KEY_RIGHT, // DROITE KEY_RIGHT, // DROITE
0}, 0},
#ifdef GCWZERO #ifdef GCWZERO
#define FAST_MOD MOD_CTRL #define FAST_MOD GFX2_MOD_CTRL
#else #else
#define FAST_MOD MOD_SHIFT #define FAST_MOD GFX2_MOD_SHIFT
#endif #endif
{4, {4,
"Faster scroll up", "Faster scroll up",
@ -106,7 +106,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"picture pixel by pixel, either in", "picture pixel by pixel, either in",
"magnify and normal mode.", "magnify and normal mode.",
true, true,
KEY_UP|MOD_ALT, // Alt + Haut KEY_UP|GFX2_MOD_ALT, // Alt + Haut
0}, 0},
{9, {9,
"Slower scroll down", "Slower scroll down",
@ -114,7 +114,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"picture pixel by pixel, either in", "picture pixel by pixel, either in",
"magnify and normal mode.", "magnify and normal mode.",
true, true,
KEY_DOWN|MOD_ALT, // Alt + Bas KEY_DOWN|GFX2_MOD_ALT, // Alt + Bas
0}, 0},
{10, {10,
"Slower scroll left", "Slower scroll left",
@ -122,7 +122,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"picture pixel by pixel, either in", "picture pixel by pixel, either in",
"magnify and normal mode.", "magnify and normal mode.",
true, true,
KEY_LEFT|MOD_ALT, // Alt + Gauche KEY_LEFT|GFX2_MOD_ALT, // Alt + Gauche
0}, 0},
{11, {11,
"Slower scroll right", "Slower scroll right",
@ -130,7 +130,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"picture pixel by pixel, either in", "picture pixel by pixel, either in",
"magnify and normal mode.", "magnify and normal mode.",
true, true,
KEY_RIGHT|MOD_ALT, // Alt + Droite KEY_RIGHT|GFX2_MOD_ALT, // Alt + Droite
0}, 0},
{12, {12,
"Move mouse cursor 1 pixel up", "Move mouse cursor 1 pixel up",
@ -141,7 +141,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
#ifdef GCWZERO #ifdef GCWZERO
KEY_UNKNOWN, KEY_UNKNOWN,
#else #else
KEY_UP|MOD_CTRL, // Ctrl + Haut KEY_UP|GFX2_MOD_CTRL, // Ctrl + Haut
#endif #endif
0}, 0},
{13, {13,
@ -153,7 +153,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
#ifdef GCWZERO #ifdef GCWZERO
KEY_UNKNOWN, KEY_UNKNOWN,
#else #else
KEY_DOWN|MOD_CTRL, // Ctrl + Bas KEY_DOWN|GFX2_MOD_CTRL, // Ctrl + Bas
#endif #endif
0}, 0},
{14, {14,
@ -165,7 +165,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
#ifdef GCWZERO #ifdef GCWZERO
KEY_UNKNOWN, KEY_UNKNOWN,
#else #else
KEY_LEFT|MOD_CTRL, // Ctrl + Gauche KEY_LEFT|GFX2_MOD_CTRL, // Ctrl + Gauche
#endif #endif
0}, 0},
{15, {15,
@ -177,7 +177,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
#ifdef GCWZERO #ifdef GCWZERO
KEY_UNKNOWN, KEY_UNKNOWN,
#else #else
KEY_RIGHT|MOD_CTRL, // Ctrl + Droite KEY_RIGHT|GFX2_MOD_CTRL, // Ctrl + Droite
#endif #endif
0}, 0},
{16, {16,
@ -189,7 +189,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
#ifdef GCWZERO #ifdef GCWZERO
KEY_SPACE, // Space KEY_SPACE, // Space
#else #else
KEY_SPACE|MOD_CTRL, // Ctrl + Space KEY_SPACE|GFX2_MOD_CTRL, // Ctrl + Space
#endif #endif
0}, 0},
{17, {17,
@ -201,7 +201,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
#ifdef GCWZERO #ifdef GCWZERO
KEY_BACKSPACE, // R-shoulderpad KEY_BACKSPACE, // R-shoulderpad
#else #else
KEY_SPACE|MOD_SHIFT, // Shift + Space KEY_SPACE|GFX2_MOD_SHIFT, // Shift + Space
#endif #endif
0}, 0},
{18, {18,
@ -242,7 +242,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"into a single colored one. All non-", "into a single colored one. All non-",
"transparent colors are set to FG.", "transparent colors are set to FG.",
true, true,
KEY_F4|MOD_SHIFT, // Shift + F4 KEY_F4|GFX2_MOD_SHIFT, // Shift + F4
0}, 0},
{23, {23,
"Freehand drawing", "Freehand drawing",
@ -258,7 +258,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"discontinuous, point by point,", "discontinuous, point by point,",
"and contour fill", "and contour fill",
true, true,
KEY_d|MOD_SHIFT, // Shift + D KEY_d|GFX2_MOD_SHIFT, // Shift + D
0}, 0},
{25, {25,
"Continuous freehand drawing", "Continuous freehand drawing",
@ -266,7 +266,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"freehand drawing mode.", "freehand drawing mode.",
"", "",
true, true,
KEY_d|MOD_CTRL, // Ctrl + D KEY_d|GFX2_MOD_CTRL, // Ctrl + D
0}, 0},
{26, {26,
"Line", "Line",
@ -282,7 +282,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"This mode can also be called", "This mode can also be called",
"\"Polyline\".", "\"Polyline\".",
true, true,
KEY_l|MOD_SHIFT, // Shift + L KEY_l|GFX2_MOD_SHIFT, // Shift + L
0}, 0},
{28, {28,
"Spray", "Spray",
@ -298,7 +298,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"configure the spray flow and size.", "configure the spray flow and size.",
"", "",
true, true,
KEY_a|MOD_SHIFT, // Shift + A KEY_a|GFX2_MOD_SHIFT, // Shift + A
0}, 0},
{30, {30,
"Flood-fill", "Flood-fill",
@ -314,7 +314,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"the clicked color to the fore-color", "the clicked color to the fore-color",
"or the back-color.", "or the back-color.",
true, true,
KEY_f|MOD_SHIFT, // Shift + F KEY_f|GFX2_MOD_SHIFT, // Shift + F
0}, 0},
{31, {31,
"Bezier's curves", "Bezier's curves",
@ -330,7 +330,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"want to draw Bezier's curves with", "want to draw Bezier's curves with",
"3 or 4 points.", "3 or 4 points.",
true, true,
KEY_i|MOD_SHIFT, // Shift + I KEY_i|GFX2_MOD_SHIFT, // Shift + I
0}, 0},
{33, {33,
"Empty rectangle", "Empty rectangle",
@ -346,7 +346,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"rectangle.", "rectangle.",
"", "",
true, true,
KEY_r|MOD_SHIFT, // Shift + R KEY_r|GFX2_MOD_SHIFT, // Shift + R
0}, 0},
{35, {35,
"Empty circle", "Empty circle",
@ -362,7 +362,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"the brush.", "the brush.",
"", "",
true, true,
KEY_c|MOD_CTRL, // Ctrl + C KEY_c|GFX2_MOD_CTRL, // Ctrl + C
0}, 0},
{37, {37,
"Filled circle", "Filled circle",
@ -370,7 +370,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
"", "",
true, true,
KEY_c|MOD_SHIFT, // Shift + C KEY_c|GFX2_MOD_SHIFT, // Shift + C
0}, 0},
{38, {38,
"Filled ellipse", "Filled ellipse",
@ -378,7 +378,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
"", "",
true, true,
KEY_c|MOD_SHIFT|MOD_CTRL, // Shift + Ctrl + C KEY_c|GFX2_MOD_SHIFT|GFX2_MOD_CTRL, // Shift + Ctrl + C
0}, 0},
{39, {39,
"Empty polygon", "Empty polygon",
@ -394,7 +394,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"polygon using the brush.", "polygon using the brush.",
"", "",
true, true,
KEY_n|MOD_CTRL, // Ctrl + N KEY_n|GFX2_MOD_CTRL, // Ctrl + N
0}, 0},
{41, {41,
"Filled polygon", "Filled polygon",
@ -402,7 +402,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
"", "",
true, true,
KEY_n|MOD_SHIFT, // Shift + N KEY_n|GFX2_MOD_SHIFT, // Shift + N
0}, 0},
{42, {42,
"Filled \"polyform\"", "Filled \"polyform\"",
@ -410,7 +410,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"polygon.", "polygon.",
"", "",
true, true,
KEY_n|MOD_SHIFT|MOD_CTRL, // Shift + Ctrl + N KEY_n|GFX2_MOD_SHIFT|GFX2_MOD_CTRL, // Shift + Ctrl + N
0}, 0},
{43, {43,
"Rectangle with gradation", "Rectangle with gradation",
@ -418,7 +418,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"a color gradation.", "a color gradation.",
"", "",
true, true,
KEY_r|MOD_ALT, // Alt + R KEY_r|GFX2_MOD_ALT, // Alt + R
0}, 0},
{44, {44,
"Gradation menu", "Gradation menu",
@ -426,7 +426,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"color gradations are calculated.", "color gradations are calculated.",
"", "",
true, true,
KEY_g|MOD_ALT, // Alt + G KEY_g|GFX2_MOD_ALT, // Alt + G
0}, 0},
{45, {45,
"Sphere with gradation", "Sphere with gradation",
@ -434,7 +434,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"a color gradation.", "a color gradation.",
"", "",
true, true,
KEY_c|MOD_ALT, // Alt + C KEY_c|GFX2_MOD_ALT, // Alt + C
0}, 0},
{46, {46,
"Ellipse with gradation", "Ellipse with gradation",
@ -442,7 +442,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"with a color gradation.", "with a color gradation.",
"", "",
true, true,
KEY_c|MOD_SHIFT|MOD_ALT, // Shift + Alt + C KEY_c|GFX2_MOD_SHIFT|GFX2_MOD_ALT, // Shift + Alt + C
0}, 0},
{47, {47,
"Adjust picture", "Adjust picture",
@ -458,7 +458,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
"", "",
true, true,
KEY_KP5|MOD_SHIFT, // Shift + Kpad5 KEY_KP5|GFX2_MOD_SHIFT, // Shift + Kpad5
0}, 0},
{49, {49,
"Drawing effects", "Drawing effects",
@ -482,7 +482,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
"", "",
true, true,
KEY_F5|MOD_SHIFT, // Shift + F5 KEY_F5|GFX2_MOD_SHIFT, // Shift + F5
0}, 0},
{131, {131,
"Quick-shade mode", "Quick-shade mode",
@ -490,7 +490,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"mode.", "mode.",
"", "",
true, true,
KEY_F5|MOD_CTRL, // Ctrl + F5 KEY_F5|GFX2_MOD_CTRL, // Ctrl + F5
0}, 0},
{132, {132,
"Quick-shade menu", "Quick-shade menu",
@ -498,7 +498,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"settings.", "settings.",
"", "",
true, true,
KEY_F5|MOD_SHIFT|MOD_CTRL, // Shift + Ctrl + F5 KEY_F5|GFX2_MOD_SHIFT|GFX2_MOD_CTRL, // Shift + Ctrl + F5
0}, 0},
{52, {52,
"Stencil mode", "Stencil mode",
@ -514,7 +514,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"settings.", "settings.",
"", "",
true, true,
KEY_F6|MOD_SHIFT, // Shift + F6 KEY_F6|GFX2_MOD_SHIFT, // Shift + F6
0}, 0},
{54, {54,
"Mask mode", "Mask mode",
@ -522,7 +522,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
"", "",
true, true,
KEY_F6|MOD_ALT, // Alt + F6 KEY_F6|GFX2_MOD_ALT, // Alt + F6
0}, 0},
{55, {55,
"Mask menu", "Mask menu",
@ -530,7 +530,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
"", "",
true, true,
KEY_F6|MOD_SHIFT|MOD_ALT, // Shift + Alt + F6 KEY_F6|GFX2_MOD_SHIFT|GFX2_MOD_ALT, // Shift + Alt + F6
0}, 0},
{56, {56,
"Grid mode", "Grid mode",
@ -546,7 +546,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"the grid used by Grid mode.", "the grid used by Grid mode.",
"", "",
true, true,
KEY_g|MOD_SHIFT, // Shift + G KEY_g|GFX2_MOD_SHIFT, // Shift + G
0}, 0},
{58, {58,
"Sieve mode", "Sieve mode",
@ -554,7 +554,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
"", "",
true, true,
KEY_g|MOD_CTRL, // Ctrl + G KEY_g|GFX2_MOD_CTRL, // Ctrl + G
0}, 0},
{59, {59,
"Sieve menu", "Sieve menu",
@ -562,7 +562,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"the sieve.", "the sieve.",
"", "",
true, true,
KEY_g|MOD_SHIFT|MOD_CTRL, // Shift + Ctrl + G KEY_g|GFX2_MOD_SHIFT|GFX2_MOD_CTRL, // Shift + Ctrl + G
0}, 0},
{60, {60,
"Invert sieve", "Invert sieve",
@ -570,7 +570,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"Sieve menu.", "Sieve menu.",
"", "",
true, true,
KEY_g|MOD_CTRL|MOD_ALT, // Ctrl + Alt + G KEY_g|GFX2_MOD_CTRL|GFX2_MOD_ALT, // Ctrl + Alt + G
0}, 0},
{61, {61,
"Colorize mode", "Colorize mode",
@ -586,7 +586,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"opacity percentage for Colorize", "opacity percentage for Colorize",
"mode.", "mode.",
true, true,
KEY_F7|MOD_SHIFT, // Shift + F7 KEY_F7|GFX2_MOD_SHIFT, // Shift + F7
0}, 0},
{63, {63,
"Smooth mode", "Smooth mode",
@ -602,7 +602,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"the Smooth matrix.", "the Smooth matrix.",
"", "",
true, true,
KEY_F8|MOD_SHIFT, // Shift + F8 KEY_F8|GFX2_MOD_SHIFT, // Shift + F8
0}, 0},
{64, {64,
"Smear mode", "Smear mode",
@ -610,7 +610,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
"", "",
true, true,
KEY_F8|MOD_ALT, // Alt + F8 KEY_F8|GFX2_MOD_ALT, // Alt + F8
0}, 0},
{65, {65,
"Tiling mode", "Tiling mode",
@ -618,7 +618,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"mode.", "mode.",
"", "",
true, true,
KEY_b|MOD_ALT, // Alt + B KEY_b|GFX2_MOD_ALT, // Alt + B
0}, 0},
{66, {66,
"Tiling menu", "Tiling menu",
@ -626,7 +626,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"the origin of the tiling.", "the origin of the tiling.",
"", "",
true, true,
KEY_b|MOD_SHIFT|MOD_ALT, // Shift + Alt + B KEY_b|GFX2_MOD_SHIFT|GFX2_MOD_ALT, // Shift + Alt + B
0}, 0},
{206, {206,
"Tilemap mode", "Tilemap mode",
@ -652,7 +652,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
true, true,
KEY_b, // B KEY_b, // B
#if defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__) #if defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__)
KEY_C|MOD_META // Right-Amiga + C KEY_C|GFX2_MOD_META // Right-Amiga + C
#else #else
0 0
#endif #endif
@ -663,7 +663,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"within a freehand polygon.", "within a freehand polygon.",
"", "",
true, true,
KEY_b|MOD_CTRL, // Ctrl + B KEY_b|GFX2_MOD_CTRL, // Ctrl + B
0}, 0},
{69, {69,
"Get previous brush back", "Get previous brush back",
@ -671,7 +671,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
"", "",
true, true,
KEY_b|MOD_SHIFT, // Shift + B KEY_b|GFX2_MOD_SHIFT, // Shift + B
0}, 0},
{70, {70,
"Horizontal brush flipping", "Horizontal brush flipping",
@ -703,7 +703,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"180\xb0.", "180\xb0.",
"", "",
true, true,
KEY_z|MOD_SHIFT, // Shift + Z KEY_z|GFX2_MOD_SHIFT, // Shift + Z
0}, 0},
{74, {74,
"Stretch brush", "Stretch brush",
@ -719,7 +719,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"user-defined brush.", "user-defined brush.",
"", "",
true, true,
KEY_s|MOD_SHIFT, // Shift + S KEY_s|GFX2_MOD_SHIFT, // Shift + S
0}, 0},
{76, {76,
"Outline brush", "Outline brush",
@ -735,7 +735,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"user-defined brush.This does the", "user-defined brush.This does the",
"opposite of the Outline option.", "opposite of the Outline option.",
true, true,
KEY_o|MOD_SHIFT, // Shift + O KEY_o|GFX2_MOD_SHIFT, // Shift + O
0}, 0},
{78, {78,
"Get colors from brush", "Get colors from brush",
@ -775,7 +775,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"colors.", "colors.",
"", "",
true, true,
KEY_BACKQUOTE|MOD_SHIFT, // Shift + `~ KEY_BACKQUOTE|GFX2_MOD_SHIFT, // Shift + `~
0}, 0},
{83, {83,
"Magnifier mode", "Magnifier mode",
@ -791,7 +791,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"magnifying factor.", "magnifying factor.",
"", "",
true, true,
KEY_m|MOD_SHIFT, // Shift + M KEY_m|GFX2_MOD_SHIFT, // Shift + M
0}, 0},
{85, {85,
"Zoom in", "Zoom in",
@ -815,7 +815,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"different effects on the", "different effects on the",
"user-defined brush.", "user-defined brush.",
true, true,
KEY_b|MOD_CTRL|MOD_ALT, // Ctrl + Alt + B KEY_b|GFX2_MOD_CTRL|GFX2_MOD_ALT, // Ctrl + Alt + B
0}, 0},
{88, {88,
"Text", "Text",
@ -839,7 +839,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"mode that should work everywhere:", "mode that should work everywhere:",
"usually a 640x400 window.", "usually a 640x400 window.",
false, false,
KEY_RETURN|MOD_SHIFT, // Shift + Enter KEY_RETURN|GFX2_MOD_SHIFT, // Shift + Enter
0}, 0},
{91, {91,
"Help and credits", "Help and credits",
@ -859,7 +859,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"useful information.", "useful information.",
"", "",
true, true,
KEY_F1|MOD_SHIFT, // Shift + F1 KEY_F1|GFX2_MOD_SHIFT, // Shift + F1
0}, 0},
{93, {93,
"Jump to spare page", "Jump to spare page",
@ -879,7 +879,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
"", "",
true, true,
KEY_TAB|MOD_SHIFT, // Shift + Tab KEY_TAB|GFX2_MOD_SHIFT, // Shift + Tab
0}, 0},
{95, {95,
"Save picture as...", "Save picture as...",
@ -889,7 +889,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
true, true,
KEY_F2, // F2 KEY_F2, // F2
#if defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__) #if defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__)
KEY_A|MOD_META // Right-Amiga + A KEY_A|GFX2_MOD_META // Right-Amiga + A
#else #else
0 0
#endif #endif
@ -900,9 +900,9 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"name you gave it.", "name you gave it.",
"", "",
true, true,
KEY_F2|MOD_SHIFT, // Shift + F2 KEY_F2|GFX2_MOD_SHIFT, // Shift + F2
#if defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__) #if defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__)
KEY_S|MOD_META // Right-Amiga + S KEY_S|GFX2_MOD_META // Right-Amiga + S
#else #else
0 0
#endif #endif
@ -915,7 +915,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
true, true,
KEY_F3, // F3 KEY_F3, // F3
#if defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__) #if defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__)
KEY_O|MOD_META // Right-Amiga + O KEY_O|GFX2_MOD_META // Right-Amiga + O
#else #else
0 0
#endif #endif
@ -926,7 +926,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"allows you to cancel modifications", "allows you to cancel modifications",
"made since last saving.", "made since last saving.",
true, true,
KEY_F3|MOD_SHIFT, // Shift + F3 KEY_F3|GFX2_MOD_SHIFT, // Shift + F3
0}, 0},
{99, {99,
"Save brush", "Save brush",
@ -934,7 +934,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"you to save your current", "you to save your current",
"user-defined brush.", "user-defined brush.",
true, true,
KEY_F2|MOD_CTRL, // Ctrl + F2 KEY_F2|GFX2_MOD_CTRL, // Ctrl + F2
0}, 0},
{100, {100,
"Load brush", "Load brush",
@ -942,7 +942,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"you to load a brush.", "you to load a brush.",
"", "",
true, true,
KEY_F3|MOD_CTRL, // Ctrl + F3 KEY_F3|GFX2_MOD_CTRL, // Ctrl + F3
0}, 0},
{101, {101,
"Settings", "Settings",
@ -950,7 +950,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"modify some parameters of the", "modify some parameters of the",
"program.", "program.",
true, true,
KEY_F10|MOD_SHIFT, // Shift + F10 KEY_F10|GFX2_MOD_SHIFT, // Shift + F10
0}, 0},
{102, {102,
"Undo (Oops!)", "Undo (Oops!)",
@ -965,7 +965,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
#elif defined (__WIZ__) #elif defined (__WIZ__)
(KEY_JOYBUTTON+JOY_BUTTON_L) (KEY_JOYBUTTON+JOY_BUTTON_L)
#elif defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__) #elif defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__)
KEY_Z|MOD_META // Right-Amiga + Z KEY_Z|GFX2_MOD_META // Right-Amiga + Z
#else #else
0 0
#endif #endif
@ -977,7 +977,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
"", "",
true, true,
KEY_u|MOD_SHIFT, // Shift + U KEY_u|GFX2_MOD_SHIFT, // Shift + U
// Secondary shortcut is button II on the Caanoo, R on the Wiz, unset on others // Secondary shortcut is button II on the Caanoo, R on the Wiz, unset on others
#if defined (__CAANOO__) #if defined (__CAANOO__)
(KEY_JOYBUTTON+JOY_BUTTON_II) (KEY_JOYBUTTON+JOY_BUTTON_II)
@ -994,7 +994,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"removes the current page from the", "removes the current page from the",
"list of \"Undo\" pages.", "list of \"Undo\" pages.",
true, true,
KEY_DELETE|MOD_SHIFT, // Shift + Suppr KEY_DELETE|GFX2_MOD_SHIFT, // Shift + Suppr
0}, 0},
{104, {104,
"Clear page", "Clear page",
@ -1014,7 +1014,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"current backcolor.", "current backcolor.",
"", "",
true, true,
KEY_BACKSPACE|MOD_SHIFT, // Shift + BackSpace KEY_BACKSPACE|GFX2_MOD_SHIFT, // Shift + BackSpace
0}, 0},
{106, {106,
"Quit program", "Quit program",
@ -1029,7 +1029,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
#elif defined (__WIZ__) #elif defined (__WIZ__)
(KEY_JOYBUTTON+JOY_BUTTON_MENU) (KEY_JOYBUTTON+JOY_BUTTON_MENU)
#eif defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__) #eif defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__)
KEY_Q|MOD_META // Right-Amiga + Q KEY_Q|GFX2_MOD_META // Right-Amiga + Q
#else #else
0 0
#endif #endif
@ -1050,7 +1050,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"define color series and some tagged", "define color series and some tagged",
"colors.", "colors.",
true, true,
KEY_p|MOD_SHIFT, // Shift + P KEY_p|GFX2_MOD_SHIFT, // Shift + P
0}, 0},
{130, {130,
"Exclude colors menu", "Exclude colors menu",
@ -1058,7 +1058,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"define the colors you don't want to", "define the colors you don't want to",
"use in Smooth and Transparency", "use in Smooth and Transparency",
true, true,
KEY_p|MOD_CTRL, // Ctrl + P KEY_p|GFX2_MOD_CTRL, // Ctrl + P
0}, 0},
{108, {108,
"Scroll palette to the left", "Scroll palette to the left",
@ -1082,7 +1082,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"the left, 8 columns by 8 columns.", "the left, 8 columns by 8 columns.",
"", "",
true, true,
KEY_PAGEUP|MOD_SHIFT, // Shift + PgUp KEY_PAGEUP|GFX2_MOD_SHIFT, // Shift + PgUp
0}, 0},
{111, {111,
"Scroll palette to the right faster", "Scroll palette to the right faster",
@ -1090,7 +1090,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"the right, 8 columns by 8 columns.", "the right, 8 columns by 8 columns.",
"", "",
true, true,
KEY_PAGEDOWN|MOD_SHIFT, // Shift + PgDn KEY_PAGEDOWN|GFX2_MOD_SHIFT, // Shift + PgDn
0}, 0},
{112, {112,
"Center brush attachment point", "Center brush attachment point",
@ -1098,7 +1098,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"user-defined brush to its center.", "user-defined brush to its center.",
"", "",
true, true,
KEY_KP5|MOD_CTRL, // Ctrl + 5 (pavé numérique) KEY_KP5|GFX2_MOD_CTRL, // Ctrl + 5 (pavé numérique)
0}, 0},
{113, {113,
"Top-left brush attachment point", "Top-left brush attachment point",
@ -1106,7 +1106,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"user-defined brush to its top-left", "user-defined brush to its top-left",
"corner.", "corner.",
true, true,
KEY_HOME|MOD_CTRL, // Ctrl + 7 KEY_HOME|GFX2_MOD_CTRL, // Ctrl + 7
0}, 0},
{114, {114,
"Top-right brush attachment point", "Top-right brush attachment point",
@ -1114,7 +1114,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"user-defined brush to its top-right", "user-defined brush to its top-right",
"corner.", "corner.",
true, true,
KEY_PAGEUP|MOD_CTRL, // Ctrl + 9 KEY_PAGEUP|GFX2_MOD_CTRL, // Ctrl + 9
0}, 0},
{115, {115,
"Bottom-left brush attachment point", "Bottom-left brush attachment point",
@ -1122,7 +1122,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"user-defined brush to its", "user-defined brush to its",
"bottom-left corner.", "bottom-left corner.",
true, true,
KEY_END|MOD_CTRL, // Ctrl + 1 KEY_END|GFX2_MOD_CTRL, // Ctrl + 1
0}, 0},
{116, {116,
"Bottom-right brush attachment point", "Bottom-right brush attachment point",
@ -1130,7 +1130,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"user-defined brush to its", "user-defined brush to its",
"bottom-right corner.", "bottom-right corner.",
true, true,
KEY_PAGEDOWN|MOD_CTRL, // Ctrl + 3 KEY_PAGEDOWN|GFX2_MOD_CTRL, // Ctrl + 3
0}, 0},
{117, {117,
"Next foreground color", "Next foreground color",
@ -1139,7 +1139,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
true, true,
#ifdef GCWZERO #ifdef GCWZERO
KEY_RIGHT|MOD_SHIFT, KEY_RIGHT|GFX2_MOD_SHIFT,
#else #else
KEY_RIGHTBRACKET, // ] (0x en AZERTY) KEY_RIGHTBRACKET, // ] (0x en AZERTY)
#endif #endif
@ -1151,7 +1151,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
true, true,
#ifdef GCWZERO #ifdef GCWZERO
KEY_LEFT|MOD_SHIFT, KEY_LEFT|GFX2_MOD_SHIFT,
#else #else
KEY_LEFTBRACKET, // [ (^ en AZERTY) KEY_LEFTBRACKET, // [ (^ en AZERTY)
#endif #endif
@ -1163,9 +1163,9 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
true, true,
#ifdef GCWZERO #ifdef GCWZERO
KEY_DOWN|MOD_SHIFT, KEY_DOWN|GFX2_MOD_SHIFT,
#else #else
KEY_RIGHTBRACKET|MOD_SHIFT, // Shift + ] KEY_RIGHTBRACKET|GFX2_MOD_SHIFT, // Shift + ]
#endif #endif
0}, 0},
{120, {120,
@ -1175,9 +1175,9 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
true, true,
#ifdef GCWZERO #ifdef GCWZERO
KEY_UP|MOD_SHIFT, KEY_UP|GFX2_MOD_SHIFT,
#else #else
KEY_LEFTBRACKET|MOD_SHIFT, // Shift + [ KEY_LEFTBRACKET|GFX2_MOD_SHIFT, // Shift + [
#endif #endif
0}, 0},
{126, {126,
@ -1202,7 +1202,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"in the user-defined color series.", "in the user-defined color series.",
"", "",
true, true,
KEY_EQUALS|MOD_SHIFT, // Shift + "=+" KEY_EQUALS|GFX2_MOD_SHIFT, // Shift + "=+"
0}, 0},
{129, {129,
"Previous user-defined backcolor", "Previous user-defined backcolor",
@ -1210,7 +1210,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"previous in the user-defined color", "previous in the user-defined color",
"series.", "series.",
true, true,
KEY_MINUS|MOD_SHIFT, // Shift + "-_" (")°" en AZERTY KEY_MINUS|GFX2_MOD_SHIFT, // Shift + "-_" (")°" en AZERTY
0}, 0},
{121, {121,
"Shrink paintbrush", "Shrink paintbrush",
@ -1234,7 +1234,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"is the same as the 'All off' button", "is the same as the 'All off' button",
"in the Effects screen", "in the Effects screen",
true, true,
KEY_e|MOD_SHIFT, // Shift-E KEY_e|GFX2_MOD_SHIFT, // Shift-E
0}, 0},
{135, {135,
"Transparency 10%", "Transparency 10%",
@ -1322,7 +1322,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
"", "",
true, true,
KEY_1|MOD_CTRL, /* Ctrl + 1 */ KEY_1|GFX2_MOD_CTRL, /* Ctrl + 1 */
0}, 0},
{146, {146,
"Zoom 2:1", "Zoom 2:1",
@ -1330,7 +1330,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"factor to 2:1", "factor to 2:1",
"", "",
true, true,
KEY_2|MOD_CTRL, /* Ctrl + 2 */ KEY_2|GFX2_MOD_CTRL, /* Ctrl + 2 */
0}, 0},
{147, {147,
"Zoom 3:1", "Zoom 3:1",
@ -1338,7 +1338,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"factor to 3:1", "factor to 3:1",
"", "",
true, true,
KEY_3|MOD_CTRL, /* Ctrl + 3 */ KEY_3|GFX2_MOD_CTRL, /* Ctrl + 3 */
0}, 0},
{148, {148,
"Zoom 4:1", "Zoom 4:1",
@ -1346,7 +1346,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"factor to 4:1", "factor to 4:1",
"", "",
true, true,
KEY_4|MOD_CTRL, /* Ctrl + 4 */ KEY_4|GFX2_MOD_CTRL, /* Ctrl + 4 */
0}, 0},
{149, {149,
"Zoom 5:1", "Zoom 5:1",
@ -1354,7 +1354,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"factor to 5:1", "factor to 5:1",
"", "",
true, true,
KEY_5|MOD_CTRL, /* Ctrl + 5 */ KEY_5|GFX2_MOD_CTRL, /* Ctrl + 5 */
0}, 0},
{150, {150,
"Zoom 6:1", "Zoom 6:1",
@ -1362,7 +1362,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"factor to 6:1", "factor to 6:1",
"", "",
true, true,
KEY_6|MOD_CTRL, /* Ctrl + 6 */ KEY_6|GFX2_MOD_CTRL, /* Ctrl + 6 */
0}, 0},
{151, {151,
"Zoom 8:1", "Zoom 8:1",
@ -1370,7 +1370,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"factor to 8:1", "factor to 8:1",
"", "",
true, true,
KEY_7|MOD_CTRL, /* Ctrl + 7 */ KEY_7|GFX2_MOD_CTRL, /* Ctrl + 7 */
0}, 0},
{152, {152,
"Zoom 10:1", "Zoom 10:1",
@ -1378,7 +1378,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"factor to 10:1", "factor to 10:1",
"", "",
true, true,
KEY_8|MOD_CTRL, /* Ctrl + 8 */ KEY_8|GFX2_MOD_CTRL, /* Ctrl + 8 */
0}, 0},
{153, {153,
"Zoom 12:1", "Zoom 12:1",
@ -1426,7 +1426,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"the magnified view. Grid cells match", "the magnified view. Grid cells match",
"the size ", "the size ",
true, true,
KEY_g|MOD_SHIFT|MOD_ALT, // Shift + Alt + G, KEY_g|GFX2_MOD_SHIFT|GFX2_MOD_ALT, // Shift + Alt + G,
0}, 0},
{159, {159,
"Select layer 1", "Select layer 1",
@ -1562,7 +1562,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"active one. The new layer is filled", "active one. The new layer is filled",
"with transparent color.", "with transparent color.",
true, true,
KEY_INSERT|MOD_ALT, // Alt + Insert KEY_INSERT|GFX2_MOD_ALT, // Alt + Insert
0}, 0},
{209, {209,
"Duplicate layer", "Duplicate layer",
@ -1578,7 +1578,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"You can't delete the last", "You can't delete the last",
"layer.", "layer.",
true, true,
KEY_DELETE|MOD_ALT, // Alt + Delete KEY_DELETE|GFX2_MOD_ALT, // Alt + Delete
0}, 0},
{177, {177,
"Merge a layer", "Merge a layer",
@ -1586,7 +1586,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"the one directly below it.", "the one directly below it.",
"", "",
true, true,
KEY_END|MOD_ALT, // Alt + End KEY_END|GFX2_MOD_ALT, // Alt + End
0}, 0},
{178, {178,
"Swap layer (up)", "Swap layer (up)",
@ -1594,7 +1594,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"up the stack. No effect if already", "up the stack. No effect if already",
"on top.", "on top.",
true, true,
KEY_PAGEUP|MOD_ALT, // Alt + PageUp KEY_PAGEUP|GFX2_MOD_ALT, // Alt + PageUp
0}, 0},
{179, {179,
"Swap layer (down)", "Swap layer (down)",
@ -1602,7 +1602,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"down the stack. No effect if already", "down the stack. No effect if already",
"on bottom.", "on bottom.",
true, true,
KEY_PAGEDOWN|MOD_ALT, // Alt + PageDown KEY_PAGEDOWN|GFX2_MOD_ALT, // Alt + PageDown
0}, 0},
{180, {180,
"Layers menu", "Layers menu",
@ -1610,7 +1610,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"to layers and image transparency.", "to layers and image transparency.",
"", "",
true, true,
KEY_HOME|MOD_ALT, // Alt + Home KEY_HOME|GFX2_MOD_ALT, // Alt + Home
0}, 0},
{181, {181,
"Brush factory", "Brush factory",
@ -1634,7 +1634,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"by doubling width and height.", "by doubling width and height.",
"", "",
true, true,
KEY_h|MOD_SHIFT, // Shift+H KEY_h|GFX2_MOD_SHIFT, // Shift+H
0}, 0},
{184, {184,
"Double brush width", "Double brush width",
@ -1642,7 +1642,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"by doubling its width.", "by doubling its width.",
"", "",
true, true,
KEY_x|MOD_SHIFT, // Shift+X KEY_x|GFX2_MOD_SHIFT, // Shift+X
0}, 0},
{185, {185,
"Double brush height", "Double brush height",
@ -1650,7 +1650,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"by doubling its height.", "by doubling its height.",
"", "",
true, true,
KEY_y|MOD_SHIFT, // Shift+Y KEY_y|GFX2_MOD_SHIFT, // Shift+Y
0}, 0},
{186, {186,
"Halve brush size", "Halve brush size",
@ -1746,7 +1746,7 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"cycling, if the current image has", "cycling, if the current image has",
"cycling colors. (See gradient menu)", "cycling colors. (See gradient menu)",
true, true,
KEY_BACKQUOTE|MOD_CTRL, // Ctrl + `~ KEY_BACKQUOTE|GFX2_MOD_CTRL, // Ctrl + `~
0}, 0},
{198, {198,
"Format checker", "Format checker",
@ -1830,16 +1830,16 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
"", "",
"", "",
true, true,
KEY_KP_PLUS|MOD_SHIFT, // Shift++ KEY_KP_PLUS|GFX2_MOD_SHIFT, // Shift++
KEY_MOUSEWHEELUP|MOD_SHIFT}, KEY_MOUSEWHEELUP|GFX2_MOD_SHIFT},
{210, {210,
"Zoom out more", "Zoom out more",
"Increase magnifying factor more.", "Increase magnifying factor more.",
"", "",
"", "",
true, true,
KEY_KP_MINUS|MOD_SHIFT, // Shift+- KEY_KP_MINUS|GFX2_MOD_SHIFT, // Shift+-
KEY_MOUSEWHEELDOWN|MOD_SHIFT}, KEY_MOUSEWHEELDOWN|GFX2_MOD_SHIFT},
}; };
word Ordering[NB_SHORTCUTS]= word Ordering[NB_SHORTCUTS]=

54
src/input.c
View File

@ -777,18 +777,18 @@ static int Handle_key_press(SDL_KeyboardEvent * event)
{ {
case SDLK_RSHIFT: case SDLK_RSHIFT:
case SDLK_LSHIFT: case SDLK_LSHIFT:
modifier=MOD_SHIFT; modifier=GFX2_MOD_SHIFT;
break; break;
case SDLK_RCTRL: case SDLK_RCTRL:
case SDLK_LCTRL: case SDLK_LCTRL:
modifier=MOD_CTRL; modifier=GFX2_MOD_CTRL;
break; break;
case SDLK_RALT: case SDLK_RALT:
case SDLK_LALT: case SDLK_LALT:
case SDLK_MODE: case SDLK_MODE:
modifier=MOD_ALT; modifier=GFX2_MOD_ALT;
break; break;
#if defined(USE_SDL2) #if defined(USE_SDL2)
@ -798,7 +798,7 @@ static int Handle_key_press(SDL_KeyboardEvent * event)
case SDLK_RMETA: case SDLK_RMETA:
case SDLK_LMETA: case SDLK_LMETA:
#endif #endif
modifier=MOD_META; modifier=GFX2_MOD_META;
break; break;
default: default:
@ -829,7 +829,7 @@ int Release_control(int key_code, int modifier)
{ {
int need_feedback = 0; int need_feedback = 0;
if (modifier == MOD_SHIFT) if (modifier == GFX2_MOD_SHIFT)
{ {
// Disable "snap axis" mode // Disable "snap axis" mode
Snap_axis = 0; Snap_axis = 0;
@ -909,24 +909,24 @@ static int Handle_key_release(SDL_KeyboardEvent * event)
{ {
case SDLK_RSHIFT: case SDLK_RSHIFT:
case SDLK_LSHIFT: case SDLK_LSHIFT:
modifier=MOD_SHIFT; modifier=GFX2_MOD_SHIFT;
break; break;
case SDLK_RCTRL: case SDLK_RCTRL:
case SDLK_LCTRL: case SDLK_LCTRL:
modifier=MOD_CTRL; modifier=GFX2_MOD_CTRL;
break; break;
case SDLK_RALT: case SDLK_RALT:
case SDLK_LALT: case SDLK_LALT:
case SDLK_MODE: case SDLK_MODE:
modifier=MOD_ALT; modifier=GFX2_MOD_ALT;
break; break;
#ifdef RSUPER_EMULATES_META_MOD #ifdef RSUPER_EMULATES_META_MOD
case SDLK_RSUPER: case SDLK_RSUPER:
SDL_SetModState(SDL_GetModState() & ~KMOD_META); SDL_SetModState(SDL_GetModState() & ~KMOD_META);
modifier=MOD_META; modifier=GFX2_MOD_META;
break; break;
#endif #endif
@ -937,7 +937,7 @@ static int Handle_key_release(SDL_KeyboardEvent * event)
case SDLK_RMETA: case SDLK_RMETA:
case SDLK_LMETA: case SDLK_LMETA:
#endif #endif
modifier=MOD_META; modifier=GFX2_MOD_META;
break; break;
default: default:
@ -961,7 +961,7 @@ static int Handle_joystick_press(SDL_JoyButtonEvent event)
if (event.button == Joybutton_control) if (event.button == Joybutton_control)
{ {
SDL_SetModState(SDL_GetModState() | KMOD_CTRL); SDL_SetModState(SDL_GetModState() | KMOD_CTRL);
if (Config.Swap_buttons == MOD_CTRL && Button_inverter==0) if (Config.Swap_buttons == GFX2_MOD_CTRL && Button_inverter==0)
{ {
Button_inverter=1; Button_inverter=1;
if (Input_new_mouse_K) if (Input_new_mouse_K)
@ -979,7 +979,7 @@ static int Handle_joystick_press(SDL_JoyButtonEvent event)
#else #else
SDL_SetModState(SDL_GetModState() | (KMOD_ALT|KMOD_GUI)); SDL_SetModState(SDL_GetModState() | (KMOD_ALT|KMOD_GUI));
#endif #endif
if (Config.Swap_buttons == MOD_ALT && Button_inverter==0) if (Config.Swap_buttons == GFX2_MOD_ALT && Button_inverter==0)
{ {
Button_inverter=1; Button_inverter=1;
if (Input_new_mouse_K) if (Input_new_mouse_K)
@ -1058,12 +1058,12 @@ static int Handle_joystick_release(SDL_JoyButtonEvent event)
if (event.button == Joybutton_shift) if (event.button == Joybutton_shift)
{ {
SDL_SetModState(SDL_GetModState() & ~KMOD_SHIFT); SDL_SetModState(SDL_GetModState() & ~KMOD_SHIFT);
return Release_control(0,MOD_SHIFT); return Release_control(0,GFX2_MOD_SHIFT);
} }
if (event.button == Joybutton_control) if (event.button == Joybutton_control)
{ {
SDL_SetModState(SDL_GetModState() & ~KMOD_CTRL); SDL_SetModState(SDL_GetModState() & ~KMOD_CTRL);
return Release_control(0,MOD_CTRL); return Release_control(0,GFX2_MOD_CTRL);
} }
if (event.button == Joybutton_alt) if (event.button == Joybutton_alt)
{ {
@ -1072,7 +1072,7 @@ static int Handle_joystick_release(SDL_JoyButtonEvent event)
#else #else
SDL_SetModState(SDL_GetModState() & ~(KMOD_ALT|KMOD_GUI)); SDL_SetModState(SDL_GetModState() & ~(KMOD_ALT|KMOD_GUI));
#endif #endif
return Release_control(0,MOD_ALT); return Release_control(0,GFX2_MOD_ALT);
} }
if (event.button == Joybutton_left_click) if (event.button == Joybutton_left_click)
{ {
@ -1697,13 +1697,13 @@ int Get_input(int sleep_time)
// NumLock = 10 Mod2Mask // NumLock = 10 Mod2Mask
// see "modmap" // see "modmap"
if (event.xkey.state & ShiftMask) if (event.xkey.state & ShiftMask)
mod |= MOD_SHIFT; mod |= GFX2_MOD_SHIFT;
if (event.xkey.state & ControlMask) if (event.xkey.state & ControlMask)
mod |= MOD_CTRL; mod |= GFX2_MOD_CTRL;
if (event.xkey.state & (Mod1Mask | Mod5Mask)) if (event.xkey.state & (Mod1Mask | Mod5Mask))
mod |= MOD_ALT; mod |= GFX2_MOD_ALT;
if (event.xkey.state & Mod4Mask) if (event.xkey.state & Mod4Mask)
mod |= MOD_META; mod |= GFX2_MOD_META;
//sym = XKeycodeToKeysym(X11_display, event.xkey.keycode, 0); //sym = XKeycodeToKeysym(X11_display, event.xkey.keycode, 0);
sym = XkbKeycodeToKeysym(X11_display, event.xkey.keycode, 0, 0); sym = XkbKeycodeToKeysym(X11_display, event.xkey.keycode, 0, 0);
GFX2_Log(GFX2_DEBUG, "key press code = %3d state=0x%08x sym = 0x%04lx %s\tmod=%04x\n", GFX2_Log(GFX2_DEBUG, "key press code = %3d state=0x%08x sym = 0x%04lx %s\tmod=%04x\n",
@ -1746,13 +1746,13 @@ int Get_input(int sleep_time)
KeySym sym; KeySym sym;
if (event.xkey.state & ShiftMask) if (event.xkey.state & ShiftMask)
mod |= MOD_SHIFT; mod |= GFX2_MOD_SHIFT;
if (event.xkey.state & ControlMask) if (event.xkey.state & ControlMask)
mod |= MOD_CTRL; mod |= GFX2_MOD_CTRL;
if (event.xkey.state & (Mod1Mask | Mod5Mask)) if (event.xkey.state & (Mod1Mask | Mod5Mask))
mod |= MOD_ALT; mod |= GFX2_MOD_ALT;
if (event.xkey.state & Mod4Mask) if (event.xkey.state & Mod4Mask)
mod |= MOD_META; mod |= GFX2_MOD_META;
sym = XkbKeycodeToKeysym(X11_display, event.xkey.keycode, 0, 0); sym = XkbKeycodeToKeysym(X11_display, event.xkey.keycode, 0, 0);
GFX2_Log(GFX2_DEBUG, "keyrelease code= %3d state=0x%08x sym = 0x%04lx %s\tmod=%04x\n", GFX2_Log(GFX2_DEBUG, "keyrelease code= %3d state=0x%08x sym = 0x%04lx %s\tmod=%04x\n",
event.xkey.keycode, event.xkey.state, sym, XKeysymToString(sym), mod); event.xkey.keycode, event.xkey.state, sym, XKeysymToString(sym), mod);
@ -1766,13 +1766,13 @@ int Get_input(int sleep_time)
X11_window, None, CurrentTime); X11_window, None, CurrentTime);
//printf("Press button = %d state = 0x%08x\n", event.xbutton.button, event.xbutton.state); //printf("Press button = %d state = 0x%08x\n", event.xbutton.button, event.xbutton.state);
if (event.xkey.state & ShiftMask) if (event.xkey.state & ShiftMask)
mod |= MOD_SHIFT; mod |= GFX2_MOD_SHIFT;
if (event.xkey.state & ControlMask) if (event.xkey.state & ControlMask)
mod |= MOD_CTRL; mod |= GFX2_MOD_CTRL;
if (event.xkey.state & (Mod1Mask | Mod5Mask)) if (event.xkey.state & (Mod1Mask | Mod5Mask))
mod |= MOD_ALT; mod |= GFX2_MOD_ALT;
if (event.xkey.state & Mod3Mask) if (event.xkey.state & Mod3Mask)
mod |= MOD_META; mod |= GFX2_MOD_META;
switch(event.xbutton.button) switch(event.xbutton.button)
{ {
case 1: case 1:

12
src/input.h
View File

@ -85,19 +85,19 @@ extern unsigned long X11_clipboard_size;
#if defined __HAIKU__ #if defined __HAIKU__
#define SHORTCUT_COPY (KEY_c|MOD_ALT) #define SHORTCUT_COPY (KEY_c|GFX2_MOD_ALT)
#elif defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__) || defined(__macosx__) #elif defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__) || defined(__macosx__)
#define SHORTCUT_COPY (KEY_c|MOD_META) #define SHORTCUT_COPY (KEY_c|GFX2_MOD_META)
#else #else
#define SHORTCUT_COPY (KEY_c|MOD_CTRL) #define SHORTCUT_COPY (KEY_c|GFX2_MOD_CTRL)
#endif #endif
#if defined __HAIKU__ #if defined __HAIKU__
#define SHORTCUT_PASTE (KEY_v|MOD_ALT) #define SHORTCUT_PASTE (KEY_v|GFX2_MOD_ALT)
#elif defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__) || defined(__macosx__) #elif defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__) || defined(__macosx__)
#define SHORTCUT_PASTE (KEY_v|MOD_META) #define SHORTCUT_PASTE (KEY_v|GFX2_MOD_META)
#else #else
#define SHORTCUT_PASTE (KEY_v|MOD_CTRL) #define SHORTCUT_PASTE (KEY_v|GFX2_MOD_CTRL)
#endif #endif
#endif #endif

44
src/keyboard.c
View File

@ -339,13 +339,13 @@ word Get_Key_modifiers(void)
SDLMod mod = SDL_GetModState(); SDLMod mod = SDL_GetModState();
if (mod & KMOD_CTRL ) if (mod & KMOD_CTRL )
modifiers|=MOD_CTRL; modifiers|=GFX2_MOD_CTRL;
if (mod & KMOD_SHIFT ) if (mod & KMOD_SHIFT )
modifiers|=MOD_SHIFT; modifiers|=GFX2_MOD_SHIFT;
if (mod & (KMOD_ALT|KMOD_MODE)) if (mod & (KMOD_ALT|KMOD_MODE))
modifiers|=MOD_ALT; modifiers|=GFX2_MOD_ALT;
if (mod & (KMOD_META)) if (mod & (KMOD_META))
modifiers|=MOD_META; modifiers|=GFX2_MOD_META;
return modifiers; return modifiers;
} }
@ -391,13 +391,13 @@ word Keysym_to_keycode(SDL_Keysym keysym)
#else #else
mod = 0; mod = 0;
if (keysym.mod & KMOD_CTRL) if (keysym.mod & KMOD_CTRL)
mod |= MOD_CTRL; mod |= GFX2_MOD_CTRL;
if (keysym.mod & KMOD_SHIFT ) if (keysym.mod & KMOD_SHIFT )
mod |= MOD_SHIFT; mod |= GFX2_MOD_SHIFT;
if (keysym.mod & (KMOD_ALT|KMOD_MODE)) if (keysym.mod & (KMOD_ALT|KMOD_MODE))
mod |= MOD_ALT; mod |= GFX2_MOD_ALT;
if (keysym.mod & (KMOD_GUI)) if (keysym.mod & (KMOD_GUI))
mod |= MOD_META; mod |= GFX2_MOD_META;
#endif #endif
// SDL_GetModState() seems to get the right up-to-date info. // SDL_GetModState() seems to get the right up-to-date info.
@ -565,24 +565,24 @@ const char * Key_name(word key)
return "None"; return "None";
#ifdef GCWZERO #ifdef GCWZERO
if (key & MOD_CTRL) if (key & GFX2_MOD_CTRL)
strcat(buffer, "A+"); strcat(buffer, "A+");
if (key & MOD_ALT) if (key & GFX2_MOD_ALT)
strcat(buffer, "B+"); strcat(buffer, "B+");
if (key & MOD_SHIFT) if (key & GFX2_MOD_SHIFT)
strcat(buffer, "X+"); strcat(buffer, "X+");
#else #else
if (key & MOD_CTRL) if (key & GFX2_MOD_CTRL)
strcat(buffer, "Ctl+"); strcat(buffer, "Ctl+");
if (key & MOD_ALT) if (key & GFX2_MOD_ALT)
strcat(buffer, "Alt+"); strcat(buffer, "Alt+");
if (key & MOD_SHIFT) if (key & GFX2_MOD_SHIFT)
strcat(buffer, "Shift+"); strcat(buffer, "Shift+");
#endif #endif
if (key & MOD_META) if (key & GFX2_MOD_META)
strcat(buffer, META_KEY_PREFIX); strcat(buffer, META_KEY_PREFIX);
key=key & ~(MOD_CTRL|MOD_ALT|MOD_SHIFT|MOD_META); key=key & ~(GFX2_MOD_CTRL|GFX2_MOD_ALT|GFX2_MOD_SHIFT|GFX2_MOD_META);
// 99 is only a sanity check // 99 is only a sanity check
if (key>=KEY_JOYBUTTON && key<=KEY_JOYBUTTON+99) if (key>=KEY_JOYBUTTON && key<=KEY_JOYBUTTON+99)
@ -864,23 +864,23 @@ word Get_Key_modifiers(void)
word mod = 0; word mod = 0;
#if defined(WIN32) #if defined(WIN32)
if (GetKeyState(VK_SHIFT) & 0x8000) if (GetKeyState(VK_SHIFT) & 0x8000)
mod |= MOD_SHIFT; mod |= GFX2_MOD_SHIFT;
// Pressing AltGr is reported by windows as the right Alt together with the Left control keys // Pressing AltGr is reported by windows as the right Alt together with the Left control keys
if ((GetKeyState(VK_RMENU) & 0x8000) && (GetKeyState(VK_LCONTROL) & 0x8000)) if ((GetKeyState(VK_RMENU) & 0x8000) && (GetKeyState(VK_LCONTROL) & 0x8000))
{ {
mod |= MOD_ALT; // ALT GR mod |= GFX2_MOD_ALT; // ALT GR
if (GetKeyState(VK_RCONTROL) & 0x8000) if (GetKeyState(VK_RCONTROL) & 0x8000)
mod |= MOD_CTRL; mod |= GFX2_MOD_CTRL;
} }
else else
{ {
if (GetKeyState(VK_CONTROL) & 0x8000) if (GetKeyState(VK_CONTROL) & 0x8000)
mod |= MOD_CTRL; mod |= GFX2_MOD_CTRL;
if (GetKeyState(VK_MENU) & 0x8000) if (GetKeyState(VK_MENU) & 0x8000)
mod |= MOD_ALT; mod |= GFX2_MOD_ALT;
} }
if ((GetKeyState(VK_LWIN) | GetKeyState(VK_RWIN)) & 0x8000) if ((GetKeyState(VK_LWIN) | GetKeyState(VK_RWIN)) & 0x8000)
mod |= MOD_META; mod |= GFX2_MOD_META;
#endif #endif
return mod; return mod;
} }

10
src/keyboard.h
View File

@ -32,10 +32,10 @@
/// - 0x0000 + SDLK_LAST+3: Mouse wheel down. /// - 0x0000 + SDLK_LAST+3: Mouse wheel down.
/// - 0x0000 + SDLK_LAST+4+B : Joystick button number "B", starting at B=0. /// - 0x0000 + SDLK_LAST+4+B : Joystick button number "B", starting at B=0.
/// - 0x0800 + a number between 0 and 0x7FF: The scancode key number, for keys which have no "sym", such as keys from multimedia keyboards, and "fn" and "Thinkpad" key for a laptop. /// - 0x0800 + a number between 0 and 0x7FF: The scancode key number, for keys which have no "sym", such as keys from multimedia keyboards, and "fn" and "Thinkpad" key for a laptop.
/// Add 0x1000 for the Shift modifier MOD_SHIFT /// Add 0x1000 for the Shift modifier GFX2_MOD_SHIFT
/// Add 0x2000 for the Control modifier ::MOD_CTRL /// Add 0x2000 for the Control modifier ::GFX2_MOD_CTRL
/// Add 0x4000 for the Alt modifier ::MOD_ALT /// Add 0x4000 for the Alt modifier ::GFX2_MOD_ALT
/// Add 0x8000 for the "Meta" modifier ::MOD_META (On MacOS X it's the CMD key) /// Add 0x8000 for the "Meta" modifier ::GFX2_MOD_META (On MacOS X it's the CMD key)
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
#if defined(USE_SDL) #if defined(USE_SDL)
#include <SDL.h> #include <SDL.h>
@ -89,6 +89,6 @@ const char * Key_name(word key);
/*! /*!
Gets the Key modifiers in our format Gets the Key modifiers in our format
Returns a combination of ::MOD_SHIFT, ::MOD_ALT, ::MOD_CTRL Returns a combination of ::GFX2_MOD_SHIFT, ::GFX2_MOD_ALT, ::GFX2_MOD_CTRL
*/ */
word Get_Key_modifiers(void); word Get_Key_modifiers(void);

4
src/operatio.c
View File

@ -521,7 +521,7 @@ void Line_12_5(void)
cursor_y = Paintbrush_Y; cursor_y = Paintbrush_Y;
// On corrige les coordonnées de la ligne si la touche shift est appuyée... // On corrige les coordonnées de la ligne si la touche shift est appuyée...
if(Get_Key_modifiers() & MOD_SHIFT) if(Get_Key_modifiers() & GFX2_MOD_SHIFT)
Clamp_coordinates_regular_angle(start_x,start_y,&cursor_x,&cursor_y); Clamp_coordinates_regular_angle(start_x,start_y,&cursor_x,&cursor_y);
// On vient de bouger // On vient de bouger
@ -3807,7 +3807,7 @@ void Grad_rectangle_12_9(void)
cursor_x = Paintbrush_X; cursor_x = Paintbrush_X;
cursor_y = Paintbrush_Y; cursor_y = Paintbrush_Y;
// On corrige les coordonnées de la ligne si la touche shift est appuyée... // On corrige les coordonnées de la ligne si la touche shift est appuyée...
if(Get_Key_modifiers() & MOD_SHIFT) if(Get_Key_modifiers() & GFX2_MOD_SHIFT)
Clamp_coordinates_regular_angle(start_x,start_y,&cursor_x,&cursor_y); Clamp_coordinates_regular_angle(start_x,start_y,&cursor_x,&cursor_y);
if ((cursor_x!=end_x) || (cursor_y!=end_y)) if ((cursor_x!=end_x) || (cursor_y!=end_y))

4
src/readini.c
View File

@ -984,10 +984,10 @@ int Load_INI(T_Config * conf)
switch(values[0]) switch(values[0])
{ {
case 1: case 1:
conf->Swap_buttons=MOD_CTRL; conf->Swap_buttons=GFX2_MOD_CTRL;
break; break;
case 2: case 2:
conf->Swap_buttons=MOD_ALT; conf->Swap_buttons=GFX2_MOD_ALT;
break; break;
} }
} }

4
src/saveini.c
View File

@ -718,10 +718,10 @@ int Save_INI(const T_Config * conf)
switch(conf->Swap_buttons) switch(conf->Swap_buttons)
{ {
case MOD_CTRL: case GFX2_MOD_CTRL:
values[0]=1; values[0]=1;
break; break;
case MOD_ALT: case GFX2_MOD_ALT:
values[0]=2; values[0]=2;
break; break;
default: default:

2
src/struct.h
View File

@ -374,7 +374,7 @@ typedef struct
byte Right_click_colorpick; ///< Boolean, true to enable a "tablet" mode, where RMB acts as instant colorpicker byte Right_click_colorpick; ///< Boolean, true to enable a "tablet" mode, where RMB acts as instant colorpicker
byte Sync_views; ///< Boolean, true when the Main and Spare should share their viewport settings. byte Sync_views; ///< Boolean, true when the Main and Spare should share their viewport settings.
byte Stylus_mode; ///< Boolean, true to tweak some tools (eg:Curve) for single-button stylus. byte Stylus_mode; ///< Boolean, true to tweak some tools (eg:Curve) for single-button stylus.
word Swap_buttons; ///< Sets which key swaps mouse buttons : 0=none, or MOD_CTRL, or MOD_ALT. word Swap_buttons; ///< Sets which key swaps mouse buttons : 0=none, or GFX2_MOD_CTRL, or GFX2_MOD_ALT.
char Scripts_directory[MAX_PATH_CHARACTERS];///< Full pathname of directory for Lua scripts char Scripts_directory[MAX_PATH_CHARACTERS];///< Full pathname of directory for Lua scripts
byte Allow_multi_shortcuts; ///< Boolean, true if the same key combination can trigger multiple shortcuts. byte Allow_multi_shortcuts; ///< Boolean, true if the same key combination can trigger multiple shortcuts.
byte Tilemap_allow_flipped_x; ///< Boolean, true if the Tilemap tool should detect x-flipped tiles. byte Tilemap_allow_flipped_x; ///< Boolean, true if the Tilemap tool should detect x-flipped tiles.

2
src/windows.c
View File

@ -1988,7 +1988,7 @@ void Compute_paintbrush_coordinates(void)
// Operations that implement it // Operations that implement it
#if defined(USE_SDL) || defined(USE_SDL2) #if defined(USE_SDL) || defined(USE_SDL2)
default: default:
if (Snap_axis==0 && (Get_Key_modifiers() & MOD_SHIFT)) if (Snap_axis==0 && (Get_Key_modifiers() & GFX2_MOD_SHIFT))
{ {
// Start "Snap axis" mode // Start "Snap axis" mode
Snap_axis=1; Snap_axis=1;