Merge lp:~attente/gtk/gtk-mir into lp:~ubuntu-desktop/gtk/ubuntugtk3
- gtk-mir
- Merge into ubuntugtk3
Status: | Merged |
---|---|
Merged at revision: | 558 |
Proposed branch: | lp:~attente/gtk/gtk-mir |
Merge into: | lp:~ubuntu-desktop/gtk/ubuntugtk3 |
Diff against target: |
953 lines (+918/-0) 6 files modified
debian/changelog (+12/-0) debian/patches/0001-mir-always-emit-a-resize-when-creating-windows.patch (+51/-0) debian/patches/0024-mir-re-write-settings-implementation.patch (+796/-0) debian/patches/0025-mir-remove-keymap-and-input-device-state-warnings.patch (+30/-0) debian/patches/0026-mir-set-application-name-when-creating-connection.patch (+25/-0) debian/patches/series (+4/-0) |
To merge this branch: | bzr merge lp:~attente/gtk/gtk-mir |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jeremy Bícha | Approve | ||
Review via email: mp+321739@code.launchpad.net |
Commit message
* debian/
* debian/
* debian/
* debian/
* debian/
- Add upstream patches from gtk-3-22 branch
- Fix LP: #1670390, LP: #1666435, LP: #1618298
Description of the change
* debian/
* debian/
* debian/
* debian/
* debian/
- Add upstream patches from gtk-3-22 branch
- Fix LP: #1670390, LP: #1666435, LP: #1618298
- 559. By William Hua
-
Squash in commit 6e711beb0bdc2a3
0bfd948e5a6a077 cd6fe82493 to clean up an ugly function.
Preview Diff
1 | === modified file 'debian/changelog' | |||
2 | --- debian/changelog 2017-03-24 01:32:46 +0000 | |||
3 | +++ debian/changelog 2017-04-03 17:42:43 +0000 | |||
4 | @@ -1,3 +1,15 @@ | |||
5 | 1 | gtk+3.0 (3.22.11-0ubuntu3) UNRELEASED; urgency=medium | ||
6 | 2 | |||
7 | 3 | * debian/patches/series: | ||
8 | 4 | * debian/patches/0001-mir-always-emit-a-resize-when-creating-windows.patch: | ||
9 | 5 | * debian/patches/0024-mir-re-write-settings-implementation.patch: | ||
10 | 6 | * debian/patches/0025-mir-remove-keymap-and-input-device-state-warnings.patch: | ||
11 | 7 | * debian/patches/0026-mir-set-application-name-when-creating-connection.patch: | ||
12 | 8 | - Add upstream patches from gtk-3-22 branch | ||
13 | 9 | - Fix LP: #1670390, LP: #1666435, LP: #1618298 | ||
14 | 10 | |||
15 | 11 | -- William Hua <william@attente.ca> Mon, 03 Apr 2017 11:06:11 -0400 | ||
16 | 12 | |||
17 | 1 | gtk+3.0 (3.22.11-0ubuntu2) zesty; urgency=medium | 13 | gtk+3.0 (3.22.11-0ubuntu2) zesty; urgency=medium |
18 | 2 | 14 | ||
19 | 3 | * Drop hack to disable Mir backend on s390x | 15 | * Drop hack to disable Mir backend on s390x |
20 | 4 | 16 | ||
21 | === added file 'debian/patches/0001-mir-always-emit-a-resize-when-creating-windows.patch' | |||
22 | --- debian/patches/0001-mir-always-emit-a-resize-when-creating-windows.patch 1970-01-01 00:00:00 +0000 | |||
23 | +++ debian/patches/0001-mir-always-emit-a-resize-when-creating-windows.patch 2017-04-03 17:42:43 +0000 | |||
24 | @@ -0,0 +1,51 @@ | |||
25 | 1 | From ff1a78788f82dbb73e6369d05a0445c7c7f7155b Mon Sep 17 00:00:00 2001 | ||
26 | 2 | From: William Hua <william.hua@canonical.com> | ||
27 | 3 | Date: Tue, 21 Mar 2017 11:25:36 -0400 | ||
28 | 4 | Subject: [PATCH 01/32] mir: always emit a resize when creating windows | ||
29 | 5 | |||
30 | 6 | --- | ||
31 | 7 | gdk/mir/gdkmirwindowimpl.c | 21 ++++++++++++++++++++- | ||
32 | 8 | 1 file changed, 20 insertions(+), 1 deletion(-) | ||
33 | 9 | |||
34 | 10 | diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c | ||
35 | 11 | index f0a76872d2..9f9107611e 100644 | ||
36 | 12 | --- a/gdk/mir/gdkmirwindowimpl.c | ||
37 | 13 | +++ b/gdk/mir/gdkmirwindowimpl.c | ||
38 | 14 | @@ -581,6 +581,25 @@ generate_configure_event (GdkWindow *window, | ||
39 | 15 | } | ||
40 | 16 | |||
41 | 17 | static void | ||
42 | 18 | +synthesize_resize (GdkWindow *window) | ||
43 | 19 | +{ | ||
44 | 20 | + GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl); | ||
45 | 21 | + MirWindowParameters params; | ||
46 | 22 | + | ||
47 | 23 | + if (!impl->mir_window) | ||
48 | 24 | + return; | ||
49 | 25 | + | ||
50 | 26 | + mir_window_get_parameters (impl->mir_window, ¶ms); | ||
51 | 27 | + | ||
52 | 28 | + window->width = params.width; | ||
53 | 29 | + window->height = params.height; | ||
54 | 30 | + | ||
55 | 31 | + _gdk_window_update_size (window); | ||
56 | 32 | + | ||
57 | 33 | + generate_configure_event (window, window->width, window->height); | ||
58 | 34 | +} | ||
59 | 35 | + | ||
60 | 36 | +static void | ||
61 | 37 | maybe_synthesize_resize (GdkWindow *window) | ||
62 | 38 | { | ||
63 | 39 | GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl); | ||
64 | 40 | @@ -635,7 +654,7 @@ ensure_mir_window_full (GdkWindow *window, | ||
65 | 41 | impl->pending_spec_update = FALSE; | ||
66 | 42 | impl->buffer_stream = mir_window_get_buffer_stream (impl->mir_window); | ||
67 | 43 | |||
68 | 44 | - maybe_synthesize_resize (window); | ||
69 | 45 | + synthesize_resize (window); | ||
70 | 46 | |||
71 | 47 | /* FIXME: Ignore some events until shown */ | ||
72 | 48 | mir_window_set_event_handler (impl->mir_window, event_cb, window_ref); | ||
73 | 49 | -- | ||
74 | 50 | 2.11.0 | ||
75 | 51 | |||
76 | 0 | 52 | ||
77 | === added file 'debian/patches/0024-mir-re-write-settings-implementation.patch' | |||
78 | --- debian/patches/0024-mir-re-write-settings-implementation.patch 1970-01-01 00:00:00 +0000 | |||
79 | +++ debian/patches/0024-mir-re-write-settings-implementation.patch 2017-04-03 17:42:43 +0000 | |||
80 | @@ -0,0 +1,796 @@ | |||
81 | 1 | From ec70eb8ae0c2e941d0677803f4b1bdf9f7273be6 Mon Sep 17 00:00:00 2001 | ||
82 | 2 | From: William Hua <william.hua@canonical.com> | ||
83 | 3 | Date: Fri, 31 Mar 2017 15:14:16 -0400 | ||
84 | 4 | Subject: [PATCH 24/32] mir: re-write settings implementation | ||
85 | 5 | |||
86 | 6 | This is a squash of commits | ||
87 | 7 | 01b73072961f8c62255cf2b66dba4e55d36fd646 and | ||
88 | 8 | 6e711beb0bdc2a30bfd948e5a6a077cd6fe82493. | ||
89 | 9 | --- | ||
90 | 10 | gdk/mir/gdkmirscreen.c | 679 +++++++++++++++++++++++++++++++++++-------------- | ||
91 | 11 | 1 file changed, 492 insertions(+), 187 deletions(-) | ||
92 | 12 | |||
93 | 13 | diff --git a/gdk/mir/gdkmirscreen.c b/gdk/mir/gdkmirscreen.c | ||
94 | 14 | index c1a189908e..0ddcb8787a 100644 | ||
95 | 15 | --- a/gdk/mir/gdkmirscreen.c | ||
96 | 16 | +++ b/gdk/mir/gdkmirscreen.c | ||
97 | 17 | @@ -48,9 +48,15 @@ struct GdkMirScreen | ||
98 | 18 | /* Current monitor configuration */ | ||
99 | 19 | MirDisplayConfig *display_config; | ||
100 | 20 | |||
101 | 21 | + /* Display format */ | ||
102 | 22 | GdkVisual *visual; | ||
103 | 23 | |||
104 | 24 | + /* Root window */ | ||
105 | 25 | GdkWindow *root_window; | ||
106 | 26 | + | ||
107 | 27 | + /* Settings */ | ||
108 | 28 | + GHashTable *settings_objects; | ||
109 | 29 | + GHashTable *current_settings; | ||
110 | 30 | }; | ||
111 | 31 | |||
112 | 32 | struct GdkMirScreenClass | ||
113 | 33 | @@ -168,6 +174,11 @@ _gdk_mir_screen_new (GdkDisplay *display) | ||
114 | 34 | static void | ||
115 | 35 | gdk_mir_screen_dispose (GObject *object) | ||
116 | 36 | { | ||
117 | 37 | + GdkMirScreen *screen = GDK_MIR_SCREEN (object); | ||
118 | 38 | + | ||
119 | 39 | + g_clear_pointer (&screen->current_settings, g_hash_table_unref); | ||
120 | 40 | + g_clear_pointer (&screen->settings_objects, g_hash_table_unref); | ||
121 | 41 | + | ||
122 | 42 | G_OBJECT_CLASS (gdk_mir_screen_parent_class)->dispose (object); | ||
123 | 43 | } | ||
124 | 44 | |||
125 | 45 | @@ -459,260 +470,551 @@ gdk_mir_screen_broadcast_client_message (GdkScreen *screen, | ||
126 | 46 | // FIXME | ||
127 | 47 | } | ||
128 | 48 | |||
129 | 49 | -static gboolean | ||
130 | 50 | -gdk_mir_screen_get_setting (GdkScreen *screen, | ||
131 | 51 | - const gchar *name, | ||
132 | 52 | - GValue *value) | ||
133 | 53 | +static void setting_changed (GSettings *settings, | ||
134 | 54 | + const gchar *key, | ||
135 | 55 | + GdkMirScreen *screen); | ||
136 | 56 | + | ||
137 | 57 | +static GSettings * | ||
138 | 58 | +get_settings (GdkMirScreen *screen, | ||
139 | 59 | + const gchar *schema_id) | ||
140 | 60 | { | ||
141 | 61 | - if (strcmp (name, "gtk-theme-name") == 0) | ||
142 | 62 | - { | ||
143 | 63 | - g_value_set_string (value, "Ambiance"); | ||
144 | 64 | - return TRUE; | ||
145 | 65 | - } | ||
146 | 66 | + GSettings *settings; | ||
147 | 67 | + GSettingsSchemaSource *source; | ||
148 | 68 | + GSettingsSchema *schema; | ||
149 | 69 | |||
150 | 70 | - if (strcmp (name, "gtk-font-name") == 0) | ||
151 | 71 | - { | ||
152 | 72 | - g_value_set_string (value, "Ubuntu"); | ||
153 | 73 | - return TRUE; | ||
154 | 74 | - } | ||
155 | 75 | + settings = g_hash_table_lookup (screen->settings_objects, schema_id); | ||
156 | 76 | |||
157 | 77 | - if (strcmp (name, "gtk-enable-animations") == 0) | ||
158 | 78 | - { | ||
159 | 79 | - g_value_set_boolean (value, TRUE); | ||
160 | 80 | - return TRUE; | ||
161 | 81 | - } | ||
162 | 82 | + if (settings) | ||
163 | 83 | + return g_object_ref (settings); | ||
164 | 84 | |||
165 | 85 | - if (strcmp (name, "gtk-xft-dpi") == 0) | ||
166 | 86 | - { | ||
167 | 87 | - g_value_set_int (value, 96 * 1024); | ||
168 | 88 | - return TRUE; | ||
169 | 89 | - } | ||
170 | 90 | + source = g_settings_schema_source_get_default (); | ||
171 | 91 | |||
172 | 92 | - if (strcmp (name, "gtk-xft-antialias") == 0) | ||
173 | 93 | + if (!source) | ||
174 | 94 | { | ||
175 | 95 | - g_value_set_int (value, TRUE); | ||
176 | 96 | - return TRUE; | ||
177 | 97 | + g_warning ("no schemas installed"); | ||
178 | 98 | + return NULL; | ||
179 | 99 | } | ||
180 | 100 | |||
181 | 101 | - if (strcmp (name, "gtk-xft-hinting") == 0) | ||
182 | 102 | - { | ||
183 | 103 | - g_value_set_int (value, TRUE); | ||
184 | 104 | - return TRUE; | ||
185 | 105 | - } | ||
186 | 106 | + schema = g_settings_schema_source_lookup (source, schema_id, TRUE); | ||
187 | 107 | |||
188 | 108 | - if (strcmp (name, "gtk-xft-hintstyle") == 0) | ||
189 | 109 | + if (!schema) | ||
190 | 110 | { | ||
191 | 111 | - g_value_set_static_string (value, "hintfull"); | ||
192 | 112 | - return TRUE; | ||
193 | 113 | + g_warning ("schema not found: %s", schema_id); | ||
194 | 114 | + return NULL; | ||
195 | 115 | } | ||
196 | 116 | |||
197 | 117 | - if (strcmp (name, "gtk-xft-rgba") == 0) | ||
198 | 118 | - { | ||
199 | 119 | - g_value_set_static_string (value, "rgba"); | ||
200 | 120 | - return TRUE; | ||
201 | 121 | - } | ||
202 | 122 | + settings = g_settings_new_full (schema, NULL, NULL); | ||
203 | 123 | + g_signal_connect (settings, "changed", G_CALLBACK (setting_changed), screen); | ||
204 | 124 | + g_hash_table_insert (screen->settings_objects, g_strdup (schema_id), g_object_ref (settings)); | ||
205 | 125 | + g_settings_schema_unref (schema); | ||
206 | 126 | + return settings; | ||
207 | 127 | +} | ||
208 | 128 | |||
209 | 129 | - if (g_str_equal (name, "gtk-modules")) | ||
210 | 130 | - { | ||
211 | 131 | - g_value_set_string (value, NULL); | ||
212 | 132 | - return TRUE; | ||
213 | 133 | - } | ||
214 | 134 | +static GVariant * | ||
215 | 135 | +read_setting (GdkMirScreen *screen, | ||
216 | 136 | + const gchar *schema_id, | ||
217 | 137 | + const gchar *key) | ||
218 | 138 | +{ | ||
219 | 139 | + GSettings *settings; | ||
220 | 140 | + GVariant *variant; | ||
221 | 141 | |||
222 | 142 | - if (g_str_equal (name, "gtk-application-prefer-dark-theme")) | ||
223 | 143 | - { | ||
224 | 144 | - g_value_set_boolean (value, FALSE); | ||
225 | 145 | - return TRUE; | ||
226 | 146 | - } | ||
227 | 147 | + settings = get_settings (screen, schema_id); | ||
228 | 148 | |||
229 | 149 | - if (g_str_equal (name, "gtk-key-theme-name")) | ||
230 | 150 | - { | ||
231 | 151 | - g_value_set_string (value, NULL); | ||
232 | 152 | - return TRUE; | ||
233 | 153 | - } | ||
234 | 154 | + if (!settings) | ||
235 | 155 | + return NULL; | ||
236 | 156 | |||
237 | 157 | - if (g_str_equal (name, "gtk-double-click-time")) | ||
238 | 158 | - { | ||
239 | 159 | - g_value_set_int (value, 250); | ||
240 | 160 | - return TRUE; | ||
241 | 161 | - } | ||
242 | 162 | + variant = g_settings_get_value (settings, key); | ||
243 | 163 | + g_object_unref (settings); | ||
244 | 164 | + return variant; | ||
245 | 165 | +} | ||
246 | 166 | |||
247 | 167 | - if (g_str_equal (name, "gtk-double-click-distance")) | ||
248 | 168 | - { | ||
249 | 169 | - g_value_set_int (value, 5); | ||
250 | 170 | - return TRUE; | ||
251 | 171 | - } | ||
252 | 172 | +static void | ||
253 | 173 | +change_setting (GdkMirScreen *screen, | ||
254 | 174 | + const gchar *name, | ||
255 | 175 | + GVariant *variant) | ||
256 | 176 | +{ | ||
257 | 177 | + GVariant *old_variant; | ||
258 | 178 | + GdkEventSetting event; | ||
259 | 179 | |||
260 | 180 | - if (g_str_equal (name, "gtk-cursor-theme-name")) | ||
261 | 181 | - { | ||
262 | 182 | - g_value_set_string (value, "Raleigh"); | ||
263 | 183 | - return TRUE; | ||
264 | 184 | - } | ||
265 | 185 | + old_variant = g_hash_table_lookup (screen->current_settings, name); | ||
266 | 186 | |||
267 | 187 | - if (g_str_equal (name, "gtk-cursor-theme-size")) | ||
268 | 188 | - { | ||
269 | 189 | - g_value_set_int (value, 128); | ||
270 | 190 | - return TRUE; | ||
271 | 191 | - } | ||
272 | 192 | + if (variant == old_variant) | ||
273 | 193 | + return; | ||
274 | 194 | |||
275 | 195 | - if (g_str_equal (name, "gtk-icon-theme-name")) | ||
276 | 196 | - { | ||
277 | 197 | - g_value_set_string (value, "hicolor"); | ||
278 | 198 | - return TRUE; | ||
279 | 199 | - } | ||
280 | 200 | + if (variant && old_variant && g_variant_equal (variant, old_variant)) | ||
281 | 201 | + return; | ||
282 | 202 | |||
283 | 203 | - if (g_str_equal (name, "gtk-shell-shows-app-menu")) | ||
284 | 204 | - { | ||
285 | 205 | - g_value_set_boolean (value, FALSE); | ||
286 | 206 | - return TRUE; | ||
287 | 207 | - } | ||
288 | 208 | + event.type = GDK_SETTING; | ||
289 | 209 | + event.window = gdk_screen_get_root_window (GDK_SCREEN (screen)); | ||
290 | 210 | + event.send_event = FALSE; | ||
291 | 211 | + event.name = g_strdup (name); | ||
292 | 212 | |||
293 | 213 | - if (g_str_equal (name, "gtk-shell-shows-menubar")) | ||
294 | 214 | + if (variant) | ||
295 | 215 | { | ||
296 | 216 | - g_value_set_boolean (value, FALSE); | ||
297 | 217 | - return TRUE; | ||
298 | 218 | + event.action = old_variant ? GDK_SETTING_ACTION_CHANGED : GDK_SETTING_ACTION_NEW; | ||
299 | 219 | + g_hash_table_insert (screen->current_settings, g_strdup (name), g_variant_ref_sink (variant)); | ||
300 | 220 | } | ||
301 | 221 | - | ||
302 | 222 | - if (g_str_equal (name, "gtk-shell-shows-desktop")) | ||
303 | 223 | + else | ||
304 | 224 | { | ||
305 | 225 | - g_value_set_boolean (value, FALSE); | ||
306 | 226 | - return TRUE; | ||
307 | 227 | + event.action = GDK_SETTING_ACTION_DELETED; | ||
308 | 228 | + g_hash_table_remove (screen->current_settings, name); | ||
309 | 229 | } | ||
310 | 230 | |||
311 | 231 | - if (g_str_equal (name, "gtk-recent-files-enabled")) | ||
312 | 232 | - { | ||
313 | 233 | - g_value_set_boolean (value, FALSE); | ||
314 | 234 | - return TRUE; | ||
315 | 235 | - } | ||
316 | 236 | + gdk_event_put ((const GdkEvent *) &event); | ||
317 | 237 | + g_free (event.name); | ||
318 | 238 | +} | ||
319 | 239 | |||
320 | 240 | - if (g_str_equal (name, "gtk-alternative-sort-arrows")) | ||
321 | 241 | - { | ||
322 | 242 | - g_value_set_boolean (value, FALSE); | ||
323 | 243 | - return TRUE; | ||
324 | 244 | - } | ||
325 | 245 | +static const struct | ||
326 | 246 | +{ | ||
327 | 247 | + const gchar *name; | ||
328 | 248 | + const gchar *schema_id; | ||
329 | 249 | + const gchar *key; | ||
330 | 250 | +} SETTINGS_MAP[] = { | ||
331 | 251 | + { | ||
332 | 252 | + "gtk-double-click-time", | ||
333 | 253 | + "org.gnome.settings-daemon.peripherals.mouse", | ||
334 | 254 | + "double-click" | ||
335 | 255 | + }, | ||
336 | 256 | + { | ||
337 | 257 | + "gtk-cursor-blink", | ||
338 | 258 | + "org.gnome.desktop.interface", | ||
339 | 259 | + "cursor-blink" | ||
340 | 260 | + }, | ||
341 | 261 | + { | ||
342 | 262 | + "gtk-cursor-blink-time", | ||
343 | 263 | + "org.gnome.desktop.interface", | ||
344 | 264 | + "cursor-blink-time" | ||
345 | 265 | + }, | ||
346 | 266 | + { | ||
347 | 267 | + "gtk-cursor-blink-timeout", | ||
348 | 268 | + "org.gnome.desktop.interface", | ||
349 | 269 | + "cursor-blink-timeout" | ||
350 | 270 | + }, | ||
351 | 271 | + { | ||
352 | 272 | + "gtk-theme-name", | ||
353 | 273 | + "org.gnome.desktop.interface", | ||
354 | 274 | + "gtk-theme" | ||
355 | 275 | + }, | ||
356 | 276 | + { | ||
357 | 277 | + "gtk-icon-theme-name", | ||
358 | 278 | + "org.gnome.desktop.interface", | ||
359 | 279 | + "icon-theme" | ||
360 | 280 | + }, | ||
361 | 281 | + { | ||
362 | 282 | + "gtk-key-theme-name", | ||
363 | 283 | + "org.gnome.desktop.interface", | ||
364 | 284 | + "gtk-key-theme" | ||
365 | 285 | + }, | ||
366 | 286 | + { | ||
367 | 287 | + "gtk-dnd-drag-threshold", | ||
368 | 288 | + "org.gnome.settings-daemon.peripherals.mouse", | ||
369 | 289 | + "drag-threshold" | ||
370 | 290 | + }, | ||
371 | 291 | + { | ||
372 | 292 | + "gtk-font-name", | ||
373 | 293 | + "org.gnome.desktop.interface", | ||
374 | 294 | + "font-name" | ||
375 | 295 | + }, | ||
376 | 296 | + { | ||
377 | 297 | + "gtk-xft-antialias", | ||
378 | 298 | + "org.gnome.settings-daemon.plugins.xsettings", | ||
379 | 299 | + "antialiasing" | ||
380 | 300 | + }, | ||
381 | 301 | + { | ||
382 | 302 | + "gtk-xft-hinting", | ||
383 | 303 | + "org.gnome.settings-daemon.plugins.xsettings", | ||
384 | 304 | + "hinting" | ||
385 | 305 | + }, | ||
386 | 306 | + { | ||
387 | 307 | + "gtk-xft-hintstyle", | ||
388 | 308 | + "org.gnome.settings-daemon.plugins.xsettings", | ||
389 | 309 | + "hinting" | ||
390 | 310 | + }, | ||
391 | 311 | + { | ||
392 | 312 | + "gtk-xft-rgba", | ||
393 | 313 | + "org.gnome.settings-daemon.plugins.xsettings", | ||
394 | 314 | + "rgba-order" | ||
395 | 315 | + }, | ||
396 | 316 | + { | ||
397 | 317 | + "gtk-xft-dpi", | ||
398 | 318 | + "org.gnome.desktop.interface", | ||
399 | 319 | + "text-scaling-factor" | ||
400 | 320 | + }, | ||
401 | 321 | + { | ||
402 | 322 | + "gtk-cursor-theme-name", | ||
403 | 323 | + "org.gnome.desktop.interface", | ||
404 | 324 | + "cursor-theme" | ||
405 | 325 | + }, | ||
406 | 326 | + { | ||
407 | 327 | + "gtk-cursor-theme-size", | ||
408 | 328 | + "org.gnome.desktop.interface", | ||
409 | 329 | + "cursor-size" | ||
410 | 330 | + }, | ||
411 | 331 | + { | ||
412 | 332 | + "gtk-enable-animations", | ||
413 | 333 | + "org.gnome.desktop.interface", | ||
414 | 334 | + "enable-animations" | ||
415 | 335 | + }, | ||
416 | 336 | + { | ||
417 | 337 | + "gtk-im-module", | ||
418 | 338 | + "org.gnome.desktop.interface", | ||
419 | 339 | + "gtk-im-module" | ||
420 | 340 | + }, | ||
421 | 341 | + { | ||
422 | 342 | + "gtk-recent-files-max-age", | ||
423 | 343 | + "org.gnome.desktop.privacy", | ||
424 | 344 | + "recent-files-max-age" | ||
425 | 345 | + }, | ||
426 | 346 | + { | ||
427 | 347 | + "gtk-sound-theme-name", | ||
428 | 348 | + "org.gnome.desktop.sound", | ||
429 | 349 | + "theme-name" | ||
430 | 350 | + }, | ||
431 | 351 | + { | ||
432 | 352 | + "gtk-enable-input-feedback-sounds", | ||
433 | 353 | + "org.gnome.desktop.sound", | ||
434 | 354 | + "input-feedback-sounds" | ||
435 | 355 | + }, | ||
436 | 356 | + { | ||
437 | 357 | + "gtk-enable-event-sounds", | ||
438 | 358 | + "org.gnome.desktop.sound", | ||
439 | 359 | + "event-sounds" | ||
440 | 360 | + }, | ||
441 | 361 | + { | ||
442 | 362 | + "gtk-shell-shows-desktop", | ||
443 | 363 | + "org.gnome.desktop.background", | ||
444 | 364 | + "show-desktop-icons" | ||
445 | 365 | + }, | ||
446 | 366 | + { | ||
447 | 367 | + "gtk-decoration-layout", | ||
448 | 368 | + "org.gnome.desktop.wm.preferences", | ||
449 | 369 | + "button-layout" | ||
450 | 370 | + }, | ||
451 | 371 | + { | ||
452 | 372 | + "gtk-titlebar-double-click", | ||
453 | 373 | + "org.gnome.desktop.wm.preferences", | ||
454 | 374 | + "action-double-click-titlebar" | ||
455 | 375 | + }, | ||
456 | 376 | + { | ||
457 | 377 | + "gtk-titlebar-middle-click", | ||
458 | 378 | + "org.gnome.desktop.wm.preferences", | ||
459 | 379 | + "action-middle-click-titlebar" | ||
460 | 380 | + }, | ||
461 | 381 | + { | ||
462 | 382 | + "gtk-titlebar-right-click", | ||
463 | 383 | + "org.gnome.desktop.wm.preferences", | ||
464 | 384 | + "action-right-click-titlebar" | ||
465 | 385 | + }, | ||
466 | 386 | + { | ||
467 | 387 | + "gtk-enable-primary-paste", | ||
468 | 388 | + "org.gnome.desktop.interface", | ||
469 | 389 | + "gtk-enable-primary-paste" | ||
470 | 390 | + }, | ||
471 | 391 | + { | ||
472 | 392 | + "gtk-recent-files-enabled", | ||
473 | 393 | + "org.gnome.desktop.privacy", | ||
474 | 394 | + "remember-recent-files" | ||
475 | 395 | + }, | ||
476 | 396 | + { | ||
477 | 397 | + "gtk-keynav-use-caret", | ||
478 | 398 | + "org.gnome.desktop.a11y", | ||
479 | 399 | + "always-show-text-caret" | ||
480 | 400 | + }, | ||
481 | 401 | + { NULL } | ||
482 | 402 | +}; | ||
483 | 403 | |||
484 | 404 | - if (g_str_equal (name, "gtk-enable-accels")) | ||
485 | 405 | - { | ||
486 | 406 | - g_value_set_boolean (value, TRUE); | ||
487 | 407 | - return TRUE; | ||
488 | 408 | - } | ||
489 | 409 | +static guint | ||
490 | 410 | +get_scaling_factor (GdkMirScreen *screen) | ||
491 | 411 | +{ | ||
492 | 412 | + GVariant *variant; | ||
493 | 413 | + guint scaling_factor; | ||
494 | 414 | |||
495 | 415 | - if (g_str_equal (name, "gtk-enable-mnemonics")) | ||
496 | 416 | - { | ||
497 | 417 | - g_value_set_boolean (value, TRUE); | ||
498 | 418 | - return TRUE; | ||
499 | 419 | - } | ||
500 | 420 | + variant = read_setting (screen, "org.gnome.desktop.interface", "scaling-factor"); | ||
501 | 421 | |||
502 | 422 | - if (g_str_equal (name, "gtk-menu-images")) | ||
503 | 423 | + if (!variant) | ||
504 | 424 | { | ||
505 | 425 | - g_value_set_boolean (value, FALSE); | ||
506 | 426 | - return TRUE; | ||
507 | 427 | + g_warning ("no scaling factor: org.gnome.desktop.interface.scaling-factor"); | ||
508 | 428 | + variant = g_variant_ref_sink (g_variant_new_uint32 (0)); | ||
509 | 429 | } | ||
510 | 430 | |||
511 | 431 | - if (g_str_equal (name, "gtk-button-images")) | ||
512 | 432 | - { | ||
513 | 433 | - g_value_set_boolean (value, FALSE); | ||
514 | 434 | - return TRUE; | ||
515 | 435 | - } | ||
516 | 436 | + scaling_factor = g_variant_get_uint32 (variant); | ||
517 | 437 | + g_variant_unref (variant); | ||
518 | 438 | |||
519 | 439 | - if (g_str_equal (name, "gtk-split-cursor")) | ||
520 | 440 | - { | ||
521 | 441 | - g_value_set_boolean (value, TRUE); | ||
522 | 442 | - return TRUE; | ||
523 | 443 | - } | ||
524 | 444 | + if (scaling_factor) | ||
525 | 445 | + return scaling_factor; | ||
526 | 446 | |||
527 | 447 | - if (g_str_equal (name, "gtk-im-module")) | ||
528 | 448 | - { | ||
529 | 449 | - g_value_set_string (value, NULL); | ||
530 | 450 | - return TRUE; | ||
531 | 451 | - } | ||
532 | 452 | + scaling_factor = 1; | ||
533 | 453 | |||
534 | 454 | - if (g_str_equal (name, "gtk-menu-bar-accel")) | ||
535 | 455 | - { | ||
536 | 456 | - g_value_set_string (value, "F10"); | ||
537 | 457 | - return TRUE; | ||
538 | 458 | - } | ||
539 | 459 | + /* TODO: scaling_factor = 2 if HiDPI >= 2 * 96 */ | ||
540 | 460 | |||
541 | 461 | - if (g_str_equal (name, "gtk-cursor-blink")) | ||
542 | 462 | - { | ||
543 | 463 | - g_value_set_boolean (value, TRUE); | ||
544 | 464 | - return TRUE; | ||
545 | 465 | - } | ||
546 | 466 | + return scaling_factor; | ||
547 | 467 | +} | ||
548 | 468 | |||
549 | 469 | - if (g_str_equal (name, "gtk-cursor-blink-time")) | ||
550 | 470 | - { | ||
551 | 471 | - g_value_set_int (value, 1200); | ||
552 | 472 | - return TRUE; | ||
553 | 473 | - } | ||
554 | 474 | +static void | ||
555 | 475 | +update_setting (GdkMirScreen *screen, | ||
556 | 476 | + const gchar *name) | ||
557 | 477 | +{ | ||
558 | 478 | + GVariant *variant; | ||
559 | 479 | + GVariant *antialiasing_variant; | ||
560 | 480 | + gboolean gtk_xft_antialias; | ||
561 | 481 | + gboolean gtk_xft_hinting; | ||
562 | 482 | + gdouble text_scaling_factor; | ||
563 | 483 | + gint cursor_size; | ||
564 | 484 | + gint i; | ||
565 | 485 | |||
566 | 486 | - if (g_str_equal (name, "gtk-cursor-blink-timeout")) | ||
567 | 487 | + if (!g_strcmp0 (name, "gtk-modules")) | ||
568 | 488 | { | ||
569 | 489 | - g_value_set_int (value, 10); | ||
570 | 490 | - return TRUE; | ||
571 | 491 | + /* TODO: X-GTK-Module-Enabled-Schema, X-GTK-Module-Enabled-Key */ | ||
572 | 492 | + /* TODO: org.gnome.settings-daemon.plugins.xsettings.enabled-gtk-modules */ | ||
573 | 493 | + /* TODO: org.gnome.settings-daemon.plugins.xsettings.disabled-gtk-modules */ | ||
574 | 494 | + return; | ||
575 | 495 | } | ||
576 | 496 | - | ||
577 | 497 | - if (g_str_equal (name, "gtk-entry-select-on-focus")) | ||
578 | 498 | + else | ||
579 | 499 | { | ||
580 | 500 | - g_value_set_boolean (value, FALSE); | ||
581 | 501 | - return TRUE; | ||
582 | 502 | + for (i = 0; SETTINGS_MAP[i].name; i++) | ||
583 | 503 | + if (!g_strcmp0 (name, SETTINGS_MAP[i].name)) | ||
584 | 504 | + break; | ||
585 | 505 | + | ||
586 | 506 | + if (!SETTINGS_MAP[i].name) | ||
587 | 507 | + return; | ||
588 | 508 | + | ||
589 | 509 | + variant = read_setting (screen, SETTINGS_MAP[i].schema_id, SETTINGS_MAP[i].key); | ||
590 | 510 | + | ||
591 | 511 | + if (!variant) | ||
592 | 512 | + { | ||
593 | 513 | + g_warning ("no setting for %s: %s.%s", SETTINGS_MAP[i].name, SETTINGS_MAP[i].schema_id, SETTINGS_MAP[i].key); | ||
594 | 514 | + return; | ||
595 | 515 | + } | ||
596 | 516 | } | ||
597 | 517 | |||
598 | 518 | - if (g_str_equal (name, "gtk-error-bell")) | ||
599 | 519 | + if (!g_strcmp0 (name, "gtk-xft-antialias")) | ||
600 | 520 | { | ||
601 | 521 | - g_value_set_boolean (value, FALSE); | ||
602 | 522 | - return TRUE; | ||
603 | 523 | + gtk_xft_antialias = g_strcmp0 (g_variant_get_string (variant, NULL), "none"); | ||
604 | 524 | + g_variant_unref (variant); | ||
605 | 525 | + variant = g_variant_ref_sink (g_variant_new_int32 (gtk_xft_antialias ? 1 : 0)); | ||
606 | 526 | } | ||
607 | 527 | - | ||
608 | 528 | - if (g_str_equal (name, "gtk-label-select-on-focus")) | ||
609 | 529 | + else if (!g_strcmp0 (name, "gtk-xft-hinting")) | ||
610 | 530 | { | ||
611 | 531 | - g_value_set_boolean (value, FALSE); | ||
612 | 532 | - return TRUE; | ||
613 | 533 | + gtk_xft_hinting = g_strcmp0 (g_variant_get_string (variant, NULL), "none"); | ||
614 | 534 | + g_variant_unref (variant); | ||
615 | 535 | + variant = g_variant_ref_sink (g_variant_new_int32 (gtk_xft_hinting ? 1 : 0)); | ||
616 | 536 | } | ||
617 | 537 | - | ||
618 | 538 | - if (g_str_equal (name, "gtk-decoration-layout")) | ||
619 | 539 | + else if (!g_strcmp0 (name, "gtk-xft-hintstyle")) | ||
620 | 540 | { | ||
621 | 541 | - g_value_set_string (value, "menu:minimize,maximize,close"); | ||
622 | 542 | - return TRUE; | ||
623 | 543 | + if (!g_strcmp0 (g_variant_get_string (variant, NULL), "none")) | ||
624 | 544 | + { | ||
625 | 545 | + g_variant_unref (variant); | ||
626 | 546 | + variant = g_variant_ref_sink (g_variant_new_string ("hintnone")); | ||
627 | 547 | + } | ||
628 | 548 | + else if (!g_strcmp0 (g_variant_get_string (variant, NULL), "slight")) | ||
629 | 549 | + { | ||
630 | 550 | + g_variant_unref (variant); | ||
631 | 551 | + variant = g_variant_ref_sink (g_variant_new_string ("hintslight")); | ||
632 | 552 | + } | ||
633 | 553 | + else if (!g_strcmp0 (g_variant_get_string (variant, NULL), "medium")) | ||
634 | 554 | + { | ||
635 | 555 | + g_variant_unref (variant); | ||
636 | 556 | + variant = g_variant_ref_sink (g_variant_new_string ("hintmedium")); | ||
637 | 557 | + } | ||
638 | 558 | + else if (!g_strcmp0 (g_variant_get_string (variant, NULL), "full")) | ||
639 | 559 | + { | ||
640 | 560 | + g_variant_unref (variant); | ||
641 | 561 | + variant = g_variant_ref_sink (g_variant_new_string ("hintfull")); | ||
642 | 562 | + } | ||
643 | 563 | + else | ||
644 | 564 | + { | ||
645 | 565 | + g_warning ("unknown org.gnome.settings-daemon.plugins.xsettings.hinting value: %s", g_variant_get_string (variant, NULL)); | ||
646 | 566 | + g_variant_unref (variant); | ||
647 | 567 | + return; | ||
648 | 568 | + } | ||
649 | 569 | } | ||
650 | 570 | + else if (!g_strcmp0 (name, "gtk-xft-rgba")) | ||
651 | 571 | + { | ||
652 | 572 | + antialiasing_variant = read_setting (screen, "org.gnome.settings-daemon.plugins.xsettings", "antialiasing"); | ||
653 | 573 | + | ||
654 | 574 | + if (g_strcmp0 (g_variant_get_string (antialiasing_variant, NULL), "rgba")) | ||
655 | 575 | + { | ||
656 | 576 | + g_variant_unref (variant); | ||
657 | 577 | + variant = g_variant_ref_sink (g_variant_new_string ("none")); | ||
658 | 578 | + } | ||
659 | 579 | + else if (g_strcmp0 (g_variant_get_string (variant, NULL), "rgba")) | ||
660 | 580 | + { | ||
661 | 581 | + g_variant_unref (variant); | ||
662 | 582 | + variant = g_variant_ref_sink (g_variant_new_string ("rgb")); | ||
663 | 583 | + } | ||
664 | 584 | |||
665 | 585 | - if (g_str_equal (name, "gtk-dnd-drag-threshold")) | ||
666 | 586 | + g_variant_unref (antialiasing_variant); | ||
667 | 587 | + } | ||
668 | 588 | + else if (!g_strcmp0 (name, "gtk-xft-dpi")) | ||
669 | 589 | { | ||
670 | 590 | - g_value_set_int (value, 8); | ||
671 | 591 | - return TRUE; | ||
672 | 592 | + text_scaling_factor = g_variant_get_double (variant); | ||
673 | 593 | + g_variant_unref (variant); | ||
674 | 594 | + variant = g_variant_ref_sink (g_variant_new_int32 (1024 * get_scaling_factor (screen) * text_scaling_factor + 0.5)); | ||
675 | 595 | } | ||
676 | 596 | - | ||
677 | 597 | - if (g_str_equal (name, "gtk-dialogs-use-header")) | ||
678 | 598 | + else if (!g_strcmp0 (name, "gtk-cursor-theme-size")) | ||
679 | 599 | { | ||
680 | 600 | - g_value_set_boolean (value, FALSE); | ||
681 | 601 | - return TRUE; | ||
682 | 602 | + cursor_size = g_variant_get_int32 (variant); | ||
683 | 603 | + g_variant_unref (variant); | ||
684 | 604 | + variant = g_variant_ref_sink (g_variant_new_int32 (get_scaling_factor (screen) * cursor_size)); | ||
685 | 605 | } | ||
686 | 606 | - | ||
687 | 607 | - if (g_str_equal (name, "gtk-long-press-time")) | ||
688 | 608 | + else if (!g_strcmp0 (name, "gtk-enable-animations")) | ||
689 | 609 | { | ||
690 | 610 | - g_value_set_uint (value, 500); | ||
691 | 611 | - return TRUE; | ||
692 | 612 | + /* TODO: disable under vnc/vino/llvmpipe */ | ||
693 | 613 | } | ||
694 | 614 | |||
695 | 615 | - if (g_str_equal (name, "gtk-primary-button-warps-slider")) | ||
696 | 616 | + change_setting (screen, name, variant); | ||
697 | 617 | + g_variant_unref (variant); | ||
698 | 618 | +} | ||
699 | 619 | + | ||
700 | 620 | +static void | ||
701 | 621 | +setting_changed (GSettings *settings, | ||
702 | 622 | + const gchar *key, | ||
703 | 623 | + GdkMirScreen *screen) | ||
704 | 624 | +{ | ||
705 | 625 | + gchar *schema_id; | ||
706 | 626 | + gint i; | ||
707 | 627 | + | ||
708 | 628 | + g_object_get (settings, "schema-id", &schema_id, NULL); | ||
709 | 629 | + | ||
710 | 630 | + for (i = 0; SETTINGS_MAP[i].name; i++) | ||
711 | 631 | + if (!g_strcmp0 (schema_id, SETTINGS_MAP[i].schema_id) && !g_strcmp0 (key, SETTINGS_MAP[i].key)) | ||
712 | 632 | + update_setting (screen, SETTINGS_MAP[i].name); | ||
713 | 633 | + | ||
714 | 634 | + if (!g_strcmp0 (schema_id, "org.gnome.settings-daemon.plugins.xsettings")) | ||
715 | 635 | { | ||
716 | 636 | - g_value_set_boolean (value, TRUE); | ||
717 | 637 | - return TRUE; | ||
718 | 638 | + if (!g_strcmp0 (key, "enabled-gtk-modules")) | ||
719 | 639 | + update_setting (screen, "gtk-modules"); | ||
720 | 640 | + else if (!g_strcmp0 (key, "disabled-gtk-modules")) | ||
721 | 641 | + update_setting (screen, "gtk-modules"); | ||
722 | 642 | + else if (!g_strcmp0 (key, "antialiasing")) | ||
723 | 643 | + update_setting (screen, "rgba-order"); | ||
724 | 644 | } | ||
725 | 645 | - | ||
726 | 646 | - if (g_str_equal (name, "gtk-recent-files-max-age")) | ||
727 | 647 | + else if (!g_strcmp0 (schema_id, "org.gnome.desktop.interface")) | ||
728 | 648 | { | ||
729 | 649 | - g_value_set_int (value, 30); | ||
730 | 650 | - return TRUE; | ||
731 | 651 | + if (!g_strcmp0 (key, "scaling-factor")) | ||
732 | 652 | + { | ||
733 | 653 | + update_setting (screen, "gtk-xft-dpi"); | ||
734 | 654 | + update_setting (screen, "gtk-cursor-theme-size"); | ||
735 | 655 | + } | ||
736 | 656 | } | ||
737 | 657 | |||
738 | 658 | - if (g_str_equal (name, "gtk-titlebar-double-click")) | ||
739 | 659 | + g_free (schema_id); | ||
740 | 660 | +} | ||
741 | 661 | + | ||
742 | 662 | +static const gchar * const KNOWN_SETTINGS[] = | ||
743 | 663 | +{ | ||
744 | 664 | + "gtk-double-click-time", | ||
745 | 665 | + "gtk-double-click-distance", | ||
746 | 666 | + "gtk-cursor-blink", | ||
747 | 667 | + "gtk-cursor-blink-time", | ||
748 | 668 | + "gtk-cursor-blink-timeout", | ||
749 | 669 | + "gtk-split-cursor", | ||
750 | 670 | + "gtk-theme-name", | ||
751 | 671 | + "gtk-icon-theme-name", | ||
752 | 672 | + "gtk-fallback-icon-theme", | ||
753 | 673 | + "gtk-key-theme-name", | ||
754 | 674 | + "gtk-menu-bar-accel", | ||
755 | 675 | + "gtk-dnd-drag-threshold", | ||
756 | 676 | + "gtk-font-name", | ||
757 | 677 | + "gtk-icon-sizes", | ||
758 | 678 | + "gtk-modules", | ||
759 | 679 | + "gtk-xft-antialias", | ||
760 | 680 | + "gtk-xft-hinting", | ||
761 | 681 | + "gtk-xft-hintstyle", | ||
762 | 682 | + "gtk-xft-rgba", | ||
763 | 683 | + "gtk-xft-dpi", | ||
764 | 684 | + "gtk-cursor-theme-name", | ||
765 | 685 | + "gtk-cursor-theme-size", | ||
766 | 686 | + "gtk-alternative-button-order", | ||
767 | 687 | + "gtk-alternative-sort-arrows", | ||
768 | 688 | + "gtk-show-input-method-menu", | ||
769 | 689 | + "gtk-show-unicode-menu", | ||
770 | 690 | + "gtk-timeout-initial", | ||
771 | 691 | + "gtk-timeout-repeat", | ||
772 | 692 | + "gtk-timeout-expand", | ||
773 | 693 | + "gtk-color-scheme", | ||
774 | 694 | + "gtk-enable-animations", | ||
775 | 695 | + "gtk-touchscreen-mode", | ||
776 | 696 | + "gtk-tooltip-timeout", | ||
777 | 697 | + "gtk-tooltip-browse-timeout", | ||
778 | 698 | + "gtk-tooltip-browse-mode-timeout", | ||
779 | 699 | + "gtk-keynav-cursor-only", | ||
780 | 700 | + "gtk-keynav-wrap-around", | ||
781 | 701 | + "gtk-error-bell", | ||
782 | 702 | + "color-hash", | ||
783 | 703 | + "gtk-file-chooser-backend", | ||
784 | 704 | + "gtk-print-backends", | ||
785 | 705 | + "gtk-print-preview-command", | ||
786 | 706 | + "gtk-enable-mnemonics", | ||
787 | 707 | + "gtk-enable-accels", | ||
788 | 708 | + "gtk-recent-files-limit", | ||
789 | 709 | + "gtk-im-module", | ||
790 | 710 | + "gtk-recent-files-max-age", | ||
791 | 711 | + "gtk-fontconfig-timestamp", | ||
792 | 712 | + "gtk-sound-theme-name", | ||
793 | 713 | + "gtk-enable-input-feedback-sounds", | ||
794 | 714 | + "gtk-enable-event-sounds", | ||
795 | 715 | + "gtk-enable-tooltips", | ||
796 | 716 | + "gtk-toolbar-style", | ||
797 | 717 | + "gtk-toolbar-icon-size", | ||
798 | 718 | + "gtk-auto-mnemonics", | ||
799 | 719 | + "gtk-primary-button-warps-slider", | ||
800 | 720 | + "gtk-visible-focus", | ||
801 | 721 | + "gtk-application-prefer-dark-theme", | ||
802 | 722 | + "gtk-button-images", | ||
803 | 723 | + "gtk-entry-select-on-focus", | ||
804 | 724 | + "gtk-entry-password-hint-timeout", | ||
805 | 725 | + "gtk-menu-images", | ||
806 | 726 | + "gtk-menu-bar-popup-delay", | ||
807 | 727 | + "gtk-scrolled-window-placement", | ||
808 | 728 | + "gtk-can-change-accels", | ||
809 | 729 | + "gtk-menu-popup-delay", | ||
810 | 730 | + "gtk-menu-popdown-delay", | ||
811 | 731 | + "gtk-label-select-on-focus", | ||
812 | 732 | + "gtk-color-palette", | ||
813 | 733 | + "gtk-im-preedit-style", | ||
814 | 734 | + "gtk-im-status-style", | ||
815 | 735 | + "gtk-shell-shows-app-menu", | ||
816 | 736 | + "gtk-shell-shows-menubar", | ||
817 | 737 | + "gtk-shell-shows-desktop", | ||
818 | 738 | + "gtk-decoration-layout", | ||
819 | 739 | + "gtk-titlebar-double-click", | ||
820 | 740 | + "gtk-titlebar-middle-click", | ||
821 | 741 | + "gtk-titlebar-right-click", | ||
822 | 742 | + "gtk-dialogs-use-header", | ||
823 | 743 | + "gtk-enable-primary-paste", | ||
824 | 744 | + "gtk-recent-files-enabled", | ||
825 | 745 | + "gtk-long-press-time", | ||
826 | 746 | + "gtk-keynav-use-caret", | ||
827 | 747 | + NULL | ||
828 | 748 | +}; | ||
829 | 749 | + | ||
830 | 750 | +static gboolean | ||
831 | 751 | +gdk_mir_screen_get_setting (GdkScreen *screen, | ||
832 | 752 | + const gchar *name, | ||
833 | 753 | + GValue *value) | ||
834 | 754 | +{ | ||
835 | 755 | + GdkMirScreen *mir_screen; | ||
836 | 756 | + GVariant *variant; | ||
837 | 757 | + | ||
838 | 758 | + mir_screen = GDK_MIR_SCREEN (screen); | ||
839 | 759 | + variant = g_hash_table_lookup (mir_screen->current_settings, name); | ||
840 | 760 | + | ||
841 | 761 | + if (!variant) | ||
842 | 762 | + update_setting (mir_screen, name); | ||
843 | 763 | + | ||
844 | 764 | + variant = g_hash_table_lookup (mir_screen->current_settings, name); | ||
845 | 765 | + | ||
846 | 766 | + if (!variant) | ||
847 | 767 | { | ||
848 | 768 | - g_value_set_string (value, "toggle-maximize"); | ||
849 | 769 | - return TRUE; | ||
850 | 770 | - } | ||
851 | 771 | + if (!g_strv_contains (KNOWN_SETTINGS, name)) | ||
852 | 772 | + g_warning ("unknown setting: %s", name); | ||
853 | 773 | |||
854 | 774 | - g_warning ("unknown property %s", name); | ||
855 | 775 | + return FALSE; | ||
856 | 776 | + } | ||
857 | 777 | |||
858 | 778 | - return FALSE; | ||
859 | 779 | + g_dbus_gvariant_to_gvalue (variant, value); | ||
860 | 780 | + return TRUE; | ||
861 | 781 | } | ||
862 | 782 | |||
863 | 783 | static gint | ||
864 | 784 | @@ -790,6 +1092,9 @@ gdk_mir_screen_init (GdkMirScreen *screen) | ||
865 | 785 | screen->visual->screen = GDK_SCREEN (screen); | ||
866 | 786 | screen->visual->type = VISUAL_TYPE; | ||
867 | 787 | screen->visual->depth = VISUAL_DEPTH; | ||
868 | 788 | + | ||
869 | 789 | + screen->settings_objects = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); | ||
870 | 790 | + screen->current_settings = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref); | ||
871 | 791 | } | ||
872 | 792 | |||
873 | 793 | static void | ||
874 | 794 | -- | ||
875 | 795 | 2.11.0 | ||
876 | 796 | |||
877 | 0 | 797 | ||
878 | === added file 'debian/patches/0025-mir-remove-keymap-and-input-device-state-warnings.patch' | |||
879 | --- debian/patches/0025-mir-remove-keymap-and-input-device-state-warnings.patch 1970-01-01 00:00:00 +0000 | |||
880 | +++ debian/patches/0025-mir-remove-keymap-and-input-device-state-warnings.patch 2017-04-03 17:42:43 +0000 | |||
881 | @@ -0,0 +1,30 @@ | |||
882 | 1 | From ecf9c06adaaa6f6d8d60b87282aeb0f37fe73bde Mon Sep 17 00:00:00 2001 | ||
883 | 2 | From: William Hua <william.hua@canonical.com> | ||
884 | 3 | Date: Fri, 31 Mar 2017 17:35:49 -0400 | ||
885 | 4 | Subject: [PATCH 25/32] mir: remove keymap and input device state warnings | ||
886 | 5 | |||
887 | 6 | --- | ||
888 | 7 | gdk/mir/gdkmireventsource.c | 4 ++++ | ||
889 | 8 | 1 file changed, 4 insertions(+) | ||
890 | 9 | |||
891 | 10 | diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c | ||
892 | 11 | index 8b239be191..ea0cc52819 100644 | ||
893 | 12 | --- a/gdk/mir/gdkmireventsource.c | ||
894 | 13 | +++ b/gdk/mir/gdkmireventsource.c | ||
895 | 14 | @@ -605,9 +605,13 @@ gdk_mir_event_source_queue_event (GdkDisplay *display, | ||
896 | 15 | case mir_event_type_close_window: | ||
897 | 16 | handle_close_event (window); | ||
898 | 17 | break; | ||
899 | 18 | + case mir_event_type_keymap: | ||
900 | 19 | + break; | ||
901 | 20 | case mir_event_type_window_output: | ||
902 | 21 | handle_window_output_event (window, mir_event_get_window_output_event (event)); | ||
903 | 22 | break; | ||
904 | 23 | + case mir_event_type_input_device_state: | ||
905 | 24 | + break; | ||
906 | 25 | case mir_event_type_window_placement: | ||
907 | 26 | handle_window_placement_event (window, mir_event_get_window_placement_event (event)); | ||
908 | 27 | break; | ||
909 | 28 | -- | ||
910 | 29 | 2.11.0 | ||
911 | 30 | |||
912 | 0 | 31 | ||
913 | === added file 'debian/patches/0026-mir-set-application-name-when-creating-connection.patch' | |||
914 | --- debian/patches/0026-mir-set-application-name-when-creating-connection.patch 1970-01-01 00:00:00 +0000 | |||
915 | +++ debian/patches/0026-mir-set-application-name-when-creating-connection.patch 2017-04-03 17:42:43 +0000 | |||
916 | @@ -0,0 +1,25 @@ | |||
917 | 1 | From 2f851530f47cdf25fd138c10907340e388532f87 Mon Sep 17 00:00:00 2001 | ||
918 | 2 | From: William Hua <william.hua@canonical.com> | ||
919 | 3 | Date: Sat, 1 Apr 2017 10:04:50 -0400 | ||
920 | 4 | Subject: [PATCH 26/32] mir: set application name when creating connection | ||
921 | 5 | |||
922 | 6 | --- | ||
923 | 7 | gdk/mir/gdkmirdisplay.c | 2 +- | ||
924 | 8 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
925 | 9 | |||
926 | 10 | diff --git a/gdk/mir/gdkmirdisplay.c b/gdk/mir/gdkmirdisplay.c | ||
927 | 11 | index 570932fabc..8b39e82e3e 100644 | ||
928 | 12 | --- a/gdk/mir/gdkmirdisplay.c | ||
929 | 13 | +++ b/gdk/mir/gdkmirdisplay.c | ||
930 | 14 | @@ -125,7 +125,7 @@ _gdk_mir_display_open (const gchar *display_name) | ||
931 | 15 | GdkMirDisplay *display; | ||
932 | 16 | GDBusConnection *session; | ||
933 | 17 | |||
934 | 18 | - connection = mir_connect_sync (NULL, "GDK-Mir"); | ||
935 | 19 | + connection = mir_connect_sync (NULL, g_get_prgname ()); | ||
936 | 20 | if (!connection) | ||
937 | 21 | return NULL; | ||
938 | 22 | |||
939 | 23 | -- | ||
940 | 24 | 2.11.0 | ||
941 | 25 | |||
942 | 0 | 26 | ||
943 | === modified file 'debian/patches/series' | |||
944 | --- debian/patches/series 2017-03-20 15:55:37 +0000 | |||
945 | +++ debian/patches/series 2017-04-03 17:42:43 +0000 | |||
946 | @@ -23,3 +23,7 @@ | |||
947 | 23 | unity-border-radius.patch | 23 | unity-border-radius.patch |
948 | 24 | unity-headerbar-maximized-mode.patch | 24 | unity-headerbar-maximized-mode.patch |
949 | 25 | gtksocket-unscale-before-sending-configurenotify.patch | 25 | gtksocket-unscale-before-sending-configurenotify.patch |
950 | 26 | 0001-mir-always-emit-a-resize-when-creating-windows.patch | ||
951 | 27 | 0024-mir-re-write-settings-implementation.patch | ||
952 | 28 | 0025-mir-remove-keymap-and-input-device-state-warnings.patch | ||
953 | 29 | 0026-mir-set-application-name-when-creating-connection.patch |
Thank you! Uploading now to the zesty unapproved queue.