Merge tag 'upstream/0.5.7'

Upstream version 0.5.7

2 files changed, 94 insertions, 94 deletions

diff --git a/src/renderers/pieRenderer.vala b/src/renderers/pieRenderer.vala
index 7135381..8085758 100644
--- a/src/renderers/pieRenderer.vala
+++ b/src/renderers/pieRenderer.vala
@@ -1,4 +1,4 @@
-/* 
+/*
 Copyright (c) 2011 by Simon Schneegans
 
 This program is free software: you can redistribute it and/or modify it
@@ -12,14 +12,14 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 more details.
 
 You should have received a copy of the GNU General Public License along with
-this program.  If not, see <http://www.gnu.org/licenses/>. 
+this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 using GLib.Math;
 
 namespace GnomePie {
 
-/////////////////////////////////////////////////////////////////////////    
+/////////////////////////////////////////////////////////////////////////
 /// This class renders a Pie. In order to accomplish that, it owns a
 /// CenterRenderer and some SliceRenderers.
 /////////////////////////////////////////////////////////////////////////
@@ -35,14 +35,14 @@ public class PieRenderer : GLib.Object {
 
     /////////////////////////////////////////////////////////////////////
     /// The index of the currently active slice.
-    /////////////////////////////////////////////////////////////////////    
-    
+    /////////////////////////////////////////////////////////////////////
+
     public int active_slice { get; private set; }
 
     /////////////////////////////////////////////////////////////////////
     /// True, if the hot keys are currently displayed.
     /////////////////////////////////////////////////////////////////////
-    
+
     public bool show_hotkeys { get; set; }
 
     /////////////////////////////////////////////////////////////////////
@@ -50,195 +50,195 @@ public class PieRenderer : GLib.Object {
     /////////////////////////////////////////////////////////////////////
 
     public int size { get; private set; }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// True if the pie should close when it's trigger is released.
     /////////////////////////////////////////////////////////////////////
-    
+
     public bool turbo_mode { get; private set; default=false; }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// True if the pie is currently navigated with the keyboard. This is
     /// set to false as soon as the mouse moves.
     /////////////////////////////////////////////////////////////////////
-    
+
     public bool key_board_control { get; set; default=false; }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// All SliceRenderers used to draw this Pie.
     /////////////////////////////////////////////////////////////////////
-    
+
     private Gee.ArrayList<SliceRenderer?> slices;
-    
+
     /////////////////////////////////////////////////////////////////////
     /// The renderer for the center of this pie.
     /////////////////////////////////////////////////////////////////////
-    
+
     private CenterRenderer center;
-    
+
     /////////////////////////////////////////////////////////////////////
     /// C'tor, initializes members.
     /////////////////////////////////////////////////////////////////////
-    
+
     public PieRenderer() {
-        this.slices = new Gee.ArrayList<SliceRenderer?>(); 
+        this.slices = new Gee.ArrayList<SliceRenderer?>();
         this.center = new CenterRenderer(this);
         this.quickaction = -1;
         this.active_slice = -2;
         this.size = 0;
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Loads a Pie. All members are initialized accordingly.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void load_pie(Pie pie) {
         this.slices.clear();
-    
+
         int count = 0;
         foreach (var group in pie.action_groups) {
             foreach (var action in group.actions) {
                 var renderer = new SliceRenderer(this);
                 this.slices.add(renderer);
                 renderer.load(action, slices.size-1);
-                
+
                 if (action.is_quickaction) {
                     this.quickaction = count;
                 }
-                
+
                 ++count;
             }
         }
-        
+
         this.turbo_mode = PieManager.get_is_turbo(pie.id);
-        
+
         this.set_highlighted_slice(this.quickaction);
-        
+
         this.size = (int)fmax(2*Config.global.theme.radius + 2*Config.global.theme.slice_radius*Config.global.theme.max_zoom,
                               2*Config.global.theme.center_radius);
-        
+
         // increase size if there are many slices
         if (slices.size > 0) {
             this.size = (int)fmax(this.size,
-                (((Config.global.theme.slice_radius + Config.global.theme.slice_gap)/tan(PI/slices.size)) 
+                (((Config.global.theme.slice_radius + Config.global.theme.slice_gap)/tan(PI/slices.size))
                 + Config.global.theme.slice_radius)*2*Config.global.theme.max_zoom);
         }
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Activates the currently active slice.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void activate() {
         if (this.active_slice >= 0 && this.active_slice < this.slices.size) {
             slices[active_slice].activate();
         }
-        
+
         foreach (var slice in this.slices)
             slice.fade_out();
-            
+
         center.fade_out();
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Asks all renders to fade out.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void cancel() {
         foreach (var slice in this.slices)
             slice.fade_out();
-            
+
         center.fade_out();
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Called when the up-key is pressed. Selects the next slice towards
-    /// the top. 
+    /// the top.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void select_up() {
         int bottom = this.slice_count()/4;
         int top = this.slice_count()*3/4;
-    
+
         if (this.active_slice == -1 || this.active_slice == bottom)
            this.set_highlighted_slice(top);
         else if (this.active_slice > bottom && this.active_slice < top)
            this.set_highlighted_slice(this.active_slice+1);
         else if (this.active_slice != top)
            this.set_highlighted_slice((this.active_slice-1+this.slice_count())%this.slice_count());
-           
+
         this.key_board_control = true;
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Called when the down-key is pressed. Selects the next slice
-    /// towards the bottom. 
+    /// towards the bottom.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void select_down() {
         int bottom = this.slice_count()/4;
         int top = this.slice_count()*3/4;
-    
+
         if (this.active_slice == -1 || this.active_slice == top)
            this.set_highlighted_slice(bottom);
         else if (this.active_slice > bottom && this.active_slice < top)
            this.set_highlighted_slice(this.active_slice-1);
         else if (this.active_slice != bottom)
            this.set_highlighted_slice((this.active_slice+1)%this.slice_count());
-           
+
         this.key_board_control = true;
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Called when the left-key is pressed. Selects the next slice
-    /// towards the left. 
+    /// towards the left.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void select_left() {
         int left = this.slice_count()/2;
         int right = 0;
-    
+
         if (this.active_slice == -1 || this.active_slice == right)
            this.set_highlighted_slice(left);
         else if (this.active_slice > left)
            this.set_highlighted_slice(this.active_slice-1);
         else if (this.active_slice < left)
            this.set_highlighted_slice(this.active_slice+1);
-        
+
         this.key_board_control = true;
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Called when the right-key is pressed. Selects the next slice
-    /// towards the right. 
+    /// towards the right.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void select_right() {
         int left = this.slice_count()/2;
         int right = 0;
-    
+
         if (this.active_slice == -1 || this.active_slice == left)
            this.set_highlighted_slice(right);
         else if (this.active_slice > left)
            this.set_highlighted_slice((this.active_slice+1)%this.slice_count());
         else if (this.active_slice < left && this.active_slice != right)
            this.set_highlighted_slice((this.active_slice-1+this.slice_count())%this.slice_count());
-           
+
         this.key_board_control = true;
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Returns the amount of slices in this pie.
     /////////////////////////////////////////////////////////////////////
-    
+
     public int slice_count() {
         return slices.size;
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Draws the entire pie.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void draw(double frame_time, Cairo.Context ctx, int mouse_x, int mouse_y) {
         if (this.size > 0) {
 	        double distance = sqrt(mouse_x*mouse_x + mouse_y*mouse_y);
@@ -247,62 +247,62 @@ public class PieRenderer : GLib.Object {
 	        if (this.key_board_control) {
 	            angle = 2.0*PI*this.active_slice/(double)slice_count();
 	        } else {
-	        
+
 	            if (distance > 0) {
 	                angle = acos(mouse_x/distance);
-		            if (mouse_y < 0) 
+		            if (mouse_y < 0)
 		                angle = 2*PI - angle;
 	            }
-	            
+
 	            int next_active_slice = this.active_slice;
-	            
+
 	            if (distance < Config.global.theme.active_radius
 	                && this.quickaction >= 0 && this.quickaction < this.slices.size) {
-	             
-	                next_active_slice = this.quickaction;   
+
+	                next_active_slice = this.quickaction;
 	                angle = 2.0*PI*quickaction/(double)slice_count();
-	            } else if (distance > Config.global.theme.active_radius && this.slice_count() > 0) {
+	            } else if (distance > Config.global.theme.active_radius && this.slice_count() > 0 && distance < Config.global.activation_range) {
 	                next_active_slice = (int)(angle*slices.size/(2*PI) + 0.5) % this.slice_count();
 	            } else {
 	                next_active_slice = -1;
 	            }
-	        
+
 	            this.set_highlighted_slice(next_active_slice);
 	        }
 
             center.draw(frame_time, ctx, angle, distance);
-	        
+
 	        foreach (var slice in this.slices)
 		        slice.draw(frame_time, ctx, angle, distance);
 		}
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Called when the user moves the mouse.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void on_mouse_move() {
         this.key_board_control = false;
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Called when the currently active slice changes.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void set_highlighted_slice(int index) {
         if (index != this.active_slice) {
-            if (index >= 0 && index < this.slice_count()) 
+            if (index >= 0 && index < this.slice_count())
                 this.active_slice = index;
             else if (this.quickaction >= 0)
                 this.active_slice = this.quickaction;
             else
                 this.active_slice = -1;
-            
+
             SliceRenderer? active = (this.active_slice >= 0 && this.active_slice < this.slice_count()) ?
                                      this.slices[this.active_slice] : null;
-	                    
+
             center.set_active_slice(active);
-            
+
             foreach (var slice in this.slices)
                 slice.set_active_slice(active);
         }
diff --git a/src/renderers/pieWindow.vala b/src/renderers/pieWindow.vala
index a95b3e3..da346dd 100644
--- a/src/renderers/pieWindow.vala
+++ b/src/renderers/pieWindow.vala
@@ -89,11 +89,7 @@ public class PieWindow : Gtk.Window {
 
         // check for compositing
         if (this.screen.is_composited()) {
-            #if HAVE_GTK_3
-                this.set_visual(this.screen.get_rgba_visual());
-            #else
-                this.set_colormap(this.screen.get_rgba_colormap());
-            #endif
+            this.set_visual(this.screen.get_rgba_visual());
             this.has_compositing = true;
         }
 
@@ -147,11 +143,7 @@ public class PieWindow : Gtk.Window {
         });
 
         // draw the pie on expose
-        #if HAVE_GTK_3
-            this.draw.connect(this.draw_window);
-        #else
-            this.expose_event.connect(this.draw_window);
-        #endif
+        this.draw.connect(this.draw_window);
     }
 
     /////////////////////////////////////////////////////////////////////
@@ -214,13 +206,7 @@ public class PieWindow : Gtk.Window {
     /// Draw the Pie.
     /////////////////////////////////////////////////////////////////////
 
-    #if HAVE_GTK_3
-        private bool draw_window(Cairo.Context ctx) {
-    #else
-        private bool draw_window(Gtk.Widget da, Gdk.EventExpose event) {
-            // clear the window
-            var ctx = Gdk.cairo_create(this.get_window());
-    #endif
+    private bool draw_window(Cairo.Context ctx) {
         // paint the background image if there is no compositing
         if (this.has_compositing) {
             ctx.set_operator (Cairo.Operator.CLEAR);
@@ -237,7 +223,17 @@ public class PieWindow : Gtk.Window {
 
         // get the mouse position
         double mouse_x = 0.0, mouse_y = 0.0;
-        this.get_pointer(out mouse_x, out mouse_y);
+        Gdk.ModifierType mask;
+
+        var display = Gdk.Display.get_default();
+        var manager = display.get_device_manager();
+        GLib.List<weak Gdk.Device?> list = manager.list_devices(Gdk.DeviceType.MASTER);
+
+        foreach(var device in list) {
+            if (device.input_source != Gdk.InputSource.KEYBOARD) {
+                this.get_window().get_device_position_double(device, out mouse_x, out mouse_y, out mask);
+            }
+        }
 
         // store the frame time
         double frame_time = this.timer.elapsed();
@@ -260,7 +256,11 @@ public class PieWindow : Gtk.Window {
             this.on_closing();
             Gtk.grab_remove(this);
             FocusGrabber.ungrab();
-            this.renderer.activate();
+
+            GLib.Timeout.add(10, () => {
+                this.renderer.activate();
+                return false;
+            });
 
             GLib.Timeout.add((uint)(Config.global.theme.fade_out_time*1000), () => {
                 this.closed = true;