trunk: Reserved hotkeys for layers. Allowed a single shortcut to launch several actions (Issue 88)
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1062 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
parent
bdf0186c7f
commit
5fd28bdd3b
@ -70,7 +70,7 @@
|
||||
#define isHidden(x) ((x)->d_name[0]=='.')
|
||||
#endif
|
||||
|
||||
extern char Program_version[]; // generated in pversion.c
|
||||
//extern char Program_version[]; // generated in pversion.c
|
||||
|
||||
extern short Old_MX;
|
||||
extern short Old_MY;
|
||||
|
||||
18
const.h
18
const.h
@ -33,7 +33,7 @@
|
||||
#define BETA1 98 ///< Version number for gfx2.cfg (3/4)
|
||||
#define BETA2 0 ///< Version number for gfx2.cfg (4/4)
|
||||
#define MAX_VIDEO_MODES 100 ///< Maximum number of video modes Grafx2 can propose.
|
||||
#define NB_SHORTCUTS 159 ///< Number of actions that can have a key combination associated to it.
|
||||
#define NB_SHORTCUTS 175 ///< Number of actions that can have a key combination associated to it.
|
||||
#define NB_ZOOM_FACTORS 12 ///< Number of zoom levels available in the magnifier.
|
||||
#define MENU_WIDTH 254 ///< Width of the menu (not counting the palette)
|
||||
#define MENU_HEIGHT 44 ///< Height of the menu.
|
||||
@ -408,6 +408,22 @@ enum SPECIAL_ACTIONS
|
||||
SPECIAL_ZOOM_18,
|
||||
SPECIAL_ZOOM_20,
|
||||
SPECIAL_SHOW_GRID,
|
||||
SPECIAL_LAYER1_SELECT,
|
||||
SPECIAL_LAYER1_TOGGLE,
|
||||
SPECIAL_LAYER2_SELECT,
|
||||
SPECIAL_LAYER2_TOGGLE,
|
||||
SPECIAL_LAYER3_SELECT,
|
||||
SPECIAL_LAYER3_TOGGLE,
|
||||
SPECIAL_LAYER4_SELECT,
|
||||
SPECIAL_LAYER4_TOGGLE,
|
||||
SPECIAL_LAYER5_SELECT,
|
||||
SPECIAL_LAYER5_TOGGLE,
|
||||
SPECIAL_LAYER6_SELECT,
|
||||
SPECIAL_LAYER6_TOGGLE,
|
||||
SPECIAL_LAYER7_SELECT,
|
||||
SPECIAL_LAYER7_TOGGLE,
|
||||
SPECIAL_LAYER8_SELECT,
|
||||
SPECIAL_LAYER8_TOGGLE,
|
||||
NB_SPECIAL_SHORTCUTS ///< Number of special shortcuts
|
||||
};
|
||||
|
||||
|
||||
258
engine.c
258
engine.c
@ -476,11 +476,11 @@ void Main_handler(void)
|
||||
int button_index; // Numéro de bouton de menu en cours
|
||||
int prev_button_number=0; // Numéro de bouton de menu sur lequel on était précédemment
|
||||
byte blink; // L'opération demande un effacement du curseur
|
||||
int shortcut_button; // Button ŕ enclencher d'aprčs la touche de raccourci enfoncée
|
||||
byte clicked_button = 0; // Côté du bouton ŕ enclencher d'aprčs la touche de raccourci enfoncée
|
||||
int key_index; // index du tableau de touches spéciales correspondant à la touche enfoncée
|
||||
char str[25];
|
||||
byte temp;
|
||||
byte effect_modified;
|
||||
byte action;
|
||||
|
||||
do
|
||||
{
|
||||
@ -498,6 +498,7 @@ void Main_handler(void)
|
||||
|
||||
if(Get_input())
|
||||
{
|
||||
action = 0;
|
||||
|
||||
// Evenement de fermeture
|
||||
if (Quit_is_required)
|
||||
@ -509,10 +510,13 @@ void Main_handler(void)
|
||||
// Gestion des touches
|
||||
if (Key)
|
||||
{
|
||||
for (key_index=0;(key_index<NB_SPECIAL_SHORTCUTS) && !Is_shortcut(Key,key_index);key_index++);
|
||||
effect_modified = 0;
|
||||
|
||||
// Gestion des touches spéciales:
|
||||
if (key_index>SPECIAL_CLICK_RIGHT)
|
||||
for (key_index=SPECIAL_CLICK_RIGHT+1;key_index<NB_SPECIAL_SHORTCUTS;key_index++)
|
||||
{
|
||||
if (Is_shortcut(Key,key_index))
|
||||
{
|
||||
// Special keys (functions not hooked to a UI button)
|
||||
switch(key_index)
|
||||
{
|
||||
case SPECIAL_SCROLL_UP : // Scroll up
|
||||
@ -520,130 +524,130 @@ void Main_handler(void)
|
||||
Scroll_magnifier(0,-(Main_magnifier_height>>2));
|
||||
else
|
||||
Scroll_screen(0,-(Screen_height>>3));
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SCROLL_DOWN : // Scroll down
|
||||
if (Main_magnifier_mode)
|
||||
Scroll_magnifier(0,(Main_magnifier_height>>2));
|
||||
else
|
||||
Scroll_screen(0,(Screen_height>>3));
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SCROLL_LEFT : // Scroll left
|
||||
if (Main_magnifier_mode)
|
||||
Scroll_magnifier(-(Main_magnifier_width>>2),0);
|
||||
else
|
||||
Scroll_screen(-(Screen_width>>3),0);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SCROLL_RIGHT : // Scroll right
|
||||
if (Main_magnifier_mode)
|
||||
Scroll_magnifier((Main_magnifier_width>>2),0);
|
||||
else
|
||||
Scroll_screen((Screen_width>>3),0);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SCROLL_UP_FAST : // Scroll up faster
|
||||
if (Main_magnifier_mode)
|
||||
Scroll_magnifier(0,-(Main_magnifier_height>>1));
|
||||
else
|
||||
Scroll_screen(0,-(Screen_height>>2));
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SCROLL_DOWN_FAST : // Scroll down faster
|
||||
if (Main_magnifier_mode)
|
||||
Scroll_magnifier(0,(Main_magnifier_height>>1));
|
||||
else
|
||||
Scroll_screen(0,(Screen_height>>2));
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SCROLL_LEFT_FAST : // Scroll left faster
|
||||
if (Main_magnifier_mode)
|
||||
Scroll_magnifier(-(Main_magnifier_width>>1),0);
|
||||
else
|
||||
Scroll_screen(-(Screen_width>>2),0);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SCROLL_RIGHT_FAST : // Scroll right faster
|
||||
if (Main_magnifier_mode)
|
||||
Scroll_magnifier((Main_magnifier_width>>1),0);
|
||||
else
|
||||
Scroll_screen((Screen_width>>2),0);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SCROLL_UP_SLOW : // Scroll up slower
|
||||
if (Main_magnifier_mode)
|
||||
Scroll_magnifier(0,-1);
|
||||
else
|
||||
Scroll_screen(0,-1);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SCROLL_DOWN_SLOW : // Scroll down slower
|
||||
if (Main_magnifier_mode)
|
||||
Scroll_magnifier(0,1);
|
||||
else
|
||||
Scroll_screen(0,1);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SCROLL_LEFT_SLOW : // Scroll left slower
|
||||
if (Main_magnifier_mode)
|
||||
Scroll_magnifier(-1,0);
|
||||
else
|
||||
Scroll_screen(-1,0);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SCROLL_RIGHT_SLOW : // Scroll right slower
|
||||
if (Main_magnifier_mode)
|
||||
Scroll_magnifier(1,0);
|
||||
else
|
||||
Scroll_screen(1,0);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_NEXT_FORECOLOR : // Next foreground color
|
||||
Special_next_forecolor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_PREVIOUS_FORECOLOR : // Previous foreground color
|
||||
Special_previous_forecolor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_NEXT_BACKCOLOR : // Next background color
|
||||
Special_next_backcolor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_PREVIOUS_BACKCOLOR : // Previous background color
|
||||
Special_previous_backcolor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SMALLER_PAINTBRUSH: // Rétrécir le pinceau
|
||||
Smaller_paintbrush();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_BIGGER_PAINTBRUSH: // Grossir le pinceau
|
||||
Bigger_paintbrush();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_NEXT_USER_FORECOLOR : // Next user-defined foreground color
|
||||
Special_next_user_forecolor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_PREVIOUS_USER_FORECOLOR : // Previous user-defined foreground color
|
||||
Special_previous_user_forecolor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_NEXT_USER_BACKCOLOR : // Next user-defined background color
|
||||
Special_next_user_backcolor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_PREVIOUS_USER_BACKCOLOR : // Previous user-defined background color
|
||||
Special_previous_user_backcolor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SHOW_HIDE_CURSOR : // Show / Hide cursor
|
||||
Hide_cursor();
|
||||
Cursor_hidden=!Cursor_hidden;
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_DOT_PAINTBRUSH : // Paintbrush = "."
|
||||
Hide_cursor();
|
||||
@ -651,32 +655,32 @@ void Main_handler(void)
|
||||
Set_paintbrush_size(1,1);
|
||||
Change_paintbrush_shape(PAINTBRUSH_SHAPE_ROUND);
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_CONTINUOUS_DRAW : // Continuous freehand drawing
|
||||
Select_button(BUTTON_DRAW,LEFT_SIDE);
|
||||
// ATTENTION CE TRUC EST MOCHE ET VA MERDER SI ON SE MET A UTILISER DES BOUTONS POPUPS
|
||||
while (Current_operation!=OPERATION_CONTINUOUS_DRAW)
|
||||
Select_button(BUTTON_DRAW,RIGHT_SIDE);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_FLIP_X : // Flip X
|
||||
Hide_cursor();
|
||||
Flip_X_lowlevel(Brush, Brush_width, Brush_height);
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_FLIP_Y : // Flip Y
|
||||
Hide_cursor();
|
||||
Flip_Y_lowlevel(Brush, Brush_width, Brush_height);
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ROTATE_90 : // 90° brush rotation
|
||||
Hide_cursor();
|
||||
Rotate_90_deg();
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ROTATE_180 : // 180° brush rotation
|
||||
Hide_cursor();
|
||||
@ -684,314 +688,338 @@ void Main_handler(void)
|
||||
Brush_offset_X=(Brush_width>>1);
|
||||
Brush_offset_Y=(Brush_height>>1);
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_STRETCH : // Stretch brush
|
||||
Hide_cursor();
|
||||
Start_operation_stack(OPERATION_STRETCH_BRUSH);
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_DISTORT : // Distort brush
|
||||
Hide_cursor();
|
||||
Start_operation_stack(OPERATION_DISTORT_BRUSH);
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ROTATE_ANY_ANGLE : // Rotate brush by any angle
|
||||
Hide_cursor();
|
||||
Start_operation_stack(OPERATION_ROTATE_BRUSH);
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_OUTLINE : // Outline brush
|
||||
Hide_cursor();
|
||||
Outline_brush();
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_NIBBLE : // Nibble brush
|
||||
Hide_cursor();
|
||||
Nibble_brush();
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_GET_BRUSH_COLORS : // Get colors from brush
|
||||
Get_colors_from_brush();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_RECOLORIZE_BRUSH : // Recolorize brush
|
||||
Hide_cursor();
|
||||
Remap_brush();
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_LOAD_BRUSH :
|
||||
Load_picture(0);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SAVE_BRUSH :
|
||||
Save_picture(0);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ZOOM_IN : // Zoom in
|
||||
Zoom(+1);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ZOOM_OUT : // Zoom out
|
||||
Zoom(-1);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_CENTER_ATTACHMENT : // Center brush attachment
|
||||
Hide_cursor();
|
||||
Brush_offset_X=(Brush_width>>1);
|
||||
Brush_offset_Y=(Brush_height>>1);
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_TOP_LEFT_ATTACHMENT : // Top-left brush attachment
|
||||
Hide_cursor();
|
||||
Brush_offset_X=0;
|
||||
Brush_offset_Y=0;
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_TOP_RIGHT_ATTACHMENT : // Top-right brush attachment
|
||||
Hide_cursor();
|
||||
Brush_offset_X=(Brush_width-1);
|
||||
Brush_offset_Y=0;
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_BOTTOM_LEFT_ATTACHMENT : // Bottom-left brush attachment
|
||||
Hide_cursor();
|
||||
Brush_offset_X=0;
|
||||
Brush_offset_Y=(Brush_height-1);
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_BOTTOM_RIGHT_ATTACHMENT : // Bottom right brush attachment
|
||||
Hide_cursor();
|
||||
Brush_offset_X=(Brush_width-1);
|
||||
Brush_offset_Y=(Brush_height-1);
|
||||
Display_cursor();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_EXCLUDE_COLORS_MENU : // Exclude colors menu
|
||||
Menu_tag_colors("Tag colors to exclude",Exclude_color,&temp,1, NULL, SPECIAL_EXCLUDE_COLORS_MENU);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_INVERT_SIEVE :
|
||||
Invert_trame();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SHADE_MODE :
|
||||
Button_Shade_mode();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SHADE_MENU :
|
||||
Button_Shade_menu();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_QUICK_SHADE_MODE :
|
||||
Button_Quick_shade_mode();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_QUICK_SHADE_MENU :
|
||||
Button_Quick_shade_menu();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_STENCIL_MODE :
|
||||
Button_Stencil_mode();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_STENCIL_MENU :
|
||||
Button_Stencil_menu();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_MASK_MODE :
|
||||
Button_Mask_mode();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_MASK_MENU :
|
||||
Button_Mask_menu();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_GRID_MODE :
|
||||
Button_Snap_mode();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_GRID_MENU :
|
||||
Button_Grid_menu();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SHOW_GRID :
|
||||
Button_Show_grid();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SIEVE_MODE :
|
||||
Button_Sieve_mode();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SIEVE_MENU :
|
||||
Button_Sieve_menu();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_COLORIZE_MODE :
|
||||
Button_Colorize_mode();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_COLORIZE_MENU :
|
||||
Button_Colorize_menu();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SMOOTH_MODE :
|
||||
Button_Smooth_mode();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SMOOTH_MENU :
|
||||
Button_Smooth_menu();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_SMEAR_MODE :
|
||||
Button_Smear_mode();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_TILING_MODE :
|
||||
Button_Tiling_mode();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_TILING_MENU :
|
||||
effect_modified = 1;
|
||||
Button_Tiling_menu();
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_EFFECTS_OFF :
|
||||
Effects_off();
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_TRANSPARENCY_1 :
|
||||
Transparency_set(1);
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_TRANSPARENCY_2 :
|
||||
Transparency_set(2);
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_TRANSPARENCY_3 :
|
||||
Transparency_set(3);
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_TRANSPARENCY_4 :
|
||||
Transparency_set(4);
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_TRANSPARENCY_5 :
|
||||
Transparency_set(5);
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_TRANSPARENCY_6 :
|
||||
Transparency_set(6);
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_TRANSPARENCY_7 :
|
||||
Transparency_set(7);
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_TRANSPARENCY_8 :
|
||||
Transparency_set(8);
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_TRANSPARENCY_9 :
|
||||
Transparency_set(9);
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_TRANSPARENCY_0 :
|
||||
Transparency_set(0);
|
||||
Key=0;
|
||||
effect_modified = 1;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ZOOM_1 :
|
||||
Zoom_set(-1);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ZOOM_2 :
|
||||
Zoom_set(0);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ZOOM_3 :
|
||||
Zoom_set(1);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ZOOM_4 :
|
||||
Zoom_set(2);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ZOOM_5 :
|
||||
Zoom_set(3);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ZOOM_6 :
|
||||
Zoom_set(4);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ZOOM_8 :
|
||||
Zoom_set(5);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ZOOM_10 :
|
||||
Zoom_set(6);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ZOOM_12 :
|
||||
Zoom_set(7);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ZOOM_14 :
|
||||
Zoom_set(8);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ZOOM_16 :
|
||||
Zoom_set(9);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ZOOM_18 :
|
||||
Zoom_set(10);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
case SPECIAL_ZOOM_20 :
|
||||
Zoom_set(11);
|
||||
Key=0;
|
||||
action++;
|
||||
break;
|
||||
default : // Gestion des touches de raccourci de bouton:
|
||||
// Pour chaque bouton
|
||||
shortcut_button=-1;
|
||||
}
|
||||
}
|
||||
} // End of special keys
|
||||
|
||||
// Shortcut for functions of Menu buttons
|
||||
for (button_index=0;button_index<NB_BUTTONS;button_index++)
|
||||
{
|
||||
if (Is_shortcut(Key,0x100+button_index))
|
||||
{
|
||||
shortcut_button=button_index;
|
||||
clicked_button =LEFT_SIDE;
|
||||
button_index=NB_BUTTONS;
|
||||
Select_button(button_index,LEFT_SIDE);
|
||||
prev_button_number=-1;
|
||||
action++;
|
||||
}
|
||||
else if (Is_shortcut(Key,0x200+button_index))
|
||||
{
|
||||
shortcut_button=button_index;
|
||||
clicked_button =RIGHT_SIDE;
|
||||
button_index=NB_BUTTONS;
|
||||
}
|
||||
}
|
||||
// Aprčs avoir scruté les boutons, si la recherche a été fructueuse,
|
||||
// on lance le bouton.
|
||||
if (shortcut_button!=-1)
|
||||
{
|
||||
Select_button(shortcut_button,clicked_button);
|
||||
Select_button(button_index,RIGHT_SIDE);
|
||||
prev_button_number=-1;
|
||||
action++;
|
||||
}
|
||||
}
|
||||
|
||||
// Si on a modifié un effet, il faut rafficher le bouton des effets en
|
||||
// conséquence.
|
||||
if ((key_index>=SPECIAL_SHADE_MODE)
|
||||
&& (key_index<=SPECIAL_TILING_MENU))
|
||||
if (effect_modified)
|
||||
{
|
||||
Hide_cursor();
|
||||
Draw_menu_button_frame(BUTTON_EFFECTS,
|
||||
@ -999,6 +1027,8 @@ void Main_handler(void)
|
||||
Display_cursor();
|
||||
}
|
||||
}
|
||||
if (action)
|
||||
Key=0;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
17
helpfile.h
17
helpfile.h
@ -283,6 +283,23 @@ static const T_Help_table helptable_help[] =
|
||||
HELP_LINK (" Next : %s", SPECIAL_NEXT_USER_BACKCOLOR)
|
||||
HELP_LINK (" Previous: %s", SPECIAL_PREVIOUS_USER_BACKCOLOR)
|
||||
HELP_TEXT ("")
|
||||
HELP_TEXT ("LAYERS")
|
||||
HELP_LINK (" Select 1 : %s", SPECIAL_LAYER1_SELECT)
|
||||
HELP_LINK (" Toggle 1 : %s", SPECIAL_LAYER1_TOGGLE)
|
||||
HELP_LINK (" Select 2 : %s", SPECIAL_LAYER2_SELECT)
|
||||
HELP_LINK (" Toggle 2 : %s", SPECIAL_LAYER2_TOGGLE)
|
||||
HELP_LINK (" Select 3 : %s", SPECIAL_LAYER3_SELECT)
|
||||
HELP_LINK (" Toggle 3 : %s", SPECIAL_LAYER3_TOGGLE)
|
||||
HELP_LINK (" Select 4 : %s", SPECIAL_LAYER4_SELECT)
|
||||
HELP_LINK (" Toggle 4 : %s", SPECIAL_LAYER4_TOGGLE)
|
||||
HELP_LINK (" Select 5 : %s", SPECIAL_LAYER5_SELECT)
|
||||
HELP_LINK (" Toggle 5 : %s", SPECIAL_LAYER5_TOGGLE)
|
||||
HELP_LINK (" Select 6 : %s", SPECIAL_LAYER6_SELECT)
|
||||
HELP_LINK (" Toggle 6 : %s", SPECIAL_LAYER6_TOGGLE)
|
||||
HELP_LINK (" Select 7 : %s", SPECIAL_LAYER7_SELECT)
|
||||
HELP_LINK (" Toggle 7 : %s", SPECIAL_LAYER7_TOGGLE)
|
||||
HELP_LINK (" Select 8 : %s", SPECIAL_LAYER8_SELECT)
|
||||
HELP_LINK (" Toggle 8 : %s", SPECIAL_LAYER8_TOGGLE)
|
||||
};
|
||||
static const T_Help_table helptable_credits[] =
|
||||
{
|
||||
|
||||
145
hotkeys.c
145
hotkeys.c
@ -1299,6 +1299,135 @@ T_Key_config ConfigKey[NB_SHORTCUTS] = {
|
||||
true,
|
||||
SDLK_g|MOD_SHIFT|MOD_ALT, // Shift + Alt + G,
|
||||
0},
|
||||
{159,
|
||||
"Select layer 1",
|
||||
"Makes the layer 1 visible and",
|
||||
"set it as the active one, where",
|
||||
"you can draw.",
|
||||
true,
|
||||
0,
|
||||
0},
|
||||
{160,
|
||||
"Toggle layer 1",
|
||||
"Makes layer 1 visible or invisible.",
|
||||
"If it's the current active layer,",
|
||||
"toggle all other layers instead.",
|
||||
true,
|
||||
0,
|
||||
0},
|
||||
{161,
|
||||
"Select layer 2",
|
||||
"Makes the layer 2 visible and",
|
||||
"set it as the active one, where",
|
||||
"you can draw.",
|
||||
true,
|
||||
0,
|
||||
0},
|
||||
{162,
|
||||
"Toggle layer 2",
|
||||
"Makes layer 2 visible or invisible.",
|
||||
"If it's the current active layer,",
|
||||
"toggle all other layers instead.",
|
||||
true,
|
||||
0,
|
||||
0},
|
||||
{163,
|
||||
"Select layer 3",
|
||||
"Makes the layer 3 visible and",
|
||||
"set it as the active one, where",
|
||||
"you can draw.",
|
||||
true,
|
||||
0,
|
||||
0},
|
||||
{164,
|
||||
"Toggle layer 3",
|
||||
"Makes layer 3 visible or invisible.",
|
||||
"If it's the current active layer,",
|
||||
"toggle all other layers instead.",
|
||||
true,
|
||||
0,
|
||||
0},
|
||||
{165,
|
||||
"Select layer 4",
|
||||
"Makes the layer 4 visible and",
|
||||
"set it as the active one, where",
|
||||
"you can draw.",
|
||||
true,
|
||||
0,
|
||||
0},
|
||||
{166,
|
||||
"Toggle layer 4",
|
||||
"Makes layer 4 visible or invisible.",
|
||||
"If it's the current active layer,",
|
||||
"toggle all other layers instead.",
|
||||
true,
|
||||
0,
|
||||
0},
|
||||
{167,
|
||||
"Select layer 5",
|
||||
"Makes the layer 5 visible and",
|
||||
"set it as the active one, where",
|
||||
"you can draw.",
|
||||
true,
|
||||
0,
|
||||
0},
|
||||
{168,
|
||||
"Toggle layer 5",
|
||||
"Makes layer 5 visible or invisible.",
|
||||
"If it's the current active layer,",
|
||||
"toggle all other layers instead.",
|
||||
true,
|
||||
0,
|
||||
0},
|
||||
{169,
|
||||
"Select layer 6",
|
||||
"Makes the layer 6 visible and",
|
||||
"set it as the active one, where",
|
||||
"you can draw.",
|
||||
true,
|
||||
0,
|
||||
0},
|
||||
{170,
|
||||
"Toggle layer 6",
|
||||
"Makes layer 6 visible or invisible.",
|
||||
"If it's the current active layer,",
|
||||
"toggle all other layers instead.",
|
||||
true,
|
||||
0,
|
||||
0},
|
||||
{171,
|
||||
"Select layer 7",
|
||||
"Makes the layer 7 visible and",
|
||||
"set it as the active one, where",
|
||||
"you can draw.",
|
||||
true,
|
||||
0,
|
||||
0},
|
||||
{172,
|
||||
"Toggle layer 7",
|
||||
"Makes layer 7 visible or invisible.",
|
||||
"If it's the current active layer,",
|
||||
"toggle all other layers instead.",
|
||||
true,
|
||||
0,
|
||||
0},
|
||||
{173,
|
||||
"Select layer 8",
|
||||
"Makes the layer 8 visible and",
|
||||
"set it as the active one, where",
|
||||
"you can draw.",
|
||||
true,
|
||||
0,
|
||||
0},
|
||||
{174,
|
||||
"Toggle layer 8",
|
||||
"Makes layer 8 visible or invisible.",
|
||||
"If it's the current active layer,",
|
||||
"toggle all other layers instead.",
|
||||
true,
|
||||
0,
|
||||
0},
|
||||
|
||||
};
|
||||
|
||||
word Ordering[NB_SHORTCUTS]=
|
||||
@ -1462,4 +1591,20 @@ word Ordering[NB_SHORTCUTS]=
|
||||
SPECIAL_ZOOM_18, /**< Sets zoom factor to 18:1 */
|
||||
SPECIAL_ZOOM_20, /**< Sets zoom factor to 20:1 */
|
||||
SPECIAL_SHOW_GRID,
|
||||
SPECIAL_LAYER1_SELECT,
|
||||
SPECIAL_LAYER1_TOGGLE,
|
||||
SPECIAL_LAYER2_SELECT,
|
||||
SPECIAL_LAYER2_TOGGLE,
|
||||
SPECIAL_LAYER3_SELECT,
|
||||
SPECIAL_LAYER3_TOGGLE,
|
||||
SPECIAL_LAYER4_SELECT,
|
||||
SPECIAL_LAYER4_TOGGLE,
|
||||
SPECIAL_LAYER5_SELECT,
|
||||
SPECIAL_LAYER5_TOGGLE,
|
||||
SPECIAL_LAYER6_SELECT,
|
||||
SPECIAL_LAYER6_TOGGLE,
|
||||
SPECIAL_LAYER7_SELECT,
|
||||
SPECIAL_LAYER7_TOGGLE,
|
||||
SPECIAL_LAYER8_SELECT,
|
||||
SPECIAL_LAYER8_TOGGLE,
|
||||
};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user