1
=== modified file 'lib/DockController.vala'
2
--- lib/DockController.vala	2016-03-23 19:51:11 +0000
3
+++ lib/DockController.vala	2016-11-03 14:10:56 +0000
4
@@ -83,6 +83,11 @@
5
83
		
83
		
6
84
		construct
84
		construct
7
85
		{
85
		{
8
86
			//FIXME Use some fixed settings for wayland session
9
87
			if (environment_is_session_type (XdgSessionType.WAYLAND)) {
10
88
				prefs.Position = Gtk.PositionType.LEFT;
11
89
			}
12
90
			
13
86
			launchers_folder = config_folder.get_child ("launchers");
91
			launchers_folder = config_folder.get_child ("launchers");
14
87
			Factory.item_factory.launchers_dir = launchers_folder;
92
			Factory.item_factory.launchers_dir = launchers_folder;
15
88
			
93
			
16
89
94
17
=== modified file 'lib/Factories/AbstractMain.vala'
18
--- lib/Factories/AbstractMain.vala	2016-02-25 14:17:32 +0000
19
+++ lib/Factories/AbstractMain.vala	2016-11-03 14:10:56 +0000
20
@@ -252,15 +252,9 @@
21
252
			internal_quarks_initialize ();
252
			internal_quarks_initialize ();
22
253
			environment_initialize ();
253
			environment_initialize ();
23
254
			
254
			
24
255
			// Make sure we are not doing silly things like trying to run in a wayland-session!
25
256
			if (!environment_is_session_type (XdgSessionType.X11)) {
26
257
				critical ("Only X11 environments are supported.");
27
258
				quit ();
28
259
				return;
29
260
			}
30
261
			
31
262
			Paths.initialize (exec_name, build_pkg_data_dir);
255
			Paths.initialize (exec_name, build_pkg_data_dir);
33
263
			WindowControl.initialize ();
256
			if (environment_is_session_type (XdgSessionType.X11))
34
257
				WindowControl.initialize ();
35
264
			DockletManager.get_default ().load_docklets ();
258
			DockletManager.get_default ().load_docklets ();
36
265
			
259
			
37
266
			initialize ();
260
			initialize ();
38
267
261
39
=== modified file 'lib/HideManager.vala'
40
--- lib/HideManager.vala	2016-03-08 22:15:30 +0000
41
+++ lib/HideManager.vala	2016-11-03 14:10:56 +0000
42
@@ -135,15 +135,22 @@
43
135
			requires (controller.window != null)
135
			requires (controller.window != null)
44
136
		{
136
		{
45
137
			unowned DockWindow window = controller.window;
137
			unowned DockWindow window = controller.window;
46
138
			unowned Wnck.Screen wnck_screen = Wnck.Screen.get_default ();
47
139
			
48
140
#if HAVE_BARRIERS
49
141
			initialize_barriers_support ();
50
142
#endif
51
143
			
138
			
52
144
			window.enter_notify_event.connect (handle_enter_notify_event);
139
			window.enter_notify_event.connect (handle_enter_notify_event);
53
145
			window.leave_notify_event.connect (handle_leave_notify_event);
140
			window.leave_notify_event.connect (handle_leave_notify_event);
54
146
			
141
			
55
142
			//FIXME Startup fixes for wayland session
56
143
			if (environment_is_session_type (XdgSessionType.WAYLAND)) {
57
144
				Hidden = false;
58
145
				Hovered = true;
59
146
				return;
60
147
			}
61
148
			
62
149
#if HAVE_BARRIERS
63
150
			initialize_barriers_support ();
64
151
#endif
65
152
			
66
153
			unowned Wnck.Screen wnck_screen = Wnck.Screen.get_default ();
67
147
			wnck_screen.window_opened.connect_after (schedule_update);
154
			wnck_screen.window_opened.connect_after (schedule_update);
68
148
			wnck_screen.window_closed.connect_after (schedule_update);
155
			wnck_screen.window_closed.connect_after (schedule_update);
69
149
			wnck_screen.active_window_changed.connect_after (handle_active_window_changed);
156
			wnck_screen.active_window_changed.connect_after (handle_active_window_changed);
70
@@ -156,20 +163,23 @@
71
156
		{
163
		{
72
157
			unowned DockWindow window = controller.window;
164
			unowned DockWindow window = controller.window;
73
158
			unowned DragManager drag_manager = controller.drag_manager;
165
			unowned DragManager drag_manager = controller.drag_manager;
74
159
			unowned Wnck.Screen wnck_screen = Wnck.Screen.get_default ();
75
160
			
166
			
76
161
			controller.prefs.notify.disconnect (prefs_changed);
167
			controller.prefs.notify.disconnect (prefs_changed);
77
162
			
168
			
78
163
			window.enter_notify_event.disconnect (handle_enter_notify_event);
169
			window.enter_notify_event.disconnect (handle_enter_notify_event);
79
164
			window.leave_notify_event.disconnect (handle_leave_notify_event);
170
			window.leave_notify_event.disconnect (handle_leave_notify_event);
80
165
			
171
			
81
172
			stop_timers ();
82
173
			
83
174
			if (!environment_is_session_type (XdgSessionType.X11))
84
175
				return;
85
176
			
86
177
			unowned Wnck.Screen wnck_screen = Wnck.Screen.get_default ();
87
166
			wnck_screen.window_opened.disconnect (schedule_update);
178
			wnck_screen.window_opened.disconnect (schedule_update);
88
167
			wnck_screen.window_closed.disconnect (schedule_update);
179
			wnck_screen.window_closed.disconnect (schedule_update);
89
168
			wnck_screen.active_window_changed.disconnect (handle_active_window_changed);
180
			wnck_screen.active_window_changed.disconnect (handle_active_window_changed);
90
169
			wnck_screen.active_workspace_changed.disconnect (handle_workspace_changed);
181
			wnck_screen.active_workspace_changed.disconnect (handle_workspace_changed);
91
170
			
182
			
92
171
			stop_timers ();
93
172
			
94
173
#if HAVE_BARRIERS
183
#if HAVE_BARRIERS
95
174
			gdk_window_remove_filter (null, (Gdk.FilterFunc)xevent_filter);
184
			gdk_window_remove_filter (null, (Gdk.FilterFunc)xevent_filter);
96
175
			
185
			
97
176
186
98
=== modified file 'lib/Items/ApplicationDockItem.vala'
99
--- lib/Items/ApplicationDockItem.vala	2016-03-29 13:36:06 +0000
100
+++ lib/Items/ApplicationDockItem.vala	2016-11-03 14:10:56 +0000
101
@@ -294,6 +294,9 @@
102
294
				return;
294
				return;
103
295
			}
295
			}
104
296
			
296
			
105
297
			if (!environment_is_session_type (XdgSessionType.X11))
106
298
				return;
107
299
			
108
297
			var window_count = WindowControl.get_num_windows (App);
300
			var window_count = WindowControl.get_num_windows (App);
109
298
			
301
			
110
299
			if (window_count <= 1) {
302
			if (window_count <= 1) {
111
@@ -326,12 +329,15 @@
112
326
		{
329
		{
113
327
			if (!is_window ())
330
			if (!is_window ())
114
328
				if (button == PopupButton.MIDDLE
331
				if (button == PopupButton.MIDDLE
116
329
					|| (button == PopupButton.LEFT && (App == null || WindowControl.get_num_windows (App) == 0
332
					|| (button == PopupButton.LEFT && (!is_running ()
117
330
					|| (mod & Gdk.ModifierType.CONTROL_MASK) == Gdk.ModifierType.CONTROL_MASK))) {
333
					|| (mod & Gdk.ModifierType.CONTROL_MASK) == Gdk.ModifierType.CONTROL_MASK))) {
118
331
					launch ();
334
					launch ();
119
332
					return AnimationType.BOUNCE;
335
					return AnimationType.BOUNCE;
120
333
				}
336
				}
121
334
			
337
			
122
338
			if (!environment_is_session_type (XdgSessionType.X11))
123
339
				return AnimationType.NONE;
124
340
			
125
335
			if (button == PopupButton.LEFT && App != null && WindowControl.get_num_windows (App) > 0) {
341
			if (button == PopupButton.LEFT && App != null && WindowControl.get_num_windows (App) > 0) {
126
336
				WindowControl.smart_focus (App, event_time);
342
				WindowControl.smart_focus (App, event_time);
127
337
				return AnimationType.DARKEN;
343
				return AnimationType.DARKEN;
128
@@ -345,7 +351,7 @@
129
345
		 */
351
		 */
130
346
		protected override AnimationType on_scrolled (Gdk.ScrollDirection direction, Gdk.ModifierType mod, uint32 event_time)
352
		protected override AnimationType on_scrolled (Gdk.ScrollDirection direction, Gdk.ModifierType mod, uint32 event_time)
131
347
		{
353
		{
133
348
			if (App == null || WindowControl.get_num_windows (App) == 0)
354
			if (!is_running ())
134
349
				return AnimationType.NONE;
355
				return AnimationType.NONE;
135
350
			
356
			
136
351
			if (GLib.get_monotonic_time () - LastScrolled < ITEM_SCROLL_DURATION * 1000)
357
			if (GLib.get_monotonic_time () - LastScrolled < ITEM_SCROLL_DURATION * 1000)
137
@@ -353,6 +359,9 @@
138
353
			
359
			
139
354
			LastScrolled = GLib.get_monotonic_time ();
360
			LastScrolled = GLib.get_monotonic_time ();
140
355
			
361
			
141
362
			if (!environment_is_session_type (XdgSessionType.X11))
142
363
				return AnimationType.NONE;
143
364
			
144
356
			if (direction == Gdk.ScrollDirection.UP || direction == Gdk.ScrollDirection.LEFT)
365
			if (direction == Gdk.ScrollDirection.UP || direction == Gdk.ScrollDirection.LEFT)
145
357
				WindowControl.focus_previous (App, event_time);
366
				WindowControl.focus_previous (App, event_time);
146
358
			else
367
			else
147
@@ -421,7 +430,8 @@
148
421
			}
430
			}
149
422
			
431
			
150
423
			var event_time = Gtk.get_current_event_time ();
432
			var event_time = Gtk.get_current_event_time ();
152
424
			if (is_running () && window_count > 0) {
433
			if (is_running () && window_count > 0
153
434
				&& environment_is_session_type (XdgSessionType.X11)) {
154
425
				var item = create_menu_item ((window_count > 1 ? _("_Close All") : _("_Close")), "window-close-symbolic;;window-close");
435
				var item = create_menu_item ((window_count > 1 ? _("_Close All") : _("_Close")), "window-close-symbolic;;window-close");
155
426
				item.activate.connect (() => WindowControl.close_all (App, event_time));
436
				item.activate.connect (() => WindowControl.close_all (App, event_time));
156
427
				items.add (item);
437
				items.add (item);
157
@@ -468,7 +478,9 @@
158
468
						continue;
478
						continue;
159
469
					
479
					
160
470
					Gtk.MenuItem window_item;
480
					Gtk.MenuItem window_item;
162
471
					var pbuf = WindowControl.get_window_icon (window);
481
					Gdk.Pixbuf? pbuf = null;
163
482
					if (environment_is_session_type (XdgSessionType.X11))
164
483
						pbuf = WindowControl.get_window_icon (window);
165
472
					var window_name = window.get_name ();
484
					var window_name = window.get_name ();
166
473
					window_name = shorten_window_name (window_name);
485
					window_name = shorten_window_name (window_name);
167
474
					
486
					
168
@@ -479,7 +491,7 @@
169
479
					
491
					
170
480
					if (window.is_active ())
492
					if (window.is_active ())
171
481
						window_item.set_sensitive (false);
493
						window_item.set_sensitive (false);
173
482
					else
494
					else if (environment_is_session_type (XdgSessionType.X11))
174
483
						window_item.activate.connect (() => WindowControl.focus_window (window, event_time));
495
						window_item.activate.connect (() => WindowControl.focus_window (window, event_time));
175
484
					
496
					
176
485
					items.add (window_item);
497
					items.add (window_item);
177
486
498
178
=== modified file 'lib/Items/ApplicationDockItemProvider.vala'
179
--- lib/Items/ApplicationDockItemProvider.vala	2016-02-22 18:53:22 +0000
180
+++ lib/Items/ApplicationDockItemProvider.vala	2016-11-03 14:10:56 +0000
181
@@ -195,6 +195,9 @@
182
195
		
195
		
183
196
		protected virtual void app_opened (Bamf.Application app)
196
		protected virtual void app_opened (Bamf.Application app)
184
197
		{
197
		{
185
198
			if (!environment_is_session_type (XdgSessionType.X11))
186
199
				return;
187
200
			
188
198
			// Make sure internal window-list of Wnck is most up to date
201
			// Make sure internal window-list of Wnck is most up to date
189
199
			Wnck.Screen.get_default ().force_update ();
202
			Wnck.Screen.get_default ().force_update ();
190
200
			
203
			
191
201
204
192
=== modified file 'lib/Items/DefaultApplicationDockItemProvider.vala'
193
--- lib/Items/DefaultApplicationDockItemProvider.vala	2016-02-22 10:55:51 +0000
194
+++ lib/Items/DefaultApplicationDockItemProvider.vala	2016-11-03 14:10:56 +0000
195
@@ -62,7 +62,7 @@
196
62
		{
62
		{
197
63
			Logger.verbose ("DefaultDockItemProvider.update_visible_items ()");
63
			Logger.verbose ("DefaultDockItemProvider.update_visible_items ()");
198
64
			
64
			
200
65
			if (Prefs.CurrentWorkspaceOnly) {
65
			if (environment_is_session_type (XdgSessionType.X11) && Prefs.CurrentWorkspaceOnly) {
201
66
				unowned Wnck.Workspace? active_workspace = Wnck.Screen.get_default ().get_active_workspace ();
66
				unowned Wnck.Workspace? active_workspace = Wnck.Screen.get_default ().get_active_workspace ();
202
67
				foreach (var item in internal_elements) {
67
				foreach (var item in internal_elements) {
203
68
					unowned TransientDockItem? transient = (item as TransientDockItem);
68
					unowned TransientDockItem? transient = (item as TransientDockItem);
204
@@ -121,6 +121,9 @@
205
121
		
121
		
206
122
		void connect_wnck ()
122
		void connect_wnck ()
207
123
		{
123
		{
208
124
			if (!environment_is_session_type (XdgSessionType.X11))
209
125
				return;
210
126
			
211
124
			unowned Wnck.Screen screen = Wnck.Screen.get_default ();
127
			unowned Wnck.Screen screen = Wnck.Screen.get_default ();
212
125
			
128
			
213
126
			screen.active_window_changed.connect_after (handle_window_changed);
129
			screen.active_window_changed.connect_after (handle_window_changed);
214
@@ -130,6 +133,9 @@
215
130
		
133
		
216
131
		void disconnect_wnck ()
134
		void disconnect_wnck ()
217
132
		{
135
		{
218
136
			if (!environment_is_session_type (XdgSessionType.X11))
219
137
				return;
220
138
			
221
133
			unowned Wnck.Screen screen = Wnck.Screen.get_default ();
139
			unowned Wnck.Screen screen = Wnck.Screen.get_default ();
222
134
			
140
			
223
135
			screen.active_window_changed.disconnect (handle_window_changed);
141
			screen.active_window_changed.disconnect (handle_window_changed);
224
136
142
225
=== modified file 'lib/Items/TransientDockItem.vala'
226
--- lib/Items/TransientDockItem.vala	2015-11-03 10:37:19 +0000
227
+++ lib/Items/TransientDockItem.vala	2016-11-03 14:10:56 +0000
228
@@ -69,6 +69,9 @@
229
69
		
69
		
230
70
		void update_forced_pixbuf ()
70
		void update_forced_pixbuf ()
231
71
		{
71
		{
232
72
			if (!environment_is_session_type (XdgSessionType.X11))
233
73
				return;
234
74
			
235
72
			if (delayed_update_timer_id > 0U)
75
			if (delayed_update_timer_id > 0U)
236
73
				return;
76
				return;
237
74
			
77
			
238
75
78
239
=== modified file 'lib/Widgets/CompositedWindow.vala'
240
--- lib/Widgets/CompositedWindow.vala	2015-11-03 10:37:19 +0000
241
+++ lib/Widgets/CompositedWindow.vala	2016-11-03 14:10:56 +0000
242
@@ -40,6 +40,10 @@
243
40
			app_paintable = true;
40
			app_paintable = true;
244
41
			decorated = false;
41
			decorated = false;
245
42
			resizable = false;
42
			resizable = false;
246
43
			
247
44
			if (!environment_is_session_type (XdgSessionType.X11))
248
45
				return;
249
46
			
250
43
			double_buffered = false;
47
			double_buffered = false;
251
44
			
48
			
252
45
			unowned Gdk.Screen screen = get_screen ();
49
			unowned Gdk.Screen screen = get_screen ();
253
46
50
254
=== modified file 'lib/Widgets/DockWindow.vala'
255
--- lib/Widgets/DockWindow.vala	2016-03-04 15:54:48 +0000
256
+++ lib/Widgets/DockWindow.vala	2016-11-03 14:10:56 +0000
257
@@ -536,6 +536,9 @@
258
536
		 */
536
		 */
259
537
		public void update_icon_regions ()
537
		public void update_icon_regions ()
260
538
		{
538
		{
261
539
			if (!environment_is_session_type (XdgSessionType.X11))
262
540
				return;
263
541
			
264
539
			Logger.verbose ("DockWindow.update_icon_regions ()");
542
			Logger.verbose ("DockWindow.update_icon_regions ()");
265
540
			
543
			
266
541
			var use_hidden_region = (menu_is_visible () || controller.hide_manager.Hidden);
544
			var use_hidden_region = (menu_is_visible () || controller.hide_manager.Hidden);
267
@@ -557,6 +560,9 @@
268
557
		 */
560
		 */
269
558
		public void update_icon_region (ApplicationDockItem appitem)
561
		public void update_icon_region (ApplicationDockItem appitem)
270
559
		{
562
		{
271
563
			if (!environment_is_session_type (XdgSessionType.X11))
272
564
				return;
273
565
			
274
560
			if (!appitem.is_running ())
566
			if (!appitem.is_running ())
275
561
				return;
567
				return;
276
562
			
568
Status:	Work in progress
Proposed branch:	lp:~ricotz/plank/wayland
Merge into:	lp:plank
Diff against target:	275 lines (+65/-22) 9 files modified lib/DockController.vala (+5/-0) lib/Factories/AbstractMain.vala (+2/-8) lib/HideManager.vala (+18/-8) lib/Items/ApplicationDockItem.vala (+17/-5) lib/Items/ApplicationDockItemProvider.vala (+3/-0) lib/Items/DefaultApplicationDockItemProvider.vala (+7/-1) lib/Items/TransientDockItem.vala (+3/-0) lib/Widgets/CompositedWindow.vala (+4/-0) lib/Widgets/DockWindow.vala (+6/-0)
To merge this branch:	bzr merge lp:~ricotz/plank/wayland
Related bugs:	Link a bug report
Related blueprints:	Wayland Support (Medium)
Reviewer	Review Type	Date Requested	Status
Docky Core		2015-11-12	Pending
Review via email: mp+277344@code.launchpad.net