- Fixed ktcc build for linux

- Added Makefile.linux32
- Added TEAtool and fixed console title
- Fixed crash of THashView

git-svn-id: svn://kolibrios.org@8250 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/develop/ktcc/trunk/source/Makefile.linux32

@@ -0,0 +1,13 @@
+CC=gcc
+NAME=kos32-tcc
+
+SRC=libtcc.c tcc.c
+CFLAGS= -DTCC_TARGET_MEOS_LINUX
+LFLAGS= -m32 -static 
+
+all:
+	$(CC) $(CFLAGS) $(LFLAGS) $(SRC) -o $(NAME) 
+install: 
+	cp $(NAME) ../bin 
+clean:
+	rm -f $(NAME)

programs/develop/ktcc/trunk/source/libtcc.c

@@ -140,7 +140,7 @@ BOOL WINAPI DllMain (HINSTANCE hDll, DWORD dwReason, LPVOID lpReserved)
 }
 #endif
 #else // _WIN32
-#ifdef TCC_TARGET_MEOS
+#if defined TCC_TARGET_MEOS && ! TCC_TARGET_MEOS_LINUX
 /* on Kolibri host, we suppose the lib and includes are at the location of 'tcc' /lib, /include */
 static void tcc_set_lib_path_kos(TCCState *s)
 {
@@ -1092,7 +1092,7 @@ LIBTCCAPI TCCState *tcc_new(void)
 #ifdef _WIN32
     tcc_set_lib_path_w32(s);
 #else
-#ifdef TCC_TARGET_MEOS
+#if defined TCC_TARGET_MEOS && ! TCC_TARGET_MEOS_LINUX
     tcc_set_lib_path_kos(s);
 #else
     tcc_set_lib_path(s, CONFIG_TCCDIR);

programs/other/TinyHashView/Makefile

@@ -0,0 +1,18 @@
+KTCC_DIR=../../develop/ktcc/trunk
+
+NAME=thashview
+
+KTCC=$(KTCC_DIR)/bin/kos32-tcc
+KPACK=kpack
+
+SRC=thashview.c algorithms/*.c
+CFLAGS=-nostdinc -I $(KTCC_DIR)/libc/include
+LFLAGS=-nostdlib -L $(KTCC_DIR)/bin/lib $(KTCC_DIR)/bin/lib/start.o
+LIBS = -lck
+
+all:
+	$(KTCC) $(CFLAGS) $(LFLAGS) $(SRC) $(LIBS) -o $(NAME)
+	$(KPACK) $(NAME)
+
+clean:
+	rm $(NAME)

programs/other/TinyHashView/build_kex_kossdk.bat

@@ -1,9 +0,0 @@
-kos32-gcc -c -fomit-frame-pointer -ID:\KOSSDK\newlib/libc/include algorithms\md5.c -o algorithms\md5.o -Wall -Wextra
-kos32-gcc -c -fomit-frame-pointer -ID:\KOSSDK\newlib/libc/include algorithms\sha1.c -o algorithms\sha1.o -Wall -Wextra
-kos32-gcc -c -fomit-frame-pointer -ID:\KOSSDK\newlib/libc/include algorithms\sha256.c -o algorithms\sha256.o -Wall -Wextra
-kos32-gcc -c -fomit-frame-pointer -ID:\KOSSDK\newlib/libc/include thashview.c -o thashview.o -Wall -Wextra
-
-kos32-ld thashview.o algorithms\md5.o algorithms\sha1.o algorithms\sha256.o -o thashview -call_shared -nostdlib --subsystem native -T D:\KOSSDK\newlib/app-dynamic.lds --image-base 0 -L "D:\KOSSDK\kos32-msys-5.4.0\win32\lib" -lgcc -lapp -lc.dll
-kos32-objcopy thashview -O binary
-@pause
-

programs/other/TinyHashView/installer/ASSOC.INI

@@ -1,196 +0,0 @@
-[THashView]
-exec=/sys/thashview
-icon=124
-next=$Quark
-
-[Quark]
-exec=/sys/QUARK
-icon=85
-next=$TinyPad
-
-[TinyPad]
-exec=/sys/tinypad
-icon=9
-next=$TextEditor
-
-[TextEditor]
-exec=/sys/develop/t_edit
-icon=58
-next=$WebView
-
-[Run]
-exec=/sys/run
-icon=55
-
-[FB2Read]
-exec=/sys/fb2read
-icon=44
-
-[WebView]
-exec=/sys/network/webview
-icon=31
-next=$TinyPad
-
-[zSea]
-exec=/kolibrios/media/zsea/zsea
-icon=46
-next=$KIV
-
-[KIV]
-exec=/sys/media/kiv
-icon=70
-next=$Animage
-
-[Animage]
-exec=/sys/media/animage
-icon=15
-
-[Pixie]
-exec=/sys/media/pixie
-icon=65
-next=$AC97snd
-
-[DosBox]
-exec=/kolibrios/emul/dosbox/dosbox
-icon=11
-
-[FPlay]
-exec=/kolibrios/media/fplay_run
-icon=40
-
-[AC97snd]
-exec=/sys/media/ac97snd
-icon=64
-
-[HexEditor]
-exec=/sys/develop/heed
-icon=22
-
-[KPack]
-exec=/sys/kpack
-icon=99
-
-[Unz]
-exec=/sys/unz
-icon=89
-
-[IconEdit]
-exec=/sys/media/iconedit
-icon=98
-
-[Assoc]
-/=/sys/file managers/eolite
-
-kf=/sys/KF_VIEW
-
-txt=$Quark
-log=$Quark
-c=$Quark
-h=$Quark
-cpp=$Quark
-
-asm=$TinyPad
-inc=$TinyPad
-mac=$TinyPad
-inf=$TinyPad
-conf=$TinyPad
-
-ini=$TextEditor
-
-fb2=$FB2Read
-
-htm=$WebView
-html=$WebView
-mht=$WebView
-docx=$WebView
-url=$WebView
-
-avi=$FPlay
-mkv=$FPlay
-wmv=$FPlay
-vob=$FPlay
-flv=$FPlay
-mp4=$FPlay
-mpg=$FPlay
-mpeg=$FPlay
-mov=$FPlay
-webm=$FPlay
-3gp=$FPlay
-divx=$FPlay
-
-png=$KIV
-jpg=$KIV
-jpeg=$KIV
-bmp=$KIV
-
-gif=$KIV
-ico=$KIV
-cur=$KIV
-pcx=$KIV
-pbm=$KIV
-pgm=$KIV
-pnm=$KIV
-tga=$KIV
-tif=$KIV
-tiff=$KIV
-wbmp=$KIV
-xbm=$KIV
-xcf=$KIV
-z80=$KIV
-
-mp3=$Pixie
-wav=$Pixie
-xm=$Pixie
-m3u=$AC97snd
-
-lap=/sys/media/listplay
-asf=/sys/media/listplay
-
-mid=/sys/media/midamp
-midi=/sys/media/midamp
-
-rtf=/sys/rtfread
-
-csv=/sys/table
-
-grf=/sys/graph
-
-com=$DosBox
-;bat=$DosBox
-;exe=$DosBox
-
-obj=/sys/develop/cObj
-
-raw=$HeEd
-
-shell=/sys/shell
-sh=/sys/shell
-
-3ds=/sys/3d/view3ds
-asc=/sys/3d/view3ds
-
-skn=/sys/skincfg
-dtp=/sys/skincfg
-lif=/kolibrios/demos/life2
-kla=/sys/games/klavisha
-pdf=/kolibrios/media/updf
-
-smc=/kolibrios/emul/zsnes
-mcr=/kolibrios/emul/psx4all
-nes=/kolibrios/emul/fceu/fceu
-sna=/kolibrios/emul/e80/e80
-gb=/kolibrios/emul/gameboy
-gbc=/kolibrios/emul/gameboy
-min=/kolibrios/emul/pokemini
-nc=/kolibrios/utils/cnc_editor/cnc_editor
-
-zip=$Unz
-7z=$Unz
-
-img=/sys/unimg
-
-bas=/kolibrios/develop/TinyBasic/TinyBasic
-
-vox=/kolibrios/3D/voxel_editor/VOXEL_EDITOR
-
-mgb=/sys/mgb

programs/other/TinyHashView/installer/SETUP.SH

@@ -1,6 +0,0 @@
-#SHS
-echo Starting installation ...
-cp thashview /rd/1/thashview
-cp icons32.png /rd/1/icons32.png
-cp ASSOC.INI /rd/1/Settings/ASSOC.ini
-echo Completed!

programs/other/TinyHashView/makefile

@@ -1,13 +0,0 @@
-all:
-	kos32-gcc -c -fomit-frame-pointer -I/usr/local/kos32/sdk/sources/newlib/libc/include ./algorithms/md5.c -o ./algorithms/md5.o -Wall -Wextra
-	kos32-gcc -c -fomit-frame-pointer -I/usr/local/kos32/sdk/sources/newlib/libc/include ./algorithms/sha1.c -o ./algorithms/sha1.o -Wall -Wextra
-	kos32-gcc -c -fomit-frame-pointer -I/usr/local/kos32/sdk/sources/newlib/libc/include ./algorithms/sha256.c -o ./algorithms/sha256.o -Wall -Wextra
-	kos32-gcc -c -fomit-frame-pointer -I/usr/local/kos32/sdk/sources/newlib/libc/include thashview.c -o thashview.o -Wall -Wextra
-	kos32-ld  -call_shared -nostdlib --subsystem native --image-base 0 -T /usr/local/kos32/sdk/sources/newlib/app-dynamic.lds -Map=thashview.map -L /usr/local/kos32/lib/ -L /usr/local/kos32/sdk/lib/  -o thashview ./algorithms/md5.o ./algorithms/sha1.o ./algorithms/sha256.o thashview.o -lgcc -lc.dll
-	kos32-strip thashview -o thashview
-	kos32-objcopy thashview -O binary
-clean:
-	rm -f *.o
-	rm -f algorithms/*.o
-
-

programs/other/TinyHashView/thashview.c

@@ -13,7 +13,7 @@
 #define FALSE 0;
 #define MAX_HASH_LEN 65 // Œ ªá¨¬ «ì­ ï ¤«¨­  áâப¨
 #define WINDOW_W 665
-#define VERSION "%s - thashview 2.2"
+#define VERSION "%s - thashview 2.3"
 
 typedef unsigned char bool;
 struct kolibri_system_colors sys_color_table;
@@ -169,7 +169,7 @@ void redraw_window() //
     pos_t win_pos = get_mouse_pos(0); //<2F>®«ãç ¥¬ ¯®§¨æ¨î ªãàá®à  ¬ëè¨.
     sprintf(title,VERSION, filename); // “áâ ­ ¢«¨¢ ¥¬ § £®«®¢®ª ®ª­ 
     begin_draw(); //<2F> ç¨­ ¥¬ à¨á®¢ ­¨¥ ¨­â¥àä¥©á  )
-    sys_create_window(win_pos.x, win_pos.y, WINDOW_W, 150, title, GREY, 0x14); // ‘®§¤ ñ¬ ®ª­®.
+    sys_create_window(win_pos.x, win_pos.y, WINDOW_W, 150, title, sys_color_table.work_area, 0x14); // ‘®§¤ ñ¬ ®ª­®.
 
     draw_bar(10, 121, 525,20, WHITE); // ‘®§¤ ñ¬ ¯àאַ㣮«ì­¨ª ¤«ï ¯®«ï ¢¢®¤ 
     draw_text_sys(edit_box_buff,15, 125, 0, 0x90000000| edit_box_text_color); // ‚뢮¤¨¬ ⥪áâ ¨§ ¡ãää¥à  ¢¢®¤ 
@@ -206,17 +206,21 @@ void redraw_window() //
 
 void paste_to_edit_buffer()    // ‚áâ ¢¨âì ¨§ ¡ãää¥à  ®¡¬¥­ 
 {
-    char *temp_buff;
+    char *temp_buff=NULL;
-    temp_buff=kol_clip_get(kol_clip_num()-1);
+    if(kol_clip_num()>0)
-    memset(edit_box_buff,0,MAX_HASH_LEN);
-    if(((int)*(temp_buff)>0) && ((int)*(temp_buff+4)==0) && ((int)*(temp_buff+8)==1))
     {
-        strncpy(edit_box_buff,temp_buff+12, MAX_HASH_LEN-1);
+        temp_buff=kol_clip_get(kol_clip_num()-1);
-        str_pos=strlen(edit_box_buff);
+        memset(edit_box_buff,0,MAX_HASH_LEN);
-        notify_show("'Pasted from clipboard!' -I");
+        if(((int)*(temp_buff)>0) && ((int)*(temp_buff+4)==0) && ((int)*(temp_buff+8)==1))
-        edit_box_text_color=BLACK;
+        {
+            strncpy(edit_box_buff,temp_buff+12, MAX_HASH_LEN-1);
+            str_pos=strlen(edit_box_buff);
+            notify_show("'Pasted from clipboard!' -I");
+            edit_box_text_color=BLACK;
+            user_free(temp_buff);
+        
+        }
     }
-    user_free(temp_buff);
 }
 
 
@@ -296,8 +300,7 @@ bool hash_compare() //
 
 void edit_box(oskey_t key)      //”ã­ªæ¨ï ॠ«¨§ãîé ï áâப㠢¢®¤ 
 {
-    edit_box_text_color=BLACK;
+    edit_box_text_color=sys_color_table.frame_area;
-
     if(key.code==CTRL_V) // …᫨ ­ ¦ â® Ctrl+V â® ¢áâ ¢¨âì ¨§ ¡ãä¥à  ®¡¬¥­ 
     {
         paste_to_edit_buffer();