1
=== modified file 'data/net.launchpad.plank.gschema.xml.in.in'
2
--- data/net.launchpad.plank.gschema.xml.in.in	2016-03-09 08:51:55 +0000
3
+++ data/net.launchpad.plank.gschema.xml.in.in	2017-01-16 09:48:10 +0000
4
@@ -71,11 +71,27 @@
5
71
			<_summary>Icon Size</_summary>
71
			<_summary>Icon Size</_summary>
6
72
			<_description>The size of dock items, in pixels.</_description>
72
			<_description>The size of dock items, in pixels.</_description>
7
73
		</key>
73
		</key>
8
74
		<key name="item-accelerator" type="s">
9
75
			<default>'Super_L'</default>
10
76
			<_summary>The base modifier-key for item keybinding shortcuts</_summary>
11
77
			<_description></_description>
12
78
		</key>
13
74
		<key name="items-alignment" enum='GtkAlignType'>
79
		<key name="items-alignment" enum='GtkAlignType'>
14
75
			<default>'center'</default>
80
			<default>'center'</default>
15
76
			<_summary>The alignment of dock items</_summary>
81
			<_summary>The alignment of dock items</_summary>
16
77
			<_description>Possible values are "fill", "start", "end", and "center".</_description>
82
			<_description>Possible values are "fill", "start", "end", and "center".</_description>
17
78
		</key>
83
		</key>
18
84
		<key name="item-option-accelerator" type="s">
19
85
			<default>'Shift_L'</default>
20
86
			<_summary>The additional modifier-key for optional item keybinding shortcuts</_summary>
21
87
			<_description></_description>
22
88
		</key>
23
89
		<key name="keybinding-unhide-delay" type="i">
24
90
			<range min="0"/>
25
91
			<default>400</default>
26
92
			<_summary>Keybinding unhide delay</_summary>
27
93
			<_description>Length of the delay before showing keybinding-overlay the dock, in milliseconds.</_description>
28
94
		</key>
29
79
		<key name="lock-items" type="b">
95
		<key name="lock-items" type="b">
30
80
			<default>false</default>
96
			<default>false</default>
31
81
			<_summary>Lock dock items</_summary>
97
			<_summary>Lock dock items</_summary>
32
82
98
33
=== modified file 'lib/DockController.vala'
34
--- lib/DockController.vala	2016-03-23 19:51:11 +0000
35
+++ lib/DockController.vala	2017-01-16 09:48:10 +0000
36
@@ -40,6 +40,7 @@
37
40
		public DockRenderer renderer { get; protected set; }
40
		public DockRenderer renderer { get; protected set; }
38
41
		public DockWindow window { get; protected set; }
41
		public DockWindow window { get; protected set; }
39
42
		public HoverWindow hover { get; protected set; }
42
		public HoverWindow hover { get; protected set; }
40
43
		public KeybindingManager keybinding_manager { get; protected set; }
41
43
		
44
		
42
44
		public DockItemProvider? default_provider { get; private set; }
45
		public DockItemProvider? default_provider { get; private set; }
43
45
		
46
		
44
@@ -100,6 +101,7 @@
45
100
			window = new DockWindow (this);
101
			window = new DockWindow (this);
46
101
			hover = new HoverWindow ();
102
			hover = new HoverWindow ();
47
102
			renderer = new DockRenderer (this, window);
103
			renderer = new DockRenderer (this, window);
48
104
			keybinding_manager = new KeybindingManager (this);
49
103
		}
105
		}
50
104
		
106
		
51
105
		~DockController ()
107
		~DockController ()
52
@@ -140,6 +142,14 @@
53
140
			renderer.initialize ();
142
			renderer.initialize ();
54
141
			
143
			
55
142
			window.show_all ();
144
			window.show_all ();
56
145
			
57
146
			// FIXME maybe do this on a separate thread while this takes some time if X is stalling
58
147
			// putting it into an idle at least gives the illusion of starting up fast ;-)
59
148
			Idle.add (() => {
60
149
				keybinding_manager.initialize ();
61
150
				
62
151
				return false;
63
152
			});
64
143
		}
153
		}
65
144
		
154
		
66
145
		/**
155
		/**
67
@@ -224,6 +234,14 @@
68
224
			}
234
			}
69
225
		}
235
		}
70
226
		
236
		
71
237
		public void virtual_click_item_at (int pos, PopupButton button)
72
238
		{
73
239
			if (visible_items.size < pos + 1)
74
240
				return;
75
241
			
76
242
			visible_items[pos].clicked (button, 0, Gtk.get_current_event_time ());
77
243
		}
78
244
		
79
227
		protected override void update_visible_elements ()
245
		protected override void update_visible_elements ()
80
228
		{
246
		{
81
229
			base.update_visible_elements ();
247
			base.update_visible_elements ();
82
230
248
83
=== modified file 'lib/DockPreferences.vala'
84
--- lib/DockPreferences.vala	2016-03-04 15:54:48 +0000
85
+++ lib/DockPreferences.vala	2017-01-16 09:48:10 +0000
86
@@ -90,6 +90,15 @@
87
90
		[Description(nick = "tooltips-enabled", blurb = "Whether to show tooltips when items are hovered.")]
90
		[Description(nick = "tooltips-enabled", blurb = "Whether to show tooltips when items are hovered.")]
88
91
		public bool TooltipsEnabled { get; set; }
91
		public bool TooltipsEnabled { get; set; }
89
92
		
92
		
90
93
		[Description(nick = "item-accelerator", blurb = "The base modifier-key for item keybinding shortcuts.")]
91
94
		public string ItemAccelerator { get; set; }
92
95
		
93
96
		[Description(nick = "item-option-accelerator", blurb = "The additional modifier-key for optional item keybinding shortcuts.")]
94
97
		public string ItemOptionAccelerator { get; set; }
95
98
		
96
99
		[Description(nick = "keybinding-unhide-delay", blurb = "Time (in ms) to wait before showing keybinding-overlay the dock.")]
97
100
		public uint KeybindingUnhideDelay { get; set; }
98
101
		
99
93
		/**
102
		/**
100
94
		 * {@inheritDoc}
103
		 * {@inheritDoc}
101
95
		 */
104
		 */
102
96
105
103
=== modified file 'lib/DockRenderer.vala'
104
--- lib/DockRenderer.vala	2016-06-01 09:48:44 +0000
105
+++ lib/DockRenderer.vala	2017-01-16 09:48:10 +0000
106
@@ -29,6 +29,11 @@
107
29
		public DockTheme theme { get; private set; }
29
		public DockTheme theme { get; private set; }
108
30
		
30
		
109
31
		/**
31
		/**
110
32
		 * If the dock should show the keybindings and which.
111
33
		 */
112
34
		public Keybinding VisibleKeybinding { get; set; default = 0; }
113
35
		
114
36
		/**
115
32
		 * The current progress [0.0..1.0] of the hide-animation of the dock.
37
		 * The current progress [0.0..1.0] of the hide-animation of the dock.
116
33
		 */
38
		 */
117
34
		[CCode (notify = false)]
39
		[CCode (notify = false)]
118
@@ -62,13 +67,16 @@
119
62
		Surface? indicator_buffer = null;
67
		Surface? indicator_buffer = null;
120
63
		Surface? urgent_indicator_buffer = null;
68
		Surface? urgent_indicator_buffer = null;
121
64
		Surface? urgent_glow_buffer = null;
69
		Surface? urgent_glow_buffer = null;
122
70
		Gee.HashMap<uint, Surface> keybinding_buffers;
123
65
		
71
		
124
66
		int64 last_hide = 0LL;
72
		int64 last_hide = 0LL;
125
67
		int64 last_hovered_changed = 0LL;
73
		int64 last_hovered_changed = 0LL;
126
74
		int64 last_keybinding = 0LL;
127
68
		
75
		
128
69
		bool screen_is_composited = false;
76
		bool screen_is_composited = false;
129
70
		bool show_notifications = true;
77
		bool show_notifications = true;
130
71
		uint reset_position_manager_timer_id = 0U;
78
		uint reset_position_manager_timer_id = 0U;
131
79
		uint keybindings_timer_id = 0U;
132
72
		int window_scale_factor = 1;
80
		int window_scale_factor = 1;
133
73
		bool is_first_frame = true;
81
		bool is_first_frame = true;
134
74
		bool zoom_changed = false;
82
		bool zoom_changed = false;
135
@@ -98,6 +106,7 @@
136
98
		{
106
		{
137
99
			transient_items = new Gee.HashSet<DockItem> ();
107
			transient_items = new Gee.HashSet<DockItem> ();
138
100
			current_items = new Gee.ArrayList<unowned DockItem> ();
108
			current_items = new Gee.ArrayList<unowned DockItem> ();
139
109
			keybinding_buffers = new Gee.HashMap<uint, Surface> ();
140
101
#if BENCHMARK
110
#if BENCHMARK
141
102
			benchmark = new Gee.ArrayList<string> ();
111
			benchmark = new Gee.ArrayList<string> ();
142
103
#endif
112
#endif
143
@@ -129,6 +138,46 @@
144
129
			controller.window.notify["HoveredItem"].disconnect (animated_draw);
138
			controller.window.notify["HoveredItem"].disconnect (animated_draw);
145
130
		}
139
		}
146
131
		
140
		
147
141
		/**
148
142
		 * Unhide the dock immediately if needed and show keybindings after a short delay
149
143
		 */
150
144
		public void show_keybindings ()
151
145
		{
152
146
			if (keybindings_timer_id > 0U)
153
147
				return;
154
148
			
155
149
			keybindings_timer_id = Timeout.add (controller.prefs.KeybindingUnhideDelay, () => {
156
150
				keybindings_timer_id = 0U;
157
151
				last_keybinding = GLib.get_monotonic_time ();
158
152
				VisibleKeybinding |= Keybinding.ITEMS;
159
153
				
160
154
				animated_draw ();
161
155
				
162
156
				return false;
163
157
			});
164
158
		}
165
159
		
166
160
		/**
167
161
		 * Hide keybindings immediately and hide the dock if needed
168
162
		 */
169
163
		public void hide_keybindings ()
170
164
		{
171
165
			if (keybindings_timer_id > 0U) {
172
166
				Source.remove (keybindings_timer_id);
173
167
				keybindings_timer_id = 0U;
174
168
			}
175
169
			
176
170
			if (VisibleKeybinding != 0) {
177
171
				var now = GLib.get_monotonic_time ();
178
172
				if (now - last_keybinding > controller.prefs.KeybindingUnhideDelay * 1000)
179
173
					last_keybinding = now;
180
174
				
181
175
				VisibleKeybinding = 0;
182
176
			}
183
177
			
184
178
			animated_draw ();
185
179
		}
186
180
		
187
132
		void prefs_changed (Object prefs, ParamSpec prop)
181
		void prefs_changed (Object prefs, ParamSpec prop)
188
133
		{
182
		{
189
134
			switch (prop.name) {
183
			switch (prop.name) {
190
@@ -213,6 +262,8 @@
191
213
			urgent_indicator_buffer = null;
262
			urgent_indicator_buffer = null;
192
214
			urgent_glow_buffer = null;
263
			urgent_glow_buffer = null;
193
215
			
264
			
194
265
			keybinding_buffers.clear ();
195
266
			
196
216
			animated_draw ();
267
			animated_draw ();
197
217
		}
268
		}
198
218
		
269
		
199
@@ -839,6 +890,26 @@
200
839
			// draw indicators
890
			// draw indicators
201
840
			if (draw_value.show_indicator && item.Indicator != IndicatorState.NONE)
891
			if (draw_value.show_indicator && item.Indicator != IndicatorState.NONE)
202
841
				draw_indicator_state (cr, draw_value.hover_region, item.Indicator, item.State);
892
				draw_indicator_state (cr, draw_value.hover_region, item.Indicator, item.State);
203
893
			
204
894
			// draw keybinding overlay
205
895
			var keybinding_time = frame_time - last_keybinding;
206
896
			opacity = double.min (1, keybinding_time / (double) (theme.HideTime * 1000));
207
897
			if (VisibleKeybinding == 0)
208
898
				opacity = 1 - opacity;
209
899
			if (opacity > 0) {
210
900
				//FIXME Use letters for for 10+ items
211
901
				var number = (item.Position + 1) % 10;
212
902
				var is_option = ((VisibleKeybinding & Keybinding.ITEMS_OPTION) == Keybinding.ITEMS_OPTION);
213
903
				var index = (is_option ? number + 1024 : number);
214
904
				
215
905
				Surface? keybinding_surface = null;
216
906
				if ((keybinding_surface = keybinding_buffers.get (index)) == null) {
217
907
					keybinding_surface = theme.create_keybinding (icon_size / 2, number.to_string (), item_buffer, is_option);
218
908
					keybinding_buffers.set (index, keybinding_surface);
219
909
				}
220
910
				cr.set_source_surface (keybinding_surface.Internal, draw_region.x + icon_size / 4, draw_region.y + icon_size / 4);
221
911
				cr.paint_with_alpha (opacity);
222
912
			}
223
842
		}
913
		}
224
843
		
914
		
225
844
		void draw_item_shadow (Cairo.Context cr, DockItem item, DockItemDrawValue draw_value)
915
		void draw_item_shadow (Cairo.Context cr, DockItem item, DockItemDrawValue draw_value)
226
@@ -1109,6 +1180,9 @@
227
1109
					return true;
1180
					return true;
228
1110
			}
1181
			}
229
1111
			
1182
			
230
1183
			if (frame_time - last_keybinding <= theme.HideTime * 1000)
231
1184
				return true;
232
1185
			
233
1112
			if (transient_items.size > 0)
1186
			if (transient_items.size > 0)
234
1113
				return true;
1187
				return true;
235
1114
			
1188
			
236
1115
1189
237
=== modified file 'lib/Drawing/DockTheme.vala'
238
--- lib/Drawing/DockTheme.vala	2016-03-12 15:14:09 +0000
239
+++ lib/Drawing/DockTheme.vala	2017-01-16 09:48:10 +0000
240
@@ -276,6 +276,92 @@
241
276
		}
276
		}
242
277
277
243
278
		/**
278
		/**
244
279
		 * Creates a keybinding overlay
245
280
		 *
246
281
		 * @param size the size of the surface
247
282
		 * @param text the string to show
248
283
		 * @param model existing surface to use as basis of new surface
249
284
		 * @param is_option slightly different style for another function
250
285
		 * @return a new dock surface with the keybinding overlay drawn on it
251
286
		 */
252
287
		public Surface create_keybinding (int size, string text, Surface model, bool is_option = false)
253
288
		{
254
289
			Logger.verbose ("DockTheme.create_keybinding (size = %i, text = %s)", size, text);
255
290
			
256
291
			var surface = new Surface.with_surface (size, size, model);
257
292
			surface.clear ();
258
293
			
259
294
			if (size <= 0)
260
295
				return surface;
261
296
			
262
297
			var cr = surface.Context;
263
298
			
264
299
			var line_width = 2.0;
265
300
			var padding = Math.ceil (size / 12.0);
266
301
			double x = line_width / 2.0;
267
302
			double y = line_width / 2.0;
268
303
			double height = size - 2 * line_width;
269
304
			double width = size - 2 * line_width;
270
305
			
271
306
			cr.set_line_width (line_width);
272
307
			
273
308
			Cairo.Pattern stroke, fill;
274
309
			
275
310
			// draw outline shadow
276
311
			stroke = new Cairo.Pattern.rgba (0.2, 0.2, 0.2, 0.3);
277
312
			draw_rounded_line (cr, x, y, width + line_width, height, true, true, stroke, null);
278
313
			
279
314
			// draw filled gradient with outline
280
315
			stroke = new Cairo.Pattern.linear (0, y, 0, y + height);
281
316
			stroke.add_color_stop_rgba (0.2, 0.0, 0.0, 0.0, 0.9);
282
317
			stroke.add_color_stop_rgba (0.8, 0.0, 0.0, 0.0, 0.8);
283
318
			fill = new Cairo.Pattern.linear (0, y, 0, y + height);
284
319
			fill.add_color_stop_rgba (0.1, 0.0, 0.0, 0.0, 0.8);
285
320
			fill.add_color_stop_rgba (0.9, 0.0, 0.0, 0.0, 0.9);
286
321
			draw_rounded_line (cr, x, y, width, height, true, true, stroke, fill);
287
322
			
288
323
			// draw inline highlight
289
324
			if (!is_option)
290
325
				stroke = new Cairo.Pattern.rgba (0.9, 0.9, 0.9, 0.1);
291
326
			else
292
327
				stroke = new Cairo.Pattern.rgba (0.9, 0.9, 0.9, 0.9);
293
328
			draw_rounded_line (cr, x + line_width, y + line_width, width - 2 * line_width, height - 2 * line_width, true, true, stroke, null);
294
329
			
295
330
			var layout = new Pango.Layout (Gdk.pango_context_get ());
296
331
			layout.set_width ((int) (width * Pango.SCALE));
297
332
			layout.set_ellipsize (Pango.EllipsizeMode.NONE);
298
333
			
299
334
			var font_description = new Gtk.Style ().font_desc;
300
335
			font_description.set_absolute_size ((int) (height * Pango.SCALE));
301
336
			font_description.set_weight (Pango.Weight.BOLD);
302
337
			layout.set_font_description (font_description);
303
338
			
304
339
			layout.set_text (text, -1);
305
340
			Pango.Rectangle ink_rect, logical_rect;
306
341
			layout.get_pixel_extents (out ink_rect, out logical_rect);
307
342
			
308
343
			var scale = double.min (1.0, double.min ((width - 2.0 * padding - 2.0 * line_width) / (double) logical_rect.width, (height - 2.0 * padding) / (double) logical_rect.height));
309
344
			
310
345
			cr.set_source_rgba (1.0, 1.0, 1.0, 0.2);
311
346
			
312
347
			cr.move_to (x + Math.floor (width / 2.0 - scale * logical_rect.width / 2.0), y + Math.floor (height / 2.0 - scale * logical_rect.height / 2.0));
313
348
			
314
349
			// draw text
315
350
			cr.save ();
316
351
			if (scale < 1)
317
352
				cr.scale (scale, scale);
318
353
			
319
354
			cr.set_line_width (line_width);
320
355
			Pango.cairo_layout_path (cr, layout);
321
356
			cr.stroke_preserve ();
322
357
			cr.set_source_rgba (1.0, 1.0, 1.0, 0.95);
323
358
			cr.fill ();
324
359
			cr.restore ();
325
360
			
326
361
			return surface;
327
362
		}
328
363
		
329
364
		/**
330
279
		 * Draws an active glow for an item.
365
		 * Draws an active glow for an item.
331
280
		 *
366
		 *
332
281
		 * @param surface the surface to draw onto
367
		 * @param surface the surface to draw onto
333
282
368
334
=== modified file 'lib/HideManager.vala'
335
--- lib/HideManager.vala	2016-03-08 22:15:30 +0000
336
+++ lib/HideManager.vala	2017-01-16 09:48:10 +0000
337
@@ -137,6 +137,8 @@
338
137
			unowned DockWindow window = controller.window;
137
			unowned DockWindow window = controller.window;
339
138
			unowned Wnck.Screen wnck_screen = Wnck.Screen.get_default ();
138
			unowned Wnck.Screen wnck_screen = Wnck.Screen.get_default ();
340
139
			
139
			
341
140
			controller.renderer.notify["VisibleKeybinding"].connect (update_hovered);
342
141
			
343
140
#if HAVE_BARRIERS
142
#if HAVE_BARRIERS
344
141
			initialize_barriers_support ();
143
			initialize_barriers_support ();
345
142
#endif
144
#endif
346
@@ -159,6 +161,7 @@
347
159
			unowned Wnck.Screen wnck_screen = Wnck.Screen.get_default ();
161
			unowned Wnck.Screen wnck_screen = Wnck.Screen.get_default ();
348
160
			
162
			
349
161
			controller.prefs.notify.disconnect (prefs_changed);
163
			controller.prefs.notify.disconnect (prefs_changed);
350
164
			controller.renderer.notify["VisibleKeybinding"].disconnect (update_hovered);
351
162
			
165
			
352
163
			window.enter_notify_event.disconnect (handle_enter_notify_event);
166
			window.enter_notify_event.disconnect (handle_enter_notify_event);
353
164
			window.leave_notify_event.disconnect (handle_leave_notify_event);
167
			window.leave_notify_event.disconnect (handle_leave_notify_event);
354
@@ -215,6 +218,7 @@
355
215
			unowned PositionManager position_manager = controller.position_manager;
218
			unowned PositionManager position_manager = controller.position_manager;
356
216
			unowned DockWindow window = controller.window;
219
			unowned DockWindow window = controller.window;
357
217
			unowned DragManager drag_manager = controller.drag_manager;
220
			unowned DragManager drag_manager = controller.drag_manager;
358
221
			unowned DockRenderer renderer = controller.renderer;
359
218
			
222
			
360
219
			freeze_notify ();
223
			freeze_notify ();
361
220
			
224
			
362
@@ -233,7 +237,7 @@
363
233
			}
237
			}
364
234
			
238
			
365
235
			// disable hiding if menu is visible or drags are active
239
			// disable hiding if menu is visible or drags are active
367
236
			var disabled = (window.menu_is_visible () || drag_manager.InternalDragActive || drag_manager.ExternalDragActive);
240
			var disabled = (window.menu_is_visible () || renderer.VisibleKeybinding > 0 || drag_manager.InternalDragActive || drag_manager.ExternalDragActive);
368
237
			if (Disabled != disabled) {
241
			if (Disabled != disabled) {
369
238
				Disabled = disabled;
242
				Disabled = disabled;
370
239
				update_needed = true;
243
				update_needed = true;
371
240
244
372
=== added file 'lib/KeybindingManager.vala'
373
--- lib/KeybindingManager.vala	1970-01-01 00:00:00 +0000
374
+++ lib/KeybindingManager.vala	2017-01-16 09:48:10 +0000
375
@@ -0,0 +1,405 @@
376
1
//
377
2
//  Copyright (C) 2012 Rico Tzschichholz
378
3
//
379
4
//  This program is free software: you can redistribute it and/or modify
380
5
//  it under the terms of the GNU General Public License as published by
381
6
//  the Free Software Foundation, either version 3 of the License, or
382
7
//  (at your option) any later version.
383
8
//
384
9
//  This program is distributed in the hope that it will be useful,
385
10
//  but WITHOUT ANY WARRANTY; without even the implied warranty of
386
11
//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
387
12
//  GNU General Public License for more details.
388
13
//
389
14
//  You should have received a copy of the GNU General Public License
390
15
//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
391
16
//
392
17
393
18
namespace Plank
394
19
{
395
20
	[Flags]
396
21
	public enum Keybinding {
397
22
		ITEMS = 1 << 0,
398
23
		ITEMS_OPTION = 1 << 1
399
24
	}
400
25
	
401
26
	/**
402
27
	 * This class is in charge to grab keybindings on the X11 display
403
28
	 * and filter X11-events and passing on such events to the registed
404
29
	 * handler methods.
405
30
	 */
406
31
	public class KeybindingManager : GLib.Object
407
32
	{
408
33
		/**
409
34
		 * The controller for this dock.
410
35
		 */
411
36
		public DockController controller { private get; construct; }
412
37
		
413
38
		/**
414
39
		 * list of bound keybindings
415
40
		 */
416
41
		Gee.ArrayList<Binding> bindings = new Gee.ArrayList<Binding> ();
417
42
		
418
43
		/**
419
44
		 * locked modifiers used to grab all keys whatever lock key
420
45
		 * is pressed.
421
46
		 */
422
47
		static uint[] ignored_masks = {
423
48
			0,
424
49
			Gdk.ModifierType.MOD2_MASK, // NUM_LOCK
425
50
			Gdk.ModifierType.LOCK_MASK, // CAPS_LOCK
426
51
			Gdk.ModifierType.MOD5_MASK, // SCROLL_LOCK
427
52
			Gdk.ModifierType.MOD2_MASK | Gdk.ModifierType.LOCK_MASK,
428
53
			Gdk.ModifierType.MOD2_MASK | Gdk.ModifierType.MOD5_MASK,
429
54
			Gdk.ModifierType.LOCK_MASK | Gdk.ModifierType.MOD5_MASK,
430
55
			Gdk.ModifierType.MOD2_MASK | Gdk.ModifierType.LOCK_MASK | Gdk.ModifierType.MOD5_MASK
431
56
		};
432
57
		
433
58
		/**
434
59
		 * Helper class to store keybinding
435
60
		 */
436
61
		class Binding
437
62
		{
438
63
			public string accelerator;
439
64
			public uint8 keycode;
440
65
			public Gdk.ModifierType modifiers;
441
66
			public KeybindingHandlerFunc handler;
442
67
			
443
68
			public Binding (string _accelerator, uint8 _keycode,
444
69
				Gdk.ModifierType _modifiers, owned KeybindingHandlerFunc _handler)
445
70
			{
446
71
				accelerator = _accelerator;
447
72
				keycode = _keycode;
448
73
				modifiers = _modifiers;
449
74
				handler = _handler;
450
75
			}
451
76
		}
452
77
		
453
78
		/**
454
79
		 * Keybinding func needed to bind key to handler
455
80
		 *
456
81
		 * @param event passing on gdk event
457
82
		 */
458
83
		public delegate void KeybindingHandlerFunc (X.Event event);
459
84
		
460
85
		public KeybindingManager (DockController controller)
461
86
		{
462
87
			GLib.Object (controller: controller);
463
88
		}
464
89
		
465
90
		construct
466
91
		{
467
92
			gdk_window_add_filter (null, (Gdk.FilterFunc) xevent_filter);
468
93
		}
469
94
		
470
95
		~KeybindingManager ()
471
96
		{
472
97
			unbind_all ();
473
98
			
474
99
			gdk_window_remove_filter (null, (Gdk.FilterFunc) xevent_filter);
475
100
		}
476
101
		
477
102
		public void initialize ()
478
103
		{
479
104
			var item_accel = controller.prefs.ItemAccelerator;
480
105
			var item_option_accel = controller.prefs.ItemOptionAccelerator;
481
106
			
482
107
			var mod = KeybindingManager.convert_to_modifier_only (item_accel);
483
108
			var option_mod = KeybindingManager.convert_to_modifier_only (item_option_accel);
484
109
			
485
110
			if (controller.prefs.ItemAccelerator == "") {
486
111
				warning ("%s is not a modifier! Keybindings will not be available!", item_accel);
487
112
				return;
488
113
			}
489
114
			
490
115
			// bind base accelerator
491
116
			if (!bind (item_accel, controller.renderer.show_keybindings)
492
117
				|| !bind ("<Release>" + item_accel, controller.renderer.hide_keybindings)) {
493
118
				warning ("Keybindings will not be available!");
494
119
				return;
495
120
			}
496
121
			
497
122
			bind (mod + "1", () => { controller.virtual_click_item_at (0, PopupButton.LEFT); });
498
123
			bind (mod + "2", () => { controller.virtual_click_item_at (1, PopupButton.LEFT); });
499
124
			bind (mod + "3", () => { controller.virtual_click_item_at (2, PopupButton.LEFT); });
500
125
			bind (mod + "4", () => { controller.virtual_click_item_at (3, PopupButton.LEFT); });
501
126
			bind (mod + "5", () => { controller.virtual_click_item_at (4, PopupButton.LEFT); });
502
127
			bind (mod + "6", () => { controller.virtual_click_item_at (5, PopupButton.LEFT); });
503
128
			bind (mod + "7", () => { controller.virtual_click_item_at (6, PopupButton.LEFT); });
504
129
			bind (mod + "8", () => { controller.virtual_click_item_at (7, PopupButton.LEFT); });
505
130
			bind (mod + "9", () => { controller.virtual_click_item_at (8, PopupButton.LEFT); });
506
131
			bind (mod + "0", () => { controller.virtual_click_item_at (9, PopupButton.LEFT); });
507
132
			
508
133
			// bind option accelerator
509
134
			if (item_option_accel == "") {
510
135
				warning ("%s is not a modifier! Optional keybindings will not be available!", item_option_accel);
511
136
				return;
512
137
			}
513
138
			
514
139
			bind (mod + item_option_accel, () => {
515
140
				controller.renderer.VisibleKeybinding |= Keybinding.ITEMS_OPTION;
516
141
				controller.renderer.animated_draw ();
517
142
			});
518
143
			bind ("<Release>" + mod + item_option_accel, () => {
519
144
				controller.renderer.VisibleKeybinding &= ~Keybinding.ITEMS_OPTION;
520
145
				controller.renderer.animated_draw ();
521
146
			});
522
147
			bind ("<Release>" + option_mod + item_option_accel, controller.renderer.hide_keybindings);
523
148
			
524
149
			bind (mod + option_mod + "1", () => { controller.virtual_click_item_at  (0, PopupButton.MIDDLE); });
525
150
			bind (mod + option_mod + "2", () => { controller.virtual_click_item_at  (1, PopupButton.MIDDLE); });
526
151
			bind (mod + option_mod + "3", () => { controller.virtual_click_item_at  (2, PopupButton.MIDDLE); });
527
152
			bind (mod + option_mod + "4", () => { controller.virtual_click_item_at  (3, PopupButton.MIDDLE); });
528
153
			bind (mod + option_mod + "5", () => { controller.virtual_click_item_at  (4, PopupButton.MIDDLE); });
529
154
			bind (mod + option_mod + "6", () => { controller.virtual_click_item_at  (5, PopupButton.MIDDLE); });
530
155
			bind (mod + option_mod + "7", () => { controller.virtual_click_item_at  (6, PopupButton.MIDDLE); });
531
156
			bind (mod + option_mod + "8", () => { controller.virtual_click_item_at  (7, PopupButton.MIDDLE); });
532
157
			bind (mod + option_mod + "9", () => { controller.virtual_click_item_at  (8, PopupButton.MIDDLE); });
533
158
			bind (mod + option_mod + "0", () => { controller.virtual_click_item_at  (9, PopupButton.MIDDLE); });
534
159
		}
535
160
		
536
161
		/**
537
162
		 * Bind accelerator to given handler
538
163
		 *
539
164
		 * @param accelerator accelerator parsable by Gtk.accelerator_parse
540
165
		 * @param handler handler called when given accelerator is pressed
541
166
		 * @return wether the bind was successful or not
542
167
		 */
543
168
		public bool bind (string accelerator, owned KeybindingHandlerFunc handler)
544
169
		{
545
170
			Logger.verbose ("Binding key " + accelerator);
546
171
			
547
172
			// convert accelerator
548
173
			uint keysym;
549
174
			Gdk.ModifierType modmask;
550
175
			Gtk.accelerator_parse (accelerator, out keysym, out modmask);
551
176
			
552
177
			unowned X.Display display = Gdk.X11.get_default_xdisplay ();
553
178
			var xid = Gdk.X11.get_default_root_xwindow ();
554
179
			
555
180
			uint8 keycode = display.keysym_to_keycode (keysym);
556
181
			if (keycode == 0)
557
182
				return false;
558
183
			
559
184
			var keystr = X.keysym_to_string (keysym);
560
185
			if (keystr == null)
561
186
				return false;
562
187
			
563
188
			// FIXME somethings is wrong with the SUPER modifier between the GDK and X values
564
189
			// so replace SUPER_MASK with MOD4_MASK
565
190
			if ((modmask & Gdk.ModifierType.SUPER_MASK) == Gdk.ModifierType.SUPER_MASK)
566
191
				modmask = (modmask & ~Gdk.ModifierType.SUPER_MASK) | Gdk.ModifierType.MOD4_MASK;
567
192
			
568
193
			// trap XErrors to avoid closing of application
569
194
			// even when grabing of key fails
570
195
			Gdk.error_trap_push ();
571
196
			
572
197
			// grab key finally
573
198
			// also grab all keys which are combined with a lock key such NumLock
574
199
			foreach (var ignored_mask in ignored_masks) {
575
200
				Gdk.error_trap_push ();
576
201
				display.grab_key (keycode, modmask | ignored_mask, xid, false, X.GrabMode.Async, X.GrabMode.Async);
577
202
				
578
203
				// wait until all X request have been processed
579
204
				Gdk.flush ();
580
205
				var result = Gdk.error_trap_pop ();
581
206
				if (result != X.ErrorCode.SUCCESS) {
582
207
					warning ("Failed to bind key 0x%X ('%s') with modifiers 0x%X", keycode, keystr, modmask);
583
208
					if (result == X.ErrorCode.BAD_ACCESS)
584
209
						debug ("Some other program is already using the key 0x%X ('%s') with modifiers 0x%X as a binding", keycode, keystr, modmask | ignored_mask);
585
210
					return false;
586
211
				}
587
212
			}
588
213
			
589
214
			Gdk.error_trap_pop ();
590
215
			
591
216
			Logger.verbose ("Successfully bound key 0x%X ('%s') with modifiers 0x%X", keycode, keystr, modmask);
592
217
			
593
218
			// if this is a key-released binding then add corresponding modifiermask
594
219
			// for keycode to our modmask if it is a modifier
595
220
			if ((modmask & Gdk.ModifierType.RELEASE_MASK) == Gdk.ModifierType.RELEASE_MASK)
596
221
				modmask |= get_modmask_for_keycode (keycode);
597
222
			
598
223
			// store binding
599
224
			var binding = new Binding (accelerator, keycode, modmask, handler);
600
225
			bindings.add (binding);
601
226
			
602
227
			return true;
603
228
		}
604
229
		
605
230
		/**
606
231
		 * Unbind given accelerator.
607
232
		 *
608
233
		 * @param accelerator accelerator parsable by Gtk.accelerator_parse
609
234
		 */
610
235
		public void unbind (string accelerator)
611
236
		{
612
237
			Logger.verbose ("Unbinding key " + accelerator);
613
238
			
614
239
			unowned X.Display display = Gdk.X11.get_default_xdisplay ();
615
240
			var xid = Gdk.X11.get_default_root_xwindow ();
616
241
			
617
242
			// unbind all keys with given accelerator
618
243
			var remove_bindings = new Gee.ArrayList<Binding> ();
619
244
			foreach (var binding in bindings) {
620
245
				if (str_equal (accelerator, binding.accelerator)) {
621
246
					// if this is a key-released binding then remove corresponding modifiermask
622
247
					// for keycode to our modmask if it is a modifier which we added on bind
623
248
					if ((binding.modifiers & Gdk.ModifierType.RELEASE_MASK) == Gdk.ModifierType.RELEASE_MASK)
624
249
						binding.modifiers &= ~get_modmask_for_keycode (binding.keycode);
625
250
					
626
251
					foreach (var ignored_mask in ignored_masks)
627
252
						display.ungrab_key (binding.keycode, binding.modifiers | ignored_mask, xid);
628
253
					remove_bindings.add (binding);
629
254
				}
630
255
			}
631
256
			
632
257
			// remove unbound keys
633
258
			bindings.remove_all (remove_bindings);
634
259
		}
635
260
		
636
261
		/**
637
262
		 * Unbind all registered bindings.
638
263
		 */
639
264
		public void unbind_all ()
640
265
		{
641
266
			unowned X.Display display = Gdk.X11.get_default_xdisplay ();
642
267
			var xid = Gdk.X11.get_default_root_xwindow ();
643
268
			
644
269
			// unbind all keys
645
270
			foreach (var binding in bindings)
646
271
				foreach (var ignored_mask in ignored_masks) {
647
272
					// if this is a key-released binding then remove corresponding modifiermask
648
273
					// for keycode to our modmask if it is a modifier which we added on bind
649
274
					if ((binding.modifiers & Gdk.ModifierType.RELEASE_MASK) != 0)
650
275
						binding.modifiers &= ~get_modmask_for_keycode (binding.keycode);
651
276
					
652
277
					display.ungrab_key (binding.keycode, binding.modifiers | ignored_mask, xid);
653
278
				}
654
279
			
655
280
			bindings.clear ();
656
281
		}
657
282
		
658
283
		/**
659
284
		 * Event filter method needed to fetch X.Events
660
285
		 */
661
286
		[CCode (instance_pos = -1)]
662
287
		Gdk.FilterReturn xevent_filter (Gdk.XEvent gdk_xevent, Gdk.Event gdk_event)
663
288
		{
664
289
			var filter_return = Gdk.FilterReturn.CONTINUE;
665
290
			X.Event* xevent = (X.Event*) gdk_xevent;
666
291
			
667
292
			if (xevent->type != X.EventType.KeyPress && xevent->type != X.EventType.KeyRelease)
668
293
				return filter_return;
669
294
			
670
295
			// remove NumLock, CapsLock and ScrollLock from key state
671
296
			uint event_mods = (xevent->xkey.state & ~(ignored_masks[7]));
672
297
			
673
298
			foreach (var binding in bindings) {
674
299
				if (xevent->xkey.keycode != binding.keycode)
675
300
					continue;
676
301
				
677
302
				if ((xevent->type == X.EventType.KeyPress && (binding.modifiers == event_mods))
678
303
					|| (xevent->type == X.EventType.KeyRelease
679
304
					&& (binding.modifiers & Gdk.ModifierType.RELEASE_MASK) == Gdk.ModifierType.RELEASE_MASK
680
305
					&& (binding.modifiers & ~Gdk.ModifierType.RELEASE_MASK) == event_mods)) {
681
306
					
682
307
					binding.handler (*xevent);
683
308
					
684
309
					// don't pass this event any futher
685
310
					filter_return = Gdk.FilterReturn.REMOVE;
686
311
				}
687
312
			}
688
313
			
689
314
			return filter_return;
690
315
		}
691
316
		
692
317
		/**
693
318
		 * Convert the given accelerator to a modifier only accelerator.
694
319
		 * This will convert the key to a modifier if possible and append it.
695
320
		 *
696
321
		 * @param accelerator accelerator parsable by Gtk.accelerator_parse
697
322
		 */
698
323
		public static string convert_to_modifier_only (string accelerator)
699
324
		{
700
325
			uint keysym;
701
326
			Gdk.ModifierType modmask;
702
327
			Gtk.accelerator_parse (accelerator, out keysym, out modmask);
703
328
			
704
329
			unowned X.Display display = Gdk.X11.get_default_xdisplay ();
705
330
			uint8 keycode = display.keysym_to_keycode (keysym);
706
331
			
707
332
			if (keycode > 0)
708
333
				modmask |= get_modmask_for_keycode (keycode);
709
334
			
710
335
			return get_accelerator_for_modmask (modmask);
711
336
		}
712
337
		
713
338
		static string get_accelerator_for_modmask (Gdk.ModifierType modmask)
714
339
		{
715
340
			string result = "";
716
341
			
717
342
			if ((modmask & Gdk.ModifierType.CONTROL_MASK) == Gdk.ModifierType.CONTROL_MASK)
718
343
				result += "<Ctrl>";
719
344
			if ((modmask & Gdk.ModifierType.MOD1_MASK) == Gdk.ModifierType.MOD1_MASK)
720
345
				result += "<Alt>";
721
346
			if ((modmask & Gdk.ModifierType.SHIFT_MASK) == Gdk.ModifierType.SHIFT_MASK)
722
347
				result += "<Shift>";
723
348
			if ((modmask & Gdk.ModifierType.META_MASK) == Gdk.ModifierType.META_MASK)
724
349
				result += "<AltGr>";
725
350
			if ((modmask & Gdk.ModifierType.HYPER_MASK) == Gdk.ModifierType.HYPER_MASK)
726
351
				result += "";
727
352
			if (((modmask & Gdk.ModifierType.SUPER_MASK) == Gdk.ModifierType.SUPER_MASK
728
353
				|| (modmask & Gdk.ModifierType.MOD4_MASK) == Gdk.ModifierType.MOD4_MASK))
729
354
				result += "<Super>";
730
355
			
731
356
			return result;
732
357
		}
733
358
		
734
359
		/**
735
360
		 * Convert keycode to ModifierType if it is a modifier
736
361
		 * otherwise return 0x0
737
362
		 */
738
363
		static Gdk.ModifierType get_modmask_for_keycode (uint keycode)
739
364
		{
740
365
			Gdk.ModifierType modmask;
741
366
			
742
367
			unowned X.Display display = Gdk.X11.get_default_xdisplay ();
743
368
			var i = 0;
744
369
			var keysym = display.keycode_to_keysym ((uint8)keycode, i);
745
370
			
746
371
			switch (keysym) {
747
372
			case Gdk.Key.Control_L:
748
373
			case Gdk.Key.Control_R:
749
374
				modmask = Gdk.ModifierType.CONTROL_MASK;
750
375
				break;
751
376
			case Gdk.Key.Alt_L:
752
377
			case Gdk.Key.Alt_R:
753
378
				modmask = Gdk.ModifierType.MOD1_MASK;
754
379
				break;
755
380
			case Gdk.Key.Shift_L:
756
381
			case Gdk.Key.Shift_R:
757
382
				modmask = Gdk.ModifierType.SHIFT_MASK;
758
383
				break;
759
384
			case Gdk.Key.Meta_L:
760
385
			case Gdk.Key.Meta_R:
761
386
				modmask = Gdk.ModifierType.META_MASK;
762
387
				break;
763
388
			case Gdk.Key.Hyper_L:
764
389
			case Gdk.Key.Hyper_R:
765
390
				modmask = Gdk.ModifierType.HYPER_MASK;
766
391
				break;
767
392
			case Gdk.Key.Super_L:
768
393
			case Gdk.Key.Super_R:
769
394
				// FIXME somethings is wrong with the SUPER modifier between the GDK and X values
770
395
				modmask = Gdk.ModifierType.MOD4_MASK; //Gdk.ModifierType.SUPER_MASK;
771
396
				break;
772
397
			default:
773
398
				modmask = 0x0;
774
399
				break;
775
400
			}
776
401
			
777
402
			return modmask;
778
403
		}
779
404
	}
780
405
}
781
0
406
782
=== modified file 'lib/Makefile.am'
783
--- lib/Makefile.am	2016-02-28 12:06:16 +0000
784
+++ lib/Makefile.am	2017-01-16 09:48:10 +0000
785
@@ -65,6 +65,7 @@
786
65
	DockRenderer.vala \
65
	DockRenderer.vala \
787
66
	DragManager.vala \
66
	DragManager.vala \
788
67
	HideManager.vala \
67
	HideManager.vala \
789
68
	KeybindingManager.vala \
790
68
	PositionManager.vala \
69
	PositionManager.vala \
791
69
	DBus/Client.vala \
70
	DBus/Client.vala \
792
70
	DBus/Interfaces.vala \
71
	DBus/Interfaces.vala \
793
71
72
794
=== modified file 'lib/libplank.symbols'
795
--- lib/libplank.symbols	2016-04-10 09:00:49 +0000
796
+++ lib/libplank.symbols	2017-01-16 09:48:10 +0000
797
@@ -130,6 +130,7 @@
798
130
plank_dock_controller_get_hide_manager
130
plank_dock_controller_get_hide_manager
799
131
plank_dock_controller_get_hover
131
plank_dock_controller_get_hover
800
132
plank_dock_controller_get_Items
132
plank_dock_controller_get_Items
801
133
plank_dock_controller_get_keybinding_manager
802
133
plank_dock_controller_get_launchers_folder
134
plank_dock_controller_get_launchers_folder
803
134
plank_dock_controller_get_name
135
plank_dock_controller_get_name
804
135
plank_dock_controller_get_position_manager
136
plank_dock_controller_get_position_manager
805
@@ -143,9 +144,11 @@
806
143
plank_dock_controller_set_drag_manager
144
plank_dock_controller_set_drag_manager
807
144
plank_dock_controller_set_hide_manager
145
plank_dock_controller_set_hide_manager
808
145
plank_dock_controller_set_hover
146
plank_dock_controller_set_hover
809
147
plank_dock_controller_set_keybinding_manager
810
146
plank_dock_controller_set_position_manager
148
plank_dock_controller_set_position_manager
811
147
plank_dock_controller_set_renderer
149
plank_dock_controller_set_renderer
812
148
plank_dock_controller_set_window
150
plank_dock_controller_set_window
813
151
plank_dock_controller_virtual_click_item_at
814
149
plank_dock_element_accept_drop
152
plank_dock_element_accept_drop
815
150
plank_dock_element_as_uri
153
plank_dock_element_as_uri
816
151
plank_dock_element_can_accept_drop
154
plank_dock_element_can_accept_drop
817
@@ -289,7 +292,10 @@
818
289
plank_dock_preferences_get_HideDelay
292
plank_dock_preferences_get_HideDelay
819
290
plank_dock_preferences_get_HideMode
293
plank_dock_preferences_get_HideMode
820
291
plank_dock_preferences_get_IconSize
294
plank_dock_preferences_get_IconSize
821
295
plank_dock_preferences_get_ItemAccelerator
822
296
plank_dock_preferences_get_ItemOptionAccelerator
823
292
plank_dock_preferences_get_ItemsAlignment
297
plank_dock_preferences_get_ItemsAlignment
824
298
plank_dock_preferences_get_KeybindingUnhideDelay
825
293
plank_dock_preferences_get_LockItems
299
plank_dock_preferences_get_LockItems
826
294
plank_dock_preferences_get_Monitor
300
plank_dock_preferences_get_Monitor
827
295
plank_dock_preferences_get_Offset
301
plank_dock_preferences_get_Offset
828
@@ -313,7 +319,10 @@
829
313
plank_dock_preferences_set_HideDelay
319
plank_dock_preferences_set_HideDelay
830
314
plank_dock_preferences_set_HideMode
320
plank_dock_preferences_set_HideMode
831
315
plank_dock_preferences_set_IconSize
321
plank_dock_preferences_set_IconSize
832
322
plank_dock_preferences_set_ItemAccelerator
833
323
plank_dock_preferences_set_ItemOptionAccelerator
834
316
plank_dock_preferences_set_ItemsAlignment
324
plank_dock_preferences_set_ItemsAlignment
835
325
plank_dock_preferences_set_KeybindingUnhideDelay
836
317
plank_dock_preferences_set_LockItems
326
plank_dock_preferences_set_LockItems
837
318
plank_dock_preferences_set_Monitor
327
plank_dock_preferences_set_Monitor
838
319
plank_dock_preferences_set_Offset
328
plank_dock_preferences_set_Offset
839
@@ -332,14 +341,19 @@
840
332
plank_dock_renderer_get_local_cursor
341
plank_dock_renderer_get_local_cursor
841
333
plank_dock_renderer_get_theme
342
plank_dock_renderer_get_theme
842
334
plank_dock_renderer_get_type
343
plank_dock_renderer_get_type
843
344
plank_dock_renderer_get_VisibleKeybinding
844
335
plank_dock_renderer_get_zoom_in_progress
345
plank_dock_renderer_get_zoom_in_progress
845
346
plank_dock_renderer_hide_keybindings
846
336
plank_dock_renderer_initialize
347
plank_dock_renderer_initialize
847
337
plank_dock_renderer_new
348
plank_dock_renderer_new
848
338
plank_dock_renderer_reset_buffers
349
plank_dock_renderer_reset_buffers
849
350
plank_dock_renderer_set_VisibleKeybinding
850
351
plank_dock_renderer_show_keybindings
851
339
plank_dock_renderer_update_local_cursor
352
plank_dock_renderer_update_local_cursor
852
340
plank_dock_theme_construct
353
plank_dock_theme_construct
853
341
plank_dock_theme_create_background
354
plank_dock_theme_create_background
854
342
plank_dock_theme_create_indicator
355
plank_dock_theme_create_indicator
855
356
plank_dock_theme_create_keybinding
856
343
plank_dock_theme_create_urgent_glow
357
plank_dock_theme_create_urgent_glow
857
344
plank_dock_theme_draw_active_glow
358
plank_dock_theme_draw_active_glow
858
345
plank_dock_theme_draw_item_count
359
plank_dock_theme_draw_item_count
859
@@ -473,6 +487,15 @@
860
473
plank_item_factory_make_element
487
plank_item_factory_make_element
861
474
plank_item_factory_new
488
plank_item_factory_new
862
475
plank_item_state_get_type
489
plank_item_state_get_type
863
490
plank_keybinding_get_type
864
491
plank_keybinding_manager_bind
865
492
plank_keybinding_manager_construct
866
493
plank_keybinding_manager_convert_to_modifier_only
867
494
plank_keybinding_manager_get_type
868
495
plank_keybinding_manager_initialize
869
496
plank_keybinding_manager_new
870
497
plank_keybinding_manager_unbind
871
498
plank_keybinding_manager_unbind_all
872
476
plank_logger_get_DisplayLevel
499
plank_logger_get_DisplayLevel
873
477
plank_logger_get_type
500
plank_logger_get_type
874
478
plank_logger_initialize
501
plank_logger_initialize
Reviewer	Date Requested	Status
Sergey "Shnatsel" Davidoff	2015-06-06	Pending
Danielle Foré	2015-06-06	Pending
Review via email: mp+261315@code.launchpad.net