From 5cf747d45dfd76598941b91e47a61e9da71b4d09 Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Fri, 13 May 2022 20:35:34 +0100
Subject: [PATCH] wayland support - add watermark and bug message and pause

this will clearly alert a user they are using e in wayland mode. this
is needed as there seems to be far too much confusion if e is in
wayland or not and when it is people having issues. this makes sure
e's wayland session desktop also has the label in it so it's clear etc.
---
 data/images/meson.build                       |   3 +-
 data/images/wayland.png                       | Bin 0 -> 8742 bytes
 data/session/meson.build                      |  19 +--------
 data/session/wl/enlightenment.desktop.in      |  38 ++++++++++++++++++
 data/session/wl/meson.build                   |  12 ++++++
 data/session/{ => x}/enlightenment.desktop.in |   0
 data/session/x/meson.build                    |  12 ++++++
 src/bin/e_start_main.c                        |  21 ++++++++++
 src/modules/wl_drm/e_mod_main.c               |  20 +++++++++
 9 files changed, 107 insertions(+), 18 deletions(-)
 create mode 100644 data/images/wayland.png
 create mode 100644 data/session/wl/enlightenment.desktop.in
 create mode 100644 data/session/wl/meson.build
 rename data/session/{ => x}/enlightenment.desktop.in (100%)
 create mode 100644 data/session/x/meson.build

diff --git a/data/images/meson.build b/data/images/meson.build
index 5cdafec8e..1ecd95e4b 100644
--- a/data/images/meson.build
+++ b/data/images/meson.build
@@ -2,7 +2,8 @@ install_data([ 'enlightenment.png',
                'test.png',
                'test.jpg',
                'test.edj',
-               'test.svg'
+               'test.svg',
+               'wayland.png'
              ],
              install_dir: join_paths(dir_data, 'enlightenment/data/images')
             )
diff --git a/data/images/wayland.png b/data/images/wayland.png
new file mode 100644
index 0000000000000000000000000000000000000000..30b59d478182e7fc66606f7c17b16aba013b88f1
GIT binary patch
literal 8742
zcmV+>BH7)EP)<h;3K|Lk000e1NJLTq005u>005u}1^@s6i_d2*001BWNkl<Zc-rlq
zd7KpGo&VoYPtWw+_YBN%tAL20C<xvM?Xlj*ctu2$m~~BzQ4=@2QKLy*_m`NBYcw$$
z<C(mSSrriz473*r3JQXp!f+pR-!naZ*YA&~kO6vTs;Zx=?uPliUh|4!rmLT-=TqP7
z`5rKcK@4ILgBZjh1~G^u4Px*S7>DLV051I}9%4XDc+m!*)*u0`5G)HQ0Lp+Nz)+w{
z|L-!O7{~*%fs8oh3jp0fJJ15u=|8nVJ<tqv2rofL?nl$|fLx$S2%!xUFty0$1}cCt
zz(imYFdi78|9d`=)sM6@{8c~*=+X(e8`uP_0oDRrfJWgZWCH=err*mSg%Ghp0w$Mm
zE}&8;+iAcIV1h2?a+0*H0MGz@2`mGa=)|lOUZRR5U|0wdO4WU_g@Br-jRpP%ct;4a
zDT$=Z07e3*0~Z3P=>I=EMfW2F>;XOn766NZZNf`<&;~R{ydvP6z@0!T;1xoAmIOzk
z8aNBMN|$z33RJ1%?~g7WmjQEt_kmr)i({%()3j`$2xu2V1X7xSnx<s|zXxvC4fMx>
zdxa1Yhlu9^P6n<4E(VT{<0zynV!#evD!vLV6JGo_60Z<A5BQdDvTW4%bD?TyMkN8=
zz}vd2`xyAT5Mr+b#47>3I`Pj03J+^z)-}1C;;(%|$<$ZaddFL0=JrN~dpH!h1h@s5
z26%e?x(>Ke2=QJjtKg@BtAXo<5I&oUR}NeOd|Q`%S%<wRRq_xVH48F4u;ryF&G)Sa
zUI1PbUTPC`R=x+!0*>oPbIjKTi$7Hf_<dxo?7z&o{krsY8(PnnIeFB+d?nGk+t7kj
zOsQF|8)9F^c?v_oeVmCK4MSv!Zl*bi;-5g#6lhrloloxj{ur<h_#^PD@X}ym-(~~P
z0+|E+X*)1e2(cnn30SDR{XGW%{utd+I9+#I_K_)a5Fuk|F%2Oyhy)AiX&O%~?2dao
zu8jD%rNy9mHEg}&P~sH+5XOBMgnmhvTmAsV!XPq0xb`g?x_86++adaCs@aJvfG2=C
z!b_J4+kGx@kwM4kRw2Z5suu0m7va)vrz{{Kgy^uuW`m#8zwdhBXTUM~Kko&e*FC=)
zU>s117OSUz<!~C8Tu<KU;h;g!9tbr_QXQ}WH)K~s=?PFW9<mC+-vCXkp<@$tuZ=IY
zx<7y~qabwR7Egof^PufZXj}prxsWpqT$vE4gYFuLZcI7rP`BHj1#ZxM{0dlXAf7l9
zIMIZ_8mrU>)HJOcxL5aj^7PIBju2v(jb7F);I}}@L2uWSz>oF?PBkAxf!l%GkjG&L
z@2Ug}z6s@LL*47(f63%isf4T<5L|$a6{jUybo=me;bmt(dvQ7Nh6z*V*FuPURTA(e
z;HF;x76PsiLcC)W`A!7h1V+XAwI8^h4^I9I(Us=|4+7Jzn+n2tJ1zCF8u$h9R=j|=
zrfClVKR0o`yMz#rs}$S*Ub_?no&i3ziF}#BJ$;Z5AQ!ZUD4YE>@Cx#{ECD-pFewE%
zL6?M&X+DO<F@+|Yv@`dpwj1sPUekB$Z@^EDIuRCdGH~etQfmy=7knG{nZ<+LQHFdy
z%<{VC<2?Pe2;>>~7!%hCBIAMT2q=VT27U<q8TfZ0M5~Pt;+li(zW68|55s@J;d79Y
zGMKJwmhWpma`cedP!pf`1C2@vsQ+&k(58E$b~zrU!1=~ZHx~@|LgC$q&(@2hAY<CT
zz(X=o2|NlsPSd*MbrKpyyUr8k1RRFU8?zJRkms|;;3<O9H$ldUX->RiDE&E1ngf$x
z1kWX@u&ONJR_Yf&g{I}3_*@ehi!Yib;7Z^DAw<;1o8A{^G>)?4pz^!vO~9PXVZt5Y
zDTanmAha@NUJcy&V-UhjmQWpv<5F$_Aw(B4{+C*CxnbnR&~iBh-%3vc2ETw^??C%1
zX#Z7et<6(r_7i(m3n_QXZ(x2kRNVsG=cQ*@CAtcBej_y<Do=^oPwZ4KW75Egf~qqh
z=NoD6g+x<qJ$aB>VD>}1(~^Li4?)w~qd~LweYxc@^x70BSP|sh2(Ag~@jke!Av4d+
zC&FMo<ty0|@G|P&e*n!Q0TD2C26(PaF%@<-jC>VF{27j$599w6GRLI}0V~06sx+nt
z%%^%K-3HWr%mkhw7OG0jn=FU&D`3x?DX@E)Q1v8?x*W1gA<zsh8(`<l5S*JP1T2+_
zt;W%bOmIja0%|@^M&_rDOxzT7LFK7XdmO~pC)q45kRD|Ha%f)-T}vUfFa_<r{&v0u
zGBVA4q6O$k8v<%RjzXqa=|+))Vy=P_kbfa`B$<F(3vB-e5F%}nQM^9^*BI(`HEgd9
zsA-zeG;OS2Vri9pCCKBR8DITls2O4j7RY7hLdgsVBwV?)H(itZ`J*%@AAq|^&mK37
zS|LQ(b^;<(<9~{|L+ak-%S2|_9Oy9ww?ah03sgJ-#BdO$`+pK=9Jo)1qI+TFUt!X_
zaMX{$J%+;;`Q!JO9T-8!j$+M6uBK@vnx>W8se)U9A16>!`3+<i^MT|JZ-!8ZJmXD>
zfXBcI3-+huhuUECe?a6T3%olDD(-;NsZcmZIy$ik)O`#)pM=m`hbQ?mrb4C3RLjN{
z7gF`~L&&ZYFCfo_)e}&!X0t>-&BrOo?AqKzei>a4ffi}UCA8uk$gPAOZ$T^s(Qb&<
zTa*Hq!1(V#Rz8Hgpy><P{RXr@Wrw|;Iw-!<{618jo<%f#7j>WBE2>UWcA%}y3DN6x
zAL-lU4S~N7nV_2>VqvI%9wLhqkODJc^fw{g3AIb0{vGIg1+;n&Z)8K|xsYM9j5?<R
zw!EInj#)QqKHd;sl++Bl6p=3jxC=P9-#_&4LdkiqrwDSVCGN@YdJR_G0yP&w=l?oG
zzKp4m|8L+*QouUrDk!yZTGO@#_B;-RrUCz{_fkv^0s=GR+I<J3X9q+Tw2E<O%hJh&
zr06DSdj!G@oZI}&nK1ELIPsTIbc6Nl<lX|+&w#LCPnTXOQ^U+48iHMO^<sPgW*_2Y
zCX0ZYk4j|q+Q9B;U>ihLgpvf5P6jb7y|iC=Ikatr_8RE=$oh54FMx16XzeC<dmL0w
z-(UZ1So+mK^9#NIB@eh?^D#Q91k{ULZUas=wgFop)Tw4O3r0Zh#c5`Lb;7PYVg0QT
ze%JbC_B;xW_nZG*-o@sfk5~lu`XILM;NMIF?$$faCQSlP)m5*tS1P&*0*Y#$vhtzg
z!u0b2v<8TNp4c^_pM#Y))8*%w&47XKT4;H_uiwrF&Pj?Ftog`BR?`_zGSFIdPxyE>
zYIx`w&~~2;#T1?hS;ew-M*U;)n-Cqz$T$hgEJPq0S3qP@p8*}<Ud_jH;k6dGN<@5K
z2wZ0RQ+|axjd?@h1YH%mJ+g67(;8?jgV-SF4nY0|kZ1C6E8GQ*1DXowB3tr3@0beK
zd=%?pmt4~y?%A36nef3Lu{&Ez#OC$z<%1AeI!L%f)bAN)^Z%e@7x?E7=-VUfjH?_Y
zAaFUdrJ8vJwn4;(hCki)u=zLXlaJRQvaf;aXCY^nBK12RO3j)*8Z@tj*cKyyd;)NT
zBLviZl<JO0rlp4ws*$2ysbL?3JwEV1pZ?^_x)3J*H%#~zOnL+g?@<sjI1h4%nEOoF
z53Nhg@aR^}$8aYk;HA3vYte(-sLm7q%C2mHhBrAZ5UGWTUz!wIh2U1u^1Ad?^Xj*&
z7W}3{MaKfy+DbspM<KE&vvuc1Yl0rdr3I}UAiVMLAYkkZsCg1Lz6h%yf|iF9yPj*3
z1@#NGZIGu$ros~3toL-Z%?myc+2AHYiKV!@Z|DqYy%iena=<>j4oc65f}<fL2ciLJ
z`3#zV2ii78_UtqAM@gh$rg`sIi$bTRFxEt5m;FB}C!l`#Jevbs_gf^O?g_gTCF8hr
zz+-c38`ngr{tp;&fy^81-O-|I2J9FM+rI@`b81P{l2hgLF=Zx&Az(>JWB{`@AFmqi
zQEf&APbR^r_kK@!J46)^j5J?lZGzxu!MLYj?DaAi@!)nU86Ftng`(S&Lo(N~eJI7z
zP&&zi9ohpS%S{lbA*WL*w*kM7k=}lWJmIYn?oJN^W}FCPAA#!A`<K|6xiIW95Tl$W
zU*SD))MN3#H|Jc)w~(+A>VU{rt1HR@uGfb{sv)4}V+dAGJ^B>!4eDcowh*uYMm#80
ztdS;C6(>N2!#xc>!ywQYKbNuSRC#7@7Cp@n-H^ztycq1fYE%NAj?(u0HZ&Q^%mY!T
z_L?Pk!^rdHoDf6O(gP!}ka>Sjq49^Xdp3u5P4htMiN;=>xK3h1Re!^E5++VSU6fvh
z)xfh;aOZ-kQcUV%^YOF7kuc<@<UfzBnNT>|f^3LESHj-B0IoEWHErbe7zUg{s>7WF
z8I@|U*}cKMsUTcXbq=`CHWDL|m3elc;55j#(C0lG0KbwE&r^+PO(O)HjvQm3;so@l
zCt&_0^AZrG;a_@HKa%wVsQx2Nd=JWP>Hu4EvYhN>7Qqe(tW~jsGT`il2&iW~Ur0K%
zt9NBV<`9J!%!0C0jN5+)ti=sO&XOG#4tY_|hKY~CxSJr*1kEqm@GK@nvBjdN?mCDl
znSm#O3-m?>mL*^*M$_$+?TENCAxmK}+H<Kag13sIqai2GNR*6X2(`nO*I?`S<<XmJ
z<ep(Z`CuP9YEak$<|N&O>sxURaDihX@xqfhZkF1dKmeBuvJ|S|(hDFvfv~5i07}jR
z{|g7HxVf<YAIO2AHnkisnkt<#vxtSEW1Y&CR3THfwp%6O3~4E=7JlvOPeKrotw;ij
zQBZlBwGc+{^^~0id&^}4#sM(c<42T0?$wZ437MtRE6*$#*eocYV!rYXAlMGwD^zZZ
z8#%>(u4w}5#pd>?U#&%YTdI+*sAo?8l~AO>JIx;sS!Y4;4U1;z88G1|^6XiQLDyag
zw#vHRtU?+4bmz!Ee?ozo-n9q9OH}X5G|fl0@WvnS(4Pb>K~42gJXvo~R<x&7j#||c
zO!pdck@@Pexa%o`f@#(X82S`8{u)FUMBAX}1JJeug^+O!xJN?faPU+^b`_ML4CRxo
zueWur6b@=JR#(N_%o1=UP;Hyn8u6>YW>yinM#-Z-%cQviDo#>lm%5>7lJ!1PS{-!#
zKAxul(UtNi$o|<yIqz5}V5A4ymfNw@<vIzsne~DvAg3(agQy(@%!AAXlL5-Fk}6LX
z3XTFX6x-oC-g@X|U--rUfgLN$L>94|4#P|$p;^62kbv$S$Vz~K?$e;^tOT8pgOE1_
zJZIWZz}&N~hh6|$)<N_OyH+=;*NE7G38*_D$J+O_3T^O$k+Hz+1P*P=u1mas;UOx$
z1S+nupMb?PAT!6JFbF{NM|Q4mEHX{YumsGb@2TbqdWQc7$G;~ti&e+LgbQ*l638_P
zsxMHNrTx{K^bQX0bL`t*Q7M}>Syfp6dgyxBP6Ac~MP>+Cf}AUBgQ^%O4c?u9hwcU&
zu5YnpR>=)&LN9S&x?xa$jeXmj?M+N_w{3#xXLb^>v@bsOMZgNFCv8CEBe3yosQZmQ
zYB;yTLi5LLs65+z*HAOwaMgLTuEY)$ongKAb}S05tL!!qa_FOnP+tTbB6r0GXieDK
zxW!WfnI=1cdM<_%n>&^kjgeATIr5-<nsvu1)Cpam+D*Vr`UvUuN5Iq{<r?=^^B{Y?
zN%iZscJ3Q&mp__;7b?R8RTqI!99qr3Br(&$-vGf+oY)yt1gs=ok&y{`CZw4tgNjql
zA7w>Du<1EiaXW0AYm9`Y$3lT(DQKnTZf|sM18tWRJ2S)#0n5{tfCwlskw%qsxityW
zvJsk|hMrfT^)qAHJ(+n>bs3<@)^wi+L(jCXezh2M);P5>rDh0NOgbZfc;B_M2cztK
znL1?#ksjDRXMYpSu!%8b<tISyjcV?*d=?ZZpnju4Rq6LeP^ib3`zN6GE&>%PSf0z}
z_^V_fryM*6&T}(PfQo6Dj-NHJgVyJI5wgL!N1t5`Llgz3izXzN1rzRupkoBg0|Nv^
zL(oUm+BgAb!LbiR?)2mkFf$MG478&yxD*OZb`*>FrS#K!bq<Ksnwx_+M8WWFF$VI6
zCw7fs8$=va!P)Wn=8A7bC19jvT_z`oXJkXy!sHOp<%XhxGRa&}In#X6QS%09f8oG?
zi|vrz1dJlL0xG_i*ga;Q2ssJXK?hnPw$-U!ahoBaHLKQr4vc#cO2<RpB8aU?o*h^;
z7F<X7V<KE-K6NS51AFFycF-t2trmJ3O-L`7OnOMfM9DqgTGxXEBw#ZRHq$nqj9~5Z
zL*eM3Lgf_b+zX9=ORgi5Hx#nZ>c@b;46;p*dTpzL_P@mcUAM_@Qu)K6>{{#hmp{Q;
z+2sKQY$4f*M?eiLv*%sIWImb}g<WquI|3`N9hfhBqr`PSPLT-$X2KV-Fzo#&#QLzA
zy0@4sv~sy&_$82ezLlGU!ebJAKpKSGoZJ!33;``n#*WExth*OM!(+)0#R$D9C|(jq
z>9w+jh8cA3hL+d*{=I*#`Ho*jW1#9=7EGOKke}d*il#xN+sPe?#MAeE5zu^LXmk~<
zyAx`@4YAFMyc7!Uz%h`0(Lr~791QyxbLvaepnfStm-VC0mdUgxQ!j}N%BS{ktH$*w
zr^qw!ga{aeSdWtg48+r{hY(PB(Etl=>@|pd0NM_Nf8HUFv+RVY7|ISB=T-h4^9AR@
zR%rUi0Qa*Un%9_rsj`b9!z2L<CR=M6a`1k|!cG#f+o%Ktu-`b)_Q*Jtt!mf>W3Ga#
zXQY(LnGK__HlKFYvJrab4E%QubD+nhVect|qVr5j_Tv&S8whnlV6&41Y!_Yw5>SUT
zjgA9N_J4<`7{<?rDeu4u|Ifm-$S^c6HfELdyaEj-3%gyJP<5efr)vZmQ=w2nvU>Yg
z2>ioI0=Ae5!#FdyK2UGJ9SAZNs`wblv(P`VrwQ7P2GnCv|F)DaW>7jFiVaRh$~`sl
z0JIi`rcZ!QCka?@mVgoa3AjgQ<fby(Y9Rcc@xSl-oBWI^uQms&uQ1kNvuLXMuJ?yL
z_cmyK-{~h=YnFfk`w6(ip0s>rc4`z_R+y90T0PV+GXG+gPlV!I2e4^Np(KIgquwu7
zaK4jIG7Ri7L%>F$-S%bK(Jf!;`nsUgLa|QU0;#&qO2H9VgR7r%0?$nI@yodC_hZ2C
z<dgIRb!G_I1~k~dtjH$ybK_K^rxAh{>Lo(&$VxM_D4hTm{mdFEKF50T(O37>0&VX)
z{Ulra;*+bNn9UB`m!<8}C#a_=y7!u$m!=~M&C8{<G36{}!N@CRF6ANWx7=Fkz#*b#
zvwT6E#UA<y?ZqXa9<SNp$kMvDr7!^#m}%FsR2D3mMd5H5b?2eQOL^BN*0B}jS#{G=
zNBql!u(>avqQ7Y7T1R3e-8J@~h**-&F$g3eokNSDyVk-71yr8_Lm%4jY=~m0z8bO;
z9L5u9hW7W8@if=yCv1nBzWsb?1M*0&z}BVptdow2T}9!Rr9~J*2@p_gg7z&?W}z58
z!vjZO2U-NW*2>V!P!-wb0^F4e&Y-d60r#00+8+UT>bm<_TbCF5TzZVzC8<Tg&Rx*u
zOVGU7B<(;ecAKXVCfuq|70p!BvnIC^CjK0DPJ@=$A?!#jut`_Jm{q~8x*E1w)$M@J
z9jQe=Ee3T<Ao_WN!H1f}I>EX!Wq3wq!=%EIaNKQh(#tUPcTPObO?`!6`X!+75(Abx
zvf&*Yj1_h}g<u;r|5Jf<-v(hnDF>HZ9!t6$F?&Akt3UKW5)fdS9+I(H-K|QkfOK08
z1m-1vo#-wIcaf6l+6ztd?EaPru(;oMVSo#41ne)H3M>PEV`^-S7K5fwF_aRSITMEb
z7D^uM<65<;dD7Fd1HOC`LT}mqO|`)4L<rdGh#HQqgZ9m-u{og*XdhryLG}$W`ZbvH
zB8<HWJbm<l*4oU~3p<7EGRSnq>01HpwM;-gcC!E{BA0EStDl}^RW$`a=>Km<-3DVW
zmzmOQABDPq??0TA3Wx?}D>i=vG_8h?C3b(K1}qTX{_Bg3xL3>ckjzoGF1KT;H2!mv
z+!v{RlT@Akp>Z*^uZPB`A-Z}1>7F7%_SPEM^h=2BhVXJHO#5cw!-4+D2mxz#L(*OX
zhJ4VmJ-Gyog`wR*<f-KW<Jas-k+bg1TnK*LcUh?o-Y+oVmkn50poe4TV0-+$2bw-h
zZa5~?1^(5FJ^YQySHrO|wAX+ZaOxX1;7#Ejm@`HzTRuhx6xBnF>178lvUY&4%o}fk
zkm6Yx-Jd1*p5#M@j*X!0cIpdv1BP<G3=vRxX#mvw?C#TH>@)k*kAm~%`DwC{QwF1d
z4Fx|?*Gf0^z6^UL6D~K5x)SpK)v0e>NFSrQtV%$D*Xg6O$+~B@1w7@DKVyH`qG74|
zJUS&xBPus)%w;g;VVF1<3hyEDVNrf)S(W^go`MlD`4=#DAr$@CW?PEC>ZY4g0<Hnn
z=JIHDvPW@ouU>v_^OF;l?yiG1k3z#L`B;Wbg-Q2A>CY0scH2iX1d_}UOw$_KUc^(H
z*fgnuv0OLVP)a~Op7Ro_i<LUoK>jFjjn!4wKV>G0<6(+T(E4*&_jOqHQ>ghrsXB9p
zE075bp>t;vO~4E(;kW({)=q``J8Yvm@Urk4@2p|Ay#50->^3HOR>(FJo*DZcsIbG*
zA{K?#mHK~gfsX%y9oNE|>9F@c1(JS`?%`|6A)w0*6(_>*S$2QZTHtL{OEdK%dFcfH
zgr)9TeHrOXWr!fN*JOxrhqD_L?t-qB@fJ65P}(S3J}}osRryO6kx9Rz)UI#PfER_=
zTvG!piDrM-^}L!6<XRJKxf!%xQajYD-;Z!+bNr1Ev`~JTeGNq0jrBqdybbMl$p)Uz
zc~;W)Y~2j?A42O~&}{3vvH>vNmDDr=g_kzX$5X&GR1Lh)4ti;V4G@cgE5n(6>e^|o
z`mJC(RGa~uqYxe-?4`9p<0nutIq}LiBZ&B6=R#<h5B@oz*;-{A1D+M$_{HZcZNPn)
z2Q0Gfb^<#g7IaQZbXv^BX?a<;x%C*VT4?n_k5hHfE@)m1-A~(1K7dugD;8I2!Kw1n
z0sJp^ooEL)LeL?5DH4S4jTU{r)v)DS=rWkv9-IfQ8|}X*e*@GlgPyfcJi##Vgz!@5
z7y)%G1m3jgmX=uSEMUnA>V%&4iRf>0d)4@%{b$25J*b|4iW5)pedHkpjuKEmX#O8C
zulEgz3fTS!=-Old;|nxH<O>`_`#+$|<_wwqDkz@}Iirx1Qf)&k@GCt!;w%As>Ha6N
zW7tIC6=+#+KOwqn<%x__h%AMsl{UXrEwKJc*n1l)BW7{%5;8VSQV6JLOg{^JWY7C$
zcb2pU-P>^-P4C)QtQ7Xc=9i%PCs>)bVFGJ_$Kti!by5N%yfgtnLlz*bMduQG`$$K_
z(7n}p0(Q-Vb{mMV#bDP$Xn4TxJLm>}A-st<uu?TC=>uC-aqvB8x3PIqqz3{?NdMBd
zL&FmF88WS#Vb^c4G~~b>UIgZ<xR4S8>ZvzR=$^4kQ2|ZM>`TuIbwD^t)p#xQp-17V
zM7SHa{~02S>|XhD;J=MzJ3A=>5nft=`!JY@Xc%n^)oxU8^fW_seR2pGoChrm<8*b)
zq4l?Ruet&FiSVK<wc4d}b;8RE;C`h#AUF>iKE;+!asItH+^V)0Vo?8XV!dO&dXbu7
z_e+4S!TS*K2#Rw;T{bNAZ@M~Gq&GF#^%OLzj_PaR-$hc<wOG~`Cwd=y7lZ#rTdh_-
z<nl~keg0C0fWk`z_$Ba~x_9sIvZl2|Az`9n=t**|MpQwM?Cu7r{R=kt67>NO2rtUp
zJlG)t5nkGXAEPop*z*_I{0DXRU?c#6t;r>zR%d>|;lYBb?js1kZs#i30C!tG>rDy)
zbrS9X?x3IUnC2alM_}{wY7!Mf9T2V|>F7>C3i}(O?o~Tiw;i}ccv)xH7r5+Pz3{SH
zC!spexberZ`NhPui@Wy>+*ZR80&cOGoS;GdClGkeu9Y<acL^`H#&ukFKVSU@z6YvY
z_ZZaQ1sne;&pa(@t{Aj@P7=Ds$1yF|o1ZNQ;BSK3zuIN{H3N5JM=iM11k_15Uzdb?
zm65RVN3i~JS!!q&!FJh&Ar%l>X@07b7K1(S$?2Tx(F*(sS=*}}76jBuI2ZV?I!TBu
zqg;DGG_E#xTGIL@^t_!K1k|?6+GsQA*bcSN+9mn!0bVj%Se`Zn>_x(VRcaIZUxanH
z!InA3day(TP`3bwN0koXT&*!a+%OV=?XN@Fr+O9j!1tXbpW_7VrH*ewWe5J~GT3oF
zeDSc9hW!n`X<84hFOpK|Tm~T{4U9CIYTx{r>J@AQzJrOD8fi<wUXIBul;#meq2t%E
z_C{F$2ia)+;9Np~18jc|w5_Q{z~H;a(z7~t!j31^)hbJ@25uH!<~d>Wr33+cg=l60
zuc9(@GPVvHegLa(gmu4%=5?~}qiqXpc*1xAk)w8C3p6h2-;NEoL(Ow4!!8=|4se6;
z_TS0gRvsk%+50F)o|@bN<g0(h#(`(L3_3?XCS{R16Q;ZX1#x=Og#EDjWvIPfRoEp6
zJP$l%wv)kOM?jr~Zs0oL7r+>fR8;>7#?L-*GE%S|w)_=p??F-KP95+t@TdL;$Q)4w
z>_x<rf&T)|Po{a0G`J?i_}@dt6luS9Y=fPzLfbD<kZi6Y8%x~>e3%S-FXaiSldu%H
zQ&-7lM;r+=ra<<|5bcKG63~>ib?XG4IDBOT0005uNkl<ZLzYnPO{LovskjH44;OGQ
z@F21Y(vc?()j1lU>!!`$2b$S2NWephSdI)_e-Ef0<dZ2h=~C|rl_~T`6ajS-3SbKI
zeDVq)caU2HdbkUKM}Z|y2bK>z0`?-JM|V!{2F}Fho)c+^C~`Q=<G?)Or8^xKEz<2N
zYd(sA%aDl;)3DZL^Ke28_yTwa_&>c-K-xg0>r>Z!lmM3iw*u3F>?4eLVco%a9(Y5a
z<&t&~>Ank^k3!vJz8N?NC^^iD*9j~^R;euzUYgVSX2jvLE1HiiU^4J^;8I}RVPq#p
zkr^xVk!7!+rNSx3AOZU(;}B&0@Jiib83AOZ*=@v-lS)5E4vSm_>`9dqj6nh#Bccl!
z2Fw6108T}oHK%GQCxD#Iyd3x^a$5b4L|dQ@5->H$D3C{c$LfSU4VZ`waOWlIS@@C3
z0ULl%bi%C%8d5!eH%P$537G+u0;7Nlz$BfVqku}FK=-T@Rozi!UzJXv5!eNMsfSM1
zBWrJ)^o|lo9FAB5_CZRwE)7e83Sg-IGXy9HijX;rIl6<B(aT;7BPT_618v9xp9WpR
z)#?A;0(7O~nd~3|(@T}R^k=v4`Dy!pjuh27h(Qcu5Q7-RAO<mrL0HBA2kigN0cJm&
Q=Kufz07*qoM6N<$g2`!Sng9R*

literal 0
HcmV?d00001

diff --git a/data/session/meson.build b/data/session/meson.build
index 8285b5bbd..1d5cf9255 100644
--- a/data/session/meson.build
+++ b/data/session/meson.build
@@ -1,17 +1,2 @@
-desktop_config = configuration_data()
-desktop_config.set('prefix', dir_prefix)
-desktop_config.set('VERSION', e_version_rev)
-e_desktop = configure_file(input        : 'enlightenment.desktop.in',
-               output       : 'enlightenment.desktop',
-               configuration: desktop_config
-              )
-
-if config_h.has('HAVE_WAYLAND') == true
-	install_data(e_desktop,
-		install_dir  : join_paths(dir_data, 'wayland-sessions'))
-endif
-
-if config_h.has('HAVE_WAYLAND_ONLY') == false
-	install_data(e_desktop,
-		install_dir  : join_paths(dir_data, 'xsessions'))
-endif
+subdir('x')
+subdir('wl')
diff --git a/data/session/wl/enlightenment.desktop.in b/data/session/wl/enlightenment.desktop.in
new file mode 100644
index 000000000..75d85cc2a
--- /dev/null
+++ b/data/session/wl/enlightenment.desktop.in
@@ -0,0 +1,38 @@
+[Desktop Entry]
+Type=Application
+Name=Enlightenment (Wayland)
+Name[ca]=Enlightenment (Wayland)
+Name[de]=Enlightenment (Wayland)
+Name[el]=Enlightenment (Wayland)
+Name[eo]=Enlightenment (Wayland)
+Name[fi]=Enlightenment (Wayland)
+Name[fr]=Enlightenment (Wayland)
+Name[gl]=Enlightenment (Wayland)
+Name[ja]=Enlightenment (Wayland)
+Name[ko]=Enlightenment (Wayland)
+Name[ms]=Enlightenment (Wayland)
+Name[pl]=Enlightenment (Wayland)
+Name[ru]=Enlightenment (Wayland)
+Name[sr]=Просвећење (Wayland)
+Name[tr]=Enlightenment (Wayland)
+Comment=Log in using Enlightenment (Version @VERSION@)
+Comment[ca]=Iniciar sessió amb Enlightenment (Versió @VERSION@)
+Comment[da]=Log ind med Enlightenment (Version @VERSION@)
+Comment[de]=Anmelden und Enlightenment verwenden (Version @VERSION@)
+Comment[el]=Είσοδος με το Enlightenment (Έκδοση @VERSION@)
+Comment[eo]=Ensaluti pere de Enlightenment (Versio @VERSION@)
+Comment[es]=Iniciar sesión usando Enlightenment (Versión @VERSION@)
+Comment[fi]=Kirjaudu käyttäen Enlightenmentiä (versio @VERSION@)
+Comment[fr]=Ouvrir une session Enlightenment (Version @VERSION@)
+Comment[gl]=Iniciar sesión usando Enlightenment (Versión @VERSION@)
+Comment[it]=Accedi con Enlightenment (Versione @VERSION@)
+Comment[ko]=Enlightenment 로그인(버전 @VERSION@)
+Comment[ms]=Daftar masuk menggunakan Enligtenment (Versi @VERSION@)
+Comment[pt]=Iniciar sessão no Enlightenment (Versão @VERSION@)
+Comment[ru]=Войти используя Enlightenment (Версия @VERSION@)
+Comment[sr]=Пријавите се за коришћење Просвећења (издања @VERSION@)
+Comment[tr]=Enlightenment kullanarak giriş yaın (Version @VERSION@)
+Icon=@prefix@/share/enlightenment/data/images/enlightenment.png
+TryExec=@prefix@/bin/enlightenment_start
+Exec=@prefix@/bin/enlightenment_start
+DesktopNames=Enlightenment
diff --git a/data/session/wl/meson.build b/data/session/wl/meson.build
new file mode 100644
index 000000000..b52ff38a9
--- /dev/null
+++ b/data/session/wl/meson.build
@@ -0,0 +1,12 @@
+desktop_config = configuration_data()
+desktop_config.set('prefix', dir_prefix)
+desktop_config.set('VERSION', e_version_rev)
+e_desktop = configure_file(
+  input         : 'enlightenment.desktop.in',
+  output        : 'enlightenment.desktop',
+  configuration : desktop_config)
+
+if config_h.has('HAVE_WAYLAND') == true
+  install_data(e_desktop,
+    install_dir : join_paths(dir_data, 'wayland-sessions'))
+endif
diff --git a/data/session/enlightenment.desktop.in b/data/session/x/enlightenment.desktop.in
similarity index 100%
rename from data/session/enlightenment.desktop.in
rename to data/session/x/enlightenment.desktop.in
diff --git a/data/session/x/meson.build b/data/session/x/meson.build
new file mode 100644
index 000000000..a73278605
--- /dev/null
+++ b/data/session/x/meson.build
@@ -0,0 +1,12 @@
+desktop_config = configuration_data()
+desktop_config.set('prefix', dir_prefix)
+desktop_config.set('VERSION', e_version_rev)
+e_desktop = configure_file(
+  input         : 'enlightenment.desktop.in',
+  output        : 'enlightenment.desktop',
+  configuration : desktop_config)
+
+if config_h.has('HAVE_WAYLAND_ONLY') == false
+  install_data(e_desktop,
+    install_dir : join_paths(dir_data, 'xsessions'))
+endif
diff --git a/src/bin/e_start_main.c b/src/bin/e_start_main.c
index 722063339..d0edb9ef4 100644
--- a/src/bin/e_start_main.c
+++ b/src/bin/e_start_main.c
@@ -566,6 +566,27 @@ main(int argc, char **argv)
    env_set("E_START", argv[0]);
    putenv("E_START_MANAGER=1");
 
+   if ((!getenv("DISPLAY")) && (!getenv("E_WL_FORCE")))
+     {
+        printf("***************************************************************\n");
+        printf("*  You are probably starting Enlightenment in wayland DRM/KMS *\n");
+        printf("***************************************************************\n");
+        printf("                                                               \n");
+        printf("  Wayland support is experimental. It may work for you.        \n");
+        printf("  It may not. If you wish you help out then please do, but     \n");
+        printf("  for a proper experience use Enlightenment in X11.            \n");
+        printf("                                                               \n");
+        printf("  If you do not want this pause and message, please set        \n");
+        printf("  the following environment variable:                          \n");
+        printf("                                                               \n");
+        printf("    E_WL_FORCE=drm                                             \n");
+        printf("                                                               \n");
+        printf("  Example:                                                     \n");
+        printf("                                                               \n");
+        printf("    E_WL_FORCE=drm enlightenment_start                         \n");
+        printf("                                                               \n");
+        sleep(10);
+     }
    for (i = 1; i < argc; i++)
      {
         if ((!strcmp(argv[i], "-h")) || (!strcmp(argv[i], "-help")) ||
diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index 61807a698..f9302fd09 100644
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@@ -738,6 +738,12 @@ _drm2_randr_apply(void)
    if (nh > maxh) nh = maxh;
    if (nw < minw) nw = minw;
    if (nh < minh) nh = minh;
+
+     {
+        Evas *e = ecore_evas_get(e_comp->ee);
+        Evas_Object *o = evas_object_name_find(e, "__e_wl_watermark");
+        if (o) evas_object_move(o, nw - 40 - 16, 16);
+     }
    printf("RRR: set vsize: %ix%i, rot=%i\n", nw, nh, ecore_evas_rotation_get(e_comp->ee));
    ecore_drm2_device_calibrate(dev, nw, nh);
    rot = ecore_evas_rotation_get(e_comp->ee);
@@ -986,6 +992,20 @@ e_modapi_init(E_Module *m)
    efl_event_callback_array_priority_add(e_comp->evas, arr,
                                          EFL_CALLBACK_PRIORITY_BEFORE, NULL);
 
+     {
+        Evas_Object *o;
+        char buf[PATH_MAX];
+
+        o = evas_object_image_filled_add(ecore_evas_get(e_comp->ee));
+        evas_object_name_set(o, "__e_wl_watermark");
+        e_prefix_data_concat_static(buf, "data/images/wayland.png");
+        evas_object_image_file_set(o, buf, NULL);
+        evas_object_move(o, w - 40 - 16, 16);
+        evas_object_resize(o, 40, 40);
+        evas_object_pass_events_set(o, EINA_TRUE);
+        evas_object_layer_set(o, EVAS_LAYER_MAX);
+        evas_object_show(o);
+     }
    return m;
 }