matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eraser uses shift-alt instead of alt because linux alt-click is normally move window

Browse Source
This commit is contained in:
Philip 2010-11-01 17:37:27 -04:00
parent edab61ec4d
commit 176ecb1197
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/interface.c
View File

@ -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); drawrect(vid_buf, x+30, y-1, 29, 17, 255, 0, 0, 255);
h = n; 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); drawrect(vid_buf, x+30, y-1, 29, 17, 0, 255, 255, 255);
h = n; 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); drawrect(vid_buf, x+30, y-1, 29, 17, 255, 0, 0, 255);
h = n; 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); drawrect(vid_buf, x+30, y-1, 29, 17, 0, 255, 255, 255);
h = n; 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); drawrect(vid_buf, x+30, y-1, 29, 17, 255, 0, 0, 255);
h = n; 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); drawrect(vid_buf, x+30, y-1, 29, 17, 0, 255, 255, 255);
h = n; 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(b==1&&h!=-1)
{ {
if(sdl_mod & (KMOD_LALT)) if(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))
{ {
SLALT = h; 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(b==4&&h!=-1)
{ {
if(sdl_mod & (KMOD_LALT)) if(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))
{ {
SLALT = h; SLALT = h;
} }

4
src/main.c
View File

@ -1833,7 +1833,7 @@ int main(int argc, char *argv[])
} }
else 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; lx = x;
ly = y; ly = y;
@ -1856,7 +1856,7 @@ int main(int argc, char *argv[])
lb = 0; lb = 0;
lm = 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) if(y>0 && y<sdl_scale*YRES && x>0 && x<sdl_scale*XRES)
{ {

2
src/powder.c
View File

@ -3695,7 +3695,7 @@ int create_parts(int x, int y, int r, int c)
} }
return 1; return 1;
} }
if(sdl_mod & (KMOD_LALT)) if(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))
{ {
for(j=-r; j<=r; j++) for(j=-r; j<=r; j++)
for(i=-r; i<=r; i++) for(i=-r; i<=r; i++)