WebSVN – Kolibri OS – Diff – /programs/system/calendar/trunk/calendar.asm

 ; Calendar for KolibriOS
+;
-; v1.2 - code update by Leency, small design fixes
+; v1.3 - code update, redesign by Leency
 ; v1.1 - add change time support by DedOK
 ; v1.0 - written in pure assembler by Ivushkin Andrey aka Willow
 ; also - diamond, spraid, fedesco
+;
 ; Created: November 1, 2004
-WIN_CW equ 266
-WIN_X equ (5000 shl 16+WIN_CW+9)
-WIN_Y equ (100 shl 16+335)
-LINE1	  equ 27 shl 16+16
-B_MONTH_X equ 5 shl 16+158+11
-B_Y	  equ LINE1
-B_MONTH   equ 63 shl 16+32
-B_WBAR_X  equ 5 shl 16+WIN_CW
-B_WBAR_Y  equ 64 shl 16+20
-B_WEEK	  equ 30 shl 16+70
-B_WX_SHIFT equ 32 shl 16
-B_DBAR_X  equ B_WBAR_X
-B_DBAR_Y  equ 85 shl 16+190
-B_DROP	  equ B_MONTH+16
-B_DAYS_Y  equ 100
-B_DAYS_SHIFT equ 30
-B_YEAR_X  equ 173 shl 16+58
-B_YEAR	  equ 188 shl 16+32
-B_TODAY_X equ 25 shl 16
-B_TODAY_Y equ 48 shl 16+10
-B_TODAY   equ 30 shl 16+50
-B_SPIN_WIDTH equ 13
-B_SPIN_X  equ 234 shl 16+B_SPIN_WIDTH
-B_SPIN	  equ 238 shl 16+32
-B_NS_X	  equ 185 shl 16+75
-B_NS_Y	  equ 48 shl 16+10
-B_NS	  equ 190 shl 16+50
-FOCUSABLE equ 5
      mov  reg,0x10e7c750;0x10ddeeff
    end if
      jmp  .exit
    .nofocus:
    if reg eq
-     mov  ecx,0x10000000
+     mov  ecx,COL_DROPDOWN_T
    else
-     mov  reg,0x10000000
+     mov  reg,COL_DROPDOWN_T
    end if
    .exit:
+}
+macro GetSkinHeight
+{
+	mov  eax,48
+	mov  ebx,4
+	int 0x40
+}
     call draw_window
-still:			;
-    mov  eax,23 		; wait here for event
+still:			;
     mov  ebx,50
-    mcall
+    mcall 23,50     ; wait here for event
   .evt:
     mov  ebp,[focus]
     call draw_clock
-    jmp  still		; ¥á«¨ ¤àã£®¥ á®¡ëâ¨¥ - ¢  ç «® æ¨ª«
+    jmp  still		; ¥á«¨ ¤àã£®¥ á®¡ëâ¨¥ - ¢  ç «® æ¨ª«
   key:			;  ¦ â  ª« ¢¨è    ª« ¢¨ âãà¥
-    mov  eax,2		; äãªæ¨ï 2 - áç¨â âì ª®¤ á¨¬¢®«
+  key:
-    mcall		; ¢ë§®¢ á¨áâ¥¬ë
+    mcall 2		; get pressed key
     cmp  ah,9
     jne  no_tab
     jle  still
     jmp  .ok
 day_bounds db -1,0,7,0,-7,0,1,0 ; left,down,up,right
-  button:		;  ¦ â  ª®¯ª  ¢ ®ª¥ ¯à®£à ¬¬ë
-    mov  eax,17 	; 17 - ¯®«ãç¨âì ¨¤¥â¨ä¨ª â®à  ¦ â®© ª®¯ª¨
+  button:
-    mcall		; ¢ë§®¢ á¨áâ¥¬ë
+    mcall 17 	; 17 - ¯®«ãç¨âì ¨¤¥â¨ä¨ª â®à  ¦ â®© ª®¯ª¨
     movzx ebx,ah
     cmp  ah,200
     jbe  nodayselect
     mcall
     jmp  still
-plus_hd:
-    mov  eax,3
+plus_hd:
-    mcall
+    mcall 3
     mov  ecx,eax
     add  ecx,1
-    mov  eax,22
-    mov  ebx,0x00000000
-    mcall
+    mov  eax,22
     mcall 22,0x00000000
-    jmp  still
-plus_he:
+    jmp  still
-    mov  eax,3
+plus_he:
-    mcall
-    mov  ecx,eax
+    mcall 3
-    add  ecx,16
-    mov  eax,22
-    mov  ebx,0x00000000
+    mov  ecx,eax
-    mcall
+    add  ecx,16
-    jmp  still
+    mcall 22,0x00000000
-minus_hd:
+    jmp  still
-    mov  eax,3
+minus_hd:
-    mcall
+    mcall 3
     mov  ecx,eax
     mcall
     ret
 draw_window:
-    mcall 12,1 ; äãªæ¨ï 12: á®®¡é¨âì  ®¡ ®âà¨á®¢ª¥ ®ª
+    mcall 12,1
-    xor  eax,eax	; äãªæ¨ï 0 : ®¯à¥¤¥«¨âì ¨ ®âà¨á®¢ âì ®ª®
+    mcall 0,WIN_X,WIN_Y-15,COL_WINDOW_BG, ,title ; define window
-    mov  ebx,WIN_X
-    mov  ecx,WIN_Y-15
+	GetSkinHeight
-    mov  edx,COL_WINDOW_BG 	   ; æ¢¥â à ¡®ç¥© ®¡« áâ¨  RRGGBB,8->color gl
+	mov ecx, eax
+	shl ecx, 16
-    mov  edi,title		   ; § £®«®¢®ª
+	add ecx, 43
-    mcall
+	mcall 13,B_WBAR_X, ,COL_TOOLBAR_BG ; draw toolbar background
     call draw_week
     mov  ebx,212*65536+7
     inc  edx
     mcall
-    mov  ebx,224*65536+7
+    mov  ebx,225*65536+7
     mov  ecx,290*65536+10
     inc  edx
     mcall
-    mov  ebx,231*65536+7
+    mov  ebx,232*65536+7
     inc  edx
     mcall
-    mov  ebx,224*65536+7
+    mov  ebx,225*65536+7
     mov  ecx,300*65536+10
     inc  edx
     mcall
-    mov  ebx,231*65536+7
+    mov  ebx,232*65536+7
     inc  edx
     mcall
-    mov  ebx,243*65536+14
+    mov  ebx,244*65536+14
     mov  ecx,290*65536+20
     inc  edx
     mcall
     mov  ebx,14*65536+110
     mov  ecx,285*65536+22
-    mov  esi,0x00d5d5d5
+    mov  esi,COL_DATE_BUTTONS
     inc  edx
     mcall
     mov  ecx,B_Y
     mov  ebx,B_MONTH_X
     mov  edx,2
     mcall
-    mov  ebx,B_SPIN_X
+    mov  ebx,B_SPIN_X ; <
     inc  edx
     mcall
-    add  ebx,B_SPIN_WIDTH shl 16
+    add  ebx,61 shl 16 ; >
     inc  edx
     mcall
     call draw_days
     mov  esi,today_end-today_msg
     mcall
     mov  ebx,B_SPIN
     mov  edx,spinner
-    mov  esi,3
+    mov  esi,12
     ShowFocus 4
     mcall
     mcall
     call draw_year
     mov  [dropped],0
     mcall 12,2
-    ret 			   ; ¢ëå®¤¨¬ ¨§ ¯à®æ¥¤ãàë
+    ret
 draw_year:
     mcall 8,B_YEAR_X,B_Y,5,COL_MONTH_YEAR_B
     push dword B_DROP
     push dword B_Y+16 shl 16
   .ddd_loop:
     mov  edi,edx
     push ecx
-    mov  ebx,B_MONTH_X
+    mov  esi,COL_DROPDOWN_BG
-    mov  ecx,[esp+4]
+    mcall 8,B_MONTH_X,[esp+4]
-    mov  esi,0x6f9fef
-    mov  eax,8
-    mcall
     shr  eax,1
     mov  ebx,[esp+8]
     xchg edx,[esp+12]
     movzx esi,byte[month_name]
     ShowFocus edi
     pop  ecx
     loop .week
     ret
-draw_days:
-    mov  eax,13
-    mov  ebx,B_DBAR_X
-    mov  ecx,B_DBAR_Y
-    mov  edx,COL_DATES_BG
-    mcall
+draw_days:
     call count_days
     cmp  ecx,[day_sel]
     jae  .ok
     mov  [day_sel],ecx
   .ok:
     mov  [number],0
     mov  eax,47
     mov  edx,B_DAYS_Y
-    mov  ebx,0x20001
+    mov  ebx,0x10001
     mov  edi,[firstday]
   .dayloop:
     push ecx
     movzx edx,dx
     mov  esi,edi
     shl  esi,21
-    lea  edx,[edx+esi+29 shl 16]
+    lea  edx,[edx+esi+34 shl 16]
     mov  ecx,edi
     add  cl,[week_days+1]
     cmp  ecx,7
     je	 .holiday
-    mov  esi,0x10000000
+    mov  esi,0x10000000 ; COL_DATE_TEXT
     jmp  .noholiday
   .holiday:
     mov  esi,0x10cc1010
   .noholiday:
     cmp  [focus],5
     jne  .draw_but
     mov  esi,COL_DATE_CHANGED
   .draw_but:
     add  edx,200+1 shl 29
+    mcall 8
+	mov    eax, [number]
+    xor    edx, edx
-    mov  eax,8
+    mov    ecx, 10
-    mcall
+    div    ecx
+    mov    [remainder], edx
+    mov    [quotient],  eax
-    popa
+	popa
+	;first number
+	mov ecx,quotient
     mcall
 	add edx,1 shl 16
 	mcall
 	sub edx,1 shl 16
+	;second number
+	mov ecx,remainder
+	add edx,9 shl 16
+    mcall
+	add edx,1 shl 16
+	mcall
+	sub edx,10 shl 16
     pop  ecx
     inc  edi
     cmp  edi,7
     jne  .nowrap
     xor  edi,edi
     mov  ebx,7
     div  bx
     mov  [firstday],edx
     ret
+I_END:
 I_END:	; ª®¥æ ¯à®£à ¬¬ë
 firstday  dd ?
 Year dd   ?
 Month dd  ?
 day_sel   dd ?

Subversion Repositories Kolibri OS

(root)/programs/system/calendar/trunk/calendar.asm – Rev 3887 → 3889