* [Qemu-devel] QEMU icon @ 2011-01-26 19:18 Stefan Weil 2011-01-26 19:23 ` [Qemu-devel] [PATCH] Add an qemu icon Stefan Weil 2011-01-27 6:24 ` [Qemu-devel] " Mulyadi Santosa 0 siblings, 2 replies; 14+ messages in thread From: Stefan Weil @ 2011-01-26 19:18 UTC (permalink / raw) To: QEMU Developers Since some time, I urgently wanted to have an icon for QEMU. As I did not find one, I tried to design one, and here is the current result: http://qemu.weilnetz.de/qemu-icon.svg. The following patch adds the icon and SDL related code to QEMU. More patches will add an installer for Windows which also uses the new icon. My website http://qemu.weilnetz.de/ already includes two installer executables and also uses the new QEMU icon as favicon.ico. If you like it, you may use the icon for qemu.org or any GPL 2 conforming purpose, too. My full code is (as always) available from http://repo.or.cz/w/qemu/ar7.git. It should be easy to add a new command line option which allows choosing any icon file, so several QEMU instances could use different icons. I did not add this, because I think that the UI related command line options need some redesign. Kind regards, Stefan Weil ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Qemu-devel] [PATCH] Add an qemu icon 2011-01-26 19:18 [Qemu-devel] QEMU icon Stefan Weil @ 2011-01-26 19:23 ` Stefan Weil 2011-01-26 19:29 ` [Qemu-devel] Re: [PATCH] Add a QEMU icon Stefan Weil 2011-01-27 6:24 ` [Qemu-devel] " Mulyadi Santosa 1 sibling, 1 reply; 14+ messages in thread From: Stefan Weil @ 2011-01-26 19:23 UTC (permalink / raw) To: QEMU Developers 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 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Qemu-devel] Re: [PATCH] Add a QEMU icon 2011-01-26 19:23 ` [Qemu-devel] [PATCH] Add an qemu icon Stefan Weil @ 2011-01-26 19:29 ` Stefan Weil 0 siblings, 0 replies; 14+ messages in thread From: Stefan Weil @ 2011-01-26 19:29 UTC (permalink / raw) To: QEMU Developers Am 26.01.2011 20:23, schrieb Stefan Weil: > 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> > --- > Sorry, the subject line was wrong. please fix it before committing the patch. Thanks, Stefan Weil ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] QEMU icon 2011-01-26 19:18 [Qemu-devel] QEMU icon Stefan Weil 2011-01-26 19:23 ` [Qemu-devel] [PATCH] Add an qemu icon Stefan Weil @ 2011-01-27 6:24 ` Mulyadi Santosa 2011-01-27 21:18 ` Stefan Weil 1 sibling, 1 reply; 14+ messages in thread From: Mulyadi Santosa @ 2011-01-27 6:24 UTC (permalink / raw) To: Stefan Weil; +Cc: QEMU Developers On Thu, Jan 27, 2011 at 02:18, Stefan Weil <weil@mail.berlios.de> wrote: > Since some time, I urgently wanted to have an icon for QEMU. > As I did not find one, I tried to design one, and here is the > current result: http://qemu.weilnetz.de/qemu-icon.svg. Nice job Stefan! :) anyway, may I suggest something? What if the big O which is colored red and the "EMU" is colored blue? Big Red is somewhat more eye catching and means "daredevil", kinda alike FreeBSD red baby devil :) -- regards, Mulyadi Santosa Freelance Linux trainer and consultant blog: the-hydra.blogspot.com training: mulyaditraining.blogspot.com ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] QEMU icon 2011-01-27 6:24 ` [Qemu-devel] " Mulyadi Santosa @ 2011-01-27 21:18 ` Stefan Weil 2011-01-28 18:53 ` [Qemu-devel] [PATCH v2] ui: Load QEMU icon from SDL user interface Stefan Weil 2011-01-28 22:07 ` [Qemu-devel] " Blue Swirl 0 siblings, 2 replies; 14+ messages in thread From: Stefan Weil @ 2011-01-27 21:18 UTC (permalink / raw) To: Mulyadi Santosa; +Cc: QEMU Developers Am 27.01.2011 07:24, schrieb Mulyadi Santosa: > On Thu, Jan 27, 2011 at 02:18, Stefan Weil <weil@mail.berlios.de> wrote: >> Since some time, I urgently wanted to have an icon for QEMU. >> As I did not find one, I tried to design one, and here is the >> current result: http://qemu.weilnetz.de/qemu-icon.svg. > > Nice job Stefan! :) > > anyway, may I suggest something? What if the big O which is colored > red and the "EMU" is colored blue? Big Red is somewhat more eye > catching and means "daredevil", kinda alike FreeBSD red baby devil > :) Hi, thanks for your suggestion. http://qemu.weilnetz.de/icon/ shows several color variations and uses a red/blue favicon for the web page. I'll split my patch in a technical part (code, Makefile) and a separate icon part (this second patch will be delayed until I get more feedback - or maybe someone else wants to create another icon). Regards, Stefan ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Qemu-devel] [PATCH v2] ui: Load QEMU icon from SDL user interface 2011-01-27 21:18 ` Stefan Weil @ 2011-01-28 18:53 ` Stefan Weil 2011-01-29 12:43 ` Andreas Färber 2011-02-16 20:15 ` [Qemu-devel] [PATCH v3] ui/sdl: Load optional QEMU icon Stefan Weil 2011-01-28 22:07 ` [Qemu-devel] " Blue Swirl 1 sibling, 2 replies; 14+ messages in thread From: Stefan Weil @ 2011-01-28 18:53 UTC (permalink / raw) To: QEMU Developers; +Cc: Anthony Liguori Load an optional QEMU icon file. If there is no icon file named qemu-icon.bmp in QEMU's default search path, QEMU will run with the usual system default icon. A matching icon file will be loaded and used by X Windows managers or MS Windows while a QEMU instance is running. SDL requires icon files in 32x32 bmp format. v2: The first version of this patch also included qemu-icon.bmp and rules to handle this file. That part will now be published in a separate patch as soon as the QEMU community has chosen a common QEMU icon. The SDL code here is useful to try different icons. Cc: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> --- ui/sdl.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) 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 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [PATCH v2] ui: Load QEMU icon from SDL user interface 2011-01-28 18:53 ` [Qemu-devel] [PATCH v2] ui: Load QEMU icon from SDL user interface Stefan Weil @ 2011-01-29 12:43 ` Andreas Färber 2011-01-29 14:48 ` Stefan Weil 2011-02-16 20:15 ` [Qemu-devel] [PATCH v3] ui/sdl: Load optional QEMU icon Stefan Weil 1 sibling, 1 reply; 14+ messages in thread From: Andreas Färber @ 2011-01-29 12:43 UTC (permalink / raw) To: Stefan Weil; +Cc: Anthony Liguori, QEMU Developers Hi Stefan, Am 28.01.2011 um 19:53 schrieb Stefan Weil: > Load an optional QEMU icon file. If there is no icon file named > qemu-icon.bmp in QEMU's default search path, QEMU will run with > the usual system default icon. > > A matching icon file will be loaded and used by X Windows managers > or MS Windows while a QEMU instance is running. > > SDL requires icon files in 32x32 bmp format. > > v2: > The first version of this patch also included qemu-icon.bmp > and rules to handle this file. That part will now be published > in a separate patch as soon as the QEMU community has chosen > a common QEMU icon. The SDL code here is useful to try > different icons. > > Cc: Anthony Liguori <aliguori@us.ibm.com> > Signed-off-by: Stefan Weil <weil@mail.berlios.de> Might to explain this in more detail, please? A .bmp file is a device- independent bitmap. The whole point of Windows' icon format was to be device-dependent from 16x16 to 64x64 (or 128x128?) resolution and 2- to 32-bit color spaces. So what does SDL do with it, and if SDL is limiting us here can't we add a .ico file and call the corresponding Win32 API function directly instead? Regards, Andreas ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [PATCH v2] ui: Load QEMU icon from SDL user interface 2011-01-29 12:43 ` Andreas Färber @ 2011-01-29 14:48 ` Stefan Weil 0 siblings, 0 replies; 14+ messages in thread From: Stefan Weil @ 2011-01-29 14:48 UTC (permalink / raw) To: Andreas Färber; +Cc: QEMU Developers Am 29.01.2011 13:43, schrieb Andreas Färber: > Hi Stefan, > > Am 28.01.2011 um 19:53 schrieb Stefan Weil: > >> Load an optional QEMU icon file. If there is no icon file named >> qemu-icon.bmp in QEMU's default search path, QEMU will run with >> the usual system default icon. >> >> A matching icon file will be loaded and used by X Windows managers >> or MS Windows while a QEMU instance is running. >> >> SDL requires icon files in 32x32 bmp format. >> >> v2: >> The first version of this patch also included qemu-icon.bmp >> and rules to handle this file. That part will now be published >> in a separate patch as soon as the QEMU community has chosen >> a common QEMU icon. The SDL code here is useful to try >> different icons. >> >> Cc: Anthony Liguori <aliguori@us.ibm.com> >> Signed-off-by: Stefan Weil <weil@mail.berlios.de> > > Might to explain this in more detail, please? A .bmp file is a > device-independent bitmap. The whole point of Windows' icon format was > to be device-dependent from 16x16 to 64x64 (or 128x128?) resolution > and 2- to 32-bit color spaces. > > So what does SDL do with it, and if SDL is limiting us here can't we > add a .ico file and call the corresponding Win32 API function directly > instead? > > Regards, > Andreas Hi Andreas, SDL offers only one function to set the icon for the window manager. This function takes a SDL_Surface * parameter, and there is only one SDL function to get an SDL_Surface from a file: SDL_WM_SetIcon(SDL_LoadBMP(filename), NULL); See http://www.libsdl.org/docs/html/sdlwmseticon.html and http://www.libsdl.org/docs/html/sdlloadbmp.html for details. Of course it is also possible to use another API to set the icon, but this would require different code for X, Win32, MacOS (?) and maybe others. The SDL solution is very simple and works sufficiently good, so I don't think we need support for the native APIs even if they might result in slightly better looking icons. Regards, Stefan ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Qemu-devel] [PATCH v3] ui/sdl: Load optional QEMU icon 2011-01-28 18:53 ` [Qemu-devel] [PATCH v2] ui: Load QEMU icon from SDL user interface Stefan Weil 2011-01-29 12:43 ` Andreas Färber @ 2011-02-16 20:15 ` Stefan Weil 2011-03-20 12:11 ` [Qemu-devel] " Stefan Weil 2011-04-01 19:54 ` [Qemu-devel] " Aurelien Jarno 1 sibling, 2 replies; 14+ messages in thread From: Stefan Weil @ 2011-02-16 20:15 UTC (permalink / raw) To: qemu-devel; +Cc: Anthony Liguori Load an optional QEMU icon file. If there is no icon file named qemu.bmp in QEMU's default search path, QEMU will run with the usual system default icon. A matching icon file will be loaded and used by X Windows managers or MS Windows while a QEMU instance is running. SDL requires icon files in 32x32x4 bmp format. v2: The first version of this patch also included qemu-icon.bmp and rules to handle this file. That part will now be published in a separate patch as soon as the QEMU community has chosen a common QEMU icon. The SDL code here is useful to try different icons. v3: White pixels are now used for transparency. This needs a 16 colour bmp file. Cc: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> --- ui/sdl.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ui/sdl.c b/ui/sdl.c index 47ac49c..f5dbc93 100644 --- a/ui/sdl.c +++ b/ui/sdl.c @@ -816,6 +816,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 */ @@ -848,6 +849,18 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) vi = SDL_GetVideoInfo(); host_format = *(vi->vfmt); + /* Load a 32x32x4 image. White pixels are transparent. */ + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, "qemu-icon.bmp"); + if (filename) { + SDL_Surface *image = SDL_LoadBMP(filename); + if (image) { + uint32_t colorkey = SDL_MapRGB(image->format, 255, 255, 255); + SDL_SetColorKey(image, SDL_SRCCOLORKEY, colorkey); + SDL_WM_SetIcon(image, NULL); + } + qemu_free(filename); + } + dcl = qemu_mallocz(sizeof(DisplayChangeListener)); dcl->dpy_update = sdl_update; dcl->dpy_resize = sdl_resize; -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Qemu-devel] Re: [PATCH v3] ui/sdl: Load optional QEMU icon 2011-02-16 20:15 ` [Qemu-devel] [PATCH v3] ui/sdl: Load optional QEMU icon Stefan Weil @ 2011-03-20 12:11 ` Stefan Weil 2011-04-01 19:54 ` [Qemu-devel] " Aurelien Jarno 1 sibling, 0 replies; 14+ messages in thread From: Stefan Weil @ 2011-03-20 12:11 UTC (permalink / raw) To: Anthony Liguori; +Cc: qemu-devel Am 16.02.2011 21:15, schrieb Stefan Weil: > Load an optional QEMU icon file. If there is no icon file named > qemu.bmp in QEMU's default search path, QEMU will run with > the usual system default icon. > > A matching icon file will be loaded and used by X Windows managers > or MS Windows while a QEMU instance is running. > > SDL requires icon files in 32x32x4 bmp format. > > v2: > The first version of this patch also included qemu-icon.bmp > and rules to handle this file. That part will now be published > in a separate patch as soon as the QEMU community has chosen > a common QEMU icon. The SDL code here is useful to try > different icons. > > v3: > White pixels are now used for transparency. > This needs a 16 colour bmp file. > > Cc: Anthony Liguori <aliguori@us.ibm.com> > Signed-off-by: Stefan Weil <weil@mail.berlios.de> > --- > ui/sdl.c | 13 +++++++++++++ > 1 files changed, 13 insertions(+), 0 deletions(-) > > diff --git a/ui/sdl.c b/ui/sdl.c > index 47ac49c..f5dbc93 100644 > --- a/ui/sdl.c > +++ b/ui/sdl.c > @@ -816,6 +816,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 */ > @@ -848,6 +849,18 @@ void sdl_display_init(DisplayState *ds, int > full_screen, int no_frame) > vi = SDL_GetVideoInfo(); > host_format = *(vi->vfmt); > > + /* Load a 32x32x4 image. White pixels are transparent. */ > + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, "qemu-icon.bmp"); > + if (filename) { > + SDL_Surface *image = SDL_LoadBMP(filename); > + if (image) { > + uint32_t colorkey = SDL_MapRGB(image->format, 255, 255, 255); > + SDL_SetColorKey(image, SDL_SRCCOLORKEY, colorkey); > + SDL_WM_SetIcon(image, NULL); > + } > + qemu_free(filename); > + } > + > dcl = qemu_mallocz(sizeof(DisplayChangeListener)); > dcl->dpy_update = sdl_update; > dcl->dpy_resize = sdl_resize; Ping. No comments? No commit? Regards, Stefan W. ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [PATCH v3] ui/sdl: Load optional QEMU icon 2011-02-16 20:15 ` [Qemu-devel] [PATCH v3] ui/sdl: Load optional QEMU icon Stefan Weil 2011-03-20 12:11 ` [Qemu-devel] " Stefan Weil @ 2011-04-01 19:54 ` Aurelien Jarno 1 sibling, 0 replies; 14+ messages in thread From: Aurelien Jarno @ 2011-04-01 19:54 UTC (permalink / raw) To: Stefan Weil; +Cc: Anthony Liguori, qemu-devel On Wed, Feb 16, 2011 at 09:15:40PM +0100, Stefan Weil wrote: > Load an optional QEMU icon file. If there is no icon file named > qemu.bmp in QEMU's default search path, QEMU will run with > the usual system default icon. > > A matching icon file will be loaded and used by X Windows managers > or MS Windows while a QEMU instance is running. > > SDL requires icon files in 32x32x4 bmp format. > > v2: > The first version of this patch also included qemu-icon.bmp > and rules to handle this file. That part will now be published > in a separate patch as soon as the QEMU community has chosen > a common QEMU icon. The SDL code here is useful to try > different icons. > > v3: > White pixels are now used for transparency. > This needs a 16 colour bmp file. > > Cc: Anthony Liguori <aliguori@us.ibm.com> > Signed-off-by: Stefan Weil <weil@mail.berlios.de> > --- > ui/sdl.c | 13 +++++++++++++ > 1 files changed, 13 insertions(+), 0 deletions(-) Thanks, applied. > diff --git a/ui/sdl.c b/ui/sdl.c > index 47ac49c..f5dbc93 100644 > --- a/ui/sdl.c > +++ b/ui/sdl.c > @@ -816,6 +816,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 */ > @@ -848,6 +849,18 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) > vi = SDL_GetVideoInfo(); > host_format = *(vi->vfmt); > > + /* Load a 32x32x4 image. White pixels are transparent. */ > + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, "qemu-icon.bmp"); > + if (filename) { > + SDL_Surface *image = SDL_LoadBMP(filename); > + if (image) { > + uint32_t colorkey = SDL_MapRGB(image->format, 255, 255, 255); > + SDL_SetColorKey(image, SDL_SRCCOLORKEY, colorkey); > + SDL_WM_SetIcon(image, NULL); > + } > + qemu_free(filename); > + } > + > dcl = qemu_mallocz(sizeof(DisplayChangeListener)); > dcl->dpy_update = sdl_update; > dcl->dpy_resize = sdl_resize; > -- > 1.7.2.3 > > > -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien@aurel32.net http://www.aurel32.net ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] QEMU icon 2011-01-27 21:18 ` Stefan Weil 2011-01-28 18:53 ` [Qemu-devel] [PATCH v2] ui: Load QEMU icon from SDL user interface Stefan Weil @ 2011-01-28 22:07 ` Blue Swirl 2011-01-28 22:19 ` Alexander Graf 1 sibling, 1 reply; 14+ messages in thread From: Blue Swirl @ 2011-01-28 22:07 UTC (permalink / raw) To: Stefan Weil; +Cc: Mulyadi Santosa, QEMU Developers On Thu, Jan 27, 2011 at 9:18 PM, Stefan Weil <weil@mail.berlios.de> wrote: > Am 27.01.2011 07:24, schrieb Mulyadi Santosa: >> >> On Thu, Jan 27, 2011 at 02:18, Stefan Weil <weil@mail.berlios.de> wrote: >>> >>> Since some time, I urgently wanted to have an icon for QEMU. >>> As I did not find one, I tried to design one, and here is the >>> current result: http://qemu.weilnetz.de/qemu-icon.svg. >> >> Nice job Stefan! :) >> >> anyway, may I suggest something? What if the big O which is colored >> red and the "EMU" is colored blue? Big Red is somewhat more eye >> catching and means "daredevil", kinda alike FreeBSD red baby devil >> :) > > Hi, > > thanks for your suggestion. > > http://qemu.weilnetz.de/icon/ shows several color variations > and uses a red/blue favicon for the web page. Here's some more bike shedding: The shape overall is almost OK, it is clear even at the favicon size. The EMU part could be a bit bigger to be more readable, if possible. But the black edges somehow remind me of Win 3.1 icons and primary colors without any effects are uncool. Red/blue version is not so bad. ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] QEMU icon 2011-01-28 22:07 ` [Qemu-devel] " Blue Swirl @ 2011-01-28 22:19 ` Alexander Graf 2011-01-28 22:48 ` Stefan Weil 0 siblings, 1 reply; 14+ messages in thread From: Alexander Graf @ 2011-01-28 22:19 UTC (permalink / raw) To: Blue Swirl; +Cc: Mulyadi Santosa, QEMU Developers [-- Attachment #1: Type: text/plain, Size: 1250 bytes --] On 28.01.2011, at 23:07, Blue Swirl wrote: > On Thu, Jan 27, 2011 at 9:18 PM, Stefan Weil <weil@mail.berlios.de> wrote: >> Am 27.01.2011 07:24, schrieb Mulyadi Santosa: >>> >>> On Thu, Jan 27, 2011 at 02:18, Stefan Weil <weil@mail.berlios.de> wrote: >>>> >>>> Since some time, I urgently wanted to have an icon for QEMU. >>>> As I did not find one, I tried to design one, and here is the >>>> current result: http://qemu.weilnetz.de/qemu-icon.svg. >>> >>> Nice job Stefan! :) >>> >>> anyway, may I suggest something? What if the big O which is colored >>> red and the "EMU" is colored blue? Big Red is somewhat more eye >>> catching and means "daredevil", kinda alike FreeBSD red baby devil >>> :) >> >> Hi, >> >> thanks for your suggestion. >> >> http://qemu.weilnetz.de/icon/ shows several color variations >> and uses a red/blue favicon for the web page. > > Here's some more bike shedding: The shape overall is almost OK, it is > clear even at the favicon size. The EMU part could be a bit bigger to > be more readable, if possible. But the black edges somehow remind me > of Win 3.1 icons and primary colors without any effects are uncool. > Red/blue version is not so bad. I always liked the Q logo: http://www.kju-app.org/ Alex [-- Attachment #2: Type: text/html, Size: 3194 bytes --] ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] QEMU icon 2011-01-28 22:19 ` Alexander Graf @ 2011-01-28 22:48 ` Stefan Weil 0 siblings, 0 replies; 14+ messages in thread From: Stefan Weil @ 2011-01-28 22:48 UTC (permalink / raw) To: Alexander Graf; +Cc: Blue Swirl, Mulyadi Santosa, QEMU Developers [-- Attachment #1: Type: text/plain, Size: 822 bytes --] Am 28.01.2011 23:19, schrieb Alexander Graf: > > On 28.01.2011, at 23:07, Blue Swirl wrote: > >> On Thu, Jan 27, 2011 at 9:18 PM, Stefan Weil <weil@mail.berlios.de >> <mailto:weil@mail.berlios.de>> wrote: >>> http://qemu.weilnetz.de/icon/ shows several color variations >>> and uses a red/blue favicon for the web page. >> >> Here's some more bike shedding: The shape overall is almost OK, it is >> clear even at the favicon size. The EMU part could be a bit bigger to >> be more readable, if possible. But the black edges somehow remind me >> of Win 3.1 icons and primary colors without any effects are uncool. >> Red/blue version is not so bad. > > I always liked the Q logo: http://www.kju-app.org/ > > Alex > Nice. I did not know the Q logo up to now and will add it to the QEMU icon contest page tomorrow. Stefan [-- Attachment #2: Type: text/html, Size: 1680 bytes --] ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2011-04-01 19:54 UTC | newest] Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-01-26 19:18 [Qemu-devel] QEMU icon Stefan Weil 2011-01-26 19:23 ` [Qemu-devel] [PATCH] Add an qemu icon Stefan Weil 2011-01-26 19:29 ` [Qemu-devel] Re: [PATCH] Add a QEMU icon Stefan Weil 2011-01-27 6:24 ` [Qemu-devel] " Mulyadi Santosa 2011-01-27 21:18 ` Stefan Weil 2011-01-28 18:53 ` [Qemu-devel] [PATCH v2] ui: Load QEMU icon from SDL user interface Stefan Weil 2011-01-29 12:43 ` Andreas Färber 2011-01-29 14:48 ` Stefan Weil 2011-02-16 20:15 ` [Qemu-devel] [PATCH v3] ui/sdl: Load optional QEMU icon Stefan Weil 2011-03-20 12:11 ` [Qemu-devel] " Stefan Weil 2011-04-01 19:54 ` [Qemu-devel] " Aurelien Jarno 2011-01-28 22:07 ` [Qemu-devel] " Blue Swirl 2011-01-28 22:19 ` Alexander Graf 2011-01-28 22:48 ` Stefan Weil
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.