dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get rid of gdk_flush() globally, use gdk_display_flush()

This commit is contained in:
Michael Natterer 2018-05-08 00:54:02 +02:00
parent f7f329b7e2
commit 1d8696cd80
13 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/display/gimpnavigationeditor.c
View File

@ -340,7 +340,7 @@ gimp_navigation_editor_popup (GimpDisplayShell *shell,
}
gtk_widget_show (shell->nav_popup);
gdk_flush ();
gdk_display_flush (gtk_widget_get_display (shell->nav_popup));
/* fill in then grab pointer */
gimp_navigation_view_set_motion_offset (view, 0, 0);

4
app/gui/gui-vtable.c
View File

@ -230,7 +230,7 @@ gui_set_busy (Gimp *gimp)
gimp_displays_set_busy (gimp);
gimp_dialog_factory_set_busy (gimp_dialog_factory_get_singleton ());
gdk_flush ();
gdk_display_flush (gdk_display_get_default ());
}
static void
@ -239,7 +239,7 @@ gui_unset_busy (Gimp *gimp)
gimp_displays_unset_busy (gimp);
gimp_dialog_factory_unset_busy (gimp_dialog_factory_get_singleton ());
gdk_flush ();
gdk_display_flush (gdk_display_get_default ());
}
static void

13
app/tools/gimpeditselectiontool.c
View File

@ -516,13 +516,14 @@ gimp_edit_selection_tool_update_motion (GimpEditSelectionTool *edit_select,
gdouble new_y,
GimpDisplay *display)
{
GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (edit_select);
GimpTool *tool = GIMP_TOOL (edit_select);
GimpImage *image = gimp_display_get_image (display);
gint dx;
gint dy;
GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (edit_select);
GimpTool *tool = GIMP_TOOL (edit_select);
GimpDisplayShell *shell = gimp_display_get_shell (display);
GimpImage *image = gimp_display_get_image (display);
gint dx;
gint dy;
gdk_flush ();
gdk_display_flush (gtk_widget_get_display (GTK_WIDGET (shell)));
gimp_draw_tool_pause (draw_tool);

2
app/widgets/gimpwidgets-utils.c
View File

@ -1411,7 +1411,7 @@ gimp_widget_flush_expose (GtkWidget *widget)
return;
gdk_window_process_updates (gtk_widget_get_window (widget), FALSE);
gdk_flush ();
gdk_display_flush (gtk_widget_get_display (widget));
}
gboolean

2
libgimpwidgets/gimppreview.c
View File

@ -523,7 +523,7 @@ gimp_preview_invalidate_now (GimpPreview *preview)
gdk_window_set_cursor (gtk_widget_get_window (priv->area),
priv->cursor_busy);
gdk_flush ();
gdk_display_flush (gtk_widget_get_display (toplevel));
g_signal_emit (preview, preview_signals[INVALIDATED], 0);

10
libgimpwidgets/test-preview-area.c
View File

@ -84,7 +84,7 @@ test_run (GtkWidget *area,
}
gdk_window_process_all_updates ();
gdk_flush ();
gdk_display_flush (gtk_widget_get_display (area));
timer = g_timer_new ();
@ -108,7 +108,7 @@ test_run (GtkWidget *area,
gdk_window_process_updates (area->window, FALSE);
}
gdk_flush ();
gdk_display_flush (gtk_widget_get_display (area));
total_time = g_timer_elapsed (timer, NULL) - start_time;
g_print ("%-20s "
@ -138,7 +138,7 @@ test_run (GtkWidget *area,
gdk_window_process_updates (area->window, FALSE);
}
gdk_flush ();
gdk_display_flush (gtk_widget_get_display (area));
total_time = g_timer_elapsed (timer, NULL) - start_time;
g_print ("%-20s "
@ -170,7 +170,7 @@ test_run (GtkWidget *area,
gdk_window_process_updates (area->window, FALSE);
}
gdk_flush ();
gdk_display_flush (gtk_widget_get_display (area));
total_time = g_timer_elapsed (timer, NULL) - start_time;
g_print ("%-20s "
@ -197,7 +197,7 @@ test_run (GtkWidget *area,
gdk_window_process_updates (area->window, FALSE);
}
gdk_flush ();
gdk_display_flush (gtk_widget_get_display (area));
total_time = g_timer_elapsed (timer, NULL) - start_time;
g_print ("%-20s "
"fill : %5.2fs, %8.1f fps, %8.2f megapixels/s\n",

2
plug-ins/common/animation-play.c
View File

@ -450,7 +450,7 @@ shape_released (GtkWidget *widget)
{
gtk_grab_remove (widget);
gdk_display_pointer_ungrab (gtk_widget_get_display (widget), 0);
gdk_flush ();
gdk_display_flush (gtk_widget_get_display (widget));
return FALSE;
}

4
plug-ins/common/curve-bend.c
View File

@ -1145,7 +1145,7 @@ do_dialog (GimpDrawable *drawable)
bender_update (cd, UP_GRAPH | UP_DRAW | UP_PREVIEW_EXPOSE);
gtk_main ();
gdk_flush ();
gdk_display_flush (gtk_widget_get_display (cd->shell));
gimp_image_delete(cd->preview_image_id);
cd->preview_image_id = -1;
@ -1525,7 +1525,7 @@ bender_update (BenderDialog *cd,
{
gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (cd->shell)),
cd->cursor_busy);
gdk_flush ();
gdk_display_flush (gtk_widget_get_display (cd->shell));
if (cd->preview_layer_id2 >= 0)
gimp_image_remove_layer(cd->preview_image_id, cd->preview_layer_id2);

2
plug-ins/file-jpeg/jpeg-save.c
View File

@ -228,7 +228,7 @@ background_jpeg_save (PreviewPersistent *pp)
prev_p = NULL;
gimp_displays_flush ();
gdk_flush ();
gdk_display_flush (gdk_display_get_default ());
return FALSE;
}

2
plug-ins/ifs-compose/ifs-compose.c
View File

@ -965,7 +965,7 @@ ifs_compose_dialog (gint32 drawable_id)
if (ifsOptD)
gtk_widget_destroy (ifsOptD->dialog);
gdk_flush ();
gdk_display_flush (gdk_display_get_default ());
g_free (ifsD);

2
plug-ins/lighting/lighting-preview.c
View File

@ -394,7 +394,7 @@ preview_compute (void)
cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
g_object_unref (cursor);
gdk_flush ();
gdk_display_flush (display);
}

2
plug-ins/screenshot/screenshot-x11.c
View File

@ -148,7 +148,7 @@ select_window (ScreenshotValues *shootvals,
#undef X_GRAB_KEY
gdk_flush ();
gdk_display_flush (gdk_monitor_get_display (monitor));
if (gdk_error_trap_pop ())
{

3
plug-ins/screenshot/screenshot.c
View File

@ -343,7 +343,8 @@ run (const gchar *name,
if (shootvals.select_delay > 0)
{
gdk_display_beep (gdk_monitor_get_display (monitor));
gdk_flush (); /* flush so the beep makes it to the server */
/* flush so the beep makes it to the server */
gdk_display_flush (gdk_monitor_get_display (monitor));
}
}