Subversion Repositories Kolibri OS

Rev

Rev 2480 | Rev 3606 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2480 Rev 2575
Line 15... Line 15...
15 
;;                                                              ;;
 15 
;;                                                              ;;
16 
;;  See file COPYING for details                                ;;
 16 
;;  See file COPYING for details                                ;;
17 
;;                                                              ;;
 17 
;;                                                              ;;
18 
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 18 
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Line 19... Line 19...
19 
 
 19 
 
Line 20... Line 20...
20 
$Revision: 2480 $
 20 
$Revision: 2575 $
21 
 
 21 
 
Line 404... Line 404...
404 
        call    eax
 404 
        call    eax
405 
        cmp     [ebp], bl
 405 
        cmp     [ebp], bl
406 
        jne     .skip
 406 
        jne     .skip
407 
;--------------------------------------
 407 
;--------------------------------------
408 
        push    ecx
 408 
        push    ecx
409 
        mov     ecx, [putimg.real_sy_and_abs_cy + 4]
 - 
 
410 
        sub     ecx, edi
 - 
 
411 
;--------------------------------------
 409 
;--------------------------------------
412 
; check for Y
 410 
align 4
413 
        cmp     cx, [Y_UNDER_subtraction_CUR_hot_y]
 - 
 
414 
        jb      .no_mouse_area
 - 
 
415 
 
 411 
.sh:
416 
        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
 - 
 
417 
        jae     .no_mouse_area
 - 
 
418 
 
 - 
 
419 
        rol     ecx, 16
 412 
        neg     ecx
420 
        add     ecx, [putimg.real_sx_and_abs_cx + 4]
 413 
        add     ecx, [putimg.real_sx_and_abs_cx + 4]
421 
        sub     ecx, [esp]
 - 
 
422 
;--------------------------------------
 414 
;--------------------------------------
423 
; check for X
 415 
; check for X
- 
 
 416 
        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
- 
 
 417 
        jae     .no_mouse_area
- 
 
 418 
 
424 
        cmp     cx, [X_UNDER_subtraction_CUR_hot_x]
 419 
        sub     cx, [X_UNDER_subtraction_CUR_hot_x]
425 
        jb      .no_mouse_area
 420 
        jb      .no_mouse_area
Line -... Line 421...
- 
 
 421 
 
- 
 
 422 
        shl     ecx, 16
- 
 
 423 
 
- 
 
 424 
        add     ecx, [putimg.real_sy_and_abs_cy + 4]
- 
 
 425 
        sub     ecx, edi
- 
 
 426 
;--------------------------------------
426 
 
 427 
; check for Y
427 
        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
 428 
        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
- 
 
 429 
        jae     .no_mouse_area
- 
 
 430 
 
- 
 
 431 
        sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
428 
        jae     .no_mouse_area
 432 
        jb      .no_mouse_area
429 
;--------------------------------------
 433 
;--------------------------------------
430 
; check mouse area for putpixel
 434 
; check mouse area for putpixel
- 
 
 435 
        call    check_mouse_area_for_putpixel_new.1
- 
 
 436 
        cmp     ecx, -1   ;SHIT HAPPENS?
- 
 
 437 
        jne     .no_mouse_area
- 
 
 438 
 
- 
 
 439 
        mov     ecx, [esp]
431 
        call    check_mouse_area_for_putpixel_new.1
 440 
        jmp     .sh
432 
;--------------------------------------
 441 
;--------------------------------------
433 
align 4
 442 
align 4
434 
.no_mouse_area:
 443 
.no_mouse_area:
435 
        pop     ecx
 444 
        pop     ecx
Line 606... Line 615...
606 
        call    eax
 615 
        call    eax
607 
        cmp     [ebp], bl
 616 
        cmp     [ebp], bl
608 
        jne     .skip
 617 
        jne     .skip
609 
;--------------------------------------
 618 
;--------------------------------------
610 
        push    ecx
 619 
        push    ecx
611 
        mov     ecx, [putimg.real_sy_and_abs_cy + 4]
 - 
 
612 
        sub     ecx, edi
 - 
 
613 
;--------------------------------------
 620 
;--------------------------------------
614 
; check for Y
 621 
align 4
615 
        cmp     cx, [Y_UNDER_subtraction_CUR_hot_y]
 - 
 
616 
        jb      .no_mouse_area
 - 
 
617 
 
 622 
.sh:
618 
        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
 - 
 
619 
        jae     .no_mouse_area
 - 
 
620 
 
 - 
 
621 
        rol     ecx, 16
 623 
        neg     ecx
622 
        add     ecx, [putimg.real_sx_and_abs_cx + 4]
 624 
        add     ecx, [putimg.real_sx_and_abs_cx + 4]
623 
        sub     ecx, [esp]
 - 
 
624 
;--------------------------------------
 625 
;--------------------------------------
625 
; check for X
 626 
; check for X
- 
 
 627 
        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
- 
 
 628 
        jae     .no_mouse_area
- 
 
 629 
 
626 
        cmp     cx, [X_UNDER_subtraction_CUR_hot_x]
 630 
        sub     cx, [X_UNDER_subtraction_CUR_hot_x]
627 
        jb      .no_mouse_area
 631 
        jb      .no_mouse_area
Line -... Line 632...
- 
 
 632 
 
- 
 
 633 
        shl     ecx, 16
- 
 
 634 
 
- 
 
 635 
        add     ecx, [putimg.real_sy_and_abs_cy + 4]
- 
 
 636 
        sub     ecx, edi
- 
 
 637 
;--------------------------------------
628 
 
 638 
; check for Y
629 
        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
 639 
        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
- 
 
 640 
        jae     .no_mouse_area
- 
 
 641 
 
- 
 
 642 
        sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
630 
        jae     .no_mouse_area
 643 
        jb      .no_mouse_area
631 
;--------------------------------------
 644 
;--------------------------------------
632 
; check mouse area for putpixel
 645 
; check mouse area for putpixel
- 
 
 646 
        call    check_mouse_area_for_putpixel_new.1
- 
 
 647 
        cmp     ecx, -1   ;SHIT HAPPENS?
- 
 
 648 
        jne     .no_mouse_area
- 
 
 649 
 
- 
 
 650 
        mov     ecx, [esp]
633 
        call    check_mouse_area_for_putpixel_new.1
 651 
        jmp     .sh
634 
;--------------------------------------
 652 
;--------------------------------------
635 
align 4
 653 
align 4
636 
.no_mouse_area:
 654 
.no_mouse_area:
637 
        pop     ecx
 655 
        pop     ecx
Line 765... Line 783...
765 
; check mouse area for putpixel
 783 
; check mouse area for putpixel
766 
        test    eax, 0x04000000
 784 
        test    eax, 0x04000000
767 
        jnz     @f
 785 
        jnz     @f
768 
;--------------------------------------
 786 
;--------------------------------------
769 
; check for Y
 787 
; check for Y
770 
        cmp     cx, [Y_UNDER_subtraction_CUR_hot_y]
 - 
 
771 
        jb      @f
 - 
 
772 
 
 - 
 
773 
        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
 788 
        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
774 
        jae     @f
 789 
        jae     @f
Line -... Line 790...
- 
 
 790 
 
- 
 
 791 
        sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
- 
 
 792 
        jb      @f
775 
 
 793 
 
776 
        rol     ecx, 16
 794 
        rol     ecx, 16
777 
;--------------------------------------
 795 
;--------------------------------------
778 
; check for X
 - 
 
779 
        cmp     cx, [X_UNDER_subtraction_CUR_hot_x]
 - 
 
780 
        jb      @f
 - 
 
781 
 
 796 
; check for X
782 
        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
 797 
        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
Line -... Line 798...
- 
 
 798 
        jae     @f
- 
 
 799 
 
- 
 
 800 
        sub     cx, [X_UNDER_subtraction_CUR_hot_x]
- 
 
 801 
        jb      @f
- 
 
 802 
 
783 
        jae     @f
 803 
        ror     ecx, 16
784 
 
 804 
 
785 
        call    check_mouse_area_for_putpixel_new.1
 805 
        call    check_mouse_area_for_putpixel_new.1
786 
;--------------------------------------
 806 
;--------------------------------------
787 
align 4
 807 
align 4
Line 839... Line 859...
839 
; check mouse area for putpixel
 859 
; check mouse area for putpixel
840 
        test    eax, 0x04000000
 860 
        test    eax, 0x04000000
841 
        jnz     @f
 861 
        jnz     @f
842 
;--------------------------------------
 862 
;--------------------------------------
843 
; check for Y
 863 
; check for Y
844 
        cmp     cx, [Y_UNDER_subtraction_CUR_hot_y]
 - 
 
845 
        jb      @f
 - 
 
846 
 
 - 
 
847 
        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
 864 
        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
848 
        jae     @f
 865 
        jae     @f
Line -... Line 866...
- 
 
 866 
 
- 
 
 867 
        sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
- 
 
 868 
        jb      @f
849 
 
 869 
 
850 
        rol     ecx, 16
 870 
        rol     ecx, 16
851 
;--------------------------------------
 871 
;--------------------------------------
852 
; check for X
 - 
 
853 
        cmp     cx, [X_UNDER_subtraction_CUR_hot_x]
 - 
 
854 
        jb      @f
 - 
 
855 
 
 872 
; check for X
856 
        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
 873 
        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
Line -... Line 874...
- 
 
 874 
        jae     @f
- 
 
 875 
 
- 
 
 876 
        sub     cx, [X_UNDER_subtraction_CUR_hot_x]
- 
 
 877 
        jb      @f
- 
 
 878 
 
857 
        jae     @f
 879 
        ror     ecx, 16
858 
 
 880 
 
859 
        call    check_mouse_area_for_putpixel_new.1
 881 
        call    check_mouse_area_for_putpixel_new.1
860 
;--------------------------------------
 882 
;--------------------------------------
861 
align 4
 883 
align 4
Line 1370... Line 1392...
1370 
;--------------------------------------
 1392 
;--------------------------------------
1371 
        mov     ecx, [drbar.real_sy_and_abs_cy]
 1393 
        mov     ecx, [drbar.real_sy_and_abs_cy]
1372 
        sub     ecx, esi
 1394 
        sub     ecx, esi
1373 
;--------------------------------------
 1395 
;--------------------------------------
1374 
; check for Y
 1396 
; check for Y
1375 
        cmp     cx, [Y_UNDER_subtraction_CUR_hot_y]
 - 
 
1376 
        jb      .no_mouse_area
 - 
 
1377 
 
 - 
 
1378 
        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
 1397 
        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
1379 
        jae     .no_mouse_area
 1398 
        jae     .no_mouse_area
Line -... Line 1399...
- 
 
 1399 
 
- 
 
 1400 
        sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
- 
 
 1401 
        jb      .no_mouse_area
1380 
 
 1402 
 
1381 
        rol     ecx, 16
 1403 
        rol     ecx, 16
1382 
        add     ecx, [drbar.real_sx_and_abs_cx]
 1404 
        add     ecx, [drbar.real_sx_and_abs_cx]
1383 
        sub     ecx, edi
 1405 
        sub     ecx, edi
1384 
;--------------------------------------
 1406 
;--------------------------------------
1385 
; check for X
 - 
 
1386 
        cmp     cx, [X_UNDER_subtraction_CUR_hot_x]
 - 
 
1387 
        jb      .no_mouse_area
 - 
 
1388 
 
 1407 
; check for X
1389 
        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
 1408 
        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
- 
 
 1409 
        jae     .no_mouse_area
- 
 
 1410 
 
- 
 
 1411 
        sub     cx, [X_UNDER_subtraction_CUR_hot_x]
- 
 
 1412 
        jb      .no_mouse_area
- 
 
 1413 
 
1390 
        jae     .no_mouse_area
 1414 
        ror     ecx, 16
1391 
;--------------------------------------
 1415 
;--------------------------------------
1392 
; check mouse area for putpixel
 1416 
; check mouse area for putpixel
1393 
        push    eax
 1417 
        push    eax
1394 
        call    check_mouse_area_for_putpixel_new.1
 1418 
        call    check_mouse_area_for_putpixel_new.1
Line 1555... Line 1579...
1555 
;--------------------------------------
 1579 
;--------------------------------------
1556 
        mov     ecx, [drbar.real_sy_and_abs_cy]
 1580 
        mov     ecx, [drbar.real_sy_and_abs_cy]
1557 
        sub     ecx, esi
 1581 
        sub     ecx, esi
1558 
;--------------------------------------
 1582 
;--------------------------------------
1559 
; check for Y
 1583 
; check for Y
1560 
        cmp     cx, [Y_UNDER_subtraction_CUR_hot_y]
 - 
 
1561 
        jb      .no_mouse_area
 - 
 
1562 
 
 - 
 
1563 
        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
 1584 
        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
1564 
        jae     .no_mouse_area
 1585 
        jae     .no_mouse_area
Line -... Line 1586...
- 
 
 1586 
 
- 
 
 1587 
        sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
- 
 
 1588 
        jb      .no_mouse_area
1565 
 
 1589 
 
1566 
        rol     ecx, 16
 1590 
        rol     ecx, 16
1567 
        add     ecx, [drbar.real_sx_and_abs_cx]
 1591 
        add     ecx, [drbar.real_sx_and_abs_cx]
1568 
        sub     ecx, edi
 1592 
        sub     ecx, edi
1569 
;--------------------------------------
 1593 
;--------------------------------------
1570 
; check for X
 - 
 
1571 
        cmp     cx, [X_UNDER_subtraction_CUR_hot_x]
 - 
 
1572 
        jb      .no_mouse_area
 - 
 
1573 
 
 1594 
; check for X
1574 
        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
 1595 
        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
- 
 
 1596 
        jae     .no_mouse_area
- 
 
 1597 
 
- 
 
 1598 
        sub     cx, [X_UNDER_subtraction_CUR_hot_x]
- 
 
 1599 
        jb      .no_mouse_area
- 
 
 1600 
 
1575 
        jae     .no_mouse_area
 1601 
        ror     ecx, 16
1576 
;--------------------------------------
 1602 
;--------------------------------------
1577 
; check mouse area for putpixel
 1603 
; check mouse area for putpixel
1578 
        push    eax
 1604 
        push    eax
1579 
        call    check_mouse_area_for_putpixel_new.1
 1605 
        call    check_mouse_area_for_putpixel_new.1