From 4fc8bdb084ab7b509dc9b6b1acb2dae5a6a288a0 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Fri, 22 Oct 2021 18:51:20 +0200
Subject: [PATCH] Use the new scrcpy icon

Use the new icon designed by @varlesh:
<https://github.com/Genymobile/scrcpy/pull/1987#issuecomment-949684080>

Attempt to use the SVG, and fallback to PNG.
---
 app/meson.build       |   6 ++++++
 app/src/icon.c        |   6 ++++--
 app/src/screen.c      |   7 +++----
 data/icon.svg         |  16 ++++++++++++++++
 data/icon_256x256.png | Bin 0 -> 6530 bytes
 release.mk            |   4 ++++
 run                   |   4 +++-
 7 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 data/icon.svg
 create mode 100644 data/icon_256x256.png

diff --git a/app/meson.build b/app/meson.build
index 698120a5..5d7495a9 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -151,6 +151,12 @@ executable('scrcpy', src,
            c_args: [])
 
 install_man('scrcpy.1')
+install_data('../data/icon.svg',
+             rename: 'scrcpy.svg',
+             install_dir: 'share/icons/hicolor/scalable/apps')
+install_data('../data/icon_256x256.png',
+             rename: 'scrcpy.png',
+             install_dir: 'share/icons/hicolor/256x256/apps')
 
 
 ### TESTS
diff --git a/app/src/icon.c b/app/src/icon.c
index 9944727e..81d0ab47 100644
--- a/app/src/icon.c
+++ b/app/src/icon.c
@@ -14,9 +14,11 @@
 
 static const char *const scrcpy_icons[] = {
 #ifdef PORTABLE
-    NULL, // TODO
+    "icon.svg",
+    "icon.png",
 #else
-    NULL, // TODO
+    PREFIX "/share/icons/hicolor/scalable/apps/scrcpy.svg"
+    PREFIX "/share/icons/hicolor/256x256/apps/scrcpy.png"
 #endif
 };
 
diff --git a/app/src/screen.c b/app/src/screen.c
index 3cd4329f..8a2748a9 100644
--- a/app/src/screen.c
+++ b/app/src/screen.c
@@ -5,9 +5,8 @@
 #include <SDL2/SDL.h>
 
 #include "events.h"
-#include "icon.xpm"
+#include "icon.h"
 #include "scrcpy.h"
-#include "tiny_xpm.h"
 #include "video_buffer.h"
 #include "util/log.h"
 
@@ -405,10 +404,10 @@ screen_init(struct screen *screen, const struct screen_params *params) {
         LOGD("Trilinear filtering disabled (not an OpenGL renderer)");
     }
 
-    SDL_Surface *icon = read_xpm(icon_xpm);
+    SDL_Surface *icon = scrcpy_icon_load();
     if (icon) {
         SDL_SetWindowIcon(screen->window, icon);
-        SDL_FreeSurface(icon);
+        scrcpy_icon_destroy(icon);
     } else {
         LOGW("Could not load icon");
     }
diff --git a/data/icon.svg b/data/icon.svg
new file mode 100644
index 00000000..0ab92c2a
--- /dev/null
+++ b/data/icon.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" version="1.1">
+ <path style="opacity:0.2" d="m 16.846877,12 c -1.116351,0 -2.227419,0.912229 -2.015075,2 l 3.122973,16 -5.596557,11.109375 C 11.959876,41.871734 11.885244,42.336988 12.177176,43 c 0.278672,0.632897 0.998812,1 1.747448,1 H 24 34.075375 c 0.748637,0 1.468777,-0.367103 1.747448,-1 0.291932,-0.663012 0.217302,-1.128266 -0.181041,-1.890625 L 30.045225,30 33.168198,14 c 0.212344,-1.087771 -0.898724,-2 -2.015075,-2 H 24 Z"/>
+ <path style="fill:#cccccc" d="m 16.846877,11 c -1.116351,0 -2.227419,0.912229 -2.015075,2 l 3.122973,16 -5.596557,11.109375 C 11.959876,40.871734 11.885244,41.336988 12.177176,42 c 0.278672,0.632897 0.998812,1 1.747448,1 H 24 34.075375 c 0.748637,0 1.468777,-0.367103 1.747448,-1 0.291932,-0.663012 0.217302,-1.128266 -0.181041,-1.890625 L 30.045225,29 33.168198,13 c 0.212344,-1.087771 -0.898724,-2 -2.015075,-2 H 24 Z"/>
+ <rect style="opacity:0.2" width="40" height="32" x="4" y="6" rx="2" ry="2"/>
+ <path style="fill:#e4e4e4" d="m 4,33 v 2 c 0,1.108 0.892,2 2,2 h 36 c 1.108,0 2,-0.892 2,-2 v -2 z"/>
+ <path style="opacity:0.1" d="m 11.494141,15 a 1.5,1.5 0 0 0 -0.832032,0.255859 1.5,1.5 0 0 0 -0.40625,2.082032 l 3.13086,4.654297 C 10.404945,24.606192 8.4012371,28.299159 8.0019531,32.460938 7.9284599,34.000879 9.5546875,34 9.5546875,34 H 38.40625 c 0,0 1.672856,-3.38e-4 1.591797,-1.617188 -0.416529,-4.131451 -2.415618,-7.796833 -5.380859,-10.394531 l 3.126953,-4.65039 a 1.5,1.5 0 0 0 -0.40625,-2.082032 1.5,1.5 0 0 0 -1.125,-0.228515 1.5,1.5 0 0 0 -0.957032,0.634765 l -3.072265,4.566407 C 29.78649,18.814887 26.990024,18 24.001953,18 c -2.989385,0 -5.786177,0.815488 -8.183594,2.230469 l -3.074218,-4.56836 A 1.5,1.5 0 0 0 11.787109,15.027344 1.5,1.5 0 0 0 11.494141,15 Z"/>
+ <path style="fill:#077063" d="M 6,5 C 4.892,5 4,5.892 4,7 V 33 H 44 V 7 C 44,5.892 43.108,5 42,5 Z"/>
+ <path style="opacity:0.1;fill:#ffffff" d="M 6,5 C 4.892,5 4,5.892 4,7 V 8 C 4,6.892 4.892,6 6,6 h 36 c 1.108,0 2,0.892 2,2 V 7 C 44,5.892 43.108,5 42,5 Z"/>
+ <path style="fill:none;stroke:#30dd81;stroke-width:3;stroke-linecap:round" d="M 15.1998,21.000026 11.5,15.5"/>
+ <path style="fill:none;stroke:#30dd81;stroke-width:3;stroke-linecap:round" d="M 32.799764,21.000026 36.5,15.5"/>
+ <path style="fill:#30dd81" d="m 24.002386,17.000034 c -8.355868,0 -15.2214979,6.346843 -15.9999669,14.460906 C 7.9289259,33.000882 9.5544999,33 9.5544999,33 H 38.406003 c 0,0 1.672201,-3.35e-4 1.591142,-1.617185 C 39.182807,23.305596 32.331836,17.000034 24.002386,17.000034 Z"/>
+ <path style="opacity:0.2" d="m 16,25 a 1.9999959,1.9999959 0 0 0 -2,2 1.9999959,1.9999959 0 0 0 2,2 1.9999959,1.9999959 0 0 0 2,-2 1.9999959,1.9999959 0 0 0 -2,-2 z m 16,0 a 1.9999959,1.9999959 0 0 0 -2,2 1.9999959,1.9999959 0 0 0 2,2 1.9999959,1.9999959 0 0 0 2,-2 1.9999959,1.9999959 0 0 0 -2,-2 z"/>
+ <path style="fill:#ffffff" d="M 15.999996,24.000008 A 1.9999959,1.9999959 0 0 1 17.999992,26.000004 1.9999959,1.9999959 0 0 1 15.999996,28 1.9999959,1.9999959 0 0 1 14,26.000004 1.9999959,1.9999959 0 0 1 15.999996,24.000008 Z"/>
+ <path style="fill:#ffffff" d="M 31.999996,24.000008 A 1.9999959,1.9999959 0 0 1 33.999991,26.000004 1.9999959,1.9999959 0 0 1 31.999996,28 1.9999959,1.9999959 0 0 1 30,26.000004 1.9999959,1.9999959 0 0 1 31.999996,24.000008 Z"/>
+ <path style="fill:#ffffff;opacity:0.2" d="M 11.494141 14 A 1.5 1.5 0 0 0 10.662109 14.255859 A 1.5 1.5 0 0 0 10.115234 16.001953 A 1.5 1.5 0 0 1 10.662109 15.255859 A 1.5 1.5 0 0 1 11.494141 15 A 1.5 1.5 0 0 1 11.787109 15.027344 A 1.5 1.5 0 0 1 12.744141 15.662109 L 15.818359 20.230469 C 18.215776 18.815488 21.012568 18 24.001953 18 C 26.990024 18 29.78649 18.814887 32.183594 20.228516 L 35.255859 15.662109 A 1.5 1.5 0 0 1 36.212891 15.027344 A 1.5 1.5 0 0 1 37.337891 15.255859 A 1.5 1.5 0 0 1 37.910156 16.001953 A 1.5 1.5 0 0 0 37.337891 14.255859 A 1.5 1.5 0 0 0 36.212891 14.027344 A 1.5 1.5 0 0 0 35.255859 14.662109 L 32.183594 19.228516 C 29.78649 17.814887 26.990024 17 24.001953 17 C 21.012568 17 18.215776 17.815488 15.818359 19.230469 L 12.744141 14.662109 A 1.5 1.5 0 0 0 11.787109 14.027344 A 1.5 1.5 0 0 0 11.494141 14 z M 35.033203 21.369141 L 34.617188 21.988281 C 37.477056 24.493668 39.433905 27.993356 39.943359 31.945312 C 39.986866 31.783283 40.008864 31.598575 39.998047 31.382812 C 39.601372 27.448291 37.768055 23.938648 35.033203 21.369141 z M 12.970703 21.373047 C 10.220358 23.959215 8.3822757 27.496796 8.0019531 31.460938 C 7.9920657 31.668114 8.0150508 31.844846 8.0585938 32 C 8.5570234 28.027243 10.515755 24.509049 13.386719 21.992188 L 12.970703 21.373047 z"/>
+</svg>
diff --git a/data/icon_256x256.png b/data/icon_256x256.png
new file mode 100644
index 0000000000000000000000000000000000000000..b96a1aff9b842976bae652c6fc22af7daed8bbf2
GIT binary patch
literal 6530
zcmeAS@N?(olHy`uVBq!ia0y~yU}OMc4mJh`hM1xiX$%aKo}Mm_Ar-gY&gCo-N!@nb
z_;E6eQpYAPCniCGn?g(+N*zjF3p%`5WWQF*O<-~2xcR-+HYNVVp|XO+BZZPr1yclh
zXKS!HF|`ONSg-i(Rv;-VG2!<svAdq-LX+ZFS%t>_|8Kd!*oMjTd-?mn*SBB&ZfW5l
zz~V?Xw4|uCH@YBv{f?vS_AdUj?7sZl|5^-Dt=SFPjoF9pz5eH4oAfuntdH-;QxVyM
ztD0&J3=CCF>n)D6ym=!m{2;M>>V0*+4~h@H#S~63Z0Y&1z~;>sos<c&BKw2SJW6LN
z|IOLRdO)YHsPEJKMXw&cmlZb(`k}O6aRx(#na&P-s~3r(V)fq_C>*yl{I``ui6Klt
zI^eGHxy^fj9s6s@SlD~a>>}e8+dI?W@qJP|-cWhvTD{)gofUixvmg#^%5KhHGLiEL
ztJ})ezie&Z3Gh6a^l<tMscjQ(EquV3A+}C%o#<lrbe{wJcPzW|`Ah$&+MxdrtKEMG
zA6L+45oa)dA@D-=n%`VO7oDmYTQ&jN9WM8uK7Yr{#MSWgj_8X>a}|Lq#*JE0zqoH4
zke_wjltYDK+F{cruUXdw_cB_zv)2{HA5mfvVBmZZ^=MX5KjRUWnp1bhS@;<;+n8d4
zR~a_U6YREgeZVk*Z=L2<2?zE6J8uh^Ff3`#_A+IA@ZxuxToYSENrCUmV+^-`?b#^n
z$n0=Pw%G~9e;4z?iid$gQ!tB*je&uOVW0>{W{}klj0_A33=9ks3=9lx3CUKj=hc^=
zaVUzEcCrl?o1A>YMrGQuhcXXh9?W^6{Dkc}2hV|XJPZE+5|~wG(;K&Q!?}*gt2<2+
z<84Z#HwqkGU}*77rutlCTjj@|3EKQ?_}ds)++~n)wt2bn?`mn*9g3T?uU&GUtsE#J
zmH6SAhT${ar>xKUo(u3ew6a~eR?p}AOKsy(1!*SX4fPhso;^A8B!AM1*aI;V4Yzm_
zZnR%aV~x5m{9@t;j@G2*1v$QzpUjVZJuD&7FpFnF?FpNzl}fkYI2fOw=dt`-;|!TC
z=C?Qv=c*mKHfhd>6=yR4awbbOy!;X^pCWQ#dUo;4m9IpqmK2HhYQ%fxJ@w8AIa)L;
zVCSrPYfol~6ntM>s3B$DoP6uVo7Nk}d<A+1emlZ-go~fNd=)Y)H2Y4l#0EnVwgqC$
z5*uqf11DH+Sm)G`fBZ(*RFlnS%j+}(cK21O{aRS?hNVySc!+#_-&YC6XJ?<XJU_GL
z)i1fjhpnd_WVn*Vko-Bk!*RA2%Z8l_<~%>Tw|+g`mhPV#uv>wLHRS$R@uU+QuN<G6
zeCHDL!3mm9`3?W?{@A-Zfg#JVA<%kyS7Vv6;fX3Y?pVje>+Y|}^$v8=YEO>X{@%Gm
z_xO#gXZFkp+}w8TT^u8GKsO`LpJ)l&D9QY?1v8JY5_)yK&PK!|w#O+b`?~$j^BLFX
zCue*5eJDsgQ5|T&uvNn0ctn1Y_5LG^5{%DZO}VCewpexM6NxvSO+mNC;uX_mcJH#_
zGTdq+AJZE1XigL3iVS&&{c{(JvDYjyaC<V9x%N}fy?s2cON}hj+G76)ik1BRTA-IG
z-*AfOfZ?ghZPSiL$$UAk)!WXrH|TF*gjQqn*RF$W?2li%Wb;7gQA`u#iVv|3d9VNI
zy#K~2@lJ3?;H=K=?4h5^?tflx+&ist?a9WxY|%}|B5Vng{567kg&*!p^ROO!6Vay>
zY>`~1XMT&p>{5^F{<bgY`IlS&eSV1HN)E%LfCWcBEo68vVl2b;#g9KAHn61U!y>)Y
zVnO{+j$YBe8(;JOuBCOyuY3;ChyS1bKVE;VzWsmRagO|_D*HR{%$G{I^7Z+RmHS@v
zGfzm+n4tYNz#(!qlkDO>E6d#&c<%|hCfh~33G=I5n6fCO>fs%!S+TRTFa9epbbr#i
z_0jnU^G!cK$lAzm;_^fG&u%NXYV9?z-)rVxw+~O$Z#~Gc=5T8Hj1=d_jk}}rgHPPO
z`1$DNY`5pSOHZ<%{1Q~T?I>%W?w{R1jX$IpMvD8CAKx-hv*&K^ov-EF7rp*}V4lGo
zj+A`13wALQTyr+nXc*kf(AY3-&L*bZ&n5j|mN7~ndNJ{Q_=PW*dcw5Jf@jvLIsaMn
z=abKI5B=F&0_XQI7^+Pw`Rko@!tjtVTS9+2Q`zZnTUSMA{3trnoqj!_y`WNP&*`pK
zlP`xgX2r}%nsQ^6^N%;deak1kKEClv?$Y%-xmOj>bf?WZx$5`a%V#S7FFv`hewx$y
z<_1QOEshz}OPv|{n-?C~aaUXQcg%OauL}j|AGx?CSn`$bk7?(kG)@Zaf4tYbMkRZD
z;r#V$>htfPTDQMjX!kz@hR$}T#LpQoPD*69F)`I{*0s0URJ%c)w?f-T#@+kllII)s
z_wP6)obX5N_L5a8g~DfcoC<wZS5_z3_E70zvEY~co&RTF{BQX`_MiEmeDzS(PW$e9
zwf}FXubmNM@<!68)MO^x9$`JXdr6tUE!T4zWo`c$R{A%2Wo?T(j|2C2rV`Kij8OB!
zRSyFe=yY4T%rF;up=0ybJwMvZ_;j(3-XclU$S*#nQnrdB8se)>U*DaUGxgd1lly1e
zGuMlG?>~N~OGavQ^-ha7hTC8NPr5m4*L>rvr`FY9*NIQnFFwSuWa;~J0^O5a=TDPk
zWAEtse`w1>hwVpPzq~jY>Xv<V*{7y}l$uq7`=4g~_!7qTXXXzR*>|Nr>raYI7dZP`
zbj@PVc-2d_CztK5wfuKF)Gf9?`__{8eF0D37dJ3^*ou5uq8P@*x<i0hct?ERiMQq}
zmi)dvxqb2(>vlhnSDJ?|m(KZ6eMcnh&9VdYXWCoWvpa7#d8rbY=yApR^Ec^rzn)3R
z|4e(i`hL>&{~<hE`RB7UUzo+%5nHI;&UEMR+IZ0uLgjZP=Q?TId_1f9XL{D=qs#x?
z5bIkVr2J>@kKKDivVZMsUEa6!LhZ_9?wd<_z6-U-mQJtWFx>F0xb$Sm$)yGc3^T)6
zw|Se3%$Oj*e)h$92jOqWXPaz19-BHZK|1|tuutv>6=m^tD-XAHvJ0>HyeV3nUHIEE
z@9SUh%PpF>_M8F3&prY9pq!rp2{FwJ8SblHzET?O>-)%ejaSH%ihI*Ov)y4^=A(3O
z)ybuu?LFZMYYfjSswW*0Rg`Er#_Ld%wEV|}*FP<~Cue$<&U$J6G|OnM)aF~o>kkx^
zE>&F?ar5i@Ij@|vP6bLd+*!?3d5xDfZJWWxqbL6s9OV+(&B?y`)4t|sZR|F0Hm!QS
zUw6ipY4Z&jq<L7`#3PMGB1&%`+WyQ!Ywe-jvfXlw+qXWA{hv`<`ZtlmOomG(+FHcJ
z^wq2WjfZd6-2ToHCb75gY;Mlahw}=rSRQS^GGn#@gY?5arZ-kCY`B*8C70Fy>(1P@
zFMk#1gjU}Y<T>DGev*aTx$*Hu4J+&B<Wn1484oa|$a68YDju1Xyz13wzC?y?M_*o6
z5b2wHU}MPN#^nYK(fq8>E<H%%VZFka|LIZ0A%+BoXM5ErymCH#+JGm(TIR5xBzGc%
z0mJ7$KIuBXqxt4)3P(2muCkY4;5pDTyY)Wj@{^&O8Zy?&MWIH#mG)e049q)hoA33n
zscz2KG5dJqYBk%hUYEmmJ#CB!7^FU5nC7wg?K1sqX{$de@Ll+kFiBi`j-$bs<_rl2
zo(1z5^IOfWmUXY6BG)^;{LQ1Mi`>{}a&45|VkyMNz&ykG?=^OFtvb65ru=s|r*oQA
zMF$%+{+oR$fg#GQAuh99TK3+-&Zh0(-|*X=-0?6Vq3mqbtIcWxYzthOA0)4kzPI}L
z^Q$*MRpcf_-<fT|*ndjq)xKNeYztJGUkJR^y_eYjsGYOp_~xmpUFJH68B7uw-ZDMA
z^rUHt+ub^m{o8yNJbZb?U*3CZS>xvfhHrTci_3MgO&*#{CD-|$<22c`KH<!|rv?nw
zW)19SEhbT~4zIMm6({>4V}pxDLa+tT0Xg1=_m3ZQ${$X!Pda+D=s=yGj-gG%l;S0?
zi{vF5Y$Y9{6Yu;lNnG_YRXDU$gF(S);lbYXm;IJ?nwuYHcyol|&URhHeMPIJ^nW+B
z>2oiYczR;R9#sQ|YJ&#3lif#o<$oQp3!kj{Gp_i2{{4lz_VNoiW#7NdZ(g_b|D8RK
z_v8Q1<f>c0<coK;%Ky1h4Yzx4zk4xNYoqQ?-<`SVV}AE-`%@B;Q@ry2RRf#a8RhMt
z+zcfex_B4FUa(ncJw2~vVax88)3wEV`&?DS^@F^BHRoMY-!F1$a_C8oJmGmq=Km{-
z$=N)u<kKtGU-F7<L2;pJJ8XW`WU5)VooQxVah1U>Csyh9lK4aX*1ldr&VOGY+yC+_
zw{*aZ?GL|lOSdlnv;S;XaG%4wr+X*WvemI4DF`Y^xfdkSAjP}jwpaY(b^n*FQaL#(
z<#0dyiJ;iMm9lCVSn^};cwBGUwlU;&{T=<A>6Lr5HvX$+Ow_nwTPMilkjwVr$#qXQ
z^N;H$>R3Ac|2c8y`M=AmnI;>^7`*y6`}dRlRq6tt{<cp#=Xm9=TZu{QyD#&(nFG2R
zZ8j)g$=KW<lK=hVtc_bcS6#QS({%ax`hnqokzFN^!&krK&Djxq<AY2i<J!Nk40sNF
z>D(`w{_5`UjjLEr3YosW^ju|X#lMF1xrVprXMT(ED)tghQaS#wLHyLF6B|vxvmIdY
zNxpG^@vHPg)i=M4mxk|G)|{%AxM|hY9`AUMTg&!nDPO;|;I+G<0fVaaf!Kxfz64cX
zTYGXgceZNn$#!+Y{7G9L)iOnyHzbFzQppYOyC^K=_v6!t!fEdoMBG!mV|a+0Z9xcg
zfpNsQ$yJkjr>|IYZTt25OM4h=%KxUHy#3X*Gd%LfpV#FadaaBa7a6QtDkr+T`rZBg
zH|V|4=ihnVPdcmKKI1(r&9J@k%A*L+y|;t+JHB{&>dv*7tOpoo9sm0HhShYr_?=Oo
zT%N|(2X%*wY{_Gop8rRya<|t`>wxo%r+zH``Se?+43C2++XIP5k>&gD^K`2J`{J|y
z<P@7g@A};<Dw#F@{$2Fst=9Edr%LYLYnbWeKl%CW1O_g{hJ(?s(*Hf(b@BMy7@6Ag
zr<;~^{wjMLcUJnqGw$E2xtHIs|D$ottMB}&+bys4#BU0*G6!@q+Eg1kPc#3^BN-;-
z`abmCWRuAI7L%4$GFN=|*tI10*Y;C;lh!=>wdYsr!RP+zm*)O6Xb3ZBu)7}nZn?ej
z7L7S-wQ`>Se?H!&(iv5=bCTR0v-r<!2XX@{cE(IH+xzc0@2oxQU2S6SCn|a(YV{9T
zT63^nxW#7hF`-F<XJ`4<!XVxouUzw|NAE9udhD!y#<xZmDGp|V+YhcbcYZnU`?@?b
z$7;WO&%`-w2{*WBlxT3WU6{po!SK@RcfIyI&wqcMr>cJ4`L@`Fhw`V^cwPAsEZ=GW
z`rur<7mOUa2XZF{eA*bA8&&brhWBRK>-3YBECzdWXWSQgBVsJib|H$*;LG2P$n<}`
z7UJqQYxf*wsjhHWkQEj>_a`>XTywRK{~yUkGvCCnsbqd&c451F+0FDM>6xn+Pe0db
z_;CI~!=kB~LKg(?rJdVp{-;?&!XaDoz?MfPH?RGjopfP(UFpeF{?c-MA9h?8`TO})
z|C4H!?eFe)$6ifNoMqmic-*P?){*rIvVZSSo$n*}xp;g1hIc2=^PKv=`Q-C!@3||!
zg|P7~Fy(3B|8qh9^V77&DNj2c4yUB5z3*K1UF&<-X@6hakN*E6Tvxa1{r_MSzqsDq
zAb+3lyb!PSA2%a5>hj!9tGK6B=y4$TdPsl6?OEx+D-W$tw6Sp8_Up|r>GtY1-<lb3
z++uL65mGnXxAy!^=`TC;7cUX!u3Ei)#)Nv?87}wQH=jtZx9Pnpc;(4`(P{x!MGJ0+
z``i{nMYqcynLXL|#O&!wr@Z96*USFt9X~d0{_Oka4`pN$yXQ6<G%VZwf7`xO)fJf~
zi`A#?<oT5(xO3j|%lr8j>hiRQPdi}v@Wzc_eU7tvnG+bk-r0S`{adg7*>xOqIs~S#
z*YUi<Ual*$d#}cyW6q3u(%oJ09jwQfnA&Zx^W5;7D_){uEl<LS>WN8<{Wn~Ea{ui#
zR{1**lfxEuZT=_m-F)|@q#arblNNFrPN=@Q-tyRMKVGSC-z7kr9(-Icbd=fths^hD
zem4}`n=>DLV?C?>GB5t7`SKgWcf#(ZowfVgYW93vey;OV&I~*2f=dfsBpP&i7Q`Ni
z`Is^-^Xkhksl$BMlAg``IhP$|XFjt0#)I`tM?3AJ`@P?0MJQ~M-LANO>5XMhw~M5U
zqqSca+Xc^6n<sqWdEg<26tjkTnssKezu6b49((zX<%=JG3*(7gh8ly#JHA}Hb+?{@
zr;X7@rS!Lj7@NX&Mw>bVN1GXpo$OOs*0cHi(h>v-e)#z&Xx=Zb1`(e%UQ1>^z4_^`
z0t@pD=ebGZ9e3;N)TKSyr?BLEJiha0(;0R)h3Sl6&T=aC--=O@2~hbH*LC_<f<!|M
z+X3N*9e&&zQ&(Pn`Q%%_1xU!?-|5gtSI>HwEpYiEck1}JwQY<iQW=7~FCDoYF(JpH
z^TQnx`2cR_2`3qTys0-=kqY=^<B-b7<G{!Kpj#qt#Yv}0jIM`|Up`q>I^!Deg5O^8
zh38Et@o3D{yt?v=@kM?%g`YwRVG}C6wI}gtNX}dGZn`uN^MqZDF)eOSn<XZuINa1{
zTf1nVr2)f9-Ut6o>fbQ1bfu>pHF`C10|%QzDRW83hhv#m4nNyxPC0g}SdU>E<MV+3
ze+pD215D2S?_PW0(_Wq}S$4ek{VL2{wZEnxnUp+5oX6qZ^~T-nzbl8&U<i;neD26a
z+fF+R{sUs|O=VsY4$WMPCR8{G^4t)2lug=Ops`{tPeZ1(!E~$TzXI;>5xB^6qj6%-
zfw0)Wjq&b5^ZS`sUiP}fcgJJ7|NMJ(4-c_Un)T>Wl9rARi^Ik_HkFf}oTy!=c~<(s
z&f@12QXDRZgoGSmcw)q`Y{?RqPBxK~GmX<d*6nF$e6eEf+NGB+1*ymc@Eq@#U%om0
z{Hd@%1`TQ}R;?21ZIG7t<cMlsv`FdW%J|q=-=gQ%JPTNjA8ZV-th8j<ba-c4_o8;l
zpwR))$Ptv7lE+ZVA;mCB%3)p>&w>>zUc|ESGQ6~?`}5=WD#M2L`~O)<Ix;(0@yS|E
zSs}%IV@u}c9FPKmtW(aWY!|j>U;h^x8aiFjf<fixi?Yt_Q;x2$wpV|D=flF!@cQP?
z;&iF&Q)clTIC=Ew(}`VOUELfC4AX++;^JOEd15jx+sl{jLhu1w9i2B*XU&>*U(kc$
zjQfhY_nVrV(+hQ9W_g+Ja{s>YuCbBPv+(fn|2+*%3D<V~f4*gliGHmtSlT(E<=^4z
z>gxRgQBhGX2bdBrEt~J;?|)vB?Wny|c<`#A_-1{DO_`UMH3+Nwy%FAJ7A}~<(6j4z
zcz1XA_uLyB4(?C9%VA-?BB0*z4XcDv!Gi;Zj*gD{&!0W}weR=4-3z_aKR-L0XkGT^
zN7?mtu`E;0r_ZnbW_#R+cjwf(bKjocdcgEz$XbpaFS9(SzN(q6zf`M*ftCB9(gHb)
zv~LrtnPO!^*2QJ<Im|Z8b>q6b$w*}Ct{XcFlPiCJd+WY(&yQ-$8=brE<ykCfT3)Zg
z<u#XuoxOd<mJfH|JUn^-%AAJHvw9llD;%2qM5l{$FN3t9Q@C<{;fCb93!^W;S^0a@
z-zi>MS*zY(TN}-}V)~LLD)Fk%XRKqZdX@EvkKIF3X_39WZPk|+2FB3fLmOS(oYPh=
zSdd`Wb==OP?9C0G6qA%qc0V38Telps?0vLR`jo}86FDbTI5|ISbsgI$P*t*CVY6cJ
z{C`U|q;@~fsjK@}uXuQ2nre@Dyz|BzZ(|O`Pkb2Q?f>6cL+lHaLhiXg`x})u{@&Se
zed0@jdH-%bm8oJ32u}WQ9w;;G;r@vq1LpqdR8TouDbki^(I3aqGP6GSvzC#(kgAHa
zB9~LKh~UNf6aH5GvTsbf@TTj4O9;cff3E|0W~s7^GB6*wG{4NUm8*d<#!)e2+Wi1V
zgND@_ED{V$0!2kcrYsaNvF42E;<~Wo)926TizT+4ytlXdz8h;s3@0aN1*6Ae6*aYe
zZCnj8t?G_~Tu#w%Zf}3@GTSWo&V+v#IO5~)hxf@?HeF@tRXFmiTwZ?uO}_2t9=4mT
zOJsVtI(&T`i|_@vkH?Q6{~XI$BX~SuiT#sB-fZRXIAtsf7@jlU(v*q5J2}2yxS#uy
zywR?MGuBV?^7ZAtwK@I#zow?9Yz>*K`d?!oM}YFNS)p%4`V#vu>3<CtDBj&&E`NA0
z(>tTIl#~{xuLlet-za@|=VxO3viA?Amv!5+NPcH(P&;s0-Y7_3q&4kDZ%O;CAbxhy
z*mypjU3I(JFUe&2y=D1zh~v$=50=YvC*GT|^3iFPpXa{C@oj%s@SZ)Sb+caC_ZLZ=
glub!o`Sq**y}}%h+e)eV3=9kmp00i_>zopr04#ywj{pDw

literal 0
HcmV?d00001

diff --git a/release.mk b/release.mk
index e327654c..2319f21e 100644
--- a/release.mk
+++ b/release.mk
@@ -94,6 +94,8 @@ dist-win32: build-server build-win32
 	cp "$(WIN32_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp data/scrcpy-console.bat "$(DIST)/$(WIN32_TARGET_DIR)"
 	cp data/scrcpy-noconsole.vbs "$(DIST)/$(WIN32_TARGET_DIR)"
+	cp data/icon_256x256.png "$(DIST)/$(WIN32_TARGET_DIR)/icon.png"
+	cp data/icon.svg "$(DIST)/$(WIN32_TARGET_DIR)"
 	cp prebuilt-deps/ffmpeg-4.3.1-win32-shared/bin/avutil-56.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp prebuilt-deps/ffmpeg-4.3.1-win32-shared/bin/avcodec-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp prebuilt-deps/ffmpeg-4.3.1-win32-shared/bin/avformat-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
@@ -110,6 +112,8 @@ dist-win64: build-server build-win64
 	cp "$(WIN64_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp data/scrcpy-console.bat "$(DIST)/$(WIN64_TARGET_DIR)"
 	cp data/scrcpy-noconsole.vbs "$(DIST)/$(WIN64_TARGET_DIR)"
+	cp data/icon_256x256.png "$(DIST)/$(WIN64_TARGET_DIR)/icon.png"
+	cp data/icon.svg "$(DIST)/$(WIN64_TARGET_DIR)"
 	cp prebuilt-deps/ffmpeg-4.3.1-win64-shared/bin/avutil-56.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp prebuilt-deps/ffmpeg-4.3.1-win64-shared/bin/avcodec-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp prebuilt-deps/ffmpeg-4.3.1-win64-shared/bin/avformat-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
diff --git a/run b/run
index 628c5c7e..dc24d1b9 100755
--- a/run
+++ b/run
@@ -20,4 +20,6 @@ then
     exit 1
 fi
 
-SCRCPY_SERVER_PATH="$BUILDDIR/server/scrcpy-server" "$BUILDDIR/app/scrcpy" "$@"
+SCRCPY_ICON_PATH="data/icon.svg" \
+SCRCPY_SERVER_PATH="$BUILDDIR/server/scrcpy-server" \
+"$BUILDDIR/app/scrcpy" "$@"