From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=46904 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PiAyS-0005V4-BY
	for qemu-devel@nongnu.org; Wed, 26 Jan 2011 14:24:13 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <stefan@weilnetz.de>) id 1PiAyP-0006sG-B8
	for qemu-devel@nongnu.org; Wed, 26 Jan 2011 14:24:12 -0500
Received: from moutng.kundenserver.de ([212.227.126.186]:52203)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefan@weilnetz.de>) id 1PiAyO-0006qI-RB
	for qemu-devel@nongnu.org; Wed, 26 Jan 2011 14:24:09 -0500
From: Stefan Weil <weil@mail.berlios.de>
Date: Wed, 26 Jan 2011 20:23:49 +0100
Message-Id: <1296069829-7208-1-git-send-email-weil@mail.berlios.de>
In-Reply-To: <4D40736E.8050601@mail.berlios.de>
References: <4D40736E.8050601@mail.berlios.de>
Subject: [Qemu-devel] [PATCH] Add an qemu icon
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: QEMU Developers <qemu-devel@nongnu.org>

The icon was designed using Inkscape.
It is licensed under GPL version 2 or later.

A bitmap file and code for its usage from SDL is added, too.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 configure             |    1 +
 pc-bios/qemu-icon.bmp |  Bin 0 -> 2118 bytes
 pc-bios/qemu-icon.svg |  117 +++++++++++++++++++++++++++++++++++++++++++++++++
 ui/sdl.c              |    7 +++
 4 files changed, 125 insertions(+), 0 deletions(-)
 create mode 100644 pc-bios/qemu-icon.bmp
 create mode 100644 pc-bios/qemu-icon.svg

diff --git a/configure b/configure
index 210670c..72991e5 100755
--- a/configure
+++ b/configure
@@ -3233,6 +3233,7 @@ DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
 DIRS="$DIRS roms/seabios roms/vgabios"
 DIRS="$DIRS fsdev ui"
 FILES="Makefile tests/Makefile"
+FILES="$FILES pc-bios/qemu-icon.bmp"
 FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
 FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
 FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
diff --git a/pc-bios/qemu-icon.bmp b/pc-bios/qemu-icon.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..94d56603a67be764f6fc571da56168eeeab32030
GIT binary patch
literal 2118
zcmaJ?ze^)Q6n>gyvoZ0^#k-h`CVMFZ7H4;9uGqpNaE)AZHWpi4VQF=6kSS952c(q4
z!hnT>g#iVBB#?vzVvrC*5Q!pkD|ldGk-}o{jhmg>ao5{rf4!OSd*8hG=B@g5QHJMZ
z5$~Vz`Z&7AAPgRS2OR&74|=iV7r-?RD%3y#jGTA^NMwS9$Qu$N@5oy+NrJ>ryg1oD
zPyDh*#z7|2BtaC%8AC>C<gGXl2he~WkpsYw-keBoiKDJ>+0sDmruGqi3wxY_s*e8`
zO?j>k4I|skw+2r}4z}P9wk_onnRTEOXiGBd%KGn4wi44<o2l!<z%VjDU>g~>D1#58
zY##M9^BgmY_)wLM5u7Ebg)jQXW3f?eW%PV2f1bHF3=HWuY@!mF6ws51vvkoXK<Dse
zSU-|0g<ig^S4#t}U$1UFQU*FM2@wyHaRH4pjNVO5PdC*|t)cIz{cLTam%5cP7AAYh
z<~>3@4)pSU{ixUox79|vq_(u3)MfkZp-ERj@m~1A@JXx`YO|fjZc{rb^t7&Cu9vg5
zn66jhPCmvAJfn@ApP?13oiV}t;3-{EyX`Z>Si3;=n_A;|Xc!Bfli|-@YvzOvKOuPE
zc+|^Ucj*FIj@K^QXQ|6nf47NlA5IGitVUC%J@%q{eO~PstEjlFwbqa&TT{DBz0=;x
zI?Zulgby?SbBxnke{nB$tG4ou;hzk~aG^82xjMA!+0r`A@bMRUr!4tB_?xbj2KiRK
zy8Q5|XrUFXFw+aKyqGh0SUVarsONGGBbN&>UkdI=6aSvs-0-yewEfj4-7)U?2*bPS
zrzpNl?YXk_Pcb~tiK)za53;!m_5yR<UcK_j=0s8pz#ALh%AY+ZL6?5WxjYbKc%Ey?
z)+3@W8Q^%Cp%v_`R#ZGf?|6L$<6!TOTq%Hk1v5kf?vcOYufXPAjI>YaoDr8Qq`i60
zhM!{UsRvPkLZaC7=-<cm4&Z~J(4pdvec}PWi_8j-V%H2|jfY71MQ2VTyT#4dCjs9_
ze2+Nal2|uZ=iq4iCOI@X(Fxr3?r6&3#Td`nq9o#zxDvmMa#4j3vpGe0N2MG|jA#f~
b{kmt71HcRPzZ1Z<2GFNO##uJRne^))Mr->?

literal 0
HcmV?d00001

diff --git a/pc-bios/qemu-icon.svg b/pc-bios/qemu-icon.svg
new file mode 100644
index 0000000..56378e2
--- /dev/null
+++ b/pc-bios/qemu-icon.svg
@@ -0,0 +1,117 @@
+<?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="1280"
+   height="1280"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="qemu-icon.svg"
+   inkscape:export-filename="qemu-icon.bmp"
+   inkscape:export-xdpi="2.25"
+   inkscape:export-ydpi="2.25">
+  <title
+     id="title3642">QEMU Icon</title>
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.25"
+     inkscape:cx="-56.591724"
+     inkscape:cy="520"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1912"
+     inkscape:window-height="1145"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <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>QEMU Icon</dc:title>
+        <cc:license
+           rdf:resource="GPL 2 or later" />
+        <dc:date>2011-01-21</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Stefan Weil</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Copyright (C) 2011</dc:title>
+          </cc:Agent>
+        </dc:rights>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,227.63782)">
+    <text
+       xml:space="preserve"
+       style="font-size:1711.86793385px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr;text-anchor:start;fill:#0000ff;fill-opacity:1;stroke:#000000;stroke-width:20.43102074000000101;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans Bold"
+       x="-69.495888"
+       y="988.01501"
+       id="TextO"
+       sodipodi:linespacing="125%"
+       transform="scale(0.96365413,1.0377167)"
+       inkscape:label="#textO"><tspan
+         sodipodi:role="line"
+         id="tspan2839"
+         x="-69.495888"
+         y="988.01501"
+         style="stroke-width:20.43102074000000101;-inkscape-font-specification:Liberation Sans Bold;font-family:Liberation Sans;font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;font-size:1711.86793385px;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%">O</tspan></text>
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:19.74012374999999864;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3617"
+       width="623.61371"
+       height="338.18701"
+       x="788.27362"
+       y="-169.91519"
+       transform="matrix(0.79034946,0.61265629,-0.6723522,0.74023139,0,0)" />
+    <text
+       xml:space="preserve"
+       style="font-size:359.0585022px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:15.89233208;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans Bold"
+       x="776.43433"
+       y="62.486996"
+       id="text2841"
+       sodipodi:linespacing="125%"
+       transform="matrix(0.73775186,0.63648615,-0.66305684,0.78342534,0,0)"><tspan
+         sodipodi:role="line"
+         id="tspan2843"
+         x="776.43433"
+         y="62.486996"
+         style="stroke-width:15.89233208">EMU</tspan></text>
+  </g>
+</svg>
diff --git a/ui/sdl.c b/ui/sdl.c
index f599d42..37bc7de 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -818,6 +818,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
     uint8_t data = 0;
     DisplayAllocator *da;
     const SDL_VideoInfo *vi;
+    char *filename;
 
 #if defined(__APPLE__)
     /* always use generic keymaps */
@@ -846,6 +847,12 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
     vi = SDL_GetVideoInfo();
     host_format = *(vi->vfmt);
 
+    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, "qemu-icon.bmp");
+    if (filename) {
+        SDL_WM_SetIcon(SDL_LoadBMP(filename), NULL);
+        qemu_free(filename);
+    }
+
     dcl = qemu_mallocz(sizeof(DisplayChangeListener));
     dcl->dpy_update = sdl_update;
     dcl->dpy_resize = sdl_resize;
-- 
1.7.2.3