From d51f1259a07274e78e29c8092c79bfe1af439224 Mon Sep 17 00:00:00 2001 From: "Mihail Semenyako (mike.dld)" Date: Tue, 30 Jan 2007 21:54:34 +0000 Subject: [PATCH] Added 'C' flag to 0-th system function: don't fill working area Modified Tinypad to use 'C' flag git-svn-id: svn://kolibrios.org@303 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/docs/sysfuncr.txt | 2 +- kernel/trunk/docs/sysfuncs.txt | 2 +- kernel/trunk/gui/skincode.inc | 2 ++ kernel/trunk/gui/window.inc | 4 ++++ programs/develop/tinypad/trunk/build_en.bat | 3 +-- programs/develop/tinypad/trunk/build_et.bat | 1 - programs/develop/tinypad/trunk/build_ru.bat | 3 +-- programs/develop/tinypad/trunk/tp-draw.asm | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/kernel/trunk/docs/sysfuncr.txt b/kernel/trunk/docs/sysfuncr.txt index 0d22dbd934..63e61289f9 100644 --- a/kernel/trunk/docs/sysfuncr.txt +++ b/kernel/trunk/docs/sysfuncr.txt @@ -33,7 +33,7 @@ используется подфункция 1 функции 71 * B = 1 - координаты всех графических примитивов задаются относительно клиентской области окна - * C зарезервирован (устанавливайте в 0) + * C = 1 - не закрашивать рабочую область при отрисовке окна * D = 0 - нормальная заливка рабочей области, 1 - градиентная Следующие параметры предназначены для окон типа I и II и игнорируются для стилей Y=1,3: diff --git a/kernel/trunk/docs/sysfuncs.txt b/kernel/trunk/docs/sysfuncs.txt index 38d8a6b21d..2a9fdb4c32 100644 --- a/kernel/trunk/docs/sysfuncs.txt +++ b/kernel/trunk/docs/sysfuncs.txt @@ -32,7 +32,7 @@ Parameters: subfunction 1 of function 71 * B = 1 - coordinates of all graphics primitives are relative to window client area - * C is reserved (set to 0) + * C = 1 - don't fill working area on window draw * D = 0 - normal filling of the working area, 1 - gradient The following parameters are intended for windows of a type I and II, and ignored for styles Y=1,3: diff --git a/kernel/trunk/gui/skincode.inc b/kernel/trunk/gui/skincode.inc index fe5e6d94a7..961d6a6897 100644 --- a/kernel/trunk/gui/skincode.inc +++ b/kernel/trunk/gui/skincode.inc @@ -346,6 +346,8 @@ drawwindow_IV: sub ecx,4 sub edx,4 mov edi,[esi+WDATA.cl_workarea] + test edi,0x40000000 + jnz _noinside2 call [drawbar] _noinside2: diff --git a/kernel/trunk/gui/window.inc b/kernel/trunk/gui/window.inc index 71aeb66a62..32e4474f67 100644 --- a/kernel/trunk/gui/window.inc +++ b/kernel/trunk/gui/window.inc @@ -737,6 +737,8 @@ drawwindow_I: mov ecx,[esi+WDATA.box.width] mov edx,[esi+WDATA.box.height] mov edi,[esi+WDATA.cl_workarea] + test edi,0x40000000 + jnz noinside call [drawbar] noinside: @@ -888,6 +890,8 @@ drawwindow_III: sub ecx,4 sub edx,4 mov edi,[esi+WDATA.cl_workarea] + test edi,0x40000000 + jnz noinside2 call [drawbar] noinside2: diff --git a/programs/develop/tinypad/trunk/build_en.bat b/programs/develop/tinypad/trunk/build_en.bat index fc5a855cba..ff1bed18ca 100644 --- a/programs/develop/tinypad/trunk/build_en.bat +++ b/programs/develop/tinypad/trunk/build_en.bat @@ -1,5 +1,4 @@ -@erase lang.inc @echo lang fix en >lang.inc -@fasm tinypad.asm tinypad.bin +@fasm tinypad.asm tinypad @erase lang.inc @pause \ No newline at end of file diff --git a/programs/develop/tinypad/trunk/build_et.bat b/programs/develop/tinypad/trunk/build_et.bat index b18635cb6d..a9f505e97b 100644 --- a/programs/develop/tinypad/trunk/build_et.bat +++ b/programs/develop/tinypad/trunk/build_et.bat @@ -1,4 +1,3 @@ -@erase lang.inc @echo lang fix et >lang.inc @fasm tinypad.asm tinypad @erase lang.inc diff --git a/programs/develop/tinypad/trunk/build_ru.bat b/programs/develop/tinypad/trunk/build_ru.bat index e2d253d96a..9042ac4313 100644 --- a/programs/develop/tinypad/trunk/build_ru.bat +++ b/programs/develop/tinypad/trunk/build_ru.bat @@ -1,5 +1,4 @@ -@erase lang.inc @echo lang fix ru >lang.inc -@fasm tinypad.asm tinypad.bin +@fasm tinypad.asm tinypad @erase lang.inc @pause \ No newline at end of file diff --git a/programs/develop/tinypad/trunk/tp-draw.asm b/programs/develop/tinypad/trunk/tp-draw.asm index 06edfb0f75..981d0045fa 100644 --- a/programs/develop/tinypad/trunk/tp-draw.asm +++ b/programs/develop/tinypad/trunk/tp-draw.asm @@ -15,7 +15,7 @@ func drawwindow ;///// DRAW WINDOW /////////////////////////////////////////// m2m [sc.work],dword[color_tbl.back] mov edx,[sc.work] - add edx,0x33000000 + add edx,0x73000000 mov ebx,[mainwnd_pos.x-2] mov bx,word[mainwnd_pos.w] mov ecx,[mainwnd_pos.y-2]