Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 7431 → Rev 7430

/programs/other/calc/trunk/calc.asm
35,12 → 35,6
include '../../../gui_patterns.inc'
include '../../../KOSfuncs.inc'
 
hotkeys_count equ 26
asci: db 49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 43, 61, 13, 45, 42, 47, 44, 46, 27, 182, \
97, 98, 99,100,101,102
butid: db 12, 13, 14, 19, 20, 21, 26, 27, 28, 34, 15, 39, 39, 22, 36, 29, 35, 35, 1, 2 , \
6, 7, 8, 9, 10, 11
 
START:
red:
call draw_window
59,10 → 53,9
 
key:
mcall 2 ; get ASCII key code
and eax, 0xffff ; supress scancodes
shr eax, 8
mov edi, asci ; convert ASCII into button id
mov ecx, hotkeys_count
mov ecx, 18
cld
repne scasb
jne still
268,7 → 261,6
call calculate
call new_entry
mov [calc], '+'
call print_display
jmp still
 
no_add:
277,7 → 269,6
call calculate
call new_entry
mov [calc], '-'
call print_display
jmp still
no_sub:
286,7 → 277,6
call calculate
call new_entry
mov [calc], '/'
call print_display
jmp still
 
no_div:
295,7 → 285,6
call calculate
mov [calc], '*'
call new_entry
call print_display
jmp still
 
no_mul:
715,11 → 704,6
cmp [edx], byte 'x'
jne next_line
 
DrawRectangle3D DISPLAY_X-1,DISPLAY_Y-1,DISPLAY_W+2,DISPLAY_H+2, [sc.work_3d_dark], [sc.work_3d_light]
DrawRectangle DISPLAY_X,DISPLAY_Y,DISPLAY_W,DISPLAY_H, [sc.work_graph]
mcall 38, < DISPLAY_X+1, DISPLAY_W+DISPLAY_X-1>, <DISPLAY_Y+1, DISPLAY_Y+1>, 0xE0E0E0 ; internal shadow
mcall , < DISPLAY_X+1, DISPLAY_X+1>, <DISPLAY_Y+2, DISPLAY_Y+DISPLAY_H-1>, ; internal shadow
call print_display
 
mcall 12, 2
727,6 → 711,10
 
print_display:
pusha
DrawRectangle3D DISPLAY_X-1,DISPLAY_Y-1,DISPLAY_W+2,DISPLAY_H+2, [sc.work_3d_dark], [sc.work_3d_light]
DrawRectangle DISPLAY_X,DISPLAY_Y,DISPLAY_W,DISPLAY_H, [sc.work_graph]
mcall 38, < DISPLAY_X+1, DISPLAY_W+DISPLAY_X-1>, <DISPLAY_Y+1, DISPLAY_Y+1>, 0xE0E0E0 ; internal shadow
mcall , < DISPLAY_X+1, DISPLAY_X+1>, <DISPLAY_Y+2, DISPLAY_Y+DISPLAY_H-1>, ; internal shadow
mcall 13, < DISPLAY_X+2, DISPLAY_W-2>, <DISPLAY_Y+2, DISPLAY_H-2>, 0xFFFfff ; background
mcall 8, <236,53>, <DISPLAY_Y,DISPLAY_H>, 3, [sc.work] ; 'dec-bin-hex'
852,6 → 840,9
db 3,'+/-', 1,'0', 1,'.', 1,'*', 3,'Sqr', 2,'Pi', 1,'=', 0
db 'x'
 
asci: db 49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 43, 61, 45, 42, 47, 44, 46, 27
butid: db 12, 13, 14, 19, 20, 21, 26, 27, 28, 34, 15, 39, 22, 36, 29, 35, 35, 1
 
I_END:
 
sc system_colors
/programs/system/board/trunk/board.asm
428,7 → 428,7
title db 'General debug & message board',0
end if
 
default_filename db '/tmp0/1/boardlog.txt',0
default_filename db '/sys/boardlog.txt',0
krnl_msg db 'K : '
duk db 'KernUser'
my_name db 'board',0
/programs/system/eskin/trunk/build.bat
File deleted
\ No newline at end of file
/programs/system/eskin/trunk/eskin.asm
@@ -43,10 +43,12 @@
@@ -55,7 +57,7 @@
@@ -65,11 +67,18 @@
@@ -81,20 +90,21 @@
@@ -103,6 +113,9 @@
@@ -111,3 +124,4 @@