Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 190 → Rev 195

/programs/media/gifview/trunk/build_en.bat
1,4 → 1,5
@erase lang.inc
@echo lang fix en >lang.inc
@fasm gifview.asm gifview
@erase lang.inc
@pause
/programs/media/gifview/trunk/build_ru.bat
1,4 → 1,5
@erase lang.inc
@echo lang fix ru >lang.inc
@fasm gifview.asm gifview
@erase lang.inc
@pause
/programs/media/gifview/trunk/gifview.asm
8,11 → 8,12
;
; COMPILE WITH FASM
 
WND_COLOR equ 0x02aabbcc
appname equ 'GIF VIEWER'
 
; input line dimensions
INP_X equ 10 shl 16+680
INP_Y equ 25 shl 16+16
INP_XY equ 15 shl 16+30
INP_X equ 5 shl 16+680
INP_Y equ 5 shl 16+16
INP_XY equ 10 shl 16+10
 
use32
 
29,7 → 30,6
 
include 'lang.inc'
include 'macros.inc' ; decrease code size (optional)
;include '/hd/1/meos/debug.inc'
include 'debug.inc'
COLOR_ORDER equ MENUETOS
 
182,7 → 182,7
push edi
cmp [entered],0
jne highlight
mov esi,WND_COLOR
mov esi,0x00aabbcc
jmp di_draw
highlight:
mov esi,0xe0e0e0
193,7 → 193,7
mov edx,2
int 0x40
mov eax,4
mov ecx,0x00107a30 ; èà¨äâ 1 ¨ 梥â ( 0xF0RRGGBB )
mov ecx,0x00107a30
mov ebx,INP_XY
mov edx,fn_input
mov esi,[inp_pos]
207,6 → 207,12
 
draw_window:
 
mov eax,48
mov ebx,3
mov ecx,sc
mov edx,sizeof.system_colors
int 0x40
 
mov eax,12
mov ebx,1
int 0x40
214,26 → 220,11
mov eax,0
mov ebx,50*65536+700
mov ecx,50*65536+500
mov edx,WND_COLOR
mov esi,0x805080d0
mov edi,0x005080d0
mov edx,[sc.work]
or edx,0x33000000
mov edi,header
int 0x40
 
 
mov eax,4
mov ebx,8*65536+8
mov ecx,0x10ddeeff
mov edx,zagolovok
mov esi,zag_konets-zagolovok
int 0x40
 
mov eax,8
mov ebx,(700-19)*65536+12
mov ecx,5*65536+12
mov edx,1
mov esi,0x6688dd
int 0x40
 
call draw_input
 
xor ecx,ecx
266,7 → 257,7
movzx edx,[gif_inf.Left]
shl edx,16
add edx,eax
add edx,10 shl 16 +45
add edx,5 shl 16 +25
mov eax,7
int 0x40
.enddraw:
274,16 → 265,8
 
; ‡¤¥áì ­ å®¤ïâáï ¤ ­­ë¥ ¯à®£à ¬¬ë:
 
; ¨­â¥àä¥©á ¯à®£à ¬¬ë ¤¢ãï§ëç­ë© - § ¤ ©â¥ ï§ëª ¢ macros.inc
header db appname,0 ; áâப  § £®«®¢ª 
 
zagolovok: ; áâப  § £®«®¢ª 
if lang eq ru
db 'Ž‘ŒŽ’ GIF'
else
db 'GIF VIEWER'
end if
zag_konets: ; ¨ ¥ñ ª®­¥æ
 
inp_pos dd inp_end-fn_input
fn_input:
; db '/hd/1/gif/smileys/sm100000.gif'
309,6 → 292,7
rb 257
;filename_len dd 0
entered rd 1
sc system_colors
 
imgcount rd 1
img_index rd 1
/programs/media/jpegview/trunk/jpegview.asm
98,8 → 98,8
cmp [winys],bp
jc .l1
 
add eax,5 ; offset for boarder
add ebx,20 ; offset for title bar
add eax,2 ; offset for boarder
add ebx,2 ; offset for title bar
push ax ; pox
push bx ; pos
push cx ; size
235,6 → 235,12
 
draw_window:
 
mov eax,48
mov ebx,3
mov ecx,sc
mov edx,sizeof.system_colors
int 0x40
 
mov eax,12
mov ebx,1
int 0x40
273,39 → 279,26
mov cx, [winys]
 
xor eax,eax ; DRAW WINDOW
mov edx,[wcolor]
add edx,0x13000000
mov edx,[sc.work]
or edx,0x33000000
mov edi,header ; WINDOW LABEL
int 0x40
 
 
; draw status bar
mov eax, 13
movzx ebx, word [winxs]
sub ebx, 5
add ebx, 4*65536
mov eax,8 ; BUTTON 2: slideshow
mov ebx,57
mov cx, [winys]
sub ecx, 19
sub cx, 39
shl ecx, 16
add ecx, 3
mov edx, 0x00557799
int 0x40
 
mov eax,8 ; BUTTON 2: filename
mov ebx,4*65536+55
mov cx, [winys]
sub cx, 16
shl ecx, 16
add ecx, 12
mov esi, 0x00557799
mov esi, [sc.work_button]
mov edx,2
int 0x40
 
mov eax,4 ; Button text
movzx ebx, word [winys]
sub ebx, 13
add ebx, 6*65536
mov ecx,0x00ffffff
add ebx, 3 shl 16 - 36
mov ecx,[sc.work_button_text]
mov edx,setname
mov esi,setnamelen-setname
int 0x40
313,24 → 306,24
 
mov eax,8 ; BUTTON 3: set as background
mov bx, [winxs]
sub bx, 60
sub bx, 65
shl ebx, 16
mov bx,55
mov cx, [winys]
sub cx, 16
sub cx, 39
shl ecx, 16
add ecx, 12
mov esi, 0x00557799
mov esi, [sc.work_button]
mov edx,3
int 0x40
 
mov eax,4 ; Button text
movzx ebx, word [winxs]
sub ebx, 60
sub ebx, 63
shl ebx,16
mov bx, word [winys]
sub bx,13
mov ecx,0x00ffffff
sub bx,36
mov ecx,[sc.work_button_text]
mov edx,setbgr
mov esi,setbgrlen-setbgr
int 0x40
391,13 → 384,12
 
mov eax,13 ; clear picture area
movzx ebx, word [winxs]
sub ebx, 7
add ebx, 4 * 65536
add ebx, 1 shl 16 -10
movzx ecx, word [winys]
sub ecx, 39
add ecx, 20 * 65536
sub ecx, 40
add ecx, 1 shl 16
 
mov edx,0
mov edx,[sc.work]
int 0x40
mov ebp,[jpeg_st]
test ebp,ebp
410,10 → 402,9
pusha
mov eax,13 ; clear text area
movzx ebx, word [winxs]
sub ebx, 64+58
add ebx, 60*65536
add ebx, 59 shl 16 -125
mov cx, [winys]
sub cx, 16
sub cx, 39
shl ecx, 16
add ecx, 12
mov edx,0xffffff
421,8 → 412,7
 
mov eax,4 ;
movzx ebx, word [winys]
sub ebx, 14
add ebx, 60*65536
add ebx, 61 shl 16 - 37
mov ecx,0x000000
mov edx,name_string
mov esi,60
529,8 → 519,6
winys dw 0
jpeg_st dd 0
file_dir dd 0
tcolor dd 0x000000
btcolor dd 0x224466+0x808080
name_string: db '/rd/1/jpegview.jpg',0
rb 256
.end:
552,6 → 540,6
 
fin:
I_END:
 
sc system_colors
fileattr: rb 40
dirinfo: rb 32+304