From 5979c5f77805b1614160eb060bfff9fdd4eb7c9d Mon Sep 17 00:00:00 2001
From: Jonas Kulla <Nyocurio@gmail.com>
Date: Sat, 29 Nov 2014 17:23:42 +0100
Subject: [PATCH] Add placeholder application icon

---
 CMakeLists.txt  |   1 +
 assets/icon.png | Bin 0 -> 1263 bytes
 assets/icon.svg |  76 ++++++++++++++++++++++++++++++++++++++++++++++++
 mkxp.pro        |   3 +-
 src/main.cpp    |  27 ++++++++++-------
 5 files changed, 96 insertions(+), 11 deletions(-)
 create mode 100644 assets/icon.png
 create mode 100644 assets/icon.svg

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cf8e74..025fb29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -230,6 +230,7 @@ set(EMBEDDED_INPUT
 	shader/blurV.vert
 	shader/simpleMatrix.vert
 	assets/liberation.ttf
+	assets/icon.png
 )
 
 if (RGSS2)
diff --git a/assets/icon.png b/assets/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..906f73b5be0b9742247122b5284a99ce2d4bb7a2
GIT binary patch
literal 1263
zcmc(f|2q>19LGOw8VW7Ux5S#Kn<>JKB^g;vESB@-!ps##z9!c4C0m(`xQvQjk|XP=
zt|zfX-3%#T(w^2Sr_xitEu|c3nw|cNdq2<n{d%7FkMAGezXZ{J^>od30YH!D=fhYb
z<-4^JD|xXs|2=>PE+`;`s#dF4n*U8GBv_+in-%Qc3`k9&Y=qJPkfp$fTu}4D6AK7U
z(9we0P?*U9MK)XtfjtD!)PPtbygLT3GGX6V(9i(iO)!`QJ~n_wLt89}Szw_L;~XGa
zLL3Q{C*cbZ1a#p0!f6^rIfAPtEb?H2162&zjR!|_kj8`C1|V;M^zG1_0C;04@`rd=
zsMtfg3inn9vdv)7_ksZ<qvWb|^h>Ach}l80QYWov8S(SmKsi?8sfa@gnrB&t>6-nv
zTJINn7Xc6qnvYjVxU@cOB6OOvHd;e#H9pwrE~Cp2t&Jg`9!7t90mgkf>ISj1#p}2%
zM8xAk1O3W#1LY}kI%X8yh8rmv{Z`tG4}QoNRHHxJRp}O7Ia+XKr^GfwQTZpS(S4{1
zQ+;;prK0{Xftj+(!z97WDd%zAk>rKd!Mj~rg$_n%?2T7{l~s3_+OKh8M%Mnc^qjYo
z_xtB3H;<OpcS{!f>_n{U-^@!w$c?qx2af%!BAoelOk(P1a-N85EE!K!;M?0s1+sxH
z3D<6rhf`|mLP(LKOg_h=7NuNPb_hFI#KB3klOG>UdWeNMl_WepExc#Z<I!^-s@O(Q
zMD2eiXzF0S4r>}#XecJWQeS!@aCi1MGTH4p6|MZp7}C;@9{l;dIg8^W)cd07c<Sph
z*_6uwr*Sk{E~N9NRmB-gR?1cm_F#KQ*zu@H72B}O#QI|EEOrec-uuF~E0zKMbg8W&
zYnp<1D@v6;cIZoWHXm(X&dEt97*8ha%{0LM67rbqDT6H--&5=WX+uW}eabXQKg~(I
z6Zb)N(8|x|_#yvInv?nNQuHj>S}(tFMzX3p&+dSO{3#|^%YyIJz6rT#5ET>~l{J(r
zOgfkJ?+|O=e+Z51LU6YWJqz=!sc!y~unUJtb1~Cc!E7IQ7?rwi;~Se3DhVEQ!kLym
zyRZ2c^Rjny-K4e79g&ku1ahxc<q1N}H&VXk5zPTp?W$rzNGH<l?|Gv18ZY{vhhFO)
zOM?RyO1Do6PQh49&GLGdkP_HpDlfjiq=R(rOC1?%7}T#(j1(teWc42?Uk!Vna@}_A
zlFQr(7)DY!R^H|PS-1Y%4srRbQ;dZ_Tn$_1?4{?EC!$^qYU9b7m(L>0rR%kfbPu7L
z63Kq<liucB!oH%inyMKtp;NizekkoP<y5Z8v#A*JSlv3_yE@PC)aJ@J3FA&LbmQ`x
zpNw&m3yB%xYPHq%XY8zqkL<RV(yX?a$UFAzOak+{$(qD&TUry_qs`%_UCHhJs$O@|
z-0pL?$5j=#^VUAwp7^An#$gk?skiP<FZ*?ky?dA@uZV78UP5gid8F78d@ptFyj`iX
sz6j4;DpYn0@XQ?Bt5Ns1lyxkt5gw~HUNChPdwu^b8kO#I-8+W+A64u5XaE2J

literal 0
HcmV?d00001

diff --git a/assets/icon.svg b/assets/icon.svg
new file mode 100644
index 0000000..f6a8aa9
--- /dev/null
+++ b/assets/icon.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="icon.svg"
+   inkscape:export-filename="/home/Ancurio/programming/C++/mkxp/assets/icon.png"
+   inkscape:export-xdpi="13.53801"
+   inkscape:export-ydpi="13.53801">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3821">
+      <stop
+         style="stop-color:#00ff88;stop-opacity:1;"
+         offset="0"
+         id="stop3823" />
+      <stop
+         style="stop-color:#00ff86;stop-opacity:1;"
+         offset="1"
+         id="stop3825" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="313.90532"
+     inkscape:cy="517.4865"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="978"
+     inkscape:window-height="599"
+     inkscape:window-x="264"
+     inkscape:window-y="516"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#00ff87;fill-opacity:1;stroke:#000000;stroke-width:24;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="M 373.75 285.9375 C 262.88803 285.9375 173.03125 375.82553 173.03125 486.6875 C 173.03125 597.54947 262.88803 687.40625 373.75 687.40625 C 484.61197 687.40625 574.5 597.54947 574.5 486.6875 C 574.5 375.82553 484.61197 285.9375 373.75 285.9375 z M 373.75 400 C 421.61925 400 460.4375 438.81825 460.4375 486.6875 C 460.4375 534.55675 421.61925 573.34375 373.75 573.34375 C 325.88075 573.34375 287.09375 534.55675 287.09375 486.6875 C 287.09375 438.81825 325.88075 400 373.75 400 z "
+       id="path2985"
+       inkscape:export-xdpi="13.79744"
+       inkscape:export-ydpi="13.79744" />
+  </g>
+</svg>
diff --git a/mkxp.pro b/mkxp.pro
index 0ee0547..78aee3e 100644
--- a/mkxp.pro
+++ b/mkxp.pro
@@ -202,7 +202,8 @@ EMBED = \
 	shader/blurV.vert \
 	shader/simpleMatrix.vert \
 	shader/tilemapvx.vert \
-	assets/liberation.ttf
+	assets/liberation.ttf \
+	assets/icon.png
 
 SHARED_FLUID {
 	DEFINES += SHARED_FLUID
diff --git a/src/main.cpp b/src/main.cpp
index cd2ca59..23fc918 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,6 +26,9 @@
 #include <SDL_ttf.h>
 #include <SDL_sound.h>
 
+#include <unistd.h>
+#include <string.h>
+#include <assert.h>
 #include <string>
 
 #include "sharedstate.h"
@@ -37,9 +40,7 @@
 
 #include "binding.h"
 
-#include <unistd.h>
-#include <string.h>
-#include <assert.h>
+#include "icon.png.xxd"
 
 static void
 rgssThreadError(RGSSThreadData *rtData, const std::string &msg)
@@ -236,6 +237,16 @@ int main(int argc, char *argv[])
 		return 0;
 	}
 
+	/* Setup application icon */
+	SDL_RWops *iconSrc;
+
+	if (conf.iconPath.empty())
+		iconSrc = SDL_RWFromConstMem(assets_icon_png, assets_icon_png_len);
+	else
+		iconSrc = SDL_RWFromFile(conf.iconPath.c_str(), "rb");
+
+	SDL_Surface *iconImg = IMG_Load_RW(iconSrc, SDL_TRUE);
+
 	SDL_SetHint("SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS", "0");
 
 	SDL_Window *win;
@@ -256,14 +267,10 @@ int main(int argc, char *argv[])
 		return 0;
 	}
 
-	if (!conf.iconPath.empty())
+	if (iconImg)
 	{
-		SDL_Surface *iconImg = IMG_Load(conf.iconPath.c_str());
-		if (iconImg)
-		{
-			SDL_SetWindowIcon(win, iconImg);
-			SDL_FreeSurface(iconImg);
-		}
+		SDL_SetWindowIcon(win, iconImg);
+		SDL_FreeSurface(iconImg);
 	}
 
 	EventThread eventThread;