From c0d0307a442324812128daea331f8447c07a73d1 Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Wed, 19 Jan 2011 20:05:36 +0000 Subject: [PATCH] 1) Fix for HEED - the event of mouse processed only if the window on "top of stack" is now 2) Fix MENU.DAT for current path of HEED on ramdisk git-svn-id: svn://kolibrios.org@1753 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/menu.dat | 2 +- data/rus/menu.dat | 2 +- programs/develop/heed/trunk/build.sh | 1 + programs/develop/heed/trunk/heed.asm | 10 ++++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/data/eng/menu.dat b/data/eng/menu.dat index 94c887b567..c40130492e 100644 --- a/data/eng/menu.dat +++ b/data/eng/menu.dat @@ -126,7 +126,7 @@ Calculator /rd/1/calc TinyPad /rd/1/tinypad Table Processor /rd/1/table Graph builder /rd/1/graph -Hex-Editor /rd/1/demos/heed +Hex-Editor /rd/1/develop/heed #15 **** NET **** Servers > /@16 Clients > /@17 diff --git a/data/rus/menu.dat b/data/rus/menu.dat index 52af897c6f..c86227de97 100644 --- a/data/rus/menu.dat +++ b/data/rus/menu.dat @@ -129,7 +129,7 @@ SysXTree /rd/1/sysxtree Текстовый редактор /rd/1/tinypad Табличный процессор /rd/1/table Построение графиков /rd/1/graph -HEX-редактор /rd/1/demos/heed +HEX-редактор /rd/1/develop/heed #15 **** NET **** Серверы > /@16 Клиенты > /@17 diff --git a/programs/develop/heed/trunk/build.sh b/programs/develop/heed/trunk/build.sh index 7c125fc850..74f032ab08 100755 --- a/programs/develop/heed/trunk/build.sh +++ b/programs/develop/heed/trunk/build.sh @@ -6,6 +6,7 @@ echo "lang fix en" > lang.inc mkdir bin fasm -m 16384 heed.asm ./bin/heed + kpack ./bin/heed rm -f lang.inc exit 0 diff --git a/programs/develop/heed/trunk/heed.asm b/programs/develop/heed/trunk/heed.asm index 296dbb7910..4f19aa7000 100644 --- a/programs/develop/heed/trunk/heed.asm +++ b/programs/develop/heed/trunk/heed.asm @@ -149,6 +149,10 @@ load_libraries l_libs_start,end_l_libs call ready_screen_buffer ; jmp open_file + mcall 9,procinfo,-1 + mov ecx,[ebx+30] ; PID + mcall 18,21 + mov [active_process],eax ; WINDOW SLOT redraw_all: call control_minimal_window_size @@ -321,6 +325,10 @@ button: align 4 mouse: + mcall 18,7 + cmp [active_process],eax + jne still + mcall 37,7 test eax,eax jz .menu_bar_1;.mouse @@ -3385,6 +3393,8 @@ shblock_end rd 1 ;смещен file_size rd 1 ; rd 1 ;под старший dword +active_process rd 1 + ed_box_data: rd 8 ;первый dword -кол-во элементов для обработки, далее указатели на editX; bufferfinfo rb 40