Compare commits
1364 Commits
3.13.2
...
wip/garnac
Author | SHA1 | Date | |
---|---|---|---|
![]() |
9f35b5816a | ||
![]() |
63c91f9d4f | ||
![]() |
aaa02440be | ||
![]() |
9611661154 | ||
![]() |
a70a2c3744 | ||
![]() |
bc47b19c3f | ||
![]() |
bc1dd1cee4 | ||
![]() |
495c89401a | ||
![]() |
e2efc85b08 | ||
![]() |
020ae58fe4 | ||
![]() |
525644059d | ||
![]() |
f0f638d2bd | ||
![]() |
bc8ec2d90d | ||
![]() |
5b0eabec51 | ||
![]() |
50099c4c10 | ||
![]() |
55eef2deb3 | ||
![]() |
f9db65f47f | ||
![]() |
a809055470 | ||
![]() |
247909e161 | ||
![]() |
e5ce6192f4 | ||
![]() |
7adbb58736 | ||
![]() |
0165cb6974 | ||
![]() |
3cdcd3e9c1 | ||
![]() |
6fc51e3723 | ||
![]() |
af45a50cb1 | ||
![]() |
72d6efc0d5 | ||
![]() |
e0ffef06dd | ||
![]() |
d5b69bcd54 | ||
![]() |
ac8fe2d9b2 | ||
![]() |
e7a88dc6b2 | ||
![]() |
bcdda506e1 | ||
![]() |
9b26694bbc | ||
![]() |
f053c09083 | ||
![]() |
ec9abaf1ef | ||
![]() |
6b88420465 | ||
![]() |
fc0a834abb | ||
![]() |
e30010b9f0 | ||
![]() |
935d76ba04 | ||
![]() |
cc013e1daa | ||
![]() |
a7a376ae1f | ||
![]() |
5e57af6286 | ||
![]() |
42b3a34f7b | ||
![]() |
19d814c887 | ||
![]() |
46eb682c83 | ||
![]() |
3aea8d8ce6 | ||
![]() |
40c3c69435 | ||
![]() |
8071e5b149 | ||
![]() |
8a481b3e10 | ||
![]() |
50e3e3b929 | ||
![]() |
2c7ef2269f | ||
![]() |
8bded7d497 | ||
![]() |
9ebe3419c3 | ||
![]() |
9385c835b8 | ||
![]() |
efef0c993b | ||
![]() |
3a2cd3389a | ||
![]() |
88acfb8e60 | ||
![]() |
8e22dce5d7 | ||
![]() |
e0906a77aa | ||
![]() |
053f5088df | ||
![]() |
75b992c7d0 | ||
![]() |
213f0fa160 | ||
![]() |
5054b2a99c | ||
![]() |
d455de32a0 | ||
![]() |
e7390cff83 | ||
![]() |
49ea6486e2 | ||
![]() |
996aeaef41 | ||
![]() |
a27b2597b9 | ||
![]() |
0e8ca1a042 | ||
![]() |
f5f26c9cff | ||
![]() |
91ac69382d | ||
![]() |
8cc345fcf5 | ||
![]() |
96b5042dda | ||
![]() |
428c687b5a | ||
![]() |
82bdd1e353 | ||
![]() |
4bebc5e5fa | ||
![]() |
be5643cee7 | ||
![]() |
2ee1c5fa61 | ||
![]() |
c625d2ee9d | ||
![]() |
3078f70f90 | ||
![]() |
7309b20c25 | ||
![]() |
c16a5ec1cf | ||
![]() |
f3e1964362 | ||
![]() |
9b9083180f | ||
![]() |
7606f79a1e | ||
![]() |
99c0b82b15 | ||
![]() |
ca7c1d5e02 | ||
![]() |
4a770907c1 | ||
![]() |
049f1556dc | ||
![]() |
7b20d151ed | ||
![]() |
8ec0c99ff4 | ||
![]() |
cf3ee327a0 | ||
![]() |
3ec3cc248d | ||
![]() |
7fb3ecc12c | ||
![]() |
4c9af7267d | ||
![]() |
db4355ba1e | ||
![]() |
33150569cd | ||
![]() |
af2a13ded4 | ||
![]() |
8b200de35a | ||
![]() |
57ae203aab | ||
![]() |
bff75b64be | ||
![]() |
8899b9da01 | ||
![]() |
76e816a14f | ||
![]() |
2750db2a89 | ||
![]() |
86a913d37a | ||
![]() |
2857fdbdb8 | ||
![]() |
69a7d5ff02 | ||
![]() |
a4f763ac3b | ||
![]() |
f2afa7aa6c | ||
![]() |
a5d2555196 | ||
![]() |
dd5a4ecdf9 | ||
![]() |
43a1d43f2b | ||
![]() |
d6d377a447 | ||
![]() |
ffd95c2ad5 | ||
![]() |
72be89dfb9 | ||
![]() |
2feeb57dee | ||
![]() |
9c81b718f9 | ||
![]() |
3a63d58d9e | ||
![]() |
a95ae4d178 | ||
![]() |
a692fd3808 | ||
![]() |
377ecdb864 | ||
![]() |
d7f544f42e | ||
![]() |
1ab8b854df | ||
![]() |
ae7aabd5de | ||
![]() |
b975676c5d | ||
![]() |
86d8c3954f | ||
![]() |
54557f062e | ||
![]() |
130807a308 | ||
![]() |
e84f694668 | ||
![]() |
b18542f2b6 | ||
![]() |
da0aac665f | ||
![]() |
8b0b0cf028 | ||
![]() |
6f64d6b0aa | ||
![]() |
ebeca983c7 | ||
![]() |
cf88675807 | ||
![]() |
405f1ce3d0 | ||
![]() |
6190ae3873 | ||
![]() |
69c267b142 | ||
![]() |
9abc071283 | ||
![]() |
a9df4bb81a | ||
![]() |
bc9e63d3db | ||
![]() |
5b5ceede2b | ||
![]() |
4e63c95c02 | ||
![]() |
67d3a7a2d7 | ||
![]() |
bc00f118f3 | ||
![]() |
5801b5518f | ||
![]() |
25a796afc6 | ||
![]() |
27b37407d0 | ||
![]() |
e23e697043 | ||
![]() |
35729e8659 | ||
![]() |
dc7e665de9 | ||
![]() |
2e3bfd1a11 | ||
![]() |
b7aca07844 | ||
![]() |
dc780d2c44 | ||
![]() |
c49b284643 | ||
![]() |
0373b854c1 | ||
![]() |
5d837a5c85 | ||
![]() |
79c86ae890 | ||
![]() |
7c7cf91c32 | ||
![]() |
e407f5bbae | ||
![]() |
8900bd2f5c | ||
![]() |
83c17134f1 | ||
![]() |
8e5fb03611 | ||
![]() |
dece49b53d | ||
![]() |
443d579d40 | ||
![]() |
5066eaf691 | ||
![]() |
6ea7fa9973 | ||
![]() |
79f755bf0f | ||
![]() |
1845bfe1b6 | ||
![]() |
8e22bf5bc9 | ||
![]() |
c13ddafdb8 | ||
![]() |
94513726de | ||
![]() |
0aa4c4d43e | ||
![]() |
e3db4ab16a | ||
![]() |
614d6bd0f8 | ||
![]() |
1d56d50fcd | ||
![]() |
0ffd4254d9 | ||
![]() |
36eee04a21 | ||
![]() |
d3fdaa3232 | ||
![]() |
165050f8f9 | ||
![]() |
68279e8a08 | ||
![]() |
cd1ce2cb0a | ||
![]() |
b01f95cfdd | ||
![]() |
4b667d1e09 | ||
![]() |
fe8454d13f | ||
![]() |
53a6d16891 | ||
![]() |
e76c3ecb00 | ||
![]() |
637be80c86 | ||
![]() |
975feb9202 | ||
![]() |
a5417ebee1 | ||
![]() |
b64b159109 | ||
![]() |
804ab7894f | ||
![]() |
299ed424d3 | ||
![]() |
55692b4019 | ||
![]() |
2fafa24305 | ||
![]() |
51a2f28723 | ||
![]() |
e11feb229b | ||
![]() |
1ee387bb31 | ||
![]() |
cba2ab445e | ||
![]() |
038f828ab1 | ||
![]() |
4dc5882777 | ||
![]() |
b0b08d5010 | ||
![]() |
070cd27786 | ||
![]() |
9df6cda3e3 | ||
![]() |
39763d4add | ||
![]() |
352cac3850 | ||
![]() |
9c745105f8 | ||
![]() |
ab9dabe725 | ||
![]() |
7ce06928e2 | ||
![]() |
ac79988939 | ||
![]() |
a43a2af18b | ||
![]() |
07f533f617 | ||
![]() |
10504b0fdc | ||
![]() |
a84f714808 | ||
![]() |
b41873dced | ||
![]() |
0a9511b24b | ||
![]() |
17438ced91 | ||
![]() |
27c7512e4d | ||
![]() |
124888764d | ||
![]() |
7e1c6ff2a2 | ||
![]() |
2fb8da0d5a | ||
![]() |
ad51c52b69 | ||
![]() |
1b22da0039 | ||
![]() |
8329e97502 | ||
![]() |
74ca936a00 | ||
![]() |
141760057b | ||
![]() |
e648f2c244 | ||
![]() |
f01247d815 | ||
![]() |
db6caa2c49 | ||
![]() |
fbd237bc66 | ||
![]() |
f6c9261bf6 | ||
![]() |
14b0a83f64 | ||
![]() |
441efd17ce | ||
![]() |
208da2316d | ||
![]() |
3b993131e8 | ||
![]() |
117f57f74c | ||
![]() |
b97ebc4124 | ||
![]() |
5d10196919 | ||
![]() |
f295349e26 | ||
![]() |
eb023ff2c9 | ||
![]() |
ba7c524a18 | ||
![]() |
dc99af40f3 | ||
![]() |
1576b7d5a6 | ||
![]() |
6ec7fa2cbd | ||
![]() |
bede9970de | ||
![]() |
5f1bcc124f | ||
![]() |
4d3419607a | ||
![]() |
7dc0b0e602 | ||
![]() |
1545d4e638 | ||
![]() |
a191554cf6 | ||
![]() |
b33a82eb7c | ||
![]() |
2705c87f74 | ||
![]() |
9fc1c919e8 | ||
![]() |
9f04c58ffe | ||
![]() |
7de1f3a7be | ||
![]() |
fd443ecf2a | ||
![]() |
8979e52a6c | ||
![]() |
e8dd5601e7 | ||
![]() |
ccca810daf | ||
![]() |
693456b644 | ||
![]() |
aacc3d5628 | ||
![]() |
1ea8efdeda | ||
![]() |
a3fbbaabe8 | ||
![]() |
d5d95b2834 | ||
![]() |
659b8ed471 | ||
![]() |
94bce5a00f | ||
![]() |
91b7dedf36 | ||
![]() |
aa1c819941 | ||
![]() |
be7e994abd | ||
![]() |
6c05eb583e | ||
![]() |
5547c98f97 | ||
![]() |
ea4979e182 | ||
![]() |
8da5761ffc | ||
![]() |
aea71fbd01 | ||
![]() |
b55f792302 | ||
![]() |
dd060d78ce | ||
![]() |
3fe281ada9 | ||
![]() |
f041b35b9b | ||
![]() |
afa58746ea | ||
![]() |
6dbec6f81b | ||
![]() |
2cbaa6660c | ||
![]() |
d74b0d5be8 | ||
![]() |
6b82f61dba | ||
![]() |
4c6866741d | ||
![]() |
84baf4e181 | ||
![]() |
3962f1d982 | ||
![]() |
414be07a69 | ||
![]() |
7f3ada7831 | ||
![]() |
12771a555a | ||
![]() |
92d6a69153 | ||
![]() |
734402e14d | ||
![]() |
5d360a9bce | ||
![]() |
f8cf5e373c | ||
![]() |
8df3fa4e67 | ||
![]() |
bbf2b4e60e | ||
![]() |
bb4dcd62ec | ||
![]() |
2345b9c6ad | ||
![]() |
af7cc87bfa | ||
![]() |
af3b599cbb | ||
![]() |
0e73ceb4bd | ||
![]() |
82a7060cdb | ||
![]() |
09120132ef | ||
![]() |
cdac4d0e92 | ||
![]() |
6aead0c67c | ||
![]() |
d593a61b39 | ||
![]() |
9747277b7e | ||
![]() |
989f9630a4 | ||
![]() |
daa15d94fd | ||
![]() |
999b99a077 | ||
![]() |
fd0b366a96 | ||
![]() |
320e2d452f | ||
![]() |
4d5dd01b7d | ||
![]() |
103c88bd72 | ||
![]() |
64cf87cfe1 | ||
![]() |
9f65edd4f5 | ||
![]() |
ea2496c80a | ||
![]() |
0c30ceddbe | ||
![]() |
5c9846c53a | ||
![]() |
2a8563ab23 | ||
![]() |
6a77d9722a | ||
![]() |
ef296031cb | ||
![]() |
e2d6028924 | ||
![]() |
4d80a4cc31 | ||
![]() |
4a968c3b4e | ||
![]() |
ccb7833e99 | ||
![]() |
b449ba942a | ||
![]() |
f53eea2c1c | ||
![]() |
b62db404ee | ||
![]() |
90a28e7b1c | ||
![]() |
8d51a9db5b | ||
![]() |
b39c00f344 | ||
![]() |
83ce71c3bf | ||
![]() |
f9d869a3dd | ||
![]() |
0b0ce4193f | ||
![]() |
719d8bd0c7 | ||
![]() |
4fc1811c15 | ||
![]() |
4b5f5abb4f | ||
![]() |
95ad52ba58 | ||
![]() |
dac30a222e | ||
![]() |
7d1b593fbd | ||
![]() |
d6a7559750 | ||
![]() |
cff5ef0ec2 | ||
![]() |
d478d8f143 | ||
![]() |
7eca43cec9 | ||
![]() |
9060190555 | ||
![]() |
0de3869656 | ||
![]() |
9f13033f15 | ||
![]() |
48bf807430 | ||
![]() |
c68e43a97f | ||
![]() |
cc53d48fa8 | ||
![]() |
ca6e799b97 | ||
![]() |
0f8e387dc0 | ||
![]() |
d62c595e51 | ||
![]() |
dd3cf94744 | ||
![]() |
eb56e0a3d7 | ||
![]() |
8937c32cd5 | ||
![]() |
a8a5da768a | ||
![]() |
33bfcf56ce | ||
![]() |
40cccb58a5 | ||
![]() |
eb6c70137b | ||
![]() |
df3b412a25 | ||
![]() |
cfba0a5dfc | ||
![]() |
3561b46fc6 | ||
![]() |
8dfb88b669 | ||
![]() |
2e3086e2aa | ||
![]() |
f424056fea | ||
![]() |
cfb7297cf1 | ||
![]() |
8769b3d554 | ||
![]() |
f8b82c376c | ||
![]() |
868e1427a8 | ||
![]() |
4aa74af694 | ||
![]() |
f3fecd478d | ||
![]() |
a5d1f67c34 | ||
![]() |
102fa0e373 | ||
![]() |
dbca3337b2 | ||
![]() |
939f7ce781 | ||
![]() |
c6e6ed87c5 | ||
![]() |
8188cddcf7 | ||
![]() |
9f17c05a15 | ||
![]() |
c3455b01af | ||
![]() |
d4e8d97e58 | ||
![]() |
a86368dcb1 | ||
![]() |
a13f906ed1 | ||
![]() |
f9e91bf007 | ||
![]() |
7c5fe42835 | ||
![]() |
e76decbcf2 | ||
![]() |
aac5a5dcaf | ||
![]() |
9b3186f8a5 | ||
![]() |
4917e367d5 | ||
![]() |
955c3c7c71 | ||
![]() |
8821162aef | ||
![]() |
0356f7afb3 | ||
![]() |
ba6fa54fdd | ||
![]() |
b2d4ecab30 | ||
![]() |
882a222d5c | ||
![]() |
7b79c44608 | ||
![]() |
580483d516 | ||
![]() |
57c1078ee7 | ||
![]() |
3a2920d4bc | ||
![]() |
ad13fa3bb3 | ||
![]() |
9b50119d31 | ||
![]() |
3ff6316562 | ||
![]() |
43058a3698 | ||
![]() |
8c16ac47c1 | ||
![]() |
6880cae3fb | ||
![]() |
4fc684b2ed | ||
![]() |
d63b9a1797 | ||
![]() |
72bd934604 | ||
![]() |
ed70e99b7b | ||
![]() |
6d72b7c017 | ||
![]() |
656fe49dbe | ||
![]() |
3471ef3441 | ||
![]() |
af9d8f1931 | ||
![]() |
a30ca3e62f | ||
![]() |
9e3bac0237 | ||
![]() |
67a30b7a89 | ||
![]() |
68ba45bcb2 | ||
![]() |
6bacbac656 | ||
![]() |
87e52b18c2 | ||
![]() |
637cc9269d | ||
![]() |
fcdd1944a4 | ||
![]() |
5636784604 | ||
![]() |
9a3b178da1 | ||
![]() |
a1488005b6 | ||
![]() |
cca68b31b1 | ||
![]() |
85452aff4f | ||
![]() |
d9d83abae2 | ||
![]() |
0bc6cb2aeb | ||
![]() |
d628cce058 | ||
![]() |
b646e25fee | ||
![]() |
94c3c8f412 | ||
![]() |
d3988c04d6 | ||
![]() |
dd0cb55997 | ||
![]() |
aef27647a0 | ||
![]() |
18f958d06d | ||
![]() |
3efbb96119 | ||
![]() |
e5d97666af | ||
![]() |
83d7e932d6 | ||
![]() |
f858f66fe0 | ||
![]() |
fffb863f37 | ||
![]() |
adf7c0e730 | ||
![]() |
bbcee174ce | ||
![]() |
9c6e6ea381 | ||
![]() |
db9645fcb3 | ||
![]() |
6af48d75a4 | ||
![]() |
6234f7d1db | ||
![]() |
301a65e05a | ||
![]() |
376d4911b6 | ||
![]() |
0559d2c19f | ||
![]() |
54e482bc7b | ||
![]() |
37c3b79551 | ||
![]() |
78d8525699 | ||
![]() |
23c00688b4 | ||
![]() |
438410c22c | ||
![]() |
59f348eb11 | ||
![]() |
cbad65f657 | ||
![]() |
1e8e107dd9 | ||
![]() |
8631bf2bbb | ||
![]() |
b9b41c20a6 | ||
![]() |
2d3deccd8e | ||
![]() |
68289a5d61 | ||
![]() |
adccbc9b7b | ||
![]() |
94b111cf6c | ||
![]() |
7303955618 | ||
![]() |
5e8bb9cc9d | ||
![]() |
accfdf7936 | ||
![]() |
c215247a6c | ||
![]() |
96b202c80d | ||
![]() |
0ac2f61a2c | ||
![]() |
2aa6dcd9d8 | ||
![]() |
469b85eb7c | ||
![]() |
673ddfde04 | ||
![]() |
56ca7eeb65 | ||
![]() |
b414955230 | ||
![]() |
af9072e725 | ||
![]() |
9b903e93e3 | ||
![]() |
7966f00a18 | ||
![]() |
9a99a80710 | ||
![]() |
be77874ec9 | ||
![]() |
768286bffb | ||
![]() |
f5c65d9ea1 | ||
![]() |
f328890ed1 | ||
![]() |
945bf626c6 | ||
![]() |
f6869bbbc2 | ||
![]() |
eafe11a7cf | ||
![]() |
daba1b511b | ||
![]() |
87a13d2c00 | ||
![]() |
11a9b4baa0 | ||
![]() |
de71fd0941 | ||
![]() |
87c973c260 | ||
![]() |
644ab0e270 | ||
![]() |
3142220443 | ||
![]() |
1f0ed5483a | ||
![]() |
72f5a36522 | ||
![]() |
7f19db1f7b | ||
![]() |
3f2d658f20 | ||
![]() |
05353c1f7e | ||
![]() |
4d23e7c202 | ||
![]() |
ad90b7dd2f | ||
![]() |
3356a43c04 | ||
![]() |
3a5a647d49 | ||
![]() |
a2ff8f4e1e | ||
![]() |
e294f6df8c | ||
![]() |
422ddeddb9 | ||
![]() |
8ef48a99ae | ||
![]() |
9d7af8a5fc | ||
![]() |
764c3dd137 | ||
![]() |
7e7c8ecbd4 | ||
![]() |
d561b3b18f | ||
![]() |
ce14bde08d | ||
![]() |
b91461ee39 | ||
![]() |
22c13b3144 | ||
![]() |
0bfebc3cae | ||
![]() |
db384a656c | ||
![]() |
1dea1813b1 | ||
![]() |
71c4138933 | ||
![]() |
9d73b4efbb | ||
![]() |
049f67df0a | ||
![]() |
2d878d3f55 | ||
![]() |
3c06f2dc90 | ||
![]() |
460e1fd7ca | ||
![]() |
f083935c6e | ||
![]() |
5c66bee84b | ||
![]() |
ef32bbdc99 | ||
![]() |
5f91a62f6f | ||
![]() |
152b2dab59 | ||
![]() |
625d3de2ee | ||
![]() |
f71315eb1e | ||
![]() |
0484ef142d | ||
![]() |
6609d9c6a4 | ||
![]() |
73c4342580 | ||
![]() |
0d5c24f13d | ||
![]() |
b6d070b06f | ||
![]() |
87eb5f8632 | ||
![]() |
5c60ea6635 | ||
![]() |
9abcf424b8 | ||
![]() |
cc7af83f8a | ||
![]() |
ae91a174e9 | ||
![]() |
9c73e21113 | ||
![]() |
a1d8110221 | ||
![]() |
9d6357f05a | ||
![]() |
1fc58faff9 | ||
![]() |
fea7ac84ee | ||
![]() |
20bee6f48e | ||
![]() |
fb5c0c3352 | ||
![]() |
5bc2bcd109 | ||
![]() |
d12390002a | ||
![]() |
13acf9e35d | ||
![]() |
3beb187cac | ||
![]() |
a3b8dcbd04 | ||
![]() |
3ff8b0051d | ||
![]() |
a8bf7934fb | ||
![]() |
7159845c6e | ||
![]() |
7bccd4f22f | ||
![]() |
e4e00b383e | ||
![]() |
36454542ae | ||
![]() |
34ba868b4c | ||
![]() |
274ea76eea | ||
![]() |
a180e8b87e | ||
![]() |
26c8086190 | ||
![]() |
34fbca0181 | ||
![]() |
4496fb4447 | ||
![]() |
7e66d2a484 | ||
![]() |
12135afa5e | ||
![]() |
cac660a5bc | ||
![]() |
dcce4e64bc | ||
![]() |
4d3511649b | ||
![]() |
d4ea2bbd9c | ||
![]() |
f303ec2eaa | ||
![]() |
2ca4ed6b04 | ||
![]() |
a5ad89dd65 | ||
![]() |
4a4d724e59 | ||
![]() |
8fdbae192a | ||
![]() |
2413e672c8 | ||
![]() |
c8432cc430 | ||
![]() |
015864da09 | ||
![]() |
669c9da2a4 | ||
![]() |
4d1d8e831e | ||
![]() |
9e199e6350 | ||
![]() |
4673d8f245 | ||
![]() |
90111c03a1 | ||
![]() |
23681800d9 | ||
![]() |
b47afe89d3 | ||
![]() |
af7f51b992 | ||
![]() |
f3d30d897f | ||
![]() |
dcc4ce4ff4 | ||
![]() |
b9fb4a5887 | ||
![]() |
d9985cd9bc | ||
![]() |
6e3f7b7ddc | ||
![]() |
2dd1f37820 | ||
![]() |
57af975154 | ||
![]() |
c5940580ed | ||
![]() |
8296d4cdce | ||
![]() |
bf9a00d5c9 | ||
![]() |
c1db9d9181 | ||
![]() |
9d2cd8ff87 | ||
![]() |
d514e8ab41 | ||
![]() |
44a60eb7e9 | ||
![]() |
6b92b45021 | ||
![]() |
ee461b5495 | ||
![]() |
46f3eb0b71 | ||
![]() |
ef32899b4d | ||
![]() |
5e9db422c9 | ||
![]() |
662dd6a289 | ||
![]() |
d5e6177900 | ||
![]() |
34ac80348c | ||
![]() |
8a7a01b0cf | ||
![]() |
2cabc067d1 | ||
![]() |
26c4c21e13 | ||
![]() |
6eda784cf0 | ||
![]() |
fb1459062f | ||
![]() |
bc9547f29e | ||
![]() |
89a371ec98 | ||
![]() |
2db71e73b4 | ||
![]() |
472f2a4b8e | ||
![]() |
db04ac9eb7 | ||
![]() |
75105e254f | ||
![]() |
901a05ad80 | ||
![]() |
ab6c4c82f6 | ||
![]() |
cacb32482c | ||
![]() |
4450b5bb14 | ||
![]() |
34421e90c3 | ||
![]() |
93b7137c62 | ||
![]() |
5ad15bb5e5 | ||
![]() |
cd4206764e | ||
![]() |
b10a017446 | ||
![]() |
d393cba39e | ||
![]() |
578f593d56 | ||
![]() |
55df99447a | ||
![]() |
d45080d32e | ||
![]() |
fa97364fa8 | ||
![]() |
41303101e5 | ||
![]() |
68542ae1ef | ||
![]() |
0c730d8feb | ||
![]() |
aeef98fd19 | ||
![]() |
69079b3b48 | ||
![]() |
ad7292faef | ||
![]() |
2f7843b295 | ||
![]() |
b24cd5ae08 | ||
![]() |
c782078e00 | ||
![]() |
5a86286aba | ||
![]() |
b1ac83d3b6 | ||
![]() |
e73f5cc8ab | ||
![]() |
593b417e5e | ||
![]() |
5e84c8f20b | ||
![]() |
9745f9f8ce | ||
![]() |
99f7be33ad | ||
![]() |
6492845f27 | ||
![]() |
fd1243d881 | ||
![]() |
00535b34b6 | ||
![]() |
a2b2a7a26f | ||
![]() |
9fdf487da1 | ||
![]() |
c5033616e9 | ||
![]() |
a0e038f34b | ||
![]() |
71dab32769 | ||
![]() |
c408cf7aac | ||
![]() |
e96eb0e82e | ||
![]() |
0015963457 | ||
![]() |
b832bc7424 | ||
![]() |
89b14babb9 | ||
![]() |
7ecde19aee | ||
![]() |
d7854794cf | ||
![]() |
f6f5f624d4 | ||
![]() |
7012c82fc7 | ||
![]() |
a0d2d207e7 | ||
![]() |
6e25c37da1 | ||
![]() |
061f434201 | ||
![]() |
638087fe78 | ||
![]() |
286a6ada5a | ||
![]() |
cb66ab5a87 | ||
![]() |
e72c6916aa | ||
![]() |
8b98cb818c | ||
![]() |
f8a4d450a5 | ||
![]() |
681cf95236 | ||
![]() |
90d6734f8c | ||
![]() |
213cd8a334 | ||
![]() |
3b1271d9be | ||
![]() |
13b6bd20ca | ||
![]() |
63e31af476 | ||
![]() |
718a89eb2f | ||
![]() |
a43ca7b5b1 | ||
![]() |
af00ca534a | ||
![]() |
4b2b431700 | ||
![]() |
2c1a6b6a12 | ||
![]() |
b3544f8ec1 | ||
![]() |
df384965c3 | ||
![]() |
700d367937 | ||
![]() |
7c5989c978 | ||
![]() |
8819d9ce66 | ||
![]() |
b63413e5b0 | ||
![]() |
cd1e1d4bf1 | ||
![]() |
9710c013c5 | ||
![]() |
05f8d79323 | ||
![]() |
f2546dfeea | ||
![]() |
47e339b46e | ||
![]() |
016b8f5b4a | ||
![]() |
b3821c4f90 | ||
![]() |
29e5c6c363 | ||
![]() |
e1704acda4 | ||
![]() |
60cbb41f42 | ||
![]() |
d88c8d9ced | ||
![]() |
60ab11ecbf | ||
![]() |
34516aeab6 | ||
![]() |
a37f632b1b | ||
![]() |
8a6542c242 | ||
![]() |
7e12000d97 | ||
![]() |
23f086da8a | ||
![]() |
4c2c1c4dd2 | ||
![]() |
545f298921 | ||
![]() |
64295e8cd7 | ||
![]() |
722d4c6c17 | ||
![]() |
cc8462969d | ||
![]() |
989bb6ebb1 | ||
![]() |
1dbda68839 | ||
![]() |
a460f88b31 | ||
![]() |
3e511b9591 | ||
![]() |
5664c703b7 | ||
![]() |
5c80c4b006 | ||
![]() |
22f91eba8d | ||
![]() |
d07e2f4090 | ||
![]() |
cd32e4a68a | ||
![]() |
4040a70781 | ||
![]() |
cb084cc841 | ||
![]() |
2deea6e0a3 | ||
![]() |
a116509301 | ||
![]() |
ead79f834c | ||
![]() |
7e431bd6bc | ||
![]() |
272e1fb296 | ||
![]() |
c39f18c2d4 | ||
![]() |
33acb5fea0 | ||
![]() |
591718dc02 | ||
![]() |
b6127eeda4 | ||
![]() |
eeff1b8b02 | ||
![]() |
354cc466af | ||
![]() |
9f5c38d121 | ||
![]() |
ead0e902ed | ||
![]() |
5d16194b03 | ||
![]() |
a74acf0ec2 | ||
![]() |
3044cfb7bf | ||
![]() |
f658740043 | ||
![]() |
c1613a16c0 | ||
![]() |
8e85015f91 | ||
![]() |
f127ee3bde | ||
![]() |
acd928044f | ||
![]() |
4ef2f2ce09 | ||
![]() |
bc81736e6b | ||
![]() |
49092397f2 | ||
![]() |
97705d3cfe | ||
![]() |
0364ea9140 | ||
![]() |
c0bdb3018b | ||
![]() |
924eaac358 | ||
![]() |
a9f5a5661f | ||
![]() |
9c589b6798 | ||
![]() |
113be01ce8 | ||
![]() |
28e59c5a8f | ||
![]() |
b588baf9f5 | ||
![]() |
9a825d9bee | ||
![]() |
f211b3ec90 | ||
![]() |
0510c3a621 | ||
![]() |
18db5d0799 | ||
![]() |
c061e26da5 | ||
![]() |
166668adc4 | ||
![]() |
ec797b055d | ||
![]() |
082cc9c83a | ||
![]() |
993bec37d7 | ||
![]() |
e496ed50d6 | ||
![]() |
a127d05790 | ||
![]() |
607730e96c | ||
![]() |
9203db0655 | ||
![]() |
64d40792c4 | ||
![]() |
e7356917b0 | ||
![]() |
fa58752276 | ||
![]() |
478b75e803 | ||
![]() |
492a1b244f | ||
![]() |
5d8ff2e34d | ||
![]() |
310083aeb2 | ||
![]() |
0faa900207 | ||
![]() |
b735571688 | ||
![]() |
5e249ad5eb | ||
![]() |
21bffe4aef | ||
![]() |
68283df4d9 | ||
![]() |
4f3de2ce39 | ||
![]() |
9f8b641472 | ||
![]() |
a9a21c801c | ||
![]() |
482a97466d | ||
![]() |
4e14bb9df3 | ||
![]() |
df90545258 | ||
![]() |
c954f9cc24 | ||
![]() |
d06b39d13c | ||
![]() |
f3595ebd08 | ||
![]() |
1e1ca47ec1 | ||
![]() |
2eec11b445 | ||
![]() |
8ff4597201 | ||
![]() |
d5f2468d88 | ||
![]() |
488dd0b402 | ||
![]() |
6565bca210 | ||
![]() |
60c22b6236 | ||
![]() |
d3111a9f07 | ||
![]() |
cdfb301200 | ||
![]() |
371560c2b6 | ||
![]() |
7616881afa | ||
![]() |
74c37d49c4 | ||
![]() |
d3142b92f0 | ||
![]() |
ae2afa7c5e | ||
![]() |
4a71621fbc | ||
![]() |
565b9d73d5 | ||
![]() |
90bd02ff4d | ||
![]() |
73ca0efaeb | ||
![]() |
790269db95 | ||
![]() |
cb82bd8afa | ||
![]() |
b1e06ed110 | ||
![]() |
fabe66e65f | ||
![]() |
4a965a37d1 | ||
![]() |
302ff7b95a | ||
![]() |
e2e241340c | ||
![]() |
461aea47dd | ||
![]() |
d87093fe29 | ||
![]() |
0cde7879d6 | ||
![]() |
89ffcee7ca | ||
![]() |
1250afef7b | ||
![]() |
3a577edaa7 | ||
![]() |
48dfde2073 | ||
![]() |
4a41d415f8 | ||
![]() |
1fb7ca398d | ||
![]() |
2b79935fd8 | ||
![]() |
e3c915350e | ||
![]() |
2e06a6765c | ||
![]() |
b63291069d | ||
![]() |
f10cb02cbf | ||
![]() |
276df8f18d | ||
![]() |
d61dde12cb | ||
![]() |
c8cc4344f2 | ||
![]() |
ae292c856b | ||
![]() |
35dd1e644d | ||
![]() |
be85ead2f8 | ||
![]() |
5c40345128 | ||
![]() |
43b3573c51 | ||
![]() |
ac6ec168da | ||
![]() |
dbb7b9e85b | ||
![]() |
1de740955f | ||
![]() |
21f123c69f | ||
![]() |
d6624b0a75 | ||
![]() |
9c465a2d5a | ||
![]() |
e53456d87c | ||
![]() |
5716fc4b90 | ||
![]() |
e926ebafdb | ||
![]() |
7125b801f2 | ||
![]() |
d20dae3553 | ||
![]() |
73a47cec2a | ||
![]() |
514d3b4bde | ||
![]() |
6910ab5389 | ||
![]() |
4052b0f048 | ||
![]() |
493c0f71d2 | ||
![]() |
ab40dfdd51 | ||
![]() |
52678c39e6 | ||
![]() |
a676249c0c | ||
![]() |
2833c702c6 | ||
![]() |
611f6741c2 | ||
![]() |
df2587a61c | ||
![]() |
30e7044746 | ||
![]() |
458953268b | ||
![]() |
1c227baf81 | ||
![]() |
892699da73 | ||
![]() |
f163a15b13 | ||
![]() |
87779ed34e | ||
![]() |
04bc846ef3 | ||
![]() |
301acac163 | ||
![]() |
9401196e88 | ||
![]() |
3457366066 | ||
![]() |
cb66cf6398 | ||
![]() |
73573a85de | ||
![]() |
b49a4ae0bc | ||
![]() |
2f63c39fa6 | ||
![]() |
95d9a95b2b | ||
![]() |
44ecb1c050 | ||
![]() |
0706de5378 | ||
![]() |
9dd9938c38 | ||
![]() |
e27bbdc769 | ||
![]() |
09b46029fa | ||
![]() |
5c289b7eab | ||
![]() |
656573c5d2 | ||
![]() |
59c5ac0cb5 | ||
![]() |
53092424e6 | ||
![]() |
6ba0491adf | ||
![]() |
e3fb9e4cee | ||
![]() |
8d53ae894b | ||
![]() |
d50f8afa9e | ||
![]() |
98fa343588 | ||
![]() |
9ceb3fbb9a | ||
![]() |
22d95546a7 | ||
![]() |
33689ec558 | ||
![]() |
602dd7fdf2 | ||
![]() |
7f15c995b7 | ||
![]() |
9be3e56b70 | ||
![]() |
24119b8a9c | ||
![]() |
4d75de006c | ||
![]() |
e19516ec5a | ||
![]() |
1ed607f398 | ||
![]() |
7e0822c5b1 | ||
![]() |
037c3438a3 | ||
![]() |
cde5d4acfa | ||
![]() |
d79db68bf8 | ||
![]() |
b3b9d9e161 | ||
![]() |
3f1f1645c7 | ||
![]() |
18a82688e2 | ||
![]() |
27d6b2645e | ||
![]() |
fee40353e2 | ||
![]() |
659360d543 | ||
![]() |
3ea6424b8f | ||
![]() |
96bee8e60d | ||
![]() |
883c4a7b0f | ||
![]() |
d4317ba1e4 | ||
![]() |
9d69b2a963 | ||
![]() |
ef3b000050 | ||
![]() |
a4a688ed83 | ||
![]() |
17dc5c57dd | ||
![]() |
ef5f939db8 | ||
![]() |
cb4751da4c | ||
![]() |
0685f17f73 | ||
![]() |
4b260d5d9f | ||
![]() |
c8f015c6d7 | ||
![]() |
604d2155ba | ||
![]() |
e7727d698f | ||
![]() |
a3f75f401c | ||
![]() |
d342f7c429 | ||
![]() |
bb2b26ca44 | ||
![]() |
2f9840a51c | ||
![]() |
09aefdba43 | ||
![]() |
4c8a408afc | ||
![]() |
4c08d9a53b | ||
![]() |
b091cbf361 | ||
![]() |
a6fcda69ac | ||
![]() |
9063e4568c | ||
![]() |
3d37b5d696 | ||
![]() |
3a8bad1e6f | ||
![]() |
e822e51752 | ||
![]() |
f9818f890b | ||
![]() |
6526118d9f | ||
![]() |
c15b3b4a09 | ||
![]() |
e1acb69cf1 | ||
![]() |
8f757c7b80 | ||
![]() |
01a47c7d6d | ||
![]() |
3ee09c6251 | ||
![]() |
bb54f91dd1 | ||
![]() |
41a79530e9 | ||
![]() |
31f5a916f4 | ||
![]() |
5657a671c1 | ||
![]() |
ecc254c659 | ||
![]() |
9cb1c95e49 | ||
![]() |
e73c46ce03 | ||
![]() |
952e9c52bc | ||
![]() |
b879af46b3 | ||
![]() |
9feb9d6bca | ||
![]() |
dc0437a5b5 | ||
![]() |
55331a0678 | ||
![]() |
f5580f61f9 | ||
![]() |
30953cf2d7 | ||
![]() |
c7fa446ee7 | ||
![]() |
9ecbac365b | ||
![]() |
80f6fb6329 | ||
![]() |
1b596a114d | ||
![]() |
265c00235b | ||
![]() |
fae37222a7 | ||
![]() |
d41449b578 | ||
![]() |
34979c3fe8 | ||
![]() |
711f0c0c50 | ||
![]() |
933d05a565 | ||
![]() |
8a0da1cb07 | ||
![]() |
1445903a34 | ||
![]() |
5d9386df0c | ||
![]() |
6fd1de226b | ||
![]() |
ac099343da | ||
![]() |
bce5f3f108 | ||
![]() |
35e0982e35 | ||
![]() |
767455e8d8 | ||
![]() |
6b8dda0d00 | ||
![]() |
277df44cfb | ||
![]() |
2dded1e510 | ||
![]() |
a7b1b1da80 | ||
![]() |
de69678085 | ||
![]() |
5f7b81eb95 | ||
![]() |
f4f70afe31 | ||
![]() |
116957b339 | ||
![]() |
1af0033368 | ||
![]() |
3645c63c08 | ||
![]() |
04ddfe0a6f | ||
![]() |
ec3dc4a607 | ||
![]() |
0b98fbab0a | ||
![]() |
5b8dc37c31 | ||
![]() |
f42258327b | ||
![]() |
7d1ef3f447 | ||
![]() |
652fe57cdd | ||
![]() |
20a6243c85 | ||
![]() |
679edac9c3 | ||
![]() |
bb59b8c249 | ||
![]() |
c5c6b2257f | ||
![]() |
6acf7b06f4 | ||
![]() |
d0c004c93c | ||
![]() |
53876d2b62 | ||
![]() |
2b63b17327 | ||
![]() |
226a09b38c | ||
![]() |
527c53a2a0 | ||
![]() |
19795c1681 | ||
![]() |
1999fcaa8f | ||
![]() |
6b5ff8fd74 | ||
![]() |
821d946a72 | ||
![]() |
5f7c901727 | ||
![]() |
7b8ee4ee1e | ||
![]() |
32cf4afb04 | ||
![]() |
e0c92befd5 | ||
![]() |
827e0341ab | ||
![]() |
8627b65f8d | ||
![]() |
9c62a907c5 | ||
![]() |
a119ea96a3 | ||
![]() |
06d55bf019 | ||
![]() |
320f38de47 | ||
![]() |
7adfaceccf | ||
![]() |
67be4e2bf3 | ||
![]() |
c3e87ee896 | ||
![]() |
f2283ec634 | ||
![]() |
d06e4beb7f | ||
![]() |
e24863d175 | ||
![]() |
2de2241690 | ||
![]() |
977de8c5d4 | ||
![]() |
fb6438cdd4 | ||
![]() |
517e8f6fbd | ||
![]() |
0e758a9e65 | ||
![]() |
64a915a68d | ||
![]() |
d233238c64 | ||
![]() |
71a4fe746e | ||
![]() |
f28c7835a1 | ||
![]() |
cecf7f4bf0 | ||
![]() |
c687cf9db6 | ||
![]() |
54d2218ac2 | ||
![]() |
471e6b9e13 | ||
![]() |
f8dcea3975 | ||
![]() |
d931af33c4 | ||
![]() |
a0e3c05428 | ||
![]() |
b8c13cc426 | ||
![]() |
38253a9f73 | ||
![]() |
cbc92b847f | ||
![]() |
a5f993f269 | ||
![]() |
31361e464a | ||
![]() |
bb977c00ca | ||
![]() |
39f65f9f86 | ||
![]() |
bda2d6d1ac | ||
![]() |
1e225ecdaf | ||
![]() |
cfb85d9a9a | ||
![]() |
f88c20f335 | ||
![]() |
c98824bc9e | ||
![]() |
69a35bb85f | ||
![]() |
a3bb6c12e5 | ||
![]() |
586f118279 | ||
![]() |
31081e5dac | ||
![]() |
ef363e9d2e | ||
![]() |
9fa77acb8c | ||
![]() |
1e30db64d1 | ||
![]() |
e830b66604 | ||
![]() |
5f0fab2156 | ||
![]() |
467465c99c | ||
![]() |
e935b52e51 | ||
![]() |
879407c10c | ||
![]() |
e76be14dbb | ||
![]() |
7fa15c74b4 | ||
![]() |
c3950699bf | ||
![]() |
e6b950e31b | ||
![]() |
9440bdb1aa | ||
![]() |
e320b06aaa | ||
![]() |
b284126d3b | ||
![]() |
6858cb261f | ||
![]() |
2d6954186e | ||
![]() |
d72bf0cd5d | ||
![]() |
584460deec | ||
![]() |
e3d5969282 | ||
![]() |
249468bbea | ||
![]() |
f0f4c31d96 | ||
![]() |
27f012ffad | ||
![]() |
7d54631ebf | ||
![]() |
513628e4ad | ||
![]() |
101b215d6b | ||
![]() |
6af48de0b8 | ||
![]() |
e5c4fedd55 | ||
![]() |
2ce23072d3 | ||
![]() |
97f4eb6b75 | ||
![]() |
75cbf3d730 | ||
![]() |
bf9fdf448d | ||
![]() |
63c627ec18 | ||
![]() |
dadbd793be | ||
![]() |
75b6e917ad | ||
![]() |
ab53c0e943 | ||
![]() |
c2fe6a18ad | ||
![]() |
b7119c55a6 | ||
![]() |
d0f2c6be6d | ||
![]() |
3a535b6722 | ||
![]() |
f9a77aec3f | ||
![]() |
bee6d2b240 | ||
![]() |
9a6a189e36 | ||
![]() |
505eabb78c | ||
![]() |
b0ba325f0e | ||
![]() |
6fbd21001b | ||
![]() |
626e4965b1 | ||
![]() |
a15042b7e5 | ||
![]() |
e56f963574 | ||
![]() |
65a8f9100c | ||
![]() |
6954d23444 | ||
![]() |
6c624e1c26 | ||
![]() |
cc839029b9 | ||
![]() |
25f8eaf1ac | ||
![]() |
8fdd226b8b | ||
![]() |
6c5595fa9c | ||
![]() |
e6558f838e | ||
![]() |
57037a45b8 | ||
![]() |
c844611052 | ||
![]() |
b60e02956d | ||
![]() |
4fe66ce0a9 | ||
![]() |
4b5a503cee | ||
![]() |
817995d97f | ||
![]() |
0e7221c361 | ||
![]() |
938fb8e6c8 | ||
![]() |
fd8c49ff0a | ||
![]() |
cd84317346 | ||
![]() |
4f55e16fe9 | ||
![]() |
c30ef668de | ||
![]() |
62e0c42803 | ||
![]() |
70aee2d95e | ||
![]() |
63c7591698 | ||
![]() |
930361b988 | ||
![]() |
baadb75a5e | ||
![]() |
f28f5dc0b6 | ||
![]() |
41fdc4ac2e | ||
![]() |
177ec27cca | ||
![]() |
37652ca2cf | ||
![]() |
6c22759d29 | ||
![]() |
25b6a40ad4 | ||
![]() |
fbea59b326 | ||
![]() |
38e4906f72 | ||
![]() |
029d69919b | ||
![]() |
5e395fb676 | ||
![]() |
ac448bd42b | ||
![]() |
f55737ec06 | ||
![]() |
80de15face | ||
![]() |
32565e096d | ||
![]() |
1d8e4bdd6d | ||
![]() |
1677a068ce | ||
![]() |
a02b8441b1 | ||
![]() |
dfe1c106f2 | ||
![]() |
e49bbe2ed8 | ||
![]() |
6ee5a1437c | ||
![]() |
93a3383e60 | ||
![]() |
c9a2a561f8 | ||
![]() |
ac0b2fdc6f | ||
![]() |
46b9984414 | ||
![]() |
f9743e2174 | ||
![]() |
a3c55c2692 | ||
![]() |
692eb4d957 | ||
![]() |
826751429b | ||
![]() |
5621d3c0c7 | ||
![]() |
b5f46c9171 | ||
![]() |
166b8c042c | ||
![]() |
d34ece6f1a | ||
![]() |
679844f791 | ||
![]() |
9316256e10 | ||
![]() |
90d7737fc1 | ||
![]() |
567ca15610 | ||
![]() |
558b323485 | ||
![]() |
1a05da8296 | ||
![]() |
5df59f75cd | ||
![]() |
029673d0ee | ||
![]() |
3a57f843d5 | ||
![]() |
182a267f69 | ||
![]() |
3de40434fa | ||
![]() |
bc8328d7c2 | ||
![]() |
12c1a06e60 | ||
![]() |
b11405570a | ||
![]() |
3b85e4b2b9 | ||
![]() |
c5abf5ddbb | ||
![]() |
2a3d4b62a7 | ||
![]() |
8ff81bcc37 | ||
![]() |
7159d3bc35 | ||
![]() |
941d202938 | ||
![]() |
5ea0cf8bab | ||
![]() |
df9a5f867f | ||
![]() |
06e4778072 | ||
![]() |
92388892b3 | ||
![]() |
5d124ac00a | ||
![]() |
a57c3ae105 | ||
![]() |
55354f5c38 | ||
![]() |
379bb0a77d | ||
![]() |
39357fc242 | ||
![]() |
799de4f0f4 | ||
![]() |
c34b5c1cf0 | ||
![]() |
46361c3e28 | ||
![]() |
f9d33b2efc | ||
![]() |
2185904fcb | ||
![]() |
eb952819c2 | ||
![]() |
d7d8c92a9a | ||
![]() |
88a7790d44 | ||
![]() |
806dabe2d7 | ||
![]() |
740e7ddd69 | ||
![]() |
bee97ab6a7 | ||
![]() |
59fc17c355 | ||
![]() |
5f25ca0c3a | ||
![]() |
41b4a079c7 | ||
![]() |
e4235376d8 | ||
![]() |
043a201f90 | ||
![]() |
d1a588a94f | ||
![]() |
01b6d9bfe2 | ||
![]() |
9711d95996 | ||
![]() |
b87db00fdb | ||
![]() |
6190b65056 | ||
![]() |
10fe91d704 | ||
![]() |
36bb05b10e | ||
![]() |
a7b7213017 | ||
![]() |
031154a400 | ||
![]() |
463b50e746 | ||
![]() |
1749a85e96 | ||
![]() |
1af9e92e91 | ||
![]() |
12d0c98fb5 | ||
![]() |
817c6986a0 | ||
![]() |
7c68aaea4c | ||
![]() |
6fea46e0cf | ||
![]() |
59fa74fed1 | ||
![]() |
581335fbea | ||
![]() |
9b5d6cc008 | ||
![]() |
d0f98ec1ba | ||
![]() |
a977fcf3d0 | ||
![]() |
664f6ef420 | ||
![]() |
06a31992e3 | ||
![]() |
4e2092d593 | ||
![]() |
9755f308e5 | ||
![]() |
09610daea1 | ||
![]() |
13b7fa4eba | ||
![]() |
909a46087f | ||
![]() |
c10c8649f5 | ||
![]() |
82dce6758a | ||
![]() |
024652bfb4 | ||
![]() |
789608b637 | ||
![]() |
d05b750b8d | ||
![]() |
704cae1de3 | ||
![]() |
23b074481a | ||
![]() |
5dc8fa6690 | ||
![]() |
a9ba98686f | ||
![]() |
59382bace2 | ||
![]() |
2edf822bc6 | ||
![]() |
355621b0ab | ||
![]() |
a307e13a63 | ||
![]() |
f807207b65 | ||
![]() |
30b54aae34 | ||
![]() |
79e682bcd0 | ||
![]() |
a05ae8654c | ||
![]() |
0db172edbf | ||
![]() |
7b0930f798 | ||
![]() |
0919b37c34 | ||
![]() |
faf55c4627 | ||
![]() |
f351c5d304 | ||
![]() |
63bca17ab6 | ||
![]() |
c2abe43ee7 | ||
![]() |
1de2fd7122 | ||
![]() |
e377e82cfd | ||
![]() |
fa8174a200 | ||
![]() |
d22448731c | ||
![]() |
ef95133b1c | ||
![]() |
c068c2122d | ||
![]() |
d8c47b0abd | ||
![]() |
66eb4bc34c | ||
![]() |
bce812ecbc | ||
![]() |
02220ed6c7 | ||
![]() |
8d08851f28 | ||
![]() |
af135c0b0b | ||
![]() |
42c972735e | ||
![]() |
110c79d10e | ||
![]() |
b9d867cb86 | ||
![]() |
ea3b961e43 | ||
![]() |
bc510378b3 | ||
![]() |
0a47d135ac | ||
![]() |
ec8ed1dbb0 | ||
![]() |
203e5335ab | ||
![]() |
f1d8428650 | ||
![]() |
8d29d22e99 | ||
![]() |
9c6e527d4b | ||
![]() |
077606c057 | ||
![]() |
a615f93060 | ||
![]() |
c562657f1e | ||
![]() |
7b3922f8e9 | ||
![]() |
c14382181f | ||
![]() |
b2183dfda7 | ||
![]() |
bb92054c86 | ||
![]() |
4e4a6eb5d7 | ||
![]() |
692acbd986 | ||
![]() |
901901825c | ||
![]() |
97f2de37e1 | ||
![]() |
967b6c33df | ||
![]() |
00c7a27732 | ||
![]() |
048ba353c4 | ||
![]() |
555e2f6de2 | ||
![]() |
ff8d5281f0 | ||
![]() |
4f9b994e73 | ||
![]() |
b8b0dc5c78 | ||
![]() |
d0cafab836 | ||
![]() |
24d7c5ebe3 | ||
![]() |
dc6decefb5 | ||
![]() |
25d7e48077 | ||
![]() |
b0b8f37240 | ||
![]() |
188e4e1b92 | ||
![]() |
9d5273bb15 | ||
![]() |
3c0fae74f1 | ||
![]() |
86dae6d4c7 | ||
![]() |
d06600aeb0 | ||
![]() |
895a3d1f39 | ||
![]() |
381ef5c683 | ||
![]() |
62097897be | ||
![]() |
2d2c47ba49 | ||
![]() |
89cdfc9194 | ||
![]() |
ad60ea9e0e | ||
![]() |
a7350475e8 | ||
![]() |
f3d7c9cff9 | ||
![]() |
906cbeed61 | ||
![]() |
0fccb0fc86 | ||
![]() |
8100cefd4c | ||
![]() |
d7e99a3f86 | ||
![]() |
6af944fe2c | ||
![]() |
12fc394b92 | ||
![]() |
53814fefc1 | ||
![]() |
e87a01c80b | ||
![]() |
21d7c1a850 | ||
![]() |
e33c58297d | ||
![]() |
5350120db4 | ||
![]() |
0997cf7fee | ||
![]() |
af3aae7295 | ||
![]() |
98e219da4b | ||
![]() |
fba022cc06 | ||
![]() |
3f6c6f1dd9 | ||
![]() |
ebc2e7221b | ||
![]() |
7cb30ced23 | ||
![]() |
7b449ac56c | ||
![]() |
724953101d | ||
![]() |
8734477d52 | ||
![]() |
ec8ba4b5f9 | ||
![]() |
2250865eb6 | ||
![]() |
847a3bbee3 | ||
![]() |
410a002ddd | ||
![]() |
8766db2593 | ||
![]() |
e362227514 | ||
![]() |
da311f266d | ||
![]() |
f5a4e996a8 | ||
![]() |
a7f083897f | ||
![]() |
e2105dc721 | ||
![]() |
b64548ee1f | ||
![]() |
53425fa721 | ||
![]() |
048f035d30 | ||
![]() |
b32c837df9 | ||
![]() |
dd03a76d51 | ||
![]() |
806a666950 | ||
![]() |
b240a5e819 | ||
![]() |
fe823b3553 | ||
![]() |
d380d30ef4 | ||
![]() |
1fe5b3e7d5 | ||
![]() |
a8df208a5c | ||
![]() |
f3f3c94831 | ||
![]() |
6e06648f7a | ||
![]() |
afb41f715b | ||
![]() |
19d26dde92 | ||
![]() |
4acb902423 | ||
![]() |
626516d12e | ||
![]() |
1c94df2553 |
35
.cvsignore
35
.cvsignore
@@ -1,35 +0,0 @@
|
|||||||
Makefile
|
|
||||||
Makefile.in
|
|
||||||
aclocal.m4
|
|
||||||
confdefs.h
|
|
||||||
config.cache
|
|
||||||
config.guess
|
|
||||||
config.h
|
|
||||||
config.log
|
|
||||||
config.status
|
|
||||||
config.sub
|
|
||||||
configure
|
|
||||||
configure.scan
|
|
||||||
libtool
|
|
||||||
ltconfig
|
|
||||||
ltmain.sh
|
|
||||||
stamp-h
|
|
||||||
stamp-h.in
|
|
||||||
stamp-h1
|
|
||||||
stamp.h
|
|
||||||
version.h
|
|
||||||
config.h.in
|
|
||||||
install-sh
|
|
||||||
missing
|
|
||||||
mkinstalldirs
|
|
||||||
INSTALL
|
|
||||||
intl
|
|
||||||
ABOUT-NLS
|
|
||||||
COPYING
|
|
||||||
intltool-*
|
|
||||||
metacity.spec
|
|
||||||
autom4te.cache
|
|
||||||
compile
|
|
||||||
depcomp
|
|
||||||
omf.make
|
|
||||||
xmldocs.make
|
|
53
.gitignore
vendored
53
.gitignore
vendored
@@ -3,6 +3,7 @@ Makefile.in
|
|||||||
Makefile.in.in
|
Makefile.in.in
|
||||||
aclocal.m4
|
aclocal.m4
|
||||||
autom4te.cache
|
autom4te.cache
|
||||||
|
build-aux
|
||||||
compile
|
compile
|
||||||
config.guess
|
config.guess
|
||||||
config.h
|
config.h
|
||||||
@@ -19,11 +20,11 @@ libtool
|
|||||||
ltmain.sh
|
ltmain.sh
|
||||||
missing
|
missing
|
||||||
.deps
|
.deps
|
||||||
src/50-mutter-navigation.xml
|
50-mutter-navigation.xml
|
||||||
src/50-mutter-system.xml
|
50-mutter-system.xml
|
||||||
src/50-mutter-windows.xml
|
50-mutter-windows.xml
|
||||||
src/mutter.desktop
|
mutter.desktop
|
||||||
src/mutter-wayland.desktop
|
mutter-wayland.desktop
|
||||||
*.o
|
*.o
|
||||||
*.a
|
*.a
|
||||||
*.lo
|
*.lo
|
||||||
@@ -32,10 +33,6 @@ src/mutter-wayland.desktop
|
|||||||
*.swp
|
*.swp
|
||||||
*.gir
|
*.gir
|
||||||
*.typelib
|
*.typelib
|
||||||
tidy-enum-types.[ch]
|
|
||||||
tidy-marshal.[ch]
|
|
||||||
stamp-tidy-enum-types.h
|
|
||||||
stamp-tidy-marshal.h
|
|
||||||
stamp-h1
|
stamp-h1
|
||||||
*.gmo
|
*.gmo
|
||||||
*.make
|
*.make
|
||||||
@@ -44,10 +41,12 @@ stamp-it
|
|||||||
.intltool-merge-cache
|
.intltool-merge-cache
|
||||||
POTFILES
|
POTFILES
|
||||||
po/*.pot
|
po/*.pot
|
||||||
50-metacity-desktop-key.xml
|
|
||||||
50-metacity-key.xml
|
|
||||||
libmutter.pc
|
libmutter.pc
|
||||||
mutter
|
mutter
|
||||||
|
mutter-restart-helper
|
||||||
|
mutter-test-client
|
||||||
|
mutter-test-runner
|
||||||
|
mutter-all.test
|
||||||
org.gnome.mutter.gschema.valid
|
org.gnome.mutter.gschema.valid
|
||||||
org.gnome.mutter.gschema.xml
|
org.gnome.mutter.gschema.xml
|
||||||
org.gnome.mutter.wayland.gschema.valid
|
org.gnome.mutter.wayland.gschema.valid
|
||||||
@@ -56,34 +55,24 @@ testasyncgetprop
|
|||||||
testboxes
|
testboxes
|
||||||
testgradient
|
testgradient
|
||||||
m4/*
|
m4/*
|
||||||
mutter-grayscale
|
|
||||||
mutter-mag
|
|
||||||
mutter-message
|
|
||||||
mutter-window-demo
|
|
||||||
focus-window
|
|
||||||
test-attached
|
|
||||||
test-focus
|
|
||||||
test-gravity
|
|
||||||
test-resizing
|
|
||||||
test-size-hints
|
|
||||||
# We can't say just "wm-tester" here or it will ignore the directory
|
|
||||||
# rather than the binary
|
|
||||||
src/wm-tester/wm-tester
|
|
||||||
INSTALL
|
INSTALL
|
||||||
mkinstalldirs
|
mkinstalldirs
|
||||||
src/mutter-enum-types.[ch]
|
meta-enum-types.[ch]
|
||||||
src/stamp-mutter-enum-types.h
|
src/stamp-meta-enum-types.h
|
||||||
src/mutter-marshal.[ch]
|
|
||||||
src/stamp-mutter-marshal.h
|
|
||||||
src/meta-dbus-display-config.[ch]
|
src/meta-dbus-display-config.[ch]
|
||||||
src/meta-dbus-idle-monitor.[ch]
|
src/meta-dbus-idle-monitor.[ch]
|
||||||
src/meta-dbus-login1.[ch]
|
src/meta-dbus-login1.[ch]
|
||||||
src/gtk-shell-protocol.c
|
src/gtk-shell-protocol.c
|
||||||
src/gtk-shell-server-protocol.h
|
src/gtk-shell-server-protocol.h
|
||||||
src/xdg-shell-protocol.c
|
src/xdg-shell-unstable-v*-protocol.c
|
||||||
src/xdg-shell-server-protocol.h
|
src/xdg-shell-unstable-v*-server-protocol.h
|
||||||
src/xserver-protocol.c
|
src/pointer-gestures-unstable-v*-protocol.c
|
||||||
src/xserver-server-protocol.h
|
src/pointer-gestures-unstable-v*-server-protocol.h
|
||||||
|
src/relative-pointer-unstable-v*-protocol.c
|
||||||
|
src/relative-pointer-unstable-v*-server-protocol.h
|
||||||
|
src/pointer-constraints-unstable-v*-protocol.c
|
||||||
|
src/pointer-constraints-unstable-v*-server-protocol.h
|
||||||
|
src/meta/meta-version.h
|
||||||
doc/reference/*.args
|
doc/reference/*.args
|
||||||
doc/reference/*.bak
|
doc/reference/*.bak
|
||||||
doc/reference/*.hierarchy
|
doc/reference/*.hierarchy
|
||||||
|
13
Makefile.am
13
Makefile.am
@@ -1,10 +1,11 @@
|
|||||||
|
|
||||||
SUBDIRS=src po doc
|
SUBDIRS = data src po doc
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||||
|
|
||||||
DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
|
DISTCLEANFILES = \
|
||||||
|
intltool-extract \
|
||||||
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
|
intltool-merge \
|
||||||
|
intltool-update \
|
||||||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
po/stamp-it \
|
||||||
|
po/.intltool-merge-cache
|
||||||
|
452
NEWS
452
NEWS
@@ -1,3 +1,455 @@
|
|||||||
|
3.19.4
|
||||||
|
======
|
||||||
|
* Fix updating stacking order when setting transient_for [Jonas; #755606]
|
||||||
|
* Support screen rotation when supported by the driver [Carlos; #745079]
|
||||||
|
* Protect against broken WM_CLASS property implementations [Sebastian; #759658]
|
||||||
|
* Handle wl_pointer v5 events on wayland [Carlos; #760637]
|
||||||
|
* Implement DND actions on wayland [Carlos; #760805]
|
||||||
|
* Misc. bug fixes [Jonas, Rui, Ray, Marek; #754711, #756789, #759297, #758613,
|
||||||
|
#760330, #760476, #759222, #760670]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl, Marek Chalupa, Carlos Garnacho, Sebastian Keller, Rui Matos,
|
||||||
|
Florian Müllner, Jasper St. Pierre, Ray Strode
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Aurimas Černius [lt]
|
||||||
|
|
||||||
|
3.19.3
|
||||||
|
======
|
||||||
|
* Correct refresh rate units on KMS/Wayland [Daniel; #758653]
|
||||||
|
* Fix crash when initial cursor position is not on a monitor [Marek; #756698]
|
||||||
|
* Fix crash when more CRTs are enabled than outputs connected [Rui; #751638]
|
||||||
|
* Fix touch pointer emulation on wayland [Carlos; #756754]
|
||||||
|
* Allow minimizing windows that don't advertise supporting it [Jasper; #758186]
|
||||||
|
* Force 2-finger scroll by default if available [Bastien; #759304]
|
||||||
|
* Fix crash during XWayland initialization [Marek; #751845]
|
||||||
|
* Ensure to send a ConfigureNotify to just mapped windows [Rui; #759492]
|
||||||
|
* Misc. bug fixes and cleanups [Carlos, Jonas, Lionel; #758239, #758633,
|
||||||
|
#755503, #759374]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl, Marek Chalupa, Carlos Garnacho, Lionel Landwerlin, Rui Matos,
|
||||||
|
Bastien Nocera, Daniel Stone, Jasper St. Pierre
|
||||||
|
|
||||||
|
3.19.2
|
||||||
|
======
|
||||||
|
* Fix crash on monitor unplug [Rui; #756796]
|
||||||
|
* Exit cleanly on initialization errors [Owen; #757311]
|
||||||
|
* Allow to determine backend setting from session type [Ray; #741666]
|
||||||
|
* Fix DRM device detection for non-PCI devices [Alban; #754911]
|
||||||
|
* Don't force placement of windows without buffer on wayland [Marek; #751887]
|
||||||
|
* Fix initialization of bypass compositor hint [Rui; #758544]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Alban Browaeys, Marek Chalupa, Rui Matos, Florian Müllner, Ray Strode,
|
||||||
|
Owen W. Taylor
|
||||||
|
|
||||||
|
3.19.1
|
||||||
|
======
|
||||||
|
* wayland: Allow to trigger popups through keyboard/touch [Carlos; #756296]
|
||||||
|
* Fix modifiers-only input source switching on Ubuntu [Alberts; #756543]
|
||||||
|
* Misc. bug fixes [Jonas, Rui, Giovanni, Florian; #756675, #756660, #746420,
|
||||||
|
#756548, #756796, #757101, #757148]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl, Giovanni Campagna, Carlos Garnacho, Rui Matos,
|
||||||
|
Alberts Muktupāvels, Florian Müllner
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Daniel Șerbănescu [ro]
|
||||||
|
|
||||||
|
3.18.1
|
||||||
|
======
|
||||||
|
* Misc. crash fixes [Jonas, Rui, Carlos, Owen, Florian; #755096, #754979,
|
||||||
|
#755490, #754357, #745785, #756642]
|
||||||
|
* Improve HiDPI support on wayland [Jonas; #755097]
|
||||||
|
* Fix doubly-scaled cursor on XWayland HiDPI [Jonas; #755099]
|
||||||
|
* Stop hiding titlebar buttons in dialogs [Florian; #641630]
|
||||||
|
* Add support for fullscreen/unfullscreen animations [Cosimo; #707248]
|
||||||
|
* Misc. bug fixes [Rui, Colin, Florian; #743339, #752047, #756074, #756649]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl, Cosimo Cecchi, Carlos Garnacho, Rui Matos, Florian Müllner,
|
||||||
|
Jasper St. Pierre, Colin Walters, Owen W. Taylor
|
||||||
|
|
||||||
|
3.18.0
|
||||||
|
======
|
||||||
|
* Misc. fixes [Florian, Jonas; #753434]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl, Florian Müllner
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Rūdolfs Mazurs [lv]
|
||||||
|
|
||||||
|
3.17.92
|
||||||
|
=======
|
||||||
|
* Don't omit the background color for backgrounds that don't fill the screen
|
||||||
|
[Ray; #754476]
|
||||||
|
* Fix up key state on FocusIn when running nested [Owen; #753948]
|
||||||
|
* Find the right DRM device instead of hardcoding card0 [Marek; #753434]
|
||||||
|
* Scale cursor on HiDPI screens [Jonas; #744932]
|
||||||
|
* Misc. fixes and cleanups [Lan, Jonas, Javier, Olivier; #754545, #754215,
|
||||||
|
#754621, #754715]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl, Marek Chalupa, Olivier Fourdan, Javier Jardón, Ting-Wei Lan,
|
||||||
|
Ray Strode, Owen W. Taylor
|
||||||
|
|
||||||
|
3.17.91
|
||||||
|
=======
|
||||||
|
* Send error on pointer-gesture protocol version mismatch [Jonas; #753855]
|
||||||
|
* Misc. cleanups [Jonas; #744932]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Chao-Hsiung Liao [zh_TW], Piotr Drąg [pl]
|
||||||
|
|
||||||
|
3.17.90
|
||||||
|
=======
|
||||||
|
* Fix glitch with some fullscreen apps [Rui; #753020]
|
||||||
|
* Fix screen update issue with NVidia driver [Aaron, Rui; #728464]
|
||||||
|
* Only call frame callbacks for surfaces that get drawn [Adel; #739163]
|
||||||
|
* Misc. bug fixes and cleanups [Jonas, Rui, Ting-Wei; #753222, #752753, #753237,
|
||||||
|
#753380, #744104, #744932]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl, Adel Gadllah, Carlos Garnacho, Ting-Wei Lan, Rui Matos,
|
||||||
|
Florian Müllner, Aaron Plattner, Jasper St. Pierre
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Akom Chotiphantawanon [th]
|
||||||
|
|
||||||
|
3.17.4
|
||||||
|
======
|
||||||
|
* nested: Allow basic configuration of dummy outputs [Jonas; #747089]
|
||||||
|
* Send wl_surface.enter and wl_surface.leave on output changes [Jonas; #744453]
|
||||||
|
* Improve HiDPI handling on wayland [Jonas; #745655, #744934]
|
||||||
|
* Implement compositor-side animated cursors [Carlos; #752342]
|
||||||
|
* Misc. bug fixes [Peter, Marek, Carlos, Matthias, Rui; #750816, #751884,
|
||||||
|
#752248, #752551, #752552, #752673, #752674]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl, Marek Chalupa, Matthias Clasen, Carlos Garnacho, Peter Hutterer,
|
||||||
|
Rui Matos, Florian Müllner, Jasper St. Pierre
|
||||||
|
|
||||||
|
3.17.3
|
||||||
|
======
|
||||||
|
* Add X11/wayland clipboard interaction [Carlos; #738312]
|
||||||
|
* Support VM monitor layout hints on wayland [Thomas; #750363]
|
||||||
|
* Misc. bug fixes [Rui, Jonas, Olivier, Carlos, Ting-Wei, Peter, Florian;
|
||||||
|
#749994, #750256, #749716, #748705, #750552, #751036, #750007, #751136,
|
||||||
|
#750552, #751471, #751715, #750680]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl, Dave Airlie, Cosimo Cecchi, Olivier Fourdan, Carlos Garnacho,
|
||||||
|
Thomas Hellstrom, Peter Hutterer, Ting-Wei Lan, Jasper Lievisse Adriaanse,
|
||||||
|
Rui Matos, Florian Müllner, Jasper St. Pierre
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Marek Černocký [cs], Christian Kirbach [de], Pedro Albuquerque [pt]
|
||||||
|
|
||||||
|
3.17.2
|
||||||
|
======
|
||||||
|
* Honor default value for click method setting [Rui; #746290]
|
||||||
|
* Add X11/wayland clipboard interoperation [Carlos; #738312]
|
||||||
|
* Misc. bug fixes [Rui; #749076, #749711]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Carlos Garnacho, Rui Matos, Jasper St. Pierre
|
||||||
|
|
||||||
|
3.17.1
|
||||||
|
======
|
||||||
|
* Add public method to get neighboring monitor [Florian; #633994]
|
||||||
|
* Apply the right settings to the right input devices [Carlos; #747886]
|
||||||
|
* Fix scroll button setting [Ondrej; #747967]
|
||||||
|
* Add support for modal hint on wayland [Jonas; #745720]
|
||||||
|
* Don't reset idle time for non-hardware events [Rui; #748541]
|
||||||
|
* Misc. bug fixes [Ray, Rui; #748380, #748478]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl, Carlos Garnacho, Ondrej Holy, Rui Matos, Florian Müllner,
|
||||||
|
Jasper St. Pierre, Ray Strode, Tomeu Vizoso
|
||||||
|
|
||||||
|
3.16.1
|
||||||
|
======
|
||||||
|
* Add function to refresh all background instances [Rui; #739178]
|
||||||
|
* Fix swapped scroll methods on wayland [Ondrej; #746870]
|
||||||
|
* Manually activate stage to fix accessibility on wayland [Ray, Rui; #746670]
|
||||||
|
* Center pointer on primary monitor on startup [Carlos; #746896]
|
||||||
|
* wayland: Reword synchronized state application semantics [Jonas; #743617]
|
||||||
|
* Ensure input settings are applied on startup [Rui; #747434]
|
||||||
|
* Misc. bug fixes [Jonas, Giovanni, Calvin, Ray, Rui; #744932, #746509, #746692,
|
||||||
|
#746510, #746545, #747263]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl, Giovanni Campagna, Carlos Garnacho, Ondrej Holy, Rui Matos,
|
||||||
|
Jasper St. Pierre, Ray Strode, Calvin Walton
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Khaled Hosny [ar], Marek Černocký [cs]
|
||||||
|
|
||||||
|
3.16.0
|
||||||
|
======
|
||||||
|
* wayland: Don't skip notifying about initial maximized state [Jonas; #745303]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Kjartan Maraas [nb], Jiri Grönroos [fi], Andika Triwidada [id],
|
||||||
|
Inaki Larranaga Murgoitio [eu], Ask H. Larsen [da], Muhammet Kara [tr]
|
||||||
|
|
||||||
|
3.15.92
|
||||||
|
=======
|
||||||
|
* Ensure pointer visibility on monitor changes [Rui, Marek; #745121, #745752]
|
||||||
|
* Fix geometry of shaded windows [Florian; #746145]
|
||||||
|
* Take over cursor visibility handling from gsd [Carlos; #712775]
|
||||||
|
* Fix touch interaction on window decorations [Carlos; #745335]
|
||||||
|
* Add options for libinput_config_click_method [Carlos; #746290]
|
||||||
|
* Scale window decorations on HiDPI displays [Florian; #744354]
|
||||||
|
* Misc. bug fixes [Carlos, Ray, Rui; #745163, #746295, #746098, #745734]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Marek Chalupa, Carlos Garnacho, Rui Matos, Florian Müllner,
|
||||||
|
Jasper St. Pierre, Ray Strode
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Piotr Drąg [pl], Milo Casagrande [it], Changwoo Ryu [ko],
|
||||||
|
Daniel Korostil [uk], Baurzhan Muftakhidinov [kk], Trần Ngọc Quân [vi],
|
||||||
|
Alexander Shopov [bg], Jordi Mas [ca], Samir Ribic [bs], A S Alam [pa],
|
||||||
|
Matej Urbančič [sl]
|
||||||
|
|
||||||
|
3.15.91
|
||||||
|
=======
|
||||||
|
* wayland: Fix nested compositor mode [Jonas; #745401]
|
||||||
|
* wayland: Fix pointer constraining [Marek; #727337]
|
||||||
|
* wayland: Fix input region on HiDPI [Jonas; #744933]
|
||||||
|
* Allow themes to style buttons differently based on function [Horst; #745108]
|
||||||
|
* Misc. bug fixes and cleanups [Ray, Rui, Alban; #745141, #745118, #745476,
|
||||||
|
#745442]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl, Alban Browaeys, Marek Chalupa, Horst, Rui Matos,
|
||||||
|
Jasper St. Pierre, Ray Strode
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Chao-Hsiung Liao [zh_TW], Efstathios Iosifidis [el], Dušan Kazik [sk],
|
||||||
|
Balázs Úr [hu], Daniel Mustieles [es], Claude Paroz [fr], Stas Solovey [ru],
|
||||||
|
Yosef Or Boczko [he], Rafael Ferreira [pt_BR], Aurimas Černius [lt],
|
||||||
|
Fran Dieguez [gl], Anders Jonsson [sv], Мирослав Николић [sr, sr@latin]
|
||||||
|
|
||||||
|
3.15.90
|
||||||
|
=======
|
||||||
|
* Initialize MetaOutput even when we can't get the EDID [Rui; #743412]
|
||||||
|
* Expose MetaMonitorManager to introspection [Rui; #743745]
|
||||||
|
* Fix flash on unredirection [Chris; #743858]
|
||||||
|
* Update xdg-shell implementation to v5 [Jonas; #744452]
|
||||||
|
* Do not try to use seat devices that aren't (yet) present [Ray; #744640]
|
||||||
|
* Add keybindings for switching to VT8-VT12 [Ray; #744800]
|
||||||
|
* Misc bug fixes [Jonas, Cosimo; #743678, #744500]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl, Cosimo Cecchi, Carlos Garnacho, Rui Matos, Jasper St. Pierre,
|
||||||
|
Ray Strode, Chris Wilson
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Yosef Or Boczko [he], Yuri Myasoedov [ru], Kristjan SCHMIDT [eo],
|
||||||
|
Matej Urbančič [sl], Dušan Kazik [sk]
|
||||||
|
|
||||||
|
3.15.4
|
||||||
|
======
|
||||||
|
* Use GTK+ theme for window decorations instead of metacity [Florian; #741917]
|
||||||
|
* Export the same EDID information on X11 and wayland [Carlos; #742882]
|
||||||
|
* Apply input device configuration on wayland [Carlos; #739397]
|
||||||
|
* Implement pointer barriers on wayland [Jonas; #706655]
|
||||||
|
* Misc. bug fixes (Ting-Wei, Rui, Ikey, Florian, Marek, Jonas; #741829,
|
||||||
|
#738630, #737463, #698995, #727893, #742825, #742824, #742841, #743173,
|
||||||
|
#743189, #743217, #743254]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl, Giovanni Campagna, Marek Chalupa, Ikey Doherty, Adel Gadllah,
|
||||||
|
Carlos Garnacho, Ting-Wei Lan, Rui Matos, Florian Müllner, Jasper St. Pierre,
|
||||||
|
Rico Tzschichholz
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Matej Urbančič [sl], Balázs Úr [hu], Marek Černocký [cs],
|
||||||
|
Inaki Larranaga Murgoitio [eu], Rafael Ferreira [pt_BR],
|
||||||
|
Daniel Mustieles [es], Fran Dieguez [gl]
|
||||||
|
|
||||||
|
3.15.3
|
||||||
|
======
|
||||||
|
* Don't leave left-over frames queued [Owen; #738686]
|
||||||
|
* Set CRTC configuration even if it might be redundant [Rui; #740838]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Rui Matos, Jasper St. Pierre, Rico Tzschichholz, Owen W. Taylor
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Trần Ngọc Quân [vi], Muhammet Kara [tr]
|
||||||
|
|
||||||
|
3.15.2
|
||||||
|
======
|
||||||
|
* Don't enable hiDPI on monitors with broken EDID [Bastien; #734839]
|
||||||
|
* Prevent crash applying monitor config for a closed lid [Rui; #739450]
|
||||||
|
* Fix "flicker" during startup transition [Ray; #740377]
|
||||||
|
* Misc. bug fixes [Lan, Florian, Carlos; #731521, #740133, #738890]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Emmanuele Bassi, Carlos Garnacho, Jonathon Jongsma, Ting-Wei Lan, Rui Matos,
|
||||||
|
Florian Müllner, Bastien Nocera, Jasper St. Pierre, Ray Strode
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Kjartan Maraas [nb]
|
||||||
|
|
||||||
|
3.15.1
|
||||||
|
======
|
||||||
|
* Use GResources for theme loading [Cosimo; #736936]
|
||||||
|
* Fix headerbar drag getting stuck on xwayland [Carlos; #738411]
|
||||||
|
* Fix wayland hiDPI regressions [Adel; #739161]
|
||||||
|
* Misc bug fixes and cleanups [Jasper, Rui, Carlos; #662962, #738630, #738888,
|
||||||
|
#738890]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Cosimo Cecchi, Adel Gadllah, Carlos Garnacho, Rui Matos, Florian Müllner,
|
||||||
|
Jasper St. Pierre
|
||||||
|
|
||||||
|
3.14.1
|
||||||
|
======
|
||||||
|
* Fix move-titlebar-onscreen function [Florian; #736915]
|
||||||
|
* Fix stacking of the guard window [Owen; #737233]
|
||||||
|
* Fix keycode lookup for non-default layouts [Rui; #737134]
|
||||||
|
* Fix workspaces-only-on-primary handling [Florian; #737178]
|
||||||
|
* Don't unstick sticky windows on workspace removal [Florian; #737625]
|
||||||
|
* Do not auto-minimize fullscreen windows [Jasper; #705177]
|
||||||
|
* Upload keymap to newly added keyboard devices [Rui; #737673]
|
||||||
|
* Apply keyboard repeat settings [Rui; #728055]
|
||||||
|
* Don't send pressed keys on enter [Rui; #727178]
|
||||||
|
* Fix build without wayland/native [Rico; #738225]
|
||||||
|
* Send modifiers after the key event [Rui; #738238]
|
||||||
|
* Fix unredirect heuristic [Adel; #738271]
|
||||||
|
* Do not show system chrome over fullscreen windows [Florian; #693991]
|
||||||
|
* Misc. bug fixes [Florian, Adel, Tom; #737135, #737581, #738146, #738384]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Tom Beckmann, Adel Gadllah, Carlos Garnacho, Rui Matos, Florian Müllner,
|
||||||
|
Jasper St. Pierre, Rico Tzschichholz, Owen W. Taylor
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Krishnababu Krothapalli [te], Мирослав Николић [sr, sr@latin],
|
||||||
|
Alexander Shopov [bg], Saibal Ray [bn_IN], Milo Casagrande [it],
|
||||||
|
Rūdolfs Mazurs [lv]
|
||||||
|
|
||||||
|
3.14.0
|
||||||
|
======
|
||||||
|
* Fix placement of popup windows on wayland [Jasper; #736812]
|
||||||
|
* Only increment serial once per event [Jasper; #736840]
|
||||||
|
* Fix window positioning regression with non-GTK+ toolkits [Owen; #736719]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jasper St. Pierre, Owen W. Taylor
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Saibal Ray [bn_IN], Dušan Kazik [sk], Manoj Kumar Giri [or],
|
||||||
|
Christian Kirbach [de], Ask H. Larsen [da], YunQiang Su [zh_CN],
|
||||||
|
Bernd Homuth [de], Shankar Prasad [kn], Petr Kovar [cs], Rajesh Ranjan [hi]
|
||||||
|
|
||||||
|
3.13.92
|
||||||
|
=======
|
||||||
|
* Rewrite background code [Owen; #735637, #736568]
|
||||||
|
* Fix size in nested mode [Owen; #736279]
|
||||||
|
* Fix destroy animation of background windows [Florian; #735927]
|
||||||
|
* Wire keymap changes up to the wayland frontend [Rui; #736433]
|
||||||
|
* Add a test framework and stacking tests [Owen; #736505]
|
||||||
|
* Simplify handling of the merged X and wayland stack [Owen; #736559]
|
||||||
|
* Fix cursor size on HiDPI [Adel; #729337]
|
||||||
|
* Misc. bug fixes [Owen; #735632, #736589, #736694]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Adel Gadllah, Rui Matos, Florian Müllner, Jasper St. Pierre, Owen W. Taylor
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Andika Triwidada [id], Piotr Drąg [pl], Changwoo Ryu [ko],
|
||||||
|
Kjartan Maraas [nb], Ville-Pekka Vainio [fi], Yuri Myasoedov [ru],
|
||||||
|
Aurimas Černius [lt], Balázs Úr [hu], Sweta Kothari [gu], A S Alam [pa],
|
||||||
|
Sandeep Sheshrao Shedmake [mr], Shantha kumar [ta], Gil Forcada [ca],
|
||||||
|
Carles Ferrando [ca@valencia], Mattias Eriksson [sv]
|
||||||
|
|
||||||
|
3.13.91
|
||||||
|
=======
|
||||||
|
* Misc. bug fixes [Carlos; #735452]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Adel Gadllah, Carlos Garnacho, Rui Matos, Jasper St. Pierre,
|
||||||
|
Rico Tzschichholz
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Chao-Hsiung Liao po/zh_HK, zh_TW.po, Enrico Nicoletto [pt_BR],
|
||||||
|
Kjartan Maraas [nb], Fran Diéguez [gl], Yosef Or Boczko [he],
|
||||||
|
Maria Mavridou [el], Claude Paroz [fr]
|
||||||
|
|
||||||
|
3.13.90
|
||||||
|
=======
|
||||||
|
* Only call XSync() once per frame [Rui; #728464]
|
||||||
|
* Update capabilities on device list changes [Carlos; #733563]
|
||||||
|
* Make use of GLSL optional [Adel; #733623]
|
||||||
|
* Handle gestures and touch events on wayland [Carlos; #733631]
|
||||||
|
* Add support for unminimize compositor effects [Cosimo; #733789]
|
||||||
|
* Always set the frame background to None [Giovanni; #734054]
|
||||||
|
* Add backend methods to handle keymaps [Rui; #734301]
|
||||||
|
* Actually mark revalidated MetaTextureTower levels as valid [Owen; #734400]
|
||||||
|
* Rely on explicit -backward switcher keybindings instead of <shift>-magic
|
||||||
|
[Christophe; #732295, #732385]
|
||||||
|
* Misc. bug fixes and cleanups [Rui, Adel, Christophe; #727178, #734852,
|
||||||
|
#734960]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Emmanuele Bassi, Giovanni Campagna, Cosimo Cecchi, Piotr Drąg,
|
||||||
|
Christophe Fergeau, Adel Gadllah, Carlos Garnacho, Rui Matos,
|
||||||
|
Florian Müllner, Jasper St. Pierre, Rico Tzschichholz, Olav Vitters,
|
||||||
|
Owen W. Taylor
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Kjartan Maraas [nb], Inaki Larranaga Murgoitio [eu], Lasse Liehu [fi],
|
||||||
|
ngoswami [as], Daniel Mustieles [es]
|
||||||
|
|
||||||
|
3.13.4
|
||||||
|
======
|
||||||
|
* Fix move/resize operations for wayland clients [Marek; #731237]
|
||||||
|
* Add ::first-frame signal to MetaWindowActor [Owen; #732343]
|
||||||
|
* Handle keysyms without the XF86 prefix [Owen; #727993]
|
||||||
|
* Add touch gesture support [Carlos]
|
||||||
|
* Fix a deadlock when exiting [Owen; #733068]
|
||||||
|
* Add framework for restarting the compositor with nice visuals
|
||||||
|
[Owen; #733026]
|
||||||
|
* Toggle seat capabilities on VT switch [Carlos; #733563]
|
||||||
|
* Misc bug fixes [Florian, Owen; #732695, #732350]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Tom Beckmann, Giovanni Campagna, Marek Chalupa, Adel Gadllah,
|
||||||
|
Carlos Garnacho, Florian Müllner, Jasper St. Pierre, Rico Tzschichholz,
|
||||||
|
Owen W. Taylor
|
||||||
|
|
||||||
|
Translations:
|
||||||
|
Yuri Myasoedov [ru], Fran Diéguez [gl], Aurimas Černius [lt], MarMav [el],
|
||||||
|
Enrico Nicoletto [pt_BR]
|
||||||
|
|
||||||
|
3.13.3
|
||||||
|
======
|
||||||
|
* Improve behavior of window buttons with compositor menus [Florian; #731058]
|
||||||
|
* Implement touch support on wayland [Carlos; #724442]
|
||||||
|
* Update window shadows [Nikita; #731866]
|
||||||
|
* Keep windows on the preferred output [Florian; #731760]
|
||||||
|
* Misc bug fixes [Jonas, Florian, Jasper; #729601, #730681, #731353, #731332,
|
||||||
|
#730527, #662962]
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Jonas Ådahl, Nikita Churaev, Carlos Garnacho, Florian Müllner,
|
||||||
|
Jasper St. Pierre, Rico Tzschichholz
|
||||||
|
|
||||||
3.13.2
|
3.13.2
|
||||||
======
|
======
|
||||||
* Add basic HiDPI support on wayland [Adel; #728902]
|
* Add basic HiDPI support on wayland [Adel; #728902]
|
||||||
|
@@ -4,8 +4,7 @@
|
|||||||
srcdir=`dirname $0`
|
srcdir=`dirname $0`
|
||||||
test -z "$srcdir" && srcdir=.
|
test -z "$srcdir" && srcdir=.
|
||||||
|
|
||||||
PKG_NAME="mutter"
|
REQUIRED_AUTOMAKE_VERSION=1.11
|
||||||
REQUIRED_AUTOMAKE_VERSION=1.10
|
|
||||||
|
|
||||||
(test -f $srcdir/configure.ac \
|
(test -f $srcdir/configure.ac \
|
||||||
&& test -d $srcdir/src) || {
|
&& test -d $srcdir/src) || {
|
||||||
@@ -19,4 +18,4 @@ which gnome-autogen.sh || {
|
|||||||
echo "your distribution's package manager)."
|
echo "your distribution's package manager)."
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
|
. gnome-autogen.sh
|
||||||
|
153
configure.ac
153
configure.ac
@@ -1,9 +1,8 @@
|
|||||||
AC_PREREQ(2.50)
|
AC_PREREQ(2.62)
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
|
||||||
|
|
||||||
m4_define([mutter_major_version], [3])
|
m4_define([mutter_major_version], [3])
|
||||||
m4_define([mutter_minor_version], [13])
|
m4_define([mutter_minor_version], [19])
|
||||||
m4_define([mutter_micro_version], [2])
|
m4_define([mutter_micro_version], [4])
|
||||||
|
|
||||||
m4_define([mutter_version],
|
m4_define([mutter_version],
|
||||||
[mutter_major_version.mutter_minor_version.mutter_micro_version])
|
[mutter_major_version.mutter_minor_version.mutter_micro_version])
|
||||||
@@ -14,6 +13,7 @@ AC_INIT([mutter], [mutter_version],
|
|||||||
[http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])
|
[http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])
|
||||||
|
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
|
AC_CONFIG_AUX_DIR([build-aux])
|
||||||
AC_CONFIG_SRCDIR(src/core/display.c)
|
AC_CONFIG_SRCDIR(src/core/display.c)
|
||||||
AC_CONFIG_HEADERS(config.h)
|
AC_CONFIG_HEADERS(config.h)
|
||||||
|
|
||||||
@@ -40,45 +40,47 @@ GETTEXT_PACKAGE=mutter
|
|||||||
AC_SUBST(GETTEXT_PACKAGE)
|
AC_SUBST(GETTEXT_PACKAGE)
|
||||||
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain])
|
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain])
|
||||||
|
|
||||||
IT_PROG_INTLTOOL([0.34.90])
|
LT_PREREQ([2.2.6])
|
||||||
|
LT_INIT([disable-static])
|
||||||
|
IT_PROG_INTLTOOL([0.41])
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
AC_ISC_POSIX
|
AC_PROG_CC_C_O
|
||||||
|
AC_PROG_INSTALL
|
||||||
|
AC_PROG_SED
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
AC_LIBTOOL_WIN32_DLL
|
PKG_PROG_PKG_CONFIG([0.21])
|
||||||
AM_PROG_LIBTOOL
|
|
||||||
|
|
||||||
# Sets GLIB_GENMARSHAL and GLIB_MKENUMS
|
# Sets GLIB_GENMARSHAL and GLIB_MKENUMS
|
||||||
AM_PATH_GLIB_2_0()
|
AM_PATH_GLIB_2_0()
|
||||||
|
|
||||||
#### Integer sizes
|
|
||||||
|
|
||||||
AC_CHECK_SIZEOF(char)
|
|
||||||
AC_CHECK_SIZEOF(short)
|
|
||||||
AC_CHECK_SIZEOF(long)
|
|
||||||
AC_CHECK_SIZEOF(int)
|
|
||||||
AC_CHECK_SIZEOF(void *)
|
|
||||||
AC_CHECK_SIZEOF(long long)
|
|
||||||
AC_CHECK_SIZEOF(__int64)
|
|
||||||
|
|
||||||
## byte order
|
|
||||||
AC_C_BIGENDIAN
|
|
||||||
|
|
||||||
CANBERRA_GTK=libcanberra-gtk3
|
CANBERRA_GTK=libcanberra-gtk3
|
||||||
CANBERRA_GTK_VERSION=0.26
|
CANBERRA_GTK_VERSION=0.26
|
||||||
|
|
||||||
CLUTTER_PACKAGE=clutter-1.0
|
CLUTTER_PACKAGE=clutter-1.0
|
||||||
|
|
||||||
MUTTER_PC_MODULES="
|
MUTTER_PC_MODULES="
|
||||||
gtk+-3.0 >= 3.9.11
|
gtk+-3.0 >= 3.19.8
|
||||||
gio-2.0 >= 2.25.10
|
gio-unix-2.0 >= 2.35.1
|
||||||
pango >= 1.2.0
|
pango >= 1.2.0
|
||||||
cairo >= 1.10.0
|
cairo >= 1.10.0
|
||||||
gsettings-desktop-schemas >= 3.7.3
|
gsettings-desktop-schemas >= 3.19.3
|
||||||
xcomposite >= 0.2 xfixes xext xdamage xi >= 1.6.0
|
$CLUTTER_PACKAGE >= 1.25.1
|
||||||
$CLUTTER_PACKAGE >= 1.17.5
|
|
||||||
cogl-1.0 >= 1.17.1
|
cogl-1.0 >= 1.17.1
|
||||||
upower-glib >= 0.99.0
|
upower-glib >= 0.99.0
|
||||||
gnome-desktop-3.0
|
gnome-desktop-3.0
|
||||||
|
xcomposite >= 0.2
|
||||||
|
xcursor
|
||||||
|
xdamage
|
||||||
|
xext
|
||||||
|
xfixes
|
||||||
|
xi >= 1.6.0
|
||||||
|
xkbfile
|
||||||
|
xkeyboard-config
|
||||||
|
xkbcommon >= 0.4.3
|
||||||
|
xkbcommon-x11
|
||||||
|
xrender
|
||||||
|
x11-xcb
|
||||||
|
xcb-randr
|
||||||
"
|
"
|
||||||
|
|
||||||
GLIB_GSETTINGS
|
GLIB_GSETTINGS
|
||||||
@@ -107,26 +109,18 @@ AC_ARG_WITH(libcanberra,
|
|||||||
[disable the use of libcanberra for playing sounds]),,
|
[disable the use of libcanberra for playing sounds]),,
|
||||||
with_libcanberra=auto)
|
with_libcanberra=auto)
|
||||||
|
|
||||||
AC_ARG_ENABLE(xsync,
|
|
||||||
AC_HELP_STRING([--disable-xsync],
|
|
||||||
[disable mutter's use of the XSync extension]),,
|
|
||||||
enable_xsync=auto)
|
|
||||||
|
|
||||||
AC_ARG_ENABLE(shape,
|
|
||||||
AC_HELP_STRING([--disable-shape],
|
|
||||||
[disable mutter's use of the shaped window extension]),,
|
|
||||||
enable_shape=auto)
|
|
||||||
|
|
||||||
AC_ARG_WITH([xwayland-path],
|
AC_ARG_WITH([xwayland-path],
|
||||||
[AS_HELP_STRING([--with-xwayland-path], [Absolute path for an X Wayland server])],
|
[AS_HELP_STRING([--with-xwayland-path], [Absolute path for an X Wayland server])],
|
||||||
[XWAYLAND_PATH="$withval"],
|
[XWAYLAND_PATH="$withval"],
|
||||||
[XWAYLAND_PATH="$bindir/Xwayland"])
|
[XWAYLAND_PATH="$bindir/Xwayland"])
|
||||||
|
|
||||||
AM_GLIB_GNU_GETTEXT
|
AC_ARG_ENABLE(installed_tests,
|
||||||
|
AS_HELP_STRING([--enable-installed-tests],
|
||||||
|
[Install test programs (default: no)]),,
|
||||||
|
[enable_installed_tests=no])
|
||||||
|
AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes)
|
||||||
|
|
||||||
## here we get the flags we'll actually use
|
## here we get the flags we'll actually use
|
||||||
# GRegex requires Glib-2.14.0
|
|
||||||
PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.14.0)
|
|
||||||
|
|
||||||
# Unconditionally use this dir to avoid a circular dep with gnomecc
|
# Unconditionally use this dir to avoid a circular dep with gnomecc
|
||||||
GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
|
GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
|
||||||
@@ -191,17 +185,48 @@ if test x$found_introspection != xno; then
|
|||||||
AC_SUBST(META_GIR)
|
AC_SUBST(META_GIR)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MUTTER_PC_MODULES="$MUTTER_PC_MODULES xcursor"
|
|
||||||
|
|
||||||
AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
|
|
||||||
AS_IF([test "x$WAYLAND_SCANNER" = "xno"],
|
|
||||||
AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols]))
|
|
||||||
AC_SUBST([WAYLAND_SCANNER])
|
|
||||||
AC_SUBST(XWAYLAND_PATH)
|
AC_SUBST(XWAYLAND_PATH)
|
||||||
|
|
||||||
MUTTER_PC_MODULES="$MUTTER_PC_MODULES clutter-wayland-1.0 clutter-wayland-compositor-1.0 clutter-egl-1.0 wayland-server >= 1.4.93 libdrm libsystemd"
|
|
||||||
PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)
|
PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)
|
||||||
|
|
||||||
|
MUTTER_NATIVE_BACKEND_MODULES="clutter-egl-1.0 libdrm libsystemd libinput gudev-1.0 gbm >= 10.3"
|
||||||
|
|
||||||
|
AC_ARG_ENABLE(native-backend,
|
||||||
|
AS_HELP_STRING([--disable-native-backend], [disable mutter native (KMS) backend]),,
|
||||||
|
enable_native_backend=auto
|
||||||
|
)
|
||||||
|
AS_IF([test "$enable_native_backend" = "yes"], [have_native_backend=yes],
|
||||||
|
[test "$enable_native_backend" = "auto"], PKG_CHECK_EXISTS([$MUTTER_NATIVE_BACKEND_MODULES], [have_native_backend=yes]))
|
||||||
|
|
||||||
|
AS_IF([test "$have_native_backend" = "yes"], [
|
||||||
|
PKG_CHECK_MODULES([MUTTER_NATIVE_BACKEND], [$MUTTER_NATIVE_BACKEND_MODULES])
|
||||||
|
AC_DEFINE([HAVE_NATIVE_BACKEND],[1], [Define if you want to enable the native (KMS) backend based on systemd])
|
||||||
|
])
|
||||||
|
AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test "$have_native_backend" = "yes"])
|
||||||
|
|
||||||
|
MUTTER_WAYLAND_MODULES="clutter-wayland-1.0 clutter-wayland-compositor-1.0 wayland-server >= 1.6.90"
|
||||||
|
|
||||||
|
AC_ARG_ENABLE(wayland,
|
||||||
|
AS_HELP_STRING([--disable-wayland], [disable mutter on wayland support]),,
|
||||||
|
enable_wayland=auto
|
||||||
|
)
|
||||||
|
AS_IF([test "$enable_wayland" = "yes"], [have_wayland=yes],
|
||||||
|
[test "$enable_wayland" = "auto"], PKG_CHECK_EXISTS([$MUTTER_WAYLAND_MODULES], [have_wayland=yes]))
|
||||||
|
|
||||||
|
AS_IF([test "$have_wayland" = "yes"], [
|
||||||
|
PKG_CHECK_MODULES([MUTTER_WAYLAND], [$MUTTER_WAYLAND_MODULES])
|
||||||
|
AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
|
||||||
|
AS_IF([test $WAYLAND_SCANNER = "no"],
|
||||||
|
[AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols])])
|
||||||
|
AC_SUBST([WAYLAND_SCANNER])
|
||||||
|
AC_DEFINE([HAVE_WAYLAND],[1],[Define if you want to enable Wayland support])
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.1],
|
||||||
|
[ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
|
||||||
|
AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
|
||||||
|
])
|
||||||
|
AM_CONDITIONAL([HAVE_WAYLAND],[test "$have_wayland" = "yes"])
|
||||||
|
|
||||||
PKG_CHECK_EXISTS([xi >= 1.6.99.1],
|
PKG_CHECK_EXISTS([xi >= 1.6.99.1],
|
||||||
AC_DEFINE([HAVE_XI23],[1],[Define if you have support for XInput 2.3 or greater]))
|
AC_DEFINE([HAVE_XI23],[1],[Define if you have support for XInput 2.3 or greater]))
|
||||||
|
|
||||||
@@ -238,16 +263,8 @@ if test x$have_xinerama = xno; then
|
|||||||
AC_MSG_ERROR([Xinerama extension was not found])
|
AC_MSG_ERROR([Xinerama extension was not found])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
found_xkb=no
|
AC_DEFINE_UNQUOTED([XKB_BASE], ["`$PKG_CONFIG --variable xkb_base xkeyboard-config`"],
|
||||||
AC_CHECK_LIB(X11, XkbQueryExtension,
|
[XKB base dir])
|
||||||
[AC_CHECK_HEADER(X11/XKBlib.h,
|
|
||||||
found_xkb=yes)],
|
|
||||||
, $ALL_X_LIBS)
|
|
||||||
|
|
||||||
if test "x$found_xkb" = "xyes"; then
|
|
||||||
AC_DEFINE(HAVE_XKB, , [Have keyboard extension library])
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
RANDR_LIBS=
|
RANDR_LIBS=
|
||||||
found_randr=no
|
found_randr=no
|
||||||
@@ -259,6 +276,8 @@ AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
|
|||||||
|
|
||||||
if test "x$found_randr" = "xyes"; then
|
if test "x$found_randr" = "xyes"; then
|
||||||
AC_DEFINE(HAVE_RANDR, , [Have the Xrandr extension library])
|
AC_DEFINE(HAVE_RANDR, , [Have the Xrandr extension library])
|
||||||
|
PKG_CHECK_EXISTS([xrandr >= 1.5.0],
|
||||||
|
AC_DEFINE([HAVE_XRANDR15],[1],[Define if you have support for XRandR 1.5 or greater]))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MUTTER_LIBS="$MUTTER_LIBS $RANDR_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
|
MUTTER_LIBS="$MUTTER_LIBS $RANDR_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
|
||||||
@@ -293,17 +312,6 @@ fi
|
|||||||
|
|
||||||
AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes")
|
AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes")
|
||||||
|
|
||||||
HOST_ALIAS=$host_alias
|
|
||||||
AC_SUBST(HOST_ALIAS)
|
|
||||||
|
|
||||||
AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
|
|
||||||
|
|
||||||
if test x"$GDK_PIXBUF_CSOURCE" = xno; then
|
|
||||||
AC_MSG_ERROR([gdk-pixbuf-csource executable not found in your path - should be installed with GTK])
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_SUBST(GDK_PIXBUF_CSOURCE)
|
|
||||||
|
|
||||||
AC_PATH_PROG(ZENITY, zenity, no)
|
AC_PATH_PROG(ZENITY, zenity, no)
|
||||||
if test x"$ZENITY" = xno; then
|
if test x"$ZENITY" = xno; then
|
||||||
AC_MSG_ERROR([zenity not found in your path - needed for dialogs])
|
AC_MSG_ERROR([zenity not found in your path - needed for dialogs])
|
||||||
@@ -316,7 +324,10 @@ if test "x$enable_debug" = "xyes"; then
|
|||||||
CFLAGS="$CFLAGS -g -O"
|
CFLAGS="$CFLAGS -g -O"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
|
AC_CHECK_DECL([GL_EXT_x11_sync_object],
|
||||||
|
[],
|
||||||
|
[AC_MSG_ERROR([GL_EXT_x11_sync_object definition not found, please update your GL headers])],
|
||||||
|
[#include <GL/glx.h>])
|
||||||
|
|
||||||
#### Warnings (last since -Werror can disturb other tests)
|
#### Warnings (last since -Werror can disturb other tests)
|
||||||
|
|
||||||
@@ -386,13 +397,13 @@ changequote([,])dnl
|
|||||||
|
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
Makefile
|
Makefile
|
||||||
|
data/Makefile
|
||||||
doc/Makefile
|
doc/Makefile
|
||||||
doc/man/Makefile
|
doc/man/Makefile
|
||||||
doc/reference/Makefile
|
|
||||||
doc/reference/meta-docs.sgml
|
|
||||||
src/Makefile
|
src/Makefile
|
||||||
src/libmutter.pc
|
src/libmutter.pc
|
||||||
src/compositor/plugins/Makefile
|
src/compositor/plugins/Makefile
|
||||||
|
src/meta/meta-version.h
|
||||||
po/Makefile.in
|
po/Makefile.in
|
||||||
])
|
])
|
||||||
|
|
||||||
@@ -418,6 +429,8 @@ mutter-$VERSION
|
|||||||
libcanberra: ${have_libcanberra}
|
libcanberra: ${have_libcanberra}
|
||||||
Introspection: ${found_introspection}
|
Introspection: ${found_introspection}
|
||||||
Session management: ${found_sm}
|
Session management: ${found_sm}
|
||||||
|
Wayland: ${have_wayland}
|
||||||
|
Native (KMS) backend: ${have_native_backend}
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|
||||||
|
@@ -45,26 +45,68 @@
|
|||||||
_description="Move window one monitor down" />
|
_description="Move window one monitor down" />
|
||||||
|
|
||||||
<KeyListEntry name="switch-applications"
|
<KeyListEntry name="switch-applications"
|
||||||
|
reverse-entry="switch-applications-backward"
|
||||||
_description="Switch applications"/>
|
_description="Switch applications"/>
|
||||||
|
|
||||||
|
<KeyListEntry name="switch-applications-backward"
|
||||||
|
reverse-entry="switch-applications"
|
||||||
|
hidden="true"
|
||||||
|
_description="Switch to previous application"/>
|
||||||
|
|
||||||
<KeyListEntry name="switch-windows"
|
<KeyListEntry name="switch-windows"
|
||||||
|
reverse-entry="switch-windows-backward"
|
||||||
_description="Switch windows"/>
|
_description="Switch windows"/>
|
||||||
|
|
||||||
|
<KeyListEntry name="switch-windows-backward"
|
||||||
|
reverse-entry="switch-windows"
|
||||||
|
hidden="true"
|
||||||
|
_description="Switch to previous window"/>
|
||||||
|
|
||||||
<KeyListEntry name="switch-group"
|
<KeyListEntry name="switch-group"
|
||||||
|
reverse-entry="switch-group-backward"
|
||||||
_description="Switch windows of an application"/>
|
_description="Switch windows of an application"/>
|
||||||
|
|
||||||
|
<KeyListEntry name="switch-group-backward"
|
||||||
|
reverse-entry="switch-group"
|
||||||
|
hidden="true"
|
||||||
|
_description="Switch to previous window of an application"/>
|
||||||
|
|
||||||
<KeyListEntry name="switch-panels"
|
<KeyListEntry name="switch-panels"
|
||||||
|
reverse-entry="switch-panels-backward"
|
||||||
_description="Switch system controls"/>
|
_description="Switch system controls"/>
|
||||||
|
|
||||||
|
<KeyListEntry name="switch-panels-backward"
|
||||||
|
reverse-entry="switch-panels"
|
||||||
|
hidden="true"
|
||||||
|
_description="Switch to previous system control"/>
|
||||||
|
|
||||||
<KeyListEntry name="cycle-windows"
|
<KeyListEntry name="cycle-windows"
|
||||||
|
reverse-entry="cycle-windows-backward"
|
||||||
_description="Switch windows directly"/>
|
_description="Switch windows directly"/>
|
||||||
|
|
||||||
|
<KeyListEntry name="cycle-windows-backward"
|
||||||
|
reverse-entry="cycle-windows"
|
||||||
|
hidden="true"
|
||||||
|
_description="Switch directly to previous window"/>
|
||||||
|
|
||||||
<KeyListEntry name="cycle-group"
|
<KeyListEntry name="cycle-group"
|
||||||
|
reverse-entry="cycle-group-backward"
|
||||||
_description="Switch windows of an app directly"/>
|
_description="Switch windows of an app directly"/>
|
||||||
|
|
||||||
|
<KeyListEntry name="cycle-group-backward"
|
||||||
|
reverse-entry="cycle-group"
|
||||||
|
hidden="true"
|
||||||
|
_description="Switch directly to previous window of an app"/>
|
||||||
|
|
||||||
<KeyListEntry name="cycle-panels"
|
<KeyListEntry name="cycle-panels"
|
||||||
|
reverse-entry="cycle-panels-backward"
|
||||||
_description="Switch system controls directly"/>
|
_description="Switch system controls directly"/>
|
||||||
|
|
||||||
|
<KeyListEntry name="cycle-panels-backward"
|
||||||
|
reverse-entry="cycle-panels"
|
||||||
|
hidden="true"
|
||||||
|
_description="Switch directly to previous system control"/>
|
||||||
|
|
||||||
<KeyListEntry name="show-desktop"
|
<KeyListEntry name="show-desktop"
|
||||||
_description="Hide all normal windows"/>
|
_description="Hide all normal windows"/>
|
||||||
|
|
@@ -1,3 +1,35 @@
|
|||||||
defaultcursordir = $(datadir)/mutter/cursors
|
desktopfiles_in_files = \
|
||||||
|
mutter.desktop.in
|
||||||
|
desktopfilesdir = $(datadir)/applications
|
||||||
|
desktopfiles_DATA = $(desktopfiles_in_files:.desktop.in=.desktop)
|
||||||
|
|
||||||
dist_defaultcursor_DATA = left_ptr.png
|
@INTLTOOL_DESKTOP_RULE@
|
||||||
|
|
||||||
|
xml_in_files = \
|
||||||
|
50-mutter-navigation.xml.in \
|
||||||
|
50-mutter-system.xml.in \
|
||||||
|
50-mutter-windows.xml.in
|
||||||
|
xmldir = $(GNOME_KEYBINDINGS_KEYSDIR)
|
||||||
|
xml_DATA = $(xml_in_files:.xml.in=.xml)
|
||||||
|
|
||||||
|
gschema_in_files = \
|
||||||
|
org.gnome.mutter.gschema.xml.in \
|
||||||
|
org.gnome.mutter.wayland.gschema.xml.in
|
||||||
|
gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml)
|
||||||
|
|
||||||
|
@INTLTOOL_XML_NOMERGE_RULE@
|
||||||
|
@GSETTINGS_RULES@
|
||||||
|
|
||||||
|
convertdir = $(datadir)/GConf/gsettings
|
||||||
|
convert_DATA = mutter-schemas.convert
|
||||||
|
|
||||||
|
CLEANFILES = \
|
||||||
|
$(desktopfiles_DATA) \
|
||||||
|
$(gsettings_SCHEMAS) \
|
||||||
|
$(xml_DATA)
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
$(convert_DATA) \
|
||||||
|
$(desktopfiles_in_files) \
|
||||||
|
$(gschema_in_files) \
|
||||||
|
$(xml_in_files)
|
||||||
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
@@ -29,5 +29,25 @@
|
|||||||
<default><![CDATA[['<Primary><Alt>F7']]]></default>
|
<default><![CDATA[['<Primary><Alt>F7']]]></default>
|
||||||
<_summary>Switch to VT 7</_summary>
|
<_summary>Switch to VT 7</_summary>
|
||||||
</key>
|
</key>
|
||||||
|
<key name="switch-to-session-8" type="as">
|
||||||
|
<default><![CDATA[['<Primary><Alt>F8']]]></default>
|
||||||
|
<_summary>Switch to VT 8</_summary>
|
||||||
|
</key>
|
||||||
|
<key name="switch-to-session-9" type="as">
|
||||||
|
<default><![CDATA[['<Primary><Alt>F9']]]></default>
|
||||||
|
<_summary>Switch to VT 9</_summary>
|
||||||
|
</key>
|
||||||
|
<key name="switch-to-session-10" type="as">
|
||||||
|
<default><![CDATA[['<Primary><Alt>F10']]]></default>
|
||||||
|
<_summary>Switch to VT 10</_summary>
|
||||||
|
</key>
|
||||||
|
<key name="switch-to-session-11" type="as">
|
||||||
|
<default><![CDATA[['<Primary><Alt>F11']]]></default>
|
||||||
|
<_summary>Switch to VT 11</_summary>
|
||||||
|
</key>
|
||||||
|
<key name="switch-to-session-12" type="as">
|
||||||
|
<default><![CDATA[['<Primary><Alt>F12']]]></default>
|
||||||
|
<_summary>Switch to VT 12</_summary>
|
||||||
|
</key>
|
||||||
</schema>
|
</schema>
|
||||||
</schemalist>
|
</schemalist>
|
@@ -1,4 +1,4 @@
|
|||||||
SUBDIRS = man reference
|
SUBDIRS = man
|
||||||
|
|
||||||
EXTRA_DIST=theme-format.txt dialogs.txt code-overview.txt \
|
EXTRA_DIST = dialogs.txt code-overview.txt \
|
||||||
how-to-get-focus-right.txt rationales.txt
|
how-to-get-focus-right.txt rationales.txt
|
||||||
|
@@ -1,164 +0,0 @@
|
|||||||
## Process this file with automake to produce Makefile.in
|
|
||||||
|
|
||||||
# We require automake 1.6 at least.
|
|
||||||
AUTOMAKE_OPTIONS = 1.6
|
|
||||||
|
|
||||||
# This is a blank Makefile.am for using gtk-doc.
|
|
||||||
# Copy this to your project's API docs directory and modify the variables to
|
|
||||||
# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
|
|
||||||
# of using the various options.
|
|
||||||
|
|
||||||
# The name of the module, e.g. 'glib'.
|
|
||||||
DOC_MODULE=meta
|
|
||||||
|
|
||||||
# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
|
|
||||||
#DOC_MODULE_VERSION=2
|
|
||||||
|
|
||||||
|
|
||||||
# The top-level SGML file. You can change this if you want to.
|
|
||||||
DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
|
|
||||||
|
|
||||||
# Directories containing the source code, relative to $(srcdir).
|
|
||||||
# gtk-doc will search all .c and .h files beneath these paths
|
|
||||||
# for inline comments documenting functions and macros.
|
|
||||||
# e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk
|
|
||||||
DOC_SOURCE_DIR=../../src/
|
|
||||||
|
|
||||||
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
|
|
||||||
SCANGOBJ_OPTIONS=
|
|
||||||
|
|
||||||
# Extra options to supply to gtkdoc-scan.
|
|
||||||
# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
|
|
||||||
SCAN_OPTIONS=--rebuild-types
|
|
||||||
|
|
||||||
# Extra options to supply to gtkdoc-mkdb.
|
|
||||||
# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
|
|
||||||
MKDB_OPTIONS=--xml-mode --output-format=xml
|
|
||||||
|
|
||||||
# Extra options to supply to gtkdoc-mktmpl
|
|
||||||
# e.g. MKTMPL_OPTIONS=--only-section-tmpl
|
|
||||||
MKTMPL_OPTIONS=
|
|
||||||
|
|
||||||
# Extra options to supply to gtkdoc-mkhtml
|
|
||||||
MKHTML_OPTIONS=
|
|
||||||
|
|
||||||
# Extra options to supply to gtkdoc-fixref. Not normally needed.
|
|
||||||
# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
|
|
||||||
FIXXREF_OPTIONS=
|
|
||||||
|
|
||||||
# Used for dependencies. The docs will be rebuilt if any of these change.
|
|
||||||
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
|
|
||||||
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
|
|
||||||
HFILE_GLOB=$(top_srcdir)/src/*/*.h
|
|
||||||
CFILE_GLOB=$(top_srcdir)/src/*/*.c
|
|
||||||
|
|
||||||
# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
|
|
||||||
# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
|
|
||||||
EXTRA_HFILES=
|
|
||||||
|
|
||||||
# Header files or dirs to ignore when scanning. Use base file/dir names
|
|
||||||
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
|
|
||||||
IGNORE_HFILES= \
|
|
||||||
async-getprop.h \
|
|
||||||
atoms.h \
|
|
||||||
bell.h \
|
|
||||||
boxes-private.h \
|
|
||||||
clutter-utils.h \
|
|
||||||
cogl-utils.h \
|
|
||||||
compositor-private.h \
|
|
||||||
constraints.h \
|
|
||||||
core.h \
|
|
||||||
display-private.h \
|
|
||||||
draw-workspace.h \
|
|
||||||
edge-resistance.h \
|
|
||||||
eventqueue.h \
|
|
||||||
frame.h \
|
|
||||||
frames.h \
|
|
||||||
group-private.h \
|
|
||||||
group-props.h \
|
|
||||||
iconcache.h \
|
|
||||||
inlinepixbufs.h \
|
|
||||||
keybindings-private.h \
|
|
||||||
meta-background-actor-private.h \
|
|
||||||
meta-background-group-private.h \
|
|
||||||
meta-module.h \
|
|
||||||
meta-plugin-manager.h \
|
|
||||||
meta-shadow-factory-private.h \
|
|
||||||
meta-texture-rectangle.h \
|
|
||||||
meta-texture-tower.h \
|
|
||||||
meta-window-actor-private.h \
|
|
||||||
meta-window-group.h \
|
|
||||||
meta-window-shape.h \
|
|
||||||
mutter-enum-types.h \
|
|
||||||
mutter-Xatomtype.h \
|
|
||||||
place.h \
|
|
||||||
preview-widget.h \
|
|
||||||
region-utils.h \
|
|
||||||
resizepopup.h \
|
|
||||||
screen-private.h \
|
|
||||||
session.h \
|
|
||||||
stack.h \
|
|
||||||
stack-tracker.h \
|
|
||||||
stamp-mutter-enum-types.h \
|
|
||||||
tabpopup.h \
|
|
||||||
theme.h \
|
|
||||||
theme-private.h \
|
|
||||||
tile-preview.h \
|
|
||||||
ui.h \
|
|
||||||
window-private.h \
|
|
||||||
window-props.h \
|
|
||||||
workspace-private.h \
|
|
||||||
xprops.h \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
MKDB_OPTIONS+=--ignore-files="$(IGNORE_HFILES)"
|
|
||||||
|
|
||||||
# Images to copy into HTML directory.
|
|
||||||
# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
|
|
||||||
HTML_IMAGES=
|
|
||||||
|
|
||||||
# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
|
|
||||||
# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
|
|
||||||
content_files= \
|
|
||||||
mutter-overview.xml \
|
|
||||||
running-mutter.xml \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
|
|
||||||
# These files must be listed here *and* in content_files
|
|
||||||
# e.g. expand_content_files=running.sgml
|
|
||||||
expand_content_files= \
|
|
||||||
mutter-overview.xml \
|
|
||||||
running-mutter.xml \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
|
|
||||||
# Only needed if you are using gtkdoc-scangobj to dynamically query widget
|
|
||||||
# signals and properties.
|
|
||||||
# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
|
|
||||||
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
|
|
||||||
GTKDOC_CFLAGS=$(MUTTER_CFLAGS)
|
|
||||||
GTKDOC_LIBS=$(MUTTER_LIBS) $(top_builddir)/src/libmutter.la
|
|
||||||
|
|
||||||
# This includes the standard gtk-doc make rules, copied by gtkdocize.
|
|
||||||
include $(top_srcdir)/gtk-doc.make
|
|
||||||
|
|
||||||
# Other files to distribute
|
|
||||||
# e.g. EXTRA_DIST += version.xml.in
|
|
||||||
EXTRA_DIST +=
|
|
||||||
|
|
||||||
# Files not to distribute
|
|
||||||
# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
|
|
||||||
# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
|
|
||||||
DISTCLEANFILES = $(DOC_MODULES).types
|
|
||||||
|
|
||||||
# Comment this out if you want 'make check' to test you doc status
|
|
||||||
# and run some sanity checks
|
|
||||||
if ENABLE_GTK_DOC
|
|
||||||
TESTS_ENVIRONMENT = cd $(srcdir) && \
|
|
||||||
DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
|
|
||||||
SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
|
|
||||||
#TESTS = $(GTKDOC_CHECK)
|
|
||||||
endif
|
|
||||||
|
|
||||||
-include $(top_srcdir)/git.mk
|
|
@@ -1,59 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
|
|
||||||
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
|
|
||||||
[
|
|
||||||
<!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'">
|
|
||||||
<!ENTITY version "@VERSION@">
|
|
||||||
]>
|
|
||||||
<book id="index">
|
|
||||||
<bookinfo>
|
|
||||||
<title>Mutter Reference Manual</title>
|
|
||||||
<releaseinfo>
|
|
||||||
This document is for Mutter &version;.
|
|
||||||
The latest version of this documentation can be found on-line at
|
|
||||||
<ulink role="online-location" url="http://developer.gnome.org/meta/">http://developer.gnome.org/meta/</ulink>.
|
|
||||||
</releaseinfo>
|
|
||||||
</bookinfo>
|
|
||||||
|
|
||||||
<xi:include href="xml/mutter-overview.xml"/>
|
|
||||||
<xi:include href="xml/running-mutter.xml"/>
|
|
||||||
|
|
||||||
<part id="core-reference">
|
|
||||||
<title>Mutter Core Reference</title>
|
|
||||||
<xi:include href="xml/main.xml"/>
|
|
||||||
<xi:include href="xml/common.xml"/>
|
|
||||||
<xi:include href="xml/gradient.xml"/>
|
|
||||||
<xi:include href="xml/prefs.xml"/>
|
|
||||||
<xi:include href="xml/util.xml"/>
|
|
||||||
<xi:include href="xml/errors.xml"/>
|
|
||||||
<xi:include href="xml/meta-plugin.xml"/>
|
|
||||||
<xi:include href="xml/barrier.xml"/>
|
|
||||||
<xi:include href="xml/boxes.xml"/>
|
|
||||||
<xi:include href="xml/compositor.xml"/>
|
|
||||||
<xi:include href="xml/display.xml"/>
|
|
||||||
<xi:include href="xml/group.xml"/>
|
|
||||||
<xi:include href="xml/keybindings.xml"/>
|
|
||||||
<xi:include href="xml/meta-background-actor.xml"/>
|
|
||||||
<xi:include href="xml/meta-shadow-factory.xml"/>
|
|
||||||
<xi:include href="xml/meta-shaped-texture.xml"/>
|
|
||||||
<xi:include href="xml/meta-window-actor.xml"/>
|
|
||||||
<xi:include href="xml/screen.xml"/>
|
|
||||||
<xi:include href="xml/window.xml"/>
|
|
||||||
<xi:include href="xml/workspace.xml"/>
|
|
||||||
</part>
|
|
||||||
|
|
||||||
<chapter id="object-tree">
|
|
||||||
<title>Object Hierarchy</title>
|
|
||||||
<xi:include href="xml/tree_index.sgml"/>
|
|
||||||
</chapter>
|
|
||||||
<index id="api-index-full">
|
|
||||||
<title>API Index</title>
|
|
||||||
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
|
|
||||||
</index>
|
|
||||||
<index id="deprecated-api-index" role="deprecated">
|
|
||||||
<title>Index of deprecated API</title>
|
|
||||||
<xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
|
|
||||||
</index>
|
|
||||||
|
|
||||||
<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
|
|
||||||
</book>
|
|
@@ -1,683 +0,0 @@
|
|||||||
<SECTION>
|
|
||||||
<FILE>barrier</FILE>
|
|
||||||
<TITLE>MetaBarrier</TITLE>
|
|
||||||
MetaBarrier
|
|
||||||
MetaBarrierClass
|
|
||||||
meta_barrier_is_active
|
|
||||||
meta_barrier_destroy
|
|
||||||
meta_barrier_release
|
|
||||||
MetaBarrierDirection
|
|
||||||
MetaBarrierEvent
|
|
||||||
<SUBSECTION Standard>
|
|
||||||
META_BARRIER
|
|
||||||
META_BARRIER_CLASS
|
|
||||||
META_BARRIER_GET_CLASS
|
|
||||||
META_IS_BARRIER
|
|
||||||
META_IS_BARRIER_CLASS
|
|
||||||
META_TYPE_BARRIER
|
|
||||||
META_TYPE_BARRIER_EVENT
|
|
||||||
MetaBarrierPrivate
|
|
||||||
meta_barrier_event_get_type
|
|
||||||
meta_barrier_get_type
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>boxes</FILE>
|
|
||||||
MetaRectangle
|
|
||||||
MetaStrut
|
|
||||||
MetaEdgeType
|
|
||||||
MetaEdge
|
|
||||||
meta_rectangle_copy
|
|
||||||
meta_rectangle_free
|
|
||||||
meta_rect
|
|
||||||
meta_rectangle_area
|
|
||||||
meta_rectangle_intersect
|
|
||||||
meta_rectangle_equal
|
|
||||||
meta_rectangle_union
|
|
||||||
meta_rectangle_overlap
|
|
||||||
meta_rectangle_vert_overlap
|
|
||||||
meta_rectangle_horiz_overlap
|
|
||||||
meta_rectangle_could_fit_rect
|
|
||||||
meta_rectangle_contains_rect
|
|
||||||
<SUBSECTION Standard>
|
|
||||||
META_TYPE_RECTANGLE
|
|
||||||
meta_rectangle_get_type
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>common</FILE>
|
|
||||||
META_VIRTUAL_CORE_POINTER_ID
|
|
||||||
META_VIRTUAL_CORE_KEYBOARD_ID
|
|
||||||
MetaFrameFlags
|
|
||||||
MetaMenuOp
|
|
||||||
MetaWindowMenuFunc
|
|
||||||
MetaGrabOp
|
|
||||||
MetaCursor
|
|
||||||
MetaFrameType
|
|
||||||
MetaVirtualModifier
|
|
||||||
MetaDirection
|
|
||||||
MetaMotionDirection
|
|
||||||
MetaSide
|
|
||||||
MetaButtonFunction
|
|
||||||
MAX_BUTTONS_PER_CORNER
|
|
||||||
MetaButtonLayout
|
|
||||||
MetaFrameBorders
|
|
||||||
meta_frame_borders_clear
|
|
||||||
META_ICON_WIDTH
|
|
||||||
META_ICON_HEIGHT
|
|
||||||
META_MINI_ICON_WIDTH
|
|
||||||
META_MINI_ICON_HEIGHT
|
|
||||||
META_DEFAULT_ICON_NAME
|
|
||||||
META_PRIORITY_RESIZE
|
|
||||||
META_PRIORITY_BEFORE_REDRAW
|
|
||||||
META_PRIORITY_REDRAW
|
|
||||||
META_PRIORITY_PREFS_NOTIFY
|
|
||||||
POINT_IN_RECT
|
|
||||||
MetaStackLayer
|
|
||||||
MetaWindowMenu
|
|
||||||
MetaResizePopup
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>compositor</FILE>
|
|
||||||
MetaCompEffect
|
|
||||||
MetaCompositor
|
|
||||||
meta_compositor_new
|
|
||||||
meta_compositor_destroy
|
|
||||||
meta_compositor_manage_screen
|
|
||||||
meta_compositor_unmanage_screen
|
|
||||||
meta_compositor_window_shape_changed
|
|
||||||
meta_compositor_process_event
|
|
||||||
meta_compositor_filter_keybinding
|
|
||||||
meta_compositor_add_window
|
|
||||||
meta_compositor_remove_window
|
|
||||||
meta_compositor_show_window
|
|
||||||
meta_compositor_hide_window
|
|
||||||
meta_compositor_switch_workspace
|
|
||||||
meta_compositor_maximize_window
|
|
||||||
meta_compositor_unmaximize_window
|
|
||||||
meta_compositor_sync_window_geometry
|
|
||||||
meta_compositor_set_updates_frozen
|
|
||||||
meta_compositor_queue_frame_drawn
|
|
||||||
meta_compositor_sync_stack
|
|
||||||
meta_compositor_sync_screen_size
|
|
||||||
meta_compositor_flash_screen
|
|
||||||
meta_get_stage_for_screen
|
|
||||||
meta_get_overlay_group_for_screen
|
|
||||||
meta_get_overlay_window
|
|
||||||
meta_get_window_actors
|
|
||||||
meta_get_window_group_for_screen
|
|
||||||
meta_get_top_window_group_for_screen
|
|
||||||
meta_disable_unredirect_for_screen
|
|
||||||
meta_enable_unredirect_for_screen
|
|
||||||
meta_set_stage_input_region
|
|
||||||
meta_empty_stage_input_region
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>display</FILE>
|
|
||||||
MetaTabList
|
|
||||||
MetaTabShowType
|
|
||||||
meta_XFree
|
|
||||||
meta_display_get_compositor_version
|
|
||||||
meta_display_get_xinput_opcode
|
|
||||||
meta_display_supports_extended_barriers
|
|
||||||
meta_display_get_xdisplay
|
|
||||||
meta_display_get_compositor
|
|
||||||
meta_display_get_screens
|
|
||||||
meta_display_has_shape
|
|
||||||
meta_display_screen_for_root
|
|
||||||
meta_display_get_focus_window
|
|
||||||
meta_display_xwindow_is_a_no_focus_window
|
|
||||||
meta_display_get_damage_event_base
|
|
||||||
meta_display_get_shape_event_base
|
|
||||||
meta_display_xserver_time_is_before
|
|
||||||
meta_display_get_last_user_time
|
|
||||||
meta_display_get_current_time
|
|
||||||
meta_display_get_current_time_roundtrip
|
|
||||||
meta_display_get_ignored_modifier_mask
|
|
||||||
meta_display_get_tab_list
|
|
||||||
meta_display_get_tab_next
|
|
||||||
meta_display_get_tab_current
|
|
||||||
meta_display_begin_grab_op
|
|
||||||
meta_display_end_grab_op
|
|
||||||
meta_display_get_grab_op
|
|
||||||
meta_display_add_keybinding
|
|
||||||
meta_display_remove_keybinding
|
|
||||||
meta_display_get_keybinding_action
|
|
||||||
meta_display_set_input_focus_window
|
|
||||||
meta_display_focus_the_no_focus_window
|
|
||||||
meta_display_sort_windows_by_stacking
|
|
||||||
meta_display_get_leader_window
|
|
||||||
meta_display_add_ignored_crossing_serial
|
|
||||||
meta_display_unmanage_screen
|
|
||||||
meta_display_clear_mouse_mode
|
|
||||||
MetaDisplay
|
|
||||||
MetaDisplayClass
|
|
||||||
<SUBSECTION Standard>
|
|
||||||
META_DISPLAY
|
|
||||||
META_DISPLAY_CLASS
|
|
||||||
META_DISPLAY_GET_CLASS
|
|
||||||
META_IS_DISPLAY
|
|
||||||
META_IS_DISPLAY_CLASS
|
|
||||||
META_TYPE_DISPLAY
|
|
||||||
meta_display_get_type
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>errors</FILE>
|
|
||||||
meta_error_trap_push
|
|
||||||
meta_error_trap_pop
|
|
||||||
meta_error_trap_push_with_return
|
|
||||||
meta_error_trap_pop_with_return
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>gradient</FILE>
|
|
||||||
MetaGradientType
|
|
||||||
meta_gradient_create_simple
|
|
||||||
meta_gradient_create_multi
|
|
||||||
meta_gradient_create_interwoven
|
|
||||||
meta_gradient_add_alpha
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>group</FILE>
|
|
||||||
MetaGroup
|
|
||||||
meta_window_get_group
|
|
||||||
meta_window_compute_group
|
|
||||||
meta_window_shutdown_group
|
|
||||||
meta_window_group_leader_changed
|
|
||||||
meta_display_lookup_group
|
|
||||||
meta_group_list_windows
|
|
||||||
meta_group_update_layers
|
|
||||||
meta_group_get_startup_id
|
|
||||||
meta_group_get_size
|
|
||||||
meta_group_property_notify
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>keybindings</FILE>
|
|
||||||
MetaKeyBinding
|
|
||||||
META_TYPE_KEY_BINDING
|
|
||||||
meta_key_binding_get_name
|
|
||||||
meta_key_binding_get_modifiers
|
|
||||||
meta_key_binding_get_mask
|
|
||||||
meta_key_binding_is_builtin
|
|
||||||
meta_keybindings_set_custom_handler
|
|
||||||
meta_screen_ungrab_all_keys
|
|
||||||
meta_screen_grab_all_keys
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>main</FILE>
|
|
||||||
meta_get_option_context
|
|
||||||
meta_init
|
|
||||||
meta_run
|
|
||||||
meta_get_replace_current_wm
|
|
||||||
meta_set_wm_name
|
|
||||||
meta_set_gnome_wm_keybindings
|
|
||||||
MetaExitCode
|
|
||||||
meta_exit
|
|
||||||
meta_quit
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>meta-background</FILE>
|
|
||||||
<TITLE>MetaBackground</TITLE>
|
|
||||||
MetaBackgroundEffects
|
|
||||||
MetaBackground
|
|
||||||
MetaBackgroundClass
|
|
||||||
meta_background_new
|
|
||||||
meta_background_copy
|
|
||||||
meta_background_load_gradient
|
|
||||||
meta_background_load_color
|
|
||||||
meta_background_load_still_frame
|
|
||||||
meta_background_load_file_async
|
|
||||||
meta_background_load_file_finish
|
|
||||||
meta_background_get_filename
|
|
||||||
meta_background_get_style
|
|
||||||
meta_background_get_shading
|
|
||||||
meta_background_get_color
|
|
||||||
meta_background_get_second_color
|
|
||||||
<SUBSECTION Standard>
|
|
||||||
META_BACKGROUND
|
|
||||||
META_BACKGROUND_CLASS
|
|
||||||
META_BACKGROUND_GET_CLASS
|
|
||||||
META_IS_BACKGROUND
|
|
||||||
META_IS_BACKGROUND_CLASS
|
|
||||||
META_TYPE_BACKGROUND
|
|
||||||
MetaBackgroundPrivate
|
|
||||||
meta_background_get_type
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>meta-background-actor</FILE>
|
|
||||||
<TITLE>MetaBackgroundActor</TITLE>
|
|
||||||
MetaBackgroundActor
|
|
||||||
MetaBackgroundActorClass
|
|
||||||
meta_background_actor_new_for_screen
|
|
||||||
MetaSnippetHook
|
|
||||||
meta_background_actor_add_glsl_snippet
|
|
||||||
meta_background_actor_set_uniform_float
|
|
||||||
<SUBSECTION Standard>
|
|
||||||
META_BACKGROUND_ACTOR
|
|
||||||
META_BACKGROUND_ACTOR_CLASS
|
|
||||||
META_BACKGROUND_ACTOR_GET_CLASS
|
|
||||||
META_IS_BACKGROUND_ACTOR
|
|
||||||
META_IS_BACKGROUND_ACTOR_CLASS
|
|
||||||
META_TYPE_BACKGROUND_ACTOR
|
|
||||||
MetaBackgroundActorPrivate
|
|
||||||
meta_background_actor_get_type
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>meta-background-group</FILE>
|
|
||||||
<TITLE>MetaBackgroundGroup</TITLE>
|
|
||||||
MetaBackgroundGroupClass
|
|
||||||
meta_background_group_new
|
|
||||||
<SUBSECTION Standard>
|
|
||||||
META_BACKGROUND_GROUP
|
|
||||||
META_BACKGROUND_GROUP_CLASS
|
|
||||||
META_BACKGROUND_GROUP_GET_CLASS
|
|
||||||
META_IS_BACKGROUND_GROUP
|
|
||||||
META_IS_BACKGROUND_GROUP_CLASS
|
|
||||||
META_TYPE_BACKGROUND_GROUP
|
|
||||||
MetaBackgroundGroupPrivate
|
|
||||||
meta_background_group_get_type
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>meta-plugin</FILE>
|
|
||||||
<TITLE>MetaPlugin</TITLE>
|
|
||||||
MetaPlugin
|
|
||||||
MetaPluginClass
|
|
||||||
MetaPluginInfo
|
|
||||||
meta_plugin_running
|
|
||||||
meta_plugin_debug_mode
|
|
||||||
meta_plugin_get_info
|
|
||||||
MetaPluginVersion
|
|
||||||
META_PLUGIN_DECLARE
|
|
||||||
meta_plugin_switch_workspace_completed
|
|
||||||
meta_plugin_minimize_completed
|
|
||||||
meta_plugin_maximize_completed
|
|
||||||
meta_plugin_unmaximize_completed
|
|
||||||
meta_plugin_map_completed
|
|
||||||
meta_plugin_destroy_completed
|
|
||||||
MetaModalOptions
|
|
||||||
meta_plugin_begin_modal
|
|
||||||
meta_plugin_end_modal
|
|
||||||
meta_plugin_get_screen
|
|
||||||
meta_plugin_manager_set_plugin_type
|
|
||||||
<SUBSECTION Standard>
|
|
||||||
META_IS_PLUGIN
|
|
||||||
META_IS_PLUGIN_CLASS
|
|
||||||
META_PLUGIN
|
|
||||||
META_PLUGIN_CLASS
|
|
||||||
META_PLUGIN_GET_CLASS
|
|
||||||
META_TYPE_PLUGIN
|
|
||||||
MetaPluginPrivate
|
|
||||||
meta_plugin_get_type
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>meta-shadow-factory</FILE>
|
|
||||||
MetaShadowParams
|
|
||||||
meta_shadow_factory_get_default
|
|
||||||
meta_shadow_factory_set_params
|
|
||||||
meta_shadow_factory_get_params
|
|
||||||
MetaShadowFactory
|
|
||||||
MetaShadowFactoryClass
|
|
||||||
<SUBSECTION Standard>
|
|
||||||
META_IS_SHADOW_FACTORY
|
|
||||||
META_IS_SHADOW_FACTORY_CLASS
|
|
||||||
META_SHADOW_FACTORY
|
|
||||||
META_SHADOW_FACTORY_CLASS
|
|
||||||
META_SHADOW_FACTORY_GET_CLASS
|
|
||||||
META_TYPE_SHADOW_FACTORY
|
|
||||||
meta_shadow_factory_get_type
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>meta-shaped-texture</FILE>
|
|
||||||
<TITLE>MetaShapedTexture</TITLE>
|
|
||||||
MetaShapedTexture
|
|
||||||
MetaShapedTextureClass
|
|
||||||
meta_shaped_texture_new
|
|
||||||
meta_shaped_texture_set_create_mipmaps
|
|
||||||
meta_shaped_texture_update_area
|
|
||||||
meta_shaped_texture_set_pixmap
|
|
||||||
meta_shaped_texture_get_texture
|
|
||||||
meta_shaped_texture_set_mask_texture
|
|
||||||
meta_shaped_texture_set_clip_region
|
|
||||||
meta_shaped_texture_get_image
|
|
||||||
<SUBSECTION Standard>
|
|
||||||
META_IS_SHAPED_TEXTURE
|
|
||||||
META_IS_SHAPED_TEXTURE_CLASS
|
|
||||||
META_SHAPED_TEXTURE
|
|
||||||
META_SHAPED_TEXTURE_CLASS
|
|
||||||
META_SHAPED_TEXTURE_GET_CLASS
|
|
||||||
META_TYPE_SHAPED_TEXTURE
|
|
||||||
MetaShapedTexturePrivate
|
|
||||||
meta_shaped_texture_get_type
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>meta-window-actor</FILE>
|
|
||||||
<TITLE>MetaWindowActor</TITLE>
|
|
||||||
MetaWindowActor
|
|
||||||
MetaWindowActorClass
|
|
||||||
meta_window_actor_get_x_window
|
|
||||||
meta_window_actor_get_workspace
|
|
||||||
meta_window_actor_get_meta_window
|
|
||||||
meta_window_actor_get_texture
|
|
||||||
meta_window_actor_is_override_redirect
|
|
||||||
meta_window_actor_get_description
|
|
||||||
meta_window_actor_showing_on_its_workspace
|
|
||||||
meta_window_actor_is_destroyed
|
|
||||||
<SUBSECTION Standard>
|
|
||||||
META_IS_WINDOW_ACTOR
|
|
||||||
META_IS_WINDOW_ACTOR_CLASS
|
|
||||||
META_TYPE_WINDOW_ACTOR
|
|
||||||
META_WINDOW_ACTOR
|
|
||||||
META_WINDOW_ACTOR_CLASS
|
|
||||||
META_WINDOW_ACTOR_GET_CLASS
|
|
||||||
MetaWindowActorPrivate
|
|
||||||
meta_window_actor_get_type
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>meta-cullable</FILE>
|
|
||||||
<TITLE>MetaCullable</TITLE>
|
|
||||||
MetaCullable
|
|
||||||
MetaCullableInterface
|
|
||||||
meta_cullable_cull_out
|
|
||||||
meta_cullable_reset_culling
|
|
||||||
meta_cullable_cull_out_children
|
|
||||||
meta_cullable_reset_culling_children
|
|
||||||
<SUBSECTION Standard>
|
|
||||||
META_TYPE_CULLABLE
|
|
||||||
META_CULLABLE
|
|
||||||
META_IS_CULLABLE
|
|
||||||
META_CULLABLE_GET_IFACE
|
|
||||||
meta_cullable_get_type
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>prefs</FILE>
|
|
||||||
MetaPreference
|
|
||||||
MetaPrefsChangedFunc
|
|
||||||
meta_prefs_add_listener
|
|
||||||
meta_prefs_remove_listener
|
|
||||||
meta_prefs_init
|
|
||||||
meta_prefs_override_preference_schema
|
|
||||||
meta_preference_to_string
|
|
||||||
meta_prefs_get_mouse_button_mods
|
|
||||||
meta_prefs_get_mouse_button_resize
|
|
||||||
meta_prefs_get_mouse_button_menu
|
|
||||||
meta_prefs_get_focus_mode
|
|
||||||
meta_prefs_get_focus_new_windows
|
|
||||||
meta_prefs_get_attach_modal_dialogs
|
|
||||||
meta_prefs_get_raise_on_click
|
|
||||||
meta_prefs_get_theme
|
|
||||||
meta_prefs_get_titlebar_font
|
|
||||||
meta_prefs_get_num_workspaces
|
|
||||||
meta_prefs_get_dynamic_workspaces
|
|
||||||
meta_prefs_get_disable_workarounds
|
|
||||||
meta_prefs_get_auto_raise
|
|
||||||
meta_prefs_get_auto_raise_delay
|
|
||||||
meta_prefs_get_focus_change_on_pointer_rest
|
|
||||||
meta_prefs_get_gnome_accessibility
|
|
||||||
meta_prefs_get_gnome_animations
|
|
||||||
meta_prefs_get_edge_tiling
|
|
||||||
meta_prefs_get_auto_maximize
|
|
||||||
meta_prefs_get_button_layout
|
|
||||||
meta_prefs_get_action_double_click_titlebar
|
|
||||||
meta_prefs_get_action_middle_click_titlebar
|
|
||||||
meta_prefs_get_action_right_click_titlebar
|
|
||||||
meta_prefs_set_num_workspaces
|
|
||||||
meta_prefs_get_workspace_name
|
|
||||||
meta_prefs_change_workspace_name
|
|
||||||
meta_prefs_get_cursor_theme
|
|
||||||
meta_prefs_get_cursor_size
|
|
||||||
meta_prefs_get_compositing_manager
|
|
||||||
meta_prefs_get_force_fullscreen
|
|
||||||
meta_prefs_set_force_fullscreen
|
|
||||||
meta_prefs_get_workspaces_only_on_primary
|
|
||||||
meta_prefs_get_no_tab_popup
|
|
||||||
meta_prefs_set_no_tab_popup
|
|
||||||
meta_prefs_get_draggable_border_width
|
|
||||||
meta_prefs_get_ignore_request_hide_titlebar
|
|
||||||
meta_prefs_set_ignore_request_hide_titlebar
|
|
||||||
MetaKeyBindingAction
|
|
||||||
MetaKeyBindingFlags
|
|
||||||
MetaKeyCombo
|
|
||||||
MetaKeyHandlerFunc
|
|
||||||
meta_prefs_get_keybindings
|
|
||||||
meta_prefs_get_keybinding_action
|
|
||||||
meta_prefs_get_window_binding
|
|
||||||
meta_prefs_get_overlay_binding
|
|
||||||
meta_prefs_get_visual_bell
|
|
||||||
meta_prefs_bell_is_audible
|
|
||||||
meta_prefs_get_visual_bell_type
|
|
||||||
MetaKeyHandler
|
|
||||||
<SUBSECTION Standard>
|
|
||||||
meta_key_binding_get_type
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>screen</FILE>
|
|
||||||
MetaScreen
|
|
||||||
MetaScreenClass
|
|
||||||
meta_screen_get_screen_number
|
|
||||||
meta_screen_get_display
|
|
||||||
meta_screen_get_xroot
|
|
||||||
meta_screen_get_size
|
|
||||||
meta_screen_get_compositor_data
|
|
||||||
meta_screen_set_compositor_data
|
|
||||||
meta_screen_for_x_screen
|
|
||||||
meta_screen_set_cm_selection
|
|
||||||
meta_screen_unset_cm_selection
|
|
||||||
meta_screen_get_startup_sequences
|
|
||||||
meta_screen_get_workspaces
|
|
||||||
meta_screen_get_n_workspaces
|
|
||||||
meta_screen_get_workspace_by_index
|
|
||||||
meta_screen_remove_workspace
|
|
||||||
meta_screen_append_new_workspace
|
|
||||||
meta_screen_get_active_workspace_index
|
|
||||||
meta_screen_get_active_workspace
|
|
||||||
meta_screen_get_n_monitors
|
|
||||||
meta_screen_get_primary_monitor
|
|
||||||
meta_screen_get_current_monitor
|
|
||||||
meta_screen_get_monitor_geometry
|
|
||||||
meta_screen_get_monitor_index_for_rect
|
|
||||||
meta_screen_focus_default_window
|
|
||||||
MetaScreenCorner
|
|
||||||
meta_screen_override_workspace_layout
|
|
||||||
<SUBSECTION Standard>
|
|
||||||
META_IS_SCREEN
|
|
||||||
META_IS_SCREEN_CLASS
|
|
||||||
META_SCREEN
|
|
||||||
META_SCREEN_CLASS
|
|
||||||
META_SCREEN_GET_CLASS
|
|
||||||
META_TYPE_SCREEN
|
|
||||||
meta_screen_get_type
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>util</FILE>
|
|
||||||
meta_is_verbose
|
|
||||||
meta_set_verbose
|
|
||||||
meta_is_debugging
|
|
||||||
meta_set_debugging
|
|
||||||
meta_is_syncing
|
|
||||||
meta_set_syncing
|
|
||||||
meta_set_replace_current_wm
|
|
||||||
meta_debug_spew_real
|
|
||||||
meta_verbose_real
|
|
||||||
meta_bug
|
|
||||||
meta_warning
|
|
||||||
meta_fatal
|
|
||||||
MetaDebugTopic
|
|
||||||
meta_topic_real
|
|
||||||
meta_add_verbose_topic
|
|
||||||
meta_remove_verbose_topic
|
|
||||||
meta_push_no_msg_prefix
|
|
||||||
meta_pop_no_msg_prefix
|
|
||||||
meta_unsigned_long_equal
|
|
||||||
meta_unsigned_long_hash
|
|
||||||
meta_frame_type_to_string
|
|
||||||
meta_gravity_to_string
|
|
||||||
_
|
|
||||||
N_
|
|
||||||
meta_g_utf8_strndup
|
|
||||||
meta_free_gslist_and_elements
|
|
||||||
meta_show_dialog
|
|
||||||
meta_debug_spew
|
|
||||||
meta_verbose
|
|
||||||
meta_topic
|
|
||||||
MetaLaterType
|
|
||||||
meta_later_add
|
|
||||||
meta_later_remove
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>window</FILE>
|
|
||||||
MetaWindow
|
|
||||||
MetaWindowClass
|
|
||||||
MetaWindowType
|
|
||||||
MetaMaximizeFlags
|
|
||||||
meta_window_get_frame
|
|
||||||
meta_window_has_focus
|
|
||||||
meta_window_appears_focused
|
|
||||||
meta_window_is_shaded
|
|
||||||
meta_window_is_monitor_sized
|
|
||||||
meta_window_is_override_redirect
|
|
||||||
meta_window_is_skip_taskbar
|
|
||||||
meta_window_get_rect
|
|
||||||
meta_window_get_input_rect
|
|
||||||
meta_window_get_frame_rect
|
|
||||||
meta_window_get_outer_rect
|
|
||||||
meta_window_client_rect_to_frame_rect
|
|
||||||
meta_window_frame_rect_to_client_rect
|
|
||||||
meta_window_get_screen
|
|
||||||
meta_window_get_display
|
|
||||||
meta_window_get_xwindow
|
|
||||||
meta_window_get_window_type
|
|
||||||
meta_window_get_window_type_atom
|
|
||||||
meta_window_get_workspace
|
|
||||||
meta_window_get_monitor
|
|
||||||
meta_window_is_on_all_workspaces
|
|
||||||
meta_window_located_on_workspace
|
|
||||||
meta_window_is_hidden
|
|
||||||
meta_window_activate
|
|
||||||
meta_window_activate_with_workspace
|
|
||||||
meta_window_get_description
|
|
||||||
meta_window_get_wm_class
|
|
||||||
meta_window_get_wm_class_instance
|
|
||||||
meta_window_showing_on_its_workspace
|
|
||||||
meta_window_get_gtk_application_id
|
|
||||||
meta_window_get_gtk_unique_bus_name
|
|
||||||
meta_window_get_gtk_application_object_path
|
|
||||||
meta_window_get_gtk_window_object_path
|
|
||||||
meta_window_get_gtk_app_menu_object_path
|
|
||||||
meta_window_get_gtk_menubar_object_path
|
|
||||||
meta_window_move
|
|
||||||
meta_window_move_frame
|
|
||||||
meta_window_move_resize_frame
|
|
||||||
meta_window_move_to_monitor
|
|
||||||
meta_window_resize
|
|
||||||
meta_window_set_demands_attention
|
|
||||||
meta_window_unset_demands_attention
|
|
||||||
meta_window_get_startup_id
|
|
||||||
meta_window_change_workspace_by_index
|
|
||||||
meta_window_change_workspace
|
|
||||||
meta_window_get_compositor_private
|
|
||||||
meta_window_set_compositor_private
|
|
||||||
meta_window_configure_notify
|
|
||||||
meta_window_get_role
|
|
||||||
meta_window_get_layer
|
|
||||||
meta_window_find_root_ancestor
|
|
||||||
meta_window_is_ancestor_of_transient
|
|
||||||
MetaWindowForeachFunc
|
|
||||||
meta_window_foreach_transient
|
|
||||||
meta_window_foreach_ancestor
|
|
||||||
meta_window_get_maximized
|
|
||||||
meta_window_is_fullscreen
|
|
||||||
meta_window_is_on_primary_monitor
|
|
||||||
meta_window_requested_bypass_compositor
|
|
||||||
meta_window_requested_dont_bypass_compositor
|
|
||||||
meta_window_is_mapped
|
|
||||||
meta_window_toplevel_is_mapped
|
|
||||||
meta_window_get_icon_geometry
|
|
||||||
meta_window_set_icon_geometry
|
|
||||||
meta_window_maximize
|
|
||||||
meta_window_unmaximize
|
|
||||||
meta_window_minimize
|
|
||||||
meta_window_unminimize
|
|
||||||
meta_window_raise
|
|
||||||
meta_window_lower
|
|
||||||
meta_window_get_title
|
|
||||||
meta_window_get_transient_for
|
|
||||||
meta_window_get_transient_for_as_xid
|
|
||||||
meta_window_delete
|
|
||||||
meta_window_get_stable_sequence
|
|
||||||
meta_window_get_user_time
|
|
||||||
meta_window_get_pid
|
|
||||||
meta_window_get_client_machine
|
|
||||||
meta_window_is_remote
|
|
||||||
meta_window_is_modal
|
|
||||||
meta_window_is_attached_dialog
|
|
||||||
meta_window_get_mutter_hints
|
|
||||||
meta_window_get_frame_type
|
|
||||||
meta_window_get_frame_bounds
|
|
||||||
meta_window_get_tile_match
|
|
||||||
meta_window_make_fullscreen
|
|
||||||
meta_window_unmake_fullscreen
|
|
||||||
meta_window_make_above
|
|
||||||
meta_window_unmake_above
|
|
||||||
meta_window_shade
|
|
||||||
meta_window_unshade
|
|
||||||
meta_window_stick
|
|
||||||
meta_window_unstick
|
|
||||||
meta_window_kill
|
|
||||||
meta_window_focus
|
|
||||||
meta_window_check_alive
|
|
||||||
meta_window_get_work_area_current_monitor
|
|
||||||
meta_window_get_work_area_for_monitor
|
|
||||||
meta_window_get_work_area_all_monitors
|
|
||||||
meta_window_begin_grab_op
|
|
||||||
<SUBSECTION Standard>
|
|
||||||
META_IS_WINDOW
|
|
||||||
META_IS_WINDOW_CLASS
|
|
||||||
META_TYPE_WINDOW
|
|
||||||
META_WINDOW
|
|
||||||
META_WINDOW_CLASS
|
|
||||||
META_WINDOW_GET_CLASS
|
|
||||||
meta_window_get_type
|
|
||||||
</SECTION>
|
|
||||||
|
|
||||||
<SECTION>
|
|
||||||
<FILE>workspace</FILE>
|
|
||||||
MetaWorkspace
|
|
||||||
MetaWorkspaceClass
|
|
||||||
meta_workspace_index
|
|
||||||
meta_workspace_get_screen
|
|
||||||
meta_workspace_list_windows
|
|
||||||
meta_workspace_get_work_area_for_monitor
|
|
||||||
meta_workspace_get_work_area_all_monitors
|
|
||||||
meta_workspace_activate
|
|
||||||
meta_workspace_activate_with_focus
|
|
||||||
meta_workspace_update_window_hints
|
|
||||||
meta_workspace_set_builtin_struts
|
|
||||||
meta_workspace_get_neighbor
|
|
||||||
<SUBSECTION Standard>
|
|
||||||
META_IS_WORKSPACE
|
|
||||||
META_IS_WORKSPACE_CLASS
|
|
||||||
META_TYPE_WORKSPACE
|
|
||||||
META_WORKSPACE
|
|
||||||
META_WORKSPACE_CLASS
|
|
||||||
META_WORKSPACE_GET_CLASS
|
|
||||||
meta_workspace_get_type
|
|
||||||
</SECTION>
|
|
||||||
|
|
@@ -1,15 +0,0 @@
|
|||||||
<part id="mutter-overview">
|
|
||||||
|
|
||||||
<title>Overview</title>
|
|
||||||
|
|
||||||
<partintro>
|
|
||||||
|
|
||||||
<para>Mutter is a GObject-based library for creating compositing window managers.</para>
|
|
||||||
|
|
||||||
<para>Compositors that wish to use Mutter must implement a subclass of #MetaPlugin and register it with meta_plugin_manager_set_plugin_type() before calling meta_init() but after g_type_init().</para>
|
|
||||||
|
|
||||||
<para>#MetaPlugin provides virtual functions that allow to override default behavior in the window management code, such as the effect to perform when a window is created or when switching workspaces.</para>
|
|
||||||
|
|
||||||
</partintro>
|
|
||||||
|
|
||||||
</part>
|
|
@@ -1,100 +0,0 @@
|
|||||||
<part id="running-mutter">
|
|
||||||
|
|
||||||
<title>Running Mutter</title>
|
|
||||||
|
|
||||||
<partintro>
|
|
||||||
|
|
||||||
<section id="environment-variables">
|
|
||||||
<title>Environment Variables</title>
|
|
||||||
|
|
||||||
<para>
|
|
||||||
Mutter automatically checks environment variables during
|
|
||||||
its initialization. These environment variables are meant
|
|
||||||
as debug tools or overrides for default behaviours:
|
|
||||||
</para>
|
|
||||||
|
|
||||||
<variablelist>
|
|
||||||
<varlistentry>
|
|
||||||
<term>MUTTER_VERBOSE</term>
|
|
||||||
<listitem>
|
|
||||||
<para>Enable verbose mode, in which more information is printed to the console. Mutter needs to be built with the --enable-verbose-mode option (enabled by default). For more fine-grained control of the output, see meta_add_verbose_topic().</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
<varlistentry>
|
|
||||||
<term>MUTTER_DEBUG</term>
|
|
||||||
<listitem>
|
|
||||||
<para>Traps and prints X errors to the console.</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
<varlistentry>
|
|
||||||
<term>MUTTER_G_FATAL_WARNINGS</term>
|
|
||||||
<listitem>
|
|
||||||
<para>Causes any logging from the domains Mutter, Gtk, Gdk, Pango or GLib to terminate the process (only when using the log functions in GLib).</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
<varlistentry>
|
|
||||||
<term>MUTTER_USE_LOGFILE</term>
|
|
||||||
<listitem>
|
|
||||||
<para>Log all messages to a temporary file.</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
<varlistentry>
|
|
||||||
<term>MUTTER_DEBUG_XINERAMA</term>
|
|
||||||
<listitem>
|
|
||||||
<para>Log extra information about support of the XINERAMA extension.</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
<varlistentry>
|
|
||||||
<term>MUTTER_DEBUG_SM</term>
|
|
||||||
<listitem>
|
|
||||||
<para>Log extra information about session management.</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
<varlistentry>
|
|
||||||
<term>MUTTER_DEBUG_BUTTON_GRABS</term>
|
|
||||||
<listitem>
|
|
||||||
<para>Log extra information about button grabs.</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
<varlistentry>
|
|
||||||
<term>MUTTER_SYNC</term>
|
|
||||||
<listitem>
|
|
||||||
<para>Call XSync after each X call.</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
<varlistentry>
|
|
||||||
<term>MUTTER_DISPLAY</term>
|
|
||||||
<listitem>
|
|
||||||
<para>Name of the X11 display to use.</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
<varlistentry>
|
|
||||||
<term>META_DISABLE_MIPMAPS</term>
|
|
||||||
<listitem>
|
|
||||||
<para>Disable use of mipmaps for the textures that back window pixmaps.</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
<varlistentry>
|
|
||||||
<term>MUTTER_USE_STATIC_GRAVITY</term>
|
|
||||||
<listitem>
|
|
||||||
<para>Enable support for clients with static bit-gravity.</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
<varlistentry>
|
|
||||||
<term>MUTTER_WM_CLASS_FILTER</term>
|
|
||||||
<listitem>
|
|
||||||
<para>Comma-separated list of WM_CLASS names to which to restrict Mutter to.</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
<varlistentry>
|
|
||||||
<term>MUTTER_DISABLE_FALLBACK_COLOR</term>
|
|
||||||
<listitem>
|
|
||||||
<para>Disable fallback for themed colors, for easier detection of typographical errors.</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
</variablelist>
|
|
||||||
|
|
||||||
</section>
|
|
||||||
|
|
||||||
</partintro>
|
|
||||||
</part>
|
|
@@ -1,396 +0,0 @@
|
|||||||
Themes are in a simple XML-subset format. There are multiple versions
|
|
||||||
of the theme format, and a given theme can support more than one format.
|
|
||||||
|
|
||||||
Version 1: THEMEDIR/metacity-1/metacity-theme-1.xml
|
|
||||||
(original metacity format)
|
|
||||||
Version 2: THEMEDIR/metacity-1/metacity-theme-2.xml
|
|
||||||
Version 3: THEMEDIR/metacity-1/metacity-theme-3.xml
|
|
||||||
|
|
||||||
The subdirectory name is "metacity-1" in all versions.
|
|
||||||
|
|
||||||
As you might expect, older versions of metacity will not understand
|
|
||||||
newer theme formats. However, newer versions will use old themes.
|
|
||||||
Metacity will always use the newest theme format it understands that
|
|
||||||
the X server supports. Some format versions are only supported if you
|
|
||||||
have the right X server features.
|
|
||||||
|
|
||||||
Each format *requires* the corresponding filename. If you put version
|
|
||||||
2 format features in the metacity-1/metacity-theme-1.xml file, then
|
|
||||||
metacity will get angry.
|
|
||||||
|
|
||||||
This document has separate sections for each format version. You may
|
|
||||||
want to read the document in reverse order, since the base features
|
|
||||||
are discussed under version 1.
|
|
||||||
|
|
||||||
New Features in Theme Format Version 3.4
|
|
||||||
========================================
|
|
||||||
|
|
||||||
An additional color type is added to pick up custom colors defined
|
|
||||||
in the GTK+ theme's CSS:
|
|
||||||
|
|
||||||
gtk:custom(name,fallback)
|
|
||||||
|
|
||||||
where <name> refers to a custom color defined with @define-color in
|
|
||||||
the GTK+ theme, and <fallback> provides an alternative color definition
|
|
||||||
in case the color referenced by <name> is not found.
|
|
||||||
|
|
||||||
New Features in Theme Format Version 3.3
|
|
||||||
========================================
|
|
||||||
|
|
||||||
Add two additional button background functions - left_single_background and
|
|
||||||
right_single_background - for button groups with just a single button.
|
|
||||||
|
|
||||||
There are now additional frame states to style left/right tiled windows
|
|
||||||
differently ("tiled_left", "tiled_right", "tiled_left_and_shaded",
|
|
||||||
"tiled_right_and_shaded").
|
|
||||||
|
|
||||||
New Features in Theme Format Version 3.2
|
|
||||||
========================================
|
|
||||||
|
|
||||||
A new window type 'attached' is added for modal dialogs which are
|
|
||||||
attached to their parent window. (When the attach_modal_dialogs preference
|
|
||||||
is turned on.) If no style is defined for the 'attached' window type,
|
|
||||||
the 'border' window type will be used instead.
|
|
||||||
|
|
||||||
New Features in Theme Format Version 3.1
|
|
||||||
========================================
|
|
||||||
|
|
||||||
Additional predefined variables are added for positioning expressions:
|
|
||||||
|
|
||||||
frame_x_center: the X center of the entire frame, with respect to the
|
|
||||||
piece currently being drawn.
|
|
||||||
frame_y_center: the Y center of the entire frame, with respect to the
|
|
||||||
piece currently being drawn.
|
|
||||||
|
|
||||||
The <title/> element now supports an "ellipsize_width" attribute. When
|
|
||||||
specified, this gives a width at which to ellipsize the title. If not
|
|
||||||
specified, the title will simply be clipped to the title area.
|
|
||||||
|
|
||||||
New Features in Theme Format Version 3
|
|
||||||
======================================
|
|
||||||
|
|
||||||
Format version 3 has exactly one new feature; any element in the file
|
|
||||||
can now have a version attribute:
|
|
||||||
|
|
||||||
version="[<|<=|=>|>] MAJOR.MINOR"
|
|
||||||
|
|
||||||
(< and > should be to be entity escaped as < and >). If this
|
|
||||||
version check is not met, then the element and its children will be
|
|
||||||
ignored. This allows having alternate sections of the theme file for
|
|
||||||
older and newer version of the Metacity theme format.
|
|
||||||
|
|
||||||
When placed on the toplevel <metacity_theme> element, an unsatisfied
|
|
||||||
version check will not just cause the contents of the file to be
|
|
||||||
ignored, it will also cause the lookup of a theme file to proceed on
|
|
||||||
and look for an older format 2 or format 1 file. This allows making a
|
|
||||||
metacity-theme-3.xml file that is only used the format version 3.2 or
|
|
||||||
newer is supported, and using metacity-theme-1.xml for older window
|
|
||||||
managers.
|
|
||||||
|
|
||||||
New Features in Theme Format Version 2
|
|
||||||
======================================
|
|
||||||
|
|
||||||
The optional attributes rounded_top_left, rounded_top_right,
|
|
||||||
rounded_bottom_left and rounded_bottom_right on <frame_geometry>
|
|
||||||
should now be the radius of the corner in pixels. You may still use
|
|
||||||
the values "false" for 0 and "true" for 5, which means v1 values will
|
|
||||||
still work just fine.
|
|
||||||
|
|
||||||
<frame_geometry> has a new optional attribute, hide_buttons. If this
|
|
||||||
is true, no buttons will be displayed on the titlebar.
|
|
||||||
|
|
||||||
Anywhere you can use a positive integer, you can use an integer constant.
|
|
||||||
|
|
||||||
As well as constant integers and reals, you may define constant colours,
|
|
||||||
thus:
|
|
||||||
<constant name="RevoltingPink" value="#FF00FF"/>
|
|
||||||
<constant name="Background" value="gtk:bg[NORMAL]"/>
|
|
||||||
|
|
||||||
<frame_style> has two new optional attributes, background and alpha.
|
|
||||||
If you specify alpha, you must specify background. background is a
|
|
||||||
colour used for the background of the frame. alpha is the transparency
|
|
||||||
as a real between 0.0 and 1.0. If the current X server does not support
|
|
||||||
alpha channels, the value is ignored.
|
|
||||||
|
|
||||||
The filename attribute of <image> may begin with "theme:". If so, the
|
|
||||||
rest of the string is the name of a theme icon. The 64x64 version of the
|
|
||||||
icon is used, except for fallback mini_icons, which use the 16x16 version.
|
|
||||||
This does not affect ordinary resizing. For example:
|
|
||||||
<button function="close" state="normal">
|
|
||||||
<draw_ops>
|
|
||||||
<include name="active_button"/>
|
|
||||||
<image filename="theme:gnome-logout" x="2" y="2"
|
|
||||||
width="width-4" height="height-4"/>
|
|
||||||
<!-- Note: not "theme:gnome-logout.png" or similar. -->
|
|
||||||
</draw_ops>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<menu_icon>s are parsed but ignored.
|
|
||||||
|
|
||||||
Fallback icons can be specified using <fallback>. There are two
|
|
||||||
optional arguments, icon and mini_icon. The values of these arguments
|
|
||||||
are identical to that of the filename attribute of <image>. Fallback
|
|
||||||
icons are used when a window does not supply its own icon. If a fallback
|
|
||||||
icon is not specified with <fallback>, Metacity will use a built-in
|
|
||||||
icon, as in metacity-theme-1.
|
|
||||||
|
|
||||||
The <arc> element, as well as the original start_angle and end_angle
|
|
||||||
attributes, may be given from and to attributes. The values of these
|
|
||||||
attributes are given in degrees clockwise, with 0 being straight up.
|
|
||||||
For example:
|
|
||||||
<arc from="0.0" to="90.0" filled="true" color="#FF00FF"
|
|
||||||
x="0" y="5" width="15" height="15"/>
|
|
||||||
|
|
||||||
<frame state="shaded"> may now take an optional resize attribute, with
|
|
||||||
the same interpretation as the resize attribute on <frame state="normal">.
|
|
||||||
If this attribute is omitted for state="shaded", it defaults to "both".
|
|
||||||
(If it is omitted for state="normal", it remains an error.)
|
|
||||||
|
|
||||||
In addition to the four <button> functions which are required in
|
|
||||||
metacity-theme-1, there are six new functions in metacity-theme-2:
|
|
||||||
shade, unshade, above, unabove, stick and unstick.
|
|
||||||
|
|
||||||
Overview of Theme Format Version 1
|
|
||||||
==================================
|
|
||||||
|
|
||||||
<?xml version="1.0"?>
|
|
||||||
<metacity_theme>
|
|
||||||
<!-- Only one info section is allowed -->
|
|
||||||
<info>
|
|
||||||
<name>Foo</name>
|
|
||||||
<author>Foo P. Bar</author>
|
|
||||||
<copyright>whoever, 2002</copyright>
|
|
||||||
<date>Jan 31 2005</date>
|
|
||||||
<description>A sentence about the theme.</description>
|
|
||||||
</info>
|
|
||||||
|
|
||||||
<!-- define a frame geometry to be referenced later -->
|
|
||||||
<!-- frame_geometry has an optional has_title attribute which
|
|
||||||
determines whether the title text height is included in the
|
|
||||||
height calculation. if not specified, defaults to true.
|
|
||||||
It also has an optional text_size="medium" attribute
|
|
||||||
(same sizes as with Pango markup, xx-small thru medium thru
|
|
||||||
xx-large)
|
|
||||||
|
|
||||||
Finally it has optional args rounded_top_left=true,
|
|
||||||
rounded_top_right=true, rounded_bottom_left=true,
|
|
||||||
rounded_bottom_right=true.
|
|
||||||
|
|
||||||
-->
|
|
||||||
<frame_geometry name="normal" has_title="true" title_scale="medium">
|
|
||||||
<distance name="left_width" value="6"/>
|
|
||||||
<distance name="right_width" value="6"/>
|
|
||||||
<distance name="bottom_height" value="7"/>
|
|
||||||
<distance name="left_titlebar_edge" value="6"/>
|
|
||||||
<distance name="right_titlebar_edge" value="6"/>
|
|
||||||
<distance name="button_width" value="17"/>
|
|
||||||
<distance name="button_height" value="17"/>
|
|
||||||
<!-- alternative to button_width button_height distances -->
|
|
||||||
<aspect_ratio name="button" value="1.0"/>
|
|
||||||
<distance name="title_vertical_pad" value="4"/>
|
|
||||||
<border name="title_border" left="3" right="12" top="4" bottom="3"/>
|
|
||||||
<border name="button_border" left="0" right="0" top="1" bottom="1"/>
|
|
||||||
</frame_geometry>
|
|
||||||
|
|
||||||
<!-- inheritance is allowed; simply overwrites values from parent -->
|
|
||||||
<frame_geometry name="borderless" parent="normal">
|
|
||||||
<distance name="left_width" value="0"/>
|
|
||||||
<distance name="right_width" value="0"/>
|
|
||||||
<distance name="bottom_height" value="0"/>
|
|
||||||
<distance name="left_titlebar_edge" value="0"/>
|
|
||||||
<distance name="right_titlebar_edge" value="0"/>
|
|
||||||
</frame_geometry>
|
|
||||||
|
|
||||||
<!-- define a constant to use in positions/sizes of draw operations;
|
|
||||||
constant names must start with a capital letter.
|
|
||||||
-->
|
|
||||||
<constant name="LineOffset" value="3"/>
|
|
||||||
|
|
||||||
<!-- define drawing operations to be referenced later;
|
|
||||||
these draw-op lists can also be placed inline.
|
|
||||||
|
|
||||||
Positions/lengths are given as expressions.
|
|
||||||
Operators are: +,-,*,/,%,`max`,`min`
|
|
||||||
All operators are infix including `max` and `min`,
|
|
||||||
i.e. "2 `max` 5"
|
|
||||||
|
|
||||||
Some variables are predefined, and constants can also
|
|
||||||
be used. Variables are:
|
|
||||||
|
|
||||||
width - width of target area
|
|
||||||
height - height of target area
|
|
||||||
object_width - natural width of object being drawn
|
|
||||||
object_height - natural height of object being drawn
|
|
||||||
left_width - distance from left of frame to client window
|
|
||||||
right_width - distance from right of frame to client window
|
|
||||||
top_height - distance from top of frame to client window
|
|
||||||
bottom_height - distance from bottom of frame to client window
|
|
||||||
mini_icon_width - width of mini icon for window
|
|
||||||
mini_icon_height - height of mini icon
|
|
||||||
icon_width - width of large icon
|
|
||||||
icon_height - height of large icon
|
|
||||||
title_width - width of title text
|
|
||||||
title_height - height of title text
|
|
||||||
|
|
||||||
All these are always defined, except object_width/object_height
|
|
||||||
which only exists for <image> right now.
|
|
||||||
|
|
||||||
-->
|
|
||||||
|
|
||||||
<draw_ops name="demo_all_ops">
|
|
||||||
<line color="#00FF00" x1="LineOffset" y1="0" x2="0" y2="height"/>
|
|
||||||
<line color="gtk:fg[NORMAL]"
|
|
||||||
x1="width - 1" y1="0" x2="width - 1" y2="height"
|
|
||||||
width="3" dash_on_length="2" dash_off_length="3"/>
|
|
||||||
<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.7"
|
|
||||||
x="0" y="0" width="width - 1" height="height - 1" filled="true"/>
|
|
||||||
<arc color="dark gray" x="0" y="0" width="width - 1" height="height - 1"
|
|
||||||
filled="false" start_angle="30" extent_angle="180"/>
|
|
||||||
<tint color="orange" alpha="0.5" x="0" y="0" width="width" height="height"/>
|
|
||||||
<!-- may be vertical, horizontal, diagonal -->
|
|
||||||
<gradient type="diagonal"
|
|
||||||
x="10" y="30" width="width / 3" height="height / 4">
|
|
||||||
<!-- any number of colors allowed here. A color can be
|
|
||||||
a color name like "blue" (look at gcolorsel), a hex color
|
|
||||||
as in HTML (#FFBB99), or a color from the gtk theme
|
|
||||||
given as "gtk:base[NORMAL]", "gtk:fg[ACTIVE]", etc.
|
|
||||||
-->
|
|
||||||
<color value="gtk:fg[SELECTED]"/>
|
|
||||||
<!-- color obtained by a 0.5 alpha composite of the second color onto the first -->
|
|
||||||
<color value="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.5"/>
|
|
||||||
</gradient>
|
|
||||||
<!-- image has an optional colorize="#color" attribute to give the
|
|
||||||
image a certain color -->
|
|
||||||
<image filename="foo.png" alpha="0.7"
|
|
||||||
x="10" y="30" width="width / 3" height="height / 4"/>
|
|
||||||
<gtk_arrow state="normal" shadow="in" arrow="up"
|
|
||||||
filled="true"
|
|
||||||
x="2" y="2" width="width - 4" height="height - 4"/>
|
|
||||||
<gtk_box state="normal" shadow="out"
|
|
||||||
x="2" y="2" width="width - 4" height="height - 4"/>
|
|
||||||
<gtk_vline state="normal" x="2" y1="0" y2="height"/>
|
|
||||||
<!-- window's icon -->
|
|
||||||
<icon alpha="0.7"
|
|
||||||
x="10" y="30" width="width / 3" height="height / 4"/>
|
|
||||||
<!-- window's title -->
|
|
||||||
<title color="gtk:text[NORMAL]" x="20" y="30"/>
|
|
||||||
<!-- include another draw ops list; has optional x/y/width/height attrs -->
|
|
||||||
<include name="some_other_draw_ops"/>
|
|
||||||
<!-- tile another draw ops list; has optional
|
|
||||||
x/y/width/height/tile_xoffset/tile_yoffset -->
|
|
||||||
<tile name="some_other_draw_ops" tile_width="10" tile_height="10"/>
|
|
||||||
</draw_ops>
|
|
||||||
|
|
||||||
<frame_style name="normal" geometry="normal">
|
|
||||||
<!-- How to draw each piece of the frame.
|
|
||||||
For each piece, a draw_ops can be given inline or referenced
|
|
||||||
by name. If a piece is omitted, then nothing will be drawn
|
|
||||||
for that piece.
|
|
||||||
|
|
||||||
For each piece, the "width" and "height" variables in
|
|
||||||
coordinate expressions refers to the dimensions of the piece,
|
|
||||||
the origin is at the top left of the piece.
|
|
||||||
|
|
||||||
So <rectangle x="0" y="0" width="width-1" height="height-1"/>
|
|
||||||
will outline a piece.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<piece position="entire_background" draw_ops="demo_all_ops"/>
|
|
||||||
<piece position="left_titlebar_edge">
|
|
||||||
<draw_ops>
|
|
||||||
<line color="#00FF00" x1="0" y1="0" x2="0" y2="height"/>
|
|
||||||
</draw_ops>
|
|
||||||
</piece>
|
|
||||||
|
|
||||||
<!-- The complete list of frame pieces:
|
|
||||||
|
|
||||||
entire_background: whole frame
|
|
||||||
titlebar: entire area above the app's window
|
|
||||||
titlebar_middle: area of titlebar_background not considered
|
|
||||||
part of an edge
|
|
||||||
left_titlebar_edge: left side of titlebar background
|
|
||||||
right_titlebar_edge: right side of titlebar background
|
|
||||||
top_titlebar_edge: top side of titlebar background
|
|
||||||
bottom_titlebar_edge: bottom side of titlebar background
|
|
||||||
title: the title area (doesn't include buttons)
|
|
||||||
left_edge: left edge of the frame
|
|
||||||
right_edge: right edge of the frame
|
|
||||||
bottom_edge: bottom edge of the frame
|
|
||||||
overlay: same area as entire_background, but drawn after
|
|
||||||
drawing all sub-pieces instead of before
|
|
||||||
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- For buttons, drawing methods have to be provided for
|
|
||||||
each of three states:
|
|
||||||
normal, pressed, prelight
|
|
||||||
and the button function or position must be provided:
|
|
||||||
close, maximize, minimize, menu,
|
|
||||||
left_left_background, left_middle_background,
|
|
||||||
left_right_background, right_left_background,
|
|
||||||
right_middle_background, right_right_background
|
|
||||||
So a working theme needs 3*4 = 12 button declarations
|
|
||||||
and a theme may have up to 3*10 = 30 button declarations
|
|
||||||
in order to handle button-rearrangement preferences.
|
|
||||||
|
|
||||||
(The name "function" for the attribute is from before the
|
|
||||||
background values existed.)
|
|
||||||
-->
|
|
||||||
|
|
||||||
<button function="close" state="normal" draw_ops="previously_named"/>
|
|
||||||
<button function="menu" state="normal">
|
|
||||||
<draw_ops>
|
|
||||||
<icon alpha="0.7"
|
|
||||||
x="0" y="0" width="object_width" height="object_height"/>
|
|
||||||
</draw_ops>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
</frame_style>
|
|
||||||
|
|
||||||
<!-- styles can inherit from each other with the parent="" attribute.
|
|
||||||
In a subclass anything can be re-specified to override
|
|
||||||
the parent style. -->
|
|
||||||
<frame_style name="focused" parent="normal">
|
|
||||||
<piece position="title">
|
|
||||||
<draw_ops>
|
|
||||||
<rectangle color="gtk:bg[SELECTED]"
|
|
||||||
x="0" y="0" width="width-1" height="height-1"/>
|
|
||||||
<title color="gtk:fg[SELECTED]" x="(width - title_width) / 2"
|
|
||||||
y="(height - title_height) / 2"/>
|
|
||||||
</draw_ops>
|
|
||||||
</piece>
|
|
||||||
</frame_style>
|
|
||||||
|
|
||||||
<!-- Maps styles to states of frame.
|
|
||||||
|
|
||||||
Focus: yes (focused), no (not focused)
|
|
||||||
Window states: normal, maximized, shaded, maximized_and_shaded
|
|
||||||
Window resizability: none, vertical, horizontal, both
|
|
||||||
|
|
||||||
Everything unspecified just does the same as
|
|
||||||
unfocused/normal/both.
|
|
||||||
|
|
||||||
only state="normal" needs a resize="" attribute.
|
|
||||||
-->
|
|
||||||
<frame_style_set name="normal">
|
|
||||||
<frame focus="yes" state="normal" resize="both" style="focused"/>
|
|
||||||
<frame focus="no" state="normal" resize="both" style="normal"/>
|
|
||||||
</frame_style_set>
|
|
||||||
|
|
||||||
<!-- Each window type needs a style set
|
|
||||||
Types: normal, dialog, modal_dialog, menu, utility, border
|
|
||||||
-->
|
|
||||||
<window type="normal" style_set="normal"/>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- For menu icons, drawing methods are needed for the same
|
|
||||||
four types as the buttons, and GTK states
|
|
||||||
(insensitive,prelight,normal,etc.)
|
|
||||||
-->
|
|
||||||
|
|
||||||
<menu_icon function="close" state="normal" draw_ops="previously_named"/>
|
|
||||||
|
|
||||||
|
|
||||||
</metacity_theme>
|
|
||||||
|
|
||||||
|
|
@@ -23,7 +23,8 @@ environment.</description>
|
|||||||
<download-page rdf:resource="http://download.gnome.org/sources/mutter/" />
|
<download-page rdf:resource="http://download.gnome.org/sources/mutter/" />
|
||||||
<bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=mutter" />
|
<bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=mutter" />
|
||||||
|
|
||||||
<category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
|
<category rdf:resource="http://api.gnome.org/doap-extensions#core" />
|
||||||
|
<programming-language>C</programming-language>
|
||||||
|
|
||||||
<maintainer>
|
<maintainer>
|
||||||
<foaf:Person>
|
<foaf:Person>
|
||||||
|
@@ -1,8 +1,11 @@
|
|||||||
# List of source files containing translatable strings.
|
# List of source files containing translatable strings.
|
||||||
# Please keep this file sorted alphabetically.
|
# Please keep this file sorted alphabetically.
|
||||||
src/50-mutter-navigation.xml.in
|
data/50-mutter-navigation.xml.in
|
||||||
src/50-mutter-system.xml.in
|
data/50-mutter-system.xml.in
|
||||||
src/50-mutter-windows.xml.in
|
data/50-mutter-windows.xml.in
|
||||||
|
data/mutter.desktop.in
|
||||||
|
data/org.gnome.mutter.gschema.xml.in
|
||||||
|
data/org.gnome.mutter.wayland.gschema.xml.in
|
||||||
src/backends/meta-monitor-manager.c
|
src/backends/meta-monitor-manager.c
|
||||||
src/compositor/compositor.c
|
src/compositor/compositor.c
|
||||||
src/compositor/meta-background.c
|
src/compositor/meta-background.c
|
||||||
@@ -18,13 +21,8 @@ src/core/prefs.c
|
|||||||
src/core/screen.c
|
src/core/screen.c
|
||||||
src/core/util.c
|
src/core/util.c
|
||||||
src/core/window.c
|
src/core/window.c
|
||||||
src/mutter.desktop.in
|
|
||||||
src/org.gnome.mutter.gschema.xml.in
|
|
||||||
src/org.gnome.mutter.wayland.gschema.xml.in
|
|
||||||
src/ui/frames.c
|
src/ui/frames.c
|
||||||
src/ui/resizepopup.c
|
|
||||||
src/ui/theme.c
|
src/ui/theme.c
|
||||||
src/ui/theme-parser.c
|
|
||||||
src/x11/session.c
|
src/x11/session.c
|
||||||
src/x11/window-props.c
|
src/x11/window-props.c
|
||||||
src/x11/xprops.c
|
src/x11/xprops.c
|
||||||
|
@@ -1,2 +1,2 @@
|
|||||||
src/metacity.schemas.in
|
# List of source files that should NOT be translated.
|
||||||
src/mutter-wayland.desktop.in
|
# Please keep this file sorted alphabetically.
|
||||||
|
2679
po/bn_IN.po
2679
po/bn_IN.po
File diff suppressed because it is too large
Load Diff
1275
po/ca@valencia.po
1275
po/ca@valencia.po
File diff suppressed because it is too large
Load Diff
2458
po/pt_BR.po
2458
po/pt_BR.po
File diff suppressed because it is too large
Load Diff
2394
po/sr@latin.po
2394
po/sr@latin.po
File diff suppressed because it is too large
Load Diff
1306
po/zh_CN.po
1306
po/zh_CN.po
File diff suppressed because it is too large
Load Diff
1267
po/zh_HK.po
1267
po/zh_HK.po
File diff suppressed because it is too large
Load Diff
2291
po/zh_TW.po
2291
po/zh_TW.po
File diff suppressed because it is too large
Load Diff
47
src/Makefile-tests.am
Normal file
47
src/Makefile-tests.am
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
# A framework for running scripted tests
|
||||||
|
|
||||||
|
if HAVE_WAYLAND
|
||||||
|
|
||||||
|
if BUILDOPT_INSTALL_TESTS
|
||||||
|
stackingdir = $(pkgdatadir)/tests/stacking
|
||||||
|
dist_stacking_DATA = \
|
||||||
|
tests/stacking/basic-x11.metatest \
|
||||||
|
tests/stacking/basic-wayland.metatest \
|
||||||
|
tests/stacking/minimized.metatest \
|
||||||
|
tests/stacking/mixed-windows.metatest \
|
||||||
|
tests/stacking/set-parent.metatest \
|
||||||
|
tests/stacking/override-redirect.metatest
|
||||||
|
|
||||||
|
mutter-all.test: tests/mutter-all.test.in
|
||||||
|
$(AM_V_GEN) sed -e "s|@libexecdir[@]|$(libexecdir)|g" $< > $@.tmp && mv $@.tmp $@
|
||||||
|
|
||||||
|
installedtestsdir = $(datadir)/installed-tests/mutter
|
||||||
|
installedtests_DATA = mutter-all.test
|
||||||
|
|
||||||
|
installedtestsbindir = $(libexecdir)/installed-tests/mutter
|
||||||
|
installedtestsbin_PROGRAMS = mutter-test-client mutter-test-runner
|
||||||
|
else
|
||||||
|
noinst_PROGRAMS += mutter-test-client mutter-test-runner
|
||||||
|
endif
|
||||||
|
|
||||||
|
EXTRA_DIST += tests/mutter-all.test.in
|
||||||
|
|
||||||
|
mutter_test_client_SOURCES = tests/test-client.c
|
||||||
|
mutter_test_client_LDADD = $(MUTTER_LIBS) libmutter.la
|
||||||
|
|
||||||
|
mutter_test_runner_SOURCES = tests/test-runner.c
|
||||||
|
mutter_test_runner_LDADD = $(MUTTER_LIBS) libmutter.la
|
||||||
|
|
||||||
|
.PHONY: run-tests
|
||||||
|
|
||||||
|
run-tests: mutter-test-client mutter-test-runner
|
||||||
|
./mutter-test-runner $(dist_stacking_DATA)
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Some random test programs for bits of the code
|
||||||
|
|
||||||
|
testboxes_SOURCES = core/testboxes.c
|
||||||
|
testboxes_LDADD = $(MUTTER_LIBS) libmutter.la
|
||||||
|
|
||||||
|
noinst_PROGRAMS += testboxes
|
311
src/Makefile.am
311
src/Makefile.am
@@ -5,55 +5,71 @@ lib_LTLIBRARIES = libmutter.la
|
|||||||
|
|
||||||
SUBDIRS=compositor/plugins
|
SUBDIRS=compositor/plugins
|
||||||
|
|
||||||
INCLUDES= \
|
EXTRA_DIST =
|
||||||
|
NULL =
|
||||||
|
|
||||||
|
AM_CPPFLAGS = \
|
||||||
-DCLUTTER_ENABLE_COMPOSITOR_API \
|
-DCLUTTER_ENABLE_COMPOSITOR_API \
|
||||||
-DCLUTTER_ENABLE_EXPERIMENTAL_API \
|
-DCLUTTER_ENABLE_EXPERIMENTAL_API \
|
||||||
-DCOGL_ENABLE_EXPERIMENTAL_API \
|
-DCOGL_ENABLE_EXPERIMENTAL_API \
|
||||||
-DCOGL_ENABLE_EXPERIMENTAL_2_0_API \
|
-DCOGL_ENABLE_EXPERIMENTAL_2_0_API \
|
||||||
|
-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
|
||||||
|
-DCOGL_DISABLE_DEPRECATION_WARNINGS \
|
||||||
$(MUTTER_CFLAGS) \
|
$(MUTTER_CFLAGS) \
|
||||||
|
$(MUTTER_NATIVE_BACKEND_CFLAGS) \
|
||||||
|
-I$(builddir) \
|
||||||
-I$(srcdir) \
|
-I$(srcdir) \
|
||||||
-I$(srcdir)/backends \
|
-I$(srcdir)/backends \
|
||||||
-I$(srcdir)/core \
|
-I$(srcdir)/core \
|
||||||
-I$(srcdir)/ui \
|
-I$(srcdir)/ui \
|
||||||
-I$(srcdir)/compositor \
|
-I$(srcdir)/compositor \
|
||||||
-DMUTTER_LIBEXECDIR=\"$(libexecdir)\" \
|
-DMUTTER_LIBEXECDIR=\"$(libexecdir)\" \
|
||||||
-DHOST_ALIAS=\"@HOST_ALIAS@\" \
|
-DMUTTER_LOCALEDIR=\"$(localedir)\" \
|
||||||
-DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" \
|
|
||||||
-DMUTTER_PKGDATADIR=\"$(pkgdatadir)\" \
|
-DMUTTER_PKGDATADIR=\"$(pkgdatadir)\" \
|
||||||
-DMUTTER_DATADIR=\"$(datadir)\" \
|
-DMUTTER_DATADIR=\"$(datadir)\" \
|
||||||
-DG_LOG_DOMAIN=\"mutter\" \
|
-DG_LOG_DOMAIN=\"mutter\" \
|
||||||
-DSN_API_NOT_YET_FROZEN=1 \
|
-DSN_API_NOT_YET_FROZEN=1 \
|
||||||
-DMUTTER_MAJOR_VERSION=$(MUTTER_MAJOR_VERSION) \
|
|
||||||
-DMUTTER_MINOR_VERSION=$(MUTTER_MINOR_VERSION) \
|
|
||||||
-DMUTTER_MICRO_VERSION=$(MUTTER_MICRO_VERSION) \
|
|
||||||
-DMUTTER_PLUGIN_API_VERSION=$(MUTTER_PLUGIN_API_VERSION) \
|
|
||||||
-DMUTTER_PKGLIBDIR=\"$(pkglibdir)\" \
|
-DMUTTER_PKGLIBDIR=\"$(pkglibdir)\" \
|
||||||
-DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\" \
|
-DMUTTER_PLUGIN_DIR=\"$(MUTTER_PLUGIN_DIR)\" \
|
||||||
-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
|
-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
|
||||||
-DXWAYLAND_PATH='"@XWAYLAND_PATH@"'
|
-DXWAYLAND_PATH=\"$(XWAYLAND_PATH)\" \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
mutter_built_sources = \
|
mutter_built_sources = \
|
||||||
$(dbus_idle_built_sources) \
|
$(dbus_idle_built_sources) \
|
||||||
$(dbus_display_config_built_sources) \
|
$(dbus_display_config_built_sources) \
|
||||||
$(dbus_login1_built_sources) \
|
$(dbus_login1_built_sources) \
|
||||||
mutter-enum-types.h \
|
meta/meta-enum-types.h \
|
||||||
mutter-enum-types.c \
|
meta-enum-types.c \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
if HAVE_WAYLAND
|
||||||
|
mutter_built_sources += \
|
||||||
|
pointer-gestures-unstable-v1-protocol.c \
|
||||||
|
pointer-gestures-unstable-v1-server-protocol.h \
|
||||||
gtk-shell-protocol.c \
|
gtk-shell-protocol.c \
|
||||||
gtk-shell-server-protocol.h \
|
gtk-shell-server-protocol.h \
|
||||||
xdg-shell-protocol.c \
|
xdg-shell-unstable-v5-protocol.c \
|
||||||
xdg-shell-server-protocol.h
|
xdg-shell-unstable-v5-server-protocol.h \
|
||||||
|
relative-pointer-unstable-v1-protocol.c \
|
||||||
|
relative-pointer-unstable-v1-server-protocol.h \
|
||||||
|
pointer-constraints-unstable-v1-protocol.c \
|
||||||
|
pointer-constraints-unstable-v1-server-protocol.h \
|
||||||
|
$(NULL)
|
||||||
|
endif
|
||||||
|
|
||||||
wayland_protocols = \
|
wayland_protocols = \
|
||||||
wayland/protocol/gtk-shell.xml \
|
wayland/protocol/gtk-shell.xml \
|
||||||
wayland/protocol/xdg-shell.xml
|
$(NULL)
|
||||||
|
|
||||||
libmutter_la_SOURCES = \
|
libmutter_la_SOURCES = \
|
||||||
backends/meta-backend.c \
|
backends/meta-backend.c \
|
||||||
backends/meta-backend.h \
|
meta/meta-backend.h \
|
||||||
backends/meta-backend-private.h \
|
backends/meta-backend-private.h \
|
||||||
|
backends/meta-barrier.c \
|
||||||
|
backends/meta-barrier-private.h \
|
||||||
backends/meta-cursor.c \
|
backends/meta-cursor.c \
|
||||||
backends/meta-cursor.h \
|
backends/meta-cursor.h \
|
||||||
backends/meta-cursor-private.h \
|
|
||||||
backends/meta-cursor-tracker.c \
|
backends/meta-cursor-tracker.c \
|
||||||
backends/meta-cursor-tracker-private.h \
|
backends/meta-cursor-tracker-private.h \
|
||||||
backends/meta-cursor-renderer.c \
|
backends/meta-cursor-renderer.c \
|
||||||
@@ -63,43 +79,45 @@ libmutter_la_SOURCES = \
|
|||||||
backends/meta-idle-monitor-private.h \
|
backends/meta-idle-monitor-private.h \
|
||||||
backends/meta-idle-monitor-dbus.c \
|
backends/meta-idle-monitor-dbus.c \
|
||||||
backends/meta-idle-monitor-dbus.h \
|
backends/meta-idle-monitor-dbus.h \
|
||||||
|
backends/meta-input-settings.c \
|
||||||
|
backends/meta-input-settings-private.h \
|
||||||
backends/meta-monitor-config.c \
|
backends/meta-monitor-config.c \
|
||||||
backends/meta-monitor-config.h \
|
backends/meta-monitor-config.h \
|
||||||
backends/meta-monitor-manager.c \
|
backends/meta-monitor-manager.c \
|
||||||
backends/meta-monitor-manager.h \
|
meta/meta-monitor-manager.h \
|
||||||
|
backends/meta-monitor-manager-private.h \
|
||||||
backends/meta-monitor-manager-dummy.c \
|
backends/meta-monitor-manager-dummy.c \
|
||||||
backends/meta-monitor-manager-dummy.h \
|
backends/meta-monitor-manager-dummy.h \
|
||||||
|
backends/meta-pointer-constraint.c \
|
||||||
|
backends/meta-pointer-constraint.h \
|
||||||
|
backends/meta-stage.h \
|
||||||
|
backends/meta-stage.c \
|
||||||
backends/edid-parse.c \
|
backends/edid-parse.c \
|
||||||
backends/edid.h \
|
backends/edid.h \
|
||||||
backends/native/meta-backend-native.c \
|
|
||||||
backends/native/meta-backend-native.h \
|
|
||||||
backends/native/meta-cursor-renderer-native.c \
|
|
||||||
backends/native/meta-cursor-renderer-native.h \
|
|
||||||
backends/native/meta-idle-monitor-native.c \
|
|
||||||
backends/native/meta-idle-monitor-native.h \
|
|
||||||
backends/native/meta-monitor-manager-kms.c \
|
|
||||||
backends/native/meta-monitor-manager-kms.h \
|
|
||||||
backends/native/meta-launcher.c \
|
|
||||||
backends/native/meta-launcher.h \
|
|
||||||
backends/native/dbus-utils.c \
|
|
||||||
backends/native/dbus-utils.h \
|
|
||||||
backends/x11/meta-backend-x11.c \
|
backends/x11/meta-backend-x11.c \
|
||||||
backends/x11/meta-backend-x11.h \
|
backends/x11/meta-backend-x11.h \
|
||||||
|
backends/x11/meta-barrier-x11.c \
|
||||||
|
backends/x11/meta-barrier-x11.h \
|
||||||
backends/x11/meta-cursor-renderer-x11.c \
|
backends/x11/meta-cursor-renderer-x11.c \
|
||||||
backends/x11/meta-cursor-renderer-x11.h \
|
backends/x11/meta-cursor-renderer-x11.h \
|
||||||
|
backends/x11/nested/meta-cursor-renderer-x11-nested.c \
|
||||||
|
backends/x11/nested/meta-cursor-renderer-x11-nested.h \
|
||||||
backends/x11/meta-idle-monitor-xsync.c \
|
backends/x11/meta-idle-monitor-xsync.c \
|
||||||
backends/x11/meta-idle-monitor-xsync.h \
|
backends/x11/meta-idle-monitor-xsync.h \
|
||||||
|
backends/x11/meta-input-settings-x11.c \
|
||||||
|
backends/x11/meta-input-settings-x11.h \
|
||||||
backends/x11/meta-monitor-manager-xrandr.c \
|
backends/x11/meta-monitor-manager-xrandr.c \
|
||||||
backends/x11/meta-monitor-manager-xrandr.h \
|
backends/x11/meta-monitor-manager-xrandr.h \
|
||||||
core/meta-accel-parse.c \
|
core/meta-accel-parse.c \
|
||||||
core/meta-accel-parse.h \
|
core/meta-accel-parse.h \
|
||||||
core/barrier.c \
|
|
||||||
meta/barrier.h \
|
meta/barrier.h \
|
||||||
core/bell.c \
|
core/bell.c \
|
||||||
core/bell.h \
|
core/bell.h \
|
||||||
core/boxes.c \
|
core/boxes.c \
|
||||||
core/boxes-private.h \
|
core/boxes-private.h \
|
||||||
meta/boxes.h \
|
meta/boxes.h \
|
||||||
|
core/meta-border.c \
|
||||||
|
core/meta-border.h \
|
||||||
compositor/clutter-utils.c \
|
compositor/clutter-utils.c \
|
||||||
compositor/clutter-utils.h \
|
compositor/clutter-utils.h \
|
||||||
compositor/cogl-utils.c \
|
compositor/cogl-utils.c \
|
||||||
@@ -107,28 +125,31 @@ libmutter_la_SOURCES = \
|
|||||||
compositor/compositor.c \
|
compositor/compositor.c \
|
||||||
compositor/compositor-private.h \
|
compositor/compositor-private.h \
|
||||||
compositor/meta-background.c \
|
compositor/meta-background.c \
|
||||||
|
compositor/meta-background-private.h \
|
||||||
compositor/meta-background-actor.c \
|
compositor/meta-background-actor.c \
|
||||||
compositor/meta-background-actor-private.h \
|
compositor/meta-background-actor-private.h \
|
||||||
|
compositor/meta-background-image.c \
|
||||||
compositor/meta-background-group.c \
|
compositor/meta-background-group.c \
|
||||||
compositor/meta-cullable.c \
|
compositor/meta-cullable.c \
|
||||||
compositor/meta-cullable.h \
|
compositor/meta-cullable.h \
|
||||||
|
compositor/meta-dnd-actor.c \
|
||||||
|
compositor/meta-dnd-actor-private.h \
|
||||||
|
compositor/meta-feedback-actor.c \
|
||||||
|
compositor/meta-feedback-actor-private.h \
|
||||||
compositor/meta-module.c \
|
compositor/meta-module.c \
|
||||||
compositor/meta-module.h \
|
compositor/meta-module.h \
|
||||||
compositor/meta-plugin.c \
|
compositor/meta-plugin.c \
|
||||||
compositor/meta-plugin-manager.c \
|
compositor/meta-plugin-manager.c \
|
||||||
compositor/meta-plugin-manager.h \
|
compositor/meta-plugin-manager.h \
|
||||||
compositor/meta-shadow-factory.c \
|
compositor/meta-shadow-factory.c \
|
||||||
compositor/meta-shadow-factory-private.h \
|
|
||||||
compositor/meta-shaped-texture.c \
|
compositor/meta-shaped-texture.c \
|
||||||
compositor/meta-shaped-texture-private.h \
|
compositor/meta-shaped-texture-private.h \
|
||||||
compositor/meta-surface-actor.c \
|
compositor/meta-surface-actor.c \
|
||||||
compositor/meta-surface-actor.h \
|
compositor/meta-surface-actor.h \
|
||||||
compositor/meta-surface-actor-x11.c \
|
compositor/meta-surface-actor-x11.c \
|
||||||
compositor/meta-surface-actor-x11.h \
|
compositor/meta-surface-actor-x11.h \
|
||||||
compositor/meta-surface-actor-wayland.c \
|
compositor/meta-sync-ring.c \
|
||||||
compositor/meta-surface-actor-wayland.h \
|
compositor/meta-sync-ring.h \
|
||||||
compositor/meta-stage.h \
|
|
||||||
compositor/meta-stage.c \
|
|
||||||
compositor/meta-texture-rectangle.c \
|
compositor/meta-texture-rectangle.c \
|
||||||
compositor/meta-texture-rectangle.h \
|
compositor/meta-texture-rectangle.h \
|
||||||
compositor/meta-texture-tower.c \
|
compositor/meta-texture-tower.c \
|
||||||
@@ -138,16 +159,17 @@ libmutter_la_SOURCES = \
|
|||||||
compositor/meta-window-group.c \
|
compositor/meta-window-group.c \
|
||||||
compositor/meta-window-group.h \
|
compositor/meta-window-group.h \
|
||||||
compositor/meta-window-shape.c \
|
compositor/meta-window-shape.c \
|
||||||
compositor/meta-window-shape.h \
|
|
||||||
compositor/region-utils.c \
|
compositor/region-utils.c \
|
||||||
compositor/region-utils.h \
|
compositor/region-utils.h \
|
||||||
meta/compositor.h \
|
meta/compositor.h \
|
||||||
meta/meta-background.h \
|
meta/meta-background.h \
|
||||||
meta/meta-background-actor.h \
|
meta/meta-background-actor.h \
|
||||||
|
meta/meta-background-image.h \
|
||||||
meta/meta-background-group.h \
|
meta/meta-background-group.h \
|
||||||
meta/meta-plugin.h \
|
meta/meta-plugin.h \
|
||||||
meta/meta-shadow-factory.h \
|
meta/meta-shadow-factory.h \
|
||||||
meta/meta-window-actor.h \
|
meta/meta-window-actor.h \
|
||||||
|
meta/meta-window-shape.h \
|
||||||
meta/compositor-mutter.h \
|
meta/compositor-mutter.h \
|
||||||
core/constraints.c \
|
core/constraints.c \
|
||||||
core/constraints.h \
|
core/constraints.h \
|
||||||
@@ -164,8 +186,8 @@ libmutter_la_SOURCES = \
|
|||||||
meta/errors.h \
|
meta/errors.h \
|
||||||
core/frame.c \
|
core/frame.c \
|
||||||
core/frame.h \
|
core/frame.h \
|
||||||
ui/gradient.c \
|
core/meta-gesture-tracker.c \
|
||||||
meta/gradient.h \
|
core/meta-gesture-tracker-private.h \
|
||||||
core/keybindings.c \
|
core/keybindings.c \
|
||||||
core/keybindings-private.h \
|
core/keybindings-private.h \
|
||||||
core/main.c \
|
core/main.c \
|
||||||
@@ -176,7 +198,10 @@ libmutter_la_SOURCES = \
|
|||||||
core/screen.c \
|
core/screen.c \
|
||||||
core/screen-private.h \
|
core/screen-private.h \
|
||||||
meta/screen.h \
|
meta/screen.h \
|
||||||
|
core/startup-notification.c \
|
||||||
|
core/startup-notification-private.h \
|
||||||
meta/types.h \
|
meta/types.h \
|
||||||
|
core/restart.c \
|
||||||
core/stack.c \
|
core/stack.c \
|
||||||
core/stack.h \
|
core/stack.h \
|
||||||
core/stack-tracker.c \
|
core/stack-tracker.c \
|
||||||
@@ -194,22 +219,20 @@ libmutter_la_SOURCES = \
|
|||||||
ui/ui.h \
|
ui/ui.h \
|
||||||
ui/frames.c \
|
ui/frames.c \
|
||||||
ui/frames.h \
|
ui/frames.h \
|
||||||
ui/resizepopup.c \
|
|
||||||
ui/resizepopup.h \
|
|
||||||
ui/theme-parser.c \
|
|
||||||
ui/theme.c \
|
ui/theme.c \
|
||||||
meta/theme.h \
|
meta/theme.h \
|
||||||
ui/theme-private.h \
|
ui/theme-private.h \
|
||||||
ui/ui.c \
|
ui/ui.c \
|
||||||
x11/iconcache.c \
|
x11/atomnames.h \
|
||||||
x11/iconcache.h \
|
x11/events.c \
|
||||||
x11/async-getprop.c \
|
x11/events.h \
|
||||||
x11/async-getprop.h \
|
|
||||||
x11/group-private.h \
|
x11/group-private.h \
|
||||||
x11/group-props.c \
|
x11/group-props.c \
|
||||||
x11/group-props.h \
|
x11/group-props.h \
|
||||||
x11/group.c \
|
x11/group.c \
|
||||||
meta/group.h \
|
meta/group.h \
|
||||||
|
x11/iconcache.c \
|
||||||
|
x11/iconcache.h \
|
||||||
x11/session.c \
|
x11/session.c \
|
||||||
x11/session.h \
|
x11/session.h \
|
||||||
x11/window-props.c \
|
x11/window-props.c \
|
||||||
@@ -220,38 +243,90 @@ libmutter_la_SOURCES = \
|
|||||||
x11/xprops.c \
|
x11/xprops.c \
|
||||||
x11/xprops.h \
|
x11/xprops.h \
|
||||||
x11/mutter-Xatomtype.h \
|
x11/mutter-Xatomtype.h \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
if HAVE_WAYLAND
|
||||||
|
libmutter_la_SOURCES += \
|
||||||
|
compositor/meta-surface-actor-wayland.c \
|
||||||
|
compositor/meta-surface-actor-wayland.h \
|
||||||
wayland/meta-wayland.c \
|
wayland/meta-wayland.c \
|
||||||
wayland/meta-wayland.h \
|
wayland/meta-wayland.h \
|
||||||
wayland/meta-wayland-private.h \
|
wayland/meta-wayland-private.h \
|
||||||
wayland/meta-xwayland.c \
|
wayland/meta-xwayland.c \
|
||||||
wayland/meta-xwayland.h \
|
wayland/meta-xwayland.h \
|
||||||
|
wayland/meta-xwayland-selection.c \
|
||||||
|
wayland/meta-xwayland-selection-private.h \
|
||||||
wayland/meta-xwayland-private.h \
|
wayland/meta-xwayland-private.h \
|
||||||
|
wayland/meta-wayland-buffer.c \
|
||||||
|
wayland/meta-wayland-buffer.h \
|
||||||
|
wayland/meta-wayland-region.c \
|
||||||
|
wayland/meta-wayland-region.h \
|
||||||
wayland/meta-wayland-data-device.c \
|
wayland/meta-wayland-data-device.c \
|
||||||
wayland/meta-wayland-data-device.h \
|
wayland/meta-wayland-data-device.h \
|
||||||
|
wayland/meta-wayland-data-device-private.h \
|
||||||
|
wayland/meta-wayland-pointer-gestures.c \
|
||||||
|
wayland/meta-wayland-pointer-gestures.h \
|
||||||
|
wayland/meta-wayland-pointer-gesture-swipe.c \
|
||||||
|
wayland/meta-wayland-pointer-gesture-swipe.h \
|
||||||
|
wayland/meta-wayland-pointer-gesture-pinch.c \
|
||||||
|
wayland/meta-wayland-pointer-gesture-pinch.h \
|
||||||
wayland/meta-wayland-keyboard.c \
|
wayland/meta-wayland-keyboard.c \
|
||||||
wayland/meta-wayland-keyboard.h \
|
wayland/meta-wayland-keyboard.h \
|
||||||
wayland/meta-wayland-pointer.c \
|
wayland/meta-wayland-pointer.c \
|
||||||
wayland/meta-wayland-pointer.h \
|
wayland/meta-wayland-pointer.h \
|
||||||
|
wayland/meta-wayland-pointer-constraints.c \
|
||||||
|
wayland/meta-wayland-pointer-constraints.h \
|
||||||
|
wayland/meta-pointer-lock-wayland.c \
|
||||||
|
wayland/meta-pointer-lock-wayland.h \
|
||||||
|
wayland/meta-pointer-confinement-wayland.c \
|
||||||
|
wayland/meta-pointer-confinement-wayland.h \
|
||||||
|
wayland/meta-wayland-popup.c \
|
||||||
|
wayland/meta-wayland-popup.h \
|
||||||
wayland/meta-wayland-seat.c \
|
wayland/meta-wayland-seat.c \
|
||||||
wayland/meta-wayland-seat.h \
|
wayland/meta-wayland-seat.h \
|
||||||
|
wayland/meta-wayland-touch.c \
|
||||||
|
wayland/meta-wayland-touch.h \
|
||||||
wayland/meta-wayland-surface.c \
|
wayland/meta-wayland-surface.c \
|
||||||
wayland/meta-wayland-surface.h \
|
wayland/meta-wayland-surface.h \
|
||||||
wayland/meta-wayland-types.h \
|
wayland/meta-wayland-types.h \
|
||||||
wayland/meta-wayland-versions.h \
|
wayland/meta-wayland-versions.h \
|
||||||
wayland/meta-wayland-outputs.c \
|
wayland/meta-wayland-outputs.c \
|
||||||
wayland/meta-wayland-outputs.h \
|
wayland/meta-wayland-outputs.h \
|
||||||
wayland/window-wayland.c \
|
wayland/meta-window-wayland.c \
|
||||||
wayland/window-wayland.h
|
wayland/meta-window-wayland.h \
|
||||||
|
$(NULL)
|
||||||
|
endif
|
||||||
|
|
||||||
nodist_libmutter_la_SOURCES = \
|
if HAVE_NATIVE_BACKEND
|
||||||
$(mutter_built_sources)
|
libmutter_la_SOURCES += \
|
||||||
|
backends/native/meta-backend-native.c \
|
||||||
|
backends/native/meta-backend-native.h \
|
||||||
|
backends/native/meta-backend-native-private.h \
|
||||||
|
backends/native/meta-barrier-native.c \
|
||||||
|
backends/native/meta-barrier-native.h \
|
||||||
|
backends/native/meta-cursor-renderer-native.c \
|
||||||
|
backends/native/meta-cursor-renderer-native.h \
|
||||||
|
backends/native/meta-idle-monitor-native.c \
|
||||||
|
backends/native/meta-idle-monitor-native.h \
|
||||||
|
backends/native/meta-input-settings-native.c \
|
||||||
|
backends/native/meta-input-settings-native.h \
|
||||||
|
backends/native/meta-monitor-manager-kms.c \
|
||||||
|
backends/native/meta-monitor-manager-kms.h \
|
||||||
|
backends/native/meta-launcher.c \
|
||||||
|
backends/native/meta-launcher.h \
|
||||||
|
backends/native/dbus-utils.c \
|
||||||
|
backends/native/dbus-utils.h \
|
||||||
|
$(NULL)
|
||||||
|
endif
|
||||||
|
|
||||||
libmutter_la_LDFLAGS = -no-undefined
|
nodist_libmutter_la_SOURCES = $(mutter_built_sources)
|
||||||
libmutter_la_LIBADD = $(MUTTER_LIBS)
|
|
||||||
|
libmutter_la_LDFLAGS = -no-undefined -export-symbols-regex "^(meta|ag)_.*"
|
||||||
|
libmutter_la_LIBADD = $(MUTTER_LIBS) $(MUTTER_NATIVE_BACKEND_LIBS)
|
||||||
|
|
||||||
# Headers installed for plugins; introspected information will
|
# Headers installed for plugins; introspected information will
|
||||||
# be extracted into Mutter-<version>.gir
|
# be extracted into Mutter-<version>.gir
|
||||||
libmutterinclude_base_headers = \
|
libmutterinclude_headers = \
|
||||||
meta/barrier.h \
|
meta/barrier.h \
|
||||||
meta/boxes.h \
|
meta/boxes.h \
|
||||||
meta/common.h \
|
meta/common.h \
|
||||||
@@ -259,43 +334,60 @@ libmutterinclude_base_headers = \
|
|||||||
meta/compositor.h \
|
meta/compositor.h \
|
||||||
meta/display.h \
|
meta/display.h \
|
||||||
meta/errors.h \
|
meta/errors.h \
|
||||||
meta/gradient.h \
|
|
||||||
meta/group.h \
|
meta/group.h \
|
||||||
meta/keybindings.h \
|
meta/keybindings.h \
|
||||||
meta/main.h \
|
meta/main.h \
|
||||||
meta/meta-background-actor.h \
|
meta/meta-backend.h \
|
||||||
meta/meta-background-group.h \
|
|
||||||
meta/meta-background.h \
|
meta/meta-background.h \
|
||||||
|
meta/meta-background-actor.h \
|
||||||
|
meta/meta-background-image.h \
|
||||||
|
meta/meta-background-group.h \
|
||||||
meta/meta-cursor-tracker.h \
|
meta/meta-cursor-tracker.h \
|
||||||
meta/meta-idle-monitor.h \
|
meta/meta-idle-monitor.h \
|
||||||
meta/meta-plugin.h \
|
meta/meta-plugin.h \
|
||||||
|
meta/meta-monitor-manager.h \
|
||||||
meta/meta-shaped-texture.h \
|
meta/meta-shaped-texture.h \
|
||||||
meta/meta-shadow-factory.h \
|
meta/meta-shadow-factory.h \
|
||||||
meta/meta-window-actor.h \
|
meta/meta-window-actor.h \
|
||||||
|
meta/meta-window-shape.h \
|
||||||
meta/prefs.h \
|
meta/prefs.h \
|
||||||
meta/screen.h \
|
meta/screen.h \
|
||||||
meta/theme.h \
|
meta/theme.h \
|
||||||
meta/types.h \
|
meta/types.h \
|
||||||
meta/util.h \
|
meta/util.h \
|
||||||
meta/window.h \
|
meta/window.h \
|
||||||
meta/workspace.h
|
meta/workspace.h \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
# Excluded from scanning for introspection but installed
|
libmutterinclude_built_headers = \
|
||||||
# atomnames.h: macros cause problems for scanning process
|
meta/meta-version.h \
|
||||||
libmutterinclude_extra_headers = \
|
meta/meta-enum-types.h \
|
||||||
meta/atomnames.h
|
$(NULL)
|
||||||
|
|
||||||
|
libmutterinclude_base_headers = \
|
||||||
|
$(libmutterinclude_headers) \
|
||||||
|
$(libmutterinclude_built_headers)
|
||||||
|
|
||||||
libmutterincludedir = $(includedir)/mutter/meta
|
libmutterincludedir = $(includedir)/mutter/meta
|
||||||
|
|
||||||
libmutterinclude_HEADERS = \
|
libmutterinclude_HEADERS = \
|
||||||
$(libmutterinclude_base_headers) \
|
$(libmutterinclude_headers)
|
||||||
$(libmutterinclude_extra_headers)
|
|
||||||
|
nodist_libmutterinclude_HEADERS = \
|
||||||
|
$(libmutterinclude_built_headers)
|
||||||
|
|
||||||
bin_PROGRAMS=mutter
|
bin_PROGRAMS=mutter
|
||||||
|
noinst_PROGRAMS=
|
||||||
|
|
||||||
mutter_SOURCES = core/mutter.c
|
mutter_SOURCES = core/mutter.c
|
||||||
mutter_LDADD = $(MUTTER_LIBS) libmutter.la
|
mutter_LDADD = $(MUTTER_LIBS) libmutter.la
|
||||||
|
|
||||||
|
libexec_PROGRAMS = mutter-restart-helper
|
||||||
|
mutter_restart_helper_SOURCES = core/restart-helper.c
|
||||||
|
mutter_restart_helper_LDADD = $(MUTTER_LIBS)
|
||||||
|
|
||||||
|
include Makefile-tests.am
|
||||||
|
|
||||||
if HAVE_INTROSPECTION
|
if HAVE_INTROSPECTION
|
||||||
include $(INTROSPECTION_MAKEFILE)
|
include $(INTROSPECTION_MAKEFILE)
|
||||||
|
|
||||||
@@ -319,101 +411,62 @@ INTROSPECTION_GIRS = Meta-$(api_version).gir
|
|||||||
Meta-$(api_version).gir: libmutter.la
|
Meta-$(api_version).gir: libmutter.la
|
||||||
@META_GIR@_INCLUDES = GObject-2.0 GDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0 Cogl-1.0
|
@META_GIR@_INCLUDES = GObject-2.0 GDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0 Cogl-1.0
|
||||||
@META_GIR@_EXPORT_PACKAGES = libmutter
|
@META_GIR@_EXPORT_PACKAGES = libmutter
|
||||||
@META_GIR@_CFLAGS = $(INCLUDES)
|
@META_GIR@_CFLAGS = $(AM_CPPFLAGS)
|
||||||
@META_GIR@_LIBS = libmutter.la
|
@META_GIR@_LIBS = libmutter.la
|
||||||
@META_GIR@_FILES = \
|
@META_GIR@_FILES = \
|
||||||
mutter-enum-types.h \
|
|
||||||
$(libmutterinclude_base_headers) \
|
$(libmutterinclude_base_headers) \
|
||||||
$(filter %.c,$(libmutter_la_SOURCES) $(nodist_libmutter_la_SOURCES))
|
$(filter %.c,$(libmutter_la_SOURCES) $(nodist_libmutter_la_SOURCES))
|
||||||
@META_GIR@_SCANNERFLAGS = --warn-all --warn-error
|
@META_GIR@_SCANNERFLAGS = --warn-all --warn-error
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
testboxes_SOURCES = core/testboxes.c
|
|
||||||
testgradient_SOURCES = ui/testgradient.c
|
|
||||||
testasyncgetprop_SOURCES = x11/testasyncgetprop.c
|
|
||||||
|
|
||||||
noinst_PROGRAMS=testboxes testgradient testasyncgetprop
|
|
||||||
|
|
||||||
testboxes_LDADD = $(MUTTER_LIBS) libmutter.la
|
|
||||||
testgradient_LDADD = $(MUTTER_LIBS) libmutter.la
|
|
||||||
testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter.la
|
|
||||||
|
|
||||||
@INTLTOOL_DESKTOP_RULE@
|
|
||||||
|
|
||||||
desktopfilesdir=$(datadir)/applications
|
|
||||||
desktopfiles_in_files=mutter.desktop.in
|
|
||||||
desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
|
|
||||||
desktopfiles_DATA = $(desktopfiles_files)
|
|
||||||
|
|
||||||
xmldir = @GNOME_KEYBINDINGS_KEYSDIR@
|
|
||||||
xml_in_files = \
|
|
||||||
50-mutter-navigation.xml.in \
|
|
||||||
50-mutter-system.xml.in \
|
|
||||||
50-mutter-windows.xml.in
|
|
||||||
xml_DATA = $(xml_in_files:.xml.in=.xml)
|
|
||||||
|
|
||||||
dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h
|
dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h
|
||||||
|
|
||||||
gsettings_SCHEMAS = org.gnome.mutter.gschema.xml org.gnome.mutter.wayland.gschema.xml
|
|
||||||
@INTLTOOL_XML_NOMERGE_RULE@
|
|
||||||
@GSETTINGS_RULES@
|
|
||||||
|
|
||||||
convertdir = $(datadir)/GConf/gsettings
|
|
||||||
convert_DATA = mutter-schemas.convert
|
|
||||||
|
|
||||||
CLEANFILES = \
|
CLEANFILES = \
|
||||||
mutter.desktop \
|
|
||||||
mutter-wm.desktop \
|
|
||||||
org.gnome.mutter.gschema.xml \
|
|
||||||
org.gnome.mutter.wayland.gschema.xml \
|
|
||||||
$(xml_DATA) \
|
|
||||||
$(mutter_built_sources) \
|
$(mutter_built_sources) \
|
||||||
$(typelib_DATA) \
|
$(typelib_DATA) \
|
||||||
$(gir_DATA)
|
$(gir_DATA)
|
||||||
|
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
DISTCLEANFILES = \
|
||||||
|
$(libmutterinclude_built_headers)
|
||||||
|
|
||||||
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = libmutter.pc
|
pkgconfig_DATA = libmutter.pc
|
||||||
|
|
||||||
EXTRA_DIST=$(desktopfiles_files) \
|
EXTRA_DIST += \
|
||||||
$(wmproperties_files) \
|
|
||||||
$(IMAGES) \
|
|
||||||
$(desktopfiles_in_files) \
|
|
||||||
$(wmproperties_in_files) \
|
|
||||||
$(xml_in_files) \
|
|
||||||
$(wayland_protocols) \
|
$(wayland_protocols) \
|
||||||
org.gnome.mutter.gschema.xml.in \
|
|
||||||
org.gnome.mutter.wayland.gschema.xml.in \
|
|
||||||
mutter-schemas.convert \
|
|
||||||
libmutter.pc.in \
|
libmutter.pc.in \
|
||||||
mutter-enum-types.h.in \
|
meta-enum-types.h.in \
|
||||||
mutter-enum-types.c.in \
|
meta-enum-types.c.in \
|
||||||
org.freedesktop.login1.xml \
|
org.freedesktop.login1.xml \
|
||||||
org.gnome.Mutter.DisplayConfig.xml \
|
org.gnome.Mutter.DisplayConfig.xml \
|
||||||
org.gnome.Mutter.IdleMonitor.xml
|
org.gnome.Mutter.IdleMonitor.xml \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
BUILT_SOURCES = $(mutter_built_sources)
|
BUILT_SOURCES = \
|
||||||
MUTTER_STAMP_FILES = stamp-mutter-enum-types.h
|
$(mutter_built_sources) \
|
||||||
|
$(libmutterinclude_built_headers)
|
||||||
|
|
||||||
|
MUTTER_STAMP_FILES = stamp-meta-enum-types.h
|
||||||
CLEANFILES += $(MUTTER_STAMP_FILES)
|
CLEANFILES += $(MUTTER_STAMP_FILES)
|
||||||
|
|
||||||
mutter-enum-types.h: stamp-mutter-enum-types.h Makefile
|
meta/meta-enum-types.h: stamp-meta-enum-types.h Makefile
|
||||||
@true
|
@true
|
||||||
stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.in
|
stamp-meta-enum-types.h: $(libmutterinclude_headers) meta-enum-types.h.in
|
||||||
$(AM_V_GEN) ( cd $(srcdir) && \
|
$(AM_V_GEN) ( cd $(srcdir) && \
|
||||||
$(GLIB_MKENUMS) \
|
$(GLIB_MKENUMS) \
|
||||||
--template mutter-enum-types.h.in \
|
--template meta-enum-types.h.in \
|
||||||
$(libmutterinclude_base_headers) ) >> xgen-teth && \
|
$(libmutterinclude_base_headers) ) >> xgen-teth && \
|
||||||
(cmp -s xgen-teth mutter-enum-types.h || cp xgen-teth mutter-enum-types.h) && \
|
(cmp -s xgen-teth meta/meta-enum-types.h || cp xgen-teth meta/meta-enum-types.h) && \
|
||||||
rm -f xgen-teth && \
|
rm -f xgen-teth && \
|
||||||
echo timestamp > $(@F)
|
echo timestamp > $(@F)
|
||||||
|
|
||||||
mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in
|
meta-enum-types.c: stamp-meta-enum-types.h meta-enum-types.c.in
|
||||||
$(AM_V_GEN) ( cd $(srcdir) && \
|
$(AM_V_GEN) ( cd $(srcdir) && \
|
||||||
$(GLIB_MKENUMS) \
|
$(GLIB_MKENUMS) \
|
||||||
--template mutter-enum-types.c.in \
|
--template meta-enum-types.c.in \
|
||||||
$(libmutterinclude_base_headers) ) >> xgen-tetc && \
|
$(libmutterinclude_base_headers) ) >> xgen-tetc && \
|
||||||
cp xgen-tetc mutter-enum-types.c && \
|
cp xgen-tetc meta-enum-types.c && \
|
||||||
rm -f xgen-tetc
|
rm -f xgen-tetc
|
||||||
|
|
||||||
dbus_display_config_built_sources = meta-dbus-display-config.c meta-dbus-display-config.h
|
dbus_display_config_built_sources = meta-dbus-display-config.c meta-dbus-display-config.h
|
||||||
@@ -442,6 +495,20 @@ $(dbus_login1_built_sources) : Makefile.am org.freedesktop.login1.xml
|
|||||||
--generate-c-code meta-dbus-login1 \
|
--generate-c-code meta-dbus-login1 \
|
||||||
$(srcdir)/org.freedesktop.login1.xml
|
$(srcdir)/org.freedesktop.login1.xml
|
||||||
|
|
||||||
|
.SECONDEXPANSION:
|
||||||
|
|
||||||
|
define protostability
|
||||||
|
$(shell echo $1 | sed 's/.*\(\<unstable\>\|\<stable\>\).*/\1/')
|
||||||
|
endef
|
||||||
|
|
||||||
|
define protoname
|
||||||
|
$(shell echo $1 | sed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\+/\1/')
|
||||||
|
endef
|
||||||
|
|
||||||
|
%-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
|
||||||
|
$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
|
||||||
|
%-server-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
|
||||||
|
$(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@
|
||||||
%-protocol.c : $(srcdir)/wayland/protocol/%.xml
|
%-protocol.c : $(srcdir)/wayland/protocol/%.xml
|
||||||
$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
|
$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
|
||||||
%-server-protocol.h : $(srcdir)/wayland/protocol/%.xml
|
%-server-protocol.h : $(srcdir)/wayland/protocol/%.xml
|
||||||
|
@@ -189,7 +189,5 @@ struct MonitorInfo
|
|||||||
};
|
};
|
||||||
|
|
||||||
MonitorInfo *decode_edid (const uchar *data);
|
MonitorInfo *decode_edid (const uchar *data);
|
||||||
char *make_display_name (const MonitorInfo *info);
|
|
||||||
char *make_display_size_string (int width_mm, int height_mm);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -28,7 +28,16 @@
|
|||||||
|
|
||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
|
|
||||||
#include "meta-backend.h"
|
#include <xkbcommon/xkbcommon.h>
|
||||||
|
|
||||||
|
#include <meta/meta-backend.h>
|
||||||
|
#include <meta/meta-idle-monitor.h>
|
||||||
|
#include "meta-cursor-renderer.h"
|
||||||
|
#include "meta-monitor-manager-private.h"
|
||||||
|
#include "backends/meta-pointer-constraint.h"
|
||||||
|
|
||||||
|
#define DEFAULT_XKB_RULES_FILE "evdev"
|
||||||
|
#define DEFAULT_XKB_MODEL "pc105+inet"
|
||||||
|
|
||||||
#define META_TYPE_BACKEND (meta_backend_get_type ())
|
#define META_TYPE_BACKEND (meta_backend_get_type ())
|
||||||
#define META_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_BACKEND, MetaBackend))
|
#define META_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_BACKEND, MetaBackend))
|
||||||
@@ -41,8 +50,10 @@ struct _MetaBackend
|
|||||||
{
|
{
|
||||||
GObject parent;
|
GObject parent;
|
||||||
|
|
||||||
MetaIdleMonitor *device_monitors[256];
|
GHashTable *device_monitors;
|
||||||
int device_id_max;
|
gint current_device_id;
|
||||||
|
|
||||||
|
MetaPointerConstraint *client_pointer_constraint;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _MetaBackendClass
|
struct _MetaBackendClass
|
||||||
@@ -66,6 +77,57 @@ struct _MetaBackendClass
|
|||||||
void (* warp_pointer) (MetaBackend *backend,
|
void (* warp_pointer) (MetaBackend *backend,
|
||||||
int x,
|
int x,
|
||||||
int y);
|
int y);
|
||||||
|
|
||||||
|
void (* set_keymap) (MetaBackend *backend,
|
||||||
|
const char *layouts,
|
||||||
|
const char *variants,
|
||||||
|
const char *options);
|
||||||
|
|
||||||
|
struct xkb_keymap * (* get_keymap) (MetaBackend *backend);
|
||||||
|
|
||||||
|
void (* lock_layout_group) (MetaBackend *backend,
|
||||||
|
guint idx);
|
||||||
|
|
||||||
|
void (* update_screen_size) (MetaBackend *backend, int width, int height);
|
||||||
|
void (* select_stage_events) (MetaBackend *backend);
|
||||||
|
|
||||||
|
gboolean (* get_relative_motion_deltas) (MetaBackend *backend,
|
||||||
|
const ClutterEvent *event,
|
||||||
|
double *dx,
|
||||||
|
double *dy,
|
||||||
|
double *dx_unaccel,
|
||||||
|
double *dy_unaccel);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
MetaIdleMonitor * meta_backend_get_idle_monitor (MetaBackend *backend,
|
||||||
|
int device_id);
|
||||||
|
MetaMonitorManager * meta_backend_get_monitor_manager (MetaBackend *backend);
|
||||||
|
MetaCursorRenderer * meta_backend_get_cursor_renderer (MetaBackend *backend);
|
||||||
|
|
||||||
|
gboolean meta_backend_grab_device (MetaBackend *backend,
|
||||||
|
int device_id,
|
||||||
|
uint32_t timestamp);
|
||||||
|
gboolean meta_backend_ungrab_device (MetaBackend *backend,
|
||||||
|
int device_id,
|
||||||
|
uint32_t timestamp);
|
||||||
|
|
||||||
|
void meta_backend_warp_pointer (MetaBackend *backend,
|
||||||
|
int x,
|
||||||
|
int y);
|
||||||
|
|
||||||
|
struct xkb_keymap * meta_backend_get_keymap (MetaBackend *backend);
|
||||||
|
|
||||||
|
void meta_backend_update_last_device (MetaBackend *backend,
|
||||||
|
int device_id);
|
||||||
|
|
||||||
|
gboolean meta_backend_get_relative_motion_deltas (MetaBackend *backend,
|
||||||
|
const ClutterEvent *event,
|
||||||
|
double *dx,
|
||||||
|
double *dy,
|
||||||
|
double *dx_unaccel,
|
||||||
|
double *dy_unaccel);
|
||||||
|
|
||||||
|
void meta_backend_set_client_pointer_constraint (MetaBackend *backend,
|
||||||
|
MetaPointerConstraint *constraint);
|
||||||
|
|
||||||
#endif /* META_BACKEND_PRIVATE_H */
|
#endif /* META_BACKEND_PRIVATE_H */
|
||||||
|
@@ -24,16 +24,33 @@
|
|||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#include "meta-backend.h"
|
#include <stdlib.h>
|
||||||
#include "meta-backend-private.h"
|
|
||||||
|
|
||||||
#include <clutter/clutter.h>
|
#include <meta/meta-backend.h>
|
||||||
|
#include "meta-backend-private.h"
|
||||||
|
#include "meta-input-settings-private.h"
|
||||||
|
|
||||||
#include "backends/x11/meta-backend-x11.h"
|
#include "backends/x11/meta-backend-x11.h"
|
||||||
|
#include "meta-cursor-tracker-private.h"
|
||||||
|
#include "meta-stage.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_NATIVE_BACKEND
|
||||||
#include "backends/native/meta-backend-native.h"
|
#include "backends/native/meta-backend-native.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "backends/meta-idle-monitor-private.h"
|
||||||
|
|
||||||
|
#include "backends/meta-monitor-manager-dummy.h"
|
||||||
|
|
||||||
static MetaBackend *_backend;
|
static MetaBackend *_backend;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* meta_get_backend:
|
||||||
|
*
|
||||||
|
* Accessor for the singleton MetaBackend.
|
||||||
|
*
|
||||||
|
* Returns: (transfer none): The only #MetaBackend there is.
|
||||||
|
*/
|
||||||
MetaBackend *
|
MetaBackend *
|
||||||
meta_get_backend (void)
|
meta_get_backend (void)
|
||||||
{
|
{
|
||||||
@@ -44,6 +61,9 @@ struct _MetaBackendPrivate
|
|||||||
{
|
{
|
||||||
MetaMonitorManager *monitor_manager;
|
MetaMonitorManager *monitor_manager;
|
||||||
MetaCursorRenderer *cursor_renderer;
|
MetaCursorRenderer *cursor_renderer;
|
||||||
|
MetaInputSettings *input_settings;
|
||||||
|
|
||||||
|
ClutterActor *stage;
|
||||||
};
|
};
|
||||||
typedef struct _MetaBackendPrivate MetaBackendPrivate;
|
typedef struct _MetaBackendPrivate MetaBackendPrivate;
|
||||||
|
|
||||||
@@ -54,26 +74,244 @@ meta_backend_finalize (GObject *object)
|
|||||||
{
|
{
|
||||||
MetaBackend *backend = META_BACKEND (object);
|
MetaBackend *backend = META_BACKEND (object);
|
||||||
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
|
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
|
||||||
int i;
|
|
||||||
|
|
||||||
g_clear_object (&priv->monitor_manager);
|
g_clear_object (&priv->monitor_manager);
|
||||||
|
g_clear_object (&priv->input_settings);
|
||||||
|
|
||||||
for (i = 0; i <= backend->device_id_max; i++)
|
g_hash_table_destroy (backend->device_monitors);
|
||||||
{
|
|
||||||
if (backend->device_monitors[i])
|
|
||||||
g_object_unref (backend->device_monitors[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
G_OBJECT_CLASS (meta_backend_parent_class)->finalize (object);
|
G_OBJECT_CLASS (meta_backend_parent_class)->finalize (object);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_backend_sync_screen_size (MetaBackend *backend)
|
||||||
|
{
|
||||||
|
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
|
||||||
|
int width, height;
|
||||||
|
|
||||||
|
meta_monitor_manager_get_screen_size (priv->monitor_manager, &width, &height);
|
||||||
|
|
||||||
|
META_BACKEND_GET_CLASS (backend)->update_screen_size (backend, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
center_pointer (MetaBackend *backend)
|
||||||
|
{
|
||||||
|
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
|
||||||
|
MetaMonitorInfo *monitors, *primary;
|
||||||
|
guint n_monitors;
|
||||||
|
|
||||||
|
monitors = meta_monitor_manager_get_monitor_infos (priv->monitor_manager, &n_monitors);
|
||||||
|
primary = &monitors[meta_monitor_manager_get_primary_index (priv->monitor_manager)];
|
||||||
|
meta_backend_warp_pointer (backend,
|
||||||
|
primary->rect.x + primary->rect.width / 2,
|
||||||
|
primary->rect.y + primary->rect.height / 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
on_monitors_changed (MetaMonitorManager *monitors,
|
||||||
|
gpointer user_data)
|
||||||
|
{
|
||||||
|
MetaBackend *backend = META_BACKEND (user_data);
|
||||||
|
ClutterDeviceManager *manager = clutter_device_manager_get_default ();
|
||||||
|
ClutterInputDevice *device = clutter_device_manager_get_core_device (manager, CLUTTER_POINTER_DEVICE);
|
||||||
|
ClutterPoint point;
|
||||||
|
|
||||||
|
meta_backend_sync_screen_size (backend);
|
||||||
|
|
||||||
|
if (clutter_input_device_get_coords (device, NULL, &point))
|
||||||
|
{
|
||||||
|
/* If we're outside all monitors, warp the pointer back inside */
|
||||||
|
if (meta_monitor_manager_get_monitor_at_point (monitors, point.x, point.y) < 0)
|
||||||
|
center_pointer (backend);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static MetaIdleMonitor *
|
||||||
|
meta_backend_create_idle_monitor (MetaBackend *backend,
|
||||||
|
int device_id)
|
||||||
|
{
|
||||||
|
return META_BACKEND_GET_CLASS (backend)->create_idle_monitor (backend, device_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
create_device_monitor (MetaBackend *backend,
|
||||||
|
int device_id)
|
||||||
|
{
|
||||||
|
MetaIdleMonitor *idle_monitor;
|
||||||
|
|
||||||
|
g_assert (g_hash_table_lookup (backend->device_monitors, &device_id) == NULL);
|
||||||
|
|
||||||
|
idle_monitor = meta_backend_create_idle_monitor (backend, device_id);
|
||||||
|
g_hash_table_insert (backend->device_monitors, &idle_monitor->device_id, idle_monitor);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
destroy_device_monitor (MetaBackend *backend,
|
||||||
|
int device_id)
|
||||||
|
{
|
||||||
|
g_hash_table_remove (backend->device_monitors, &device_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
on_device_added (ClutterDeviceManager *device_manager,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
gpointer user_data)
|
||||||
|
{
|
||||||
|
MetaBackend *backend = META_BACKEND (user_data);
|
||||||
|
int device_id = clutter_input_device_get_device_id (device);
|
||||||
|
|
||||||
|
create_device_monitor (backend, device_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline gboolean
|
||||||
|
device_is_slave_touchscreen (ClutterInputDevice *device)
|
||||||
|
{
|
||||||
|
return (clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_MASTER &&
|
||||||
|
clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline gboolean
|
||||||
|
check_has_pointing_device (ClutterDeviceManager *manager)
|
||||||
|
{
|
||||||
|
const GSList *devices;
|
||||||
|
|
||||||
|
devices = clutter_device_manager_peek_devices (manager);
|
||||||
|
|
||||||
|
for (; devices; devices = devices->next)
|
||||||
|
{
|
||||||
|
ClutterInputDevice *device = devices->data;
|
||||||
|
|
||||||
|
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
|
||||||
|
continue;
|
||||||
|
if (clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE ||
|
||||||
|
clutter_input_device_get_device_type (device) == CLUTTER_KEYBOARD_DEVICE)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline gboolean
|
||||||
|
check_has_slave_touchscreen (ClutterDeviceManager *manager)
|
||||||
|
{
|
||||||
|
const GSList *devices;
|
||||||
|
|
||||||
|
devices = clutter_device_manager_peek_devices (manager);
|
||||||
|
|
||||||
|
for (; devices; devices = devices->next)
|
||||||
|
{
|
||||||
|
ClutterInputDevice *device = devices->data;
|
||||||
|
|
||||||
|
if (clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_MASTER &&
|
||||||
|
clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE)
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
on_device_removed (ClutterDeviceManager *device_manager,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
gpointer user_data)
|
||||||
|
{
|
||||||
|
MetaBackend *backend = META_BACKEND (user_data);
|
||||||
|
int device_id = clutter_input_device_get_device_id (device);
|
||||||
|
|
||||||
|
destroy_device_monitor (backend, device_id);
|
||||||
|
|
||||||
|
/* If the device the user last interacted goes away, check again pointer
|
||||||
|
* visibility.
|
||||||
|
*/
|
||||||
|
if (backend->current_device_id == device_id)
|
||||||
|
{
|
||||||
|
MetaCursorTracker *cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
|
||||||
|
gboolean has_touchscreen, has_pointing_device;
|
||||||
|
ClutterInputDeviceType device_type;
|
||||||
|
|
||||||
|
device_type = clutter_input_device_get_device_type (device);
|
||||||
|
has_touchscreen = check_has_slave_touchscreen (device_manager);
|
||||||
|
|
||||||
|
if (device_type == CLUTTER_TOUCHSCREEN_DEVICE && has_touchscreen)
|
||||||
|
{
|
||||||
|
/* There's more touchscreens left, keep the pointer hidden */
|
||||||
|
meta_cursor_tracker_set_pointer_visible (cursor_tracker, FALSE);
|
||||||
|
}
|
||||||
|
else if (device_type != CLUTTER_KEYBOARD_DEVICE)
|
||||||
|
{
|
||||||
|
has_pointing_device = check_has_pointing_device (device_manager);
|
||||||
|
meta_cursor_tracker_set_pointer_visible (cursor_tracker,
|
||||||
|
has_pointing_device &&
|
||||||
|
!has_touchscreen);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static MetaMonitorManager *
|
||||||
|
create_monitor_manager (MetaBackend *backend)
|
||||||
|
{
|
||||||
|
if (g_getenv ("META_DUMMY_MONITORS"))
|
||||||
|
return g_object_new (META_TYPE_MONITOR_MANAGER_DUMMY, NULL);
|
||||||
|
|
||||||
|
return META_BACKEND_GET_CLASS (backend)->create_monitor_manager (backend);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
meta_backend_real_post_init (MetaBackend *backend)
|
meta_backend_real_post_init (MetaBackend *backend)
|
||||||
{
|
{
|
||||||
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
|
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
|
||||||
|
|
||||||
priv->monitor_manager = META_BACKEND_GET_CLASS (backend)->create_monitor_manager (backend);
|
priv->stage = meta_stage_new ();
|
||||||
|
clutter_actor_realize (priv->stage);
|
||||||
|
META_BACKEND_GET_CLASS (backend)->select_stage_events (backend);
|
||||||
|
|
||||||
|
priv->monitor_manager = create_monitor_manager (backend);
|
||||||
|
|
||||||
|
g_signal_connect (priv->monitor_manager, "monitors-changed",
|
||||||
|
G_CALLBACK (on_monitors_changed), backend);
|
||||||
|
meta_backend_sync_screen_size (backend);
|
||||||
|
|
||||||
priv->cursor_renderer = META_BACKEND_GET_CLASS (backend)->create_cursor_renderer (backend);
|
priv->cursor_renderer = META_BACKEND_GET_CLASS (backend)->create_cursor_renderer (backend);
|
||||||
|
|
||||||
|
backend->device_monitors = g_hash_table_new_full (g_int_hash, g_int_equal,
|
||||||
|
NULL, (GDestroyNotify) g_object_unref);
|
||||||
|
|
||||||
|
{
|
||||||
|
MetaCursorTracker *cursor_tracker;
|
||||||
|
ClutterDeviceManager *manager;
|
||||||
|
gboolean has_touchscreen = FALSE;
|
||||||
|
GSList *devices, *l;
|
||||||
|
|
||||||
|
/* Create the core device monitor. */
|
||||||
|
create_device_monitor (backend, 0);
|
||||||
|
|
||||||
|
manager = clutter_device_manager_get_default ();
|
||||||
|
g_signal_connect_object (manager, "device-added",
|
||||||
|
G_CALLBACK (on_device_added), backend, 0);
|
||||||
|
g_signal_connect_object (manager, "device-removed",
|
||||||
|
G_CALLBACK (on_device_removed), backend, 0);
|
||||||
|
|
||||||
|
devices = clutter_device_manager_list_devices (manager);
|
||||||
|
|
||||||
|
for (l = devices; l != NULL; l = l->next)
|
||||||
|
{
|
||||||
|
ClutterInputDevice *device = l->data;
|
||||||
|
on_device_added (manager, device, backend);
|
||||||
|
has_touchscreen |= device_is_slave_touchscreen (device);
|
||||||
|
}
|
||||||
|
|
||||||
|
cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
|
||||||
|
meta_cursor_tracker_set_pointer_visible (cursor_tracker, !has_touchscreen);
|
||||||
|
|
||||||
|
g_slist_free (devices);
|
||||||
|
}
|
||||||
|
|
||||||
|
priv->input_settings = meta_input_settings_create ();
|
||||||
|
|
||||||
|
center_pointer (backend);
|
||||||
}
|
}
|
||||||
|
|
||||||
static MetaCursorRenderer *
|
static MetaCursorRenderer *
|
||||||
@@ -101,13 +339,31 @@ meta_backend_real_ungrab_device (MetaBackend *backend,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
meta_backend_real_warp_pointer (MetaBackend *backend,
|
meta_backend_real_update_screen_size (MetaBackend *backend,
|
||||||
int x,
|
int width, int height)
|
||||||
int y)
|
{
|
||||||
|
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
|
||||||
|
|
||||||
|
clutter_actor_set_size (priv->stage, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_backend_real_select_stage_events (MetaBackend *backend)
|
||||||
{
|
{
|
||||||
/* Do nothing */
|
/* Do nothing */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
meta_backend_real_get_relative_motion_deltas (MetaBackend *backend,
|
||||||
|
const ClutterEvent *event,
|
||||||
|
double *dx,
|
||||||
|
double *dy,
|
||||||
|
double *dx_unaccel,
|
||||||
|
double *dy_unaccel)
|
||||||
|
{
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
meta_backend_class_init (MetaBackendClass *klass)
|
meta_backend_class_init (MetaBackendClass *klass)
|
||||||
{
|
{
|
||||||
@@ -119,7 +375,28 @@ meta_backend_class_init (MetaBackendClass *klass)
|
|||||||
klass->create_cursor_renderer = meta_backend_real_create_cursor_renderer;
|
klass->create_cursor_renderer = meta_backend_real_create_cursor_renderer;
|
||||||
klass->grab_device = meta_backend_real_grab_device;
|
klass->grab_device = meta_backend_real_grab_device;
|
||||||
klass->ungrab_device = meta_backend_real_ungrab_device;
|
klass->ungrab_device = meta_backend_real_ungrab_device;
|
||||||
klass->warp_pointer = meta_backend_real_warp_pointer;
|
klass->update_screen_size = meta_backend_real_update_screen_size;
|
||||||
|
klass->select_stage_events = meta_backend_real_select_stage_events;
|
||||||
|
klass->get_relative_motion_deltas = meta_backend_real_get_relative_motion_deltas;
|
||||||
|
|
||||||
|
g_signal_new ("keymap-changed",
|
||||||
|
G_TYPE_FROM_CLASS (object_class),
|
||||||
|
G_SIGNAL_RUN_LAST,
|
||||||
|
0,
|
||||||
|
NULL, NULL, NULL,
|
||||||
|
G_TYPE_NONE, 0);
|
||||||
|
g_signal_new ("keymap-layout-group-changed",
|
||||||
|
G_TYPE_FROM_CLASS (object_class),
|
||||||
|
G_SIGNAL_RUN_LAST,
|
||||||
|
0,
|
||||||
|
NULL, NULL, NULL,
|
||||||
|
G_TYPE_NONE, 1, G_TYPE_UINT);
|
||||||
|
g_signal_new ("last-device-changed",
|
||||||
|
G_TYPE_FROM_CLASS (object_class),
|
||||||
|
G_SIGNAL_RUN_LAST,
|
||||||
|
0,
|
||||||
|
NULL, NULL, NULL,
|
||||||
|
G_TYPE_NONE, 1, G_TYPE_INT);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -128,44 +405,25 @@ meta_backend_init (MetaBackend *backend)
|
|||||||
_backend = backend;
|
_backend = backend;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* FIXME -- destroy device monitors at some point */
|
|
||||||
G_GNUC_UNUSED static void
|
|
||||||
destroy_device_monitor (MetaBackend *backend,
|
|
||||||
int device_id)
|
|
||||||
{
|
|
||||||
g_clear_object (&backend->device_monitors[device_id]);
|
|
||||||
if (device_id == backend->device_id_max)
|
|
||||||
backend->device_id_max--;
|
|
||||||
}
|
|
||||||
|
|
||||||
static MetaIdleMonitor *
|
|
||||||
meta_backend_create_idle_monitor (MetaBackend *backend,
|
|
||||||
int device_id)
|
|
||||||
{
|
|
||||||
return META_BACKEND_GET_CLASS (backend)->create_idle_monitor (backend, device_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
meta_backend_post_init (MetaBackend *backend)
|
meta_backend_post_init (MetaBackend *backend)
|
||||||
{
|
{
|
||||||
META_BACKEND_GET_CLASS (backend)->post_init (backend);
|
META_BACKEND_GET_CLASS (backend)->post_init (backend);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* meta_backend_get_idle_monitor: (skip)
|
||||||
|
*/
|
||||||
MetaIdleMonitor *
|
MetaIdleMonitor *
|
||||||
meta_backend_get_idle_monitor (MetaBackend *backend,
|
meta_backend_get_idle_monitor (MetaBackend *backend,
|
||||||
int device_id)
|
int device_id)
|
||||||
{
|
{
|
||||||
g_return_val_if_fail (device_id >= 0 && device_id < 256, NULL);
|
return g_hash_table_lookup (backend->device_monitors, &device_id);
|
||||||
|
|
||||||
if (!backend->device_monitors[device_id])
|
|
||||||
{
|
|
||||||
backend->device_monitors[device_id] = meta_backend_create_idle_monitor (backend, device_id);
|
|
||||||
backend->device_id_max = MAX (backend->device_id_max, device_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
return backend->device_monitors[device_id];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* meta_backend_get_monitor_manager: (skip)
|
||||||
|
*/
|
||||||
MetaMonitorManager *
|
MetaMonitorManager *
|
||||||
meta_backend_get_monitor_manager (MetaBackend *backend)
|
meta_backend_get_monitor_manager (MetaBackend *backend)
|
||||||
{
|
{
|
||||||
@@ -174,6 +432,9 @@ meta_backend_get_monitor_manager (MetaBackend *backend)
|
|||||||
return priv->monitor_manager;
|
return priv->monitor_manager;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* meta_backend_get_cursor_renderer: (skip)
|
||||||
|
*/
|
||||||
MetaCursorRenderer *
|
MetaCursorRenderer *
|
||||||
meta_backend_get_cursor_renderer (MetaBackend *backend)
|
meta_backend_get_cursor_renderer (MetaBackend *backend)
|
||||||
{
|
{
|
||||||
@@ -182,6 +443,9 @@ meta_backend_get_cursor_renderer (MetaBackend *backend)
|
|||||||
return priv->cursor_renderer;
|
return priv->cursor_renderer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* meta_backend_grab_device: (skip)
|
||||||
|
*/
|
||||||
gboolean
|
gboolean
|
||||||
meta_backend_grab_device (MetaBackend *backend,
|
meta_backend_grab_device (MetaBackend *backend,
|
||||||
int device_id,
|
int device_id,
|
||||||
@@ -190,6 +454,9 @@ meta_backend_grab_device (MetaBackend *backend,
|
|||||||
return META_BACKEND_GET_CLASS (backend)->grab_device (backend, device_id, timestamp);
|
return META_BACKEND_GET_CLASS (backend)->grab_device (backend, device_id, timestamp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* meta_backend_ungrab_device: (skip)
|
||||||
|
*/
|
||||||
gboolean
|
gboolean
|
||||||
meta_backend_ungrab_device (MetaBackend *backend,
|
meta_backend_ungrab_device (MetaBackend *backend,
|
||||||
int device_id,
|
int device_id,
|
||||||
@@ -198,6 +465,9 @@ meta_backend_ungrab_device (MetaBackend *backend,
|
|||||||
return META_BACKEND_GET_CLASS (backend)->ungrab_device (backend, device_id, timestamp);
|
return META_BACKEND_GET_CLASS (backend)->ungrab_device (backend, device_id, timestamp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* meta_backend_warp_pointer: (skip)
|
||||||
|
*/
|
||||||
void
|
void
|
||||||
meta_backend_warp_pointer (MetaBackend *backend,
|
meta_backend_warp_pointer (MetaBackend *backend,
|
||||||
int x,
|
int x,
|
||||||
@@ -206,6 +476,112 @@ meta_backend_warp_pointer (MetaBackend *backend,
|
|||||||
META_BACKEND_GET_CLASS (backend)->warp_pointer (backend, x, y);
|
META_BACKEND_GET_CLASS (backend)->warp_pointer (backend, x, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
meta_backend_set_keymap (MetaBackend *backend,
|
||||||
|
const char *layouts,
|
||||||
|
const char *variants,
|
||||||
|
const char *options)
|
||||||
|
{
|
||||||
|
META_BACKEND_GET_CLASS (backend)->set_keymap (backend, layouts, variants, options);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* meta_backend_get_keymap: (skip)
|
||||||
|
*/
|
||||||
|
struct xkb_keymap *
|
||||||
|
meta_backend_get_keymap (MetaBackend *backend)
|
||||||
|
|
||||||
|
{
|
||||||
|
return META_BACKEND_GET_CLASS (backend)->get_keymap (backend);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
meta_backend_lock_layout_group (MetaBackend *backend,
|
||||||
|
guint idx)
|
||||||
|
{
|
||||||
|
META_BACKEND_GET_CLASS (backend)->lock_layout_group (backend, idx);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* meta_backend_get_stage:
|
||||||
|
* @backend: A #MetaBackend
|
||||||
|
*
|
||||||
|
* Gets the global #ClutterStage that's managed by this backend.
|
||||||
|
*
|
||||||
|
* Returns: (transfer none): the #ClutterStage
|
||||||
|
*/
|
||||||
|
ClutterActor *
|
||||||
|
meta_backend_get_stage (MetaBackend *backend)
|
||||||
|
{
|
||||||
|
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
|
||||||
|
return priv->stage;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
meta_backend_update_last_device (MetaBackend *backend,
|
||||||
|
int device_id)
|
||||||
|
{
|
||||||
|
ClutterInputDeviceType device_type;
|
||||||
|
MetaCursorTracker *cursor_tracker;
|
||||||
|
ClutterDeviceManager *manager;
|
||||||
|
ClutterInputDevice *device;
|
||||||
|
|
||||||
|
if (backend->current_device_id == device_id)
|
||||||
|
return;
|
||||||
|
|
||||||
|
manager = clutter_device_manager_get_default ();
|
||||||
|
device = clutter_device_manager_get_device (manager, device_id);
|
||||||
|
|
||||||
|
if (!device ||
|
||||||
|
clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
|
||||||
|
return;
|
||||||
|
|
||||||
|
device_type = clutter_input_device_get_device_type (device);
|
||||||
|
|
||||||
|
cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
|
||||||
|
backend->current_device_id = device_id;
|
||||||
|
g_signal_emit_by_name (backend, "last-device-changed", device_id);
|
||||||
|
|
||||||
|
if (device_type == CLUTTER_KEYBOARD_DEVICE)
|
||||||
|
return;
|
||||||
|
|
||||||
|
switch (device_type)
|
||||||
|
{
|
||||||
|
case CLUTTER_TOUCHSCREEN_DEVICE:
|
||||||
|
meta_cursor_tracker_set_pointer_visible (cursor_tracker, FALSE);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
meta_cursor_tracker_set_pointer_visible (cursor_tracker, TRUE);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
gboolean
|
||||||
|
meta_backend_get_relative_motion_deltas (MetaBackend *backend,
|
||||||
|
const ClutterEvent *event,
|
||||||
|
double *dx,
|
||||||
|
double *dy,
|
||||||
|
double *dx_unaccel,
|
||||||
|
double *dy_unaccel)
|
||||||
|
{
|
||||||
|
MetaBackendClass *klass = META_BACKEND_GET_CLASS (backend);
|
||||||
|
return klass->get_relative_motion_deltas (backend,
|
||||||
|
event,
|
||||||
|
dx, dy,
|
||||||
|
dx_unaccel, dy_unaccel);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
meta_backend_set_client_pointer_constraint (MetaBackend *backend,
|
||||||
|
MetaPointerConstraint *constraint)
|
||||||
|
{
|
||||||
|
g_assert (!constraint || (constraint && !backend->client_pointer_constraint));
|
||||||
|
|
||||||
|
g_clear_object (&backend->client_pointer_constraint);
|
||||||
|
if (constraint)
|
||||||
|
backend->client_pointer_constraint = g_object_ref (constraint);
|
||||||
|
}
|
||||||
|
|
||||||
static GType
|
static GType
|
||||||
get_backend_type (void)
|
get_backend_type (void)
|
||||||
{
|
{
|
||||||
@@ -214,7 +590,7 @@ get_backend_type (void)
|
|||||||
return META_TYPE_BACKEND_X11;
|
return META_TYPE_BACKEND_X11;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CLUTTER_WINDOWING_EGL)
|
#if defined(CLUTTER_WINDOWING_EGL) && defined(HAVE_NATIVE_BACKEND)
|
||||||
if (clutter_check_windowing_backend (CLUTTER_WINDOWING_EGL))
|
if (clutter_check_windowing_backend (CLUTTER_WINDOWING_EGL))
|
||||||
return META_TYPE_BACKEND_NATIVE;
|
return META_TYPE_BACKEND_NATIVE;
|
||||||
#endif
|
#endif
|
||||||
@@ -278,15 +654,29 @@ static GSourceFuncs event_funcs = {
|
|||||||
event_dispatch
|
event_dispatch
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* meta_clutter_init: (skip)
|
||||||
|
*/
|
||||||
void
|
void
|
||||||
meta_clutter_init (void)
|
meta_clutter_init (void)
|
||||||
{
|
{
|
||||||
|
ClutterSettings *clutter_settings;
|
||||||
GSource *source;
|
GSource *source;
|
||||||
|
|
||||||
meta_create_backend ();
|
meta_create_backend ();
|
||||||
|
|
||||||
if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
|
if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
|
||||||
g_error ("Unable to initialize Clutter.\n");
|
{
|
||||||
|
g_warning ("Unable to initialize Clutter.\n");
|
||||||
|
exit (1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* XXX: We cannot handle high dpi scaling yet, so fix the scale to 1
|
||||||
|
* for now.
|
||||||
|
*/
|
||||||
|
clutter_settings = clutter_settings_get_default ();
|
||||||
|
g_object_set (clutter_settings, "window-scaling-factor", 1, NULL);
|
||||||
|
|
||||||
source = g_source_new (&event_funcs, sizeof (GSource));
|
source = g_source_new (&event_funcs, sizeof (GSource));
|
||||||
g_source_attach (source, NULL);
|
g_source_attach (source, NULL);
|
||||||
|
76
src/backends/meta-barrier-private.h
Normal file
76
src/backends/meta-barrier-private.h
Normal file
@@ -0,0 +1,76 @@
|
|||||||
|
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2014-2015 Red Hat
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||||
|
* 02111-1307, USA.
|
||||||
|
*
|
||||||
|
* Written by:
|
||||||
|
* Jasper St. Pierre <jstpierre@mecheye.net>
|
||||||
|
* Jonas Ådahl <jadahl@gmail.com>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef META_BARRIER_PRIVATE_H
|
||||||
|
#define META_BARRIER_PRIVATE_H
|
||||||
|
|
||||||
|
#include "core/meta-border.h"
|
||||||
|
|
||||||
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
|
#define META_TYPE_BARRIER_IMPL (meta_barrier_impl_get_type ())
|
||||||
|
#define META_BARRIER_IMPL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_BARRIER_IMPL, MetaBarrierImpl))
|
||||||
|
#define META_BARRIER_IMPL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_BARRIER_IMPL, MetaBarrierImplClass))
|
||||||
|
#define META_IS_BARRIER_IMPL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_BARRIER_IMPL))
|
||||||
|
#define META_IS_BARRIER_IMPL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_BARRIER_IMPL))
|
||||||
|
#define META_BARRIER_IMPL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_BARRIER_IMPL, MetaBarrierImplClass))
|
||||||
|
|
||||||
|
typedef struct _MetaBarrierImpl MetaBarrierImpl;
|
||||||
|
typedef struct _MetaBarrierImplClass MetaBarrierImplClass;
|
||||||
|
|
||||||
|
struct _MetaBarrierImpl
|
||||||
|
{
|
||||||
|
GObject parent;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct _MetaBarrierImplClass
|
||||||
|
{
|
||||||
|
GObjectClass parent_class;
|
||||||
|
|
||||||
|
gboolean (*is_active) (MetaBarrierImpl *barrier);
|
||||||
|
void (*release) (MetaBarrierImpl *barrier,
|
||||||
|
MetaBarrierEvent *event);
|
||||||
|
void (*destroy) (MetaBarrierImpl *barrier);
|
||||||
|
};
|
||||||
|
|
||||||
|
GType meta_barrier_impl_get_type (void) G_GNUC_CONST;
|
||||||
|
|
||||||
|
void _meta_barrier_emit_hit_signal (MetaBarrier *barrier,
|
||||||
|
MetaBarrierEvent *event);
|
||||||
|
void _meta_barrier_emit_left_signal (MetaBarrier *barrier,
|
||||||
|
MetaBarrierEvent *event);
|
||||||
|
|
||||||
|
void meta_barrier_event_unref (MetaBarrierEvent *event);
|
||||||
|
|
||||||
|
G_END_DECLS
|
||||||
|
|
||||||
|
struct _MetaBarrierPrivate
|
||||||
|
{
|
||||||
|
MetaDisplay *display;
|
||||||
|
MetaBorder border;
|
||||||
|
MetaBarrierImpl *impl;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif /* META_BARRIER_PRIVATE_H */
|
@@ -10,15 +10,16 @@
|
|||||||
|
|
||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
|
|
||||||
#include <X11/extensions/XInput2.h>
|
|
||||||
#include <X11/extensions/Xfixes.h>
|
|
||||||
#include <meta/util.h>
|
#include <meta/util.h>
|
||||||
#include <meta/barrier.h>
|
#include <meta/barrier.h>
|
||||||
#include "display-private.h"
|
#include "backends/native/meta-backend-native.h"
|
||||||
#include "mutter-enum-types.h"
|
#include "backends/native/meta-barrier-native.h"
|
||||||
#include "core.h"
|
#include "backends/x11/meta-backend-x11.h"
|
||||||
|
#include "backends/x11/meta-barrier-x11.h"
|
||||||
|
#include <meta/meta-enum-types.h>
|
||||||
|
|
||||||
G_DEFINE_TYPE (MetaBarrier, meta_barrier, G_TYPE_OBJECT)
|
G_DEFINE_TYPE (MetaBarrier, meta_barrier, G_TYPE_OBJECT)
|
||||||
|
G_DEFINE_TYPE (MetaBarrierImpl, meta_barrier_impl, G_TYPE_OBJECT)
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
PROP_0,
|
PROP_0,
|
||||||
@@ -45,21 +46,6 @@ enum {
|
|||||||
|
|
||||||
static guint obj_signals[LAST_SIGNAL];
|
static guint obj_signals[LAST_SIGNAL];
|
||||||
|
|
||||||
struct _MetaBarrierPrivate
|
|
||||||
{
|
|
||||||
MetaDisplay *display;
|
|
||||||
|
|
||||||
int x1;
|
|
||||||
int y1;
|
|
||||||
int x2;
|
|
||||||
int y2;
|
|
||||||
|
|
||||||
MetaBarrierDirection directions;
|
|
||||||
|
|
||||||
PointerBarrier xbarrier;
|
|
||||||
};
|
|
||||||
|
|
||||||
static void meta_barrier_event_unref (MetaBarrierEvent *event);
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
meta_barrier_get_property (GObject *object,
|
meta_barrier_get_property (GObject *object,
|
||||||
@@ -75,19 +61,20 @@ meta_barrier_get_property (GObject *object,
|
|||||||
g_value_set_object (value, priv->display);
|
g_value_set_object (value, priv->display);
|
||||||
break;
|
break;
|
||||||
case PROP_X1:
|
case PROP_X1:
|
||||||
g_value_set_int (value, priv->x1);
|
g_value_set_int (value, priv->border.line.a.x);
|
||||||
break;
|
break;
|
||||||
case PROP_Y1:
|
case PROP_Y1:
|
||||||
g_value_set_int (value, priv->y1);
|
g_value_set_int (value, priv->border.line.a.y);
|
||||||
break;
|
break;
|
||||||
case PROP_X2:
|
case PROP_X2:
|
||||||
g_value_set_int (value, priv->x2);
|
g_value_set_int (value, priv->border.line.b.x);
|
||||||
break;
|
break;
|
||||||
case PROP_Y2:
|
case PROP_Y2:
|
||||||
g_value_set_int (value, priv->y2);
|
g_value_set_int (value, priv->border.line.b.y);
|
||||||
break;
|
break;
|
||||||
case PROP_DIRECTIONS:
|
case PROP_DIRECTIONS:
|
||||||
g_value_set_flags (value, priv->directions);
|
g_value_set_flags (value,
|
||||||
|
meta_border_get_allows_directions (&priv->border));
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
@@ -109,19 +96,20 @@ meta_barrier_set_property (GObject *object,
|
|||||||
priv->display = g_value_get_object (value);
|
priv->display = g_value_get_object (value);
|
||||||
break;
|
break;
|
||||||
case PROP_X1:
|
case PROP_X1:
|
||||||
priv->x1 = g_value_get_int (value);
|
priv->border.line.a.x = g_value_get_int (value);
|
||||||
break;
|
break;
|
||||||
case PROP_Y1:
|
case PROP_Y1:
|
||||||
priv->y1 = g_value_get_int (value);
|
priv->border.line.a.y = g_value_get_int (value);
|
||||||
break;
|
break;
|
||||||
case PROP_X2:
|
case PROP_X2:
|
||||||
priv->x2 = g_value_get_int (value);
|
priv->border.line.b.x = g_value_get_int (value);
|
||||||
break;
|
break;
|
||||||
case PROP_Y2:
|
case PROP_Y2:
|
||||||
priv->y2 = g_value_get_int (value);
|
priv->border.line.b.y = g_value_get_int (value);
|
||||||
break;
|
break;
|
||||||
case PROP_DIRECTIONS:
|
case PROP_DIRECTIONS:
|
||||||
priv->directions = g_value_get_flags (value);
|
meta_border_set_allows_directions (&priv->border,
|
||||||
|
g_value_get_flags (value));
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
@@ -133,13 +121,11 @@ static void
|
|||||||
meta_barrier_dispose (GObject *object)
|
meta_barrier_dispose (GObject *object)
|
||||||
{
|
{
|
||||||
MetaBarrier *barrier = META_BARRIER (object);
|
MetaBarrier *barrier = META_BARRIER (object);
|
||||||
MetaBarrierPrivate *priv = barrier->priv;
|
|
||||||
|
|
||||||
if (meta_barrier_is_active (barrier))
|
if (meta_barrier_is_active (barrier))
|
||||||
{
|
{
|
||||||
meta_bug ("MetaBarrier wrapper %p for X barrier %ld was destroyed"
|
meta_bug ("MetaBarrier %p was destroyed while it was still active.",
|
||||||
" while the X barrier is still active.",
|
barrier);
|
||||||
barrier, priv->xbarrier);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
G_OBJECT_CLASS (meta_barrier_parent_class)->dispose (object);
|
G_OBJECT_CLASS (meta_barrier_parent_class)->dispose (object);
|
||||||
@@ -148,7 +134,12 @@ meta_barrier_dispose (GObject *object)
|
|||||||
gboolean
|
gboolean
|
||||||
meta_barrier_is_active (MetaBarrier *barrier)
|
meta_barrier_is_active (MetaBarrier *barrier)
|
||||||
{
|
{
|
||||||
return barrier->priv->xbarrier != 0;
|
MetaBarrierImpl *impl = barrier->priv->impl;
|
||||||
|
|
||||||
|
if (impl)
|
||||||
|
return META_BARRIER_IMPL_GET_CLASS (impl)->is_active (impl);
|
||||||
|
else
|
||||||
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -165,15 +156,10 @@ void
|
|||||||
meta_barrier_release (MetaBarrier *barrier,
|
meta_barrier_release (MetaBarrier *barrier,
|
||||||
MetaBarrierEvent *event)
|
MetaBarrierEvent *event)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_XI23
|
MetaBarrierImpl *impl = barrier->priv->impl;
|
||||||
MetaBarrierPrivate *priv = barrier->priv;
|
|
||||||
if (META_DISPLAY_HAS_XINPUT_23 (priv->display))
|
if (impl)
|
||||||
{
|
META_BARRIER_IMPL_GET_CLASS (impl)->release (impl, event);
|
||||||
XIBarrierReleasePointer (priv->display->xdisplay,
|
|
||||||
META_VIRTUAL_CORE_POINTER_ID,
|
|
||||||
priv->xbarrier, event->event_id);
|
|
||||||
}
|
|
||||||
#endif /* HAVE_XI23 */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -181,31 +167,27 @@ meta_barrier_constructed (GObject *object)
|
|||||||
{
|
{
|
||||||
MetaBarrier *barrier = META_BARRIER (object);
|
MetaBarrier *barrier = META_BARRIER (object);
|
||||||
MetaBarrierPrivate *priv = barrier->priv;
|
MetaBarrierPrivate *priv = barrier->priv;
|
||||||
Display *dpy;
|
|
||||||
Window root;
|
|
||||||
|
|
||||||
g_return_if_fail (priv->x1 == priv->x2 || priv->y1 == priv->y2);
|
g_return_if_fail (priv->border.line.a.x == priv->border.line.b.x ||
|
||||||
|
priv->border.line.a.y == priv->border.line.b.y);
|
||||||
|
|
||||||
if (priv->display == NULL)
|
#if defined(HAVE_NATIVE_BACKEND)
|
||||||
{
|
if (META_IS_BACKEND_NATIVE (meta_get_backend ()))
|
||||||
g_warning ("A display must be provided when constructing a barrier.");
|
priv->impl = meta_barrier_impl_native_new (barrier);
|
||||||
return;
|
#endif
|
||||||
}
|
#if defined(HAVE_XI23)
|
||||||
|
if (META_IS_BACKEND_X11 (meta_get_backend ()) &&
|
||||||
|
!meta_is_wayland_compositor ())
|
||||||
|
priv->impl = meta_barrier_impl_x11_new (barrier);
|
||||||
|
#endif
|
||||||
|
|
||||||
dpy = priv->display->xdisplay;
|
if (priv->impl == NULL)
|
||||||
root = DefaultRootWindow (dpy);
|
g_warning ("Created a non-working barrier");
|
||||||
|
|
||||||
priv->xbarrier = XFixesCreatePointerBarrier (dpy, root,
|
/* Take a ref that we'll release in destroy() so that the object stays
|
||||||
priv->x1, priv->y1,
|
* alive while active. */
|
||||||
priv->x2, priv->y2,
|
|
||||||
priv->directions, 0, NULL);
|
|
||||||
|
|
||||||
/* Take a ref that we'll release when the XID dies inside destroy(),
|
|
||||||
* so that the object stays alive and doesn't get GC'd. */
|
|
||||||
g_object_ref (barrier);
|
g_object_ref (barrier);
|
||||||
|
|
||||||
g_hash_table_insert (priv->display->xids, &priv->xbarrier, barrier);
|
|
||||||
|
|
||||||
G_OBJECT_CLASS (meta_barrier_parent_class)->constructed (object);
|
G_OBJECT_CLASS (meta_barrier_parent_class)->constructed (object);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -306,20 +288,10 @@ meta_barrier_class_init (MetaBarrierClass *klass)
|
|||||||
void
|
void
|
||||||
meta_barrier_destroy (MetaBarrier *barrier)
|
meta_barrier_destroy (MetaBarrier *barrier)
|
||||||
{
|
{
|
||||||
MetaBarrierPrivate *priv = barrier->priv;
|
MetaBarrierImpl *impl = barrier->priv->impl;
|
||||||
Display *dpy;
|
|
||||||
|
|
||||||
if (priv->display == NULL)
|
if (impl)
|
||||||
return;
|
return META_BARRIER_IMPL_GET_CLASS (impl)->destroy (impl);
|
||||||
|
|
||||||
dpy = priv->display->xdisplay;
|
|
||||||
|
|
||||||
if (!meta_barrier_is_active (barrier))
|
|
||||||
return;
|
|
||||||
|
|
||||||
XFixesDestroyPointerBarrier (dpy, priv->xbarrier);
|
|
||||||
g_hash_table_remove (priv->display->xids, &priv->xbarrier);
|
|
||||||
priv->xbarrier = 0;
|
|
||||||
|
|
||||||
g_object_unref (barrier);
|
g_object_unref (barrier);
|
||||||
}
|
}
|
||||||
@@ -330,72 +302,33 @@ meta_barrier_init (MetaBarrier *barrier)
|
|||||||
barrier->priv = G_TYPE_INSTANCE_GET_PRIVATE (barrier, META_TYPE_BARRIER, MetaBarrierPrivate);
|
barrier->priv = G_TYPE_INSTANCE_GET_PRIVATE (barrier, META_TYPE_BARRIER, MetaBarrierPrivate);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_XI23
|
void
|
||||||
static void
|
_meta_barrier_emit_hit_signal (MetaBarrier *barrier,
|
||||||
meta_barrier_fire_event (MetaBarrier *barrier,
|
MetaBarrierEvent *event)
|
||||||
XIBarrierEvent *xevent)
|
|
||||||
{
|
{
|
||||||
MetaBarrierEvent *event = g_slice_new0 (MetaBarrierEvent);
|
|
||||||
|
|
||||||
event->ref_count = 1;
|
|
||||||
event->event_id = xevent->eventid;
|
|
||||||
event->time = xevent->time;
|
|
||||||
event->dt = xevent->dtime;
|
|
||||||
|
|
||||||
event->x = xevent->root_x;
|
|
||||||
event->y = xevent->root_y;
|
|
||||||
event->dx = xevent->dx;
|
|
||||||
event->dy = xevent->dy;
|
|
||||||
|
|
||||||
event->released = (xevent->flags & XIBarrierPointerReleased) != 0;
|
|
||||||
event->grabbed = (xevent->flags & XIBarrierDeviceIsGrabbed) != 0;
|
|
||||||
|
|
||||||
switch (xevent->evtype)
|
|
||||||
{
|
|
||||||
case XI_BarrierHit:
|
|
||||||
g_signal_emit (barrier, obj_signals[HIT], 0, event);
|
g_signal_emit (barrier, obj_signals[HIT], 0, event);
|
||||||
break;
|
}
|
||||||
case XI_BarrierLeave:
|
|
||||||
|
void
|
||||||
|
_meta_barrier_emit_left_signal (MetaBarrier *barrier,
|
||||||
|
MetaBarrierEvent *event)
|
||||||
|
{
|
||||||
g_signal_emit (barrier, obj_signals[LEFT], 0, event);
|
g_signal_emit (barrier, obj_signals[LEFT], 0, event);
|
||||||
break;
|
|
||||||
default:
|
|
||||||
g_assert_not_reached ();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
meta_barrier_event_unref (event);
|
static void
|
||||||
}
|
meta_barrier_impl_class_init (MetaBarrierImplClass *klass)
|
||||||
|
|
||||||
gboolean
|
|
||||||
meta_display_process_barrier_event (MetaDisplay *display,
|
|
||||||
XIEvent *event)
|
|
||||||
{
|
{
|
||||||
MetaBarrier *barrier;
|
klass->is_active = NULL;
|
||||||
XIBarrierEvent *xev;
|
klass->release = NULL;
|
||||||
|
klass->destroy = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
if (event == NULL)
|
static void
|
||||||
return FALSE;
|
meta_barrier_impl_init (MetaBarrierImpl *impl)
|
||||||
|
|
||||||
switch (event->evtype)
|
|
||||||
{
|
{
|
||||||
case XI_BarrierHit:
|
|
||||||
case XI_BarrierLeave:
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return FALSE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
xev = (XIBarrierEvent *) event;
|
|
||||||
barrier = g_hash_table_lookup (display->xids, &xev->barrier);
|
|
||||||
if (barrier != NULL)
|
|
||||||
{
|
|
||||||
meta_barrier_fire_event (barrier, xev);
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
#endif /* HAVE_XI23 */
|
|
||||||
|
|
||||||
static MetaBarrierEvent *
|
static MetaBarrierEvent *
|
||||||
meta_barrier_event_ref (MetaBarrierEvent *event)
|
meta_barrier_event_ref (MetaBarrierEvent *event)
|
||||||
{
|
{
|
||||||
@@ -406,7 +339,7 @@ meta_barrier_event_ref (MetaBarrierEvent *event)
|
|||||||
return event;
|
return event;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
void
|
||||||
meta_barrier_event_unref (MetaBarrierEvent *event)
|
meta_barrier_event_unref (MetaBarrierEvent *event)
|
||||||
{
|
{
|
||||||
g_return_if_fail (event != NULL);
|
g_return_if_fail (event != NULL);
|
@@ -1,51 +0,0 @@
|
|||||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright 2013 Red Hat, Inc.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU General Public License as
|
|
||||||
* published by the Free Software Foundation; either version 2 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful, but
|
|
||||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
* Author: Giovanni Campagna <gcampagn@redhat.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef META_CURSOR_PRIVATE_H
|
|
||||||
#define META_CURSOR_PRIVATE_H
|
|
||||||
|
|
||||||
#include "meta-cursor.h"
|
|
||||||
|
|
||||||
#include <cogl/cogl.h>
|
|
||||||
#include <gbm.h>
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
CoglTexture2D *texture;
|
|
||||||
struct gbm_bo *bo;
|
|
||||||
int hot_x, hot_y;
|
|
||||||
} MetaCursorImage;
|
|
||||||
|
|
||||||
struct _MetaCursorReference {
|
|
||||||
int ref_count;
|
|
||||||
|
|
||||||
MetaCursor cursor;
|
|
||||||
MetaCursorImage image;
|
|
||||||
};
|
|
||||||
|
|
||||||
CoglTexture *meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor,
|
|
||||||
int *hot_x,
|
|
||||||
int *hot_y);
|
|
||||||
|
|
||||||
struct gbm_bo *meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor,
|
|
||||||
int *hot_x,
|
|
||||||
int *hot_y);
|
|
||||||
|
|
||||||
#endif /* META_CURSOR_PRIVATE_H */
|
|
@@ -25,22 +25,22 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#include "meta-cursor-renderer.h"
|
#include "meta-cursor-renderer.h"
|
||||||
#include "meta-cursor-private.h"
|
|
||||||
|
#include <meta/meta-backend.h>
|
||||||
|
#include <backends/meta-backend-private.h>
|
||||||
|
#include <backends/meta-monitor-manager-private.h>
|
||||||
|
#include <meta/util.h>
|
||||||
|
|
||||||
#include <cogl/cogl.h>
|
#include <cogl/cogl.h>
|
||||||
#include <cogl/cogl-wayland-server.h>
|
|
||||||
#include <clutter/clutter.h>
|
#include <clutter/clutter.h>
|
||||||
|
|
||||||
#include "meta-stage.h"
|
#include "meta-stage.h"
|
||||||
|
|
||||||
#include "wayland/meta-wayland-private.h"
|
|
||||||
|
|
||||||
struct _MetaCursorRendererPrivate
|
struct _MetaCursorRendererPrivate
|
||||||
{
|
{
|
||||||
int current_x, current_y;
|
int current_x, current_y;
|
||||||
MetaRectangle current_rect;
|
|
||||||
|
|
||||||
MetaCursorReference *displayed_cursor;
|
MetaCursorSprite *displayed_cursor;
|
||||||
gboolean handled_by_backend;
|
gboolean handled_by_backend;
|
||||||
};
|
};
|
||||||
typedef struct _MetaCursorRendererPrivate MetaCursorRendererPrivate;
|
typedef struct _MetaCursorRendererPrivate MetaCursorRendererPrivate;
|
||||||
@@ -48,24 +48,33 @@ typedef struct _MetaCursorRendererPrivate MetaCursorRendererPrivate;
|
|||||||
G_DEFINE_TYPE_WITH_PRIVATE (MetaCursorRenderer, meta_cursor_renderer, G_TYPE_OBJECT);
|
G_DEFINE_TYPE_WITH_PRIVATE (MetaCursorRenderer, meta_cursor_renderer, G_TYPE_OBJECT);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
queue_redraw (MetaCursorRenderer *renderer)
|
queue_redraw (MetaCursorRenderer *renderer,
|
||||||
|
MetaCursorSprite *cursor_sprite)
|
||||||
{
|
{
|
||||||
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
|
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
|
||||||
MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
|
MetaBackend *backend = meta_get_backend ();
|
||||||
ClutterActor *stage = compositor->stage;
|
ClutterActor *stage = meta_backend_get_stage (backend);
|
||||||
|
CoglTexture *texture;
|
||||||
|
MetaRectangle rect = { 0 };
|
||||||
|
|
||||||
|
if (cursor_sprite)
|
||||||
|
rect = meta_cursor_renderer_calculate_rect (renderer, cursor_sprite);
|
||||||
|
|
||||||
/* During early initialization, we can have no stage */
|
/* During early initialization, we can have no stage */
|
||||||
if (!stage)
|
if (!stage)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (priv->handled_by_backend)
|
if (cursor_sprite && !priv->handled_by_backend)
|
||||||
meta_stage_set_cursor (META_STAGE (stage), NULL, &priv->current_rect);
|
texture = meta_cursor_sprite_get_cogl_texture (cursor_sprite);
|
||||||
else
|
else
|
||||||
meta_stage_set_cursor (META_STAGE (stage), priv->displayed_cursor, &priv->current_rect);
|
texture = NULL;
|
||||||
|
|
||||||
|
meta_stage_set_cursor (META_STAGE (stage), texture, &rect);
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
meta_cursor_renderer_real_update_cursor (MetaCursorRenderer *renderer)
|
meta_cursor_renderer_real_update_cursor (MetaCursorRenderer *renderer,
|
||||||
|
MetaCursorSprite *cursor_sprite)
|
||||||
{
|
{
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
@@ -81,34 +90,63 @@ meta_cursor_renderer_init (MetaCursorRenderer *renderer)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MetaRectangle
|
||||||
|
meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,
|
||||||
|
MetaCursorSprite *cursor_sprite)
|
||||||
|
{
|
||||||
|
MetaCursorRendererPrivate *priv =
|
||||||
|
meta_cursor_renderer_get_instance_private (renderer);
|
||||||
|
CoglTexture *texture;
|
||||||
|
int hot_x, hot_y;
|
||||||
|
int width, height;
|
||||||
|
float texture_scale;
|
||||||
|
|
||||||
|
texture = meta_cursor_sprite_get_cogl_texture (cursor_sprite);
|
||||||
|
if (!texture)
|
||||||
|
return (MetaRectangle) { 0 };
|
||||||
|
|
||||||
|
meta_cursor_sprite_get_hotspot (cursor_sprite, &hot_x, &hot_y);
|
||||||
|
texture_scale = meta_cursor_sprite_get_texture_scale (cursor_sprite);
|
||||||
|
width = cogl_texture_get_width (texture);
|
||||||
|
height = cogl_texture_get_height (texture);
|
||||||
|
|
||||||
|
return (MetaRectangle) {
|
||||||
|
.x = (int)roundf (priv->current_x - (hot_x * texture_scale)),
|
||||||
|
.y = (int)roundf (priv->current_y - (hot_y * texture_scale)),
|
||||||
|
.width = (int)roundf (width * texture_scale),
|
||||||
|
.height = (int)roundf (height * texture_scale),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
is_cursor_in_monitors_area (int x, int y)
|
||||||
|
{
|
||||||
|
MetaMonitorManager *monitor_manager = meta_backend_get_monitor_manager (meta_get_backend ());
|
||||||
|
return meta_monitor_manager_get_monitor_at_point (monitor_manager,
|
||||||
|
(gfloat) x, (gfloat) y) >= 0;
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
update_cursor (MetaCursorRenderer *renderer)
|
update_cursor (MetaCursorRenderer *renderer,
|
||||||
|
MetaCursorSprite *cursor_sprite)
|
||||||
{
|
{
|
||||||
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
|
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
|
||||||
gboolean handled_by_backend;
|
gboolean handled_by_backend;
|
||||||
gboolean should_redraw = FALSE;
|
gboolean should_redraw = FALSE;
|
||||||
|
|
||||||
if (priv->displayed_cursor)
|
/* do not render cursor if it is not on any monitor. Such situation
|
||||||
{
|
* can occur e. g. after monitor hot-plug */
|
||||||
CoglTexture *texture;
|
if (!is_cursor_in_monitors_area (priv->current_x, priv->current_y))
|
||||||
int hot_x, hot_y;
|
return;
|
||||||
|
|
||||||
texture = meta_cursor_reference_get_cogl_texture (priv->displayed_cursor, &hot_x, &hot_y);
|
if (cursor_sprite)
|
||||||
|
meta_cursor_sprite_prepare_at (cursor_sprite,
|
||||||
|
priv->current_x,
|
||||||
|
priv->current_y);
|
||||||
|
|
||||||
priv->current_rect.x = priv->current_x - hot_x;
|
handled_by_backend =
|
||||||
priv->current_rect.y = priv->current_y - hot_y;
|
META_CURSOR_RENDERER_GET_CLASS (renderer)->update_cursor (renderer,
|
||||||
priv->current_rect.width = cogl_texture_get_width (COGL_TEXTURE (texture));
|
cursor_sprite);
|
||||||
priv->current_rect.height = cogl_texture_get_height (COGL_TEXTURE (texture));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
priv->current_rect.x = 0;
|
|
||||||
priv->current_rect.y = 0;
|
|
||||||
priv->current_rect.width = 0;
|
|
||||||
priv->current_rect.height = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
handled_by_backend = META_CURSOR_RENDERER_GET_CLASS (renderer)->update_cursor (renderer);
|
|
||||||
if (handled_by_backend != priv->handled_by_backend)
|
if (handled_by_backend != priv->handled_by_backend)
|
||||||
{
|
{
|
||||||
priv->handled_by_backend = handled_by_backend;
|
priv->handled_by_backend = handled_by_backend;
|
||||||
@@ -119,7 +157,7 @@ update_cursor (MetaCursorRenderer *renderer)
|
|||||||
should_redraw = TRUE;
|
should_redraw = TRUE;
|
||||||
|
|
||||||
if (should_redraw)
|
if (should_redraw)
|
||||||
queue_redraw (renderer);
|
queue_redraw (renderer, cursor_sprite);
|
||||||
}
|
}
|
||||||
|
|
||||||
MetaCursorRenderer *
|
MetaCursorRenderer *
|
||||||
@@ -130,15 +168,24 @@ meta_cursor_renderer_new (void)
|
|||||||
|
|
||||||
void
|
void
|
||||||
meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer,
|
meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer,
|
||||||
MetaCursorReference *cursor)
|
MetaCursorSprite *cursor_sprite)
|
||||||
{
|
{
|
||||||
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
|
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
|
||||||
|
|
||||||
if (priv->displayed_cursor == cursor)
|
if (priv->displayed_cursor == cursor_sprite)
|
||||||
return;
|
return;
|
||||||
|
priv->displayed_cursor = cursor_sprite;
|
||||||
|
|
||||||
priv->displayed_cursor = cursor;
|
update_cursor (renderer, cursor_sprite);
|
||||||
update_cursor (renderer);
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
meta_cursor_renderer_force_update (MetaCursorRenderer *renderer)
|
||||||
|
{
|
||||||
|
MetaCursorRendererPrivate *priv =
|
||||||
|
meta_cursor_renderer_get_instance_private (renderer);
|
||||||
|
|
||||||
|
update_cursor (renderer, priv->displayed_cursor);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@@ -152,10 +199,10 @@ meta_cursor_renderer_set_position (MetaCursorRenderer *renderer,
|
|||||||
priv->current_x = x;
|
priv->current_x = x;
|
||||||
priv->current_y = y;
|
priv->current_y = y;
|
||||||
|
|
||||||
update_cursor (renderer);
|
update_cursor (renderer, priv->displayed_cursor);
|
||||||
}
|
}
|
||||||
|
|
||||||
MetaCursorReference *
|
MetaCursorSprite *
|
||||||
meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer)
|
meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer)
|
||||||
{
|
{
|
||||||
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
|
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
|
||||||
@@ -163,10 +210,27 @@ meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer)
|
|||||||
return priv->displayed_cursor;
|
return priv->displayed_cursor;
|
||||||
}
|
}
|
||||||
|
|
||||||
const MetaRectangle *
|
#ifdef HAVE_WAYLAND
|
||||||
meta_cursor_renderer_get_rect (MetaCursorRenderer *renderer)
|
void
|
||||||
|
meta_cursor_renderer_realize_cursor_from_wl_buffer (MetaCursorRenderer *renderer,
|
||||||
|
MetaCursorSprite *cursor_sprite,
|
||||||
|
struct wl_resource *buffer)
|
||||||
{
|
{
|
||||||
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
|
|
||||||
|
|
||||||
return &priv->current_rect;
|
MetaCursorRendererClass *renderer_class = META_CURSOR_RENDERER_GET_CLASS (renderer);
|
||||||
|
|
||||||
|
if (renderer_class->realize_cursor_from_wl_buffer)
|
||||||
|
renderer_class->realize_cursor_from_wl_buffer (renderer, cursor_sprite, buffer);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void
|
||||||
|
meta_cursor_renderer_realize_cursor_from_xcursor (MetaCursorRenderer *renderer,
|
||||||
|
MetaCursorSprite *cursor_sprite,
|
||||||
|
XcursorImage *xc_image)
|
||||||
|
{
|
||||||
|
MetaCursorRendererClass *renderer_class = META_CURSOR_RENDERER_GET_CLASS (renderer);
|
||||||
|
|
||||||
|
if (renderer_class->realize_cursor_from_xcursor)
|
||||||
|
renderer_class->realize_cursor_from_xcursor (renderer, cursor_sprite, xc_image);
|
||||||
}
|
}
|
||||||
|
@@ -26,45 +26,56 @@
|
|||||||
#define META_CURSOR_RENDERER_H
|
#define META_CURSOR_RENDERER_H
|
||||||
|
|
||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
|
#include <X11/Xcursor/Xcursor.h>
|
||||||
|
#ifdef HAVE_WAYLAND
|
||||||
|
#include <wayland-server.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <meta/screen.h>
|
#include <meta/screen.h>
|
||||||
#include "meta-cursor.h"
|
#include "meta-cursor.h"
|
||||||
|
|
||||||
#include <gbm.h>
|
|
||||||
|
|
||||||
#define META_TYPE_CURSOR_RENDERER (meta_cursor_renderer_get_type ())
|
#define META_TYPE_CURSOR_RENDERER (meta_cursor_renderer_get_type ())
|
||||||
#define META_CURSOR_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_CURSOR_RENDERER, MetaCursorRenderer))
|
G_DECLARE_DERIVABLE_TYPE (MetaCursorRenderer, meta_cursor_renderer,
|
||||||
#define META_CURSOR_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_CURSOR_RENDERER, MetaCursorRendererClass))
|
META, CURSOR_RENDERER, GObject);
|
||||||
#define META_IS_CURSOR_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_CURSOR_RENDERER))
|
|
||||||
#define META_IS_CURSOR_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_CURSOR_RENDERER))
|
|
||||||
#define META_CURSOR_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_CURSOR_RENDERER, MetaCursorRendererClass))
|
|
||||||
|
|
||||||
typedef struct _MetaCursorRenderer MetaCursorRenderer;
|
|
||||||
typedef struct _MetaCursorRendererClass MetaCursorRendererClass;
|
|
||||||
|
|
||||||
struct _MetaCursorRenderer
|
|
||||||
{
|
|
||||||
GObject parent;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct _MetaCursorRendererClass
|
struct _MetaCursorRendererClass
|
||||||
{
|
{
|
||||||
GObjectClass parent_class;
|
GObjectClass parent_class;
|
||||||
|
|
||||||
gboolean (* update_cursor) (MetaCursorRenderer *renderer);
|
gboolean (* update_cursor) (MetaCursorRenderer *renderer,
|
||||||
|
MetaCursorSprite *cursor_sprite);
|
||||||
|
#ifdef HAVE_WAYLAND
|
||||||
|
void (* realize_cursor_from_wl_buffer) (MetaCursorRenderer *renderer,
|
||||||
|
MetaCursorSprite *cursor_sprite,
|
||||||
|
struct wl_resource *buffer);
|
||||||
|
#endif
|
||||||
|
void (* realize_cursor_from_xcursor) (MetaCursorRenderer *renderer,
|
||||||
|
MetaCursorSprite *cursor_sprite,
|
||||||
|
XcursorImage *xc_image);
|
||||||
};
|
};
|
||||||
|
|
||||||
GType meta_cursor_renderer_get_type (void) G_GNUC_CONST;
|
|
||||||
|
|
||||||
MetaCursorRenderer * meta_cursor_renderer_new (void);
|
MetaCursorRenderer * meta_cursor_renderer_new (void);
|
||||||
|
|
||||||
void meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer,
|
void meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer,
|
||||||
MetaCursorReference *cursor);
|
MetaCursorSprite *cursor_sprite);
|
||||||
|
|
||||||
void meta_cursor_renderer_set_position (MetaCursorRenderer *renderer,
|
void meta_cursor_renderer_set_position (MetaCursorRenderer *renderer,
|
||||||
int x, int y);
|
int x, int y);
|
||||||
|
void meta_cursor_renderer_force_update (MetaCursorRenderer *renderer);
|
||||||
|
|
||||||
MetaCursorReference * meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer);
|
MetaCursorSprite * meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer);
|
||||||
const MetaRectangle * meta_cursor_renderer_get_rect (MetaCursorRenderer *renderer);
|
|
||||||
|
MetaRectangle meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,
|
||||||
|
MetaCursorSprite *cursor_sprite);
|
||||||
|
|
||||||
|
#ifdef HAVE_WAYLAND
|
||||||
|
void meta_cursor_renderer_realize_cursor_from_wl_buffer (MetaCursorRenderer *renderer,
|
||||||
|
MetaCursorSprite *cursor_sprite,
|
||||||
|
struct wl_resource *buffer);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void meta_cursor_renderer_realize_cursor_from_xcursor (MetaCursorRenderer *renderer,
|
||||||
|
MetaCursorSprite *cursor_sprite,
|
||||||
|
XcursorImage *xc_image);
|
||||||
|
|
||||||
#endif /* META_CURSOR_RENDERER_H */
|
#endif /* META_CURSOR_RENDERER_H */
|
||||||
|
@@ -23,8 +23,6 @@
|
|||||||
#define META_CURSOR_TRACKER_PRIVATE_H
|
#define META_CURSOR_TRACKER_PRIVATE_H
|
||||||
|
|
||||||
#include <meta/meta-cursor-tracker.h>
|
#include <meta/meta-cursor-tracker.h>
|
||||||
#include <wayland-server.h>
|
|
||||||
#include <gbm.h>
|
|
||||||
|
|
||||||
#include "meta-cursor.h"
|
#include "meta-cursor.h"
|
||||||
#include "meta-cursor-renderer.h"
|
#include "meta-cursor-renderer.h"
|
||||||
@@ -32,12 +30,11 @@
|
|||||||
struct _MetaCursorTracker {
|
struct _MetaCursorTracker {
|
||||||
GObject parent_instance;
|
GObject parent_instance;
|
||||||
|
|
||||||
MetaScreen *screen;
|
|
||||||
MetaCursorRenderer *renderer;
|
MetaCursorRenderer *renderer;
|
||||||
|
|
||||||
gboolean is_showing;
|
gboolean is_showing;
|
||||||
|
|
||||||
MetaCursorReference *displayed_cursor;
|
MetaCursorSprite *displayed_cursor;
|
||||||
|
|
||||||
/* Wayland clients can set a NULL buffer as their cursor
|
/* Wayland clients can set a NULL buffer as their cursor
|
||||||
* explicitly, which means that we shouldn't display anything.
|
* explicitly, which means that we shouldn't display anything.
|
||||||
@@ -45,12 +42,12 @@ struct _MetaCursorTracker {
|
|||||||
* determine an unset window cursor; we need an extra boolean.
|
* determine an unset window cursor; we need an extra boolean.
|
||||||
*/
|
*/
|
||||||
gboolean has_window_cursor;
|
gboolean has_window_cursor;
|
||||||
MetaCursorReference *window_cursor;
|
MetaCursorSprite *window_cursor;
|
||||||
|
|
||||||
MetaCursorReference *root_cursor;
|
MetaCursorSprite *root_cursor;
|
||||||
|
|
||||||
/* The cursor from the X11 server. */
|
/* The cursor from the X11 server. */
|
||||||
MetaCursorReference *xfixes_cursor;
|
MetaCursorSprite *xfixes_cursor;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _MetaCursorTrackerClass {
|
struct _MetaCursorTrackerClass {
|
||||||
@@ -61,15 +58,15 @@ gboolean meta_cursor_tracker_handle_xevent (MetaCursorTracker *tracker,
|
|||||||
XEvent *xevent);
|
XEvent *xevent);
|
||||||
|
|
||||||
void meta_cursor_tracker_set_window_cursor (MetaCursorTracker *tracker,
|
void meta_cursor_tracker_set_window_cursor (MetaCursorTracker *tracker,
|
||||||
MetaCursorReference *cursor);
|
MetaCursorSprite *cursor_sprite);
|
||||||
void meta_cursor_tracker_unset_window_cursor (MetaCursorTracker *tracker);
|
void meta_cursor_tracker_unset_window_cursor (MetaCursorTracker *tracker);
|
||||||
void meta_cursor_tracker_set_root_cursor (MetaCursorTracker *tracker,
|
void meta_cursor_tracker_set_root_cursor (MetaCursorTracker *tracker,
|
||||||
MetaCursorReference *cursor);
|
MetaCursorSprite *cursor_sprite);
|
||||||
|
|
||||||
void meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
|
void meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
|
||||||
int new_x,
|
int new_x,
|
||||||
int new_y);
|
int new_y);
|
||||||
|
|
||||||
MetaCursorReference * meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker);
|
MetaCursorSprite * meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -27,26 +27,22 @@
|
|||||||
* pointer abstraction"
|
* pointer abstraction"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
#include "config.h"
|
||||||
|
#include "meta-cursor-tracker-private.h"
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <meta/main.h>
|
#include <meta/main.h>
|
||||||
#include <meta/util.h>
|
#include <meta/util.h>
|
||||||
#include <meta/errors.h>
|
#include <meta/errors.h>
|
||||||
|
|
||||||
#include <cogl/cogl.h>
|
#include <cogl/cogl.h>
|
||||||
#include <cogl/cogl-wayland-server.h>
|
|
||||||
#include <clutter/clutter.h>
|
#include <clutter/clutter.h>
|
||||||
|
|
||||||
#include <gdk/gdk.h>
|
#include <gdk/gdk.h>
|
||||||
#include <gdk/gdkx.h>
|
#include <gdk/gdkx.h>
|
||||||
|
#include <X11/extensions/Xfixes.h>
|
||||||
|
|
||||||
#include "meta-backend.h"
|
#include "meta-backend-private.h"
|
||||||
|
|
||||||
#include "meta-cursor-private.h"
|
|
||||||
#include "meta-cursor-tracker-private.h"
|
|
||||||
#include "screen-private.h"
|
|
||||||
|
|
||||||
#include "wayland/meta-wayland-private.h"
|
|
||||||
|
|
||||||
G_DEFINE_TYPE (MetaCursorTracker, meta_cursor_tracker, G_TYPE_OBJECT);
|
G_DEFINE_TYPE (MetaCursorTracker, meta_cursor_tracker, G_TYPE_OBJECT);
|
||||||
|
|
||||||
@@ -57,13 +53,15 @@ enum {
|
|||||||
|
|
||||||
static guint signals[LAST_SIGNAL];
|
static guint signals[LAST_SIGNAL];
|
||||||
|
|
||||||
static MetaCursorReference *
|
static MetaCursorSprite *
|
||||||
get_displayed_cursor (MetaCursorTracker *tracker)
|
get_displayed_cursor (MetaCursorTracker *tracker)
|
||||||
{
|
{
|
||||||
|
MetaDisplay *display = meta_get_display ();
|
||||||
|
|
||||||
if (!tracker->is_showing)
|
if (!tracker->is_showing)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (tracker->screen->display->grab_op == META_GRAB_OP_NONE)
|
if (meta_display_windows_are_interactable (display))
|
||||||
{
|
{
|
||||||
if (tracker->has_window_cursor)
|
if (tracker->has_window_cursor)
|
||||||
return tracker->window_cursor;
|
return tracker->window_cursor;
|
||||||
@@ -81,14 +79,14 @@ update_displayed_cursor (MetaCursorTracker *tracker)
|
|||||||
static void
|
static void
|
||||||
sync_cursor (MetaCursorTracker *tracker)
|
sync_cursor (MetaCursorTracker *tracker)
|
||||||
{
|
{
|
||||||
MetaCursorReference *displayed_cursor = get_displayed_cursor (tracker);
|
MetaCursorSprite *displayed_cursor = get_displayed_cursor (tracker);
|
||||||
|
|
||||||
if (tracker->displayed_cursor == displayed_cursor)
|
if (tracker->displayed_cursor == displayed_cursor)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
g_clear_pointer (&tracker->displayed_cursor, meta_cursor_reference_unref);
|
g_clear_object (&tracker->displayed_cursor);
|
||||||
if (displayed_cursor)
|
if (displayed_cursor)
|
||||||
tracker->displayed_cursor = meta_cursor_reference_ref (displayed_cursor);
|
tracker->displayed_cursor = g_object_ref (displayed_cursor);
|
||||||
|
|
||||||
update_displayed_cursor (tracker);
|
update_displayed_cursor (tracker);
|
||||||
g_signal_emit (tracker, signals[CURSOR_CHANGED], 0);
|
g_signal_emit (tracker, signals[CURSOR_CHANGED], 0);
|
||||||
@@ -97,6 +95,9 @@ sync_cursor (MetaCursorTracker *tracker)
|
|||||||
static void
|
static void
|
||||||
meta_cursor_tracker_init (MetaCursorTracker *self)
|
meta_cursor_tracker_init (MetaCursorTracker *self)
|
||||||
{
|
{
|
||||||
|
MetaBackend *backend = meta_get_backend ();
|
||||||
|
|
||||||
|
self->renderer = meta_backend_get_cursor_renderer (backend);
|
||||||
self->is_showing = TRUE;
|
self->is_showing = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -106,9 +107,9 @@ meta_cursor_tracker_finalize (GObject *object)
|
|||||||
MetaCursorTracker *self = META_CURSOR_TRACKER (object);
|
MetaCursorTracker *self = META_CURSOR_TRACKER (object);
|
||||||
|
|
||||||
if (self->displayed_cursor)
|
if (self->displayed_cursor)
|
||||||
meta_cursor_reference_unref (self->displayed_cursor);
|
g_object_unref (self->displayed_cursor);
|
||||||
if (self->root_cursor)
|
if (self->root_cursor)
|
||||||
meta_cursor_reference_unref (self->root_cursor);
|
g_object_unref (self->root_cursor);
|
||||||
|
|
||||||
G_OBJECT_CLASS (meta_cursor_tracker_parent_class)->finalize (object);
|
G_OBJECT_CLASS (meta_cursor_tracker_parent_class)->finalize (object);
|
||||||
}
|
}
|
||||||
@@ -129,47 +130,9 @@ meta_cursor_tracker_class_init (MetaCursorTrackerClass *klass)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static MetaCursorTracker *
|
static MetaCursorTracker *
|
||||||
make_wayland_cursor_tracker (MetaScreen *screen)
|
meta_cursor_tracker_new (void)
|
||||||
{
|
{
|
||||||
MetaBackend *backend = meta_get_backend ();
|
return g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
|
||||||
MetaWaylandCompositor *compositor;
|
|
||||||
MetaCursorTracker *self;
|
|
||||||
|
|
||||||
self = g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
|
|
||||||
self->screen = screen;
|
|
||||||
self->renderer = meta_backend_get_cursor_renderer (backend);
|
|
||||||
|
|
||||||
compositor = meta_wayland_compositor_get_default ();
|
|
||||||
compositor->seat->pointer.cursor_tracker = self;
|
|
||||||
meta_cursor_tracker_update_position (self, 0, 0);
|
|
||||||
|
|
||||||
return self;
|
|
||||||
}
|
|
||||||
|
|
||||||
static MetaCursorTracker *
|
|
||||||
make_x11_cursor_tracker (MetaScreen *screen)
|
|
||||||
{
|
|
||||||
MetaBackend *backend = meta_get_backend ();
|
|
||||||
MetaCursorTracker *self;
|
|
||||||
|
|
||||||
self = g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
|
|
||||||
self->screen = screen;
|
|
||||||
self->renderer = meta_backend_get_cursor_renderer (backend);
|
|
||||||
|
|
||||||
XFixesSelectCursorInput (screen->display->xdisplay,
|
|
||||||
screen->xroot,
|
|
||||||
XFixesDisplayCursorNotifyMask);
|
|
||||||
|
|
||||||
return self;
|
|
||||||
}
|
|
||||||
|
|
||||||
static MetaCursorTracker *
|
|
||||||
meta_cursor_tracker_new (MetaScreen *screen)
|
|
||||||
{
|
|
||||||
if (meta_is_wayland_compositor ())
|
|
||||||
return make_wayland_cursor_tracker (screen);
|
|
||||||
else
|
|
||||||
return make_x11_cursor_tracker (screen);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static MetaCursorTracker *_cursor_tracker;
|
static MetaCursorTracker *_cursor_tracker;
|
||||||
@@ -186,7 +149,7 @@ MetaCursorTracker *
|
|||||||
meta_cursor_tracker_get_for_screen (MetaScreen *screen)
|
meta_cursor_tracker_get_for_screen (MetaScreen *screen)
|
||||||
{
|
{
|
||||||
if (!_cursor_tracker)
|
if (!_cursor_tracker)
|
||||||
_cursor_tracker = meta_cursor_tracker_new (screen);
|
_cursor_tracker = meta_cursor_tracker_new ();
|
||||||
|
|
||||||
return _cursor_tracker;
|
return _cursor_tracker;
|
||||||
}
|
}
|
||||||
@@ -194,11 +157,11 @@ meta_cursor_tracker_get_for_screen (MetaScreen *screen)
|
|||||||
static void
|
static void
|
||||||
set_window_cursor (MetaCursorTracker *tracker,
|
set_window_cursor (MetaCursorTracker *tracker,
|
||||||
gboolean has_cursor,
|
gboolean has_cursor,
|
||||||
MetaCursorReference *cursor)
|
MetaCursorSprite *cursor_sprite)
|
||||||
{
|
{
|
||||||
g_clear_pointer (&tracker->window_cursor, meta_cursor_reference_unref);
|
g_clear_object (&tracker->window_cursor);
|
||||||
if (cursor)
|
if (cursor_sprite)
|
||||||
tracker->window_cursor = meta_cursor_reference_ref (cursor);
|
tracker->window_cursor = g_object_ref (cursor_sprite);
|
||||||
tracker->has_window_cursor = has_cursor;
|
tracker->has_window_cursor = has_cursor;
|
||||||
sync_cursor (tracker);
|
sync_cursor (tracker);
|
||||||
}
|
}
|
||||||
@@ -207,42 +170,29 @@ gboolean
|
|||||||
meta_cursor_tracker_handle_xevent (MetaCursorTracker *tracker,
|
meta_cursor_tracker_handle_xevent (MetaCursorTracker *tracker,
|
||||||
XEvent *xevent)
|
XEvent *xevent)
|
||||||
{
|
{
|
||||||
|
MetaDisplay *display = meta_get_display ();
|
||||||
XFixesCursorNotifyEvent *notify_event;
|
XFixesCursorNotifyEvent *notify_event;
|
||||||
|
|
||||||
if (meta_is_wayland_compositor ())
|
if (meta_is_wayland_compositor ())
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (xevent->xany.type != tracker->screen->display->xfixes_event_base + XFixesCursorNotify)
|
if (xevent->xany.type != display->xfixes_event_base + XFixesCursorNotify)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
notify_event = (XFixesCursorNotifyEvent *)xevent;
|
notify_event = (XFixesCursorNotifyEvent *)xevent;
|
||||||
if (notify_event->subtype != XFixesDisplayCursorNotify)
|
if (notify_event->subtype != XFixesDisplayCursorNotify)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
g_clear_pointer (&tracker->xfixes_cursor, meta_cursor_reference_unref);
|
g_clear_object (&tracker->xfixes_cursor);
|
||||||
|
g_signal_emit (tracker, signals[CURSOR_CHANGED], 0);
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static MetaCursorReference *
|
|
||||||
meta_cursor_reference_take_texture (CoglTexture2D *texture,
|
|
||||||
int hot_x,
|
|
||||||
int hot_y)
|
|
||||||
{
|
|
||||||
MetaCursorReference *self;
|
|
||||||
|
|
||||||
self = g_slice_new0 (MetaCursorReference);
|
|
||||||
self->ref_count = 1;
|
|
||||||
self->image.texture = texture;
|
|
||||||
self->image.hot_x = hot_x;
|
|
||||||
self->image.hot_y = hot_y;
|
|
||||||
|
|
||||||
return self;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
ensure_xfixes_cursor (MetaCursorTracker *tracker)
|
ensure_xfixes_cursor (MetaCursorTracker *tracker)
|
||||||
{
|
{
|
||||||
|
MetaDisplay *display = meta_get_display ();
|
||||||
XFixesCursorImage *cursor_image;
|
XFixesCursorImage *cursor_image;
|
||||||
CoglTexture2D *sprite;
|
CoglTexture2D *sprite;
|
||||||
guint8 *cursor_data;
|
guint8 *cursor_data;
|
||||||
@@ -252,7 +202,7 @@ ensure_xfixes_cursor (MetaCursorTracker *tracker)
|
|||||||
if (tracker->xfixes_cursor)
|
if (tracker->xfixes_cursor)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
cursor_image = XFixesGetCursorImage (tracker->screen->display->xdisplay);
|
cursor_image = XFixesGetCursorImage (display->xdisplay);
|
||||||
if (!cursor_image)
|
if (!cursor_image)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -296,10 +246,13 @@ ensure_xfixes_cursor (MetaCursorTracker *tracker)
|
|||||||
|
|
||||||
if (sprite != NULL)
|
if (sprite != NULL)
|
||||||
{
|
{
|
||||||
MetaCursorReference *cursor = meta_cursor_reference_take_texture (sprite,
|
MetaCursorSprite *cursor_sprite = meta_cursor_sprite_new ();
|
||||||
|
meta_cursor_sprite_set_texture (cursor_sprite,
|
||||||
|
sprite,
|
||||||
cursor_image->xhot,
|
cursor_image->xhot,
|
||||||
cursor_image->yhot);
|
cursor_image->yhot);
|
||||||
tracker->xfixes_cursor = cursor;
|
cogl_object_unref (sprite);
|
||||||
|
tracker->xfixes_cursor = cursor_sprite;
|
||||||
}
|
}
|
||||||
XFree (cursor_image);
|
XFree (cursor_image);
|
||||||
}
|
}
|
||||||
@@ -312,22 +265,22 @@ ensure_xfixes_cursor (MetaCursorTracker *tracker)
|
|||||||
CoglTexture *
|
CoglTexture *
|
||||||
meta_cursor_tracker_get_sprite (MetaCursorTracker *tracker)
|
meta_cursor_tracker_get_sprite (MetaCursorTracker *tracker)
|
||||||
{
|
{
|
||||||
MetaCursorReference *cursor;
|
MetaCursorSprite *cursor_sprite;
|
||||||
|
|
||||||
g_return_val_if_fail (META_IS_CURSOR_TRACKER (tracker), NULL);
|
g_return_val_if_fail (META_IS_CURSOR_TRACKER (tracker), NULL);
|
||||||
|
|
||||||
if (meta_is_wayland_compositor ())
|
if (meta_is_wayland_compositor ())
|
||||||
{
|
{
|
||||||
cursor = tracker->displayed_cursor;
|
cursor_sprite = tracker->displayed_cursor;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ensure_xfixes_cursor (tracker);
|
ensure_xfixes_cursor (tracker);
|
||||||
cursor = tracker->xfixes_cursor;
|
cursor_sprite = tracker->xfixes_cursor;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cursor)
|
if (cursor_sprite)
|
||||||
return meta_cursor_reference_get_cogl_texture (cursor, NULL, NULL);
|
return meta_cursor_sprite_get_cogl_texture (cursor_sprite);
|
||||||
else
|
else
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@@ -344,22 +297,22 @@ meta_cursor_tracker_get_hot (MetaCursorTracker *tracker,
|
|||||||
int *x,
|
int *x,
|
||||||
int *y)
|
int *y)
|
||||||
{
|
{
|
||||||
MetaCursorReference *cursor;
|
MetaCursorSprite *cursor_sprite;
|
||||||
|
|
||||||
g_return_if_fail (META_IS_CURSOR_TRACKER (tracker));
|
g_return_if_fail (META_IS_CURSOR_TRACKER (tracker));
|
||||||
|
|
||||||
if (meta_is_wayland_compositor ())
|
if (meta_is_wayland_compositor ())
|
||||||
{
|
{
|
||||||
cursor = tracker->displayed_cursor;
|
cursor_sprite = tracker->displayed_cursor;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ensure_xfixes_cursor (tracker);
|
ensure_xfixes_cursor (tracker);
|
||||||
cursor = tracker->xfixes_cursor;
|
cursor_sprite = tracker->xfixes_cursor;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cursor)
|
if (cursor_sprite)
|
||||||
meta_cursor_reference_get_cogl_texture (cursor, x, y);
|
meta_cursor_sprite_get_hotspot (cursor_sprite, x, y);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (x)
|
if (x)
|
||||||
@@ -371,9 +324,9 @@ meta_cursor_tracker_get_hot (MetaCursorTracker *tracker,
|
|||||||
|
|
||||||
void
|
void
|
||||||
meta_cursor_tracker_set_window_cursor (MetaCursorTracker *tracker,
|
meta_cursor_tracker_set_window_cursor (MetaCursorTracker *tracker,
|
||||||
MetaCursorReference *cursor)
|
MetaCursorSprite *cursor_sprite)
|
||||||
{
|
{
|
||||||
set_window_cursor (tracker, TRUE, cursor);
|
set_window_cursor (tracker, TRUE, cursor_sprite);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@@ -384,11 +337,11 @@ meta_cursor_tracker_unset_window_cursor (MetaCursorTracker *tracker)
|
|||||||
|
|
||||||
void
|
void
|
||||||
meta_cursor_tracker_set_root_cursor (MetaCursorTracker *tracker,
|
meta_cursor_tracker_set_root_cursor (MetaCursorTracker *tracker,
|
||||||
MetaCursorReference *cursor)
|
MetaCursorSprite *cursor_sprite)
|
||||||
{
|
{
|
||||||
g_clear_pointer (&tracker->root_cursor, meta_cursor_reference_unref);
|
g_clear_object (&tracker->root_cursor);
|
||||||
if (cursor)
|
if (cursor_sprite)
|
||||||
tracker->root_cursor = meta_cursor_reference_ref (cursor);
|
tracker->root_cursor = g_object_ref (cursor_sprite);
|
||||||
|
|
||||||
sync_cursor (tracker);
|
sync_cursor (tracker);
|
||||||
}
|
}
|
||||||
@@ -408,12 +361,12 @@ get_pointer_position_gdk (int *x,
|
|||||||
int *y,
|
int *y,
|
||||||
int *mods)
|
int *mods)
|
||||||
{
|
{
|
||||||
GdkDeviceManager *gmanager;
|
GdkSeat *gseat;
|
||||||
GdkDevice *gdevice;
|
GdkDevice *gdevice;
|
||||||
GdkScreen *gscreen;
|
GdkScreen *gscreen;
|
||||||
|
|
||||||
gmanager = gdk_display_get_device_manager (gdk_display_get_default ());
|
gseat = gdk_display_get_default_seat (gdk_display_get_default ());
|
||||||
gdevice = gdk_x11_device_manager_lookup (gmanager, META_VIRTUAL_CORE_POINTER_ID);
|
gdevice = gdk_seat_get_pointer (gseat);
|
||||||
|
|
||||||
gdk_device_get_position (gdevice, &gscreen, x, y);
|
gdk_device_get_position (gdevice, &gscreen, x, y);
|
||||||
if (mods)
|
if (mods)
|
||||||
@@ -471,7 +424,7 @@ meta_cursor_tracker_set_pointer_visible (MetaCursorTracker *tracker,
|
|||||||
sync_cursor (tracker);
|
sync_cursor (tracker);
|
||||||
}
|
}
|
||||||
|
|
||||||
MetaCursorReference *
|
MetaCursorSprite *
|
||||||
meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker)
|
meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker)
|
||||||
{
|
{
|
||||||
return tracker->displayed_cursor;
|
return tracker->displayed_cursor;
|
||||||
|
@@ -21,14 +21,13 @@
|
|||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#include "meta-cursor-private.h"
|
#include "meta-cursor.h"
|
||||||
|
|
||||||
#include <meta/errors.h>
|
#include <meta/errors.h>
|
||||||
|
|
||||||
#include "display-private.h"
|
#include "display-private.h"
|
||||||
#include "screen-private.h"
|
#include "screen-private.h"
|
||||||
#include "meta-backend.h"
|
#include "meta-backend-private.h"
|
||||||
#include "backends/native/meta-cursor-renderer-native.h"
|
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
@@ -36,40 +35,32 @@
|
|||||||
#include <X11/extensions/Xfixes.h>
|
#include <X11/extensions/Xfixes.h>
|
||||||
#include <X11/Xcursor/Xcursor.h>
|
#include <X11/Xcursor/Xcursor.h>
|
||||||
|
|
||||||
#include <cogl/cogl-wayland-server.h>
|
enum {
|
||||||
|
PREPARE_AT,
|
||||||
|
|
||||||
MetaCursorReference *
|
LAST_SIGNAL
|
||||||
meta_cursor_reference_ref (MetaCursorReference *self)
|
};
|
||||||
|
|
||||||
|
static guint signals[LAST_SIGNAL];
|
||||||
|
|
||||||
|
struct _MetaCursorSprite
|
||||||
{
|
{
|
||||||
g_assert (self->ref_count > 0);
|
GObject parent;
|
||||||
self->ref_count++;
|
|
||||||
|
|
||||||
return self;
|
MetaCursor cursor;
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
CoglTexture2D *texture;
|
||||||
meta_cursor_image_free (MetaCursorImage *image)
|
float texture_scale;
|
||||||
{
|
int hot_x, hot_y;
|
||||||
cogl_object_unref (image->texture);
|
|
||||||
if (image->bo)
|
|
||||||
gbm_bo_destroy (image->bo);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
int current_frame;
|
||||||
meta_cursor_reference_free (MetaCursorReference *self)
|
XcursorImages *xcursor_images;
|
||||||
{
|
|
||||||
meta_cursor_image_free (&self->image);
|
|
||||||
g_slice_free (MetaCursorReference, self);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
int theme_scale;
|
||||||
meta_cursor_reference_unref (MetaCursorReference *self)
|
gboolean theme_dirty;
|
||||||
{
|
};
|
||||||
self->ref_count--;
|
|
||||||
|
|
||||||
if (self->ref_count == 0)
|
G_DEFINE_TYPE (MetaCursorSprite, meta_cursor_sprite, G_TYPE_OBJECT)
|
||||||
meta_cursor_reference_free (self);
|
|
||||||
}
|
|
||||||
|
|
||||||
static const char *
|
static const char *
|
||||||
translate_meta_cursor (MetaCursor cursor)
|
translate_meta_cursor (MetaCursor cursor)
|
||||||
@@ -126,247 +117,242 @@ meta_cursor_create_x_cursor (Display *xdisplay,
|
|||||||
return XcursorLibraryLoadCursor (xdisplay, translate_meta_cursor (cursor));
|
return XcursorLibraryLoadCursor (xdisplay, translate_meta_cursor (cursor));
|
||||||
}
|
}
|
||||||
|
|
||||||
static XcursorImage *
|
static XcursorImages *
|
||||||
load_cursor_on_client (MetaCursor cursor)
|
load_cursor_on_client (MetaCursor cursor, int scale)
|
||||||
{
|
{
|
||||||
return XcursorLibraryLoadImage (translate_meta_cursor (cursor),
|
return XcursorLibraryLoadImages (translate_meta_cursor (cursor),
|
||||||
meta_prefs_get_cursor_theme (),
|
meta_prefs_get_cursor_theme (),
|
||||||
meta_prefs_get_cursor_size ());
|
meta_prefs_get_cursor_size () * scale);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
meta_cursor_image_load_gbm_buffer (struct gbm_device *gbm,
|
meta_cursor_sprite_load_from_xcursor_image (MetaCursorSprite *self,
|
||||||
MetaCursorImage *image,
|
XcursorImage *xc_image)
|
||||||
uint8_t *pixels,
|
|
||||||
int width,
|
|
||||||
int height,
|
|
||||||
int rowstride,
|
|
||||||
uint32_t gbm_format)
|
|
||||||
{
|
|
||||||
if (width > 64 || height > 64)
|
|
||||||
{
|
|
||||||
meta_warning ("Invalid theme cursor size (must be at most 64x64)\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (gbm_device_is_format_supported (gbm, gbm_format,
|
|
||||||
GBM_BO_USE_CURSOR_64X64 | GBM_BO_USE_WRITE))
|
|
||||||
{
|
|
||||||
uint8_t buf[4 * 64 * 64];
|
|
||||||
int i;
|
|
||||||
|
|
||||||
image->bo = gbm_bo_create (gbm, 64, 64,
|
|
||||||
gbm_format, GBM_BO_USE_CURSOR_64X64 | GBM_BO_USE_WRITE);
|
|
||||||
|
|
||||||
memset (buf, 0, sizeof(buf));
|
|
||||||
for (i = 0; i < height; i++)
|
|
||||||
memcpy (buf + i * 4 * 64, pixels + i * rowstride, width * 4);
|
|
||||||
|
|
||||||
gbm_bo_write (image->bo, buf, 64 * 64 * 4);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
meta_warning ("HW cursor for format %d not supported\n", gbm_format);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct gbm_device *
|
|
||||||
get_gbm_device (void)
|
|
||||||
{
|
{
|
||||||
MetaBackend *meta_backend = meta_get_backend ();
|
MetaBackend *meta_backend = meta_get_backend ();
|
||||||
MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (meta_backend);
|
MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (meta_backend);
|
||||||
|
uint width, height, rowstride;
|
||||||
if (META_IS_CURSOR_RENDERER_NATIVE (renderer))
|
|
||||||
return meta_cursor_renderer_native_get_gbm_device (META_CURSOR_RENDERER_NATIVE (renderer));
|
|
||||||
else
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
meta_cursor_image_load_from_xcursor_image (MetaCursorImage *image,
|
|
||||||
XcursorImage *xc_image)
|
|
||||||
{
|
|
||||||
int width, height, rowstride;
|
|
||||||
CoglPixelFormat cogl_format;
|
CoglPixelFormat cogl_format;
|
||||||
uint32_t gbm_format;
|
|
||||||
ClutterBackend *clutter_backend;
|
ClutterBackend *clutter_backend;
|
||||||
CoglContext *cogl_context;
|
CoglContext *cogl_context;
|
||||||
struct gbm_device *gbm;
|
CoglTexture *texture;
|
||||||
|
|
||||||
|
g_assert (self->texture == NULL);
|
||||||
|
|
||||||
width = xc_image->width;
|
width = xc_image->width;
|
||||||
height = xc_image->height;
|
height = xc_image->height;
|
||||||
rowstride = width * 4;
|
rowstride = width * 4;
|
||||||
|
|
||||||
gbm_format = GBM_FORMAT_ARGB8888;
|
|
||||||
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
|
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
|
||||||
cogl_format = COGL_PIXEL_FORMAT_BGRA_8888;
|
cogl_format = COGL_PIXEL_FORMAT_BGRA_8888;
|
||||||
#else
|
#else
|
||||||
cogl_format = COGL_PIXEL_FORMAT_ARGB_8888;
|
cogl_format = COGL_PIXEL_FORMAT_ARGB_8888;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
image->hot_x = xc_image->xhot;
|
|
||||||
image->hot_y = xc_image->yhot;
|
|
||||||
|
|
||||||
clutter_backend = clutter_get_default_backend ();
|
clutter_backend = clutter_get_default_backend ();
|
||||||
cogl_context = clutter_backend_get_cogl_context (clutter_backend);
|
cogl_context = clutter_backend_get_cogl_context (clutter_backend);
|
||||||
image->texture = cogl_texture_2d_new_from_data (cogl_context,
|
texture = cogl_texture_2d_new_from_data (cogl_context,
|
||||||
width, height,
|
width, height,
|
||||||
cogl_format,
|
cogl_format,
|
||||||
rowstride,
|
rowstride,
|
||||||
(uint8_t *) xc_image->pixels,
|
(uint8_t *) xc_image->pixels,
|
||||||
NULL);
|
NULL);
|
||||||
|
meta_cursor_sprite_set_texture (self, texture,
|
||||||
|
xc_image->xhot, xc_image->yhot);
|
||||||
|
cogl_object_unref (texture);
|
||||||
|
|
||||||
gbm = get_gbm_device ();
|
meta_cursor_renderer_realize_cursor_from_xcursor (renderer, self, xc_image);
|
||||||
if (gbm)
|
|
||||||
meta_cursor_image_load_gbm_buffer (gbm,
|
|
||||||
image,
|
|
||||||
(uint8_t *) xc_image->pixels,
|
|
||||||
width, height, rowstride,
|
|
||||||
gbm_format);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MetaCursorReference *
|
static XcursorImage *
|
||||||
meta_cursor_reference_from_theme (MetaCursor cursor)
|
meta_cursor_sprite_get_current_frame_image (MetaCursorSprite *self)
|
||||||
|
{
|
||||||
|
return self->xcursor_images->images[self->current_frame];
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
meta_cursor_sprite_tick_frame (MetaCursorSprite *self)
|
||||||
{
|
{
|
||||||
MetaCursorReference *self;
|
|
||||||
XcursorImage *image;
|
XcursorImage *image;
|
||||||
|
|
||||||
image = load_cursor_on_client (cursor);
|
if (!meta_cursor_sprite_is_animated (self))
|
||||||
if (!image)
|
return;
|
||||||
return NULL;
|
|
||||||
|
|
||||||
self = g_slice_new0 (MetaCursorReference);
|
self->current_frame++;
|
||||||
self->ref_count = 1;
|
|
||||||
self->cursor = cursor;
|
|
||||||
meta_cursor_image_load_from_xcursor_image (&self->image, image);
|
|
||||||
|
|
||||||
XcursorImageDestroy (image);
|
if (self->current_frame >= self->xcursor_images->nimage)
|
||||||
return self;
|
self->current_frame = 0;
|
||||||
|
|
||||||
|
image = meta_cursor_sprite_get_current_frame_image (self);
|
||||||
|
|
||||||
|
g_clear_pointer (&self->texture, cogl_object_unref);
|
||||||
|
meta_cursor_sprite_load_from_xcursor_image (self, image);
|
||||||
|
}
|
||||||
|
|
||||||
|
guint
|
||||||
|
meta_cursor_sprite_get_current_frame_time (MetaCursorSprite *self)
|
||||||
|
{
|
||||||
|
if (!meta_cursor_sprite_is_animated (self))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
return self->xcursor_images->images[self->current_frame]->delay;
|
||||||
|
}
|
||||||
|
|
||||||
|
gboolean
|
||||||
|
meta_cursor_sprite_is_animated (MetaCursorSprite *self)
|
||||||
|
{
|
||||||
|
return (self->xcursor_images &&
|
||||||
|
self->xcursor_images->nimage > 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
MetaCursorSprite *
|
||||||
|
meta_cursor_sprite_new (void)
|
||||||
|
{
|
||||||
|
return g_object_new (META_TYPE_CURSOR_SPRITE, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
meta_cursor_image_load_from_buffer (MetaCursorImage *image,
|
meta_cursor_sprite_load_from_theme (MetaCursorSprite *self)
|
||||||
struct wl_resource *buffer,
|
|
||||||
int hot_x,
|
|
||||||
int hot_y)
|
|
||||||
{
|
{
|
||||||
struct gbm_device *gbm = get_gbm_device ();
|
XcursorImage *image;
|
||||||
|
|
||||||
ClutterBackend *backend;
|
g_assert (self->cursor != META_CURSOR_NONE);
|
||||||
CoglContext *cogl_context;
|
|
||||||
struct wl_shm_buffer *shm_buffer;
|
|
||||||
uint32_t gbm_format;
|
|
||||||
int width, height;
|
|
||||||
|
|
||||||
image->hot_x = hot_x;
|
/* We might be reloading with a different scale. If so clear the old data. */
|
||||||
image->hot_y = hot_y;
|
if (self->xcursor_images)
|
||||||
|
|
||||||
backend = clutter_get_default_backend ();
|
|
||||||
cogl_context = clutter_backend_get_cogl_context (backend);
|
|
||||||
|
|
||||||
image->texture = cogl_wayland_texture_2d_new_from_buffer (cogl_context, buffer, NULL);
|
|
||||||
|
|
||||||
width = cogl_texture_get_width (COGL_TEXTURE (image->texture));
|
|
||||||
height = cogl_texture_get_height (COGL_TEXTURE (image->texture));
|
|
||||||
|
|
||||||
shm_buffer = wl_shm_buffer_get (buffer);
|
|
||||||
if (shm_buffer)
|
|
||||||
{
|
{
|
||||||
if (gbm)
|
g_clear_pointer (&self->texture, cogl_object_unref);
|
||||||
{
|
XcursorImagesDestroy (self->xcursor_images);
|
||||||
int rowstride = wl_shm_buffer_get_stride (shm_buffer);
|
|
||||||
|
|
||||||
switch (wl_shm_buffer_get_format (shm_buffer))
|
|
||||||
{
|
|
||||||
#if G_BYTE_ORDER == G_BIG_ENDIAN
|
|
||||||
case WL_SHM_FORMAT_ARGB8888:
|
|
||||||
gbm_format = GBM_FORMAT_ARGB8888;
|
|
||||||
break;
|
|
||||||
case WL_SHM_FORMAT_XRGB8888:
|
|
||||||
gbm_format = GBM_FORMAT_XRGB8888;
|
|
||||||
break;
|
|
||||||
#else
|
|
||||||
case WL_SHM_FORMAT_ARGB8888:
|
|
||||||
gbm_format = GBM_FORMAT_ARGB8888;
|
|
||||||
break;
|
|
||||||
case WL_SHM_FORMAT_XRGB8888:
|
|
||||||
gbm_format = GBM_FORMAT_XRGB8888;
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
default:
|
|
||||||
g_warn_if_reached ();
|
|
||||||
gbm_format = GBM_FORMAT_ARGB8888;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
meta_cursor_image_load_gbm_buffer (gbm,
|
self->current_frame = 0;
|
||||||
image,
|
self->xcursor_images = load_cursor_on_client (self->cursor,
|
||||||
(uint8_t *) wl_shm_buffer_get_data (shm_buffer),
|
self->theme_scale);
|
||||||
width, height, rowstride,
|
if (!self->xcursor_images)
|
||||||
gbm_format);
|
meta_fatal ("Could not find cursor. Perhaps set XCURSOR_PATH?");
|
||||||
}
|
|
||||||
}
|
image = meta_cursor_sprite_get_current_frame_image (self);
|
||||||
else
|
meta_cursor_sprite_load_from_xcursor_image (self, image);
|
||||||
{
|
|
||||||
/* HW cursors must be 64x64, but 64x64 is huge, and no cursor theme actually uses
|
self->theme_dirty = FALSE;
|
||||||
that, so themed cursors must be padded with transparent pixels to fill the
|
|
||||||
overlay. This is trivial if we have CPU access to the data, but it's not
|
|
||||||
possible if the buffer is in GPU memory (and possibly tiled too), so if we
|
|
||||||
don't get the right size, we fallback to GL.
|
|
||||||
*/
|
|
||||||
if (width != 64 || height != 64)
|
|
||||||
{
|
|
||||||
meta_warning ("Invalid cursor size (must be 64x64), falling back to software (GL) cursors\n");
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gbm)
|
MetaCursorSprite *
|
||||||
|
meta_cursor_sprite_from_theme (MetaCursor cursor)
|
||||||
{
|
{
|
||||||
image->bo = gbm_bo_import (gbm, GBM_BO_IMPORT_WL_BUFFER,
|
MetaCursorSprite *self;
|
||||||
buffer, GBM_BO_USE_CURSOR_64X64);
|
|
||||||
if (!image->bo)
|
|
||||||
meta_warning ("Importing HW cursor from wl_buffer failed\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
MetaCursorReference *
|
self = meta_cursor_sprite_new ();
|
||||||
meta_cursor_reference_from_buffer (struct wl_resource *buffer,
|
|
||||||
int hot_x,
|
|
||||||
int hot_y)
|
|
||||||
{
|
|
||||||
MetaCursorReference *self;
|
|
||||||
|
|
||||||
self = g_slice_new0 (MetaCursorReference);
|
self->cursor = cursor;
|
||||||
self->ref_count = 1;
|
self->theme_dirty = TRUE;
|
||||||
meta_cursor_image_load_from_buffer (&self->image, buffer, hot_x, hot_y);
|
|
||||||
|
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
CoglTexture *
|
void
|
||||||
meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor,
|
meta_cursor_sprite_set_texture (MetaCursorSprite *self,
|
||||||
int *hot_x,
|
CoglTexture *texture,
|
||||||
int *hot_y)
|
int hot_x,
|
||||||
|
int hot_y)
|
||||||
{
|
{
|
||||||
if (hot_x)
|
g_clear_pointer (&self->texture, cogl_object_unref);
|
||||||
*hot_x = cursor->image.hot_x;
|
if (texture)
|
||||||
if (hot_y)
|
self->texture = cogl_object_ref (texture);
|
||||||
*hot_y = cursor->image.hot_y;
|
self->hot_x = hot_x;
|
||||||
return COGL_TEXTURE (cursor->image.texture);
|
self->hot_y = hot_y;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct gbm_bo *
|
void
|
||||||
meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor,
|
meta_cursor_sprite_set_texture_scale (MetaCursorSprite *self,
|
||||||
int *hot_x,
|
float scale)
|
||||||
int *hot_y)
|
|
||||||
{
|
{
|
||||||
if (hot_x)
|
self->texture_scale = scale;
|
||||||
*hot_x = cursor->image.hot_x;
|
}
|
||||||
if (hot_y)
|
|
||||||
*hot_y = cursor->image.hot_y;
|
void
|
||||||
return cursor->image.bo;
|
meta_cursor_sprite_set_theme_scale (MetaCursorSprite *self,
|
||||||
|
int theme_scale)
|
||||||
|
{
|
||||||
|
if (self->theme_scale != theme_scale)
|
||||||
|
self->theme_dirty = TRUE;
|
||||||
|
self->theme_scale = theme_scale;
|
||||||
|
}
|
||||||
|
|
||||||
|
CoglTexture *
|
||||||
|
meta_cursor_sprite_get_cogl_texture (MetaCursorSprite *self)
|
||||||
|
{
|
||||||
|
return COGL_TEXTURE (self->texture);
|
||||||
}
|
}
|
||||||
|
|
||||||
MetaCursor
|
MetaCursor
|
||||||
meta_cursor_reference_get_meta_cursor (MetaCursorReference *cursor)
|
meta_cursor_sprite_get_meta_cursor (MetaCursorSprite *self)
|
||||||
{
|
{
|
||||||
return cursor->cursor;
|
return self->cursor;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
meta_cursor_sprite_get_hotspot (MetaCursorSprite *self,
|
||||||
|
int *hot_x,
|
||||||
|
int *hot_y)
|
||||||
|
{
|
||||||
|
*hot_x = self->hot_x;
|
||||||
|
*hot_y = self->hot_y;
|
||||||
|
}
|
||||||
|
|
||||||
|
float
|
||||||
|
meta_cursor_sprite_get_texture_scale (MetaCursorSprite *self)
|
||||||
|
{
|
||||||
|
return self->texture_scale;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
meta_cursor_sprite_prepare_at (MetaCursorSprite *self,
|
||||||
|
int x,
|
||||||
|
int y)
|
||||||
|
{
|
||||||
|
g_signal_emit (self, signals[PREPARE_AT], 0, x, y);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
meta_cursor_sprite_realize_texture (MetaCursorSprite *self)
|
||||||
|
{
|
||||||
|
if (self->theme_dirty)
|
||||||
|
meta_cursor_sprite_load_from_theme (self);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_cursor_sprite_init (MetaCursorSprite *self)
|
||||||
|
{
|
||||||
|
self->texture_scale = 1.0f;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_cursor_sprite_finalize (GObject *object)
|
||||||
|
{
|
||||||
|
MetaCursorSprite *self = META_CURSOR_SPRITE (object);
|
||||||
|
|
||||||
|
if (self->xcursor_images)
|
||||||
|
XcursorImagesDestroy (self->xcursor_images);
|
||||||
|
|
||||||
|
g_clear_pointer (&self->texture, cogl_object_unref);
|
||||||
|
|
||||||
|
G_OBJECT_CLASS (meta_cursor_sprite_parent_class)->finalize (object);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_cursor_sprite_class_init (MetaCursorSpriteClass *klass)
|
||||||
|
{
|
||||||
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||||
|
|
||||||
|
object_class->finalize = meta_cursor_sprite_finalize;
|
||||||
|
|
||||||
|
signals[PREPARE_AT] = g_signal_new ("prepare-at",
|
||||||
|
G_TYPE_FROM_CLASS (object_class),
|
||||||
|
G_SIGNAL_RUN_LAST,
|
||||||
|
0,
|
||||||
|
NULL, NULL, NULL,
|
||||||
|
G_TYPE_NONE, 2,
|
||||||
|
G_TYPE_INT,
|
||||||
|
G_TYPE_INT);
|
||||||
}
|
}
|
||||||
|
@@ -22,23 +22,54 @@
|
|||||||
#ifndef META_CURSOR_H
|
#ifndef META_CURSOR_H
|
||||||
#define META_CURSOR_H
|
#define META_CURSOR_H
|
||||||
|
|
||||||
typedef struct _MetaCursorReference MetaCursorReference;
|
|
||||||
|
|
||||||
MetaCursorReference * meta_cursor_reference_ref (MetaCursorReference *cursor);
|
|
||||||
void meta_cursor_reference_unref (MetaCursorReference *cursor);
|
|
||||||
|
|
||||||
#include <meta/common.h>
|
#include <meta/common.h>
|
||||||
#include <wayland-server.h>
|
#include <meta/boxes.h>
|
||||||
|
|
||||||
MetaCursorReference * meta_cursor_reference_from_theme (MetaCursor cursor);
|
typedef struct _MetaCursorSprite MetaCursorSprite;
|
||||||
|
|
||||||
MetaCursorReference * meta_cursor_reference_from_buffer (struct wl_resource *buffer,
|
#define META_TYPE_CURSOR_SPRITE (meta_cursor_sprite_get_type ())
|
||||||
int hot_x,
|
G_DECLARE_FINAL_TYPE (MetaCursorSprite,
|
||||||
int hot_y);
|
meta_cursor_sprite,
|
||||||
|
META, CURSOR_SPRITE,
|
||||||
|
GObject);
|
||||||
|
|
||||||
MetaCursor meta_cursor_reference_get_meta_cursor (MetaCursorReference *cursor);
|
MetaCursorSprite * meta_cursor_sprite_new (void);
|
||||||
|
|
||||||
|
MetaCursorSprite * meta_cursor_sprite_from_theme (MetaCursor cursor);
|
||||||
|
|
||||||
|
|
||||||
|
void meta_cursor_sprite_set_theme_scale (MetaCursorSprite *self,
|
||||||
|
int scale);
|
||||||
|
|
||||||
|
MetaCursor meta_cursor_sprite_get_meta_cursor (MetaCursorSprite *self);
|
||||||
|
|
||||||
Cursor meta_cursor_create_x_cursor (Display *xdisplay,
|
Cursor meta_cursor_create_x_cursor (Display *xdisplay,
|
||||||
MetaCursor cursor);
|
MetaCursor cursor);
|
||||||
|
|
||||||
|
void meta_cursor_sprite_prepare_at (MetaCursorSprite *self,
|
||||||
|
int x,
|
||||||
|
int y);
|
||||||
|
|
||||||
|
void meta_cursor_sprite_realize_texture (MetaCursorSprite *self);
|
||||||
|
|
||||||
|
void meta_cursor_sprite_set_texture (MetaCursorSprite *self,
|
||||||
|
CoglTexture *texture,
|
||||||
|
int hot_x,
|
||||||
|
int hot_y);
|
||||||
|
|
||||||
|
void meta_cursor_sprite_set_texture_scale (MetaCursorSprite *self,
|
||||||
|
float scale);
|
||||||
|
|
||||||
|
CoglTexture *meta_cursor_sprite_get_cogl_texture (MetaCursorSprite *self);
|
||||||
|
|
||||||
|
void meta_cursor_sprite_get_hotspot (MetaCursorSprite *self,
|
||||||
|
int *hot_x,
|
||||||
|
int *hot_y);
|
||||||
|
|
||||||
|
float meta_cursor_sprite_get_texture_scale (MetaCursorSprite *self);
|
||||||
|
|
||||||
|
gboolean meta_cursor_sprite_is_animated (MetaCursorSprite *self);
|
||||||
|
void meta_cursor_sprite_tick_frame (MetaCursorSprite *self);
|
||||||
|
guint meta_cursor_sprite_get_current_frame_time (MetaCursorSprite *self);
|
||||||
|
|
||||||
#endif /* META_CURSOR_H */
|
#endif /* META_CURSOR_H */
|
||||||
|
@@ -38,7 +38,7 @@
|
|||||||
#include <meta/meta-idle-monitor.h>
|
#include <meta/meta-idle-monitor.h>
|
||||||
#include "meta-idle-monitor-private.h"
|
#include "meta-idle-monitor-private.h"
|
||||||
#include "meta-idle-monitor-dbus.h"
|
#include "meta-idle-monitor-dbus.h"
|
||||||
#include "meta-backend.h"
|
#include "meta-backend-private.h"
|
||||||
|
|
||||||
G_STATIC_ASSERT(sizeof(unsigned long) == sizeof(gpointer));
|
G_STATIC_ASSERT(sizeof(unsigned long) == sizeof(gpointer));
|
||||||
|
|
||||||
@@ -210,9 +210,9 @@ make_watch (MetaIdleMonitor *monitor,
|
|||||||
* meta_idle_monitor_add_idle_watch:
|
* meta_idle_monitor_add_idle_watch:
|
||||||
* @monitor: A #MetaIdleMonitor
|
* @monitor: A #MetaIdleMonitor
|
||||||
* @interval_msec: The idletime interval, in milliseconds
|
* @interval_msec: The idletime interval, in milliseconds
|
||||||
* @callback: (allow-none): The callback to call when the user has
|
* @callback: (nullable): The callback to call when the user has
|
||||||
* accumulated @interval_msec milliseconds of idle time.
|
* accumulated @interval_msec milliseconds of idle time.
|
||||||
* @user_data: (allow-none): The user data to pass to the callback
|
* @user_data: (nullable): The user data to pass to the callback
|
||||||
* @notify: A #GDestroyNotify
|
* @notify: A #GDestroyNotify
|
||||||
*
|
*
|
||||||
* Returns: a watch id
|
* Returns: a watch id
|
||||||
@@ -252,9 +252,9 @@ meta_idle_monitor_add_idle_watch (MetaIdleMonitor *monitor,
|
|||||||
/**
|
/**
|
||||||
* meta_idle_monitor_add_user_active_watch:
|
* meta_idle_monitor_add_user_active_watch:
|
||||||
* @monitor: A #MetaIdleMonitor
|
* @monitor: A #MetaIdleMonitor
|
||||||
* @callback: (allow-none): The callback to call when the user is
|
* @callback: (nullable): The callback to call when the user is
|
||||||
* active again.
|
* active again.
|
||||||
* @user_data: (allow-none): The user data to pass to the callback
|
* @user_data: (nullable): The user data to pass to the callback
|
||||||
* @notify: A #GDestroyNotify
|
* @notify: A #GDestroyNotify
|
||||||
*
|
*
|
||||||
* Returns: a watch id
|
* Returns: a watch id
|
||||||
|
87
src/backends/meta-input-settings-private.h
Normal file
87
src/backends/meta-input-settings-private.h
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright 2014 Red Hat, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* Author: Carlos Garnacho <carlosg@gnome.org>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef META_INPUT_SETTINGS_PRIVATE_H
|
||||||
|
#define META_INPUT_SETTINGS_PRIVATE_H
|
||||||
|
|
||||||
|
#include "display-private.h"
|
||||||
|
|
||||||
|
#include <clutter/clutter.h>
|
||||||
|
|
||||||
|
#define META_TYPE_INPUT_SETTINGS (meta_input_settings_get_type ())
|
||||||
|
#define META_INPUT_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_INPUT_SETTINGS, MetaInputSettings))
|
||||||
|
#define META_INPUT_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_INPUT_SETTINGS, MetaInputSettingsClass))
|
||||||
|
#define META_IS_INPUT_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_INPUT_SETTINGS))
|
||||||
|
#define META_IS_INPUT_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_INPUT_SETTINGS))
|
||||||
|
#define META_INPUT_SETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_INPUT_SETTINGS, MetaInputSettingsClass))
|
||||||
|
|
||||||
|
typedef struct _MetaInputSettings MetaInputSettings;
|
||||||
|
typedef struct _MetaInputSettingsClass MetaInputSettingsClass;
|
||||||
|
|
||||||
|
struct _MetaInputSettings
|
||||||
|
{
|
||||||
|
GObject parent_instance;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct _MetaInputSettingsClass
|
||||||
|
{
|
||||||
|
GObjectClass parent_class;
|
||||||
|
|
||||||
|
void (* set_send_events) (MetaInputSettings *settings,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
GDesktopDeviceSendEvents mode);
|
||||||
|
void (* set_matrix) (MetaInputSettings *settings,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
gfloat matrix[6]);
|
||||||
|
void (* set_speed) (MetaInputSettings *settings,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
gdouble speed);
|
||||||
|
void (* set_left_handed) (MetaInputSettings *settings,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
gboolean enabled);
|
||||||
|
void (* set_tap_enabled) (MetaInputSettings *settings,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
gboolean enabled);
|
||||||
|
void (* set_invert_scroll) (MetaInputSettings *settings,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
gboolean inverted);
|
||||||
|
void (* set_edge_scroll) (MetaInputSettings *settings,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
gboolean enabled);
|
||||||
|
void (* set_scroll_button) (MetaInputSettings *settings,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
guint button);
|
||||||
|
|
||||||
|
void (* set_click_method) (MetaInputSettings *settings,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
GDesktopTouchpadClickMethod mode);
|
||||||
|
|
||||||
|
void (* set_keyboard_repeat) (MetaInputSettings *settings,
|
||||||
|
gboolean repeat,
|
||||||
|
guint delay,
|
||||||
|
guint interval);
|
||||||
|
};
|
||||||
|
|
||||||
|
GType meta_input_settings_get_type (void) G_GNUC_CONST;
|
||||||
|
|
||||||
|
MetaInputSettings * meta_input_settings_create (void);
|
||||||
|
|
||||||
|
#endif /* META_INPUT_SETTINGS_PRIVATE_H */
|
893
src/backends/meta-input-settings.c
Normal file
893
src/backends/meta-input-settings.c
Normal file
@@ -0,0 +1,893 @@
|
|||||||
|
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright 2014 Red Hat, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* Author: Carlos Garnacho <carlosg@gnome.org>
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* SECTION:input-settings
|
||||||
|
* @title: MetaInputSettings
|
||||||
|
* @short_description: Mutter input device configuration
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#include "meta-backend-private.h"
|
||||||
|
#include "meta-input-settings-private.h"
|
||||||
|
#include "x11/meta-input-settings-x11.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_NATIVE_BACKEND
|
||||||
|
#include "native/meta-backend-native.h"
|
||||||
|
#include "native/meta-input-settings-native.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <meta/util.h>
|
||||||
|
|
||||||
|
typedef struct _MetaInputSettingsPrivate MetaInputSettingsPrivate;
|
||||||
|
typedef struct _DeviceMappingInfo DeviceMappingInfo;
|
||||||
|
|
||||||
|
struct _DeviceMappingInfo
|
||||||
|
{
|
||||||
|
MetaInputSettings *input_settings;
|
||||||
|
ClutterInputDevice *device;
|
||||||
|
GSettings *settings;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct _MetaInputSettingsPrivate
|
||||||
|
{
|
||||||
|
ClutterDeviceManager *device_manager;
|
||||||
|
MetaMonitorManager *monitor_manager;
|
||||||
|
guint monitors_changed_id;
|
||||||
|
|
||||||
|
GSettings *mouse_settings;
|
||||||
|
GSettings *touchpad_settings;
|
||||||
|
GSettings *trackball_settings;
|
||||||
|
GSettings *keyboard_settings;
|
||||||
|
|
||||||
|
GHashTable *mappable_devices;
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef void (*ConfigBoolFunc) (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
gboolean setting);
|
||||||
|
typedef void (*ConfigDoubleFunc) (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
gdouble value);
|
||||||
|
typedef void (*ConfigUintFunc) (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
guint value);
|
||||||
|
|
||||||
|
G_DEFINE_TYPE_WITH_PRIVATE (MetaInputSettings, meta_input_settings, G_TYPE_OBJECT)
|
||||||
|
|
||||||
|
static GSList *
|
||||||
|
meta_input_settings_get_devices (MetaInputSettings *settings,
|
||||||
|
ClutterInputDeviceType type)
|
||||||
|
{
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
const GSList *devices;
|
||||||
|
GSList *list = NULL;
|
||||||
|
|
||||||
|
priv = meta_input_settings_get_instance_private (settings);
|
||||||
|
devices = clutter_device_manager_peek_devices (priv->device_manager);
|
||||||
|
|
||||||
|
while (devices)
|
||||||
|
{
|
||||||
|
ClutterInputDevice *device = devices->data;
|
||||||
|
|
||||||
|
if (clutter_input_device_get_device_type (device) == type &&
|
||||||
|
clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_MASTER)
|
||||||
|
list = g_slist_prepend (list, device);
|
||||||
|
|
||||||
|
devices = devices->next;
|
||||||
|
}
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_input_settings_dispose (GObject *object)
|
||||||
|
{
|
||||||
|
MetaInputSettings *settings = META_INPUT_SETTINGS (object);
|
||||||
|
MetaInputSettingsPrivate *priv = meta_input_settings_get_instance_private (settings);
|
||||||
|
|
||||||
|
g_clear_object (&priv->mouse_settings);
|
||||||
|
g_clear_object (&priv->touchpad_settings);
|
||||||
|
g_clear_object (&priv->trackball_settings);
|
||||||
|
g_clear_object (&priv->keyboard_settings);
|
||||||
|
g_clear_pointer (&priv->mappable_devices, g_hash_table_unref);
|
||||||
|
|
||||||
|
if (priv->monitors_changed_id && priv->monitor_manager)
|
||||||
|
{
|
||||||
|
g_signal_handler_disconnect (priv->monitor_manager,
|
||||||
|
priv->monitors_changed_id);
|
||||||
|
priv->monitors_changed_id = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
g_clear_object (&priv->monitor_manager);
|
||||||
|
|
||||||
|
G_OBJECT_CLASS (meta_input_settings_parent_class)->dispose (object);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
settings_device_set_bool_setting (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
ConfigBoolFunc func,
|
||||||
|
gboolean enabled)
|
||||||
|
{
|
||||||
|
func (input_settings, device, enabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
settings_set_bool_setting (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDeviceType type,
|
||||||
|
ConfigBoolFunc func,
|
||||||
|
gboolean enabled)
|
||||||
|
{
|
||||||
|
GSList *devices, *d;
|
||||||
|
|
||||||
|
devices = meta_input_settings_get_devices (input_settings, type);
|
||||||
|
|
||||||
|
for (d = devices; d; d = d->next)
|
||||||
|
settings_device_set_bool_setting (input_settings, d->data, func, enabled);
|
||||||
|
|
||||||
|
g_slist_free (devices);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
settings_device_set_double_setting (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
ConfigDoubleFunc func,
|
||||||
|
gdouble value)
|
||||||
|
{
|
||||||
|
func (input_settings, device, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
settings_set_double_setting (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDeviceType type,
|
||||||
|
ConfigDoubleFunc func,
|
||||||
|
gdouble value)
|
||||||
|
{
|
||||||
|
GSList *devices, *d;
|
||||||
|
|
||||||
|
devices = meta_input_settings_get_devices (input_settings, type);
|
||||||
|
|
||||||
|
for (d = devices; d; d = d->next)
|
||||||
|
settings_device_set_double_setting (input_settings, d->data, func, value);
|
||||||
|
|
||||||
|
g_slist_free (devices);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
settings_device_set_uint_setting (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
ConfigUintFunc func,
|
||||||
|
guint value)
|
||||||
|
{
|
||||||
|
(func) (input_settings, device, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
settings_set_uint_setting (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDeviceType type,
|
||||||
|
ConfigUintFunc func,
|
||||||
|
guint value)
|
||||||
|
{
|
||||||
|
GSList *devices, *d;
|
||||||
|
|
||||||
|
devices = meta_input_settings_get_devices (input_settings, type);
|
||||||
|
|
||||||
|
for (d = devices; d; d = d->next)
|
||||||
|
settings_device_set_uint_setting (input_settings, d->data, func, value);
|
||||||
|
|
||||||
|
g_slist_free (devices);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
update_touchpad_left_handed (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device)
|
||||||
|
{
|
||||||
|
MetaInputSettingsClass *input_settings_class;
|
||||||
|
GDesktopTouchpadHandedness handedness;
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
gboolean enabled = FALSE;
|
||||||
|
|
||||||
|
if (device &&
|
||||||
|
clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
|
||||||
|
return;
|
||||||
|
|
||||||
|
priv = meta_input_settings_get_instance_private (input_settings);
|
||||||
|
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
|
||||||
|
handedness = g_settings_get_enum (priv->touchpad_settings, "left-handed");
|
||||||
|
|
||||||
|
switch (handedness)
|
||||||
|
{
|
||||||
|
case G_DESKTOP_TOUCHPAD_HANDEDNESS_RIGHT:
|
||||||
|
enabled = FALSE;
|
||||||
|
break;
|
||||||
|
case G_DESKTOP_TOUCHPAD_HANDEDNESS_LEFT:
|
||||||
|
enabled = TRUE;
|
||||||
|
break;
|
||||||
|
case G_DESKTOP_TOUCHPAD_HANDEDNESS_MOUSE:
|
||||||
|
enabled = g_settings_get_boolean (priv->mouse_settings, "left-handed");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
g_assert_not_reached ();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (device)
|
||||||
|
{
|
||||||
|
settings_device_set_bool_setting (input_settings, device,
|
||||||
|
input_settings_class->set_left_handed,
|
||||||
|
enabled);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
|
||||||
|
input_settings_class->set_left_handed,
|
||||||
|
enabled);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
update_mouse_left_handed (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device)
|
||||||
|
{
|
||||||
|
MetaInputSettingsClass *input_settings_class;
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
gboolean enabled;
|
||||||
|
|
||||||
|
if (device &&
|
||||||
|
clutter_input_device_get_device_type (device) != CLUTTER_POINTER_DEVICE)
|
||||||
|
return;
|
||||||
|
|
||||||
|
priv = meta_input_settings_get_instance_private (input_settings);
|
||||||
|
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
|
||||||
|
enabled = g_settings_get_boolean (priv->mouse_settings, "left-handed");
|
||||||
|
|
||||||
|
if (device)
|
||||||
|
{
|
||||||
|
settings_device_set_bool_setting (input_settings, device,
|
||||||
|
input_settings_class->set_left_handed,
|
||||||
|
enabled);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
GDesktopTouchpadHandedness touchpad_handedness;
|
||||||
|
|
||||||
|
settings_set_bool_setting (input_settings, CLUTTER_POINTER_DEVICE,
|
||||||
|
input_settings_class->set_left_handed,
|
||||||
|
enabled);
|
||||||
|
|
||||||
|
touchpad_handedness = g_settings_get_enum (priv->touchpad_settings,
|
||||||
|
"left-handed");
|
||||||
|
|
||||||
|
/* Also update touchpads if they're following mouse settings */
|
||||||
|
if (touchpad_handedness == G_DESKTOP_TOUCHPAD_HANDEDNESS_MOUSE)
|
||||||
|
update_touchpad_left_handed (input_settings, NULL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static GSettings *
|
||||||
|
get_settings_for_device_type (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDeviceType type)
|
||||||
|
{
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
priv = meta_input_settings_get_instance_private (input_settings);
|
||||||
|
switch (type)
|
||||||
|
{
|
||||||
|
case CLUTTER_POINTER_DEVICE:
|
||||||
|
return priv->mouse_settings;
|
||||||
|
case CLUTTER_TOUCHPAD_DEVICE:
|
||||||
|
return priv->touchpad_settings;
|
||||||
|
default:
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
update_device_speed (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device)
|
||||||
|
{
|
||||||
|
GSettings *settings;
|
||||||
|
ConfigDoubleFunc func;
|
||||||
|
const gchar *key = "speed";
|
||||||
|
|
||||||
|
func = META_INPUT_SETTINGS_GET_CLASS (input_settings)->set_speed;
|
||||||
|
|
||||||
|
if (device)
|
||||||
|
{
|
||||||
|
settings = get_settings_for_device_type (input_settings,
|
||||||
|
clutter_input_device_get_device_type (device));
|
||||||
|
if (!settings)
|
||||||
|
return;
|
||||||
|
|
||||||
|
settings_device_set_double_setting (input_settings, device, func,
|
||||||
|
g_settings_get_double (settings, key));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
settings = get_settings_for_device_type (input_settings, CLUTTER_POINTER_DEVICE);
|
||||||
|
settings_set_double_setting (input_settings, CLUTTER_POINTER_DEVICE, func,
|
||||||
|
g_settings_get_double (settings, key));
|
||||||
|
settings = get_settings_for_device_type (input_settings, CLUTTER_TOUCHPAD_DEVICE);
|
||||||
|
settings_set_double_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE, func,
|
||||||
|
g_settings_get_double (settings, key));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
update_device_natural_scroll (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device)
|
||||||
|
{
|
||||||
|
GSettings *settings;
|
||||||
|
ConfigBoolFunc func;
|
||||||
|
const gchar *key = "natural-scroll";
|
||||||
|
|
||||||
|
func = META_INPUT_SETTINGS_GET_CLASS (input_settings)->set_invert_scroll;
|
||||||
|
|
||||||
|
if (device)
|
||||||
|
{
|
||||||
|
settings = get_settings_for_device_type (input_settings,
|
||||||
|
clutter_input_device_get_device_type (device));
|
||||||
|
if (!settings)
|
||||||
|
return;
|
||||||
|
|
||||||
|
settings_device_set_bool_setting (input_settings, device, func,
|
||||||
|
g_settings_get_boolean (settings, key));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
settings = get_settings_for_device_type (input_settings, CLUTTER_POINTER_DEVICE);
|
||||||
|
settings_set_bool_setting (input_settings, CLUTTER_POINTER_DEVICE, func,
|
||||||
|
g_settings_get_boolean (settings, key));
|
||||||
|
settings = get_settings_for_device_type (input_settings, CLUTTER_TOUCHPAD_DEVICE);
|
||||||
|
settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE, func,
|
||||||
|
g_settings_get_boolean (settings, key));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
update_touchpad_tap_enabled (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device)
|
||||||
|
{
|
||||||
|
MetaInputSettingsClass *input_settings_class;
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
gboolean enabled;
|
||||||
|
|
||||||
|
if (device &&
|
||||||
|
clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
|
||||||
|
return;
|
||||||
|
|
||||||
|
priv = meta_input_settings_get_instance_private (input_settings);
|
||||||
|
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
|
||||||
|
enabled = g_settings_get_boolean (priv->touchpad_settings, "tap-to-click");
|
||||||
|
|
||||||
|
if (device)
|
||||||
|
{
|
||||||
|
settings_device_set_bool_setting (input_settings, device,
|
||||||
|
input_settings_class->set_tap_enabled,
|
||||||
|
enabled);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
|
||||||
|
input_settings_class->set_tap_enabled,
|
||||||
|
enabled);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
update_touchpad_edge_scroll (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device)
|
||||||
|
{
|
||||||
|
MetaInputSettingsClass *input_settings_class;
|
||||||
|
gboolean edge_scroll_enabled;
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
|
||||||
|
if (device &&
|
||||||
|
clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
|
||||||
|
return;
|
||||||
|
|
||||||
|
priv = meta_input_settings_get_instance_private (input_settings);
|
||||||
|
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
|
||||||
|
edge_scroll_enabled = g_settings_get_boolean (priv->touchpad_settings, "edge-scrolling-enabled");
|
||||||
|
|
||||||
|
if (device)
|
||||||
|
{
|
||||||
|
settings_device_set_bool_setting (input_settings, device,
|
||||||
|
input_settings_class->set_edge_scroll,
|
||||||
|
edge_scroll_enabled);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
|
||||||
|
(ConfigBoolFunc) input_settings_class->set_edge_scroll,
|
||||||
|
edge_scroll_enabled);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
update_touchpad_click_method (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device)
|
||||||
|
{
|
||||||
|
MetaInputSettingsClass *input_settings_class;
|
||||||
|
GDesktopTouchpadClickMethod method;
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
|
||||||
|
if (device &&
|
||||||
|
clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
|
||||||
|
return;
|
||||||
|
|
||||||
|
priv = meta_input_settings_get_instance_private (input_settings);
|
||||||
|
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
|
||||||
|
method = g_settings_get_enum (priv->touchpad_settings, "click-method");
|
||||||
|
|
||||||
|
if (device)
|
||||||
|
{
|
||||||
|
settings_device_set_uint_setting (input_settings, device,
|
||||||
|
input_settings_class->set_click_method,
|
||||||
|
method);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
settings_set_uint_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
|
||||||
|
(ConfigUintFunc) input_settings_class->set_click_method,
|
||||||
|
method);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
update_touchpad_send_events (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device)
|
||||||
|
{
|
||||||
|
MetaInputSettingsClass *input_settings_class;
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
GDesktopDeviceSendEvents mode;
|
||||||
|
|
||||||
|
if (device &&
|
||||||
|
clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
|
||||||
|
return;
|
||||||
|
|
||||||
|
priv = meta_input_settings_get_instance_private (input_settings);
|
||||||
|
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
|
||||||
|
mode = g_settings_get_enum (priv->touchpad_settings, "send-events");
|
||||||
|
|
||||||
|
if (device)
|
||||||
|
{
|
||||||
|
settings_device_set_uint_setting (input_settings, device,
|
||||||
|
input_settings_class->set_send_events,
|
||||||
|
mode);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
settings_set_uint_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
|
||||||
|
input_settings_class->set_send_events,
|
||||||
|
mode);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
device_is_trackball (ClutterInputDevice *device)
|
||||||
|
{
|
||||||
|
gboolean is_trackball;
|
||||||
|
char *name;
|
||||||
|
|
||||||
|
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
name = g_ascii_strdown (clutter_input_device_get_device_name (device), -1);
|
||||||
|
is_trackball = strstr (name, "trackball") != NULL;
|
||||||
|
g_free (name);
|
||||||
|
|
||||||
|
return is_trackball;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
update_trackball_scroll_button (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device)
|
||||||
|
{
|
||||||
|
MetaInputSettingsClass *input_settings_class;
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
guint button;
|
||||||
|
|
||||||
|
if (device && !device_is_trackball (device))
|
||||||
|
return;
|
||||||
|
|
||||||
|
priv = meta_input_settings_get_instance_private (input_settings);
|
||||||
|
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
|
||||||
|
/* This key is 'i' in the schema but it also specifies a minimum
|
||||||
|
* range of 0 so the cast here is safe. */
|
||||||
|
button = (guint) g_settings_get_int (priv->trackball_settings, "scroll-wheel-emulation-button");
|
||||||
|
|
||||||
|
if (device)
|
||||||
|
{
|
||||||
|
input_settings_class->set_scroll_button (input_settings, device, button);
|
||||||
|
}
|
||||||
|
else if (!device)
|
||||||
|
{
|
||||||
|
const GSList *devices;
|
||||||
|
|
||||||
|
devices = clutter_device_manager_peek_devices (priv->device_manager);
|
||||||
|
|
||||||
|
while (devices)
|
||||||
|
{
|
||||||
|
device = devices->data;
|
||||||
|
|
||||||
|
if (device_is_trackball (device))
|
||||||
|
input_settings_class->set_scroll_button (input_settings, device, button);
|
||||||
|
|
||||||
|
devices = devices->next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
update_keyboard_repeat (MetaInputSettings *input_settings)
|
||||||
|
{
|
||||||
|
MetaInputSettingsClass *input_settings_class;
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
guint delay, interval;
|
||||||
|
gboolean repeat;
|
||||||
|
|
||||||
|
priv = meta_input_settings_get_instance_private (input_settings);
|
||||||
|
repeat = g_settings_get_boolean (priv->keyboard_settings, "repeat");
|
||||||
|
delay = g_settings_get_uint (priv->keyboard_settings, "delay");
|
||||||
|
interval = g_settings_get_uint (priv->keyboard_settings, "repeat-interval");
|
||||||
|
|
||||||
|
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
|
||||||
|
input_settings_class->set_keyboard_repeat (input_settings,
|
||||||
|
repeat, delay, interval);
|
||||||
|
}
|
||||||
|
|
||||||
|
static MetaOutput *
|
||||||
|
meta_input_settings_find_output (MetaInputSettings *input_settings,
|
||||||
|
GSettings *settings,
|
||||||
|
ClutterInputDevice *device)
|
||||||
|
{
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
guint n_values, n_outputs, i;
|
||||||
|
MetaOutput *outputs;
|
||||||
|
gchar **edid;
|
||||||
|
|
||||||
|
priv = meta_input_settings_get_instance_private (input_settings);
|
||||||
|
edid = g_settings_get_strv (settings, "display");
|
||||||
|
n_values = g_strv_length (edid);
|
||||||
|
|
||||||
|
if (n_values != 3)
|
||||||
|
{
|
||||||
|
g_warning ("EDID configuration for device '%s' "
|
||||||
|
"is incorrect, must have 3 values",
|
||||||
|
clutter_input_device_get_device_name (device));
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!*edid[0] && !*edid[1] && !*edid[2])
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
outputs = meta_monitor_manager_get_outputs (priv->monitor_manager,
|
||||||
|
&n_outputs);
|
||||||
|
for (i = 0; i < n_outputs; i++)
|
||||||
|
{
|
||||||
|
if (g_strcmp0 (outputs[i].vendor, edid[0]) == 0 &&
|
||||||
|
g_strcmp0 (outputs[i].product, edid[1]) == 0 &&
|
||||||
|
g_strcmp0 (outputs[i].serial, edid[2]) == 0)
|
||||||
|
return &outputs[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
update_device_display (MetaInputSettings *input_settings,
|
||||||
|
GSettings *settings,
|
||||||
|
ClutterInputDevice *device)
|
||||||
|
{
|
||||||
|
MetaInputSettingsClass *input_settings_class;
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
gfloat matrix[6] = { 1, 0, 0, 0, 1, 0 };
|
||||||
|
MetaOutput *output;
|
||||||
|
|
||||||
|
priv = meta_input_settings_get_instance_private (input_settings);
|
||||||
|
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
|
||||||
|
output = meta_input_settings_find_output (input_settings, settings, device);
|
||||||
|
|
||||||
|
if (output)
|
||||||
|
meta_monitor_manager_get_monitor_matrix (priv->monitor_manager,
|
||||||
|
output, matrix);
|
||||||
|
|
||||||
|
input_settings_class->set_matrix (input_settings, device, matrix);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_input_settings_changed_cb (GSettings *settings,
|
||||||
|
const char *key,
|
||||||
|
gpointer user_data)
|
||||||
|
{
|
||||||
|
MetaInputSettings *input_settings = META_INPUT_SETTINGS (user_data);
|
||||||
|
MetaInputSettingsPrivate *priv = meta_input_settings_get_instance_private (input_settings);
|
||||||
|
|
||||||
|
if (settings == priv->mouse_settings)
|
||||||
|
{
|
||||||
|
if (strcmp (key, "left-handed") == 0)
|
||||||
|
update_mouse_left_handed (input_settings, NULL);
|
||||||
|
else if (strcmp (key, "speed") == 0)
|
||||||
|
update_device_speed (input_settings, NULL);
|
||||||
|
else if (strcmp (key, "natural-scroll") == 0)
|
||||||
|
update_device_natural_scroll (input_settings, NULL);
|
||||||
|
}
|
||||||
|
else if (settings == priv->touchpad_settings)
|
||||||
|
{
|
||||||
|
if (strcmp (key, "left-handed") == 0)
|
||||||
|
update_touchpad_left_handed (input_settings, NULL);
|
||||||
|
else if (strcmp (key, "speed") == 0)
|
||||||
|
update_device_speed (input_settings, NULL);
|
||||||
|
else if (strcmp (key, "natural-scroll") == 0)
|
||||||
|
update_device_natural_scroll (input_settings, NULL);
|
||||||
|
else if (strcmp (key, "tap-to-click") == 0)
|
||||||
|
update_touchpad_tap_enabled (input_settings, NULL);
|
||||||
|
else if (strcmp (key, "send-events") == 0)
|
||||||
|
update_touchpad_send_events (input_settings, NULL);
|
||||||
|
else if (strcmp (key, "edge-scrolling-enabled") == 0)
|
||||||
|
update_touchpad_edge_scroll (input_settings, NULL);
|
||||||
|
else if (strcmp (key, "click-method") == 0)
|
||||||
|
update_touchpad_click_method (input_settings, NULL);
|
||||||
|
}
|
||||||
|
else if (settings == priv->trackball_settings)
|
||||||
|
{
|
||||||
|
if (strcmp (key, "scroll-wheel-emulation-button") == 0)
|
||||||
|
update_trackball_scroll_button (input_settings, NULL);
|
||||||
|
}
|
||||||
|
else if (settings == priv->keyboard_settings)
|
||||||
|
{
|
||||||
|
if (strcmp (key, "repeat") == 0 ||
|
||||||
|
strcmp (key, "repeat-interval") == 0 ||
|
||||||
|
strcmp (key, "delay") == 0)
|
||||||
|
update_keyboard_repeat (input_settings);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
mapped_device_changed_cb (GSettings *settings,
|
||||||
|
const gchar *key,
|
||||||
|
DeviceMappingInfo *info)
|
||||||
|
{
|
||||||
|
if (strcmp (key, "display") == 0)
|
||||||
|
update_device_display (info->input_settings, settings, info->device);
|
||||||
|
}
|
||||||
|
|
||||||
|
static GSettings *
|
||||||
|
lookup_device_settings (ClutterInputDevice *device)
|
||||||
|
{
|
||||||
|
const gchar *group, *schema, *vendor, *product;
|
||||||
|
ClutterInputDeviceType type;
|
||||||
|
GSettings *settings;
|
||||||
|
gchar *path;
|
||||||
|
|
||||||
|
type = clutter_input_device_get_device_type (device);
|
||||||
|
|
||||||
|
if (type == CLUTTER_TOUCHSCREEN_DEVICE)
|
||||||
|
{
|
||||||
|
group = "touchscreens";
|
||||||
|
schema = "org.gnome.desktop.peripherals.touchscreen";
|
||||||
|
}
|
||||||
|
else if (type == CLUTTER_TABLET_DEVICE ||
|
||||||
|
type == CLUTTER_PEN_DEVICE ||
|
||||||
|
type == CLUTTER_ERASER_DEVICE ||
|
||||||
|
type == CLUTTER_CURSOR_DEVICE)
|
||||||
|
{
|
||||||
|
group = "tablets";
|
||||||
|
schema = "org.gnome.desktop.peripherals.tablet";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
vendor = clutter_input_device_get_vendor_id (device);
|
||||||
|
product = clutter_input_device_get_product_id (device);
|
||||||
|
path = g_strdup_printf ("/org/gnome/desktop/peripherals/%s/%s:%s/",
|
||||||
|
group, vendor, product);
|
||||||
|
|
||||||
|
settings = g_settings_new_with_path (schema, path);
|
||||||
|
g_free (path);
|
||||||
|
|
||||||
|
return settings;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
monitors_changed_cb (MetaMonitorManager *monitor_manager,
|
||||||
|
MetaInputSettings *input_settings)
|
||||||
|
{
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
ClutterInputDevice *device;
|
||||||
|
GSettings *settings;
|
||||||
|
GHashTableIter iter;
|
||||||
|
|
||||||
|
priv = meta_input_settings_get_instance_private (input_settings);
|
||||||
|
g_hash_table_iter_init (&iter, priv->mappable_devices);
|
||||||
|
|
||||||
|
while (g_hash_table_iter_next (&iter, (gpointer *) &device,
|
||||||
|
(gpointer *) &settings))
|
||||||
|
update_device_display (input_settings, settings, device);
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
check_add_mappable_device (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device)
|
||||||
|
{
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
DeviceMappingInfo *info;
|
||||||
|
GSettings *settings;
|
||||||
|
|
||||||
|
settings = lookup_device_settings (device);
|
||||||
|
|
||||||
|
if (!settings)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
priv = meta_input_settings_get_instance_private (input_settings);
|
||||||
|
|
||||||
|
info = g_new0 (DeviceMappingInfo, 1);
|
||||||
|
info->input_settings = input_settings;
|
||||||
|
info->device = device;
|
||||||
|
info->settings = settings;
|
||||||
|
|
||||||
|
g_signal_connect_data (settings, "changed",
|
||||||
|
G_CALLBACK (mapped_device_changed_cb),
|
||||||
|
info, (GClosureNotify) g_free, 0);
|
||||||
|
|
||||||
|
g_hash_table_insert (priv->mappable_devices, device, settings);
|
||||||
|
|
||||||
|
update_device_display (input_settings, settings, device);
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
apply_device_settings (MetaInputSettings *input_settings,
|
||||||
|
ClutterInputDevice *device)
|
||||||
|
{
|
||||||
|
update_mouse_left_handed (input_settings, device);
|
||||||
|
update_device_speed (input_settings, device);
|
||||||
|
update_device_natural_scroll (input_settings, device);
|
||||||
|
|
||||||
|
update_touchpad_left_handed (input_settings, device);
|
||||||
|
update_device_speed (input_settings, device);
|
||||||
|
update_device_natural_scroll (input_settings, device);
|
||||||
|
update_touchpad_tap_enabled (input_settings, device);
|
||||||
|
update_touchpad_send_events (input_settings, device);
|
||||||
|
update_touchpad_edge_scroll (input_settings, device);
|
||||||
|
update_touchpad_click_method (input_settings, device);
|
||||||
|
|
||||||
|
update_trackball_scroll_button (input_settings, device);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_input_settings_device_added (ClutterDeviceManager *device_manager,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
MetaInputSettings *input_settings)
|
||||||
|
{
|
||||||
|
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
|
||||||
|
return;
|
||||||
|
|
||||||
|
apply_device_settings (input_settings, device);
|
||||||
|
check_add_mappable_device (input_settings, device);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_input_settings_device_removed (ClutterDeviceManager *device_manager,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
MetaInputSettings *input_settings)
|
||||||
|
{
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
|
||||||
|
priv = meta_input_settings_get_instance_private (input_settings);
|
||||||
|
g_hash_table_remove (priv->mappable_devices, device);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
check_mappable_devices (MetaInputSettings *input_settings)
|
||||||
|
{
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
const GSList *devices, *l;
|
||||||
|
|
||||||
|
priv = meta_input_settings_get_instance_private (input_settings);
|
||||||
|
devices = clutter_device_manager_peek_devices (priv->device_manager);
|
||||||
|
|
||||||
|
for (l = devices; l; l = l->next)
|
||||||
|
{
|
||||||
|
ClutterInputDevice *device = l->data;
|
||||||
|
|
||||||
|
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
check_add_mappable_device (input_settings, device);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_input_settings_constructed (GObject *object)
|
||||||
|
{
|
||||||
|
MetaInputSettings *input_settings = META_INPUT_SETTINGS (object);
|
||||||
|
|
||||||
|
apply_device_settings (input_settings, NULL);
|
||||||
|
update_keyboard_repeat (input_settings);
|
||||||
|
check_mappable_devices (input_settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_input_settings_class_init (MetaInputSettingsClass *klass)
|
||||||
|
{
|
||||||
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||||
|
|
||||||
|
object_class->dispose = meta_input_settings_dispose;
|
||||||
|
object_class->constructed = meta_input_settings_constructed;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_input_settings_init (MetaInputSettings *settings)
|
||||||
|
{
|
||||||
|
MetaInputSettingsPrivate *priv;
|
||||||
|
|
||||||
|
priv = meta_input_settings_get_instance_private (settings);
|
||||||
|
priv->device_manager = clutter_device_manager_get_default ();
|
||||||
|
g_signal_connect (priv->device_manager, "device-added",
|
||||||
|
G_CALLBACK (meta_input_settings_device_added), settings);
|
||||||
|
g_signal_connect (priv->device_manager, "device-removed",
|
||||||
|
G_CALLBACK (meta_input_settings_device_removed), settings);
|
||||||
|
|
||||||
|
priv->mouse_settings = g_settings_new ("org.gnome.desktop.peripherals.mouse");
|
||||||
|
g_signal_connect (priv->mouse_settings, "changed",
|
||||||
|
G_CALLBACK (meta_input_settings_changed_cb), settings);
|
||||||
|
|
||||||
|
priv->touchpad_settings = g_settings_new ("org.gnome.desktop.peripherals.touchpad");
|
||||||
|
g_signal_connect (priv->touchpad_settings, "changed",
|
||||||
|
G_CALLBACK (meta_input_settings_changed_cb), settings);
|
||||||
|
|
||||||
|
priv->trackball_settings = g_settings_new ("org.gnome.desktop.peripherals.trackball");
|
||||||
|
g_signal_connect (priv->trackball_settings, "changed",
|
||||||
|
G_CALLBACK (meta_input_settings_changed_cb), settings);
|
||||||
|
|
||||||
|
priv->keyboard_settings = g_settings_new ("org.gnome.desktop.peripherals.keyboard");
|
||||||
|
g_signal_connect (priv->keyboard_settings, "changed",
|
||||||
|
G_CALLBACK (meta_input_settings_changed_cb), settings);
|
||||||
|
|
||||||
|
priv->mappable_devices =
|
||||||
|
g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) g_object_unref);
|
||||||
|
|
||||||
|
priv->monitor_manager = g_object_ref (meta_monitor_manager_get ());
|
||||||
|
g_signal_connect (priv->monitor_manager, "monitors-changed",
|
||||||
|
G_CALLBACK (monitors_changed_cb), settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
MetaInputSettings *
|
||||||
|
meta_input_settings_create (void)
|
||||||
|
{
|
||||||
|
#ifdef HAVE_NATIVE_BACKEND
|
||||||
|
MetaBackend *backend;
|
||||||
|
|
||||||
|
backend = meta_get_backend ();
|
||||||
|
|
||||||
|
if (META_IS_BACKEND_NATIVE (backend))
|
||||||
|
return g_object_new (META_TYPE_INPUT_SETTINGS_NATIVE, NULL);
|
||||||
|
#endif
|
||||||
|
if (!meta_is_wayland_compositor ())
|
||||||
|
return g_object_new (META_TYPE_INPUT_SETTINGS_X11, NULL);
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
File diff suppressed because it is too large
Load Diff
@@ -23,7 +23,7 @@
|
|||||||
#ifndef META_MONITOR_CONFIG_H
|
#ifndef META_MONITOR_CONFIG_H
|
||||||
#define META_MONITOR_CONFIG_H
|
#define META_MONITOR_CONFIG_H
|
||||||
|
|
||||||
#include "meta-monitor-manager.h"
|
#include "meta-monitor-manager-private.h"
|
||||||
|
|
||||||
#define META_TYPE_MONITOR_CONFIG (meta_monitor_config_get_type ())
|
#define META_TYPE_MONITOR_CONFIG (meta_monitor_config_get_type ())
|
||||||
#define META_MONITOR_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_CONFIG, MetaMonitorConfig))
|
#define META_MONITOR_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_CONFIG, MetaMonitorConfig))
|
||||||
@@ -36,9 +36,6 @@ GType meta_monitor_config_get_type (void) G_GNUC_CONST;
|
|||||||
|
|
||||||
MetaMonitorConfig *meta_monitor_config_new (void);
|
MetaMonitorConfig *meta_monitor_config_new (void);
|
||||||
|
|
||||||
gboolean meta_monitor_config_match_current (MetaMonitorConfig *config,
|
|
||||||
MetaMonitorManager *manager);
|
|
||||||
|
|
||||||
gboolean meta_monitor_config_apply_stored (MetaMonitorConfig *config,
|
gboolean meta_monitor_config_apply_stored (MetaMonitorConfig *config,
|
||||||
MetaMonitorManager *manager);
|
MetaMonitorManager *manager);
|
||||||
|
|
||||||
|
@@ -27,7 +27,11 @@
|
|||||||
|
|
||||||
#include "meta-monitor-manager-dummy.h"
|
#include "meta-monitor-manager-dummy.h"
|
||||||
|
|
||||||
#define ALL_WL_TRANSFORMS ((1 << (WL_OUTPUT_TRANSFORM_FLIPPED_270 + 1)) - 1)
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include <meta/util.h>
|
||||||
|
|
||||||
|
#define ALL_TRANSFORMS ((1 << (META_MONITOR_TRANSFORM_FLIPPED_270 + 1)) - 1)
|
||||||
|
|
||||||
struct _MetaMonitorManagerDummy
|
struct _MetaMonitorManagerDummy
|
||||||
{
|
{
|
||||||
@@ -44,9 +48,69 @@ G_DEFINE_TYPE (MetaMonitorManagerDummy, meta_monitor_manager_dummy, META_TYPE_MO
|
|||||||
static void
|
static void
|
||||||
meta_monitor_manager_dummy_read_current (MetaMonitorManager *manager)
|
meta_monitor_manager_dummy_read_current (MetaMonitorManager *manager)
|
||||||
{
|
{
|
||||||
|
unsigned int num_monitors = 1;
|
||||||
|
int *monitor_scales = NULL;
|
||||||
|
const char *num_monitors_str;
|
||||||
|
const char *monitor_scales_str;
|
||||||
|
unsigned int i;
|
||||||
|
int current_x = 0;
|
||||||
|
|
||||||
|
/* To control what monitor configuration is generated, there are two available
|
||||||
|
* environmental variables that can be used:
|
||||||
|
*
|
||||||
|
* MUTTER_DEBUG_NUM_DUMMY_MONITORS
|
||||||
|
*
|
||||||
|
* Specifies the number of dummy monitors to include in the stage. Every
|
||||||
|
* monitor is 1024x786 pixels and they are placed on a horizontal row.
|
||||||
|
*
|
||||||
|
* MUTTER_DEBUG_DUMMY_MONITOR_SCALES
|
||||||
|
*
|
||||||
|
* A comma separated list that specifies the scales of the dummy monitors.
|
||||||
|
*
|
||||||
|
* For example the following configuration results in two monitors, where the
|
||||||
|
* first one has the monitor scale 1, and the other the monitor scale 2.
|
||||||
|
*
|
||||||
|
* MUTTER_DEBUG_NUM_DUMMY_MONITORS=2
|
||||||
|
* MUTTER_DEBUG_DUMMY_MONITOR_SCALES=1,2
|
||||||
|
*/
|
||||||
|
num_monitors_str = getenv ("MUTTER_DEBUG_NUM_DUMMY_MONITORS");
|
||||||
|
if (num_monitors_str)
|
||||||
|
{
|
||||||
|
num_monitors = g_ascii_strtoll (num_monitors_str, NULL, 10);
|
||||||
|
if (num_monitors <= 0)
|
||||||
|
{
|
||||||
|
meta_warning ("Invalid number of dummy monitors");
|
||||||
|
num_monitors = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
monitor_scales = g_newa (int, num_monitors);
|
||||||
|
for (i = 0; i < num_monitors; i++)
|
||||||
|
monitor_scales[i] = 1;
|
||||||
|
|
||||||
|
monitor_scales_str = getenv ("MUTTER_DEBUG_DUMMY_MONITOR_SCALES");
|
||||||
|
if (monitor_scales_str)
|
||||||
|
{
|
||||||
|
gchar **scales_str_list;
|
||||||
|
|
||||||
|
scales_str_list = g_strsplit (monitor_scales_str, ",", -1);
|
||||||
|
if (g_strv_length (scales_str_list) != num_monitors)
|
||||||
|
meta_warning ("Number of specified monitor scales differ from number "
|
||||||
|
"of monitors (defaults to 1).\n");
|
||||||
|
for (i = 0; i < num_monitors && scales_str_list[i]; i++)
|
||||||
|
{
|
||||||
|
int scale = g_ascii_strtoll (scales_str_list[i], NULL, 10);
|
||||||
|
if (scale == 1 || scale == 2)
|
||||||
|
monitor_scales[i] = scale;
|
||||||
|
else
|
||||||
|
meta_warning ("Invalid dummy monitor scale");
|
||||||
|
}
|
||||||
|
g_strfreev (scales_str_list);
|
||||||
|
}
|
||||||
|
|
||||||
manager->max_screen_width = 65535;
|
manager->max_screen_width = 65535;
|
||||||
manager->max_screen_height = 65535;
|
manager->max_screen_height = 65535;
|
||||||
manager->screen_width = 1024;
|
manager->screen_width = 1024 * num_monitors;
|
||||||
manager->screen_height = 768;
|
manager->screen_height = 768;
|
||||||
|
|
||||||
manager->modes = g_new0 (MetaMonitorMode, 1);
|
manager->modes = g_new0 (MetaMonitorMode, 1);
|
||||||
@@ -57,44 +121,52 @@ meta_monitor_manager_dummy_read_current (MetaMonitorManager *manager)
|
|||||||
manager->modes[0].height = 768;
|
manager->modes[0].height = 768;
|
||||||
manager->modes[0].refresh_rate = 60.0;
|
manager->modes[0].refresh_rate = 60.0;
|
||||||
|
|
||||||
manager->crtcs = g_new0 (MetaCRTC, 1);
|
manager->crtcs = g_new0 (MetaCRTC, num_monitors);
|
||||||
manager->n_crtcs = 1;
|
manager->n_crtcs = num_monitors;
|
||||||
|
manager->outputs = g_new0 (MetaOutput, num_monitors);
|
||||||
|
manager->n_outputs = num_monitors;
|
||||||
|
|
||||||
manager->crtcs[0].crtc_id = 1;
|
for (i = 0; i < num_monitors; i++)
|
||||||
manager->crtcs[0].rect.x = 0;
|
{
|
||||||
manager->crtcs[0].rect.y = 0;
|
manager->crtcs[i].crtc_id = i + 1;
|
||||||
manager->crtcs[0].rect.width = manager->modes[0].width;
|
manager->crtcs[i].rect.x = current_x;
|
||||||
manager->crtcs[0].rect.height = manager->modes[0].height;
|
manager->crtcs[i].rect.y = 0;
|
||||||
manager->crtcs[0].current_mode = &manager->modes[0];
|
manager->crtcs[i].rect.width = manager->modes[0].width;
|
||||||
manager->crtcs[0].transform = WL_OUTPUT_TRANSFORM_NORMAL;
|
manager->crtcs[i].rect.height = manager->modes[0].height;
|
||||||
manager->crtcs[0].all_transforms = ALL_WL_TRANSFORMS;
|
manager->crtcs[i].current_mode = &manager->modes[0];
|
||||||
manager->crtcs[0].is_dirty = FALSE;
|
manager->crtcs[i].transform = META_MONITOR_TRANSFORM_NORMAL;
|
||||||
manager->crtcs[0].logical_monitor = NULL;
|
manager->crtcs[i].all_transforms = ALL_TRANSFORMS;
|
||||||
|
manager->crtcs[i].is_dirty = FALSE;
|
||||||
|
manager->crtcs[i].logical_monitor = NULL;
|
||||||
|
|
||||||
manager->outputs = g_new0 (MetaOutput, 1);
|
current_x += manager->crtcs[i].rect.width;
|
||||||
manager->n_outputs = 1;
|
|
||||||
|
|
||||||
manager->outputs[0].crtc = &manager->crtcs[0];
|
manager->outputs[i].crtc = &manager->crtcs[i];
|
||||||
manager->outputs[0].output_id = 1;
|
manager->outputs[i].winsys_id = i + 1;
|
||||||
manager->outputs[0].name = g_strdup ("LVDS");
|
manager->outputs[i].name = g_strdup_printf ("LVDS%d", i + 1);
|
||||||
manager->outputs[0].vendor = g_strdup ("MetaProducts Inc.");
|
manager->outputs[i].vendor = g_strdup ("MetaProducts Inc.");
|
||||||
manager->outputs[0].product = g_strdup ("unknown");
|
manager->outputs[i].product = g_strdup ("unknown");
|
||||||
manager->outputs[0].serial = g_strdup ("0xC0FFEE");
|
manager->outputs[i].serial = g_strdup ("0xC0FFEE");
|
||||||
manager->outputs[0].width_mm = 222;
|
manager->outputs[i].suggested_x = -1;
|
||||||
manager->outputs[0].height_mm = 125;
|
manager->outputs[i].suggested_y = -1;
|
||||||
manager->outputs[0].subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
|
manager->outputs[i].width_mm = 222;
|
||||||
manager->outputs[0].preferred_mode = &manager->modes[0];
|
manager->outputs[i].height_mm = 125;
|
||||||
manager->outputs[0].n_modes = 1;
|
manager->outputs[i].subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
|
||||||
manager->outputs[0].modes = g_new0 (MetaMonitorMode *, 1);
|
manager->outputs[i].preferred_mode = &manager->modes[0];
|
||||||
manager->outputs[0].modes[0] = &manager->modes[0];
|
manager->outputs[i].n_modes = 1;
|
||||||
manager->outputs[0].n_possible_crtcs = 1;
|
manager->outputs[i].modes = g_new0 (MetaMonitorMode *, 1);
|
||||||
manager->outputs[0].possible_crtcs = g_new0 (MetaCRTC *, 1);
|
manager->outputs[i].modes[0] = &manager->modes[0];
|
||||||
manager->outputs[0].possible_crtcs[0] = &manager->crtcs[0];
|
manager->outputs[i].n_possible_crtcs = 1;
|
||||||
manager->outputs[0].n_possible_clones = 0;
|
manager->outputs[i].possible_crtcs = g_new0 (MetaCRTC *, 1);
|
||||||
manager->outputs[0].possible_clones = g_new0 (MetaOutput *, 0);
|
manager->outputs[i].possible_crtcs[0] = &manager->crtcs[i];
|
||||||
manager->outputs[0].backlight = -1;
|
manager->outputs[i].n_possible_clones = 0;
|
||||||
manager->outputs[0].backlight_min = 0;
|
manager->outputs[i].possible_clones = g_new0 (MetaOutput *, 0);
|
||||||
manager->outputs[0].backlight_max = 0;
|
manager->outputs[i].backlight = -1;
|
||||||
|
manager->outputs[i].backlight_min = 0;
|
||||||
|
manager->outputs[i].backlight_max = 0;
|
||||||
|
manager->outputs[i].connector_type = META_CONNECTOR_TYPE_LVDS;
|
||||||
|
manager->outputs[i].scale = monitor_scales[i];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -125,7 +197,7 @@ meta_monitor_manager_dummy_apply_config (MetaMonitorManager *manager,
|
|||||||
{
|
{
|
||||||
MetaMonitorMode *mode;
|
MetaMonitorMode *mode;
|
||||||
MetaOutput *output;
|
MetaOutput *output;
|
||||||
int i, n_outputs;
|
unsigned int j;
|
||||||
int width, height;
|
int width, height;
|
||||||
|
|
||||||
mode = crtc_info->mode;
|
mode = crtc_info->mode;
|
||||||
@@ -151,10 +223,9 @@ meta_monitor_manager_dummy_apply_config (MetaMonitorManager *manager,
|
|||||||
screen_width = MAX (screen_width, crtc_info->x + width);
|
screen_width = MAX (screen_width, crtc_info->x + width);
|
||||||
screen_height = MAX (screen_height, crtc_info->y + height);
|
screen_height = MAX (screen_height, crtc_info->y + height);
|
||||||
|
|
||||||
n_outputs = crtc_info->outputs->len;
|
for (j = 0; j < crtc_info->outputs->len; j++)
|
||||||
for (i = 0; i < n_outputs; i++)
|
|
||||||
{
|
{
|
||||||
output = ((MetaOutput**)crtc_info->outputs->pdata)[i];
|
output = ((MetaOutput**)crtc_info->outputs->pdata)[j];
|
||||||
|
|
||||||
output->is_dirty = TRUE;
|
output->is_dirty = TRUE;
|
||||||
output->crtc = crtc;
|
output->crtc = crtc;
|
||||||
|
@@ -23,7 +23,7 @@
|
|||||||
#ifndef META_MONITOR_MANAGER_DUMMY_H
|
#ifndef META_MONITOR_MANAGER_DUMMY_H
|
||||||
#define META_MONITOR_MANAGER_DUMMY_H
|
#define META_MONITOR_MANAGER_DUMMY_H
|
||||||
|
|
||||||
#include "meta-monitor-manager.h"
|
#include "meta-monitor-manager-private.h"
|
||||||
|
|
||||||
#define META_TYPE_MONITOR_MANAGER_DUMMY (meta_monitor_manager_dummy_get_type ())
|
#define META_TYPE_MONITOR_MANAGER_DUMMY (meta_monitor_manager_dummy_get_type ())
|
||||||
#define META_MONITOR_MANAGER_DUMMY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummy))
|
#define META_MONITOR_MANAGER_DUMMY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummy))
|
||||||
|
@@ -41,31 +41,72 @@
|
|||||||
#include "display-private.h"
|
#include "display-private.h"
|
||||||
#include <meta/screen.h>
|
#include <meta/screen.h>
|
||||||
#include "stack-tracker.h"
|
#include "stack-tracker.h"
|
||||||
#include "ui.h"
|
#include <meta/meta-monitor-manager.h>
|
||||||
#include <wayland-server.h>
|
|
||||||
|
|
||||||
#include "meta-display-config-shared.h"
|
#include "meta-display-config-shared.h"
|
||||||
#include "meta-dbus-display-config.h"
|
#include "meta-dbus-display-config.h"
|
||||||
#include "meta-cursor.h"
|
#include "meta-cursor.h"
|
||||||
|
|
||||||
typedef struct _MetaMonitorManagerClass MetaMonitorManagerClass;
|
|
||||||
typedef struct _MetaMonitorManager MetaMonitorManager;
|
|
||||||
typedef struct _MetaMonitorConfigClass MetaMonitorConfigClass;
|
typedef struct _MetaMonitorConfigClass MetaMonitorConfigClass;
|
||||||
typedef struct _MetaMonitorConfig MetaMonitorConfig;
|
typedef struct _MetaMonitorConfig MetaMonitorConfig;
|
||||||
|
|
||||||
typedef struct _MetaOutput MetaOutput;
|
|
||||||
typedef struct _MetaCRTC MetaCRTC;
|
typedef struct _MetaCRTC MetaCRTC;
|
||||||
|
typedef struct _MetaOutput MetaOutput;
|
||||||
typedef struct _MetaMonitorMode MetaMonitorMode;
|
typedef struct _MetaMonitorMode MetaMonitorMode;
|
||||||
typedef struct _MetaMonitorInfo MetaMonitorInfo;
|
typedef struct _MetaMonitorInfo MetaMonitorInfo;
|
||||||
typedef struct _MetaCRTCInfo MetaCRTCInfo;
|
typedef struct _MetaCRTCInfo MetaCRTCInfo;
|
||||||
typedef struct _MetaOutputInfo MetaOutputInfo;
|
typedef struct _MetaOutputInfo MetaOutputInfo;
|
||||||
|
typedef struct _MetaTileInfo MetaTileInfo;
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
META_MONITOR_TRANSFORM_NORMAL,
|
||||||
|
META_MONITOR_TRANSFORM_90,
|
||||||
|
META_MONITOR_TRANSFORM_180,
|
||||||
|
META_MONITOR_TRANSFORM_270,
|
||||||
|
META_MONITOR_TRANSFORM_FLIPPED,
|
||||||
|
META_MONITOR_TRANSFORM_FLIPPED_90,
|
||||||
|
META_MONITOR_TRANSFORM_FLIPPED_180,
|
||||||
|
META_MONITOR_TRANSFORM_FLIPPED_270,
|
||||||
|
} MetaMonitorTransform;
|
||||||
|
|
||||||
|
/* This matches the values in drm_mode.h */
|
||||||
|
typedef enum {
|
||||||
|
META_CONNECTOR_TYPE_Unknown = 0,
|
||||||
|
META_CONNECTOR_TYPE_VGA = 1,
|
||||||
|
META_CONNECTOR_TYPE_DVII = 2,
|
||||||
|
META_CONNECTOR_TYPE_DVID = 3,
|
||||||
|
META_CONNECTOR_TYPE_DVIA = 4,
|
||||||
|
META_CONNECTOR_TYPE_Composite = 5,
|
||||||
|
META_CONNECTOR_TYPE_SVIDEO = 6,
|
||||||
|
META_CONNECTOR_TYPE_LVDS = 7,
|
||||||
|
META_CONNECTOR_TYPE_Component = 8,
|
||||||
|
META_CONNECTOR_TYPE_9PinDIN = 9,
|
||||||
|
META_CONNECTOR_TYPE_DisplayPort = 10,
|
||||||
|
META_CONNECTOR_TYPE_HDMIA = 11,
|
||||||
|
META_CONNECTOR_TYPE_HDMIB = 12,
|
||||||
|
META_CONNECTOR_TYPE_TV = 13,
|
||||||
|
META_CONNECTOR_TYPE_eDP = 14,
|
||||||
|
META_CONNECTOR_TYPE_VIRTUAL = 15,
|
||||||
|
META_CONNECTOR_TYPE_DSI = 16,
|
||||||
|
} MetaConnectorType;
|
||||||
|
|
||||||
|
struct _MetaTileInfo {
|
||||||
|
guint32 group_id;
|
||||||
|
guint32 flags;
|
||||||
|
guint32 max_h_tiles;
|
||||||
|
guint32 max_v_tiles;
|
||||||
|
guint32 loc_h_tile;
|
||||||
|
guint32 loc_v_tile;
|
||||||
|
guint32 tile_w;
|
||||||
|
guint32 tile_h;
|
||||||
|
};
|
||||||
|
|
||||||
struct _MetaOutput
|
struct _MetaOutput
|
||||||
{
|
{
|
||||||
/* The CRTC driving this output, NULL if the output is not enabled */
|
/* The CRTC driving this output, NULL if the output is not enabled */
|
||||||
MetaCRTC *crtc;
|
MetaCRTC *crtc;
|
||||||
/* The low-level ID of this output, used to apply back configuration */
|
/* The low-level ID of this output, used to apply back configuration */
|
||||||
glong output_id;
|
glong winsys_id;
|
||||||
char *name;
|
char *name;
|
||||||
char *vendor;
|
char *vendor;
|
||||||
char *product;
|
char *product;
|
||||||
@@ -75,6 +116,8 @@ struct _MetaOutput
|
|||||||
CoglSubpixelOrder subpixel_order;
|
CoglSubpixelOrder subpixel_order;
|
||||||
int scale;
|
int scale;
|
||||||
|
|
||||||
|
MetaConnectorType connector_type;
|
||||||
|
|
||||||
MetaMonitorMode *preferred_mode;
|
MetaMonitorMode *preferred_mode;
|
||||||
MetaMonitorMode **modes;
|
MetaMonitorMode **modes;
|
||||||
unsigned int n_modes;
|
unsigned int n_modes;
|
||||||
@@ -101,12 +144,18 @@ struct _MetaOutput
|
|||||||
*/
|
*/
|
||||||
gboolean is_primary;
|
gboolean is_primary;
|
||||||
gboolean is_presentation;
|
gboolean is_presentation;
|
||||||
|
gboolean is_underscanning;
|
||||||
|
gboolean supports_underscanning;
|
||||||
|
|
||||||
gpointer driver_private;
|
gpointer driver_private;
|
||||||
GDestroyNotify driver_notify;
|
GDestroyNotify driver_notify;
|
||||||
|
|
||||||
/* get a new preferred mode on hotplug events, to handle dynamic guest resizing */
|
/* get a new preferred mode on hotplug events, to handle dynamic guest resizing */
|
||||||
gboolean hotplug_mode_update;
|
gboolean hotplug_mode_update;
|
||||||
|
gint suggested_x;
|
||||||
|
gint suggested_y;
|
||||||
|
|
||||||
|
MetaTileInfo tile_info;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _MetaCRTC
|
struct _MetaCRTC
|
||||||
@@ -114,7 +163,7 @@ struct _MetaCRTC
|
|||||||
glong crtc_id;
|
glong crtc_id;
|
||||||
MetaRectangle rect;
|
MetaRectangle rect;
|
||||||
MetaMonitorMode *current_mode;
|
MetaMonitorMode *current_mode;
|
||||||
enum wl_output_transform transform;
|
MetaMonitorTransform transform;
|
||||||
unsigned int all_transforms;
|
unsigned int all_transforms;
|
||||||
|
|
||||||
/* Only used to build the logical configuration
|
/* Only used to build the logical configuration
|
||||||
@@ -125,7 +174,11 @@ struct _MetaCRTC
|
|||||||
/* Used when changing configuration */
|
/* Used when changing configuration */
|
||||||
gboolean is_dirty;
|
gboolean is_dirty;
|
||||||
|
|
||||||
MetaCursorReference *cursor;
|
/* Used by cursor renderer backend */
|
||||||
|
void *cursor_renderer_private;
|
||||||
|
|
||||||
|
gpointer driver_private;
|
||||||
|
GDestroyNotify driver_notify;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _MetaMonitorMode
|
struct _MetaMonitorMode
|
||||||
@@ -142,6 +195,7 @@ struct _MetaMonitorMode
|
|||||||
GDestroyNotify driver_notify;
|
GDestroyNotify driver_notify;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define META_MAX_OUTPUTS_PER_MONITOR 4
|
||||||
/**
|
/**
|
||||||
* MetaMonitorInfo:
|
* MetaMonitorInfo:
|
||||||
*
|
*
|
||||||
@@ -157,19 +211,30 @@ struct _MetaMonitorInfo
|
|||||||
int number;
|
int number;
|
||||||
int xinerama_index;
|
int xinerama_index;
|
||||||
MetaRectangle rect;
|
MetaRectangle rect;
|
||||||
|
/* for tiled monitors these are calculated, from untiled just copied */
|
||||||
|
float refresh_rate;
|
||||||
|
int width_mm;
|
||||||
|
int height_mm;
|
||||||
gboolean is_primary;
|
gboolean is_primary;
|
||||||
gboolean is_presentation; /* XXX: not yet used */
|
gboolean is_presentation; /* XXX: not yet used */
|
||||||
gboolean in_fullscreen;
|
gboolean in_fullscreen;
|
||||||
|
int scale;
|
||||||
|
|
||||||
/* The primary or first output for this monitor, 0 if we can't figure out.
|
/* The primary or first output for this monitor, 0 if we can't figure out.
|
||||||
It can be matched to an output_id of a MetaOutput.
|
It can be matched to a winsys_id of a MetaOutput.
|
||||||
|
|
||||||
This is used as an opaque token on reconfiguration when switching from
|
This is used as an opaque token on reconfiguration when switching from
|
||||||
clone to extened, to decide on what output the windows should go next
|
clone to extened, to decide on what output the windows should go next
|
||||||
(it's an attempt to keep windows on the same monitor, and preferably on
|
(it's an attempt to keep windows on the same monitor, and preferably on
|
||||||
the primary one).
|
the primary one).
|
||||||
*/
|
*/
|
||||||
glong output_id;
|
glong winsys_id;
|
||||||
|
|
||||||
|
guint32 tile_group_id;
|
||||||
|
|
||||||
|
int monitor_winsys_xid;
|
||||||
|
int n_outputs;
|
||||||
|
MetaOutput *outputs[META_MAX_OUTPUTS_PER_MONITOR];
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -185,18 +250,19 @@ struct _MetaCRTCInfo {
|
|||||||
MetaMonitorMode *mode;
|
MetaMonitorMode *mode;
|
||||||
int x;
|
int x;
|
||||||
int y;
|
int y;
|
||||||
enum wl_output_transform transform;
|
MetaMonitorTransform transform;
|
||||||
GPtrArray *outputs;
|
GPtrArray *outputs;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* MetaOutputInfo:
|
* MetaOutputInfo:
|
||||||
* this is the same as MetaOutputInfo, but for CRTCs
|
* this is the same as MetaCRTCInfo, but for outputs
|
||||||
*/
|
*/
|
||||||
struct _MetaOutputInfo {
|
struct _MetaOutputInfo {
|
||||||
MetaOutput *output;
|
MetaOutput *output;
|
||||||
gboolean is_primary;
|
gboolean is_primary;
|
||||||
gboolean is_presentation;
|
gboolean is_presentation;
|
||||||
|
gboolean is_underscanning;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define META_TYPE_MONITOR_MANAGER (meta_monitor_manager_get_type ())
|
#define META_TYPE_MONITOR_MANAGER (meta_monitor_manager_get_type ())
|
||||||
@@ -286,12 +352,15 @@ struct _MetaMonitorManagerClass
|
|||||||
unsigned short *,
|
unsigned short *,
|
||||||
unsigned short *,
|
unsigned short *,
|
||||||
unsigned short *);
|
unsigned short *);
|
||||||
|
|
||||||
|
void (*add_monitor) (MetaMonitorManager *,
|
||||||
|
MetaMonitorInfo *);
|
||||||
|
|
||||||
|
void (*delete_monitor) (MetaMonitorManager *,
|
||||||
|
int monitor_winsys_xid);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
GType meta_monitor_manager_get_type (void);
|
|
||||||
|
|
||||||
MetaMonitorManager *meta_monitor_manager_get (void);
|
|
||||||
|
|
||||||
void meta_monitor_manager_rebuild_derived (MetaMonitorManager *manager);
|
void meta_monitor_manager_rebuild_derived (MetaMonitorManager *manager);
|
||||||
|
|
||||||
MetaMonitorInfo *meta_monitor_manager_get_monitor_infos (MetaMonitorManager *manager,
|
MetaMonitorInfo *meta_monitor_manager_get_monitor_infos (MetaMonitorManager *manager,
|
||||||
@@ -327,19 +396,32 @@ void meta_monitor_manager_apply_configuration (MetaMonitorManager
|
|||||||
void meta_monitor_manager_confirm_configuration (MetaMonitorManager *manager,
|
void meta_monitor_manager_confirm_configuration (MetaMonitorManager *manager,
|
||||||
gboolean ok);
|
gboolean ok);
|
||||||
|
|
||||||
|
void meta_output_parse_edid (MetaOutput *output,
|
||||||
|
GBytes *edid);
|
||||||
|
|
||||||
void meta_crtc_info_free (MetaCRTCInfo *info);
|
void meta_crtc_info_free (MetaCRTCInfo *info);
|
||||||
void meta_output_info_free (MetaOutputInfo *info);
|
void meta_output_info_free (MetaOutputInfo *info);
|
||||||
|
|
||||||
void meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
|
|
||||||
int n_old_outputs);
|
|
||||||
void meta_monitor_manager_free_mode_array (MetaMonitorMode *old_modes,
|
|
||||||
int n_old_modes);
|
|
||||||
gboolean meta_monitor_manager_has_hotplug_mode_update (MetaMonitorManager *manager);
|
gboolean meta_monitor_manager_has_hotplug_mode_update (MetaMonitorManager *manager);
|
||||||
|
void meta_monitor_manager_read_current_config (MetaMonitorManager *manager);
|
||||||
|
void meta_monitor_manager_on_hotplug (MetaMonitorManager *manager);
|
||||||
|
|
||||||
|
gboolean meta_monitor_manager_get_monitor_matrix (MetaMonitorManager *manager,
|
||||||
|
MetaOutput *output,
|
||||||
|
gfloat matrix[6]);
|
||||||
|
|
||||||
|
gint meta_monitor_manager_get_monitor_at_point (MetaMonitorManager *manager,
|
||||||
|
gfloat x,
|
||||||
|
gfloat y);
|
||||||
|
|
||||||
|
void meta_monitor_manager_clear_output (MetaOutput *output);
|
||||||
|
void meta_monitor_manager_clear_mode (MetaMonitorMode *mode);
|
||||||
|
void meta_monitor_manager_clear_crtc (MetaCRTC *crtc);
|
||||||
|
|
||||||
/* Returns true if transform causes width and height to be inverted
|
/* Returns true if transform causes width and height to be inverted
|
||||||
This is true for the odd transforms in the enum */
|
This is true for the odd transforms in the enum */
|
||||||
static inline gboolean
|
static inline gboolean
|
||||||
meta_monitor_transform_is_rotated (enum wl_output_transform transform)
|
meta_monitor_transform_is_rotated (MetaMonitorTransform transform)
|
||||||
{
|
{
|
||||||
return (transform % 2);
|
return (transform % 2);
|
||||||
}
|
}
|
@@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#include "meta-monitor-manager.h"
|
#include "meta-monitor-manager-private.h"
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
@@ -35,19 +35,26 @@
|
|||||||
#include <meta/main.h>
|
#include <meta/main.h>
|
||||||
#include "util-private.h"
|
#include "util-private.h"
|
||||||
#include <meta/errors.h>
|
#include <meta/errors.h>
|
||||||
|
#include "edid.h"
|
||||||
#include "meta-monitor-config.h"
|
#include "meta-monitor-config.h"
|
||||||
#include "backends/x11/meta-monitor-manager-xrandr.h"
|
#include "backends/x11/meta-monitor-manager-xrandr.h"
|
||||||
#include "meta-backend.h"
|
#include "meta-backend-private.h"
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
CONFIRM_DISPLAY_CHANGE,
|
CONFIRM_DISPLAY_CHANGE,
|
||||||
SIGNALS_LAST
|
SIGNALS_LAST
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
/* Array index matches MetaMonitorTransform */
|
||||||
PROP_0,
|
static gfloat transform_matrices[][6] = {
|
||||||
PROP_POWER_SAVE_MODE,
|
{ 1, 0, 0, 0, 1, 0 }, /* normal */
|
||||||
PROP_LAST
|
{ 0, -1, 1, 1, 0, 0 }, /* 90° */
|
||||||
|
{ -1, 0, 1, 0, -1, 1 }, /* 180° */
|
||||||
|
{ 0, 1, 0, -1, 0, 1 }, /* 270° */
|
||||||
|
{ -1, 0, 1, 0, 1, 0 }, /* normal flipped */
|
||||||
|
{ 0, 1, 0, 1, 0, 0 }, /* 90° flipped */
|
||||||
|
{ 1, 0, 0, 0, -1, 1 }, /* 180° flipped */
|
||||||
|
{ 0, -1, 1, -1, 0, 1 }, /* 270° flipped */
|
||||||
};
|
};
|
||||||
|
|
||||||
static int signals[SIGNALS_LAST];
|
static int signals[SIGNALS_LAST];
|
||||||
@@ -64,12 +71,96 @@ meta_monitor_manager_init (MetaMonitorManager *manager)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* rules for constructing a tiled monitor
|
||||||
|
* 1. find a tile_group_id
|
||||||
|
* 2. iterate over all outputs for that tile group id
|
||||||
|
* 3. see if output has a crtc and if it is configured for the tile size
|
||||||
|
* 4. calculate the total tile size
|
||||||
|
* 5. set tile finished size
|
||||||
|
* 6. check for more tile_group_id
|
||||||
|
*/
|
||||||
static void
|
static void
|
||||||
read_current_config (MetaMonitorManager *manager)
|
construct_tile_monitor (MetaMonitorManager *manager,
|
||||||
|
GArray *monitor_infos,
|
||||||
|
guint32 tile_group_id)
|
||||||
{
|
{
|
||||||
manager->serial++;
|
MetaMonitorInfo info;
|
||||||
|
unsigned i;
|
||||||
|
|
||||||
META_MONITOR_MANAGER_GET_CLASS (manager)->read_current (manager);
|
for (i = 0; i < monitor_infos->len; i++)
|
||||||
|
{
|
||||||
|
MetaMonitorInfo *pinfo = &g_array_index (monitor_infos, MetaMonitorInfo, i);
|
||||||
|
|
||||||
|
if (pinfo->tile_group_id == tile_group_id)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* didn't find it */
|
||||||
|
info.number = monitor_infos->len;
|
||||||
|
info.tile_group_id = tile_group_id;
|
||||||
|
info.is_presentation = FALSE;
|
||||||
|
info.refresh_rate = 0.0;
|
||||||
|
info.width_mm = 0;
|
||||||
|
info.height_mm = 0;
|
||||||
|
info.is_primary = FALSE;
|
||||||
|
info.rect.x = INT_MAX;
|
||||||
|
info.rect.y = INT_MAX;
|
||||||
|
info.rect.width = 0;
|
||||||
|
info.rect.height = 0;
|
||||||
|
info.winsys_id = 0;
|
||||||
|
info.n_outputs = 0;
|
||||||
|
info.monitor_winsys_xid = 0;
|
||||||
|
|
||||||
|
for (i = 0; i < manager->n_outputs; i++)
|
||||||
|
{
|
||||||
|
MetaOutput *output = &manager->outputs[i];
|
||||||
|
|
||||||
|
if (!output->tile_info.group_id)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (output->tile_info.group_id != tile_group_id)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (!output->crtc)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (output->crtc->rect.width != (int)output->tile_info.tile_w ||
|
||||||
|
output->crtc->rect.height != (int)output->tile_info.tile_h)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (output->tile_info.loc_h_tile == 0 && output->tile_info.loc_v_tile == 0)
|
||||||
|
{
|
||||||
|
info.refresh_rate = output->crtc->current_mode->refresh_rate;
|
||||||
|
info.width_mm = output->width_mm;
|
||||||
|
info.height_mm = output->height_mm;
|
||||||
|
info.winsys_id = output->winsys_id;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* hack */
|
||||||
|
if (output->crtc->rect.x < info.rect.x)
|
||||||
|
info.rect.x = output->crtc->rect.x;
|
||||||
|
if (output->crtc->rect.y < info.rect.y)
|
||||||
|
info.rect.y = output->crtc->rect.y;
|
||||||
|
|
||||||
|
if (output->tile_info.loc_h_tile == 0)
|
||||||
|
info.rect.height += output->tile_info.tile_h;
|
||||||
|
|
||||||
|
if (output->tile_info.loc_v_tile == 0)
|
||||||
|
info.rect.width += output->tile_info.tile_w;
|
||||||
|
|
||||||
|
if (info.n_outputs > META_MAX_OUTPUTS_PER_MONITOR)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
info.outputs[info.n_outputs++] = output;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* if we don't have a winsys id, i.e. we haven't found tile 0,0
|
||||||
|
don't try and add this to the monitor infos */
|
||||||
|
if (!info.winsys_id)
|
||||||
|
return;
|
||||||
|
|
||||||
|
g_array_append_val (monitor_infos, info);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -82,16 +173,26 @@ read_current_config (MetaMonitorManager *manager)
|
|||||||
static void
|
static void
|
||||||
make_logical_config (MetaMonitorManager *manager)
|
make_logical_config (MetaMonitorManager *manager)
|
||||||
{
|
{
|
||||||
|
MetaMonitorManagerClass *manager_class = META_MONITOR_MANAGER_GET_CLASS (manager);
|
||||||
GArray *monitor_infos;
|
GArray *monitor_infos;
|
||||||
unsigned int i, j;
|
unsigned int i, j;
|
||||||
|
|
||||||
monitor_infos = g_array_sized_new (FALSE, TRUE, sizeof (MetaMonitorInfo),
|
monitor_infos = g_array_sized_new (FALSE, TRUE, sizeof (MetaMonitorInfo),
|
||||||
manager->n_outputs);
|
manager->n_crtcs);
|
||||||
|
|
||||||
/* Walk the list of MetaCRTCs, and build a MetaMonitorInfo
|
/* Walk the list of MetaCRTCs, and build a MetaMonitorInfo
|
||||||
for each of them, unless they reference a rectangle that
|
for each of them, unless they reference a rectangle that
|
||||||
is already there.
|
is already there.
|
||||||
*/
|
*/
|
||||||
|
/* for tiling we need to work out how many tiled outputs there are */
|
||||||
|
for (i = 0; i < manager->n_outputs; i++)
|
||||||
|
{
|
||||||
|
MetaOutput *output = &manager->outputs[i];
|
||||||
|
|
||||||
|
if (output->tile_info.group_id)
|
||||||
|
construct_tile_monitor (manager, monitor_infos, output->tile_info.group_id);
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < manager->n_crtcs; i++)
|
for (i = 0; i < manager->n_crtcs; i++)
|
||||||
{
|
{
|
||||||
MetaCRTC *crtc = &manager->crtcs[i];
|
MetaCRTC *crtc = &manager->crtcs[i];
|
||||||
@@ -103,8 +204,8 @@ make_logical_config (MetaMonitorManager *manager)
|
|||||||
for (j = 0; j < monitor_infos->len; j++)
|
for (j = 0; j < monitor_infos->len; j++)
|
||||||
{
|
{
|
||||||
MetaMonitorInfo *info = &g_array_index (monitor_infos, MetaMonitorInfo, j);
|
MetaMonitorInfo *info = &g_array_index (monitor_infos, MetaMonitorInfo, j);
|
||||||
if (meta_rectangle_equal (&crtc->rect,
|
if (meta_rectangle_contains_rect (&info->rect,
|
||||||
&info->rect))
|
&crtc->rect))
|
||||||
{
|
{
|
||||||
crtc->logical_monitor = info;
|
crtc->logical_monitor = info;
|
||||||
break;
|
break;
|
||||||
@@ -116,7 +217,10 @@ make_logical_config (MetaMonitorManager *manager)
|
|||||||
MetaMonitorInfo info;
|
MetaMonitorInfo info;
|
||||||
|
|
||||||
info.number = monitor_infos->len;
|
info.number = monitor_infos->len;
|
||||||
|
info.tile_group_id = 0;
|
||||||
info.rect = crtc->rect;
|
info.rect = crtc->rect;
|
||||||
|
info.refresh_rate = crtc->current_mode->refresh_rate;
|
||||||
|
info.scale = 1;
|
||||||
info.is_primary = FALSE;
|
info.is_primary = FALSE;
|
||||||
/* This starts true because we want
|
/* This starts true because we want
|
||||||
is_presentation only if all outputs are
|
is_presentation only if all outputs are
|
||||||
@@ -125,8 +229,9 @@ make_logical_config (MetaMonitorManager *manager)
|
|||||||
*/
|
*/
|
||||||
info.is_presentation = TRUE;
|
info.is_presentation = TRUE;
|
||||||
info.in_fullscreen = -1;
|
info.in_fullscreen = -1;
|
||||||
info.output_id = 0;
|
info.winsys_id = 0;
|
||||||
|
info.n_outputs = 0;
|
||||||
|
info.monitor_winsys_xid = 0;
|
||||||
g_array_append_val (monitor_infos, info);
|
g_array_append_val (monitor_infos, info);
|
||||||
|
|
||||||
crtc->logical_monitor = &g_array_index (monitor_infos, MetaMonitorInfo,
|
crtc->logical_monitor = &g_array_index (monitor_infos, MetaMonitorInfo,
|
||||||
@@ -148,6 +253,9 @@ make_logical_config (MetaMonitorManager *manager)
|
|||||||
if (output->crtc == NULL)
|
if (output->crtc == NULL)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
if (output->tile_info.group_id)
|
||||||
|
continue;
|
||||||
|
|
||||||
/* We must have a logical monitor on every CRTC at this point */
|
/* We must have a logical monitor on every CRTC at this point */
|
||||||
g_assert (output->crtc->logical_monitor != NULL);
|
g_assert (output->crtc->logical_monitor != NULL);
|
||||||
|
|
||||||
@@ -156,8 +264,17 @@ make_logical_config (MetaMonitorManager *manager)
|
|||||||
info->is_primary = info->is_primary || output->is_primary;
|
info->is_primary = info->is_primary || output->is_primary;
|
||||||
info->is_presentation = info->is_presentation && output->is_presentation;
|
info->is_presentation = info->is_presentation && output->is_presentation;
|
||||||
|
|
||||||
if (output->is_primary || info->output_id == 0)
|
info->width_mm = output->width_mm;
|
||||||
info->output_id = output->output_id;
|
info->height_mm = output->height_mm;
|
||||||
|
|
||||||
|
info->outputs[0] = output;
|
||||||
|
info->n_outputs = 1;
|
||||||
|
|
||||||
|
if (output->is_primary || info->winsys_id == 0)
|
||||||
|
{
|
||||||
|
info->scale = output->scale;
|
||||||
|
info->winsys_id = output->winsys_id;
|
||||||
|
}
|
||||||
|
|
||||||
if (info->is_primary)
|
if (info->is_primary)
|
||||||
manager->primary_monitor_index = info->number;
|
manager->primary_monitor_index = info->number;
|
||||||
@@ -165,6 +282,35 @@ make_logical_config (MetaMonitorManager *manager)
|
|||||||
|
|
||||||
manager->n_monitor_infos = monitor_infos->len;
|
manager->n_monitor_infos = monitor_infos->len;
|
||||||
manager->monitor_infos = (void*)g_array_free (monitor_infos, FALSE);
|
manager->monitor_infos = (void*)g_array_free (monitor_infos, FALSE);
|
||||||
|
|
||||||
|
if (manager_class->add_monitor)
|
||||||
|
for (i = 0; i < manager->n_monitor_infos; i++)
|
||||||
|
manager_class->add_monitor (manager, &manager->monitor_infos[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
power_save_mode_changed (MetaMonitorManager *manager,
|
||||||
|
GParamSpec *pspec,
|
||||||
|
gpointer user_data)
|
||||||
|
{
|
||||||
|
MetaMonitorManagerClass *klass;
|
||||||
|
int mode = meta_dbus_display_config_get_power_save_mode (META_DBUS_DISPLAY_CONFIG (manager));
|
||||||
|
|
||||||
|
if (mode == META_POWER_SAVE_UNSUPPORTED)
|
||||||
|
return;
|
||||||
|
|
||||||
|
/* If DPMS is unsupported, force the property back. */
|
||||||
|
if (manager->power_save_mode == META_POWER_SAVE_UNSUPPORTED)
|
||||||
|
{
|
||||||
|
meta_dbus_display_config_set_power_save_mode (META_DBUS_DISPLAY_CONFIG (manager), META_POWER_SAVE_UNSUPPORTED);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
klass = META_MONITOR_MANAGER_GET_CLASS (manager);
|
||||||
|
if (klass->set_power_save_mode)
|
||||||
|
klass->set_power_save_mode (manager, mode);
|
||||||
|
|
||||||
|
manager->power_save_mode = mode;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -172,11 +318,14 @@ meta_monitor_manager_constructed (GObject *object)
|
|||||||
{
|
{
|
||||||
MetaMonitorManager *manager = META_MONITOR_MANAGER (object);
|
MetaMonitorManager *manager = META_MONITOR_MANAGER (object);
|
||||||
|
|
||||||
|
g_signal_connect_object (manager, "notify::power-save-mode",
|
||||||
|
G_CALLBACK (power_save_mode_changed), manager, 0);
|
||||||
|
|
||||||
manager->in_init = TRUE;
|
manager->in_init = TRUE;
|
||||||
|
|
||||||
manager->config = meta_monitor_config_new ();
|
manager->config = meta_monitor_config_new ();
|
||||||
|
|
||||||
read_current_config (manager);
|
meta_monitor_manager_read_current_config (manager);
|
||||||
|
|
||||||
if (!meta_monitor_config_apply_stored (manager->config, manager))
|
if (!meta_monitor_config_apply_stored (manager->config, manager))
|
||||||
meta_monitor_config_make_default (manager->config, manager);
|
meta_monitor_config_make_default (manager->config, manager);
|
||||||
@@ -189,24 +338,7 @@ meta_monitor_manager_constructed (GObject *object)
|
|||||||
so this is not needed.
|
so this is not needed.
|
||||||
*/
|
*/
|
||||||
if (META_IS_MONITOR_MANAGER_XRANDR (manager))
|
if (META_IS_MONITOR_MANAGER_XRANDR (manager))
|
||||||
{
|
meta_monitor_manager_read_current_config (manager);
|
||||||
MetaOutput *old_outputs;
|
|
||||||
MetaCRTC *old_crtcs;
|
|
||||||
MetaMonitorMode *old_modes;
|
|
||||||
unsigned int n_old_outputs, n_old_modes;
|
|
||||||
|
|
||||||
old_outputs = manager->outputs;
|
|
||||||
n_old_outputs = manager->n_outputs;
|
|
||||||
old_modes = manager->modes;
|
|
||||||
n_old_modes = manager->n_modes;
|
|
||||||
old_crtcs = manager->crtcs;
|
|
||||||
|
|
||||||
read_current_config (manager);
|
|
||||||
|
|
||||||
meta_monitor_manager_free_output_array (old_outputs, n_old_outputs);
|
|
||||||
meta_monitor_manager_free_mode_array (old_modes, n_old_modes);
|
|
||||||
g_free (old_crtcs);
|
|
||||||
}
|
|
||||||
|
|
||||||
make_logical_config (manager);
|
make_logical_config (manager);
|
||||||
initialize_dbus_interface (manager);
|
initialize_dbus_interface (manager);
|
||||||
@@ -214,63 +346,79 @@ meta_monitor_manager_constructed (GObject *object)
|
|||||||
manager->in_init = FALSE;
|
manager->in_init = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
void
|
||||||
meta_monitor_manager_set_power_save_mode (MetaMonitorManager *manager,
|
meta_monitor_manager_clear_output (MetaOutput *output)
|
||||||
MetaPowerSave mode)
|
|
||||||
{
|
{
|
||||||
MetaMonitorManagerClass *klass;
|
g_free (output->name);
|
||||||
|
g_free (output->vendor);
|
||||||
|
g_free (output->product);
|
||||||
|
g_free (output->serial);
|
||||||
|
g_free (output->modes);
|
||||||
|
g_free (output->possible_crtcs);
|
||||||
|
g_free (output->possible_clones);
|
||||||
|
|
||||||
if (manager->power_save_mode == META_POWER_SAVE_UNSUPPORTED ||
|
if (output->driver_notify)
|
||||||
mode == META_POWER_SAVE_UNSUPPORTED)
|
output->driver_notify (output);
|
||||||
return;
|
|
||||||
|
|
||||||
klass = META_MONITOR_MANAGER_GET_CLASS (manager);
|
memset (output, 0, sizeof (*output));
|
||||||
if (klass->set_power_save_mode)
|
|
||||||
klass->set_power_save_mode (manager, mode);
|
|
||||||
|
|
||||||
manager->power_save_mode = mode;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
|
meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
|
||||||
int n_old_outputs)
|
int n_old_outputs)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < n_old_outputs; i++)
|
for (i = 0; i < n_old_outputs; i++)
|
||||||
{
|
meta_monitor_manager_clear_output (&old_outputs[i]);
|
||||||
g_free (old_outputs[i].name);
|
|
||||||
g_free (old_outputs[i].vendor);
|
|
||||||
g_free (old_outputs[i].product);
|
|
||||||
g_free (old_outputs[i].serial);
|
|
||||||
g_free (old_outputs[i].modes);
|
|
||||||
g_free (old_outputs[i].possible_crtcs);
|
|
||||||
g_free (old_outputs[i].possible_clones);
|
|
||||||
|
|
||||||
if (old_outputs[i].driver_notify)
|
|
||||||
old_outputs[i].driver_notify (&old_outputs[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_free (old_outputs);
|
g_free (old_outputs);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
meta_monitor_manager_clear_mode (MetaMonitorMode *mode)
|
||||||
|
{
|
||||||
|
g_free (mode->name);
|
||||||
|
|
||||||
|
if (mode->driver_notify)
|
||||||
|
mode->driver_notify (mode);
|
||||||
|
|
||||||
|
memset (mode, 0, sizeof (*mode));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
meta_monitor_manager_free_mode_array (MetaMonitorMode *old_modes,
|
meta_monitor_manager_free_mode_array (MetaMonitorMode *old_modes,
|
||||||
int n_old_modes)
|
int n_old_modes)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < n_old_modes; i++)
|
for (i = 0; i < n_old_modes; i++)
|
||||||
{
|
meta_monitor_manager_clear_mode (&old_modes[i]);
|
||||||
g_free (old_modes[i].name);
|
|
||||||
|
|
||||||
if (old_modes[i].driver_notify)
|
|
||||||
old_modes[i].driver_notify (&old_modes[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_free (old_modes);
|
g_free (old_modes);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
meta_monitor_manager_clear_crtc (MetaCRTC *crtc)
|
||||||
|
{
|
||||||
|
if (crtc->driver_notify)
|
||||||
|
crtc->driver_notify (crtc);
|
||||||
|
|
||||||
|
memset (crtc, 0, sizeof (*crtc));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_monitor_manager_free_crtc_array (MetaCRTC *old_crtcs,
|
||||||
|
int n_old_crtcs)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < n_old_crtcs; i++)
|
||||||
|
meta_monitor_manager_clear_crtc (&old_crtcs[i]);
|
||||||
|
|
||||||
|
g_free (old_crtcs);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
meta_monitor_manager_finalize (GObject *object)
|
meta_monitor_manager_finalize (GObject *object)
|
||||||
{
|
{
|
||||||
@@ -278,8 +426,8 @@ meta_monitor_manager_finalize (GObject *object)
|
|||||||
|
|
||||||
meta_monitor_manager_free_output_array (manager->outputs, manager->n_outputs);
|
meta_monitor_manager_free_output_array (manager->outputs, manager->n_outputs);
|
||||||
meta_monitor_manager_free_mode_array (manager->modes, manager->n_modes);
|
meta_monitor_manager_free_mode_array (manager->modes, manager->n_modes);
|
||||||
|
meta_monitor_manager_free_crtc_array (manager->crtcs, manager->n_crtcs);
|
||||||
g_free (manager->monitor_infos);
|
g_free (manager->monitor_infos);
|
||||||
g_free (manager->crtcs);
|
|
||||||
|
|
||||||
G_OBJECT_CLASS (meta_monitor_manager_parent_class)->finalize (object);
|
G_OBJECT_CLASS (meta_monitor_manager_parent_class)->finalize (object);
|
||||||
}
|
}
|
||||||
@@ -298,44 +446,6 @@ meta_monitor_manager_dispose (GObject *object)
|
|||||||
G_OBJECT_CLASS (meta_monitor_manager_parent_class)->dispose (object);
|
G_OBJECT_CLASS (meta_monitor_manager_parent_class)->dispose (object);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
meta_monitor_manager_set_property (GObject *object,
|
|
||||||
guint prop_id,
|
|
||||||
const GValue *value,
|
|
||||||
GParamSpec *pspec)
|
|
||||||
{
|
|
||||||
MetaMonitorManager *self = META_MONITOR_MANAGER (object);
|
|
||||||
|
|
||||||
switch (prop_id)
|
|
||||||
{
|
|
||||||
case PROP_POWER_SAVE_MODE:
|
|
||||||
meta_monitor_manager_set_power_save_mode (self, g_value_get_int (value));
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
meta_monitor_manager_get_property (GObject *object,
|
|
||||||
guint prop_id,
|
|
||||||
GValue *value,
|
|
||||||
GParamSpec *pspec)
|
|
||||||
{
|
|
||||||
MetaMonitorManager *self = META_MONITOR_MANAGER (object);
|
|
||||||
|
|
||||||
switch (prop_id)
|
|
||||||
{
|
|
||||||
case PROP_POWER_SAVE_MODE:
|
|
||||||
g_value_set_int (value, self->power_save_mode);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static GBytes *
|
static GBytes *
|
||||||
meta_monitor_manager_real_read_edid (MetaMonitorManager *manager,
|
meta_monitor_manager_real_read_edid (MetaMonitorManager *manager,
|
||||||
MetaOutput *output)
|
MetaOutput *output)
|
||||||
@@ -356,8 +466,6 @@ meta_monitor_manager_class_init (MetaMonitorManagerClass *klass)
|
|||||||
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||||
|
|
||||||
object_class->constructed = meta_monitor_manager_constructed;
|
object_class->constructed = meta_monitor_manager_constructed;
|
||||||
object_class->get_property = meta_monitor_manager_get_property;
|
|
||||||
object_class->set_property = meta_monitor_manager_set_property;
|
|
||||||
object_class->dispose = meta_monitor_manager_dispose;
|
object_class->dispose = meta_monitor_manager_dispose;
|
||||||
object_class->finalize = meta_monitor_manager_finalize;
|
object_class->finalize = meta_monitor_manager_finalize;
|
||||||
|
|
||||||
@@ -371,8 +479,6 @@ meta_monitor_manager_class_init (MetaMonitorManagerClass *klass)
|
|||||||
0,
|
0,
|
||||||
NULL, NULL, NULL,
|
NULL, NULL, NULL,
|
||||||
G_TYPE_NONE, 0);
|
G_TYPE_NONE, 0);
|
||||||
|
|
||||||
g_object_class_override_property (object_class, PROP_POWER_SAVE_MODE, "power-save-mode");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const double known_diagonals[] = {
|
static const double known_diagonals[] = {
|
||||||
@@ -402,15 +508,16 @@ static char *
|
|||||||
make_display_name (MetaMonitorManager *manager,
|
make_display_name (MetaMonitorManager *manager,
|
||||||
MetaOutput *output)
|
MetaOutput *output)
|
||||||
{
|
{
|
||||||
char *inches = NULL;
|
g_autofree char *inches = NULL;
|
||||||
char *vendor_name = NULL;
|
g_autofree char *vendor_name = NULL;
|
||||||
char *ret;
|
|
||||||
|
|
||||||
if (g_str_has_prefix (output->name, "LVDS") ||
|
switch (output->connector_type)
|
||||||
g_str_has_prefix (output->name, "eDP"))
|
|
||||||
{
|
{
|
||||||
ret = g_strdup (_("Built-in display"));
|
case META_CONNECTOR_TYPE_LVDS:
|
||||||
goto out;
|
case META_CONNECTOR_TYPE_eDP:
|
||||||
|
return g_strdup (_("Built-in display"));
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (output->width_mm > 0 && output->height_mm > 0)
|
if (output->width_mm > 0 && output->height_mm > 0)
|
||||||
@@ -444,18 +551,38 @@ make_display_name (MetaMonitorManager *manager,
|
|||||||
/* TRANSLATORS: this is a monitor vendor name, followed by a
|
/* TRANSLATORS: this is a monitor vendor name, followed by a
|
||||||
* size in inches, like 'Dell 15"'
|
* size in inches, like 'Dell 15"'
|
||||||
*/
|
*/
|
||||||
ret = g_strdup_printf (_("%s %s"), vendor_name, inches);
|
return g_strdup_printf (_("%s %s"), vendor_name, inches);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ret = g_strdup (vendor_name);
|
return g_strdup (vendor_name);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
out:
|
static const char *
|
||||||
g_free (inches);
|
get_connector_type_name (MetaConnectorType connector_type)
|
||||||
g_free (vendor_name);
|
{
|
||||||
|
switch (connector_type)
|
||||||
return ret;
|
{
|
||||||
|
case META_CONNECTOR_TYPE_Unknown: return "Unknown";
|
||||||
|
case META_CONNECTOR_TYPE_VGA: return "VGA";
|
||||||
|
case META_CONNECTOR_TYPE_DVII: return "DVII";
|
||||||
|
case META_CONNECTOR_TYPE_DVID: return "DVID";
|
||||||
|
case META_CONNECTOR_TYPE_DVIA: return "DVIA";
|
||||||
|
case META_CONNECTOR_TYPE_Composite: return "Composite";
|
||||||
|
case META_CONNECTOR_TYPE_SVIDEO: return "SVIDEO";
|
||||||
|
case META_CONNECTOR_TYPE_LVDS: return "LVDS";
|
||||||
|
case META_CONNECTOR_TYPE_Component: return "Component";
|
||||||
|
case META_CONNECTOR_TYPE_9PinDIN: return "9PinDIN";
|
||||||
|
case META_CONNECTOR_TYPE_DisplayPort: return "DisplayPort";
|
||||||
|
case META_CONNECTOR_TYPE_HDMIA: return "HDMIA";
|
||||||
|
case META_CONNECTOR_TYPE_HDMIB: return "HDMIB";
|
||||||
|
case META_CONNECTOR_TYPE_TV: return "TV";
|
||||||
|
case META_CONNECTOR_TYPE_eDP: return "eDP";
|
||||||
|
case META_CONNECTOR_TYPE_VIRTUAL: return "VIRTUAL";
|
||||||
|
case META_CONNECTOR_TYPE_DSI: return "DSI";
|
||||||
|
default: g_assert_not_reached ();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
@@ -477,7 +604,7 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
|
|||||||
GVariantBuilder transforms;
|
GVariantBuilder transforms;
|
||||||
|
|
||||||
g_variant_builder_init (&transforms, G_VARIANT_TYPE ("au"));
|
g_variant_builder_init (&transforms, G_VARIANT_TYPE ("au"));
|
||||||
for (j = 0; j <= WL_OUTPUT_TRANSFORM_FLIPPED_270; j++)
|
for (j = 0; j <= META_MONITOR_TRANSFORM_FLIPPED_270; j++)
|
||||||
if (crtc->all_transforms & (1 << j))
|
if (crtc->all_transforms & (1 << j))
|
||||||
g_variant_builder_add (&transforms, "u", j);
|
g_variant_builder_add (&transforms, "u", j);
|
||||||
|
|
||||||
@@ -538,6 +665,12 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
|
|||||||
g_variant_new_boolean (output->is_primary));
|
g_variant_new_boolean (output->is_primary));
|
||||||
g_variant_builder_add (&properties, "{sv}", "presentation",
|
g_variant_builder_add (&properties, "{sv}", "presentation",
|
||||||
g_variant_new_boolean (output->is_presentation));
|
g_variant_new_boolean (output->is_presentation));
|
||||||
|
g_variant_builder_add (&properties, "{sv}", "connector-type",
|
||||||
|
g_variant_new_string (get_connector_type_name (output->connector_type)));
|
||||||
|
g_variant_builder_add (&properties, "{sv}", "underscanning",
|
||||||
|
g_variant_new_boolean (output->is_underscanning));
|
||||||
|
g_variant_builder_add (&properties, "{sv}", "supports-underscanning",
|
||||||
|
g_variant_new_boolean (output->supports_underscanning));
|
||||||
|
|
||||||
edid_file = manager_class->get_edid_file (manager, output);
|
edid_file = manager_class->get_edid_file (manager, output);
|
||||||
if (edid_file)
|
if (edid_file)
|
||||||
@@ -558,9 +691,23 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (output->tile_info.group_id)
|
||||||
|
{
|
||||||
|
g_variant_builder_add (&properties, "{sv}", "tile",
|
||||||
|
g_variant_new ("(uuuuuuuu)",
|
||||||
|
output->tile_info.group_id,
|
||||||
|
output->tile_info.flags,
|
||||||
|
output->tile_info.max_h_tiles,
|
||||||
|
output->tile_info.max_v_tiles,
|
||||||
|
output->tile_info.loc_h_tile,
|
||||||
|
output->tile_info.loc_v_tile,
|
||||||
|
output->tile_info.tile_w,
|
||||||
|
output->tile_info.tile_h));
|
||||||
|
}
|
||||||
|
|
||||||
g_variant_builder_add (&output_builder, "(uxiausauaua{sv})",
|
g_variant_builder_add (&output_builder, "(uxiausauaua{sv})",
|
||||||
i, /* ID */
|
i, /* ID */
|
||||||
(gint64)output->output_id,
|
(gint64)output->winsys_id,
|
||||||
(int)(output->crtc ? output->crtc - manager->crtcs : -1),
|
(int)(output->crtc ? output->crtc - manager->crtcs : -1),
|
||||||
&crtcs,
|
&crtcs,
|
||||||
output->name,
|
output->name,
|
||||||
@@ -667,7 +814,7 @@ meta_monitor_manager_handle_apply_configuration (MetaDBusDisplayConfig *skeleto
|
|||||||
int new_mode, x, y;
|
int new_mode, x, y;
|
||||||
int new_screen_width, new_screen_height;
|
int new_screen_width, new_screen_height;
|
||||||
guint transform;
|
guint transform;
|
||||||
guint output_id;
|
guint output_index;
|
||||||
GPtrArray *crtc_infos, *output_infos;
|
GPtrArray *crtc_infos, *output_infos;
|
||||||
|
|
||||||
if (serial != manager->serial)
|
if (serial != manager->serial)
|
||||||
@@ -694,7 +841,6 @@ meta_monitor_manager_handle_apply_configuration (MetaDBusDisplayConfig *skeleto
|
|||||||
MetaOutput *first_output;
|
MetaOutput *first_output;
|
||||||
MetaCRTC *crtc;
|
MetaCRTC *crtc;
|
||||||
MetaMonitorMode *mode;
|
MetaMonitorMode *mode;
|
||||||
guint output_id;
|
|
||||||
|
|
||||||
crtc_info = g_slice_new (MetaCRTCInfo);
|
crtc_info = g_slice_new (MetaCRTCInfo);
|
||||||
crtc_info->outputs = g_ptr_array_new ();
|
crtc_info->outputs = g_ptr_array_new ();
|
||||||
@@ -756,8 +902,7 @@ meta_monitor_manager_handle_apply_configuration (MetaDBusDisplayConfig *skeleto
|
|||||||
crtc_info->y = 0;
|
crtc_info->y = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (transform < WL_OUTPUT_TRANSFORM_NORMAL ||
|
if (transform > META_MONITOR_TRANSFORM_FLIPPED_270 ||
|
||||||
transform > WL_OUTPUT_TRANSFORM_FLIPPED_270 ||
|
|
||||||
((crtc->all_transforms & (1 << transform)) == 0))
|
((crtc->all_transforms & (1 << transform)) == 0))
|
||||||
{
|
{
|
||||||
g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
|
g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
|
||||||
@@ -768,18 +913,18 @@ meta_monitor_manager_handle_apply_configuration (MetaDBusDisplayConfig *skeleto
|
|||||||
crtc_info->transform = transform;
|
crtc_info->transform = transform;
|
||||||
|
|
||||||
first_output = NULL;
|
first_output = NULL;
|
||||||
while (g_variant_iter_loop (nested_outputs, "u", &output_id))
|
while (g_variant_iter_loop (nested_outputs, "u", &output_index))
|
||||||
{
|
{
|
||||||
MetaOutput *output;
|
MetaOutput *output;
|
||||||
|
|
||||||
if (output_id >= manager->n_outputs)
|
if (output_index >= manager->n_outputs)
|
||||||
{
|
{
|
||||||
g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
|
g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
|
||||||
G_DBUS_ERROR_INVALID_ARGS,
|
G_DBUS_ERROR_INVALID_ARGS,
|
||||||
"Invalid output id");
|
"Invalid output id");
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
output = &manager->outputs[output_id];
|
output = &manager->outputs[output_index];
|
||||||
|
|
||||||
if (!output_can_config (output, crtc, mode))
|
if (!output_can_config (output, crtc, mode))
|
||||||
{
|
{
|
||||||
@@ -824,12 +969,12 @@ meta_monitor_manager_handle_apply_configuration (MetaDBusDisplayConfig *skeleto
|
|||||||
}
|
}
|
||||||
|
|
||||||
g_variant_iter_init (&output_iter, outputs);
|
g_variant_iter_init (&output_iter, outputs);
|
||||||
while (g_variant_iter_loop (&output_iter, "(u@a{sv})", &output_id, &properties))
|
while (g_variant_iter_loop (&output_iter, "(u@a{sv})", &output_index, &properties))
|
||||||
{
|
{
|
||||||
MetaOutputInfo *output_info;
|
MetaOutputInfo *output_info;
|
||||||
gboolean primary, presentation;
|
gboolean primary, presentation, underscanning;
|
||||||
|
|
||||||
if (output_id >= manager->n_outputs)
|
if (output_index >= manager->n_outputs)
|
||||||
{
|
{
|
||||||
g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
|
g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
|
||||||
G_DBUS_ERROR_INVALID_ARGS,
|
G_DBUS_ERROR_INVALID_ARGS,
|
||||||
@@ -838,7 +983,7 @@ meta_monitor_manager_handle_apply_configuration (MetaDBusDisplayConfig *skeleto
|
|||||||
}
|
}
|
||||||
|
|
||||||
output_info = g_slice_new0 (MetaOutputInfo);
|
output_info = g_slice_new0 (MetaOutputInfo);
|
||||||
output_info->output = &manager->outputs[output_id];
|
output_info->output = &manager->outputs[output_index];
|
||||||
|
|
||||||
if (g_variant_lookup (properties, "primary", "b", &primary))
|
if (g_variant_lookup (properties, "primary", "b", &primary))
|
||||||
output_info->is_primary = primary;
|
output_info->is_primary = primary;
|
||||||
@@ -846,6 +991,9 @@ meta_monitor_manager_handle_apply_configuration (MetaDBusDisplayConfig *skeleto
|
|||||||
if (g_variant_lookup (properties, "presentation", "b", &presentation))
|
if (g_variant_lookup (properties, "presentation", "b", &presentation))
|
||||||
output_info->is_presentation = presentation;
|
output_info->is_presentation = presentation;
|
||||||
|
|
||||||
|
if (g_variant_lookup (properties, "underscanning", "b", &underscanning))
|
||||||
|
output_info->is_underscanning = underscanning;
|
||||||
|
|
||||||
g_ptr_array_add (output_infos, output_info);
|
g_ptr_array_add (output_infos, output_info);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -909,7 +1057,7 @@ static gboolean
|
|||||||
meta_monitor_manager_handle_change_backlight (MetaDBusDisplayConfig *skeleton,
|
meta_monitor_manager_handle_change_backlight (MetaDBusDisplayConfig *skeleton,
|
||||||
GDBusMethodInvocation *invocation,
|
GDBusMethodInvocation *invocation,
|
||||||
guint serial,
|
guint serial,
|
||||||
guint output_id,
|
guint output_index,
|
||||||
gint value)
|
gint value)
|
||||||
{
|
{
|
||||||
MetaMonitorManager *manager = META_MONITOR_MANAGER (skeleton);
|
MetaMonitorManager *manager = META_MONITOR_MANAGER (skeleton);
|
||||||
@@ -923,14 +1071,14 @@ meta_monitor_manager_handle_change_backlight (MetaDBusDisplayConfig *skeleton,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (output_id >= manager->n_outputs)
|
if (output_index >= manager->n_outputs)
|
||||||
{
|
{
|
||||||
g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
|
g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
|
||||||
G_DBUS_ERROR_INVALID_ARGS,
|
G_DBUS_ERROR_INVALID_ARGS,
|
||||||
"Invalid output id");
|
"Invalid output id");
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
output = &manager->outputs[output_id];
|
output = &manager->outputs[output_index];
|
||||||
|
|
||||||
if (value < 0 || value > 100)
|
if (value < 0 || value > 100)
|
||||||
{
|
{
|
||||||
@@ -1126,6 +1274,13 @@ initialize_dbus_interface (MetaMonitorManager *manager)
|
|||||||
g_object_unref);
|
g_object_unref);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* meta_monitor_manager_get:
|
||||||
|
*
|
||||||
|
* Accessor for the singleton MetaMonitorManager.
|
||||||
|
*
|
||||||
|
* Returns: (transfer none): The only #MetaMonitorManager there is.
|
||||||
|
*/
|
||||||
MetaMonitorManager *
|
MetaMonitorManager *
|
||||||
meta_monitor_manager_get (void)
|
meta_monitor_manager_get (void)
|
||||||
{
|
{
|
||||||
@@ -1200,20 +1355,238 @@ meta_monitor_manager_get_screen_limits (MetaMonitorManager *manager,
|
|||||||
*height = manager->max_screen_height;
|
*height = manager->max_screen_height;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
meta_monitor_manager_read_current_config (MetaMonitorManager *manager)
|
||||||
|
{
|
||||||
|
MetaOutput *old_outputs;
|
||||||
|
MetaCRTC *old_crtcs;
|
||||||
|
MetaMonitorMode *old_modes;
|
||||||
|
unsigned int n_old_outputs, n_old_crtcs, n_old_modes;
|
||||||
|
|
||||||
|
/* Some implementations of read_current use the existing information
|
||||||
|
* we have available, so don't free the old configuration until after
|
||||||
|
* read_current finishes. */
|
||||||
|
old_outputs = manager->outputs;
|
||||||
|
n_old_outputs = manager->n_outputs;
|
||||||
|
old_crtcs = manager->crtcs;
|
||||||
|
n_old_crtcs = manager->n_crtcs;
|
||||||
|
old_modes = manager->modes;
|
||||||
|
n_old_modes = manager->n_modes;
|
||||||
|
|
||||||
|
manager->serial++;
|
||||||
|
META_MONITOR_MANAGER_GET_CLASS (manager)->read_current (manager);
|
||||||
|
|
||||||
|
meta_monitor_manager_free_output_array (old_outputs, n_old_outputs);
|
||||||
|
meta_monitor_manager_free_mode_array (old_modes, n_old_modes);
|
||||||
|
meta_monitor_manager_free_crtc_array (old_crtcs, n_old_crtcs);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
meta_monitor_manager_rebuild_derived (MetaMonitorManager *manager)
|
meta_monitor_manager_rebuild_derived (MetaMonitorManager *manager)
|
||||||
{
|
{
|
||||||
|
MetaMonitorManagerClass *manager_class = META_MONITOR_MANAGER_GET_CLASS (manager);
|
||||||
MetaMonitorInfo *old_monitor_infos;
|
MetaMonitorInfo *old_monitor_infos;
|
||||||
|
unsigned old_n_monitor_infos;
|
||||||
|
unsigned i, j;
|
||||||
old_monitor_infos = manager->monitor_infos;
|
old_monitor_infos = manager->monitor_infos;
|
||||||
|
old_n_monitor_infos = manager->n_monitor_infos;
|
||||||
|
|
||||||
if (manager->in_init)
|
if (manager->in_init)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
make_logical_config (manager);
|
make_logical_config (manager);
|
||||||
|
|
||||||
|
if (manager_class->delete_monitor)
|
||||||
|
{
|
||||||
|
for (i = 0; i < old_n_monitor_infos; i++)
|
||||||
|
{
|
||||||
|
gboolean delete_mon = TRUE;
|
||||||
|
for (j = 0; j < manager->n_monitor_infos; j++)
|
||||||
|
{
|
||||||
|
if (manager->monitor_infos[j].monitor_winsys_xid == old_monitor_infos[i].monitor_winsys_xid)
|
||||||
|
{
|
||||||
|
delete_mon = FALSE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (delete_mon)
|
||||||
|
manager_class->delete_monitor (manager, old_monitor_infos[i].monitor_winsys_xid);
|
||||||
|
}
|
||||||
|
}
|
||||||
g_signal_emit_by_name (manager, "monitors-changed");
|
g_signal_emit_by_name (manager, "monitors-changed");
|
||||||
|
|
||||||
g_free (old_monitor_infos);
|
g_free (old_monitor_infos);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
meta_output_parse_edid (MetaOutput *meta_output,
|
||||||
|
GBytes *edid)
|
||||||
|
{
|
||||||
|
MonitorInfo *parsed_edid;
|
||||||
|
gsize len;
|
||||||
|
|
||||||
|
if (!edid)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
parsed_edid = decode_edid (g_bytes_get_data (edid, &len));
|
||||||
|
|
||||||
|
if (parsed_edid)
|
||||||
|
{
|
||||||
|
meta_output->vendor = g_strndup (parsed_edid->manufacturer_code, 4);
|
||||||
|
if (!g_utf8_validate (meta_output->vendor, -1, NULL))
|
||||||
|
g_clear_pointer (&meta_output->vendor, g_free);
|
||||||
|
|
||||||
|
meta_output->product = g_strndup (parsed_edid->dsc_product_name, 14);
|
||||||
|
if (!g_utf8_validate (meta_output->product, -1, NULL) ||
|
||||||
|
meta_output->product[0] == '\0')
|
||||||
|
{
|
||||||
|
g_clear_pointer (&meta_output->product, g_free);
|
||||||
|
meta_output->product = g_strdup_printf ("0x%04x", (unsigned) parsed_edid->product_code);
|
||||||
|
}
|
||||||
|
|
||||||
|
meta_output->serial = g_strndup (parsed_edid->dsc_serial_number, 14);
|
||||||
|
if (!g_utf8_validate (meta_output->serial, -1, NULL) ||
|
||||||
|
meta_output->serial[0] == '\0')
|
||||||
|
{
|
||||||
|
g_clear_pointer (&meta_output->serial, g_free);
|
||||||
|
meta_output->serial = g_strdup_printf ("0x%08x", parsed_edid->serial_number);
|
||||||
|
}
|
||||||
|
|
||||||
|
g_free (parsed_edid);
|
||||||
|
}
|
||||||
|
|
||||||
|
out:
|
||||||
|
if (!meta_output->vendor)
|
||||||
|
meta_output->vendor = g_strdup ("unknown");
|
||||||
|
if (!meta_output->product)
|
||||||
|
meta_output->product = g_strdup ("unknown");
|
||||||
|
if (!meta_output->serial)
|
||||||
|
meta_output->serial = g_strdup ("unknown");
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
meta_monitor_manager_on_hotplug (MetaMonitorManager *manager)
|
||||||
|
{
|
||||||
|
gboolean applied_config = FALSE;
|
||||||
|
|
||||||
|
/* If the monitor has hotplug_mode_update (which is used by VMs), don't bother
|
||||||
|
* applying our stored configuration, because it's likely the user just resizing
|
||||||
|
* the window.
|
||||||
|
*/
|
||||||
|
if (!meta_monitor_manager_has_hotplug_mode_update (manager))
|
||||||
|
{
|
||||||
|
if (meta_monitor_config_apply_stored (manager->config, manager))
|
||||||
|
applied_config = TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* If we haven't applied any configuration, apply the default configuration. */
|
||||||
|
if (!applied_config)
|
||||||
|
meta_monitor_config_make_default (manager->config, manager);
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
calculate_viewport_matrix (MetaMonitorManager *manager,
|
||||||
|
MetaOutput *output,
|
||||||
|
gfloat viewport[6])
|
||||||
|
{
|
||||||
|
gfloat x, y, width, height;
|
||||||
|
|
||||||
|
if (!output->crtc)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
x = (float) output->crtc->rect.x / manager->screen_width;
|
||||||
|
y = (float) output->crtc->rect.y / manager->screen_height;
|
||||||
|
width = (float) output->crtc->rect.width / manager->screen_width;
|
||||||
|
height = (float) output->crtc->rect.height / manager->screen_height;
|
||||||
|
|
||||||
|
viewport[0] = width;
|
||||||
|
viewport[1] = 0.0f;
|
||||||
|
viewport[2] = x;
|
||||||
|
viewport[3] = 0.0f;
|
||||||
|
viewport[4] = height;
|
||||||
|
viewport[5] = y;
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void
|
||||||
|
multiply_matrix (float a[6],
|
||||||
|
float b[6],
|
||||||
|
float res[6])
|
||||||
|
{
|
||||||
|
res[0] = a[0] * b[0] + a[1] * b[3];
|
||||||
|
res[1] = a[0] * b[1] + a[1] * b[4];
|
||||||
|
res[2] = a[0] * b[2] + a[1] * b[5] + a[2];
|
||||||
|
res[3] = a[3] * b[0] + a[4] * b[3];
|
||||||
|
res[4] = a[3] * b[1] + a[4] * b[4];
|
||||||
|
res[5] = a[3] * b[2] + a[4] * b[5] + a[5];
|
||||||
|
}
|
||||||
|
|
||||||
|
gboolean
|
||||||
|
meta_monitor_manager_get_monitor_matrix (MetaMonitorManager *manager,
|
||||||
|
MetaOutput *output,
|
||||||
|
gfloat matrix[6])
|
||||||
|
{
|
||||||
|
gfloat viewport[9];
|
||||||
|
|
||||||
|
if (!calculate_viewport_matrix (manager, output, viewport))
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
multiply_matrix (viewport, transform_matrices[output->crtc->transform],
|
||||||
|
matrix);
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* meta_monitor_manager_get_output_geometry:
|
||||||
|
* @manager: A #MetaMonitorManager
|
||||||
|
* @id: A valid #MetaOutput id
|
||||||
|
*
|
||||||
|
* Returns: The monitor index or -1 if @id isn't valid or the output
|
||||||
|
* isn't associated with a logical monitor.
|
||||||
|
*/
|
||||||
|
gint
|
||||||
|
meta_monitor_manager_get_monitor_for_output (MetaMonitorManager *manager,
|
||||||
|
guint id)
|
||||||
|
{
|
||||||
|
MetaOutput *output;
|
||||||
|
guint i;
|
||||||
|
|
||||||
|
g_return_val_if_fail (META_IS_MONITOR_MANAGER (manager), -1);
|
||||||
|
g_return_val_if_fail (id < manager->n_outputs, -1);
|
||||||
|
|
||||||
|
output = &manager->outputs[id];
|
||||||
|
if (!output || !output->crtc)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
for (i = 0; i < manager->n_monitor_infos; i++)
|
||||||
|
if (meta_rectangle_contains_rect (&manager->monitor_infos[i].rect,
|
||||||
|
&output->crtc->rect))
|
||||||
|
return i;
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
gint
|
||||||
|
meta_monitor_manager_get_monitor_at_point (MetaMonitorManager *manager,
|
||||||
|
gfloat x,
|
||||||
|
gfloat y)
|
||||||
|
{
|
||||||
|
unsigned int i;
|
||||||
|
|
||||||
|
for (i = 0; i < manager->n_monitor_infos; i++)
|
||||||
|
{
|
||||||
|
MetaMonitorInfo *monitor = &manager->monitor_infos[i];
|
||||||
|
int left, right, top, bottom;
|
||||||
|
|
||||||
|
left = monitor->rect.x;
|
||||||
|
right = left + monitor->rect.width;
|
||||||
|
top = monitor->rect.y;
|
||||||
|
bottom = top + monitor->rect.height;
|
||||||
|
|
||||||
|
if ((x >= left) && (x < right) && (y >= top) && (y < bottom))
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
57
src/backends/meta-pointer-constraint.c
Normal file
57
src/backends/meta-pointer-constraint.c
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2015 Red Hat
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||||
|
* 02111-1307, USA.
|
||||||
|
*
|
||||||
|
* Written by:
|
||||||
|
* Jonas Ådahl <jadahl@gmail.com>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
#include "backends/meta-pointer-constraint.h"
|
||||||
|
|
||||||
|
#include <glib-object.h>
|
||||||
|
|
||||||
|
G_DEFINE_TYPE (MetaPointerConstraint, meta_pointer_constraint, G_TYPE_OBJECT);
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_pointer_constraint_init (MetaPointerConstraint *constraint)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
meta_pointer_constraint_class_init (MetaPointerConstraintClass *klass)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
meta_pointer_constraint_constrain (MetaPointerConstraint *constraint,
|
||||||
|
ClutterInputDevice *device,
|
||||||
|
guint32 time,
|
||||||
|
float prev_x,
|
||||||
|
float prev_y,
|
||||||
|
float *x,
|
||||||
|
float *y)
|
||||||
|
{
|
||||||
|
META_POINTER_CONSTRAINT_GET_CLASS (constraint)->constrain (constraint,
|
||||||
|
device,
|
||||||
|
time,
|
||||||
|
prev_x, prev_y,
|
||||||
|
x, y);
|
||||||
|
}
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user