From 725fe0911ef7e17a9c32b742ade1da09a4fe07ac Mon Sep 17 00:00:00 2001
From: "Marat Zakiyanov (Mario79)" <mario79@bk.ru>
Date: Thu, 5 Nov 2009 21:31:58 +0000
Subject: [PATCH] Box_Lib: 1) Small fix for FileBrowser control. 2) OpenDialog
 - fix for Tab key and additional associations for icons.

git-svn-id: svn://kolibrios.org@1248 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 .../libraries/box_lib/asm/trunk/OpenDial.asm  | 35 +++++++++++++++++--
 .../libraries/box_lib/asm/trunk/icons.ini     |  3 ++
 .../libraries/box_lib/trunk/filebrowser.mac   |  6 ++--
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/programs/develop/libraries/box_lib/asm/trunk/OpenDial.asm b/programs/develop/libraries/box_lib/asm/trunk/OpenDial.asm
index 4ef90a3538..a353f4108b 100644
--- a/programs/develop/libraries/box_lib/asm/trunk/OpenDial.asm
+++ b/programs/develop/libraries/box_lib/asm/trunk/OpenDial.asm
@@ -176,8 +176,10 @@ key:
 	je	NumPad_invert_Up
 	cmp	ah,158
 	je	symbol_a_up
-	cmp	ah,15 ;143 ; Tab
-	je	change_focus_area
+	cmp	ah,15 ; Tab down
+	je	change_focus_area_press_Tab_key
+	cmp	ah,143 ; Tab up
+	je	change_focus_area_check_Tab_key
 	jmp	still
 .extended_key:
 	mov	[extended_key],0
@@ -269,6 +271,30 @@ key:
 @@:
 	ret
 ;---------------------------------------------------------------------
+change_focus_area_Tab_key_ASCII:
+	xor	eax,eax
+	inc	eax
+	mov	[Tab_key_block],al
+	jmp	change_focus_area
+;---------------------------------------------------------------------
+change_focus_area_press_Tab_key:
+	mov	al,[Tab_key_block]
+	test	al,al
+	jnz	still
+	xor	eax,eax
+	inc	eax
+	mov	[Tab_key],al
+	jmp	still
+;---------------------------------------------------------------------
+change_focus_area_check_Tab_key:
+	xor	eax,eax
+	mov	[Tab_key_block],al
+	mov	al,[Tab_key]
+	test	al,al
+	jz	still
+	xor	eax,eax
+	mov	[Tab_key],al
+;---------------------------------------------------------------------
 change_focus_area:
 	mov	al,[focus_pointer]
 	inc	al
@@ -295,7 +321,7 @@ change_focus_area:
 key_ASCII:
 	mcall	2
 	cmp	ah,9
-	je	change_focus_area
+	je	change_focus_area_Tab_key_ASCII
 	cmp	ah,13
 	je	.load_dir
 	cmp	ah,27
@@ -2306,6 +2332,9 @@ alt_flag	db 0
 
 error_window	db 0
 
+Tab_key		db 0
+Tab_key_block	db 0
+
 filter_flag	db 1
 
 focus_pointer	db 0
diff --git a/programs/develop/libraries/box_lib/asm/trunk/icons.ini b/programs/develop/libraries/box_lib/asm/trunk/icons.ini
index e1876afbe6..e4690bf7bc 100644
--- a/programs/develop/libraries/box_lib/asm/trunk/icons.ini
+++ b/programs/develop/libraries/box_lib/asm/trunk/icons.ini
@@ -10,6 +10,7 @@ exc=3
 wtx=3
 inf=3
 xml=3
+odt=3
 jpg=6
 jpe=6
 jpeg=6
@@ -88,6 +89,7 @@ flv=11
 mkv=11
 wmv=11
 mov=11
+mp4=11
 img=5
 ima=5
 imz=5
@@ -127,6 +129,7 @@ mt=12
 htm=13
 html=13
 mht=13
+eml=13
 lif=14
 3ds=15
 kex=16
diff --git a/programs/develop/libraries/box_lib/trunk/filebrowser.mac b/programs/develop/libraries/box_lib/trunk/filebrowser.mac
index a6a760bc58..7c5f7f97ef 100644
--- a/programs/develop/libraries/box_lib/trunk/filebrowser.mac
+++ b/programs/develop/libraries/box_lib/trunk/filebrowser.mac
@@ -1014,9 +1014,9 @@ fb_mouse:
 	mov	fb_mouse_keys_delta,edx
 	jmp	.exit_fb
 .enter_1:
-	mov	eax,fb_mouse_keys_old
-	cmp	fb_mouse_keys,eax
-	jz	.exit_fb
+;	mov	eax,fb_mouse_keys_old
+;	cmp	fb_mouse_keys,eax
+;	jz	.exit_fb
 	test	fb_mouse_keys,10b
 	jne	.mark_mouse
 	mov	edx,2