Subversion Repositories Kolibri OS

Rev

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

Rev 4880 Rev 5880
Line 469... Line 469...
469 
 
 469 
 
Line 470... Line 470...
470 
draw_clock:
 470 
draw_clock:
471 
 
 471 
 
472 
    mcall 3
 472 
    mcall 3
Line 473... Line 473...
473 
    mov  ecx,eax
 473 
    mov  ecx,eax
474 
    mcall 47,0x00020100, ,195*65536+301,0x50CCCCCC,COL_TOOLBAR_BG
 474 
    mcall 47,0x00020100, ,195*65536+298,0x50CCCCCC,COL_TOOLBAR_BG
475 
 
 475 
 
Line 511... Line 511...
511 
	mcall 13,B_WBAR_X, ,COL_TOOLBAR_BG ; draw toolbar background
 511 
	mcall 13,B_WBAR_X, ,COL_TOOLBAR_BG ; draw toolbar background
512 
	mcall 13,B_WBAR_X,BT_WBAR_Y,COL_TOOLBAR_BG ; draw toolbar background
 512 
	mcall 13,B_WBAR_X,BT_WBAR_Y,COL_TOOLBAR_BG ; draw toolbar background
513 
	mcall 13,0*65536+B_WBAR_X,84*65536+199,0xE7E7E7
 513 
	mcall 13,0*65536+B_WBAR_X,84*65536+199,0xE7E7E7
Line 514... Line 514...
514
514
515 
draw_window:
 - 
 
- 
 
 515 
draw_window:
516 
 
 516 
    call draw_clock
517 
    call draw_week
 517 
    call draw_week
518 
    mcall 8,193*65536+8,287*65536+10,72,COL_TOOLBAR_BG
 518 
    mcall 8,193*65536+8,285*65536+10,72,COL_TOOLBAR_BG
519 
    mov  ebx,202*65536+8
 519 
    mov  ebx,202*65536+8
520 
    inc  edx ;73
 520 
    inc  edx ;73
521 
    mcall
 521 
    mcall
522 
    mov  ebx,193*65536+8
 522 
    mov  ebx,193*65536+8
523 
    mov  ecx,311*65536+10
 523 
    mov  ecx,315*65536+10
524 
    inc  edx ;74
 524 
    inc  edx ;74
525 
    mcall
 525 
    mcall
526 
    mov  ebx,202*65536+8
 526 
    mov  ebx,202*65536+8
527 
    inc  edx ;75
 527 
    inc  edx ;75
528 
    mcall
 528 
    mcall
529 
    mov  ebx,215*65536+8
 529 
    mov  ebx,215*65536+8
530 
    mov  ecx,287*65536+10
 530 
    mov  ecx,285*65536+10
531 
    inc  edx ;76
 531 
    inc  edx ;76
532 
    mcall
 532 
    mcall
533 
    mov  ebx,224*65536+8
 533 
    mov  ebx,224*65536+8
534 
    inc  edx ;77
 534 
    inc  edx ;77
535 
    mcall
 535 
    mcall
536 
    mov  ebx,215*65536+8
 536 
    mov  ebx,215*65536+8
537 
    mov  ecx,311*65536+10
 537 
    mov  ecx,315*65536+10
538 
    inc  edx ;78
 538 
    inc  edx ;78
539 
    mcall
 539 
    mcall
540 
    mov  ebx,224*65536+8
 540 
    mov  ebx,224*65536+8
541 
    inc  edx ;79
 541 
    inc  edx ;79
542 
    mcall
 - 
 
543 
    ;mov  ebx,237*65536+21
 - 
 
544 
    ;mov  ecx,281*65536+35
 - 
 
545 
    ;inc  edx ;80
 - 
 
546 
    ;or   edx,0x40CCFF44
 - 
 
547 
    ;mcall
 542 
    mcall
548 
    mov  ebx,25*65536+110
 543 
    mov  ebx,25*65536+110
549 
    mov  ecx,293*65536+22
 544 
    mov  ecx,293*65536+22
550 
    mov  esi,COL_TOOLBAR_BG
 545 
    mov  esi,COL_TOOLBAR_BG
551 
    mov  edx,81
 546 
    mov  edx,81
Line 566... Line 561...
566 
    mov  edx,2
 561 
    mov  edx,2
567 
    mcall
 562 
    mcall
568 
    mov  ebx,B_SPIN_X ; <
 563 
    mov  ebx,B_SPIN_X ; <
569 
    inc  edx
 564 
    inc  edx
570 
    mcall
 565 
    mcall
571 
    add  ebx,61 shl 16 ; >
 566 
    add  ebx,54 shl 16 ; >
572 
    inc  edx
 567 
    inc  edx
573 
    mcall
 568 
    mcall
574 
    call draw_days
 569 
    call draw_days
Line 575... Line 570...
575 
 
 570 
 
576 
	; draw text in window
 571 
	; draw text in window
577 
    mcall 4,157*65536+301,0x80CCCCCC,sys_text
 572 
    mcall 4,157*65536+301,0x80CCCCCC,sys_text
578 
    mcall  ,211*65536+301,,separator
 573 
    mcall  ,211*65536+301,,separator
579 
    mcall  ,233*65536+301
 574 
    mcall  ,233*65536+301
580 
    mcall  ,185*65536+289, ,plus
 575 
    mcall  ,185*65536+287, ,plus
581 
    mcall  ,185*65536+313, ,minus
 576 
    mcall  ,185*65536+317, ,minus
Line 582... Line 577...
582 
    mcall  , 35*65536+300,0x00CCCCCC,set_date_t,15 ;set date text
 577 
    mcall  , 35*65536+300,0x00CCCCCC,set_date_t,15 ;set date text
583 
 
 578 
 
Line 601... Line 596...
601 
    mov  esi,today_end-today_msg
 596 
    mov  esi,today_end-today_msg
602 
    mcall
 597 
    mcall
Line 603... Line 598...
603 
 
 598 
 
604 
    mov  ebx,B_SPIN
 599 
    mov  ebx,B_SPIN
605 
    mov  edx,spinner
 600 
    mov  edx,spinner
606 
    mov  esi,12
 601 
    mov  esi,8
607 
	mov  ecx,COL_DROPDOWN_T
 602 
    mov  ecx,COL_DROPDOWN_T
Line 608... Line 603...
608 
    mcall
 603 
    mcall
609 
 
 604 
 
Line 614... Line 609...
614 
    mov  ebx,B_MONTH
 609 
    mov  ebx,B_MONTH
615 
    ShowFocus 2
 610 
    ShowFocus 2
616 
    mcall
 611 
    mcall
Line 617... Line 612...
617 
 
 612 
 
618 
    call draw_year
 - 
 
619 
    call draw_clock
 613 
    call draw_year
620 
    mov  [dropped],0
 614 
    mov  [dropped],0
Line 621... Line 615...
621 
    ret
 615 
    ret
622 
 
 - 
 
623 
draw_year:
 616 
 
624 
    mcall 8,B_YEAR_X,B_Y,5,COL_MONTH_YEAR_B
 617 
draw_year:
625 
    ShowFocus 3,esi
 618 
    ShowFocus 3,esi
Line 626... Line 619...
626 
    mcall 47,0x40001,Year,B_YEAR
 619 
    mcall 47,0x40001,Year,B_YEAR
Line 694... Line 687...
694 
    mov  [number],0
 687 
    mov  [number],0
695 
    mov  eax,47
 688 
    mov  eax,47
696 
    mov  edx,B_DAYS_Y
 689 
    mov  edx,B_DAYS_Y
697 
    mov  ebx,0x10001
 690 
    mov  ebx,0x10001
698 
    mov  edi,[firstday]
 691 
    mov  edi,[firstday]
699 
  .dayloop:
 - 
 
700 
    push ecx
 692 
    push ecx
- 
 
 693 
  .dayloop:
701 
    movzx edx,dx
 694 
    movzx edx,dx
702 
    mov  esi,edi
 695 
    mov  esi,edi
703 
    shl  esi,21
 696 
    shl  esi,21
704 
    lea  edx,[edx+esi+34 shl 16]
 697 
    lea  edx,[edx+esi+34 shl 16]
705 
    mov  ecx,edi
 698 
    mov  ecx,edi
Line 712... Line 705...
712 
    mov  esi,0x10cc1010
 705 
    mov  esi,0x10cc1010
713 
  .noholiday:
 706 
  .noholiday:
714 
    mov  ecx,number
 707 
    mov  ecx,number
715 
    inc  dword[ecx]
 708 
    inc  dword[ecx]
716 
    pusha
 709 
    pusha
- 
 
 710 
    sub  edx,8 shl 16 + 8
717 
    mov  ebx,edx
 711 
    mov  ebx,edx
718 
    mov  bx,DATE_BUTTON_WIDTH-1
 712 
    mov  bx,DATE_BUTTON_WIDTH-1
719 
    sub  ebx,8 shl 16
 - 
 
720 
    shrd ecx,edx,16
 713 
    shrd ecx,edx,16
721 
    mov  cx,DATE_BUTTON_HEIGHT-1
 714 
    mov  cx,DATE_BUTTON_HEIGHT-1
722 
    sub  ecx,12 shl 16
 - 
 
723 
    mov  edx,[number]
 715 
    mov  edx,[number]
724 
    cmp  edx,[day_sel]
 716 
    cmp  edx,[day_sel]
725 
    je	 .draw_sel
 717 
    je	 .draw_sel
726 
    mov  esi,COL_DATE_BUTTONS
 718 
    mov  esi,COL_DATE_BUTTONS
727 
    jmp  .draw_but
 719 
    jmp  .draw_but
Line 766... Line 758...
766 
	;first number
 758 
; first number
767 
	mov ecx,quotient
 759 
	mov	ecx,quotient
768 
    mcall
760 
	mcall
769 
	add edx,1 shl 16
 761 
	add	edx,1 shl 16
770 
	mcall
 762 
	mcall
771 
	sub edx,1 shl 16
 - 
 
772
- 
 
773 
	;second number
 763 
; second number
774 
	mov ecx,remainder
 764 
	mov	ecx,remainder
775 
	add edx,9 shl 16
 765 
	add	edx,8 shl 16
776 
    mcall
766 
	mcall
777 
	add edx,1 shl 16
 767 
	add	edx,1 shl 16
778 
	mcall
 768 
	mcall
779 
	sub edx,10 shl 16
 769 
	sub	edx,10 shl 16
780
- 
 
781
- 
 
782 
    pop  ecx
 - 
 
783 
    inc  edi
 770 
	inc	edi
784 
    cmp  edi,7
 771 
	cmp	edi,7
785 
    jne  .nowrap
 772 
	jne	.nowrap
786 
    xor  edi,edi
 773 
	xor	edi,edi
787 
    add  dx,B_DAYS_SHIFT
 774 
	add	dx,B_DAYS_SHIFT
788 
  .nowrap:
 775 
.nowrap:
789 
    loop .eloop
 776 
	dec	dword [esp]
790 
    jmp  .ex
 - 
 
791 
  .eloop:
 - 
 
792 
    jmp  .dayloop
 777 
	jnz	.dayloop
793 
  .ex:
 778 
	pop	ecx
794 
    ret
 779 
	ret
Line 795... Line 780...
795 
 
 780 
 
796 
count_days:    ; ecx -days in month
 781 
count_days:    ; ecx -days in month
797 
    call is_leap_year
 782 
    call is_leap_year