| 56,7 → 56,8 |
|---|
| call drawwindow_I |
| jmp window._.draw_window_caption.2 |
| |
| @@: dec al |
| @@: |
| dec al |
| jnz @f |
| |
| ; type II - only reserve area, no draw |
| 65,7 → 66,8 |
|---|
| call [draw_pointer] |
| jmp .exit |
| |
| @@: dec al |
| @@: |
| dec al |
| jnz @f |
| |
| ; type III - new style |
| 73,7 → 75,8 |
|---|
| jmp window._.draw_window_caption.2 |
| |
| ; type IV & V - skinned window (resizable & not) |
| @@: mov eax, [TASK_COUNT] |
| @@: |
| mov eax, [TASK_COUNT] |
| movzx eax, word[WIN_POS + eax * 2] |
| cmp eax, [CURRENT_TASK] |
| setz al |
| 133,7 → 136,8 |
|---|
| cmp ebx, .sizeof.ftable / 4 |
| ja @f |
| jmp [.ftable + ebx * 4] |
| @@: ret |
| @@: |
| ret |
| |
| |
| align 4 |
| 210,11 → 214,13 |
|---|
| or eax, eax |
| jge @f |
| xor eax, eax |
| @@: mov [screen_workarea.left], eax |
| @@: |
| mov [screen_workarea.left], eax |
| cmp ebx, edi |
| jle @f |
| mov ebx, edi |
| @@: mov [screen_workarea.right], ebx |
| @@: |
| mov [screen_workarea.right], ebx |
| |
| .check_horizontal: |
| mov edi, [Screen_Max_Y] |
| 227,11 → 233,13 |
|---|
| or eax, eax |
| jge @f |
| xor eax, eax |
| @@: mov [screen_workarea.top], eax |
| @@: |
| mov [screen_workarea.top], eax |
| cmp ebx, edi |
| jle @f |
| mov ebx, edi |
| @@: mov [screen_workarea.bottom], ebx |
| @@: |
| mov [screen_workarea.bottom], ebx |
| |
| .check_if_redraw_needed: |
| or esi, esi |
| 328,17 → 336,21 |
|---|
| cmp ebx, -1 |
| jne @f |
| mov ebx, [edi + WDATA.box.left] |
| @@: cmp ecx, -1 |
| @@: |
| cmp ecx, -1 |
| jne @f |
| mov ecx, [edi + WDATA.box.top] |
| @@: cmp edx, -1 |
| @@: |
| cmp edx, -1 |
| jne @f |
| mov edx, [edi + WDATA.box.width] |
| @@: cmp esi, -1 |
| @@: |
| cmp esi, -1 |
| jne @f |
| mov esi, [edi + WDATA.box.height] |
| |
| @@: push esi edx ecx ebx |
| @@: |
| push esi edx ecx ebx |
| mov eax, esp |
| mov bl, [edi + WDATA.fl_wstate] |
| call window._.set_window_box |
| 399,7 → 411,8 |
|---|
| push eax ecx |
| xor eax, eax |
| mov ecx, WIN_STACK |
| @@: inc eax |
| @@: |
| inc eax |
| add ecx, 2 |
| ; process no |
| mov [ecx + 0x000], ax |
| 466,17 → 479,21 |
|---|
| cmp eax, [esp + RECT.left] |
| jae @f |
| mov eax, [esp + RECT.left] |
| @@: cmp ebx, [esp + RECT.top] |
| @@: |
| cmp ebx, [esp + RECT.top] |
| jae @f |
| mov ebx, [esp + RECT.top] |
| @@: cmp ecx, [esp + RECT.right] |
| @@: |
| cmp ecx, [esp + RECT.right] |
| jbe @f |
| mov ecx, [esp + RECT.right] |
| @@: cmp edx, [esp + RECT.bottom] |
| @@: |
| cmp edx, [esp + RECT.bottom] |
| jbe @f |
| mov edx, [esp + RECT.bottom] |
| |
| @@: push esi |
| @@: |
| push esi |
| movzx esi, word[WIN_POS + esi * 2] |
| call window._.set_screen |
| pop esi |
| 520,7 → 537,8 |
|---|
| sub eax, ebx |
| jle @f |
| mov [edi + WDATA.box.width], ebx |
| @@: sub ebx, [edi + WDATA.box.width] |
| @@: |
| sub ebx, [edi + WDATA.box.width] |
| mov [edi + WDATA.box.left], ebx |
| |
| .fix_vertical: |
| 533,7 → 551,8 |
|---|
| sub eax, ebx |
| jle @f |
| mov [edi + WDATA.box.height], ebx |
| @@: sub ebx, [edi + WDATA.box.height] |
| @@: |
| sub ebx, [edi + WDATA.box.height] |
| mov [edi + WDATA.box.top], ebx |
| jmp .fix_client_box |
| |
| 655,7 → 674,8 |
|---|
| cmp ebx, eax |
| jbe @f |
| mov ebx, eax |
| @@: push ebx |
| @@: |
| push ebx |
| |
| xor edi, edi |
| |
| 674,7 → 694,8 |
|---|
| jz @f |
| sub ecx, 0x00040404 |
| mov [esi + WDATA.cl_titlebar], ecx |
| @@: and ecx, 0x00ffffff |
| @@: |
| and ecx, 0x00ffffff |
| call [draw_line] |
| inc edx |
| cmp edx, [esp] |
| 753,7 → 774,8 |
|---|
| cmp ebx, eax |
| jb @f |
| mov ebx, eax |
| @@: push ebx |
| @@: |
| push ebx |
| |
| xor edi, edi |
| |
| 770,10 → 792,12 |
|---|
| test ecx, 0x40000000 |
| jz @f |
| add ecx, 0x00040404 |
| @@: test ecx, 0x80000000 |
| @@: |
| test ecx, 0x80000000 |
| jz @f |
| sub ecx, 0x00040404 |
| @@: mov [esi + WDATA.cl_titlebar], ecx |
| @@: |
| mov [esi + WDATA.cl_titlebar], ecx |
| and ecx, 0x00ffffff |
| call [draw_line] |
| inc edx |
| 987,7 → 1011,8 |
|---|
| cmp eax, [TASK_COUNT] |
| jz @f |
| mov ebp, calculatescreen |
| @@: mov eax, [edi + WDATA.box.left] |
| @@: |
| mov eax, [edi + WDATA.box.left] |
| mov ebx, [edi + WDATA.box.top] |
| mov ecx, [edi + WDATA.box.width] |
| mov edx, [edi + WDATA.box.height] |
| 1022,7 → 1047,8 |
|---|
| call minimize_window |
| jmp .exit |
| |
| @@: call restore_minimized_window |
| @@: |
| call restore_minimized_window |
| |
| .exit: |
| ret |
| 1083,7 → 1109,8 |
|---|
| mov [ecx + BOX.height], eax |
| xchg eax, ecx |
| |
| @@: call window._.set_window_box |
| @@: |
| call window._.set_window_box |
| add esp, BOX.sizeof |
| |
| .exit: |
| 1124,7 → 1151,8 |
|---|
| lea eax, [edx + APPDATA.saved_box] |
| jmp .set_box |
| |
| @@: mov eax, [screen_workarea.top] |
| @@: |
| mov eax, [screen_workarea.top] |
| push [screen_workarea.bottom] \ |
| [edi + WDATA.box.width] \ |
| eax \ |
| 1232,7 → 1260,8 |
|---|
| cmp ecx, edx |
| jle @f |
| mov ecx, edx |
| @@: mov [draw_limits.left], ecx |
| @@: |
| mov [draw_limits.left], ecx |
| mov ecx, [eax + BOX.left] |
| add ecx, [eax + BOX.width] |
| add edx, [ebx + BOX.width] |
| 1239,13 → 1268,15 |
|---|
| cmp ecx, edx |
| jae @f |
| mov ecx, edx |
| @@: mov [draw_limits.right], ecx |
| @@: |
| mov [draw_limits.right], ecx |
| mov ecx, [eax + BOX.top] |
| mov edx, [ebx + BOX.top] |
| cmp ecx, edx |
| jle @f |
| mov ecx, edx |
| @@: mov [draw_limits.top], ecx |
| @@: |
| mov [draw_limits.top], ecx |
| mov ecx, [eax + BOX.top] |
| add ecx, [eax + BOX.height] |
| add edx, [ebx + BOX.height] |
| 1252,7 → 1283,8 |
|---|
| cmp ecx, edx |
| jae @f |
| mov ecx, edx |
| @@: mov [draw_limits.bottom], ecx |
| @@: |
| mov [draw_limits.bottom], ecx |
| |
| ; recalculate screen buffer at old position |
| push ebx |
| 1477,7 → 1509,8 |
|---|
| |
| xor eax, eax |
| |
| @@: mov [edi + APPDATA.wnd_caption], eax |
| @@: |
| mov [edi + APPDATA.wnd_caption], eax |
| |
| mov esi, [esp] |
| add edi, APPDATA.saved_box |
| 1601,7 → 1634,8 |
|---|
| jne @f |
| mov eax, [_skinh] |
| ret |
| @@: mov eax, 21 |
| @@: |
| mov eax, 21 |
| ret |
| |
| align 4 |
| 1619,11 → 1653,13 |
|---|
| mov eax, [_skinh] |
| add eax, 3 |
| ret |
| @@: or al, al |
| @@: |
| or al, al |
| jnz @f |
| mov eax, 21 |
| ret |
| @@: mov eax, 21 + 2 |
| @@: |
| mov eax, 21 + 2 |
| ret |
| |
| align 4 |
| 1770,7 → 1806,8 |
|---|
| mov eax, esi |
| mov [ebp], al |
| ; -- end body -- |
| @@: inc ebp |
| @@: |
| inc ebp |
| inc edx |
| cmp edx, [ff_xsz] |
| jb .ff_new_x |
| 2014,7 → 2051,8 |
|---|
| cmp edx, [CURRENT_TASK] |
| jne @f |
| inc eax |
| @@: mov edx, [CURRENT_TASK] |
| @@: |
| mov edx, [CURRENT_TASK] |
| shl edx, 5 |
| add edx, window_data |
| movzx ebx, [edx + WDATA.fl_wstyle] |
| 2045,7 → 2083,8 |
|---|
| |
| call drawwindow_I_caption |
| |
| .2: mov edi, [CURRENT_TASK] |
| .2: |
| mov edi, [CURRENT_TASK] |
| shl edi, 5 |
| test [edi + window_data + WDATA.fl_wstyle], WSTYLE_HASCAPTION |
| jz .exit |
| Property changes: |
|---|
| Added: svn:eol-style |
|---|
| +native |
|---|
| \ No newline at end of property |
|---|