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

Sped up XOR animation by ignoring some motion events, if needed.

Browse source
This commit is contained in:
William Kendrick 2003-07-20 10:18:41 +00:00
parent dc03f181eb
commit cab5439e13
2 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/CHANGES.txt
View file

@ -42,6 +42,10 @@ http://www.newbreedsoftware.com/tuxpaint/
* Simplified CFLAGS variable in Makefile. * Simplified CFLAGS variable in Makefile.
Ben Armstrong <synrg@sanctuary.nslug.ns.ca> Ben Armstrong <synrg@sanctuary.nslug.ns.ca>
* Made main event loop ignore motion events if the loop has spun too long.
(Fixes problems where shape or stamp tools take forver to 'catch up' with
the mouse; especially noticable on slow machines over remote X display.)
2003.Jun.17 (0.9.11) 2003.Jun.17 (0.9.11)
* Windows bugfixes. * Windows bugfixes.

33
src/tuxpaint.c
View file

@ -737,13 +737,14 @@ void mainloop(void)
shape_ctr_x, shape_ctr_y, shape_outer_x, shape_outer_y; shape_ctr_x, shape_ctr_y, shape_outer_x, shape_outer_y;
int num_things, thing_scroll, cur_thing, old_thing, do_draw, old_tool, int num_things, thing_scroll, cur_thing, old_thing, do_draw, old_tool,
tmp_int; tmp_int;
int cur_time, last_print_time, scrolling; int cur_time, last_print_time, scrolling, ignoring_motion;
SDL_TimerID scrolltimer; SDL_TimerID scrolltimer;
SDL_Event event; SDL_Event event;
SDLKey key, key_down; SDLKey key, key_down;
Uint16 key_unicode; Uint16 key_unicode;
SDLMod mod; SDLMod mod;
Uint32 last_cursor_blink, cur_cursor_blink; Uint32 last_cursor_blink, cur_cursor_blink,
pre_event_time, current_event_time;
num_things = 0; num_things = 0;
@ -776,8 +777,19 @@ void mainloop(void)
do do
{ {
ignoring_motion = 0;
pre_event_time = SDL_GetTicks();
while (SDL_PollEvent(&event)) while (SDL_PollEvent(&event))
{ {
current_event_time = SDL_GetTicks();
if (current_event_time > pre_event_time + 250)
ignoring_motion = 1;
if (event.type == SDL_QUIT) if (event.type == SDL_QUIT)
{ {
done = do_quit(); done = do_quit();
@ -1703,7 +1715,7 @@ void mainloop(void)
old_y + (img_stamps[cur_stamp]->h / 2)); old_y + (img_stamps[cur_stamp]->h / 2));
#else #else
stamp_xor(old_x - (img_stamps[cur_stamp]->w / 2), stamp_xor(old_x - (img_stamps[cur_stamp]->w / 2),
old_y - (img_stamps[cur_stamp]->h / 2)); old_y - (img_stamps[cur_stamp]->h / 2));
#endif #endif
playsound(1, SND_STAMP, 1); playsound(1, SND_STAMP, 1);
@ -2145,7 +2157,7 @@ void mainloop(void)
button_down = 0; button_down = 0;
} }
else if (event.type == SDL_MOUSEMOTION) else if (event.type == SDL_MOUSEMOTION && !ignoring_motion)
{ {
new_x = event.button.x - 96; new_x = event.button.x - 96;
new_y = event.button.y; new_y = event.button.y;
@ -2373,10 +2385,10 @@ void mainloop(void)
stamp_xor(old_x - w / 2, old_y - h / 2); stamp_xor(old_x - w / 2, old_y - h / 2);
else else
rect_xor(old_x - w / 2, old_y - h / 2, rect_xor(old_x - w / 2, old_y - h / 2,
old_x + w / 2, old_y + h / 2); old_x + w / 2, old_y + h / 2);
#else #else
rect_xor(old_x - w / 2, old_y - h / 2, rect_xor(old_x - w / 2, old_y - h / 2,
old_x + w / 2, old_y + h / 2); old_x + w / 2, old_y + h / 2);
#endif #endif
update_screen(old_x - w / 2 + 96, old_y - h / 2, update_screen(old_x - w / 2 + 96, old_y - h / 2,
old_x + w / 2 + 96, old_y + h / 2); old_x + w / 2 + 96, old_y + h / 2);
@ -6004,7 +6016,7 @@ void line_xor(int x1, int y1, int x2, int y2)
/* Kludgey, but it works: */ /* Kludgey, but it works: */
SDL_LockSurface(screen); //SDL_LockSurface(screen);
dx = x2 - x1; dx = x2 - x1;
dy = y2 - y1; dy = y2 - y1;
@ -6038,8 +6050,10 @@ void line_xor(int x1, int y1, int x2, int y2)
{ {
num_drawn++; num_drawn++;
if (num_drawn < 10 || dont_do_xor == 0) if (num_drawn < 10 || dont_do_xor == 0)
{
clipped_putpixel(screen, x1 + 96, y, clipped_putpixel(screen, x1 + 96, y,
0xFFFFFFFF - getpixel(screen, x1 + 96, y)); 0xFFFFFFFF - getpixel(screen, x1 + 96, y));
}
} }
x1 = x1 + dx; x1 = x1 + dx;
@ -6075,7 +6089,7 @@ void line_xor(int x1, int y1, int x2, int y2)
} }
} }
SDL_UnlockSurface(screen); //SDL_UnlockSurface(screen);
} }
@ -7736,7 +7750,6 @@ void update_shape(int cx, int ox1, int ox2, int cy, int oy1, int oy2, int fix)
} }
/* Draw a shape! */ /* Draw a shape! */
void do_shape(int cx, int cy, int ox, int oy, int rotn, int use_brush) void do_shape(int cx, int cy, int ox, int oy, int rotn, int use_brush)
@ -7851,7 +7864,7 @@ void do_shape(int cx, int cy, int ox, int oy, int rotn, int use_brush)
if (!use_brush) if (!use_brush)
{ {
/* (XOR) */ /* (XOR) */
line_xor(x1, y1, x2, y2); line_xor(x1, y1, x2, y2);
} }
else else