WebSVN – Kolibri OS – Diff – /kernel/branches/net/gui/event.inc

 ;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
 ;; Copyright (C) MenuetOS 2000-2004 Ville Mikael Turjanmaa      ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+$Revision: 2382 $
+WINDOW_MOVE_AND_RESIZE_FLAGS = \
+  mouse.WINDOW_RESIZE_N_FLAG + \
+  mouse.WINDOW_RESIZE_W_FLAG + \
+  mouse.WINDOW_RESIZE_S_FLAG + \
+  mouse.WINDOW_RESIZE_E_FLAG + \
-$Revision: 1376 $
+  mouse.WINDOW_MOVE_FLAG
 uglobal
 align 4
         jz      .fail
       ; eax - current event, ebx - previos event below
-        mov     ecx,EV_SPACE         ; current - in allocated space
+        mov     ecx, EV_SPACE        ; current - in allocated space
-        mov     ebx,FreeEvents       ; previos - íà÷àëî ñïèñêà
+        mov     ebx, FreeEvents      ; previos - íà÷àëî ñïèñêà
         push    ebx                  ; îíî æå è êîíåö ïîòîì áóäåò
+  @@:
-  @@:   mov     [ebx+EVENT.fd],eax
+        mov     [ebx+EVENT.fd], eax
-        mov     [eax+EVENT.bk],ebx
+        mov     [eax+EVENT.bk], ebx
-        mov     ebx,eax              ; previos <- current
+        mov     ebx, eax             ; previos <- current
-        add     eax,EVENT.size       ; new current
+        add     eax, EVENT.size      ; new current
         loop    @b
         pop     eax                  ; âîò îíî êîíöîì è ñòàëî
-        mov     [ebx+EVENT.fd],eax
+        mov     [ebx+EVENT.fd], eax
-        mov     [eax+EVENT.bk],ebx
+        mov     [eax+EVENT.bk], ebx
+.fail:
-.fail:  ret
+        ret
 EVENT_WATCHED    equ 0x10000000 ;áèò 28
 EVENT_SIGNALED   equ 0x20000000 ;áèò 29
 MANUAL_RESET     equ 0x40000000 ;áèò 30
         jne     @f  ; not empty ???
         pushad
         call    init_events
         popad
         jz      RemoveEventTo.break ; POPF+RET
+  @@:
-  @@:   mov     eax,[eax+EVENT.fd]
+        mov     eax, [eax+EVENT.fd]
-        mov     [eax+EVENT.magic],'EVNT'
+        mov     [eax+EVENT.magic], 'EVNT'
-        mov     [eax+EVENT.destroy],destroy_event.internal
+        mov     [eax+EVENT.destroy], destroy_event.internal
-        mov     [eax+EVENT.state],ecx
+        mov     [eax+EVENT.state], ecx
-        mov     [eax+EVENT.pid],edx
+        mov     [eax+EVENT.pid], edx
         inc     [event_uid]
-        mov     [ecx+EVENT.bk],eax   ; NewRight.bk=Self
+        mov     [ecx+EVENT.bk], eax  ; NewRight.bk=Self
-        xchg    ebx,[eax+EVENT.bk]   ; Self.bk=NewLeft,   ebx=OldLeft
+        xchg    ebx, [eax+EVENT.bk]  ; Self.bk=NewLeft,   ebx=OldLeft
-        xchg    ecx,[eax+EVENT.fd]   ; Self.fd=NewRight,  ecx=OldRight
+        xchg    ecx, [eax+EVENT.fd]  ; Self.fd=NewRight,  ecx=OldRight
-        mov     [ebx+EVENT.fd],ecx   ; OldLeft.fd=OldRight
+        mov     [ebx+EVENT.fd], ecx  ; OldLeft.fd=OldRight
-        mov     [ecx+EVENT.bk],ebx   ; OldRight.bk=OldLeft
+        mov     [ecx+EVENT.bk], ebx  ; OldRight.bk=OldLeft
+.break:
-.break: popfd
+        popfd
         ret
 align 4
 NotDummyTest:                                      ;; INTERNAL use (not returned for fail !!!)
 ;   ebx - uid (for Dummy testing)
-        cmp     [eax+EVENT.magic],'EVNT'
+        cmp     [eax+EVENT.magic], 'EVNT'
         jne     @f
-        cmp     [eax+EVENT.id],ebx
+        cmp     [eax+EVENT.id], ebx
         je      .ret
+  @@:
-  @@:   pop     eax
+        pop     eax
-        xor     eax,eax
+        xor     eax, eax
+.ret:
-.ret:   ret
+        ret
 align 4
         Mov     [esi+APPDATA.wait_begin],eax,[timer_ticks]
-        mov     eax,[TASK_BASE]
+        mov     eax, [TASK_BASE]
         mov     [eax+TASKDATA.state], 5
         call    change_task
-        mov     eax,[esi+APPDATA.wait_param]
+        mov     eax, [esi+APPDATA.wait_param]
+  @@:
-  @@:   ret
+        ret
 align 4
 wait_event:                                        ;; EXPORT use
 ;info:
 ;   eax - àäðåñ îáúåêòà EVENT (=0 => fail)
-        add     ebx,APP_EV_OFFSET
+        add     ebx, APP_EV_OFFSET
-        mov     eax,[ebx+APPOBJ.bk]  ; âûáèðàåì ñ êîíöà, ïî ïðèíöèïó FIFO
+        mov     eax, [ebx+APPOBJ.bk] ; âûáèðàåì ñ êîíöà, ïî ïðèíöèïó FIFO
-        cmp     eax,ebx  ; empty ???
+        cmp     eax, ebx ; empty ???
         je      get_event_alone.ret0
+.ret:
-.ret:   ret
+        ret
 align 4
 get_event_alone:
 ;info:
 ;   eax - àäðåñ îáúåêòà EVENT (=0 => fail)
-        mov     eax,[ebx+APPDATA.wait_param]
+        mov     eax, [ebx+APPDATA.wait_param]
         test    byte[eax+EVENT.state+3], EVENT_SIGNALED shr 24
         jnz     .ret
         or      byte[eax+EVENT.state+3], EVENT_WATCHED shr 24
+.ret0:
-.ret0:  xor     eax,eax ; NO event!!!
+        xor     eax, eax; NO event!!!
+.ret:
-.ret:   ret
+        ret
 align 4
 sys_sendwindowmsg:                                 ;; f72
         dec     ebx
         jnz     .ret ;subfunction==1 ?
        ;pushfd  ;à íàôèãà?
         cli
-        sub     ecx,2
+        sub     ecx, 2
+        je      .sendkey
-        je      .sendkey
+        dec     ecx
-        loop    .retf
+        jnz     .retf
 .sendbtn:
-        cmp     byte[BTN_COUNT],1
+        cmp     byte[BTN_COUNT], 1
         jae     .result ;overflow
+        inc     byte[BTN_COUNT]
-        inc     byte[BTN_COUNT]
+        shl     edx, 8
-        mov     [BTN_BUFF],edx
+        mov     [BTN_BUFF], edx
         jmp     .result
 .sendkey:
-        movzx   eax,byte[KEY_COUNT]
+        movzx   eax, byte[KEY_COUNT]
         inc     byte[KEY_COUNT]
-        mov     [KEY_COUNT+1+eax],dl
+        mov     [KEY_COUNT+1+eax], dl
 .result:
         setae   byte[esp+32] ;ñ÷èòàåì, ÷òî èñõîäíî: dword[esp+32]==72
 .retf: ;popfd
+.ret:
-.ret:   ret
+        ret
 align 4
 sys_getevent:                                      ;; f11
-        mov     ebx,[current_slot] ;ïîêà ýòî âîïðîñ, ÷åãî êóäû ñóâàòü..........
+        mov     ebx, [current_slot];ïîêà ýòî âîïðîñ, ÷åãî êóäû ñóâàòü..........
 .loop: ; ïîêà íå èñ÷åðïàåì âñå áèòû ìàñêè
-        bsr     eax,ecx        ; íàõîäèì íåíóëåâîé áèò ìàñêè (31 -> 0)
+        bsr     eax, ecx       ; íàõîäèì íåíóëåâîé áèò ìàñêè (31 -> 0)
         jz      .no_events     ; èñ÷åðïàëè âñå áèòû ìàñêè, íî íè÷åãî íå íàøëè ???
-        btr     ecx,eax        ; ñáðàñûâàåì ïðîâåðÿåìûé áèò ìàñêè
+        btr     ecx, eax       ; ñáðàñûâàåì ïðîâåðÿåìûé áèò ìàñêè
        ; ïåðåõîäèì íà îáðàáîò÷èê ýòîãî (eax) áèòà
-        cmp     eax,16
-        jae     .IRQ           ; eax=[16..31]=retvals, events irq0..irq15
-        cmp     eax,9
+        cmp     eax, 9
-        jae     .loop          ; eax=[9..15], ignored
+        jae     .loop          ; eax=[9..31], ignored
-        cmp     eax,3
+        cmp     eax, 3
         je      .loop          ; eax=3, ignored
         ja      .FlagAutoReset ; eax=[4..8], retvals=eax+1
-        cmp     eax,1
+        cmp     eax, 1
         jae     .BtKy          ; eax=[1,2],  retvals=eax+1
         jne     .result
         jmp     .loop
   .no_events:
-        xor     eax,eax
+        xor     eax, eax
         ret
-.IRQ:
-;TODO: ñäåëàòü òàê æå, êàê è äëÿ FlagAutoReset (BgrRedraw,Mouse,IPC,Stack,Debug)
-        mov     edx,[irq_owner+eax*4-64] ; eax==16+irq
-        cmp     edx,[edi+TASKDATA.pid]
-        jne     .loop
-        mov     edx,eax
-        shl     edx,12
-        cmp     dword[IRQ_SAVE+edx-0x10000],0 ; edx==(16+irq)*0x1000
-        je      .loop          ; empty ???
-        ret     ; retval = eax
 .FlagAutoReset: ; retvals: BgrRedraw=5, Mouse=6, IPC=7, Stack=8, Debug=9
+        cmp     eax, 5; Mouse 5+1=6
+        jne     @f
+        push    eax
+; If the window is captured and moved by the user, then no mouse events!!!
+        mov     al, [mouse.active_sys_window.action]
+        and     al, WINDOW_MOVE_AND_RESIZE_FLAGS
+        test    al, al
+        pop     eax
+        jnz     .loop
+@@:
-        btr     [ebx+APPDATA.event_mask],eax
+        btr     [ebx+APPDATA.event_mask], eax
         jnc     .loop
   .result:      ; retval = eax+1
         inc     eax
         ret
 .Buttons:                      ; eax=2, retval Buttons=3
-        cmp     byte[BTN_COUNT],0
+        cmp     byte[BTN_COUNT], 0
         je      .loop          ; empty ???
-        cmp     edx,[TASK_COUNT]
+        cmp     edx, [TASK_COUNT]
         jne     .loop          ; not Top ???
+        mov     edx, [BTN_BUFF]
+        shr     edx, 8
-        cmp     dword[BTN_BUFF],0xFFFF ;-ID for Minimize-Button of Form
+        cmp     edx, 0xFFFF    ;-ID for Minimize-Button of Form
         jne     .result
-        mov     [window_minimize],1
+        mov     [window_minimize], 1
         dec     byte[BTN_COUNT]
         jmp     .loop
 .Keys:    ; eax==1
-        cmp     edx,[TASK_COUNT]
+        cmp     edx, [TASK_COUNT]
         jne     @f             ; not Top ???
-        cmp     [KEY_COUNT],al ; al==1
+        cmp     [KEY_COUNT], al; al==1
         jae     .result        ; not empty ???
+  @@:
-  @@:   mov     edx, hotkey_buffer
+        mov     edx, hotkey_buffer
+  @@:
-  @@:   cmp     [edx],bh       ; bh - slot for testing
+        cmp     [edx], bh      ; bh - slot for testing
         je      .result
-        add     edx,8
+        add     edx, 8
         cmp     edx, hotkey_buffer+120*8
         jb      @b
         jmp     .loop

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/gui/event.inc – Rev 1376 → 2382