From 608f4346d0baa3996154d2f946717ec8958dc534 Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Tue, 27 Sep 2011 07:12:16 +0000 Subject: [PATCH] Icon - deactivate the window after click (working to kernel r.2244 and above) git-svn-id: svn://kolibrios.org@2245 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/system/icon/trunk/build.sh | 13 +++++++++++++ programs/system/icon/trunk/build_en.bat | 3 ++- programs/system/icon/trunk/build_ge.bat | 3 ++- programs/system/icon/trunk/build_ru.bat | 3 ++- programs/system/icon/trunk/icon.asm | 19 +++++++++++++++---- 5 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 programs/system/icon/trunk/build.sh diff --git a/programs/system/icon/trunk/build.sh b/programs/system/icon/trunk/build.sh new file mode 100644 index 000000000..8c39dcb70 --- /dev/null +++ b/programs/system/icon/trunk/build.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# This script does for Linux the same as build.bat for DOS, +# it compiles the current KolibriOS applications + + echo "lang fix en" + echo "lang fix en" > lang.inc + fasm -m 16384 icon.asm icon + kpack icon + rm -f lang.inc + exit 0 + + + diff --git a/programs/system/icon/trunk/build_en.bat b/programs/system/icon/trunk/build_en.bat index 88c2ba40b..67cb2d57e 100644 --- a/programs/system/icon/trunk/build_en.bat +++ b/programs/system/icon/trunk/build_en.bat @@ -1,5 +1,6 @@ @erase lang.inc @echo lang fix en >lang.inc -@fasm icon.asm icon +@fasm -m 16384 icon.asm icon +@kpack icon @erase lang.inc @pause \ No newline at end of file diff --git a/programs/system/icon/trunk/build_ge.bat b/programs/system/icon/trunk/build_ge.bat index f07bb212c..566eed39b 100644 --- a/programs/system/icon/trunk/build_ge.bat +++ b/programs/system/icon/trunk/build_ge.bat @@ -1,5 +1,6 @@ @erase lang.inc @echo lang fix ge >lang.inc -@fasm icon.asm icon +@fasm -m 16384 icon.asm icon +@kpack icon @erase lang.inc @pause \ No newline at end of file diff --git a/programs/system/icon/trunk/build_ru.bat b/programs/system/icon/trunk/build_ru.bat index 9099b9cd6..2a07c3bf9 100644 --- a/programs/system/icon/trunk/build_ru.bat +++ b/programs/system/icon/trunk/build_ru.bat @@ -1,5 +1,6 @@ @erase lang.inc @echo lang fix ru >lang.inc -@fasm icon.asm icon +@fasm -m 16384 icon.asm icon +@kpack icon @erase lang.inc @pause \ No newline at end of file diff --git a/programs/system/icon/trunk/icon.asm b/programs/system/icon/trunk/icon.asm index fdff48c39..dd5ade0c2 100644 --- a/programs/system/icon/trunk/icon.asm +++ b/programs/system/icon/trunk/icon.asm @@ -955,7 +955,6 @@ thread: mcall still2: - mov eax,10 mcall @@ -991,7 +990,8 @@ still2: @@: call get_bg_info mcall 67,[ebp+0],[ebp+4],51,51 - .lp1: call draw_window2 + .lp1: + call draw_window2 jmp still2 button2: @@ -1001,6 +1001,18 @@ still2: cmp ah, 2 jnz still2 + mcall 9,I_END,-1 + mov ecx,[ebx+30] ; PID + mcall 18,21 + mov edx,eax ; SLOT + mcall 18,7 + cmp edx,eax ; compare with active SLOT + jne @f + mov ecx,edx + mcall 18,1 ; set to down + call draw_window2 +@@: + mov esi,[ebp+8] mov ebx,1 mov edi,finfo.path @@ -1352,10 +1364,9 @@ create_thread_event db 0 image dd 0x3000 I_Param: - icon_data = I_END+0x1400 process_table = I_END+0x2400 - + bgrx dd ? bgry dd ? param_str rb 31