notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

KMOD_CTRL is defined as (KMOD_LCTRL|KMOD_RCTRL) so no need to check all 3

Browse source
This commit is contained in:
Albert Cahalan 2005-01-19 21:39:50 +00:00
parent 690c5b8c36
commit 553c5f9977
1 changed files with 7 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/tuxpaint.c
View file

@ -2368,7 +2368,7 @@ static void eat_sdl_events(void)
else if (event.type == SDL_KEYDOWN) else if (event.type == SDL_KEYDOWN)
{ {
SDLKey key = event.key.keysym.sym; SDLKey key = event.key.keysym.sym;
SDLMod ctrl = event.key.keysym.mod & (KMOD_CTRL|KMOD_LCTRL|KMOD_RCTRL); SDLMod ctrl = event.key.keysym.mod & KMOD_CTRL;
SDLMod alt = event.key.keysym.mod & KMOD_ALT; SDLMod alt = event.key.keysym.mod & KMOD_ALT;
if (key==SDLK_ESCAPE || (key==SDLK_c && ctrl) || (key==SDLK_F4 && alt)) if (key==SDLK_ESCAPE || (key==SDLK_c && ctrl) || (key==SDLK_F4 && alt))
exit(0); exit(0);
@ -2734,11 +2734,7 @@ static void mainloop(void)
done = do_quit(); done = do_quit();
} }
#endif #endif
else if (key == SDLK_z && else if (key==SDLK_z && (mod & KMOD_CTRL) && !noshortcuts)
(mod & KMOD_CTRL ||
mod & KMOD_LCTRL ||
mod & KMOD_RCTRL) &&
!noshortcuts)
{ {
/* Ctrl-Z - Undo */ /* Ctrl-Z - Undo */
@ -2754,11 +2750,7 @@ static void mainloop(void)
shape_tool_mode = SHAPE_TOOL_MODE_DONE; shape_tool_mode = SHAPE_TOOL_MODE_DONE;
} }
} }
else if (key == SDLK_r && else if (key==SDLK_r && (mod & KMOD_CTRL) && !noshortcuts)
(mod & KMOD_CTRL ||
mod & KMOD_LCTRL ||
mod & KMOD_RCTRL) &&
!noshortcuts)
{ {
/* Ctrl-R - Redo */ /* Ctrl-R - Redo */
@ -2769,11 +2761,7 @@ static void mainloop(void)
shape_tool_mode = SHAPE_TOOL_MODE_DONE; shape_tool_mode = SHAPE_TOOL_MODE_DONE;
} }
} }
else if (key == SDLK_o && else if (key==SDLK_o && (mod & KMOD_CTRL) && !noshortcuts)
(mod & KMOD_CTRL ||
mod & KMOD_LCTRL ||
mod & KMOD_RCTRL) &&
!noshortcuts)
{ {
/* Ctrl-O - Open */ /* Ctrl-O - Open */
@ -2810,11 +2798,7 @@ static void mainloop(void)
/* FIXME: Make delay configurable: */ /* FIXME: Make delay configurable: */
control_drawtext_timer(1000, tool_tips[cur_tool]); control_drawtext_timer(1000, tool_tips[cur_tool]);
} }
else if ((key == SDLK_n && else if ( (key==SDLK_n && (mod & KMOD_CTRL)) && tool_avail[TOOL_NEW] && !noshortcuts)
((mod & KMOD_CTRL ||
mod & KMOD_LCTRL ||
mod & KMOD_RCTRL))) && tool_avail[TOOL_NEW] &&
!noshortcuts)
{ {
/* Ctrl-N - New */ /* Ctrl-N - New */
@ -2855,11 +2839,7 @@ static void mainloop(void)
draw_toolbar(); draw_toolbar();
update_screen_rect(&r_tools); update_screen_rect(&r_tools);
} }
else if (key == SDLK_s && else if (key==SDLK_s && (mod & KMOD_CTRL) && !noshortcuts)
(mod & KMOD_CTRL ||
mod & KMOD_LCTRL ||
mod & KMOD_RCTRL) &&
!noshortcuts)
{ {
/* Ctrl-S - Save */ /* Ctrl-S - Save */
@ -13732,9 +13712,7 @@ static int do_open(int want_new_tool)
playsound(1, SND_CLICK, 1); playsound(1, SND_CLICK, 1);
} }
else if (key == SDLK_d && else if (key == SDLK_d &&
(event.key.keysym.mod & KMOD_CTRL || (event.key.keysym.mod & KMOD_CTRL) &&
event.key.keysym.mod & KMOD_LCTRL ||
event.key.keysym.mod & KMOD_RCTRL) &&
d_places[which] != PLACE_STARTERS_DIR && d_places[which] != PLACE_STARTERS_DIR &&
!noshortcuts) !noshortcuts)
{ {