diff --git a/cfg_new/5pxtinyfont.png b/5pxtinyfont.png
similarity index 100%
rename from cfg_new/5pxtinyfont.png
rename to 5pxtinyfont.png
diff --git a/cfg_new/8pxfont.png b/8pxfont.png
similarity index 100%
rename from cfg_new/8pxfont.png
rename to 8pxfont.png
diff --git a/Makefile b/Makefile
index 8460143b..a7ee7884 100644
--- a/Makefile
+++ b/Makefile
@@ -19,62 +19,71 @@
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Windows specific
-ifdef COMSPEC
-DELCOMMAND = del
-BIN = grafx2.exe
-COPT = -Wall -O -g -ggdb -Dmain=SDL_main
-LOPT = -mwindows -lmingw32 -lSDLmain -lSDL -lshlwapi
-CC = gcc
+ ifdef COMSPEC
+ DELCOMMAND = del
+ BIN = grafx2.exe
+ CFGBIN = gfxcfg.exe
+ COPT = -Wall -O -g -ggdb -Dmain=SDL_main
+ LOPT = -mwindows -lmingw32 -lSDLmain -lSDL -lshlwapi
+ CC = gcc
else
-# Linux specific
-DELCOMMAND = rm -rf
-ifdef WIN32CROSS
-#cross compile a Win32 executable
-CC = i586-mingw32msvc-gcc
-BIN = grafx2.exe
-COPT = -Wall -O -g -ggdb -Dmain=SDL_main
-LOPT = -mwindows -lmingw32 -lSDLmain -lSDL -lshlwapi
-else
-BIN = grafx2
-COPT = -Wall -c -g
-LOPT = -lSDL -o $(BIN)
-CC = gcc
-endif
+ # Linux specific
+ DELCOMMAND = rm -rf
+ ifdef WIN32CROSS
+ #cross compile a Win32 executable
+ CC = i586-mingw32msvc-gcc
+ BIN = grafx2.exe
+ CFGBIN = gfxcfg.exe
+ COPT = -Wall -O -g -ggdb -Dmain=SDL_main
+ LOPT = -mwindows -lmingw32 -lSDLmain -lSDL -lshlwapi
+ else
+ BIN = grafx2
+ CFGBIN = gfxcfg
+ COPT = -Wall -c -g
+ LOPT = -lSDL -o $(BIN)
+ CC = gcc
+ endif
endif
.PHONY : all debug release clean depend zip
OBJ = main.o init.o graph.o sdlscreen.o divers.o special.o boutons.o palette.o aide.o operatio.o pages.o loadsave.o readline.o moteur.o files.o op_c.o linux.o op_asm.o readini.o saveini.o shade.o clavier.o io.o
+CFGOBJ = gfxcfg.o SFont.o clavier.o io.o
OBJDIR = obj/
-all : $(BIN)
+all : $(BIN) $(CFGBIN)
debug : $(BIN)
-release : $(BIN)
+release : $(BIN) $(CFGBIN)
strip $(BIN)
+ strip $(CFGBIN)
# A raw source archive
zip :
tar cvzf gfx2-src.tgz *.c *.h Makefile Makefile.dep gfx2.dat gfx2.ini gfx2.cfg doc/gpl-2.0.txt \
- cfg_new/*.c cfg_new/*.h cfg_new/Makefile cfg_new/8pxfont.png
+ 8pxfont.png
# A release zip archive
ziprelease:
- zip grafx2-beta-svn`svnversion`.zip $(BIN) gfx2.dat gfx2.ico doc/gpl-2.0.txt SDL.dll gfx2.cfg
+ zip grafx2-beta-svn`svnversion`.zip $(BIN) $(CFGBIN) gfx2.dat gfx2.ico doc/gpl-2.0.txt SDL.dll gfx2.cfg
$(BIN) : $(OBJ)
$(CC) $(OBJ) -o $(BIN) $(LOPT)
+
+$(CFGBIN) : $(CFGOBJ)
+ $(CC) $(CFGOBJ) -o $(CFGBIN) $(LOPT) -lSDL_image
%.o :
$(CC) $(COPT) -c $*.c -o $*.o
depend :
- $(CC) -MM $(OBJ:.o=.c) > Makefile.dep
+ $(CC) -MM $(OBJ:.o=.c) $(CFGOBJ:.o=.c) > Makefile.dep
clean :
$(DELCOMMAND) *.o
$(DELCOMMAND) $(BIN)
+ $(DELCOMMAND) $(CFGBIN)
include Makefile.dep
diff --git a/Makefile.dep b/Makefile.dep
index c9b0f211..7f3ad223 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -33,10 +33,12 @@ files.o: files.c const.h struct.h global.h loadsave.h graph.h divers.h \
op_c.o: op_c.c op_c.h struct.h const.h op_asm.h erreurs.h
linux.o: linux.c
op_asm.o: op_asm.c op_c.h struct.h const.h graph.h
-readini.o: readini.c const.h global.h struct.h loadsave.h
+readini.o: readini.c const.h global.h struct.h loadsave.h graph.h
saveini.o: saveini.c const.h global.h struct.h loadsave.h readini.h \
- files.h erreurs.h
+ files.h erreurs.h graph.h
shade.o: shade.c global.h struct.h const.h loadsave.h graph.h moteur.h \
divers.h readline.h
clavier.o: clavier.c global.h struct.h const.h loadsave.h
io.o: io.c struct.h const.h io.h
+gfxcfg.o: gfxcfg.c SFont.h struct.h const.h clavier.h io.h
+SFont.o: SFont.c SFont.h
diff --git a/cfg_new/SFont.c b/SFont.c
similarity index 100%
rename from cfg_new/SFont.c
rename to SFont.c
diff --git a/cfg_new/SFont.h b/SFont.h
similarity index 100%
rename from cfg_new/SFont.h
rename to SFont.h
diff --git a/cfg_new/Makefile b/cfg_new/Makefile
deleted file mode 100644
index f6b0906e..00000000
--- a/cfg_new/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# Grafx2 - The Ultimate 256-color bitmap paint program
-#
-# Copyright 2008 Adrien Destugues
-# Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud)
-#
-# Grafx2 is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; version 2
-# of the License.
-#
-# Grafx2 is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Grafx2; if not, see or
-# write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-ifdef COMSPEC
-COPT = -Wall -O -g -ggdb -Dmain=SDL_main
-LOPT = `sdl-config --libs` -lSDL_image -g
-else
-COPT = -c `sdl-config --cflags` -Wall -g
-LOPT = `sdl-config --libs` -lSDL_image -lSDL_gfx -g
-endif
-
-gfxcfg: gfxcfg.o SFont.o ../clavier.o ../io.o
- gcc gfxcfg.o ../clavier.o ../io.o SFont.o -o gfxcfg $(LOPT)
-
-gfxcfg.o: gfxcfg.c SFont.h
- gcc -c gfxcfg.c -o gfxcfg.o $(COPT)
-
-../clavier.o: ../clavier.c
- gcc -c ../clavier.c -o ../clavier.o $(COPT)
-
-../io.o: ../io.c
- gcc -c ../io.c -o ../io.o $(COPT)
-
-SFont.o: SFont.h SFont.c
- gcc -c SFont.c -o SFont.o $(COPT)
diff --git a/cfg_new/scancodes.h b/cfg_new/scancodes.h
deleted file mode 100644
index daaab917..00000000
--- a/cfg_new/scancodes.h
+++ /dev/null
@@ -1,1060 +0,0 @@
-/* Grafx2 - The Ultimate 256-color bitmap paint program
-
- Copyright 2008 Adrien Destugues
- Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud)
-
- Grafx2 is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2
- of the License.
-
- Grafx2 is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Grafx2; if not, see or
- write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-const char*
- Table_Normal[256] =
-{
- /*00*/ "???"
- /*01*/,"Esc"
- /*02*/,"1 !"
- /*03*/,"2 @"
- /*04*/,"3 #"
- /*05*/,"4 $"
- /*06*/,"5 %"
- /*07*/,"6 ^"
- /*08*/,"7 &"
- /*09*/,"8 *"
- /*0A*/,"9 ("
- /*0B*/,"0 )"
- /*0C*/,"- _"
- /*0D*/,"= +"
- /*0E*/,"BkSpc"
- /*0F*/,"Tab"
- /*10*/,"Q"
- /*11*/,"W"
- /*12*/,"E"
- /*13*/,"R"
- /*14*/,"T"
- /*15*/,"Y"
- /*16*/,"U"
- /*17*/,"I"
- /*18*/,"O"
- /*19*/,"P"
- /*1A*/,"[ /*"
- /*1B*/,"] */"
- /*1C*/,"Retrn"
- /*1D*/,"???"
- /*1E*/,"A"
- /*1F*/,"S"
- /*20*/,"D"
- /*21*/,"F"
- /*22*/,"G"
- /*23*/,"H"
- /*24*/,"J"
- /*25*/,"K"
- /*26*/,"L"
- /*27*/,"; :"
- /*28*/,"' "
- /*29*/,"` ~"
- /*2A*/,"???"
- /*2B*/,"\\ "
- /*2C*/,"Z"
- /*2D*/,"X"
- /*2E*/,"C"
- /*2F*/,"V"
- /*30*/,"B"
- /*31*/,"N"
- /*32*/,"M"
- /*33*/,", <"
- /*34*/,". >"
- /*35*/,"/ ?"
- /*36*/,"???"
- /*37*/,"Grey*"
- /*38*/,"???"
- /*39*/,"Space"
- /*3A*/,"???"
- /*3B*/,"F1"
- /*3C*/,"F2"
- /*3D*/,"F3"
- /*3E*/,"F4"
- /*3F*/,"F5"
- /*40*/,"F6"
- /*41*/,"F7"
- /*42*/,"F8"
- /*43*/,"F9"
- /*44*/,"F10"
- /*45*/,"???"
- /*46*/,"???"
- /*47*/,"Home"
- /*48*/,"Up"
- /*49*/,"PgUp"
- /*4A*/,"Grey-"
- /*4B*/,"Left"
- /*4C*/,"Kpad5"
- /*4D*/,"Right"
- /*4E*/,"Grey+"
- /*4F*/,"End"
- /*50*/,"Down"
- /*51*/,"PgDn"
- /*52*/,"Ins"
- /*53*/,"Del"
- /*54*/,"???"
- /*55*/,"???"
- /*56*/,"Lft|"
- /*57*/,"???"
- /*58*/,"???"
- /*59*/,"???"
- /*5A*/,"???"
- /*5B*/,"???"
- /*5C*/,"???"
- /*5D*/,"???"
- /*5E*/,"???"
- /*5F*/,"???"
- /*60*/,"???"
- /*61*/,"???"
- /*62*/,"???"
- /*63*/,"???"
- /*64*/,"???"
- /*65*/,"???"
- /*66*/,"???"
- /*67*/,"???"
- /*68*/,"???"
- /*69*/,"???"
- /*6A*/,"???"
- /*6B*/,"???"
- /*6C*/,"???"
- /*6D*/,"???"
- /*6E*/,"???"
- /*6F*/,"???"
- /*70*/,"???"
- /*71*/,"???"
- /*72*/,"???"
- /*73*/,"???"
- /*74*/,"???"
- /*75*/,"???"
- /*76*/,"???"
- /*77*/,"???"
- /*78*/,"???"
- /*79*/,"???"
- /*7A*/,"???"
- /*7B*/,"???"
- /*7C*/,"???"
- /*7D*/,"???"
- /*7E*/,"???"
- /*7F*/,"???"
- /*80*/,"???"
- /*81*/,"???"
- /*82*/,"???"
- /*83*/,"???"
- /*84*/,"???"
- /*85*/,"F11"
- /*86*/,"F12"
- /*87*/,"???"
- /*88*/,"???"
- /*89*/,"???"
- /*8A*/,"???"
- /*8B*/,"???"
- /*8C*/,"???"
- /*8D*/,"???"
- /*8E*/,"???"
- /*8F*/,"???"
- /*90*/,"???"
- /*91*/,"???"
- /*92*/,"???"
- /*93*/,"???"
- /*94*/,"???"
- /*95*/,"???"
- /*96*/,"???"
- /*97*/,"???"
- /*98*/,"???"
- /*99*/,"???"
- /*9A*/,"???"
- /*9B*/,"???"
- /*9C*/,"???"
- /*9D*/,"???"
- /*9E*/,"???"
- /*9F*/,"???"
- /*A0*/,"???"
- /*A1*/,"???"
- /*A2*/,"???"
- /*A3*/,"???"
- /*A4*/,"???"
- /*A5*/,"???"
- /*A6*/,"???"
- /*A7*/,"???"
- /*A8*/,"???"
- /*A9*/,"???"
- /*AA*/,"???"
- /*AB*/,"???"
- /*AC*/,"???"
- /*AD*/,"???"
- /*AE*/,"???"
- /*AF*/,"???"
- /*B0*/,"???"
- /*B1*/,"???"
- /*B2*/,"???"
- /*B3*/,"???"
- /*B4*/,"???"
- /*B5*/,"???"
- /*B6*/,"Win L"
- /*B7*/,"Win R"
- /*B8*/,"Win M"
- /*B9*/,"???"
- /*BA*/,"???"
- /*BB*/,"???"
- /*BC*/,"???"
- /*BD*/,"???"
- /*BE*/,"???"
- /*BF*/,"???"
- /*C0*/,"???"
- /*C1*/,"???"
- /*C2*/,"???"
- /*C3*/,"???"
- /*C4*/,"???"
- /*C5*/,"???"
- /*C6*/,"???"
- /*C7*/,"???"
- /*C8*/,"???"
- /*C9*/,"???"
- /*CA*/,"???"
- /*CB*/,"???"
- /*CC*/,"???"
- /*CD*/,"???"
- /*CE*/,"???"
- /*CF*/,"???"
- /*D0*/,"???"
- /*D1*/,"???"
- /*D2*/,"???"
- /*D3*/,"???"
- /*D4*/,"???"
- /*D5*/,"???"
- /*D6*/,"???"
- /*D7*/,"???"
- /*D8*/,"???"
- /*D9*/,"???"
- /*DA*/,"???"
- /*DB*/,"???"
- /*DC*/,"???"
- /*DD*/,"???"
- /*DE*/,"???"
- /*DF*/,"???"
- /*E0*/,"Enter"
- /*E1*/,"???"
- /*E2*/,"???"
- /*E3*/,"???"
- /*E4*/,"???"
- /*E5*/,"???"
- /*E6*/,"???"
- /*E7*/,"???"
- /*E8*/,"???"
- /*E9*/,"???"
- /*EA*/,"???"
- /*EB*/,"???"
- /*EC*/,"???"
- /*ED*/,"???"
- /*EE*/,"???"
- /*EF*/,"???"
- /*F0*/,"???"
- /*F1*/,"???"
- /*F2*/,"???"
- /*F3*/,"???"
- /*F4*/,"???"
- /*F5*/,"???"
- /*F6*/,"???"
- /*F7*/,"???"
- /*F8*/,"???"
- /*F9*/,"???"
- /*FA*/,"???"
- /*FB*/,"???"
- /*FC*/,"???"
- /*FD*/,"???"
- /*FE*/,"???"
- /*FF*/,""
-};
-
-const char* Table_Shift[256] =
-{
- /*00*/ "???"
- /*01*/,"Esc"
- /*02*/,"1 !"
- /*03*/,"2 @"
- /*04*/,"3 #"
- /*05*/,"4 $"
- /*06*/,"5 %"
- /*07*/,"6 ^"
- /*08*/,"7 &"
- /*09*/,"8 *"
- /*0A*/,"9 ("
- /*0B*/,"0 )"
- /*0C*/,"- _"
- /*0D*/,"= +"
- /*0E*/,"BkSpc"
- /*0F*/,"Tab"
- /*10*/,"Q"
- /*11*/,"W"
- /*12*/,"E"
- /*13*/,"R"
- /*14*/,"T"
- /*15*/,"Y"
- /*16*/,"U"
- /*17*/,"I"
- /*18*/,"O"
- /*19*/,"P"
- /*1A*/,"[ /*"
- /*1B*/,"] */"
- /*1C*/,"Retrn"
- /*1D*/,"???"
- /*1E*/,"A"
- /*1F*/,"S"
- /*20*/,"D"
- /*21*/,"F"
- /*22*/,"G"
- /*23*/,"H"
- /*24*/,"J"
- /*25*/,"K"
- /*26*/,"L"
- /*27*/,"; :"
- /*28*/,"' "
- /*29*/,"` ~"
- /*2A*/,"???"
- /*2B*/,"\\ "
- /*2C*/,"Z"
- /*2D*/,"X"
- /*2E*/,"C"
- /*2F*/,"V"
- /*30*/,"B"
- /*31*/,"N"
- /*32*/,"M"
- /*33*/,", <"
- /*34*/,". >"
- /*35*/,"/ ?"
- /*36*/,"???"
- /*37*/,"Grey*"
- /*38*/,"???"
- /*39*/,"Space"
- /*3A*/,"???"
- /*3B*/,"???"
- /*3C*/,"???"
- /*3D*/,"???"
- /*3E*/,"???"
- /*3F*/,"???"
- /*40*/,"???"
- /*41*/,"???"
- /*42*/,"???"
- /*43*/,"???"
- /*44*/,"???"
- /*45*/,"???"
- /*46*/,"???"
- /*47*/,"Home"
- /*48*/,"Up"
- /*49*/,"PgUp"
- /*4A*/,"Grey-"
- /*4B*/,"Left"
- /*4C*/,"Kpad5"
- /*4D*/,"Right"
- /*4E*/,"Grey+"
- /*4F*/,"End"
- /*50*/,"Down"
- /*51*/,"PgDn"
- /*52*/,"Ins"
- /*53*/,"Del"
- /*54*/,"F1"
- /*55*/,"F2"
- /*56*/,"F3"
- /*57*/,"F4"
- /*58*/,"F5"
- /*59*/,"F6"
- /*5A*/,"F7"
- /*5B*/,"F8"
- /*5C*/,"F9"
- /*5D*/,"F10"
- /*5E*/,"???"
- /*5F*/,"???"
- /*60*/,"???"
- /*61*/,"???"
- /*62*/,"???"
- /*63*/,"???"
- /*64*/,"???"
- /*65*/,"???"
- /*66*/,"???"
- /*67*/,"???"
- /*68*/,"???"
- /*69*/,"???"
- /*6A*/,"???"
- /*6B*/,"???"
- /*6C*/,"???"
- /*6D*/,"???"
- /*6E*/,"???"
- /*6F*/,"???"
- /*70*/,"???"
- /*71*/,"???"
- /*72*/,"???"
- /*73*/,"???"
- /*74*/,"???"
- /*75*/,"???"
- /*76*/,"???"
- /*77*/,"???"
- /*78*/,"???"
- /*79*/,"???"
- /*7A*/,"???"
- /*7B*/,"???"
- /*7C*/,"???"
- /*7D*/,"???"
- /*7E*/,"???"
- /*7F*/,"???"
- /*80*/,"???"
- /*81*/,"???"
- /*82*/,"???"
- /*83*/,"???"
- /*84*/,"???"
- /*85*/,"???"
- /*86*/,"???"
- /*87*/,"F11"
- /*88*/,"F12"
- /*89*/,"???"
- /*8A*/,"???"
- /*8B*/,"???"
- /*8C*/,"???"
- /*8D*/,"???"
- /*8E*/,"???"
- /*8F*/,"???"
- /*90*/,"???"
- /*91*/,"???"
- /*92*/,"???"
- /*93*/,"???"
- /*94*/,"???"
- /*95*/,"???"
- /*96*/,"???"
- /*97*/,"???"
- /*98*/,"???"
- /*99*/,"???"
- /*9A*/,"???"
- /*9B*/,"???"
- /*9C*/,"???"
- /*9D*/,"???"
- /*9E*/,"???"
- /*9F*/,"???"
- /*A0*/,"???"
- /*A1*/,"???"
- /*A2*/,"???"
- /*A3*/,"???"
- /*A4*/,"???"
- /*A5*/,"???"
- /*A6*/,"???"
- /*A7*/,"???"
- /*A8*/,"???"
- /*A9*/,"???"
- /*AA*/,"???"
- /*AB*/,"???"
- /*AC*/,"???"
- /*AD*/,"???"
- /*AE*/,"???"
- /*AF*/,"???"
- /*B0*/,"???"
- /*B1*/,"???"
- /*B2*/,"???"
- /*B3*/,"???"
- /*B4*/,"???"
- /*B5*/,"???"
- /*B6*/,"???"
- /*B7*/,"???"
- /*B8*/,"???"
- /*B9*/,"???"
- /*BA*/,"???"
- /*BB*/,"???"
- /*BC*/,"???"
- /*BD*/,"???"
- /*BE*/,"???"
- /*BF*/,"???"
- /*C0*/,"???"
- /*C1*/,"???"
- /*C2*/,"Win L"
- /*C3*/,"Win R"
- /*C4*/,"Win M"
- /*C5*/,"???"
- /*C6*/,"???"
- /*C7*/,"???"
- /*C8*/,"???"
- /*C9*/,"???"
- /*CA*/,"???"
- /*CB*/,"???"
- /*CC*/,"???"
- /*CD*/,"???"
- /*CE*/,"???"
- /*CF*/,"???"
- /*D0*/,"???"
- /*D1*/,"???"
- /*D2*/,"???"
- /*D3*/,"???"
- /*D4*/,"???"
- /*D5*/,"???"
- /*D6*/,"???"
- /*D7*/,"???"
- /*D8*/,"???"
- /*D9*/,"???"
- /*DA*/,"???"
- /*DB*/,"???"
- /*DC*/,"???"
- /*DD*/,"???"
- /*DE*/,"???"
- /*DF*/,"???"
- /*E0*/,"Enter"
- /*E1*/,"???"
- /*E2*/,"???"
- /*E3*/,"???"
- /*E4*/,"???"
- /*E5*/,"???"
- /*E6*/,"???"
- /*E7*/,"???"
- /*E8*/,"???"
- /*E9*/,"???"
- /*EA*/,"???"
- /*EB*/,"???"
- /*EC*/,"???"
- /*ED*/,"???"
- /*EE*/,"???"
- /*EF*/,"???"
- /*F0*/,"???"
- /*F1*/,"???"
- /*F2*/,"???"
- /*F3*/,"???"
- /*F4*/,"???"
- /*F5*/,"???"
- /*F6*/,"???"
- /*F7*/,"???"
- /*F8*/,"???"
- /*F9*/,"???"
- /*FA*/,"???"
- /*FB*/,"???"
- /*FC*/,"???"
- /*FD*/,"???"
- /*FE*/,"???"
- /*FF*/,"???"
-};
-
-const char* Table_Ctrl[256] =
-{
- /*00*/ "???"
- /*01*/,"Esc"
- /*02*/,"???"
- /*03*/,"2 @"
- /*04*/,"???"
- /*05*/,"???"
- /*06*/,"???"
- /*07*/,"6 ^"
- /*08*/,"???"
- /*09*/,"8 *"
- /*0A*/,"???"
- /*0B*/,"???"
- /*0C*/,"- _"
- /*0D*/,"= +"
- /*0E*/,"BkSpc"
- /*0F*/,"???"
- /*10*/,"Q"
- /*11*/,"W"
- /*12*/,"E"
- /*13*/,"R"
- /*14*/,"T"
- /*15*/,"Y"
- /*16*/,"U"
- /*17*/,"I"
- /*18*/,"O"
- /*19*/,"P"
- /*1A*/,"[ /*"
- /*1B*/,"] */"
- /*1C*/,"Retrn"
- /*1D*/,"???"
- /*1E*/,"A"
- /*1F*/,"S"
- /*20*/,"D"
- /*21*/,"F"
- /*22*/,"G"
- /*23*/,"H"
- /*24*/,"J"
- /*25*/,"K"
- /*26*/,"L"
- /*27*/,"; :"
- /*28*/,"???"
- /*29*/,"???"
- /*2A*/,"???"
- /*2B*/,"\\"
- /*2C*/,"Z"
- /*2D*/,"X"
- /*2E*/,"C"
- /*2F*/,"V"
- /*30*/,"B"
- /*31*/,"N"
- /*32*/,"M"
- /*33*/,"???"
- /*34*/,"???"
- /*35*/,"???"
- /*36*/,"???"
- /*37*/,"???"
- /*38*/,"???"
- /*39*/,"Space"
- /*3A*/,"???"
- /*3B*/,"???"
- /*3C*/,"???"
- /*3D*/,"???"
- /*3E*/,"???"
- /*3F*/,"???"
- /*40*/,"???"
- /*41*/,"???"
- /*42*/,"???"
- /*43*/,"???"
- /*44*/,"???"
- /*45*/,"???"
- /*46*/,"???"
- /*47*/,"???"
- /*48*/,"???"
- /*49*/,"???"
- /*4A*/,"???"
- /*4B*/,"???"
- /*4C*/,"???"
- /*4D*/,"???"
- /*4E*/,"???"
- /*4F*/,"???"
- /*50*/,"???"
- /*51*/,"???"
- /*52*/,"???"
- /*53*/,"???"
- /*54*/,"???"
- /*55*/,"???"
- /*56*/,"???"
- /*57*/,"???"
- /*58*/,"???"
- /*59*/,"???"
- /*5A*/,"???"
- /*5B*/,"???"
- /*5C*/,"???"
- /*5D*/,"???"
- /*5E*/,"F1"
- /*5F*/,"F2"
- /*60*/,"F3"
- /*61*/,"F4"
- /*62*/,"F5"
- /*63*/,"F6"
- /*64*/,"F7"
- /*65*/,"F8"
- /*66*/,"F9"
- /*67*/,"F10"
- /*68*/,"???"
- /*69*/,"???"
- /*6A*/,"???"
- /*6B*/,"???"
- /*6C*/,"???"
- /*6D*/,"???"
- /*6E*/,"???"
- /*6F*/,"???"
- /*70*/,"???"
- /*71*/,"???"
- /*72*/,"???"
- /*73*/,"Left"
- /*74*/,"Right"
- /*75*/,"End"
- /*76*/,"PgDn"
- /*77*/,"Home"
- /*78*/,"???"
- /*79*/,"???"
- /*7A*/,"???"
- /*7B*/,"???"
- /*7C*/,"???"
- /*7D*/,"???"
- /*7E*/,"???"
- /*7F*/,"???"
- /*80*/,"???"
- /*81*/,"???"
- /*82*/,"???"
- /*83*/,"???"
- /*84*/,"PgUp"
- /*85*/,"???"
- /*86*/,"???"
- /*87*/,"???"
- /*88*/,"???"
- /*89*/,"F11"
- /*8A*/,"F12"
- /*8B*/,"???"
- /*8C*/,"???"
- /*8D*/,"Up"
- /*8E*/,"Grey-"
- /*8F*/,"Keyp5"
- /*90*/,"Grey+"
- /*91*/,"Down"
- /*92*/,"Ins"
- /*93*/,"Del"
- /*94*/,"Tab"
- /*95*/,"Grey/"
- /*96*/,"Grey*"
- /*97*/,"???"
- /*98*/,"???"
- /*99*/,"???"
- /*9A*/,"???"
- /*9B*/,"???"
- /*9C*/,"???"
- /*9D*/,"???"
- /*9E*/,"???"
- /*9F*/,"???"
- /*A0*/,"???"
- /*A1*/,"???"
- /*A2*/,"???"
- /*A3*/,"???"
- /*A4*/,"???"
- /*A5*/,"???"
- /*A6*/,"???"
- /*A7*/,"???"
- /*A8*/,"???"
- /*A9*/,"???"
- /*AA*/,"???"
- /*AB*/,"???"
- /*AC*/,"???"
- /*AD*/,"???"
- /*AE*/,"???"
- /*AF*/,"???"
- /*B0*/,"???"
- /*B1*/,"???"
- /*B2*/,"???"
- /*B3*/,"???"
- /*B4*/,"???"
- /*B5*/,"???"
- /*B6*/,"???"
- /*B7*/,"???"
- /*B8*/,"???"
- /*B9*/,"???"
- /*BA*/,"???"
- /*BB*/,"???"
- /*BC*/,"???"
- /*BD*/,"???"
- /*BE*/,"???"
- /*BF*/,"???"
- /*C0*/,"???"
- /*C1*/,"???"
- /*C2*/,"???"
- /*C3*/,"???"
- /*C4*/,"???"
- /*C5*/,"???"
- /*C6*/,"???"
- /*C7*/,"???"
- /*C8*/,"???"
- /*C9*/,"???"
- /*CA*/,"???"
- /*CB*/,"???"
- /*CC*/,"???"
- /*CD*/,"???"
- /*CE*/,"Win L"
- /*CF*/,"Win R"
- /*D0*/,"Win M"
- /*D1*/,"???"
- /*D2*/,"???"
- /*D3*/,"???"
- /*D4*/,"???"
- /*D5*/,"???"
- /*D6*/,"???"
- /*D7*/,"???"
- /*D8*/,"???"
- /*D9*/,"???"
- /*DA*/,"???"
- /*DB*/,"???"
- /*DC*/,"???"
- /*DD*/,"???"
- /*DE*/,"???"
- /*DF*/,"???"
- /*E0*/,"Enter"
- /*E1*/,"???"
- /*E2*/,"???"
- /*E3*/,"???"
- /*E4*/,"???"
- /*E5*/,"???"
- /*E6*/,"???"
- /*E7*/,"???"
- /*E8*/,"???"
- /*E9*/,"???"
- /*EA*/,"???"
- /*EB*/,"???"
- /*EC*/,"???"
- /*ED*/,"???"
- /*EE*/,"???"
- /*EF*/,"???"
- /*F0*/,"???"
- /*F1*/,"???"
- /*F2*/,"???"
- /*F3*/,"???"
- /*F4*/,"???"
- /*F5*/,"???"
- /*F6*/,"???"
- /*F7*/,"???"
- /*F8*/,"???"
- /*F9*/,"???"
- /*FA*/,"???"
- /*FB*/,"???"
- /*FC*/,"???"
- /*FD*/,"???"
- /*FE*/,"???"
- /*FF*/,"???"
-};
-
-const char* Table_Alt[256] =
-{
- /*00*/ "???"
- /*01*/,"Esc"
- /*02*/,"???"
- /*03*/,"???"
- /*04*/,"???"
- /*05*/,"???"
- /*06*/,"???"
- /*07*/,"???"
- /*08*/,"???"
- /*09*/,"???"
- /*0A*/,"???"
- /*0B*/,"???"
- /*0C*/,"???"
- /*0D*/,"???"
- /*0E*/,"BkSpc"
- /*0F*/,"???"
- /*10*/,"Q"
- /*11*/,"W"
- /*12*/,"E"
- /*13*/,"R"
- /*14*/,"T"
- /*15*/,"Y"
- /*16*/,"U"
- /*17*/,"I"
- /*18*/,"O"
- /*19*/,"P"
- /*1A*/,"[ /*"
- /*1B*/,"] */"
- /*1C*/,"Retrn"
- /*1D*/,"???"
- /*1E*/,"A"
- /*1F*/,"S"
- /*20*/,"D"
- /*21*/,"F"
- /*22*/,"G"
- /*23*/,"H"
- /*24*/,"J"
- /*25*/,"K"
- /*26*/,"L"
- /*27*/,"; :"
- /*28*/,"' "
- /*29*/,"` ~"
- /*2A*/,"???"
- /*2B*/,"\\"
- /*2C*/,"Z"
- /*2D*/,"X"
- /*2E*/,"C"
- /*2F*/,"V"
- /*30*/,"B"
- /*31*/,"N"
- /*32*/,"M"
- /*33*/,", <"
- /*34*/,". >"
- /*35*/,"/ ?"
- /*36*/,"???"
- /*37*/,"Grey*"
- /*38*/,"???"
- /*39*/,"Space"
- /*3A*/,"???"
- /*3B*/,"???"
- /*3C*/,"???"
- /*3D*/,"???"
- /*3E*/,"???"
- /*3F*/,"???"
- /*40*/,"???"
- /*41*/,"???"
- /*42*/,"???"
- /*43*/,"???"
- /*44*/,"???"
- /*45*/,"???"
- /*46*/,"???"
- /*47*/,"???"
- /*48*/,"???"
- /*49*/,"???"
- /*4A*/,"Grey-"
- /*4B*/,"???"
- /*4C*/,"???"
- /*4D*/,"???"
- /*4E*/,"Grey+"
- /*4F*/,"???"
- /*50*/,"???"
- /*51*/,"???"
- /*52*/,"???"
- /*53*/,"???"
- /*54*/,"???"
- /*55*/,"???"
- /*56*/,"???"
- /*57*/,"???"
- /*58*/,"???"
- /*59*/,"???"
- /*5A*/,"???"
- /*5B*/,"???"
- /*5C*/,"???"
- /*5D*/,"???"
- /*5E*/,"???"
- /*5F*/,"???"
- /*60*/,"???"
- /*61*/,"???"
- /*62*/,"???"
- /*63*/,"???"
- /*64*/,"???"
- /*65*/,"???"
- /*66*/,"???"
- /*67*/,"???"
- /*68*/,"F1"
- /*69*/,"F2"
- /*6A*/,"F3"
- /*6B*/,"F4"
- /*6C*/,"F5"
- /*6D*/,"F6"
- /*6E*/,"F7"
- /*6F*/,"F8"
- /*70*/,"F9"
- /*71*/,"F10"
- /*72*/,"???"
- /*73*/,"???"
- /*74*/,"???"
- /*75*/,"???"
- /*76*/,"???"
- /*77*/,"???"
- /*78*/,"1 !"
- /*79*/,"2 @"
- /*7A*/,"3 #"
- /*7B*/,"4 $"
- /*7C*/,"5 %"
- /*7D*/,"6 ^"
- /*7E*/,"7 &"
- /*7F*/,"8 *"
- /*80*/,"9 ("
- /*81*/,"0 )"
- /*82*/,"- _"
- /*83*/,"= +"
- /*84*/,"???"
- /*85*/,"???"
- /*86*/,"???"
- /*87*/,"???"
- /*88*/,"???"
- /*89*/,"???"
- /*8A*/,"???"
- /*8B*/,"F11"
- /*8C*/,"F12"
- /*8D*/,"???"
- /*8E*/,"???"
- /*8F*/,"???"
- /*90*/,"???"
- /*91*/,"???"
- /*92*/,"???"
- /*93*/,"???"
- /*94*/,"???"
- /*95*/,"???"
- /*96*/,"???"
- /*97*/,"Home"
- /*98*/,"Up"
- /*99*/,"PgUp"
- /*9A*/,"???"
- /*9B*/,"Left"
- /*9C*/,"???"
- /*9D*/,"Right"
- /*9E*/,"???"
- /*9F*/,"End"
- /*A0*/,"Down"
- /*A1*/,"PgDn"
- /*A2*/,"Ins"
- /*A3*/,"Del"
- /*A4*/,"Grey/"
- /*A5*/,"Tab"
- /*A6*/,"Enter"
- /*A7*/,"???"
- /*A8*/,"???"
- /*A9*/,"???"
- /*AA*/,"???"
- /*AB*/,"???"
- /*AC*/,"???"
- /*AD*/,"???"
- /*AE*/,"???"
- /*AF*/,"???"
- /*B0*/,"???"
- /*B1*/,"???"
- /*B2*/,"???"
- /*B3*/,"???"
- /*B4*/,"???"
- /*B5*/,"???"
- /*B6*/,"???"
- /*B7*/,"???"
- /*B8*/,"???"
- /*B9*/,"???"
- /*BA*/,"???"
- /*BB*/,"???"
- /*BC*/,"???"
- /*BD*/,"???"
- /*BE*/,"???"
- /*BF*/,"???"
- /*C0*/,"???"
- /*C1*/,"???"
- /*C2*/,"???"
- /*C3*/,"???"
- /*C4*/,"???"
- /*C5*/,"???"
- /*C6*/,"???"
- /*C7*/,"???"
- /*C8*/,"???"
- /*C9*/,"???"
- /*CA*/,"???"
- /*CB*/,"???"
- /*CC*/,"???"
- /*CD*/,"???"
- /*CE*/,"???"
- /*CF*/,"???"
- /*D0*/,"???"
- /*D1*/,"???"
- /*D2*/,"???"
- /*D3*/,"???"
- /*D4*/,"???"
- /*D5*/,"???"
- /*D6*/,"???"
- /*D7*/,"???"
- /*D8*/,"???"
- /*D9*/,"???"
- /*DA*/,"Win L"
- /*DB*/,"Win R"
- /*DC*/,"Win M"
- /*DD*/,"???"
- /*DE*/,"???"
- /*DF*/,"???"
- /*E0*/,"???"
- /*E1*/,"???"
- /*E2*/,"???"
- /*E3*/,"???"
- /*E4*/,"???"
- /*E5*/,"???"
- /*E6*/,"???"
- /*E7*/,"???"
- /*E8*/,"???"
- /*E9*/,"???"
- /*EA*/,"???"
- /*EB*/,"???"
- /*EC*/,"???"
- /*ED*/,"???"
- /*EE*/,"???"
- /*EF*/,"???"
- /*F0*/,"???"
- /*F1*/,"???"
- /*F2*/,"???"
- /*F3*/,"???"
- /*F4*/,"???"
- /*F5*/,"???"
- /*F6*/,"???"
- /*F7*/,"???"
- /*F8*/,"???"
- /*F9*/,"???"
- /*FA*/,"???"
- /*FB*/,"???"
- /*FC*/,"???"
- /*FD*/,"???"
- /*FE*/,"???"
- /*FF*/,"???"
-};
diff --git a/cfg_new/gfxcfg.c b/gfxcfg.c
similarity index 99%
rename from cfg_new/gfxcfg.c
rename to gfxcfg.c
index 1a8e5737..0de68fda 100644
--- a/cfg_new/gfxcfg.c
+++ b/gfxcfg.c
@@ -41,10 +41,10 @@
#define MOD_CTRL 0x2000
#define MOD_ALT 0x4000
-#include "../struct.h"
-#include "../clavier.h"
-#include "../const.h"
-#include "../io.h"
+#include "struct.h"
+#include "clavier.h"
+#include "const.h"
+#include "io.h"
/*** Constants ***/