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

[Del] key to quickly access a small eraser

Browse source 
A keyboard shortcut is now available for quickly accessing
a small eraser.  Hold the [Del] key while clicking, and drag
around the picture to erase.  Release the key and/or mouse to
return to normal operation.

(Eventually, this could be utilized when we can support
the recognition of a drawing tablet stylus' "eraser" tip;
see https://sourceforge.net/p/tuxpaint/feature-requests/8/)
This commit is contained in:
Bill Kendrick 2022-09-28 01:00:28 -07:00
parent f2674920c8
commit 65d1c087d6
2 changed files with 116 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
docs/CHANGES.txt
View file

@ -7,7 +7,7 @@ Various contributors (see below, and AUTHORS.txt)
http://www.tuxpaint.org/
2022.September.17 (0.9.29)
2022.September.28 (0.9.29)
* Improvements to "Stamp" tool:
-----------------------------
* Stamps may now be rotated.
@ -59,6 +59,15 @@ http://www.tuxpaint.org/
* Other Improvements:
-------------------
* A keyboard shortcut is now available for quickly accessing
a small eraser. Hold the [Del] key while clicking, and drag
around the picture to erase. Release the key and/or mouse to
return to normal operation.
(Eventually, this could be utilized when we can support
the recognition of a drawing tablet stylus' "eraser" tip;
see https://sourceforge.net/p/tuxpaint/feature-requests/8/)
Bill Kendrick <bill@newbreedsoftware.com>
* Automatic button size option ("buttonsize=auto"), to scale button
size reasonably based on window size / fullscreen resolution.
(For https://sourceforge.net/p/tuxpaint/feature-requests/218/)

107
src/tuxpaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt)
June 14, 2002 - September 14, 2022
June 14, 2002 - September 28, 2022
*/
#include "platform.h"
@ -2212,6 +2212,8 @@ static void render_color_button(int the_color, SDL_Surface * decoration,
SDL_Surface * icon);
static void handle_color_changed(void);
static int do_quick_eraser(void);
static int do_slideshow(void);
static void play_slideshow(int *selected, int num_selected, char *dirname,
char **d_names, char **d_exts, int speed);
@ -5361,6 +5363,11 @@ static void mainloop(void)
SDL_Flip(screen);
}
else if (kbd_state[SDL_SCANCODE_DELETE] /* FIXME */)
{
/* Holding [Del] while clicking; switch to temp-mode eraser! */
do_quick_eraser();
}
else
{
/* Draw something! */
@ -24320,6 +24327,104 @@ static int do_color_sel(int temp_mode)
return (chose);
}
/**
* Quick eraser mode, invoked by holding [Del] while clicking.
* (Eventually, we'll be able to detect tablet stylus erasers;
* but waiting for https://github.com/libsdl-org/SDL/issues/2217)
*/
static int do_quick_eraser(void) {
SDL_Event event;
SDLKey key;
int val_x, val_y, motioner;
int valhat_x, valhat_y, hatmotioner;
int done, old_eraser;
val_x = val_y = motioner = 0;
valhat_x = valhat_y = hatmotioner = 0;
/* Remember current eraser & switch to a suitable default */
old_eraser = cur_eraser;
cur_eraser = NUM_ERASERS - 2; /* 2nd-smallest circle */
done = 0;
do
{
while (SDL_PollEvent(&event))
{
if (event.type == SDL_QUIT)
{
done = 1;
}
else if (event.type == SDL_WINDOWEVENT)
{
handle_active(&event);
}
else if (event.type == SDL_KEYUP)
{
key = event.key.keysym.sym;
handle_keymouse(key, SDL_KEYUP, 24, NULL, NULL);
}
else if (event.type == SDL_KEYDOWN)
{
key = event.key.keysym.sym;
handle_keymouse(key, SDL_KEYDOWN, 24, NULL, NULL);
if (key == SDLK_ESCAPE)
{
/* Hit [Escape] */
done = 1;
}
}
else if (event.type == SDL_MOUSEBUTTONUP)
{
/* Released mouse button; all done */
done = 1;
}
else if (event.type == SDL_MOUSEMOTION)
{
/* Dragging around the canvas */
if (event.button.x >= r_canvas.x &&
event.button.x < r_canvas.x + r_canvas.w &&
event.button.y >= r_canvas.y
&& event.button.y < r_canvas.y + r_canvas.h)
{
do_setcursor(cursor_crosshair);
eraser_draw(oldpos_x - r_canvas.x, oldpos_y - r_canvas.y,
event.button.x - r_canvas.x, event.button.y - r_canvas.y);
}
oldpos_x = event.motion.x;
oldpos_y = event.motion.y;
}
else if (event.type == SDL_JOYAXISMOTION)
handle_joyaxismotion(event, &motioner, &val_x, &val_y);
else if (event.type == SDL_JOYHATMOTION)
handle_joyhatmotion(event, oldpos_x, oldpos_y, &valhat_x, &valhat_y,
&hatmotioner, &old_hat_ticks);
else if (event.type == SDL_JOYBALLMOTION)
handle_joyballmotion(event, oldpos_x, oldpos_y);
else if (event.type == SDL_JOYBUTTONDOWN
|| event.type == SDL_JOYBUTTONUP)
handle_joybuttonupdown(event, oldpos_x, oldpos_y);
}
if (motioner | hatmotioner)
handle_motioners(oldpos_x, oldpos_y, motioner, hatmotioner,
old_hat_ticks, val_x, val_y, valhat_x, valhat_y);
SDL_Delay(10);
}
while (!done);
cur_eraser = old_eraser;
}
/**
* Display a large prompt, allowing the user to pick a
* color from a large palette.