diff options
| author | Philip <philip@philip-linuxlaptop.(none)> | 2010-11-01 21:37:27 (GMT) |
|---|---|---|
| committer | Philip <philip@philip-linuxlaptop.(none)> | 2010-11-01 21:37:27 (GMT) |
| commit | 176ecb11974c2fde3a174afcf14ce9922182b50c (patch) | |
| tree | 55f6022c2e2d4f5a2ae0e538367d2603ffd6739b /src | |
| parent | edab61ec4dc262be7dca1acf4d44c24ad513f126 (diff) | |
| download | powder-176ecb11974c2fde3a174afcf14ce9922182b50c.zip powder-176ecb11974c2fde3a174afcf14ce9922182b50c.tar.gz | |
eraser uses shift-alt instead of alt because linux alt-click is normally move window
Diffstat (limited to 'src')
| -rw-r--r-- | src/interface.c | 10 | ||||
| -rw-r--r-- | src/main.c | 4 | ||||
| -rw-r--r-- | src/powder.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/interface.c b/src/interface.c index 81b5ed6..2161bcb 100644 --- a/src/interface.c +++ b/src/interface.c @@ -1497,7 +1497,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, drawrect(vid_buf, x+30, y-1, 29, 17, 255, 0, 0, 255); h = n; } - if(!bq && mx>=x+32 && mx<x+58 && my>=y && my< y+15&&(sdl_mod & (KMOD_LALT))) + if(!bq && mx>=x+32 && mx<x+58 && my>=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))) { drawrect(vid_buf, x+30, y-1, 29, 17, 0, 255, 255, 255); h = n; @@ -1531,7 +1531,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, drawrect(vid_buf, x+30, y-1, 29, 17, 255, 0, 0, 255); h = n; } - if(!bq && mx>=x+32 && mx<x+58 && my>=y && my< y+15&&(sdl_mod & (KMOD_LALT))) + if(!bq && mx>=x+32 && mx<x+58 && my>=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))) { drawrect(vid_buf, x+30, y-1, 29, 17, 0, 255, 255, 255); h = n; @@ -1568,7 +1568,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, drawrect(vid_buf, x+30, y-1, 29, 17, 255, 0, 0, 255); h = n; } - if(!bq && mx>=x+32 && mx<x+58 && my>=y && my< y+15&&(sdl_mod & (KMOD_LALT))) + if(!bq && mx>=x+32 && mx<x+58 && my>=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))) { drawrect(vid_buf, x+30, y-1, 29, 17, 0, 255, 255, 255); h = n; @@ -1604,7 +1604,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, if(b==1&&h!=-1) { - if(sdl_mod & (KMOD_LALT)) + if(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT)) { SLALT = h; } @@ -1614,7 +1614,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, } if(b==4&&h!=-1) { - if(sdl_mod & (KMOD_LALT)) + if(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT)) { SLALT = h; } @@ -1833,7 +1833,7 @@ int main(int argc, char *argv[]) } else { - if((sdl_mod & (KMOD_LSHIFT|KMOD_RSHIFT)) && !(sdl_mod & (KMOD_LCTRL|KMOD_RCTRL))) + if((sdl_mod & (KMOD_LSHIFT|KMOD_RSHIFT)) && !(sdl_mod & (KMOD_LCTRL|KMOD_RCTRL|KMOD_LALT))) { lx = x; ly = y; @@ -1856,7 +1856,7 @@ int main(int argc, char *argv[]) lb = 0; lm = 0; } - else if((sdl_mod & (KMOD_LALT||KMOD_RALT)) || b==SDL_BUTTON_MIDDLE) + else if(((sdl_mod & (KMOD_LALT||KMOD_RALT)) && !sdl_mod & (KMOD_LALT)) || b==SDL_BUTTON_MIDDLE) { if(y>0 && y<sdl_scale*YRES && x>0 && x<sdl_scale*XRES) { diff --git a/src/powder.c b/src/powder.c index 5260663..74ac89f 100644 --- a/src/powder.c +++ b/src/powder.c @@ -3695,7 +3695,7 @@ int create_parts(int x, int y, int r, int c) } return 1; } - if(sdl_mod & (KMOD_LALT)) + if(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT)) { for(j=-r; j<=r; j++) for(i=-r; i<=r; i++) |