diff --git a/src/buttons.c b/src/buttons.c index 801dad1f..3227f672 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -764,10 +764,8 @@ const T_Lookup Lookup_MouseSpeed[] = { const T_Lookup Lookup_SwapButtons[] = { {"None",0}, - {"Shift",MOD_SHIFT}, {"Control",MOD_CTRL}, {"Alt",MOD_ALT}, - {"Meta",MOD_META}, {NULL,-1}, }; diff --git a/src/readini.c b/src/readini.c index c280574d..7c520806 100644 --- a/src/readini.c +++ b/src/readini.c @@ -923,17 +923,11 @@ int Load_INI(T_Config * conf) switch(values[0]) { case 1: - conf->Swap_buttons=MOD_SHIFT; - break; - case 2: conf->Swap_buttons=MOD_CTRL; break; - case 3: + case 2: conf->Swap_buttons=MOD_ALT; break; - case 4: - conf->Swap_buttons=MOD_META; - break; } } diff --git a/src/saveini.c b/src/saveini.c index 1d1ae41d..2f81e905 100644 --- a/src/saveini.c +++ b/src/saveini.c @@ -683,17 +683,11 @@ int Save_INI(T_Config * conf) switch(conf->Swap_buttons) { - case MOD_SHIFT: + case MOD_CTRL: values[0]=1; break; - case MOD_CTRL: - values[0]=2; - break; case MOD_ALT: - values[0]=3; - break; - case MOD_META: - values[0]=4; + values[0]=2; break; default: values[0]=0; diff --git a/src/struct.h b/src/struct.h index b8221f7e..a98c29ab 100644 --- a/src/struct.h +++ b/src/struct.h @@ -358,7 +358,7 @@ typedef struct 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 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_SHIFT, MOD_CTRL, MOD_ALT, MOD_META. + word Swap_buttons; ///< Sets which key swaps mouse buttons : 0=none, or MOD_CTRL, or MOD_ALT. } T_Config; // Structures utilisées pour les descriptions de pages et de liste de pages.