forked from KolibriOS/kolibrios
Mods by vhanla:
- Window is grabbed to drag only if you CLICK on its grab area (ie. the title bar) - Button is selected only if it is clicked on its area git-svn-id: svn://kolibrios.org@415 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
heavyiron
parent
2a81124ad8
commit
5efd9e7bcf
@ -458,9 +458,11 @@ checkbuttons:
|
||||
|
||||
cmp [BTN_DOWN],byte 0 ; mouse buttons pressed
|
||||
jnz @f
|
||||
;..................................... start 1/5 : modified by vhanla .............................
|
||||
mov [bPressedMouseXY_B],0
|
||||
;..................................... end 1/5 : modified by vhanla .............................
|
||||
ret
|
||||
@@:
|
||||
|
||||
pushad
|
||||
|
||||
xor esi, esi
|
||||
@ -472,6 +474,20 @@ checkbuttons:
|
||||
ret
|
||||
|
||||
@@:
|
||||
;..................................... start 2/5 : modified by vhanla .............................
|
||||
;here i catch the coordinates when the mouse's button is clicked
|
||||
push ax
|
||||
cmp [bPressedMouseXY_B],0;FALSE
|
||||
jnz @f
|
||||
mov [bPressedMouseXY_B],1;TRUE - it was already clicked
|
||||
mov ax,[MOUSE_X]
|
||||
mov [mx],ax
|
||||
mov ax,[MOUSE_Y]
|
||||
mov [my],ax
|
||||
@@:
|
||||
pop ax
|
||||
;and it is only refreshed after the mouse's button release
|
||||
;..................................... end 2/5 : modified by vhanla .............................
|
||||
|
||||
push esi
|
||||
inc edx
|
||||
@ -496,10 +512,6 @@ checkbuttons:
|
||||
shl eax,4
|
||||
add eax,edi
|
||||
|
||||
;......................start 1/2 : modified by vhanla .............................
|
||||
mov [buttonid],eax
|
||||
;......................end 1/2 : modified by vhanla .............................
|
||||
|
||||
; check that button is at top of windowing stack
|
||||
|
||||
movzx ebx,word [eax]
|
||||
@ -534,7 +546,9 @@ checkbuttons:
|
||||
mov ecx, [ebx+WDATA.box.left] ; window x start
|
||||
movzx edx,word [eax+4] ; button x start
|
||||
add edx,ecx
|
||||
mov cx,[MOUSE_X]
|
||||
;..................................... start 3/5 : modified by vhanla .............................
|
||||
mov cx,[mx] ;mov cx,[MOUSE_X]
|
||||
;..................................... end 3/5 : modified by vhanla .............................
|
||||
cmp edx,ecx
|
||||
jg buttonnewcheck
|
||||
|
||||
@ -550,7 +564,9 @@ checkbuttons:
|
||||
mov ecx, [ebx+WDATA.box.top] ; window y start
|
||||
movzx edx,word [eax+8] ; button y start
|
||||
add edx,ecx
|
||||
mov cx,[MOUSE_Y]
|
||||
;..................................... start 4/5 : modified by vhanla .............................
|
||||
mov cx,[my] ;mov cx,[MOUSE_Y]
|
||||
;..................................... start 4/5 : modified by vhanla .............................
|
||||
cmp edx,ecx
|
||||
jg buttonnewcheck
|
||||
|
||||
@ -591,11 +607,13 @@ checkbuttons:
|
||||
call negativebutton
|
||||
mov [MOUSE_BACKGROUND],byte 0 ; no mouse background
|
||||
mov [DONT_DRAW_MOUSE],byte 0 ; draw mouse
|
||||
;..................................... start 2/2 : modified by vhanla .............................
|
||||
;..................................... start 5/5 : modified by vhanla .............................
|
||||
; check coordinates
|
||||
jmp afterbuttonid
|
||||
buttonid dd 0x0 ;here a will backup the eax value
|
||||
afterbuttonid:
|
||||
jmp @f
|
||||
mx dw 0x0 ; keeps the x mouse's position when it was clicked
|
||||
my dw 0x0 ; keeps the y mouse's position when it was clicked
|
||||
bPressedMouseXY_B db 0x0
|
||||
@@:
|
||||
|
||||
pusha
|
||||
; mouse x >= button x ?
|
||||
@ -645,4 +663,4 @@ yes_on_button:
|
||||
popa
|
||||
ret
|
||||
|
||||
;..................................... end 2/2 : modified by vhanla ................................
|
||||
;..................................... end 5/5 : modified by vhanla ................................
|
||||
|
||||
@ -1189,13 +1189,33 @@ checkwindows:
|
||||
|
||||
cmp [BTN_DOWN],byte 0 ; mouse buttons pressed ?
|
||||
jne .mouse_buttons_pressed
|
||||
;..................................... start 1/4 : modified by vhanla .................
|
||||
mov [bPressedMouseXY_W],0
|
||||
;..................................... end 1/4 : modified by vhanla ...................
|
||||
popad
|
||||
ret
|
||||
.mouse_buttons_pressed:
|
||||
|
||||
;..................................... start 2/4 : modified by vhanla .................
|
||||
jmp @f
|
||||
bPressedMouseXY_W db 0x0
|
||||
@@:
|
||||
;..................................... end 2/4 : modified by vhanla ...................
|
||||
mov esi,[TASK_COUNT]
|
||||
inc esi
|
||||
|
||||
;..................................... start 3/4 : modified by vhanla .................
|
||||
push ax
|
||||
cmp [bPressedMouseXY_W],0
|
||||
jnz @f
|
||||
mov [bPressedMouseXY_W],1
|
||||
mov ax,[MOUSE_X]
|
||||
mov [mx],ax
|
||||
mov ax,[MOUSE_Y]
|
||||
mov [my],ax
|
||||
@@:
|
||||
pop ax
|
||||
;..................................... end 3/4 : modified by vhanla ...................
|
||||
|
||||
cwloop:
|
||||
cmp esi,2
|
||||
jb .exit
|
||||
@ -1213,9 +1233,10 @@ checkwindows:
|
||||
test [edi+WDATA.fl_wstate],WSTATE_MINIMIZED
|
||||
jnz cwloop
|
||||
|
||||
movzx eax, word [MOUSE_X]
|
||||
movzx ebx, word [MOUSE_Y]
|
||||
|
||||
;..................................... start 4/4 : modified by vhanla .................
|
||||
movzx eax, word [mx]; movzx eax,word[MOUSE_X]
|
||||
movzx ebx, word [my]; movzx ebx,word[MOUSE_Y]
|
||||
;..................................... endt 4/4 : modified by vhanla ..................
|
||||
cmp ecx, eax
|
||||
jae cwloop
|
||||
cmp edx, ebx
|
||||
|
||||
@ -458,9 +458,11 @@ checkbuttons:
|
||||
|
||||
cmp [BTN_DOWN],byte 0 ; mouse buttons pressed
|
||||
jnz @f
|
||||
;..................................... start 1/5 : modified by vhanla .............................
|
||||
mov [bPressedMouseXY_B],0
|
||||
;..................................... end 1/5 : modified by vhanla .............................
|
||||
ret
|
||||
@@:
|
||||
|
||||
pushad
|
||||
|
||||
xor esi, esi
|
||||
@ -472,6 +474,20 @@ checkbuttons:
|
||||
ret
|
||||
|
||||
@@:
|
||||
;..................................... start 2/5 : modified by vhanla .............................
|
||||
;here i catch the coordinates when the mouse's button is clicked
|
||||
push ax
|
||||
cmp [bPressedMouseXY_B],0;FALSE
|
||||
jnz @f
|
||||
mov [bPressedMouseXY_B],1;TRUE - it was already clicked
|
||||
mov ax,[MOUSE_X]
|
||||
mov [mx],ax
|
||||
mov ax,[MOUSE_Y]
|
||||
mov [my],ax
|
||||
@@:
|
||||
pop ax
|
||||
;and it is only refreshed after the mouse's button release
|
||||
;..................................... end 2/5 : modified by vhanla .............................
|
||||
|
||||
push esi
|
||||
inc edx
|
||||
@ -496,10 +512,6 @@ checkbuttons:
|
||||
shl eax,4
|
||||
add eax,edi
|
||||
|
||||
;......................start 1/2 : modified by vhanla .............................
|
||||
mov [buttonid],eax
|
||||
;......................end 1/2 : modified by vhanla .............................
|
||||
|
||||
; check that button is at top of windowing stack
|
||||
|
||||
movzx ebx,word [eax]
|
||||
@ -534,7 +546,9 @@ checkbuttons:
|
||||
mov ecx, [ebx+WDATA.box.left] ; window x start
|
||||
movzx edx,word [eax+4] ; button x start
|
||||
add edx,ecx
|
||||
mov cx,[MOUSE_X]
|
||||
;..................................... start 3/5 : modified by vhanla .............................
|
||||
mov cx,[mx] ;mov cx,[MOUSE_X]
|
||||
;..................................... end 3/5 : modified by vhanla .............................
|
||||
cmp edx,ecx
|
||||
jg buttonnewcheck
|
||||
|
||||
@ -550,7 +564,9 @@ checkbuttons:
|
||||
mov ecx, [ebx+WDATA.box.top] ; window y start
|
||||
movzx edx,word [eax+8] ; button y start
|
||||
add edx,ecx
|
||||
mov cx,[MOUSE_Y]
|
||||
;..................................... start 4/5 : modified by vhanla .............................
|
||||
mov cx,[my] ;mov cx,[MOUSE_Y]
|
||||
;..................................... start 4/5 : modified by vhanla .............................
|
||||
cmp edx,ecx
|
||||
jg buttonnewcheck
|
||||
|
||||
@ -591,11 +607,13 @@ checkbuttons:
|
||||
call negativebutton
|
||||
mov [MOUSE_BACKGROUND],byte 0 ; no mouse background
|
||||
mov [DONT_DRAW_MOUSE],byte 0 ; draw mouse
|
||||
;..................................... start 2/2 : modified by vhanla .............................
|
||||
;..................................... start 5/5 : modified by vhanla .............................
|
||||
; check coordinates
|
||||
jmp afterbuttonid
|
||||
buttonid dd 0x0 ;here a will backup the eax value
|
||||
afterbuttonid:
|
||||
jmp @f
|
||||
mx dw 0x0 ; keeps the x mouse's position when it was clicked
|
||||
my dw 0x0 ; keeps the y mouse's position when it was clicked
|
||||
bPressedMouseXY_B db 0x0
|
||||
@@:
|
||||
|
||||
pusha
|
||||
; mouse x >= button x ?
|
||||
@ -645,4 +663,4 @@ yes_on_button:
|
||||
popa
|
||||
ret
|
||||
|
||||
;..................................... end 2/2 : modified by vhanla ................................
|
||||
;..................................... end 5/5 : modified by vhanla ................................
|
||||
|
||||
@ -1189,13 +1189,33 @@ checkwindows:
|
||||
|
||||
cmp [BTN_DOWN],byte 0 ; mouse buttons pressed ?
|
||||
jne .mouse_buttons_pressed
|
||||
;..................................... start 1/4 : modified by vhanla .................
|
||||
mov [bPressedMouseXY_W],0
|
||||
;..................................... end 1/4 : modified by vhanla ...................
|
||||
popad
|
||||
ret
|
||||
.mouse_buttons_pressed:
|
||||
|
||||
;..................................... start 2/4 : modified by vhanla .................
|
||||
jmp @f
|
||||
bPressedMouseXY_W db 0x0
|
||||
@@:
|
||||
;..................................... end 2/4 : modified by vhanla ...................
|
||||
mov esi,[TASK_COUNT]
|
||||
inc esi
|
||||
|
||||
;..................................... start 3/4 : modified by vhanla .................
|
||||
push ax
|
||||
cmp [bPressedMouseXY_W],0
|
||||
jnz @f
|
||||
mov [bPressedMouseXY_W],1
|
||||
mov ax,[MOUSE_X]
|
||||
mov [mx],ax
|
||||
mov ax,[MOUSE_Y]
|
||||
mov [my],ax
|
||||
@@:
|
||||
pop ax
|
||||
;..................................... end 3/4 : modified by vhanla ...................
|
||||
|
||||
cwloop:
|
||||
cmp esi,2
|
||||
jb .exit
|
||||
@ -1213,9 +1233,10 @@ checkwindows:
|
||||
test [edi+WDATA.fl_wstate],WSTATE_MINIMIZED
|
||||
jnz cwloop
|
||||
|
||||
movzx eax, word [MOUSE_X]
|
||||
movzx ebx, word [MOUSE_Y]
|
||||
|
||||
;..................................... start 4/4 : modified by vhanla .................
|
||||
movzx eax, word [mx]; movzx eax,word[MOUSE_X]
|
||||
movzx ebx, word [my]; movzx ebx,word[MOUSE_Y]
|
||||
;..................................... endt 4/4 : modified by vhanla ..................
|
||||
cmp ecx, eax
|
||||
jae cwloop
|
||||
cmp edx, ebx
|
||||
|
||||
Loading…
Reference in New Issue
Block a user