Files {BOARD,AIRC}.ASM restored from before svn.1723:

- BOARD.ASM@1723 can not be compiled (wrong path to MACROS.INC)
- AIRC.ASM@1723 lacks english support

git-svn-id: svn://kolibrios.org@1725 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
CleverMouse 2010-12-21 12:49:48 +00:00
parent 1c5b84e164
commit 0f20b06d91
2 changed files with 42 additions and 43 deletions

View File

@ -53,10 +53,10 @@ UTF8 = 2
ENCODING_X = 25 + 15*6 ENCODING_X = 25 + 15*6
ENCODING_Y = 183 + 3*12 ENCODING_Y = 183 + 3*12
def_server_name db 'kolibrios.org',0 ; default server name def_server_name db 'kolibrios.org',0 ; default server name
user_nick dd 12 ; length user_nick dd 12 ; length
db 'Dmitry_Sokolowski ' ; string db 'kolibri_user ' ; string
user_nick_max = $ - user_nick - 4 user_nick_max = $ - user_nick - 4
user_real_name dd 14 ; length user_real_name dd 14 ; length
@ -104,17 +104,17 @@ redraw: ; redraw
still: still:
mov eax,10 ; wait here for event mov eax,10 ; wait here for event
mcall mcall
dec eax ; redraw dec eax ; redraw
je redraw je redraw
dec eax ; key dec eax ; key
je main_window_key je main_window_key
dec eax ; button dec eax ; button
je button je button
cmp al,4 cmp al,4
jz ipc jz ipc
call process_network_event call process_network_event
@ -137,7 +137,7 @@ button: ; button
cmp ah,1 ; close program cmp ah,1 ; close program
jne noclose jne noclose
exit: exit:
or eax,-1 or eax,-1
mcall mcall
noclose: noclose:
cmp ah,21 cmp ah,21
@ -164,7 +164,7 @@ exit:
ipc: ipc:
mov edx,msgbox_struct mov edx,msgbox_struct
cmp byte[edx-1],0 cmp byte[edx-1],0
jz @f jz @f
mov byte[edx-1],0 mov byte[edx-1],0
mov al,[edx] mov al,[edx]
dec eax dec eax
@ -287,7 +287,7 @@ socket_commands:
cmp ah,24 ; close socket cmp ah,24 ; close socket
jz disconnect jz disconnect
no_24: no_24:
@ -667,7 +667,7 @@ process_command:
mov ecx,[xpos] mov ecx,[xpos]
sub ecx,7 sub ecx,7
cmp ecx,user_nick_max cmp ecx,user_nick_max
jb @f jb @f
mov ecx,user_nick_max mov ecx,user_nick_max
@@: @@:
mov [user_nick],ecx mov [user_nick],ecx
@ -705,7 +705,7 @@ process_command:
mov ecx,[xpos] mov ecx,[xpos]
sub ecx,7 sub ecx,7
cmp ecx,user_real_name_max cmp ecx,user_real_name_max
jb @f jb @f
mov ecx,user_real_name_max mov ecx,user_real_name_max
@@: @@:
mov [user_real_name],ecx mov [user_real_name],ecx
@ -2169,28 +2169,28 @@ draw_window:
mov edi,title mov edi,title
mcall mcall
mov eax,8 ; button: change encoding mov eax,8 ; button: change encoding
mov ebx,(ENCODING_X-2)*65536+38 mov ebx,(ENCODING_X-2)*65536+38
mov ecx,(ENCODING_Y-2)*65536+12 mov ecx,(ENCODING_Y-2)*65536+12
mov edx,21 mov edx,21
mov esi,[main_button] mov esi,[main_button]
mcall mcall
; mov eax,8 ; button: open socket ; mov eax,8 ; button: open socket
mov ebx,43*65536+22 mov ebx,43*65536+22
mov ecx,241*65536+10 mov ecx,241*65536+10
; mov edx,22 ; mov edx,22
inc edx inc edx
mcall mcall
;mov eax,8 ; button: send userinfo ;mov eax,8 ; button: send userinfo
mov ebx,180*65536+22 mov ebx,180*65536+22
mov ecx,241*65536+10 mov ecx,241*65536+10
; mov edx,23 ; mov edx,23
inc edx inc edx
mcall mcall
;mov eax,8 ; button: close socket ;mov eax,8 ; button: close socket
mov ebx,317*65536+22 mov ebx,317*65536+22
mov ecx,241*65536+10 mov ecx,241*65536+10
; mov edx,24 ; mov edx,24
@ -2281,28 +2281,28 @@ main_button dd 0x6565cc
text: text:
db ' ‚ è¥ ¨¬ï : KolibriOS User - ¬¥­ï©â¥ â ª: /areal Jill User ' db ' Real name : KolibriOS User - change with eg /areal Jill User '
db ' <EFBFBD>¨ª : Ataualpa - ¬¥­ï©â¥ â ª: /anick Jill ' db ' Nick : kolibri_user - change with eg /anick Jill '
db ' ‘¥à¢¥à : kolibrios.org - ¬¥­ï©â¥ â ª: /aserv irc.by ' db ' Server : kolibrios.org - change with eg /aserv irc.by '
db ' Š®¤¨à®¢ª  : UTF-8 ' db ' Encoding : UTF-8 '
db ' ' db ' '
db ' 1) ‘®¥¤¨­¨âì 2) <20>®á« âì ¤ ­­ë¥ 3) ‡ ¢¥àè¨âì ' db ' 1) Connect 2) Send userinfo 3) Disconnect '
db ' ' db ' '
db ' ‘â âãá ᮥ¤¨­¥­¨ï: ®âᮥ¤¨­¥­® ' db ' Connection status: disconnected '
db ' ' db ' '
db ' Š®¬ ­¤ë ¯®á«¥ ãáâ ­®¢«¥­¨ï ᮥ¤¨­¥­¨ï: ' db ' Commands after established connection: '
db ' ' db ' '
db ' /join #ChannelName - ­ ¯à¨¬¥à: /join #general ' db ' /join #ChannelName - eg /join #general '
db ' /part #ChannelName - ­ ¯à¨¬¥à: /part #windows ' db ' /part #ChannelName - eg /part #windows '
db ' /query Nickname - ­ ¯à¨¬¥à: /query Mary ' db ' /query Nickname - eg /query Mary '
db ' /quit - ¯®ª¨­ãâì á¥à¢¥à ¨ § ªàëâì ᮪¥â ' db ' /quit - Quit server and Close socket '
db 'x' ; <- END MARKER, DONT DELETE db 'x' ; <- END MARKER, DONT DELETE
status_text: status_text:
db '®âᮥ¤¨­¥­® ' db 'disconnected '
db '¯®«ãç î ¨¬ï á¥à¢¥à ... ' db 'resolving server name...'
db 'ᮥ¤¨­¥­¨¥... ' db 'connecting... '
db 'ᮥ¤¨­¥­® ' db 'connected '
status_text_len = 24 status_text_len = 24
encoding_text: encoding_text:
@ -2330,7 +2330,7 @@ channel_thread:
add eax,0x80000 add eax,0x80000
mov esp,eax mov esp,eax
; mov edi,ebp ; clear thread memory ; mov edi,ebp ; clear thread memory
; imul edi,120*80 ; imul edi,120*80
; add edi,I_END ; add edi,I_END
; mov ecx,120*80 ; mov ecx,120*80
@ -2376,13 +2376,13 @@ channel_thread:
mcall 10 mcall 10
dec eax dec eax
jz thread_redraw jz thread_redraw
dec eax dec eax
jz thread_key jz thread_key
dec eax dec eax
jz thread_end jz thread_end
cmp al,4 cmp al,4
jz thread_ipc jz thread_ipc
call check_mouse call check_mouse
jmp w_t jmp w_t
thread_end: thread_end:
@ -2531,7 +2531,7 @@ thread_key:
mov ebx,1 mov ebx,1
mcall mcall
cmp dword [ipcbuf+4],8 cmp dword [ipcbuf+4],8
jne wait_for_sending jne wait_for_sending
popa popa
call draw_channel_text call draw_channel_text
call print_entry call print_entry
@ -2648,7 +2648,7 @@ thread_draw_window:
mcall mcall
;mov eax,38 ; line ;mov eax,38 ; line
mov ebx,410*65536+410 mov ebx,410*65536+410
mov ecx,22*65536+148 mov ecx,22*65536+148
mov edx,[channel_line_sun] mov edx,[channel_line_sun]
@ -2773,7 +2773,7 @@ align 4
@IMPORT: @IMPORT:
library network, 'network.obj', msgbox, 'msgbox.obj' library network, 'network.obj', msgbox, 'msgbox.obj'
import network, \ import network, \
getaddrinfo_start, 'getaddrinfo_start', \ getaddrinfo_start, 'getaddrinfo_start', \
getaddrinfo_process, 'getaddrinfo_process', \ getaddrinfo_process, 'getaddrinfo_process', \
getaddrinfo_abort, 'getaddrinfo_abort', \ getaddrinfo_abort, 'getaddrinfo_abort', \
@ -2798,15 +2798,15 @@ encoding dd UTF8
recode_proc dd recode_to_cp866, recode_to_cp1251, recode_to_utf8 recode_proc dd recode_to_cp866, recode_to_cp1251, recode_to_utf8
get_byte_table dd get_byte_cp866, get_byte_cp1251, get_byte_utf8 get_byte_table dd get_byte_cp866, get_byte_cp1251, get_byte_utf8
msgbox_func_array: msgbox_func_array:
times 3 dd msgbox_notify times 3 dd msgbox_notify
initialized_size: initialized_size:
main_PID dd ? ; identifier of main thread main_PID dd ? ; identifier of main thread
utf8_bytes_rest dd ? ; bytes rest in current UTF8 sequence utf8_bytes_rest dd ? ; bytes rest in current UTF8 sequence
utf8_char dd ? ; first bits of current UTF8 character utf8_char dd ? ; first bits of current UTF8 character
gai_reqdata rb 32 ; buffer for getaddrinfo_start/process gai_reqdata rb 32 ; buffer for getaddrinfo_start/process
ip_list dd ? ; will be filled as pointer to addrinfo list ip_list dd ? ; will be filled as pointer to addrinfo list
irc_server_name rb 256 ; buffer for irc_server_name irc_server_name rb 256 ; buffer for irc_server_name
packetbuf rb 1024 ; buffer for packets to server packetbuf rb 1024 ; buffer for packets to server
mb_stack rb 1024 ; stack for messagebox thread mb_stack rb 1024 ; stack for messagebox thread

View File

@ -5,7 +5,6 @@
; ;
; Compile with FASM for Menuet ; Compile with FASM for Menuet
; ;
LMARGIN equ (15+5) LMARGIN equ (15+5)
TMARGIN equ (35+5) TMARGIN equ (35+5)
HSPACE equ 16 HSPACE equ 16
@ -27,7 +26,7 @@ include 'lang.inc'
dd i_end+0x2000 ; memory for app (4 Kb) dd i_end+0x2000 ; memory for app (4 Kb)
dd i_end+0x2000 ; esp dd i_end+0x2000 ; esp
dd 0x0 , 0x0 ; I_Param , I_Icon dd 0x0 , 0x0 ; I_Param , I_Icon
include '\..\..\MACROS.INC' include '..\..\..\MACROS.INC'
include 'debug.inc' include 'debug.inc'
purge newline purge newline
MAXSTRINGS = 16 MAXSTRINGS = 16