From d81e718e9bab143993a21ce4f37efb7c628430d6 Mon Sep 17 00:00:00 2001 From: "Sergey Semyonov (Serge)" Date: Tue, 28 May 2013 19:40:50 +0000 Subject: [PATCH] Kernel: remove useless MOUSE_DOWN MOUSE_BACKGROUND DONT_DRAW_MOUSE. git-svn-id: svn://kolibrios.org@3558 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/const.inc | 4 ---- kernel/trunk/core/sys32.inc | 3 --- kernel/trunk/gui/window.inc | 6 ------ kernel/trunk/kernel.asm | 6 ------ 4 files changed, 19 deletions(-) diff --git a/kernel/trunk/const.inc b/kernel/trunk/const.inc index 574a8362b5..7830498c80 100644 --- a/kernel/trunk/const.inc +++ b/kernel/trunk/const.inc @@ -234,7 +234,6 @@ MOUSE_SCROLL_V equ (OS_BASE+0x000FB0E) MOUSE_COLOR_MEM equ (OS_BASE+0x000FB10) COLOR_TEMP equ (OS_BASE+0x000FB30) BTN_DOWN equ (OS_BASE+0x000FB40) -MOUSE_DOWN equ (OS_BASE+0x000FB44) X_UNDER equ (OS_BASE+0x000FB4A) Y_UNDER equ (OS_BASE+0x000FB4C) @@ -256,9 +255,6 @@ TASK_ACTIVATE equ (OS_BASE+0x000FF01) REDRAW_BACKGROUND equ (OS_BASE+0x000FFF0) BANK_RW equ (OS_BASE+0x000FFF2) -MOUSE_BACKGROUND equ (OS_BASE+0x000FFF4) -DONT_DRAW_MOUSE equ (OS_BASE+0x000FFF5) -;DONT_SWITCH equ (OS_BASE+0x000FFFF) TMP_STACK_TOP equ 0x006CC00 diff --git a/kernel/trunk/core/sys32.inc b/kernel/trunk/core/sys32.inc index 045290e37b..1f3b4837b4 100644 --- a/kernel/trunk/core/sys32.inc +++ b/kernel/trunk/core/sys32.inc @@ -675,9 +675,6 @@ terminate: ; terminate application xor esi, esi call redrawscreen - mov [MOUSE_BACKGROUND], byte 0; no mouse background - mov [DONT_DRAW_MOUSE], byte 0; draw mouse - call unlock_application_table ;mov esi,process_terminated ;call sys_msg_board_str diff --git a/kernel/trunk/gui/window.inc b/kernel/trunk/gui/window.inc index 10360922ba..aa23575101 100644 --- a/kernel/trunk/gui/window.inc +++ b/kernel/trunk/gui/window.inc @@ -992,7 +992,6 @@ waredraw: ;//////////////////////////////////////////////////////////////////// jz .do_not_draw ; yes it is, activate and update screen buffer - mov byte[MOUSE_DOWN], 1 call window._.window_activate pushad @@ -1025,13 +1024,9 @@ align 4 ; no it's not, just activate the window call window._.window_activate xor eax, eax - mov byte[MOUSE_BACKGROUND], al - mov byte[DONT_DRAW_MOUSE], al - dec eax ;-------------------------------------- align 4 .exit: - mov byte[MOUSE_DOWN], 0 inc eax ret ;------------------------------------------------------------------------------ @@ -1184,7 +1179,6 @@ align 4 add edx, ebx call ebp inc [_display.mask_seqno] - mov byte[MOUSE_BACKGROUND], 0 ;-------------------------------------- align 4 .exit: diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index 50fce8e205..25e9f67c8e 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -2221,11 +2221,6 @@ sysfn_deactivate: ; 18.1 = DEACTIVATE WINDOW lea esi, [WIN_POS + esi * 2] call window._.window_deactivate - xor eax, eax - mov byte[MOUSE_BACKGROUND], al - mov byte[DONT_DRAW_MOUSE], al - mov byte[MOUSE_DOWN], 0 - call syscall_display_settings._.calculate_whole_screen call syscall_display_settings._.redraw_whole_screen .nowindowdeactivate: @@ -3559,7 +3554,6 @@ set_bgr_event: mov [draw_data+32 + RECT.top], eax mov [draw_data+32 + RECT.right], eax mov [draw_data+32 + RECT.bottom], eax - mov [MOUSE_BACKGROUND], byte 0 ;-------------------------------------- align 4 nobackgr: