| @@ -1,47 +1,49 @@ | | | @@ -1,47 +1,49 @@ |
1 | $NetBSD: patch-libswc_swc.c,v 1.1 2020/02/24 14:11:17 nia Exp $ | | 1 | $NetBSD: patch-libswc_swc.c,v 1.2 2020/02/24 14:23:53 nia Exp $ |
2 | | | 2 | |
3 | Disable decoration managers until this is stable. | | 3 | Disable decoration managers until this is stable. |
4 | | | 4 | |
5 | Currently this causes problems quitting applications. | | 5 | Currently this causes problems quitting applications. |
6 | | | 6 | |
| | | 7 | https://github.com/michaelforney/swc/issues/58 |
| | | 8 | |
7 | --- libswc/swc.c.orig 2020-02-22 10:04:33.000000000 +0000 | | 9 | --- libswc/swc.c.orig 2020-02-22 10:04:33.000000000 +0000 |
8 | +++ libswc/swc.c | | 10 | +++ libswc/swc.c |
9 | @@ -169,7 +169,7 @@ swc_initialize(struct wl_display *displa | | 11 | @@ -169,7 +169,7 @@ swc_initialize(struct wl_display *displa |
10 | goto error10; | | 12 | goto error10; |
11 | } | | 13 | } |
12 | | | 14 | |
13 | - swc.xdg_decoration_manager = xdg_decoration_manager_create(display); | | 15 | - swc.xdg_decoration_manager = xdg_decoration_manager_create(display); |
14 | + /*swc.xdg_decoration_manager = xdg_decoration_manager_create(display); | | 16 | + /*swc.xdg_decoration_manager = xdg_decoration_manager_create(display); |
15 | if (!swc.xdg_decoration_manager) { | | 17 | if (!swc.xdg_decoration_manager) { |
16 | ERROR("Could not initialize XDG decoration manager\n"); | | 18 | ERROR("Could not initialize XDG decoration manager\n"); |
17 | goto error11; | | 19 | goto error11; |
18 | @@ -179,7 +179,7 @@ swc_initialize(struct wl_display *displa | | 20 | @@ -179,7 +179,7 @@ swc_initialize(struct wl_display *displa |
19 | if (!swc.kde_decoration_manager) { | | 21 | if (!swc.kde_decoration_manager) { |
20 | ERROR("Could not initialize KDE decoration manager\n"); | | 22 | ERROR("Could not initialize KDE decoration manager\n"); |
21 | goto error12; | | 23 | goto error12; |
22 | - } | | 24 | - } |
23 | + }*/ | | 25 | + }*/ |
24 | | | 26 | |
25 | swc.panel_manager = panel_manager_create(display); | | 27 | swc.panel_manager = panel_manager_create(display); |
26 | if (!swc.panel_manager) { | | 28 | if (!swc.panel_manager) { |
27 | @@ -192,9 +192,9 @@ swc_initialize(struct wl_display *displa | | 29 | @@ -192,9 +192,9 @@ swc_initialize(struct wl_display *displa |
28 | return true; | | 30 | return true; |
29 | | | 31 | |
30 | error13: | | 32 | error13: |
31 | - wl_global_destroy(swc.kde_decoration_manager); | | 33 | - wl_global_destroy(swc.kde_decoration_manager); |
32 | + /*wl_global_destroy(swc.kde_decoration_manager);*/ | | 34 | + /*wl_global_destroy(swc.kde_decoration_manager);*/ |
33 | error12: | | 35 | error12: |
34 | - wl_global_destroy(swc.xdg_decoration_manager); | | 36 | - wl_global_destroy(swc.xdg_decoration_manager); |
35 | + /*wl_global_destroy(swc.xdg_decoration_manager);*/ | | 37 | + /*wl_global_destroy(swc.xdg_decoration_manager);*/ |
36 | error11: | | 38 | error11: |
37 | wl_global_destroy(swc.xdg_shell); | | 39 | wl_global_destroy(swc.xdg_shell); |
38 | error10: | | 40 | error10: |
39 | @@ -225,7 +225,7 @@ EXPORT void | | 41 | @@ -225,7 +225,7 @@ EXPORT void |
40 | swc_finalize(void) | | 42 | swc_finalize(void) |
41 | { | | 43 | { |
42 | wl_global_destroy(swc.panel_manager); | | 44 | wl_global_destroy(swc.panel_manager); |
43 | - wl_global_destroy(swc.xdg_decoration_manager); | | 45 | - wl_global_destroy(swc.xdg_decoration_manager); |
44 | + /*wl_global_destroy(swc.xdg_decoration_manager);*/ | | 46 | + /*wl_global_destroy(swc.xdg_decoration_manager);*/ |
45 | wl_global_destroy(swc.xdg_shell); | | 47 | wl_global_destroy(swc.xdg_shell); |
46 | wl_global_destroy(swc.shell); | | 48 | wl_global_destroy(swc.shell); |
47 | seat_destroy(swc.seat); | | 49 | seat_destroy(swc.seat); |