From fefbcb7b048eb4d8c33c918558f765fc6947e0e9 Mon Sep 17 00:00:00 2001
From: Ryo Nakano <26003928+ryonakano@users.noreply.github.com>
Date: Fri, 3 Jan 2020 13:21:50 +0900
Subject: [PATCH] Fix deprecations

---
 src/Widgets/ColorHistory.vala |  2 +-
 src/Widgets/Picker.vala       | 67 ++++++++++++++---------------------
 2 files changed, 28 insertions(+), 41 deletions(-)

diff --git a/src/Widgets/ColorHistory.vala b/src/Widgets/ColorHistory.vala
index db49c55..aaea13d 100644
--- a/src/Widgets/ColorHistory.vala
+++ b/src/Widgets/ColorHistory.vala
@@ -180,7 +180,7 @@ namespace ColorPicker.Widgets {
             ctx.rel_line_to (triangle_width / 2, -1 * triangle_height);
             ctx.rel_line_to (triangle_width / 2, triangle_height);
             ctx.close_path ();                                     
-            Gdk.cairo_set_source_rgba (ctx, style_context.get_background_color(Gtk.StateFlags.NORMAL));            
+            Gdk.cairo_set_source_rgba (ctx, style_context.get_color (Gtk.StateFlags.NORMAL));            
             ctx.fill ();   
            
             
diff --git a/src/Widgets/Picker.vala b/src/Widgets/Picker.vala
index 78c57a7..7d259f3 100644
--- a/src/Widgets/Picker.vala
+++ b/src/Widgets/Picker.vala
@@ -72,8 +72,10 @@ namespace ColorPicker.Widgets {
                 zoomlevel = settings.zoomlevel;
             }
 
-            var screen = get_screen ();            
-            set_default_size (screen.get_width (), screen.get_height ());
+            var display = Gdk.Display.get_default ();
+            Gdk.Monitor monitor = display.get_primary_monitor ();
+            Gdk.Rectangle geom = monitor.get_geometry ();
+            set_default_size (geom.width, geom.height);
         }   
 
         
@@ -130,9 +132,11 @@ namespace ColorPicker.Widgets {
         
         
         public void set_magnifier_cursor () {
-             // draw cursor
+            var manager = Gdk.Display.get_default ().get_default_seat ();
+
+            // draw cursor
              int px, py;
-             get_pointer (out px, out py);
+             get_window ().get_device_position (manager.get_pointer (), out px, out py, null);
 
              var radius = snapsize * zoomlevel / 2;
              
@@ -220,15 +224,13 @@ namespace ColorPicker.Widgets {
             */
                 
             // Set the cursor            
-            var manager = Gdk.Display.get_default ().get_device_manager ();
-            manager.get_client_pointer ().grab (
+            manager.grab (
                 get_window (),
-                Gdk.GrabOwnership.APPLICATION,
+                Gdk.SeatCapabilities.ALL,
                 true,
-                Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.POINTER_MOTION_MASK | Gdk.EventMask.SCROLL_MASK,
                 magnifier,
-                Gdk.CURRENT_TIME);      
-                                      
+                new Gdk.Event (Gdk.EventType.BUTTON_PRESS | Gdk.EventType.MOTION_NOTIFY | Gdk.EventType.SCROLL),
+                null);
         }     
          
         
@@ -241,10 +243,10 @@ namespace ColorPicker.Widgets {
 
 
         public override bool key_press_event (Gdk.EventKey e) {
+            var manager = Gdk.Display.get_default ().get_default_seat ();
             int px, py;
-            get_pointer (out px, out py);
-            var manager = Gdk.Display.get_default ().get_device_manager ();
-                            
+            get_window ().get_device_position (manager.get_pointer (), out px, out py, null);
+
             switch (e.keyval) {
                 case Gdk.Key.Escape:
                     cancelled ();
@@ -254,16 +256,16 @@ namespace ColorPicker.Widgets {
                     picked (color);
                     break;
                 case Gdk.Key.Up:
-                    manager.get_client_pointer ().warp (get_screen (), px, py - 1);
+                    manager.get_pointer ().warp (get_screen (), px, py - 1);
                     break;
                 case Gdk.Key.Down:
-                    manager.get_client_pointer ().warp (get_screen (), px, py + 1);
+                    manager.get_pointer ().warp (get_screen (), px, py + 1);
                     break;
                 case Gdk.Key.Left:
-                    manager.get_client_pointer ().warp (get_screen (), px - 1, py);
+                    manager.get_pointer ().warp (get_screen (), px - 1, py);
                     break;
                 case Gdk.Key.Right:
-                    manager.get_client_pointer ().warp (get_screen (), px + 1, py);
+                    manager.get_pointer ().warp (get_screen (), px + 1, py);
                     break;
             }
            
@@ -297,38 +299,23 @@ namespace ColorPicker.Widgets {
 
         public override void show_all () {
             base.show_all ();                            
-            
-            var manager = Gdk.Display.get_default ().get_device_manager ();
-            var pointer = manager.get_client_pointer ();
-            var keyboard = pointer.get_associated_device ();
+
+            var manager = Gdk.Display.get_default ().get_default_seat ();
             var window = get_window ();
 
-            var status = pointer.grab (window,
-                        Gdk.GrabOwnership.NONE,
+            var status = manager.grab (window,
+                        Gdk.SeatCapabilities.ALL,
                         false,
-                        Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.BUTTON_RELEASE_MASK | Gdk.EventMask.POINTER_MOTION_MASK,
                         new Gdk.Cursor.for_display (window.get_display (), Gdk.CursorType.CROSSHAIR),
-                        Gtk.get_current_event_time ());
-            
+                        new Gdk.Event (Gdk.EventType.BUTTON_PRESS | Gdk.EventType.BUTTON_RELEASE | Gdk.EventType.MOTION_NOTIFY),
+                        null);
+
             if (status != Gdk.GrabStatus.SUCCESS) {
-                pointer.ungrab (Gtk.get_current_event_time ());
+                manager.ungrab ();
             }
 
             // show magnifier
             set_magnifier_cursor ();
-    
-            if (keyboard != null) {
-                status = keyboard.grab (window,
-                        Gdk.GrabOwnership.NONE,
-                        false,
-                        Gdk.EventMask.KEY_PRESS_MASK,
-                        null,
-                        Gtk.get_current_event_time ());
-
-                if (status != Gdk.GrabStatus.SUCCESS) {
-                    keyboard.ungrab (Gtk.get_current_event_time ());
-                }                
-            }
         }        
 
         public new void close () {