callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: rename gimp_motion_buffer_eval_event() to motion_event()

Browse Source 
because it's feeding it motion events.
This commit is contained in:
Michael Natterer
2011-04-18 01:09:57 +02:00
parent 6f865eda2b
commit d62cf65030
3 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/display/gimpdisplayshell-tool-events.c
View File

@ -917,12 +917,12 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
/* Early removal of useless events saves CPU time.
*/
if (gimp_motion_buffer_eval_event (shell->motion_buffer,
shell->scale_x,
shell->scale_y,
&image_coords,
TRUE,
history_events[i]->time))
if (gimp_motion_buffer_motion_event (shell->motion_buffer,
&image_coords,
history_events[i]->time,
shell->scale_x,
shell->scale_y,
TRUE))
{
gimp_motion_buffer_process_event_queue (shell->motion_buffer,
state,
@ -938,12 +938,12 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
/* Early removal of useless events saves CPU time.
*/
if (gimp_motion_buffer_eval_event (shell->motion_buffer,
shell->scale_x,
shell->scale_y,
&image_coords,
event_fill,
time))
if (gimp_motion_buffer_motion_event (shell->motion_buffer,
&image_coords,
time,
shell->scale_x,
shell->scale_y,
event_fill))
{
gimp_motion_buffer_process_event_queue (shell->motion_buffer,
state,
@ -959,12 +959,12 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
/* Early removal of useless events saves CPU time.
* Pass event_fill = FALSE since we are only hovering.
*/
if (gimp_motion_buffer_eval_event (shell->motion_buffer,
shell->scale_x,
shell->scale_y,
&image_coords,
FALSE,
time))
if (gimp_motion_buffer_motion_event (shell->motion_buffer,
&image_coords,
time,
shell->scale_x,
shell->scale_y,
FALSE))
{
GimpCoords buf_coords;

66
app/display/gimpmotionbuffer.c
View File

@ -216,7 +216,7 @@ gimp_motion_buffer_finish_stroke (GimpMotionBuffer *buffer)
}
/**
* gimp_motion_buffer_eval_event:
* gimp_motion_buffer_motion_event:
* @buffer:
* @coords:
* @inertia_factor:
@ -240,12 +240,12 @@ gimp_motion_buffer_finish_stroke (GimpMotionBuffer *buffer)
* Return value:
**/
gboolean
gimp_motion_buffer_eval_event (GimpMotionBuffer *buffer,
gdouble scale_x,
gdouble scale_y,
GimpCoords *coords,
gboolean event_fill,
guint32 time)
gimp_motion_buffer_motion_event (GimpMotionBuffer *buffer,
GimpCoords *coords,
guint32 time,
gdouble scale_x,
gdouble scale_y,
gboolean event_fill)
{
gdouble delta_time = 0.001;
gdouble delta_x = 0.0;
@ -426,32 +426,6 @@ gimp_motion_buffer_eval_event (GimpMotionBuffer *buffer,
return TRUE;
}
void
gimp_motion_buffer_push_event_history (GimpMotionBuffer *buffer,
const GimpCoords *coords)
{
g_return_if_fail (GIMP_IS_MOTION_BUFFER (buffer));
g_return_if_fail (coords != NULL);
if (buffer->event_history->len == 4)
g_array_remove_index (buffer->event_history, 0);
g_array_append_val (buffer->event_history, *coords);
}
void
gimp_motion_buffer_pop_event_queue (GimpMotionBuffer *buffer,
GimpCoords *coords)
{
g_return_if_fail (GIMP_IS_MOTION_BUFFER (buffer));
g_return_if_fail (coords != NULL);
g_return_if_fail (buffer->event_queue->len > 0);
*coords = g_array_index (buffer->event_queue, GimpCoords, 0);
g_array_remove_index (buffer->event_queue, 0);
}
void
gimp_motion_buffer_process_event_queue (GimpMotionBuffer *buffer,
GdkModifierType state,
@ -502,6 +476,32 @@ gimp_motion_buffer_process_event_queue (GimpMotionBuffer *buffer,
}
}
void
gimp_motion_buffer_push_event_history (GimpMotionBuffer *buffer,
const GimpCoords *coords)
{
g_return_if_fail (GIMP_IS_MOTION_BUFFER (buffer));
g_return_if_fail (coords != NULL);
if (buffer->event_history->len == 4)
g_array_remove_index (buffer->event_history, 0);
g_array_append_val (buffer->event_history, *coords);
}
void
gimp_motion_buffer_pop_event_queue (GimpMotionBuffer *buffer,
GimpCoords *coords)
{
g_return_if_fail (GIMP_IS_MOTION_BUFFER (buffer));
g_return_if_fail (coords != NULL);
g_return_if_fail (buffer->event_queue->len > 0);
*coords = g_array_index (buffer->event_queue, GimpCoords, 0);
g_array_remove_index (buffer->event_queue, 0);
}
/* private functions */

8
app/display/gimpmotionbuffer.h
View File

@ -78,12 +78,12 @@ void gimp_motion_buffer_start_stroke (GimpMotionBuffer *buffer,
GimpCoords *last_motion);
void gimp_motion_buffer_finish_stroke (GimpMotionBuffer *buffer);
gboolean gimp_motion_buffer_eval_event (GimpMotionBuffer *buffer,
gboolean gimp_motion_buffer_motion_event (GimpMotionBuffer *buffer,
GimpCoords *coords,
guint32 time,
gdouble scale_x,
gdouble scale_y,
GimpCoords *coords,
gboolean event_fill,
guint32 time);
gboolean event_fill);
void gimp_motion_buffer_push_event_history (GimpMotionBuffer *buffer,
const GimpCoords *coords);