From b49cbc3acfea66138a0effc650eb15cdc3839a21 Mon Sep 17 00:00:00 2001
From: Yves Rizoud <yrizoud@gmail.com>
Date: Tue, 18 Nov 2008 22:53:28 +0000
Subject: [PATCH] grafx2 and gfxcfg now have a 32x32 icon while running. (gif
 image in install dir.) (win32): Added embedded icon for gfxcfg.exe. Only
 32x32 version, because lazy.

Tested on Win98 and Linux.



git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@355 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 Makefile    |  13 ++++++++-----
 gfx2.gif    | Bin 1149 -> 1149 bytes
 gfx2cfg.gif | Bin 0 -> 1134 bytes
 gfxcfg.c    |  18 +++++++++++++++++-
 main.c      |  22 ++++++++++++++++++++--
 5 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 gfx2cfg.gif

diff --git a/Makefile b/Makefile
index 69380aef..6afe9988 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,7 @@ ifdef COMSPEC
   # Resources (icon)
   WINDRES = windres.exe
   OBJRES = $(OBJDIR)/winres.o
+  CFGOBJRES = $(OBJDIR)/wincfgres.o
 else
 
   PLATFORM = $(shell uname)
@@ -129,15 +130,15 @@ release : $(BIN) $(CFGBIN)
 # A release zip archive
 ziprelease: version $(BIN) $(BINCFG) release
 	tar cvzf src-svn`svnversion | sed 's/:/-/'`.tgz *.c *.h Makefile Makefile.dep
-	zip grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-win32.zip $(BIN) $(CFGBIN) gfx2.dat gfx2.ico doc/gpl-2.0.txt SDL.dll fonts/8pxfont.png SDL_image.dll zlib1.dll libpng13.dll $(TTFLIBS) fonts/Tuffy.ttf src-svn`svnversion | sed 's/:/-/'`.tgz
+	zip grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-win32.zip $(BIN) $(CFGBIN) gfx2.dat gfx2.gif gfx2cfg.gif doc/gpl-2.0.txt SDL.dll fonts/8pxfont.png SDL_image.dll zlib1.dll libpng13.dll $(TTFLIBS) fonts/Tuffy.ttf src-svn`svnversion | sed 's/:/-/'`.tgz
 	$(DELCOMMAND) src-svn`svnversion | sed 's/:/-/'`.tgz
-	tar cvzf grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-src.tgz *.c *.h Makefile Makefile.dep gfx2.dat gfx2.ico doc/gpl-2.0.txt fonts/8pxfont.png fonts/Tuffy.ttf
+	tar cvzf grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-src.tgz *.c *.h Makefile Makefile.dep gfx2.dat gfx2.ico gfx2.gif gfx2cfg.gif doc/gpl-2.0.txt fonts/8pxfont.png fonts/Tuffy.ttf
 
 $(BIN) : $(OBJ) $(OBJRES)
 	$(CC) $(OBJ) $(OBJRES) -o $(BIN) $(LOPT)
 
-$(CFGBIN) : $(CFGOBJ)
-	$(CC) $(CFGOBJ) -o $(CFGBIN) $(LOPT)
+$(CFGBIN) : $(CFGOBJ) $(CFGOBJRES)
+	$(CC) $(CFGOBJ) $(CFGOBJRES) -o $(CFGBIN) $(LOPT)
 
 # SVN revision number
 version.c :
@@ -157,9 +158,11 @@ depend :
 
 $(OBJDIR)/winres.o : gfx2.ico
 	echo "1 ICON \"gfx2.ico\"" | $(WINDRES) -o $(OBJDIR)/winres.o
+$(OBJDIR)/wincfgres.o : gfx2cfg.ico
+	echo "1 ICON \"gfx2cfg.ico\"" | $(WINDRES) -o $(OBJDIR)/wincfgres.o
 
 clean :
-	$(DELCOMMAND) $(OBJ) $(CFGOBJ) $(OBJDIR)/version.o $(OBJRES)
+	$(DELCOMMAND) $(OBJ) $(CFGOBJ) $(OBJDIR)/version.o $(OBJRES) $(CFGOBJRES)
 	$(DELCOMMAND) $(BIN) $(CFGBIN)
 
 test :
diff --git a/gfx2.gif b/gfx2.gif
index bd327aab5d28e2cc4dc48c0d9a31df8fa6248a45..d5612139ef4847246f1ca9a200b61f75c07881dd 100644
GIT binary patch
delta 16
Xcmey%@t0!*7c=u8hCiEmnF|;JIpPKP

delta 16
Xcmey%@t0!*7c;X<P0eOr<^o0lG=>E`

diff --git a/gfx2cfg.gif b/gfx2cfg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0a4ca88a8f2b36443539e40473276419bf9395ef
GIT binary patch
literal 1134
zcmZ?wbh9u|RA5kGn9cwK4Pe{=p<-AZ_9QekG#of^;15vz55pfY1*Cy25U8mcMWZ1w
zOhSO+j}9=A19O4`13SlmhX0&09vdDwFmMQKh5X2W=+w+0=P{*Y!6H`{HU^V9FCH{D
z_j8!Y)g&xf(lA*gQ0#();1b3jRcEfA45OvKjN0Z>1s^V@__WxtN=&E-Rz2Ns*Q&KP
z<AKV_g|3C0R5~3pFR$RA<93#_A^p+{rcG_4TGuk1*L&sj?R{0U)_0x6<yERPgOs8-
zGbEhyeJQ3IyH>r}?8@owPofT+ZN4OG^W)ux&IzZP&Yjxv@#JCE`PXEmr)@gX9C~uo
z+tb@~o^B5R9~Z_ub<LHgSog_GZg1Zj*|agXd!F`ple2eMzi0E0v`o5vcblcU{(&8@
zQ??&c6&BC2S@ULB_R_~kPF_7&aH(OtQLug2r;S;Q=H!b#@RM5;@m6d5Vb<*0H@~)j
zdM;l3e&)_U|9`2LMJDL{+<vd|3~R^S+WCwV9yD`q61f#E)XOg2!oMknp-rH!ZMHL~
PDa#{gwy6;T4h+@+XF!h=

literal 0
HcmV?d00001

diff --git a/gfxcfg.c b/gfxcfg.c
index 16551d7a..21d79725 100644
--- a/gfxcfg.c
+++ b/gfxcfg.c
@@ -655,7 +655,23 @@ int main(__attribute__((unused)) int argc, __attribute__((unused)) char *argv[])
   	/* On initialise SDL */
   	SDL_Init(SDL_INIT_VIDEO);
   	Ecran = SDL_SetVideoMode(640,480,8,0);
-  	SDL_WM_SetCaption ("Grafx2 configuration tool","../gfx2.gif");
+  	SDL_WM_SetCaption ("Grafx2 configuration tool","Gfx2Cfg");
+    {
+      // Routine pour définir l'icone.
+      SDL_Surface * Icone = IMG_Load("gfx2cfg.gif");
+      byte *Masque_icone;
+      if (Icone)
+      {
+        int x,y;
+        Masque_icone=malloc(128);
+        memset(Masque_icone,0,128);
+        for (y=0;y<32;y++)
+          for (x=0;x<32;x++)
+            if (((byte *)(Icone->pixels))[(y*32+x)] != 255)
+              Masque_icone[(y*32+x)/8] |=0x80>>(x&7);
+        SDL_WM_SetIcon(Icone,Masque_icone);
+      }
+    }
     SDL_EnableKeyRepeat(250, 32);
     SDL_EnableUNICODE(SDL_ENABLE);
 
diff --git a/main.c b/main.c
index 073a0163..3a10ff86 100644
--- a/main.c
+++ b/main.c
@@ -37,6 +37,7 @@
 #include <signal.h>
 #include <time.h>
 #include <SDL/SDL.h>
+#include <SDL/SDL_image.h>
 #include <unistd.h>
 #include "pages.h"
 #include "files.h"
@@ -329,8 +330,25 @@ void Initialisation_du_programme(int argc,char * argv[])
   SDL_Init(SDL_INIT_TIMER|SDL_INIT_VIDEO);
   SDL_EnableKeyRepeat(250, 32);
   SDL_EnableUNICODE(SDL_ENABLE);
-  SDL_WM_SetCaption("GrafX2 beta "POURCENTAGE_VERSION" - USE AT YOUR OWN RISK","grafx2.gif");
-
+  SDL_WM_SetCaption("GrafX2 beta "POURCENTAGE_VERSION" - USE AT YOUR OWN RISK","GrafX2");
+  {
+    // Routine pour définir l'icone.
+    char Chemin_icone[256];
+    sprintf(Chemin_icone, "%s%s", Repertoire_du_programme, "gfx2.gif");
+    SDL_Surface * Icone = IMG_Load(Chemin_icone);
+    if (Icone)
+    {
+      byte *Masque_icone;
+      int x,y;
+      Masque_icone=malloc(128);
+      memset(Masque_icone,0,128);
+      for (y=0;y<32;y++)
+        for (x=0;x<32;x++)
+          if (((byte *)(Icone->pixels))[(y*32+x)] != 255)
+            Masque_icone[(y*32+x)/8] |=0x80>>(x&7);
+      SDL_WM_SetIcon(Icone,Masque_icone);
+    }
+  }
   // Texte
   Initialisation_Texte();