mirror of
https://github.com/KolibriOS/kolibrios.git
synced 2024-11-25 02:09:36 +03:00
Fix EN typos
- Corrections for en_US language. - Some whitespace sanitation. git-svn-id: svn://kolibrios.org@10059 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Andrew Dent
parent
349dbb6edf
commit
27f290d51b
@ -31,7 +31,7 @@
|
||||
}
|
||||
|
||||
;-----------------------------------
|
||||
; Shell`s initialization
|
||||
; Shell's initialization
|
||||
; without arguments
|
||||
;-----------------------------------
|
||||
|
||||
@ -105,7 +105,7 @@
|
||||
ret
|
||||
|
||||
;-----------------------------------
|
||||
; Wait answer from shell
|
||||
; Wait for answer from the shell
|
||||
;
|
||||
; INPUT:
|
||||
; edi - shell-buffer
|
||||
@ -259,7 +259,7 @@
|
||||
; Get string from shell
|
||||
;
|
||||
; INPUT:
|
||||
; eax - addres of memory for str
|
||||
; eax - address of memory for str
|
||||
;-----------------------------------
|
||||
|
||||
shell.get_string:
|
||||
@ -380,7 +380,7 @@
|
||||
; Print string to shell
|
||||
;
|
||||
; INPUT:
|
||||
; arg1 - addres of string
|
||||
; arg1 - address of string
|
||||
;-----------------------------------
|
||||
|
||||
macro shpsa [addr] {
|
||||
@ -420,7 +420,7 @@
|
||||
; Get string from shell
|
||||
;
|
||||
; INPUT:
|
||||
; arg1 - addres of memory for str
|
||||
; arg1 - address of memory for str
|
||||
;-----------------------------------
|
||||
|
||||
macro shgs [addr] {
|
||||
@ -432,7 +432,7 @@
|
||||
; Get number from shell
|
||||
;
|
||||
; INPUT:
|
||||
; arg1 - addres of memory for num
|
||||
; arg1 - address of memory for num
|
||||
;-----------------------------------
|
||||
|
||||
macro shgn [addr] {
|
||||
@ -504,4 +504,4 @@
|
||||
sub eax, ..chs
|
||||
|
||||
pop ebx
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,17 +10,17 @@
|
||||
;include 'smb_nf2.inc'
|
||||
|
||||
smb_base dd 0 ; IO port base for SMBus acces
|
||||
smb_slave dd 0 ; SMBus addres for monitoring chip
|
||||
smb_slave dd 0 ; SMBus address for monitoring chip
|
||||
|
||||
;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
|
||||
smbInit:
|
||||
; Èçìåíèòü, êîä òîëüêî äëÿ òåñòèðîâàíèÿ !!!
|
||||
; mov dword[IO_Read ], nf2_readb
|
||||
; mov dword[IO_Write], nf2_writeb
|
||||
|
||||
|
||||
|
||||
|
||||
; See pci_pm.c -> pci_pm_smb_prob
|
||||
|
||||
|
||||
|
||||
.exit_err:
|
||||
stc
|
||||
@ -28,7 +28,7 @@ smbInit:
|
||||
.exit_ok:
|
||||
clc
|
||||
ret
|
||||
|
||||
|
||||
;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
|
||||
; pci_bus_num: db 2 ; Íîìåð øèíû
|
||||
; pci_devfn: db 255
|
||||
@ -67,6 +67,6 @@ smbInit:
|
||||
; ret
|
||||
;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
|
||||
smbClose:
|
||||
|
||||
|
||||
ret
|
||||
;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
; version: 2.02
|
||||
; last update: 15/03/2012
|
||||
; changed by: Marat Zakiyanov aka Mario79, aka Mario
|
||||
; changes: some optimisations and code refactoring
|
||||
; changes: some optimizations and code refactoring
|
||||
;---------------------------------------------------------------------
|
||||
; version: 2.01
|
||||
; last update: 27/09/2011
|
||||
@ -54,7 +54,7 @@
|
||||
; (working to kernel r.2244 and above)
|
||||
;---------------------------------------------------------------------
|
||||
; Many fix's and changes created by:
|
||||
; Halyavin, Diamond, Heavyiron,
|
||||
; Halyavin, Diamond, Heavyiron,
|
||||
; SPraid, Dunkaist
|
||||
;---------------------------------------------------------------------
|
||||
; version: 2.00
|
||||
@ -89,11 +89,11 @@ include '../../../load_lib.mac'
|
||||
;------------------------------------------------------------------------------
|
||||
START: ; start of execution
|
||||
mcall 68,11
|
||||
;---------------------------------------------------------------------
|
||||
;---------------------------------------------------------------------
|
||||
load_libraries l_libs_start,end_l_libs
|
||||
test eax,eax
|
||||
jnz close
|
||||
|
||||
|
||||
; unpack deflate
|
||||
mov eax,[unpack_DeflateUnpack2]
|
||||
mov [deflate_unpack],eax
|
||||
@ -129,7 +129,7 @@ load_libraries l_libs_start,end_l_libs
|
||||
mov [strip_file],eax
|
||||
; back memeory to system
|
||||
mcall 68,13,[finfo.point]
|
||||
|
||||
|
||||
mov eax,[raw_pointer]
|
||||
mov eax,[eax+8]
|
||||
shr eax,5
|
||||
@ -142,13 +142,13 @@ load_libraries l_libs_start,end_l_libs
|
||||
boot_str:
|
||||
cmp [I_Param],dword 'BOOT'
|
||||
je START2
|
||||
;------------------------------------------------------------------------------
|
||||
;------------------------------------------------------------------------------
|
||||
; ICON EDITOR MODE - START1 entering label
|
||||
;------------------------------------------------------------------------------
|
||||
;------------------------------------------------------------------------------
|
||||
START1:
|
||||
call load_icon_list
|
||||
;------------------------------------------------------------------------------
|
||||
align 4
|
||||
align 4
|
||||
red:
|
||||
call draw_window ; at first, draw the window
|
||||
mov esi,[current_icon]
|
||||
@ -159,7 +159,7 @@ still:
|
||||
mcall 10 ; wait here for event
|
||||
dec eax ; redraw request ?
|
||||
jz red
|
||||
|
||||
|
||||
dec eax ; key in buffer ?
|
||||
jz key
|
||||
;------------------------------------------------------------------------------
|
||||
@ -170,11 +170,11 @@ button:
|
||||
|
||||
cmp eax,1 ; button id=1 ?
|
||||
je close
|
||||
|
||||
|
||||
mov esi,[current_icon]
|
||||
add esi,12
|
||||
mov ebx,[cur_band]
|
||||
|
||||
|
||||
cmp eax,11
|
||||
jb @f
|
||||
cmp eax,13
|
||||
@ -186,26 +186,26 @@ align 4
|
||||
@@:
|
||||
cmp eax,21 ; apply changes
|
||||
je apply
|
||||
|
||||
|
||||
cmp eax,22 ; user pressed the 'add icon' button
|
||||
je add_icon
|
||||
|
||||
|
||||
cmp eax,23 ; user pressed the remove icon button
|
||||
je remove_icon
|
||||
|
||||
|
||||
|
||||
cmp eax,30 ; left arrow to icons bar
|
||||
je arrow.left
|
||||
|
||||
|
||||
cmp eax,31 ; right arrow to icons bar
|
||||
je arrow.right
|
||||
|
||||
|
||||
cmp eax,32
|
||||
je ico
|
||||
|
||||
cmp eax,40 ; user pressed button for icon position
|
||||
jae press_button_for_icon_position
|
||||
|
||||
|
||||
jmp still
|
||||
;------------------------------------------------------------------------------
|
||||
align 4
|
||||
@ -255,7 +255,7 @@ ico:
|
||||
call itoa
|
||||
jmp arrow.drwic1
|
||||
;------------------------------------------------------------------------------
|
||||
align 4
|
||||
align 4
|
||||
apply:
|
||||
; (1) save list
|
||||
mov ebx,finfo
|
||||
@ -334,7 +334,7 @@ add_icon:
|
||||
jb no_f
|
||||
mov edi,eax
|
||||
sub eax,40
|
||||
|
||||
|
||||
xor edx,edx ; bcd -> 10
|
||||
mov ebx,16
|
||||
div ebx
|
||||
@ -342,13 +342,13 @@ add_icon:
|
||||
shl eax,1 ; multiply x2
|
||||
lea eax,[eax+eax*4] ; multiply x5
|
||||
add eax,edx
|
||||
|
||||
|
||||
mov ebx,eax
|
||||
add ebx,icons_reserved
|
||||
cmp [ebx],byte 'x'
|
||||
je no_f
|
||||
mov [ebx],byte 'x'
|
||||
|
||||
|
||||
mov [cur_btn],edi
|
||||
xor edx,edx
|
||||
mov ebx,10
|
||||
@ -357,13 +357,13 @@ add_icon:
|
||||
add edx,65
|
||||
mov [icon_default+0],dl
|
||||
mov [icon_default+1],al
|
||||
|
||||
|
||||
inc dword [icons]
|
||||
mov edi,[icons]
|
||||
dec edi
|
||||
imul edi,REC_SIZE
|
||||
add edi,icon_data
|
||||
|
||||
|
||||
mov [current_icon],edi
|
||||
|
||||
mov esi,icon_default
|
||||
@ -382,7 +382,7 @@ align 4
|
||||
remove_icon:
|
||||
mov ebx,24*65536+250+8*14
|
||||
mcall 4,,0xc0ff0000,rem_text,,0xffffff
|
||||
|
||||
|
||||
mcall 10
|
||||
cmp eax,3
|
||||
jne no_f
|
||||
@ -392,7 +392,7 @@ remove_icon:
|
||||
cmp eax,40
|
||||
jb red
|
||||
sub eax,40
|
||||
|
||||
|
||||
xor edx,edx
|
||||
mov ebx,16
|
||||
div ebx
|
||||
@ -400,27 +400,27 @@ remove_icon:
|
||||
shl eax,1 ; multiply x2
|
||||
lea eax,[eax+eax*4] ; multiply x5
|
||||
add eax,edx
|
||||
|
||||
|
||||
mov ebx,eax
|
||||
add ebx,icons_reserved
|
||||
cmp [ebx],byte 'x'
|
||||
jne red
|
||||
mov [ebx],byte ' '
|
||||
|
||||
|
||||
xor edx,edx
|
||||
mov ebx,10
|
||||
div ebx
|
||||
shl eax,8
|
||||
mov al,dl
|
||||
|
||||
|
||||
add eax,65*256+65
|
||||
|
||||
|
||||
mov esi,icon_data
|
||||
mov edi,REC_SIZE
|
||||
imul edi,[icons]
|
||||
add edi,icon_data
|
||||
;--------------------------------------
|
||||
align 4
|
||||
align 4
|
||||
news:
|
||||
cmp word [esi],ax
|
||||
je foundi
|
||||
@ -433,15 +433,15 @@ align 4
|
||||
foundi:
|
||||
mov ecx,edi
|
||||
sub ecx,esi
|
||||
|
||||
|
||||
mov edi,esi
|
||||
add esi,REC_SIZE
|
||||
|
||||
|
||||
cld
|
||||
rep movsb
|
||||
|
||||
|
||||
dec [icons]
|
||||
|
||||
|
||||
mov eax,icon_data
|
||||
mov [current_icon],eax
|
||||
movzx ebx,word[eax]
|
||||
@ -667,11 +667,11 @@ draw_window:
|
||||
mcall ,<20,280>,<135,135> ; HOROZONTAL LINE ON WINDOW AREA
|
||||
|
||||
mcall 8,<20,72>,<(275+1+14),(13-2)>,11,[bcolor] ;id 11 TEXT ENTER BUTTONS
|
||||
|
||||
|
||||
inc edx
|
||||
add ecx,14*65536
|
||||
mcall ; id 12
|
||||
|
||||
|
||||
inc edx
|
||||
add ecx,14*65536
|
||||
mcall ; id 13
|
||||
@ -694,7 +694,7 @@ draw_window:
|
||||
|
||||
add edx,1 + 1 shl 29
|
||||
mcall ,<(33-19),(34*8)> ; id 32
|
||||
|
||||
|
||||
mcall 4,<(23-15),(273-24)>,0,arrows,1
|
||||
|
||||
add ebx,(36*7+27)shl 16
|
||||
@ -761,7 +761,7 @@ no_button:
|
||||
inc al
|
||||
cmp al,9
|
||||
jbe newbline
|
||||
|
||||
|
||||
mov al,0
|
||||
add edx,6
|
||||
ror ebx,16
|
||||
@ -810,12 +810,12 @@ align 4
|
||||
push ecx
|
||||
pusha
|
||||
mov ebp,0
|
||||
|
||||
|
||||
mov eax,[strip_file_size]
|
||||
add eax,[strip_file]
|
||||
cmp eax,ebx
|
||||
ja @f
|
||||
; draw a rectangle if icon does not exist
|
||||
; draw a rectangle if icon does not exist
|
||||
mov ebx,edx ; X
|
||||
mov ecx,edx ; Y
|
||||
shl ecx,16
|
||||
@ -843,14 +843,14 @@ align 4
|
||||
lea edx,[ebx+(8*5)shl 16]
|
||||
pop ecx
|
||||
mcall 47,0x30000,,,0xff
|
||||
|
||||
|
||||
add ecx,7
|
||||
add edx,(3*8+4)shl 16
|
||||
mcall
|
||||
|
||||
|
||||
add edx,(5*8+4)shl 16
|
||||
mcall ,,[icon_count]
|
||||
|
||||
|
||||
pop ecx
|
||||
add edx,(10*8+4)shl 16
|
||||
mcall ,,,,0xff0000
|
||||
@ -866,17 +866,17 @@ close:
|
||||
align 4
|
||||
START2:
|
||||
mcall 40,10000b ; only Event 5 - draw background
|
||||
|
||||
|
||||
mcall 48,5
|
||||
mov [warea.by_x],eax
|
||||
mov [warea.by_y],ebx
|
||||
|
||||
|
||||
mcall 51,1,START_mouse_thread,stack_mouse_thread
|
||||
|
||||
|
||||
xor eax,eax
|
||||
mov [x_left],eax
|
||||
mov [y_top],eax
|
||||
|
||||
|
||||
mcall 14
|
||||
mov ebx,eax
|
||||
shr eax,16
|
||||
@ -925,7 +925,7 @@ align 4
|
||||
dec ecx
|
||||
jnz .start_new
|
||||
jmp still2
|
||||
;------------------------------------------------------------------------------
|
||||
;------------------------------------------------------------------------------
|
||||
align 4
|
||||
draw_picture:
|
||||
mov eax,[current_X]
|
||||
@ -976,17 +976,17 @@ align 4
|
||||
mov ebx,32
|
||||
cld
|
||||
;--------------------------------------
|
||||
align 4
|
||||
align 4
|
||||
.y:
|
||||
mov ecx,32
|
||||
rep movsd
|
||||
|
||||
|
||||
add edi,(52-32)*4
|
||||
dec ebx
|
||||
jnz .y
|
||||
|
||||
call draw_text
|
||||
|
||||
|
||||
mov edx,[current_X]
|
||||
shl edx,16
|
||||
add edx,[current_Y]
|
||||
@ -1020,18 +1020,18 @@ align 4
|
||||
founde:
|
||||
sub eax,title
|
||||
mov [tl],eax
|
||||
|
||||
|
||||
mov eax,[tl]
|
||||
lea eax,[eax+eax*2] ; eax *= char_width/2
|
||||
shl eax,16
|
||||
|
||||
|
||||
mov ebx,27 shl 16+40
|
||||
sub ebx,eax
|
||||
|
||||
|
||||
xor ecx,ecx ; black shade of text
|
||||
or ecx,0x08000000 ; redirect the output to the user area
|
||||
add ebx,1 shl 16 ;*65536+1
|
||||
|
||||
|
||||
mov edi,[draw_area]
|
||||
mcall 4,,,title,[tl]
|
||||
|
||||
|
||||
@ -83,12 +83,12 @@ align 4
|
||||
align 4
|
||||
START: ; start of execution
|
||||
mcall 68,11
|
||||
|
||||
|
||||
mcall 30, 1, default_dir
|
||||
|
||||
; DEBUGF DBG_INFO, "MENU START! sc.work = %x\n", [sc.work]
|
||||
|
||||
mov esi,bootparam
|
||||
mov esi,bootparam
|
||||
cmp [esi],byte 0
|
||||
je .no_boot_parameters
|
||||
; boot params - hex
|
||||
@ -105,7 +105,7 @@ START: ; start of execution
|
||||
|
||||
call conversion_ASCII_to_HEX
|
||||
mov [menu_button_x.start],ebx
|
||||
|
||||
|
||||
; dps "menu_button_x.start: "
|
||||
; dpd ebx
|
||||
; newline
|
||||
@ -123,34 +123,34 @@ START: ; start of execution
|
||||
; dps "menu_button_y.start: "
|
||||
; dpd ebx
|
||||
; newline
|
||||
|
||||
|
||||
call conversion_ASCII_to_HEX
|
||||
mov [menu_button_y.size],ebx
|
||||
|
||||
|
||||
; dps "menu_button_y.size: "
|
||||
; dpd ebx
|
||||
; newline
|
||||
|
||||
|
||||
call conversion_ASCII_to_HEX
|
||||
mov [panel_height],ebx
|
||||
|
||||
; dps "panel_height: "
|
||||
; dpd ebx
|
||||
; newline
|
||||
|
||||
|
||||
call conversion_ASCII_to_HEX
|
||||
mov [panel_attachment],ebx
|
||||
|
||||
|
||||
; dps "panel_attachment: "
|
||||
; dpd ebx
|
||||
; newline
|
||||
;--------------------------------------
|
||||
align 4
|
||||
align 4
|
||||
.no_boot_parameters:
|
||||
call program_exist
|
||||
mcall 14
|
||||
mov [screen_size],eax
|
||||
|
||||
|
||||
mcall 48,3,sc,sizeof.system_colors ; load system colors
|
||||
|
||||
; DEBUGF DBG_INFO, "sc.work = %x\n", [sc.work]
|
||||
@ -235,7 +235,7 @@ align 4
|
||||
jmp .for1
|
||||
.end_for1:
|
||||
.no_res:
|
||||
|
||||
|
||||
; get size of file MENU.DAT
|
||||
mcall 70,fileinfo
|
||||
test eax,eax
|
||||
@ -324,7 +324,7 @@ search_end1:
|
||||
xor ax,ax
|
||||
jmp .store
|
||||
;--------------------------------------
|
||||
align 4
|
||||
align 4
|
||||
@@:
|
||||
sub ax,[panel_height] ;20
|
||||
.store:
|
||||
@ -354,7 +354,7 @@ align 4
|
||||
mcall 40,100111b ; mouse + button + key + redraw
|
||||
;------------------------------------------------------------------------------
|
||||
align 4
|
||||
red:
|
||||
red:
|
||||
call draw_window ; redraw
|
||||
;------------------------------------------------------------------------------
|
||||
align 4
|
||||
@ -364,7 +364,7 @@ still: ; event loop
|
||||
mcall 23,5 ; wait here for event
|
||||
test [close_now],1 ; is close flag set?
|
||||
jnz close
|
||||
|
||||
|
||||
cmp eax,1 ; redraw request ?
|
||||
je red
|
||||
cmp eax,2 ; key pressed ?
|
||||
@ -375,14 +375,14 @@ still: ; event loop
|
||||
je mouse
|
||||
cmp edi,[menu_data]
|
||||
je still ; if main process-ignored
|
||||
|
||||
|
||||
movzx ebx,[edi + parent] ; parent id
|
||||
shl ebx,4
|
||||
add ebx,[menu_data] ; ebx = base of parent info
|
||||
call backconvert ; get my id in al
|
||||
cmp al,[ebx + child] ; if I'm not child of my parent, I shall die :)
|
||||
jne close
|
||||
|
||||
|
||||
jmp still
|
||||
;------------------------------------------------------------------------------
|
||||
align 4
|
||||
@ -392,7 +392,7 @@ key:
|
||||
mov al,[edi + rows] ; number of buttons
|
||||
cmp ah,178 ; KEY_UP
|
||||
jne .noup
|
||||
|
||||
|
||||
mov ah,[edi+cur_sel]
|
||||
mov [edi+prev_sel],ah
|
||||
dec byte [edi+cur_sel]
|
||||
@ -404,7 +404,7 @@ align 4
|
||||
.noup:
|
||||
cmp ah,177 ; KEY_DOWN
|
||||
jne .nodn
|
||||
|
||||
|
||||
mov ah,[edi + cur_sel]
|
||||
mov [edi + prev_sel],ah
|
||||
inc [edi + cur_sel]
|
||||
@ -456,7 +456,7 @@ button1:
|
||||
mov al,[esi + cur_sel]
|
||||
mov [esi + prev_sel],al
|
||||
mov [esi + cur_sel],ah
|
||||
|
||||
|
||||
pushad
|
||||
mov edi,esi
|
||||
; dph eax
|
||||
@ -472,25 +472,25 @@ align 4
|
||||
dec ah
|
||||
jnz .next_string
|
||||
pop eax
|
||||
|
||||
|
||||
mov ecx,40
|
||||
mov al,'|'
|
||||
cld
|
||||
repne scasb
|
||||
test ecx,ecx ; if '|' not found
|
||||
je searchexit
|
||||
|
||||
|
||||
cmp [edi],byte '@' ; check for submenu
|
||||
je runthread
|
||||
|
||||
|
||||
cmp [last_key],179
|
||||
je searchexit
|
||||
|
||||
|
||||
;dec edi
|
||||
push edi ; pointer to start of filename
|
||||
call searchstartstring ; search for next string
|
||||
sub edi,2 ; to last byte of string
|
||||
|
||||
|
||||
mov ecx,edi
|
||||
pop esi
|
||||
sub ecx,esi
|
||||
@ -507,7 +507,7 @@ align 4
|
||||
jns close
|
||||
mov eax, fileinfo_start.name
|
||||
mov [file_open.params], eax
|
||||
mcall 70,file_open
|
||||
mcall 70,file_open
|
||||
jmp close
|
||||
;--------------------------------------
|
||||
align 4
|
||||
@ -518,23 +518,23 @@ searchexit:
|
||||
align 4
|
||||
runthread:
|
||||
inc edi
|
||||
|
||||
|
||||
push eax
|
||||
call get_number ; get number of this process
|
||||
pop eax
|
||||
|
||||
|
||||
test ebx,ebx ; returned zero - main menu or not number
|
||||
jz searchexit
|
||||
|
||||
|
||||
mov al,bl
|
||||
|
||||
|
||||
mov ebx,[processes]
|
||||
dec bl
|
||||
cmp al,bl
|
||||
ja searchexit ; such process doesnt exist
|
||||
ja searchexit ; such process doesn't exist
|
||||
cmp al,[esi + child]
|
||||
je searchexit ; such process already exists
|
||||
|
||||
|
||||
mov [esi + child],al ; this is my child
|
||||
mov cx,[esi + x_start]
|
||||
add cx,BTN_WIDTH+1 ; new x_start in cx
|
||||
@ -546,7 +546,7 @@ runthread:
|
||||
mov bl,[esi + rows] ; number of buttons in bl
|
||||
sub bl,ah ; number of btn from bottom
|
||||
|
||||
; Leency: store vars for case when attachement=top
|
||||
; Leency: store vars for case when attachement=top
|
||||
pusha
|
||||
mov [prior_thread_selected_y_end], bl
|
||||
mcall 9,procinfo,-1
|
||||
@ -571,7 +571,7 @@ runthread:
|
||||
mov [edx + cur_sel],al ; clear current selected element
|
||||
mov [edx + prev_sel],al ; clear previous selected element
|
||||
mov [edx + child],0
|
||||
|
||||
|
||||
mcall 68,12,0x1000 ; stack of each thread is allocated 4 KB
|
||||
add eax,0x1000 ; set the stack pointer to the desired position
|
||||
mov edx,eax
|
||||
@ -629,9 +629,9 @@ align 4
|
||||
click:
|
||||
cmp [mousemask],0 ; not in a window (i.e. menu)
|
||||
jne still
|
||||
; checking for pressing 'MENU' on the taskbar
|
||||
; checking for pressing 'MENU' on the taskbar
|
||||
mov eax,[screen_mouse_position]
|
||||
|
||||
|
||||
cmp [panel_attachment],byte 1
|
||||
je @f
|
||||
|
||||
@ -652,25 +652,25 @@ align 4
|
||||
add bx,word [menu_button_y.size]
|
||||
cmp bx,ax
|
||||
jb close
|
||||
|
||||
|
||||
shr eax,16
|
||||
|
||||
|
||||
mov ebx,[menu_button_x.start]
|
||||
cmp bx,ax ; MENU_BOTTON_X_SIZE
|
||||
ja close
|
||||
|
||||
|
||||
add bx,[menu_button_x.size]
|
||||
cmp bx,ax ; MENU_BOTTON_X_POS
|
||||
ja still
|
||||
;------------------------------------------------------------------------------
|
||||
align 4
|
||||
close:
|
||||
|
||||
|
||||
movzx ebx,[edi+parent] ; parent id
|
||||
shl ebx,4
|
||||
add ebx,[menu_data] ; ebx = base of parent info
|
||||
call backconvert
|
||||
cmp [ebx + child],al ; if i am the child of my parent...
|
||||
cmp [ebx + child],al ; if I am the child of my parent...
|
||||
jnz @f
|
||||
mov [ebx + child],-1 ; ...my parent now has no children
|
||||
;--------------------------------------
|
||||
@ -678,10 +678,10 @@ align 4
|
||||
@@:
|
||||
or eax,-1 ; close this thread
|
||||
mov [edi + child],al ; my child is not mine
|
||||
|
||||
|
||||
call free_area_if_set_mutex
|
||||
call set_mutex_for_free_area
|
||||
|
||||
|
||||
mcall
|
||||
;--------------------------------------
|
||||
align 4
|
||||
@ -693,7 +693,7 @@ backconvert: ; convert from pointer to process id
|
||||
;------------------------------------------------------------------------------
|
||||
align 4
|
||||
set_mutex_for_free_area:
|
||||
; set mutex for free thread stack area
|
||||
; set mutex for free thread stack area
|
||||
push eax ebx
|
||||
;--------------------------------------
|
||||
align 4
|
||||
@ -732,7 +732,7 @@ align 4
|
||||
pop ecx ebx eax
|
||||
;--------------------------------------
|
||||
align 4
|
||||
.end:
|
||||
.end:
|
||||
ret
|
||||
;------------------------------------------------------------------------------
|
||||
;==================================
|
||||
@ -824,13 +824,13 @@ draw_window:
|
||||
movzx ecx,[edi + y_end]
|
||||
cmp [panel_attachment],byte 1
|
||||
je @f
|
||||
|
||||
|
||||
|
||||
|
||||
;cmp ebp,0x000 ; if this is first started thread
|
||||
;je .1 ; then show it at the very top
|
||||
|
||||
|
||||
push ebx eax
|
||||
; if attachement=top
|
||||
; if attachement=top
|
||||
; then NEW_WIN_Y = PRIOR_WIN_Y + PRIOR_WIN_H - ITEM_H + 1 - SEL_ITEM_Y
|
||||
|
||||
mov ecx, [prior_thread_y]
|
||||
@ -842,17 +842,17 @@ draw_window:
|
||||
mov al, [prior_thread_selected_y_end]
|
||||
mov ebx, BTN_HEIGHT
|
||||
mul ebx
|
||||
|
||||
|
||||
sub ecx, eax
|
||||
|
||||
mov [edi + cur_sel],1 ;if attachement=top then set item=1 selected
|
||||
|
||||
|
||||
pop eax ebx
|
||||
|
||||
jmp .1
|
||||
;--------------------------------------
|
||||
align 4
|
||||
@@:
|
||||
@@:
|
||||
sub ecx,eax ; ecx = Y_START
|
||||
;--------------------------------------
|
||||
align 4
|
||||
@ -866,7 +866,7 @@ align 4
|
||||
mov bx,BTN_WIDTH ; ebx = [ X_START | X_SIZE ]
|
||||
mov edx,0x01000000 ; color of work area RRGGBB,8->color gl
|
||||
mov esi,edx ; unmovable window
|
||||
|
||||
|
||||
mov eax,[y_working_area]
|
||||
shr eax,16
|
||||
ror ecx,16
|
||||
@ -878,14 +878,14 @@ align 4
|
||||
@@:
|
||||
cmp cx,ax
|
||||
ja @f
|
||||
mov cx,ax
|
||||
mov cx,ax
|
||||
;--------------------------------------
|
||||
align 4
|
||||
@@:
|
||||
rol ecx,16
|
||||
xor eax,eax ; function 0 : define and draw window
|
||||
mcall
|
||||
|
||||
|
||||
; dps "[ Y_START | Y_SIZE ] : "
|
||||
; dph ecx
|
||||
; newline
|
||||
@ -951,11 +951,11 @@ align 4
|
||||
; from system close button with 0x000001 id
|
||||
; dunkaist]
|
||||
mcall
|
||||
push edx
|
||||
|
||||
push edx
|
||||
|
||||
mov edx, esi
|
||||
mcall 13 ; draw rect
|
||||
|
||||
|
||||
mcall , BTN_WIDTH,<[draw_y],1>,[sc.work_light]
|
||||
add ecx, BTN_HEIGHT-1
|
||||
mcall , 1
|
||||
@ -963,7 +963,7 @@ align 4
|
||||
mcall , <BTN_WIDTH,1>, , [sc.work_dark]
|
||||
add [draw_y], BTN_HEIGHT-1
|
||||
mcall , BTN_WIDTH,<[draw_y],1>
|
||||
|
||||
|
||||
pop edx
|
||||
movzx edx,dl
|
||||
dec dl
|
||||
@ -987,7 +987,7 @@ align 4
|
||||
jne .findline
|
||||
dec ecx ; TODO what in ecx? button number?
|
||||
jnz .findline
|
||||
|
||||
|
||||
mov ecx, [sc.work_text]
|
||||
add ecx, FONT_TYPE
|
||||
|
||||
@ -1044,13 +1044,13 @@ align 4
|
||||
cmp [is_icon_active], 1
|
||||
jne .not_active_icon
|
||||
mov ecx, [shared_icons_active_ptr]
|
||||
.not_active_icon:
|
||||
.not_active_icon:
|
||||
add ebx, ecx
|
||||
mcall 65, ebx, <18,18>, [tmp], 32, 0, 0
|
||||
|
||||
@@:
|
||||
pop ebp edi esi ecx
|
||||
|
||||
|
||||
pop edx
|
||||
ret
|
||||
;------------------------------------------------------------------------------
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
params dd PARAMS
|
||||
dd 0x0
|
||||
;---------------------------------------------------------------------
|
||||
delay dd 500
|
||||
delay dd 500
|
||||
mount_attempt dd 0
|
||||
;---------------------------------------------------------------------
|
||||
fileinfo:
|
||||
@ -84,13 +84,13 @@ START:
|
||||
mov esi, [params]
|
||||
cmp [esi], byte '/'
|
||||
jne @f
|
||||
mov esi, [params] ;user gave us the path so lets mount it
|
||||
mov esi, [params] ;user gave us the path so let's mount it
|
||||
inc esi
|
||||
mov edi,f30_3_work_area+64
|
||||
call proc_copy_path
|
||||
mcall 30,3,f30_3_work_area
|
||||
mcall -1
|
||||
@@:
|
||||
@@:
|
||||
test [esi], byte 0xFF
|
||||
jz .params_done
|
||||
cmp word[esi], '-d' ; delay
|
||||
@ -262,7 +262,7 @@ load_file:
|
||||
jbe @f
|
||||
mov ecx,eax
|
||||
;-----------------------------------
|
||||
@@:
|
||||
@@:
|
||||
mov [fileinfo.size],ecx
|
||||
;--------------------------------------
|
||||
DEBUGF 1, "Searchap: get file\n"
|
||||
@ -283,7 +283,7 @@ load_file:
|
||||
DEBUGF 1, "Searchap: read file - error!\n"
|
||||
;--------------------------------------
|
||||
ret
|
||||
;-----------------------------------
|
||||
;-----------------------------------
|
||||
@@:
|
||||
;--------------------------------------
|
||||
DEBUGF 1, "Searchap: read file corrected size: %d\n",[fileinfo.size]
|
||||
@ -446,7 +446,7 @@ mount_dir rb 1
|
||||
;-------------------------------------------------------------------------------
|
||||
align 4
|
||||
f30_3_work_area:
|
||||
db 'kolibrios',0
|
||||
db 'kolibrios',0
|
||||
rb 118
|
||||
;-------------------------------------------------------------------------------
|
||||
align 4
|
||||
@ -474,4 +474,4 @@ align 4
|
||||
stacktop:
|
||||
;-------------------------------------------------------------------------------
|
||||
I_END:
|
||||
;-------------------------------------------------------------------------------
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
@ -13,7 +13,7 @@ Shell 0.8.1 // 14.04.2020 - 01.04.2021 // rgimad, turbocat, Kenshin
|
||||
* fixed bug with ctrl+v
|
||||
* added navigation in current string by Home, End
|
||||
* directory highlighting in ls command output
|
||||
* Now for incorrect scripts (which doesnt start with #SHS) shell says
|
||||
* Now for incorrect scripts (which doesn't start with #SHS) shell says
|
||||
that they are incorrect, not "File not found".
|
||||
Also, translated comments from russian to english in two files.
|
||||
* added mv command
|
||||
@ -47,7 +47,7 @@ Shell 0.7.7 // 06.02.2017 // Leency
|
||||
Shell 0.7.6 // 06.02.2017 // Siemargl
|
||||
* Файловые операции используют 64-bit размеры файлов.
|
||||
cp <file> <dest> теперь понимает, если <dest> - каталог
|
||||
cp использует буфер 1Мб, или не более половины свободной памяти
|
||||
cp использует буфер 1Мб, или не более половины свободной памяти
|
||||
|
||||
Shell 0.7.5 // 06.01.2017 // Siemargl
|
||||
* Мелкие багфиксы, изменена логика обработки стрелок вверх/вниз, чтобы как у всех
|
||||
@ -111,18 +111,18 @@ Shell 0.5.4 // 04.06.2012 // Albom
|
||||
=======================================
|
||||
* Исправлен интерфейс исполняемых консольных приложений. Теперь они должны создавать буфер с именем pid-SHELL, где pid - идентификатор процесса без заглавных нулей
|
||||
* Реинкарнированы команды ccpuid, free, killall
|
||||
+ Добавлена команда history
|
||||
+ Добавлена команда history
|
||||
|
||||
|
||||
Shell 0.5.3 // 19.04.2012 // Albom
|
||||
=======================================
|
||||
* Исправление в команде pwd
|
||||
* Исправление в команде pwd
|
||||
|
||||
|
||||
Shell 0.5.2 // 16.04.2012 // Albom
|
||||
=======================================
|
||||
* Исправление в команде ls
|
||||
* Незначительные другие исправления
|
||||
* Исправление в команде ls
|
||||
* Незначительные другие исправления
|
||||
|
||||
|
||||
Shell 0.5.1 // 15.04.2012 // Albom
|
||||
@ -164,10 +164,10 @@ Shell 0.4.4 // 20.08.2010 // Albom
|
||||
1) шелл корректно завершается при закрытии окна
|
||||
2) исправлено ещё 2 ошибки
|
||||
3) добавлены 2 команды:
|
||||
* sleep - ждать. параметр - время в сотых частях секунды. только целое число.
|
||||
* sleep - ждать. параметр - время в сотых частях секунды. только целое число.
|
||||
* ccpuid - вывод в консоль информации (пока скудно) о процессоре. пользы мало, но давно хотел с командой cpuid разобраться (в следующем семестре буду студентам курс читать, включил разбор команды в программу).
|
||||
|
||||
есть много идей. некоторые легко реализуются, некоторые сложнее. если интересно:
|
||||
есть много идей. некоторые легко реализуются, некоторые сложнее. если интересно:
|
||||
1) добавить переменную (одну!), в которую будет результат в текстовой форме (не то что возвращает функция) записываться. с ней можно будет работать из командной строки
|
||||
2) внедрить простую стековую машину для вычислений с вещественными числами
|
||||
|
||||
@ -218,7 +218,7 @@ shell /sys/somescript
|
||||
Shell 0.3 // 07.08.2008 // Albom
|
||||
=======================================
|
||||
1) Возможность запуска скриптов
|
||||
* каждая строка должна представляет собой команду
|
||||
* каждая строка должна представляет собой команду
|
||||
* строкой считается набор символов, который заканчивается CR+LF (Windows) или LF(UNIX) или CR(Mac)
|
||||
* если строка начинается с #, то вся строка (т.е. комментарий) игнорируется
|
||||
* скрипт должен начитаться с #SHS
|
||||
@ -251,7 +251,7 @@ Shell 0.1 // 29.07.2008 // Albom
|
||||
|
||||
Shell 0.02 // 27.07.2008 // Albom
|
||||
=======================================
|
||||
* Реализовал команды:
|
||||
* Реализовал команды:
|
||||
exit - выход
|
||||
ls (с параметром и без) - вывод списка директории
|
||||
pwd - текущий каталог
|
||||
@ -259,9 +259,8 @@ Shell 0.02 // 27.07.2008 // Albom
|
||||
kill - завершить процесс по PID
|
||||
help (с параметром и без) - помощь
|
||||
|
||||
|
||||
|
||||
Shell 0.01 // 27.07.2008 // Albom
|
||||
=======================================
|
||||
* Решил написать функциональный шелл на Си с использованием console.obj
|
||||
* Пока сделал функцию отделения команды и параметров, а также реализовал команды help (пока без параметров), ver и exit
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ int newline_to_file(char *fn, unsigned long long pos)
|
||||
kol_struct70 k70_out;
|
||||
|
||||
k70_out.p00 = 3;
|
||||
k70_out.p04 = pos; // offset
|
||||
k70_out.p04 = pos; // offset
|
||||
//k70_out.p08 = 0;
|
||||
k70_out.p12 = 2;
|
||||
k70_out.p16 = (unsigned)newline;
|
||||
@ -60,7 +60,7 @@ int cmd_echo(char text[])
|
||||
// remove spaces at the end of out_len
|
||||
while (out_len > 0 && text[out_len - 1] == ' ') { out_len--; }
|
||||
|
||||
// delete quotes if has
|
||||
// delete quotes if present
|
||||
if (text[out_len - 1] == '"') { out_len--; }
|
||||
if (text[0] == '"') { text++; out_len--; }
|
||||
|
||||
@ -123,7 +123,7 @@ int cmd_echo(char text[])
|
||||
k70_in.p21 = filename_out;
|
||||
|
||||
result = kol_file_70(&k70_in); // get information about file
|
||||
if ( 0 != result ) // file doesnt exist, then rewrite
|
||||
if ( 0 != result ) // file doesn't exist, then rewrite
|
||||
{
|
||||
k70_out.p00 = 2;
|
||||
k70_out.p04 = 0; // offset
|
||||
@ -148,7 +148,7 @@ int cmd_echo(char text[])
|
||||
unsigned long long filesize = bdvk.p32;
|
||||
|
||||
k70_out.p00 = 3;
|
||||
k70_out.p04 = filesize; // offset
|
||||
k70_out.p04 = filesize; // offset
|
||||
//k70_out.p08 = 0;
|
||||
k70_out.p12 = out_len;
|
||||
k70_out.p16 = (unsigned)text;
|
||||
@ -170,4 +170,3 @@ int cmd_echo(char text[])
|
||||
//free(filename_out);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user