[gtk+/wip/william/deprecations: 3/5] mir: cleanup

[William Hua <williamhua src gnome org>]

commit 60c49e4438d7e48d5bea064c9d1574e054b8e494
Author: William Hua <william hua canonical com>
Date:   Mon Feb 27 18:18:38 2017 -0500

    mir: cleanup

 gdk/mir/gdkmirwindowimpl.c |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index 7b7ebde..d050b96 100644
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -90,7 +90,7 @@ struct _GdkMirWindowImpl
   gint                rect_anchor_dx;
   gint                rect_anchor_dy;
 
-  /* Desired surface attributes */
+  /* Desired window attributes */
   GdkWindowTypeHint type_hint;
   MirWindowState window_state;
   gboolean modal;
@@ -102,7 +102,7 @@ struct _GdkMirWindowImpl
 
   GdkDisplay *display;
 
-  /* Surface being rendered to (only exists when window visible) */
+  /* Window being rendered to (only exists when visible) */
   MirWindow *mir_window;
   MirBufferStream *buffer_stream;
   MirBufferUsage buffer_usage;
@@ -115,7 +115,7 @@ struct _GdkMirWindowImpl
   GdkGeometry geometry_hints;
   GdkWindowHints geometry_mask;
 
-  /* Egl surface for the current mir surface */
+  /* Egl surface for the current mir window */
   EGLSurface egl_surface;
 
   /* Dummy MIR and EGL surfaces */
@@ -265,7 +265,7 @@ gdk_mir_window_impl_init (GdkMirWindowImpl *impl)
 {
   impl->properties = g_hash_table_new_full (NULL, NULL, NULL, gdk_mir_property_free);
   impl->type_hint = GDK_WINDOW_TYPE_HINT_NORMAL;
-  impl->window_state = mir_surface_state_unknown;
+  impl->window_state = mir_window_state_unknown;
   impl->output_scale = 1;
 }
 
@@ -276,7 +276,7 @@ set_window_state (GdkMirWindowImpl *impl,
   MirConnection *connection = gdk_mir_display_get_mir_connection (impl->display);
   MirWindowSpec *spec;
 
-  if (impl->window_state == state)
+  if (state == impl->window_state)
     return;
 
   impl->window_state = state;
@@ -411,8 +411,8 @@ apply_geometry_hints (MirWindowSpec    *spec,
     }
   if (impl->geometry_mask & GDK_HINT_ASPECT)
     {
-      mir_window_spec_set_min_aspect_ratio (spec, 1000, (unsigned)(1000.0/impl->geometry_hints.min_aspect));
-      mir_window_spec_set_max_aspect_ratio (spec, 1000, (unsigned)(1000.0/impl->geometry_hints.max_aspect));
+      mir_window_spec_set_min_aspect_ratio (spec, (guint) 1000 * impl->geometry_hints.min_aspect, 1000);
+      mir_window_spec_set_max_aspect_ratio (spec, (guint) 1000 * impl->geometry_hints.max_aspect, 1000);
     }
 }
 
@@ -468,7 +468,7 @@ create_spec (GdkWindow        *window,
 }
 
 static void
-update_surface_spec (GdkWindow *window)
+update_window_spec (GdkWindow *window)
 {
   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
   MirWindowSpec *spec;
@@ -541,7 +541,7 @@ ensure_mir_window_full (GdkWindow      *window,
   if (impl->mir_window)
     {
       if (impl->pending_spec_update)
-        update_surface_spec(window);
+        update_window_spec (window);
       return;
     }
 
@@ -576,7 +576,8 @@ ensure_mir_window_full (GdkWindow      *window,
 
   generate_configure_event (window, window->width, window->height);
 
-  mir_window_set_event_handler (impl->mir_window, event_cb, window_ref); // FIXME: Ignore some events until 
shown
+  /* FIXME: Ignore some events until shown */
+  mir_window_set_event_handler (impl->mir_window, event_cb, window_ref);
 }
 
 static void
@@ -631,7 +632,7 @@ send_buffer (GdkWindow *window)
   /* The Cairo context is no longer valid */
   g_clear_pointer (&impl->cairo_surface, cairo_surface_destroy);
   if (impl->pending_spec_update)
-    update_surface_spec (window);
+    update_window_spec (window);
 
   impl->pending_spec_update = FALSE;
 }
@@ -831,7 +832,7 @@ gdk_mir_window_impl_move_resize (GdkWindow *window,
   */
   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
 
-  /* If resize requested then rebuild surface */
+  /* If resize requested then rebuild window */
   if (width >= 0 && (window->width != width || window->height != height))
   {
     /* We accept any resize */
@@ -849,7 +850,7 @@ gdk_mir_window_impl_move_resize (GdkWindow *window,
           impl->transient_x = x;
           impl->transient_y = y;
           if (!impl->pending_spec_update && impl->mir_window)
-            update_surface_spec (window);
+            update_window_spec (window);
         }
     }
 }
@@ -987,7 +988,7 @@ gdk_mir_window_impl_move_to_rect (GdkWindow          *window,
   impl->rect_anchor_dy = rect_anchor_dy + get_window_shadow_dy (window, window_anchor);
 
   if (impl->mir_window && !impl->pending_spec_update)
-    update_surface_spec (window);
+    update_window_spec (window);
 }
 
 static gint
@@ -1219,8 +1220,8 @@ gdk_mir_window_impl_set_device_cursor (GdkWindow *window,
 {
   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
   MirConnection *connection = gdk_mir_display_get_mir_connection (impl->display);
-  const gchar *cursor_name;
   MirWindowSpec *spec;
+  const gchar *cursor_name;
 
   if (cursor)
     cursor_name = _gdk_mir_cursor_get_name (cursor);
@@ -1346,7 +1347,7 @@ gdk_mir_window_impl_set_type_hint (GdkWindow         *window,
     {
       impl->type_hint = hint;
       if (impl->mir_window && !impl->pending_spec_update)
-        update_surface_spec (window);
+        update_window_spec (window);
     }
 }
 
@@ -1369,7 +1370,7 @@ gdk_mir_window_impl_set_modal_hint (GdkWindow *window,
       impl->modal = modal;
 
       if (impl->mir_window && !impl->pending_spec_update)
-        update_surface_spec (window);
+        update_window_spec (window);
     }
 }
 
@@ -1464,7 +1465,7 @@ gdk_mir_window_impl_set_transient_for (GdkWindow *window,
   impl->transient_for = parent;
 
   if (impl->mir_window && !impl->pending_spec_update)
-    update_surface_spec (window);
+    update_window_spec (window);
 }
 
 static void
@@ -2193,7 +2194,8 @@ _gdk_mir_window_get_mir_window (GdkWindow *window)
 }
 
 void
-_gdk_mir_window_set_scale (GdkWindow *window, gdouble scale)
+_gdk_mir_window_set_scale (GdkWindow *window,
+                           gdouble    scale)
 {
   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
   GdkRectangle area = {0, 0, window->width, window->height};