[metacity] compositor: merge repair_display and repair_screen
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] compositor: merge repair_display and repair_screen
- Date: Sat, 4 Mar 2017 16:49:41 +0000 (UTC)
commit 805f8f9ef5d9808f08d7ab5b0a3369d420fa7eb6
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sat Mar 4 16:34:40 2017 +0200
compositor: merge repair_display and repair_screen
src/compositor/meta-compositor-xrender.c | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
---
diff --git a/src/compositor/meta-compositor-xrender.c b/src/compositor/meta-compositor-xrender.c
index e219b4b..53ed3f4 100644
--- a/src/compositor/meta-compositor-xrender.c
+++ b/src/compositor/meta-compositor-xrender.c
@@ -1742,37 +1742,24 @@ paint_all (MetaCompositorXRender *xrender,
}
static void
-repair_screen (MetaCompositorXRender *xrender,
- MetaScreen *screen)
+repair_display (MetaCompositorXRender *xrender)
{
- MetaDisplay *display = meta_screen_get_display (screen);
+ MetaCompositor *compositor = META_COMPOSITOR (xrender);
+ MetaDisplay *display = meta_compositor_get_display (compositor);
Display *xdisplay = meta_display_get_xdisplay (display);
+ MetaScreen *screen = meta_display_get_screen (display);
if (xrender->all_damage != None)
{
meta_error_trap_push (display);
+
paint_all (xrender, screen, xrender->all_damage);
XFixesDestroyRegion (xdisplay, xrender->all_damage);
xrender->all_damage = None;
xrender->clip_changed = FALSE;
- meta_error_trap_pop (display);
- }
-}
-static void
-repair_display (MetaCompositorXRender *xrender)
-{
- MetaCompositor *compositor = META_COMPOSITOR (xrender);
- MetaDisplay *display = meta_compositor_get_display (compositor);
- MetaScreen *screen = meta_display_get_screen (display);
-
- if (xrender->repaint_id > 0)
- {
- g_source_remove (xrender->repaint_id);
- xrender->repaint_id = 0;
+ meta_error_trap_pop (display);
}
-
- repair_screen (xrender, screen);
}
static gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]