-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathfeature.patch
2617 lines (2505 loc) · 93.3 KB
/
feature.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/.gitignore b/.gitignore
index 5c28541..0dde90e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ dwl
*-protocol.c
*-protocol.h
.ccls-cache
+config.h
diff --git a/Makefile b/Makefile
index c7df8c5..fc2ed86 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ DWLDEVCFLAGS = -pedantic -Wall -Wextra -Wdeclaration-after-statement -Wno-unused
-Werror=strict-prototypes -Werror=implicit -Werror=return-type -Werror=incompatible-pointer-types
# CFLAGS / LDFLAGS
+<<<<<<< HEAD
PKGS = wlroots wayland-server xkbcommon libinput pixman-1 $(XLIBS)
DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS)
LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` -lm $(LIBS)
@@ -22,6 +23,17 @@ dwl-ipc-unstable-v2-protocol.o: dwl-ipc-unstable-v2-protocol.h
PREFIX?= /usr/local
BINDIR?= $(PREFIX)/bin
DESKTOP?= /usr/share/wayland-sessions
+=======
+PKGS = wlroots wayland-server xkbcommon libinput $(XLIBS)
+DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS)
+LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` $(LIBS)
+
+all: dwl
+dwl: dwl.o util.o net-tapesoftware-dwl-wm-unstable-v1-protocol.o
+ $(CC) dwl.o util.o net-tapesoftware-dwl-wm-unstable-v1-protocol.o $(LDLIBS) $(LDFLAGS) $(DWLCFLAGS) -o $@
+dwl.o: dwl.c config.mk config.h client.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h net-tapesoftware-dwl-wm-unstable-v1-protocol.o
+util.o: util.c util.h
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
# wayland-scanner is a tool which generates C headers and rigging for Wayland
# protocols, which are specified in XML. wlroots requires you to rig these up
@@ -35,6 +47,7 @@ xdg-shell-protocol.h:
wlr-layer-shell-unstable-v1-protocol.h:
$(WAYLAND_SCANNER) server-header \
protocols/wlr-layer-shell-unstable-v1.xml $@
+<<<<<<< HEAD
dwl-ipc-unstable-v2-protocol.h:
$(WAYLAND_SCANNER) server-header \
protocols/dwl-ipc-unstable-v2.xml $@
@@ -44,16 +57,34 @@ dwl-ipc-unstable-v2-protocol.c:
pointer-constraints-unstable-v1-protocol.h:
$(WAYLAND_SCANNER) server-header \
$(WAYLAND_PROTOCOLS)/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml $@
+=======
+
+net-tapesoftware-dwl-wm-unstable-v1-protocol.h: protocols/net-tapesoftware-dwl-wm-unstable-v1.xml
+ $(WAYLAND_SCANNER) server-header \
+ protocols/net-tapesoftware-dwl-wm-unstable-v1.xml $@
+net-tapesoftware-dwl-wm-unstable-v1-protocol.c: protocols/net-tapesoftware-dwl-wm-unstable-v1.xml
+ $(WAYLAND_SCANNER) private-code \
+ protocols/net-tapesoftware-dwl-wm-unstable-v1.xml $@
+net-tapesoftware-dwl-wm-unstable-v1-protocol.o: net-tapesoftware-dwl-wm-unstable-v1-protocol.h
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
config.h:
cp config.def.h $@
clean:
+<<<<<<< HEAD
rm -f dwl *.o *-protocol.h xdg-shell-protocol.c
+=======
+ rm -f dwl *.o *-protocol.h
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
dist: clean
mkdir -p dwl-$(VERSION)
cp -R LICENSE* Makefile README.md client.h config.def.h\
+<<<<<<< HEAD
config.mk protocols dwl.1 dwl.c util.c util.h\
+=======
+ config.mk protocols dwl.1 dwl.c util.c util.h dwl.desktop\
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
dwl-$(VERSION)
tar -caf dwl-$(VERSION).tar.gz dwl-$(VERSION)
rm -rf dwl-$(VERSION)
@@ -65,10 +96,18 @@ install: dwl
mkdir -p $(DESTDIR)$(MANDIR)/man1
cp -f dwl.1 $(DESTDIR)$(MANDIR)/man1
chmod 644 $(DESTDIR)$(MANDIR)/man1/dwl.1
+<<<<<<< HEAD
install -Dm 644 dwl.desktop $(DESKTOP)/dwl.desktop
uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/dwl $(DESTDIR)$(MANDIR)/man1/dwl.1
rm -f $(DESKTOP)/dwl.desktop
+=======
+ mkdir -p $(DESTDIR)$(DATADIR)/wayland-sessions
+ cp -f dwl.desktop $(DESTDIR)$(DATADIR)/wayland-sessions/dwl.desktop
+ chmod 644 $(DESTDIR)$(DATADIR)/wayland-sessions/dwl.desktop
+uninstall:
+ rm -f $(DESTDIR)$(PREFIX)/bin/dwl $(DESTDIR)$(MANDIR)/man1/dwl.1 $(DESTDIR)$(DATADIR)/wayland-sessions/dwl.desktop
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
.SUFFIXES: .c .o
.c.o:
diff --git a/client.h b/client.h
index 5a45edc..fbbeff5 100644
--- a/client.h
+++ b/client.h
@@ -324,6 +324,17 @@ client_send_close(Client *c)
}
static inline void
+<<<<<<< HEAD
+=======
+client_set_border_color(Client *c, const float color[static 4])
+{
+ int i;
+ for (i = 0; i < 4; i++)
+ wlr_scene_rect_set_color(c->border[i], color);
+}
+
+static inline void
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
client_set_fullscreen(Client *c, int fullscreen)
{
#ifdef XWAYLAND
diff --git a/config.def.h b/config.def.h
index 5127907..109b479 100644
--- a/config.def.h
+++ b/config.def.h
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/* appearance */
static const int sloppyfocus = 1; /* focus follows mouse */
static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */
@@ -30,17 +31,51 @@ static const Rule rules[] = {
/* app_id title tags mask isfloating monitor */
/* examples: */
{ "Gimp", NULL, 0, 1, -1 },
+=======
+/* Taken from https://github.com/djpohly/dwl/issues/466 */
+#define COLOR(hex) { ((hex >> 24) & 0xFF) / 255.0f, \
+ ((hex >> 16) & 0xFF) / 255.0f, \
+ ((hex >> 8) & 0xFF) / 255.0f, \
+ (hex & 0xFF) / 255.0f }
+/* appearance */
+static const int sloppyfocus = 1; /* focus follows mouse */
+static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */
+static const unsigned int borderpx = 1; /* border pixel of windows */
+static const float bordercolor[] = COLOR(0x444444ff);
+static const float focuscolor[] = COLOR(0x005577ff);
+static const float urgentcolor[] = COLOR(0xff0000ff);
+/* To conform the xdg-protocol, set the alpha to zero to restore the old behavior */
+static const float fullscreen_bg[] = {0.1, 0.1, 0.1, 1.0}; /* You can also use glsl colors */
+
+/* tagging - TAGCOUNT must be no greater than 31 */
+#define TAGCOUNT (9)
+
+/* logging */
+static int log_level = WLR_ERROR;
+
+static const Rule rules[] = {
+ /* app_id title tags mask isfloating monitor */
+ /* examples:
+ { "Gimp", NULL, 0, 1, -1 },
+ */
+ { "firefox", NULL, 1 << 8, 0, -1 },
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
};
/* layout(s) */
static const Layout layouts[] = {
/* symbol arrange function */
{ "[]=", tile },
+<<<<<<< HEAD
//{ "><>", NULL }, /* no layout function means floating behavior */
{ "[M]", monocle },
{ "TTT", bstack },
{ "===", bstackhoriz },
{ "[D]", deck },
+=======
+ { "><>", NULL }, /* no layout function means floating behavior */
+ { "[M]", monocle },
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
};
/* monitors */
@@ -111,16 +146,24 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA
#define MODKEY WLR_MODIFIER_ALT
#define TAGKEYS(KEY,SKEY,TAG) \
+<<<<<<< HEAD
{ MODKEY, -1, KEY, view, {.ui = 1 << TAG} }, \
{ MODKEY|WLR_MODIFIER_CTRL, -1, KEY, toggleview, {.ui = 1 << TAG} }, \
{ MODKEY|WLR_MODIFIER_SHIFT, -1, SKEY, tag, {.ui = 1 << TAG} }, \
{ MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,-1,SKEY,toggletag, {.ui = 1 << TAG} }
+=======
+ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
+ { MODKEY|WLR_MODIFIER_CTRL, KEY, toggleview, {.ui = 1 << TAG} }, \
+ { MODKEY|WLR_MODIFIER_SHIFT, SKEY, tag, {.ui = 1 << TAG} }, \
+ { MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,SKEY,toggletag, {.ui = 1 << TAG} }
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
/* commands */
static const char *termcmd[] = { "foot", NULL };
+<<<<<<< HEAD
static const char *menucmd[] = { "/bin/sh", "-c", "ddmenu_path | wmenu -f "JetBrainsMono NF Thin 12" -N 100E23 -n 8A889D -M 585273 | s
h", NULL };
@@ -169,6 +212,36 @@ static const Key keys[] = {
{ MODKEY, -1, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} },
{ MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} },
{ MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} },
+=======
+static const char *menucmd[] = { "bemenu-run", NULL };
+
+static const Key keys[] = {
+ /* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
+ /* modifier key function argument */
+ { MODKEY, XKB_KEY_p, spawn, {.v = menucmd} },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd} },
+ { MODKEY, XKB_KEY_j, focusstack, {.i = +1} },
+ { MODKEY, XKB_KEY_k, focusstack, {.i = -1} },
+ { MODKEY, XKB_KEY_i, incnmaster, {.i = +1} },
+ { MODKEY, XKB_KEY_d, incnmaster, {.i = -1} },
+ { MODKEY, XKB_KEY_h, setmfact, {.f = -0.05} },
+ { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05} },
+ { MODKEY, XKB_KEY_Return, zoom, {0} },
+ { MODKEY, XKB_KEY_Tab, view, {0} },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} },
+ { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} },
+ { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} },
+ { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} },
+ { MODKEY, XKB_KEY_space, setlayout, {0} },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
+ { MODKEY, XKB_KEY_e, togglefullscreen, {0} },
+ { MODKEY, XKB_KEY_0, view, {.ui = ~0} },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} },
+ { MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} },
+ { MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} },
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} },
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0),
TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1),
TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2),
@@ -178,10 +251,18 @@ static const Key keys[] = {
TAGKEYS( XKB_KEY_7, XKB_KEY_ampersand, 6),
TAGKEYS( XKB_KEY_8, XKB_KEY_asterisk, 7),
TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 8),
+<<<<<<< HEAD
{ MODKEY|WLR_MODIFIER_SHIFT, -1, XKB_KEY_Q, quit, {0} },
/* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,-1,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} }
+=======
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q, quit, {0} },
+
+ /* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
+ { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} },
+#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} }
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6),
CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12),
};
diff --git a/config.mk b/config.mk
index 8f5584a..b6bbc15 100644
--- a/config.mk
+++ b/config.mk
@@ -6,9 +6,19 @@ PKG_CONFIG = pkg-config
# paths
PREFIX = /usr/local
MANDIR = $(PREFIX)/share/man
+<<<<<<< HEAD
#XWAYLAND =
#XLIBS =
# Uncomment to build XWayland support
XWAYLAND = -DXWAYLAND
XLIBS = xcb xcb-icccm
+=======
+DATADIR = $(PREFIX)/share
+
+XWAYLAND =
+XLIBS =
+# Uncomment to build XWayland support
+#XWAYLAND = -DXWAYLAND
+#XLIBS = xcb xcb-icccm
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
diff --git a/dwl.1 b/dwl.1
index cae1036..5dd2112 100644
--- a/dwl.1
+++ b/dwl.1
@@ -7,6 +7,10 @@
.Sh SYNOPSIS
.Nm
.Op Fl v
+<<<<<<< HEAD
+=======
+.Op Fl d
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
.Op Fl s Ar startup command
.Sh DESCRIPTION
.Nm
@@ -22,6 +26,15 @@ option,
writes its name and version to standard error and exits unsuccessfully.
.Pp
When given the
+<<<<<<< HEAD
+=======
+.Fl d
+option,
+.Nm
+enables full wlroots logging, including debug information.
+.Pp
+When given the
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
.Fl s
option,
.Nm
@@ -101,7 +114,11 @@ These environment variables are used by
A directory where temporary user files, such as the Wayland socket,
are stored.
.It Ev XDG_CONFIG_DIR
+<<<<<<< HEAD
A directory containung configuration of various programs and
+=======
+A directory containing configuration of various programs and
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
libraries, including libxkbcommon.
.It Ev DISPLAY , WAYLAND_DISPLAY , WAYLAND_SOCKET
Tell how to connect to an underlying X11 or Wayland server.
diff --git a/dwl.c b/dwl.c
index 0d7296c..dbc6372 100644
--- a/dwl.c
+++ b/dwl.c
@@ -1,16 +1,22 @@
/*
* See LICENSE file for copyright and license details.
*/
+<<<<<<< HEAD
#ifndef POINTERCONSTRAINTS
#define POINTERCONSTRAINTS
#endif
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
#include <getopt.h>
#include <libinput.h>
#include <limits.h>
#include <linux/input-event-codes.h>
+<<<<<<< HEAD
#include <pixman-1/pixman.h>
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
@@ -39,11 +45,17 @@
#include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_output_management_v1.h>
#include <wlr/types/wlr_pointer.h>
+<<<<<<< HEAD
#include <wlr/types/wlr_pointer_constraints_v1.h>
#include <wlr/types/wlr_presentation_time.h>
#include <wlr/types/wlr_primary_selection.h>
#include <wlr/types/wlr_primary_selection_v1.h>
#include <wlr/types/wlr_relative_pointer_v1.h>
+=======
+#include <wlr/types/wlr_presentation_time.h>
+#include <wlr/types/wlr_primary_selection.h>
+#include <wlr/types/wlr_primary_selection_v1.h>
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
#include <wlr/types/wlr_scene.h>
#include <wlr/types/wlr_screencopy_v1.h>
#include <wlr/types/wlr_seat.h>
@@ -58,6 +70,7 @@
#include <wlr/types/wlr_xdg_decoration_v1.h>
#include <wlr/types/wlr_xdg_output_v1.h>
#include <wlr/types/wlr_xdg_shell.h>
+<<<<<<< HEAD
#include <wlr/util/box.h>
#include <wlr/util/log.h>
#include <wlr/util/region.h>
@@ -69,6 +82,17 @@
#endif
#include "dwl-ipc-unstable-v2-protocol.h"
+=======
+#include <wlr/util/log.h>
+#include <xkbcommon/xkbcommon.h>
+#include "net-tapesoftware-dwl-wm-unstable-v1-protocol.h"
+#ifdef XWAYLAND
+#include <wlr/xwayland.h>
+#include <xcb/xcb.h>
+#include <xcb/xcb_icccm.h>
+#endif
+
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
#include "util.h"
/* macros */
@@ -78,7 +102,11 @@
#define VISIBLEON(C, M) ((M) && (C)->mon == (M) && ((C)->tags & (M)->tagset[(M)->seltags]))
#define LENGTH(X) (sizeof X / sizeof X[0])
#define END(A) ((A) + LENGTH(A))
+<<<<<<< HEAD
#define TAGMASK ((1u << tagcount) - 1)
+=======
+#define TAGMASK ((1u << TAGCOUNT) - 1)
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
#define LISTEN(E, L, H) wl_signal_add((E), ((L)->notify = (H), (L)))
#define IDLE_NOTIFY_ACTIVITY wlr_idle_notify_activity(idle, seat), wlr_idle_notifier_v1_notify_activity(idle_notifier, seat)
@@ -105,7 +133,10 @@ typedef struct {
const Arg arg;
} Button;
+<<<<<<< HEAD
typedef struct Pertag Pertag;
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
typedef struct Monitor Monitor;
typedef struct {
/* Must keep these three elements in this order */
@@ -141,6 +172,7 @@ typedef struct {
} Client;
typedef struct {
+<<<<<<< HEAD
struct wl_list link;
struct wl_resource *resource;
Monitor *monitor;
@@ -149,6 +181,9 @@ typedef struct {
typedef struct {
uint32_t mod;
xkb_keysym_t chain;
+=======
+ uint32_t mod;
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
xkb_keysym_t keysym;
void (*func)(const Arg *);
const Arg arg;
@@ -191,9 +226,20 @@ typedef struct {
void (*arrange)(Monitor *);
} Layout;
+<<<<<<< HEAD
struct Monitor {
struct wl_list link;
struct wl_list dwl_ipc_outputs;
+=======
+typedef struct {
+ struct wl_list link;
+ struct wl_resource *resource;
+ struct Monitor *monitor;
+} DwlWmMonitor;
+
+struct Monitor {
+ struct wl_list link;
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
struct wlr_output *wlr_output;
struct wlr_scene_output *scene_output;
struct wlr_scene_rect *fullscreen_bg; /* See createmon() for info */
@@ -204,12 +250,17 @@ struct Monitor {
struct wlr_box m; /* monitor area, layout-relative */
struct wlr_box w; /* window area, layout-relative */
struct wl_list layers[4]; /* LayerSurface::link */
+<<<<<<< HEAD
const Layout *lt[2];
int gappih; /* horizontal gap between windows */
int gappiv; /* vertical gap between windows */
int gappoh; /* horizontal outer gaps */
int gappov; /* vertical outer gaps */
Pertag *pertag;
+=======
+ struct wl_list dwl_wm_monitor_link;
+ const Layout *lt[2];
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
unsigned int seltags;
unsigned int sellt;
uint32_t tagset[2];
@@ -229,6 +280,7 @@ typedef struct {
} MonitorRule;
typedef struct {
+<<<<<<< HEAD
struct wlr_pointer_constraint_v1 *constraint;
Client *focused;
@@ -237,6 +289,8 @@ typedef struct {
} PointerConstraint;
typedef struct {
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
const char *id;
const char *title;
uint32_t tags;
@@ -260,10 +314,15 @@ static void arrange(Monitor *m);
static void arrangelayer(Monitor *m, struct wl_list *list,
struct wlr_box *usable_area, int exclusive);
static void arrangelayers(Monitor *m);
+<<<<<<< HEAD
static void autostartexec(void);
static void axisnotify(struct wl_listener *listener, void *data);
static void buttonpress(struct wl_listener *listener, void *data);
static void checkconstraintregion(void);
+=======
+static void axisnotify(struct wl_listener *listener, void *data);
+static void buttonpress(struct wl_listener *listener, void *data);
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
static void chvt(const Arg *arg);
static void checkidleinhibitor(struct wlr_surface *exclude);
static void cleanup(void);
@@ -273,7 +332,10 @@ static void closemon(Monitor *m);
static void commitlayersurfacenotify(struct wl_listener *listener, void *data);
static void commitnotify(struct wl_listener *listener, void *data);
static void createdecoration(struct wl_listener *listener, void *data);
+<<<<<<< HEAD
static void commitpointerconstraint(struct wl_listener *listener, void *data);
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
static void createidleinhibitor(struct wl_listener *listener, void *data);
static void createkeyboard(struct wlr_keyboard *keyboard);
static void createlayersurface(struct wl_listener *listener, void *data);
@@ -281,18 +343,23 @@ static void createlocksurface(struct wl_listener *listener, void *data);
static void createmon(struct wl_listener *listener, void *data);
static void createnotify(struct wl_listener *listener, void *data);
static void createpointer(struct wlr_pointer *pointer);
+<<<<<<< HEAD
static void createpointerconstraint(struct wl_listener *listener, void *data);
static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
static void cursorframe(struct wl_listener *listener, void *data);
static void deck(Monitor *m);
static void defaultgaps(const Arg *arg);
static void cursorwarptoconstrainthint(void);
+=======
+static void cursorframe(struct wl_listener *listener, void *data);
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
static void destroydragicon(struct wl_listener *listener, void *data);
static void destroyidleinhibitor(struct wl_listener *listener, void *data);
static void destroylayersurfacenotify(struct wl_listener *listener, void *data);
static void destroylock(SessionLock *lock, int unlocked);
static void destroylocksurface(struct wl_listener *listener, void *data);
static void destroynotify(struct wl_listener *listener, void *data);
+<<<<<<< HEAD
static void destroypointerconstraint(struct wl_listener *listener, void *data);
static void destroysessionlock(struct wl_listener *listener, void *data);
static void destroysessionmgr(struct wl_listener *listener, void *data);
@@ -308,6 +375,11 @@ static void dwl_ipc_output_set_client_tags(struct wl_client *client, struct wl_r
static void dwl_ipc_output_set_layout(struct wl_client *client, struct wl_resource *resource, uint32_t index);
static void dwl_ipc_output_set_tags(struct wl_client *client, struct wl_resource *resource, uint32_t tagmask, uint32_t toggle_tagset);
static void dwl_ipc_output_release(struct wl_client *client, struct wl_resource *resource);
+=======
+static void destroysessionlock(struct wl_listener *listener, void *data);
+static void destroysessionmgr(struct wl_listener *listener, void *data);
+static Monitor *dirtomon(enum wlr_direction dir);
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
static void focusclient(Client *c, int lift);
static void focusmon(const Arg *arg);
static void focusstack(const Arg *arg);
@@ -315,6 +387,7 @@ static Client *focustop(Monitor *m);
static void fullscreennotify(struct wl_listener *listener, void *data);
static void handlesig(int signo);
static void incnmaster(const Arg *arg);
+<<<<<<< HEAD
static void incgaps(const Arg *arg);
static void incigaps(const Arg *arg);
static void incihgaps(const Arg *arg);
@@ -322,6 +395,8 @@ static void incivgaps(const Arg *arg);
static void incogaps(const Arg *arg);
static void incohgaps(const Arg *arg);
static void incovgaps(const Arg *arg);
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
static void inputdevice(struct wl_listener *listener, void *data);
static int keybinding(uint32_t mods, xkb_keysym_t sym);
static void keypress(struct wl_listener *listener, void *data);
@@ -334,14 +409,21 @@ static void mapnotify(struct wl_listener *listener, void *data);
static void maximizenotify(struct wl_listener *listener, void *data);
static void monocle(Monitor *m);
static void motionabsolute(struct wl_listener *listener, void *data);
+<<<<<<< HEAD
static void motionnotify(uint32_t time, struct wlr_input_device *device, double sx,
double sy, double sx_unaccel, double sy_unaccel);
+=======
+static void motionnotify(uint32_t time);
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
static void motionrelative(struct wl_listener *listener, void *data);
static void moveresize(const Arg *arg);
static void outputmgrapply(struct wl_listener *listener, void *data);
static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test);
static void outputmgrtest(struct wl_listener *listener, void *data);
+<<<<<<< HEAD
static void pointerconstraintsetregion(struct wl_listener *listener, void *data);
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
static void pointerfocus(Client *c, struct wlr_surface *surface,
double sx, double sy, uint32_t time);
static void printstatus(void);
@@ -353,7 +435,10 @@ static void run(char *startup_cmd);
static void setcursor(struct wl_listener *listener, void *data);
static void setfloating(Client *c, int floating);
static void setfullscreen(Client *c, int fullscreen);
+<<<<<<< HEAD
static void setgaps(int oh, int ov, int ih, int iv);
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
static void setlayout(const Arg *arg);
static void setmfact(const Arg *arg);
static void setmon(Client *c, Monitor *m, uint32_t newtags);
@@ -367,10 +452,15 @@ static void tagmon(const Arg *arg);
static void tile(Monitor *m);
static void togglefloating(const Arg *arg);
static void togglefullscreen(const Arg *arg);
+<<<<<<< HEAD
static void togglegaps(const Arg *arg);
static void toggletag(const Arg *arg);
static void toggleview(const Arg *arg);
static void toggle_visibility(const Arg *arg);
+=======
+static void toggletag(const Arg *arg);
+static void toggleview(const Arg *arg);
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
static void unlocksession(struct wl_listener *listener, void *data);
static void unmaplayersurfacenotify(struct wl_listener *listener, void *data);
static void unmapnotify(struct wl_listener *listener, void *data);
@@ -383,8 +473,15 @@ static Monitor *xytomon(double x, double y);
static void xytonode(double x, double y, struct wlr_surface **psurface,
Client **pc, LayerSurface **pl, double *nx, double *ny);
static void zoom(const Arg *arg);
+<<<<<<< HEAD
static void bstack(Monitor *m);
static void bstackhoriz(Monitor *m);
+=======
+
+static void dwl_wm_bind(struct wl_client *client, void *data,
+ uint32_t version, uint32_t id);
+static void dwl_wm_printstatus(Monitor *monitor);
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
/* variables */
static const char broken[] = "broken";
@@ -392,7 +489,10 @@ static const char *cursor_image = "left_ptr";
static pid_t child_pid = -1;
static int locked;
static void *exclusive_focus;
+<<<<<<< HEAD
static xkb_keysym_t chainkey = -1;
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
static struct wl_display *dpy;
static struct wlr_backend *backend;
static struct wlr_scene *scene;
@@ -417,6 +517,7 @@ static struct wlr_layer_shell_v1 *layer_shell;
static struct wlr_output_manager_v1 *output_mgr;
static struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard_mgr;
+<<<<<<< HEAD
static struct wlr_relative_pointer_manager_v1 *relative_pointer_mgr;
static struct wlr_pointer_constraints_v1 *pointer_constraints;
static struct wl_listener pointer_constraint_commit;
@@ -424,6 +525,8 @@ static PointerConstraint *active_constraint;
static pixman_region32_t active_confine;
static int active_confine_requires_warp;
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
static struct wlr_cursor *cursor;
static struct wlr_xcursor_manager *cursor_mgr;
@@ -442,8 +545,11 @@ static struct wlr_box sgeom;
static struct wl_list mons;
static Monitor *selmon;
+<<<<<<< HEAD
static int enablegaps = 1; /* enables gaps, used by togglegaps */
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
/* global event handlers */
static struct wl_listener cursor_axis = {.notify = axisnotify};
static struct wl_listener cursor_button = {.notify = buttonpress};
@@ -451,15 +557,21 @@ static struct wl_listener cursor_frame = {.notify = cursorframe};
static struct wl_listener cursor_motion = {.notify = motionrelative};
static struct wl_listener cursor_motion_absolute = {.notify = motionabsolute};
static struct wl_listener drag_icon_destroy = {.notify = destroydragicon};
+<<<<<<< HEAD
static struct zdwl_ipc_manager_v2_interface dwl_manager_implementation = {.release = dwl_ipc_manager_release, .get_output = dwl_ipc_manager_get_output};
static struct zdwl_ipc_output_v2_interface dwl_output_implementation = {.release = dwl_ipc_output_release, .set_tags = dwl_ipc_output_set_tags, .set_layout = dwl_ipc_output_set_layout, .set_client_tags = dwl_ipc_output_set_client_tags};
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
static struct wl_listener idle_inhibitor_create = {.notify = createidleinhibitor};
static struct wl_listener idle_inhibitor_destroy = {.notify = destroyidleinhibitor};
static struct wl_listener layout_change = {.notify = updatemons};
static struct wl_listener new_input = {.notify = inputdevice};
static struct wl_listener new_virtual_keyboard = {.notify = virtualkeyboard};
static struct wl_listener new_output = {.notify = createmon};
+<<<<<<< HEAD
static struct wl_listener new_pointer_constraint = {.notify = createpointerconstraint};
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
static struct wl_listener new_xdg_surface = {.notify = createnotify};
static struct wl_listener new_xdg_decoration = {.notify = createdecoration};
static struct wl_listener new_layer_shell_surface = {.notify = createlayersurface};
@@ -478,13 +590,21 @@ static struct wl_listener session_lock_mgr_destroy = {.notify = destroysessionmg
static void activatex11(struct wl_listener *listener, void *data);
static void configurex11(struct wl_listener *listener, void *data);
static void createnotifyx11(struct wl_listener *listener, void *data);
+<<<<<<< HEAD
static Atom getatom(xcb_connection_t *xc, const char *name);
+=======
+static xcb_atom_t getatom(xcb_connection_t *xc, const char *name);
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
static void sethints(struct wl_listener *listener, void *data);
static void xwaylandready(struct wl_listener *listener, void *data);
static struct wl_listener new_xwayland_surface = {.notify = createnotifyx11};
static struct wl_listener xwayland_ready = {.notify = xwaylandready};
static struct wlr_xwayland *xwayland;
+<<<<<<< HEAD
static Atom netatom[NetLast];
+=======
+static xcb_atom_t netatom[NetLast];
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
#endif
/* configuration, allows nested code to access above variables */
@@ -493,6 +613,7 @@ static Atom netatom[NetLast];
/* attempt to encapsulate suck into one file */
#include "client.h"
+<<<<<<< HEAD
static pid_t *autostart_pids;
static size_t autostart_len;
struct Pertag {
@@ -503,6 +624,8 @@ struct Pertag {
const Layout *ltidxs[TAGCOUNT + 1][2]; /* matrix of tags and layouts indexes */
};
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
/* function implementations */
void
applybounds(Client *c, struct wlr_box *bbox)
@@ -576,7 +699,11 @@ arrange(Monitor *m)
if (m->lt[m->sellt]->arrange)
m->lt[m->sellt]->arrange(m);
+<<<<<<< HEAD
motionnotify(0, NULL, 0, 0, 0, 0);
+=======
+ motionnotify(0);
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
checkidleinhibitor(NULL);
}
@@ -644,6 +771,7 @@ arrangelayers(Monitor *m)
}
void
+<<<<<<< HEAD
autostartexec(void) {
const char *const *p;
size_t i = 0;
@@ -665,6 +793,8 @@ autostartexec(void) {
}
void
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
axisnotify(struct wl_listener *listener, void *data)
{
/* This event is forwarded by the cursor when a pointer emits an axis event,
@@ -719,7 +849,11 @@ buttonpress(struct wl_listener *listener, void *data)
* we will send an enter event after which the client will provide us
* a cursor surface */
wlr_seat_pointer_clear_focus(seat);
+<<<<<<< HEAD
motionnotify(0, NULL, 0, 0, 0, 0);
+=======
+ motionnotify(0);
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
/* Drop the window off on its new monitor */
selmon = xytomon(cursor->x, cursor->y);
setmon(grabc, selmon, 0);
@@ -736,6 +870,7 @@ buttonpress(struct wl_listener *listener, void *data)
}
void
+<<<<<<< HEAD
checkconstraintregion(void)
{
struct wlr_pointer_constraint_v1 *constraint = active_constraint->constraint;
@@ -772,6 +907,8 @@ checkconstraintregion(void)
}
void
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
chvt(const Arg *arg)
{
wlr_session_change_vt(wlr_backend_get_session(backend), arg->ui);
@@ -799,11 +936,15 @@ checkidleinhibitor(struct wlr_surface *exclude)
void
cleanup(void)
{
+<<<<<<< HEAD
size_t i;
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
#ifdef XWAYLAND
wlr_xwayland_destroy(xwayland);
#endif
wl_display_destroy_clients(dpy);
+<<<<<<< HEAD
/* kill child processes */
for (i = 0; i < autostart_len; i++) {
@@ -813,6 +954,8 @@ cleanup(void)
}
}
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
if (child_pid > 0) {
kill(child_pid, SIGTERM);
waitpid(child_pid, NULL, 0);
@@ -845,12 +988,19 @@ void
cleanupmon(struct wl_listener *listener, void *data)
{
Monitor *m = wl_container_of(listener, m, destroy);
+<<<<<<< HEAD
LayerSurface *l, *tmp;
int i;
DwlIpcOutput *ipc_output;
wl_list_for_each(ipc_output, &m->dwl_ipc_outputs, link)
wl_resource_destroy(ipc_output->resource);
+=======
+ DwlWmMonitor *mon, *montmp;
+ LayerSurface *l, *tmp;
+ int i;
+
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
for (i = 0; i <= ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY; i++)
wl_list_for_each_safe(l, tmp, &m->layers[i], link)
wlr_layer_surface_v1_destroy(l->layer_surface);
@@ -860,10 +1010,20 @@ cleanupmon(struct wl_listener *listener, void *data)
wl_list_remove(&m->link);
m->wlr_output->data = NULL;
wlr_output_layout_remove(output_layout, m->wlr_output);
+<<<<<<< HEAD
wlr_scene_output_destroy(m->scene_output);
wlr_scene_node_destroy(&m->fullscreen_bg->node);
free(m->pertag);
+=======
+ wl_list_for_each_safe(mon, montmp, &m->dwl_wm_monitor_link, link) {
+ wl_resource_set_user_data(mon->resource, NULL);
+ free(mon);
+ }
+ wlr_scene_output_destroy(m->scene_output);
+ wlr_scene_node_destroy(&m->fullscreen_bg->node);
+
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
closemon(m);
free(m);
}
@@ -943,12 +1103,15 @@ createdecoration(struct wl_listener *listener, void *data)
}
void
+<<<<<<< HEAD
commitpointerconstraint(struct wl_listener *listener, void *data)
{
checkconstraintregion();
}
void
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
createidleinhibitor(struct wl_listener *listener, void *data)
{
struct wlr_idle_inhibitor_v1 *idle_inhibitor = data;
@@ -1067,19 +1230,28 @@ createmon(struct wl_listener *listener, void *data)
const MonitorRule *r;
size_t i;
Monitor *m = wlr_output->data = ecalloc(1, sizeof(*m));
+<<<<<<< HEAD
m->wlr_output = wlr_output;
wl_list_init(&m->dwl_ipc_outputs);
+=======
+ wl_list_init(&m->dwl_wm_monitor_link);
+ m->wlr_output = wlr_output;
+
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
wlr_output_init_render(wlr_output, alloc, drw);
/* Initialize monitor state using configured rules */
for (i = 0; i < LENGTH(m->layers); i++)
wl_list_init(&m->layers[i]);
+<<<<<<< HEAD
m->gappih = gappih;
m->gappiv = gappiv;
m->gappoh = gappoh;
m->gappov = gappov;
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
m->tagset[0] = m->tagset[1] = 1;
for (r = monrules; r < END(monrules); r++) {
if (!r->name || strstr(wlr_output->name, r->name)) {
@@ -1117,6 +1289,7 @@ createmon(struct wl_listener *listener, void *data)
wl_list_insert(&mons, &m->link);
printstatus();
+<<<<<<< HEAD
m->pertag = calloc(1, sizeof(Pertag));
m->pertag->curtag = m->pertag->prevtag = 1;
@@ -1129,6 +1302,8 @@ createmon(struct wl_listener *listener, void *data)
m->pertag->sellts[i] = m->sellt;
}
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
/* The xdg-protocol specifies:
*
* If the fullscreened surface is not opaque, the compositor must make
@@ -1244,6 +1419,7 @@ createpointer(struct wlr_pointer *pointer)
}
void
+<<<<<<< HEAD
createpointerconstraint(struct wl_listener *listener, void *data)
{
struct wlr_pointer_constraint_v1 *wlr_constraint = data;
@@ -1312,6 +1488,8 @@ cursorconstrain(struct wlr_pointer_constraint_v1 *wlr_constraint)
}
void
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
cursorframe(struct wl_listener *listener, void *data)
{
/* This event is forwarded by the cursor when a pointer emits an frame
@@ -1323,6 +1501,7 @@ cursorframe(struct wl_listener *listener, void *data)
}
void
+<<<<<<< HEAD
deck(Monitor *m)
{
unsigned int i, n = 0, mw, my;
@@ -1389,13 +1568,19 @@ cursorwarptoconstrainthint(void)
}
void
+=======
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
destroydragicon(struct wl_listener *listener, void *data)
{
struct wlr_drag_icon *icon = data;
wlr_scene_node_destroy(icon->data);
/* Focus enter isn't sent during drag, so refocus the focused node. */
focusclient(focustop(selmon), 1);
+<<<<<<< HEAD
motionnotify(0, NULL, 0, 0, 0, 0);
+=======
+ motionnotify(0);
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
}
void
@@ -1430,7 +1615,11 @@ destroylock(SessionLock *lock, int unlock)
wlr_scene_node_set_enabled(&locked_bg->node, 0);
focusclient(focustop(selmon), 0);
+<<<<<<< HEAD
motionnotify(0, NULL, 0, 0, 0, 0);
+=======
+ motionnotify(0);
+>>>>>>> cadf5eb1e9ee1737789548130947852ba2edf0da
destroy:
wl_list_remove(&lock->new_surface.link);
@@ -1485,6 +1674,7 @@ destroynotify(struct wl_listener *listener, void *data)
}
void
+<<<<<<< HEAD
destroypointerconstraint(struct wl_listener *listener, void *data)
{
PointerConstraint *constraint = wl_container_of(listener, constraint, destroy);
@@ -1505,6 +1695,8 @@ destroypointerconstraint(struct wl_listener *listener, void *data)
}