From 4c9af7267d20ec31d57f1bd1c334b316fb681fa9 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Fri, 6 Nov 2015 16:24:34 -0500
Subject: [PATCH] Revert "Force cursor update after applying configuration"

This reverts commit 33150569cd9880af04be2ae3ab379578ff88312d.

This was a stow-a-away sitting in my local tree.
---
 src/backends/native/meta-launcher.c           | 37 ------------------
 .../native/meta-monitor-manager-kms.c         | 38 -------------------
 2 files changed, 75 deletions(-)

diff --git a/src/backends/native/meta-launcher.c b/src/backends/native/meta-launcher.c
index 013f40e07..d7da9e87c 100644
--- a/src/backends/native/meta-launcher.c
+++ b/src/backends/native/meta-launcher.c
@@ -109,30 +109,6 @@ get_seat_proxy (GCancellable *cancellable)
   return seat;
 }
 
-static void
-frame_callback (CoglOnscreen  *onscreen,
-                CoglFrameEvent event,
-                CoglFrameInfo *frame_info,
-                void          *user_data)
-{
-  CoglFrameClosure **frame_closure = user_data;
-
-  MetaBackend *backend = meta_get_backend ();
-  MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (backend);
-  CoglOnscreen *cogl_onscreen;
-
-  if (event != COGL_FRAME_EVENT_COMPLETE)
-    return;
-
-  meta_cursor_renderer_native_force_update (META_CURSOR_RENDERER_NATIVE (renderer));
-
-  cogl_onscreen = COGL_ONSCREEN (cogl_get_draw_framebuffer ());
-  cogl_onscreen_remove_frame_callback (cogl_onscreen,
-                                       *frame_closure);
-
-  *frame_closure = NULL;
-}
-
 static void
 session_unpause (void)
 {
@@ -152,8 +128,6 @@ session_unpause (void)
     MetaBackend *backend = meta_get_backend ();
     MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (backend);
     ClutterActor *stage = meta_backend_get_stage (backend);
-    CoglOnscreen *cogl_onscreen;
-    static CoglFrameClosure *frame_closure = NULL;
 
     /* When we mode-switch back, we need to immediately queue a redraw
      * in case nothing else queued one for us, and force the cursor to
@@ -161,17 +135,6 @@ session_unpause (void)
 
     clutter_actor_queue_redraw (stage);
     meta_cursor_renderer_native_force_update (META_CURSOR_RENDERER_NATIVE (renderer));
-
-    cogl_onscreen = COGL_ONSCREEN (cogl_get_draw_framebuffer ());
-
-    if (frame_closure)
-        cogl_onscreen_remove_frame_callback (cogl_onscreen, frame_closure);
-
-    frame_closure = cogl_onscreen_add_frame_callback (cogl_onscreen,
-                                                      frame_callback,
-                                                      &frame_closure,
-                                                      NULL);
-
     meta_idle_monitor_native_reset_idletime (meta_idle_monitor_get_core ());
   }
 }
diff --git a/src/backends/native/meta-monitor-manager-kms.c b/src/backends/native/meta-monitor-manager-kms.c
index b56d6d375..cc2b18eb2 100644
--- a/src/backends/native/meta-monitor-manager-kms.c
+++ b/src/backends/native/meta-monitor-manager-kms.c
@@ -25,8 +25,6 @@
 
 #include "meta-monitor-manager-kms.h"
 #include "meta-monitor-config.h"
-#include "backends/meta-backend-private.h"
-#include "meta-cursor-renderer-native.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -79,9 +77,6 @@ struct _MetaMonitorManagerKms
   drmModeConnector **connectors;
   unsigned int       n_connectors;
 
-  /* used to find out when configuration has been applied */
-  CoglFrameClosure *frame_closure;
-
   GUdevClient *udev;
 
   GSettings *desktop_settings;
@@ -910,29 +905,6 @@ set_underscan (MetaMonitorManagerKms *manager_kms,
     }
 }
 
-static void
-frame_callback (CoglOnscreen  *onscreen,
-                CoglFrameEvent event,
-                CoglFrameInfo *frame_info,
-                void          *user_data)
-{
-  MetaMonitorManagerKms *manager_kms = user_data;
-  MetaBackend *backend = meta_get_backend ();
-  MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (backend);
-  CoglOnscreen *cogl_onscreen;
-
-  if (event != COGL_FRAME_EVENT_COMPLETE)
-    return;
-
-  meta_cursor_renderer_native_force_update (META_CURSOR_RENDERER_NATIVE (renderer));
-
-  cogl_onscreen = COGL_ONSCREEN (cogl_get_draw_framebuffer ());
-  cogl_onscreen_remove_frame_callback (cogl_onscreen,
-                                       manager_kms->frame_closure);
-
-  manager_kms->frame_closure = NULL;
-}
-
 static void
 meta_monitor_manager_kms_apply_configuration (MetaMonitorManager *manager,
                                               MetaCRTCInfo       **crtcs,
@@ -944,7 +916,6 @@ meta_monitor_manager_kms_apply_configuration (MetaMonitorManager *manager,
   ClutterBackend *backend;
   CoglContext *cogl_context;
   CoglDisplay *cogl_display;
-  CoglOnscreen *cogl_onscreen;
   unsigned i;
   GPtrArray *cogl_crtcs;
   int screen_width, screen_height;
@@ -1080,15 +1051,6 @@ meta_monitor_manager_kms_apply_configuration (MetaMonitorManager *manager,
       return;
     }
 
-  cogl_onscreen = COGL_ONSCREEN (cogl_get_draw_framebuffer ());
-  if (manager_kms->frame_closure)
-    cogl_onscreen_remove_frame_callback (cogl_onscreen,
-                                         manager_kms->frame_closure);
-  manager_kms->frame_closure = cogl_onscreen_add_frame_callback (cogl_onscreen,
-                                                                 frame_callback,
-                                                                 manager,
-                                                                 NULL);
-
   for (i = 0; i < n_outputs; i++)
     {
       MetaOutputInfo *output_info = outputs[i];