Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 870 → Rev 869

/programs/system/panel/trunk/@PANEL
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/programs/system/panel/trunk/CHAR.MT
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/programs/system/panel/trunk/readme.txt
File deleted
\ No newline at end of file
/programs/system/panel/trunk/LANG.INI
File deleted
\ No newline at end of file
/programs/system/panel/trunk/CHAR2.MT
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/programs/system/panel/trunk/MOI.INC
File deleted
\ No newline at end of file
/programs/system/panel/trunk/KEYMAP.KEY
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/programs/system/panel/trunk/@PANEL.ASM
15,8 → 15,7
dd 0x0,0x0 ; param, icon
 
include 'lang.inc'
include 'macros.inc'
include 'moi.inc' ;à áª« ¤ª¨ ª« ¢¨ âãàë
include '..\..\..\macros.inc'
 
width dd 305
buttons dd 1 ; 0 no frames ; 1 frames
33,7 → 32,6
 
PANEL_HEIGHT = 18
 
 
handle_key:
 
mcall 18, 7
44,25 → 42,6
jnz begin_1.ret
mov ebx, exec_fileinfo
shr eax, 8
cmp al, 0
je prod
mov [key_r],al
sub [key_r],2
cmp al, 2
jz alter
cmp al, 3
jz alter
cmp al, 4
jz alter
cmp al, 5
jz alter
cmp al, 6
jz alter
cmp al, 7
jz alter
cmp al, 8
jz alter
prod:
cmp al, 15
jz alt_tab_pressed
cmp al, 88
83,9 → 62,7
jz alt_tab_released
@@:
; this is hotkey Ctrl+Shift ;or LShift+RShift
 
jmp karu
; mov ebx, setup_exec
mov ebx, setup_exec
; test ah, 001100b
; jz change_sys_lang
change_key_lang:
334,16 → 311,14
 
 
START:
; mov eax, 51
; mov ebx, 1
; mov ecx, detect_start
; mov edx, detect_stack
; int 0x40
mov eax, 51
mov ebx, 1
mov ecx, detect_start
mov edx, detect_stack
int 0x40
mcall 66,4,0,2 ; LShift+RShift
mcall 66, , ,11h ; Ctrl+Shift
mcall 66,,88,110h ; Alt+Ctrl+F12
mcall 66,,91,0h ; LWin
mcall 66,,92,0h ; RWin
mcall 66,,91,100h ; Alt+LWin
mcall 66,,92 ; Alt+RWin
mcall 66,,62 ; Alt+F4
350,15 → 325,7
mcall 66,,71 ; Alt+Home
mcall 66,,72 ; Alt+Up
mcall 66,,15 ; Alt+Tab
mcall 66,,2 ; Alt+1
mcall 66,,3 ; Alt+2
mcall 66,,4 ; Alt+3
mcall 66,,5 ; Alt+4
mcall 66,,6 ; Alt+5
mcall 66,,7 ; Alt+6
mcall 66,,8 ; Alt+7
mcall 66,,,101h ; Alt+Shift+Tab
 
mcall 18, 8, 1
test eax, eax
jne @f
390,16 → 357,9
mcall 14
mov [screen_size],eax
 
;mcall 48,5 ; barsuk {
mov eax, 14
int 0x40
mcall 48,5
mov ecx,eax
;eax = [xsize]*65536 + [ysize], £¤¥
shr ecx, 16
and eax, 0xFFFF
lea edx,[eax-PANEL_HEIGHT-1]
; barsuk }
 
lea edx,[ebx-PANEL_HEIGHT-1]
mcall 48,6
 
; // Alver 26.08.2007 // {
424,8 → 384,6
mov eax, 23
mov ebx, 30
int 0x40
call load_ini
call fir_lng
 
still:
; mcall 13,<390,70>,<3,11>,0xffffff
435,40 → 393,6
call draw_info
call draw_running_applications
 
mov eax, 18 ; check if active window changed
mov ebx, 7 ; barsuk
int 0x40
cmp eax, [last_active_window]
jz @f
 
; need_window_tab:
; in: ebx->process info
; out: ZF set <=> do not draw
 
mov ebx, [last_active_window]
mov [prev_active_window], ebx
mov [last_active_window], eax
 
mov ecx, eax
mov eax, 9
mov ebx, process_info_buffer
int 0x40
 
call need_window_tab
jnz .need_repaint
 
mov eax, 9
mov ebx, process_info_buffer
mov ecx, [prev_active_window]
int 0x40
call need_window_tab
jz @f
 
.need_repaint:
mov dword [active_window_changed], 1
 
@@:
 
mov eax, 23
mov ebx, 20
int 0x40
478,18 → 402,10
cmp eax,3 ; button ?
jz button
call handle_key
 
cmp dword [active_window_changed], 0
jnz red_active
 
jmp still
 
red_active: ; barsuk
 
red: ; redraw window
 
mov dword [active_window_changed], 0
 
mcall 14
movzx ecx,ax
mov edx,eax
505,7 → 421,6
mcall 67,0,,,PANEL_HEIGHT
 
.lp1:
 
call draw_window
call draw_info
jmp still
514,9 → 429,6
mov eax,17
int 0x40
 
cmp al, 0 ; barsuk
jnz right_mouse
 
cmp ah,50
jb no_activate
cmp ah,70
534,51 → 446,6
; je still
mcall 55,eax, , ,activatemusic
jmp still
 
right_mouse: ; barsuk
 
cmp ah,50
jb still
cmp ah,70
jg still
 
movzx ecx,byte ah
sub ecx,52
 
cmp ecx, [app_tab_count]
jge still
 
shl ecx,2
 
mov eax, 37
mov ebx, 0
int 0x40
mov ebx, eax
shr eax, 16
mov [x_coord], ax
and ebx, 0xFFFF
mov [y_coord], bx
 
mov eax, 9
mov ecx,[app_list+ecx] ; ecx->selected app.slot
mov [n_slot], ecx
mov ebx, procinfo_for_detect
int 0x40
 
; cmp dword [procinfo_for_detect+process_information.slot_state],9
; jz still
 
mov eax, 51
mov ebx, 1
mov ecx, context_menu_start
mov edx, ctx_menu_stack
int 0x40
 
mov [ctx_menu_PID], eax
 
jmp still
 
 
no_activate:
 
 
817,13 → 684,6
redraw_window_tabs:
xor edi, edi
mov [contrast], 0
 
push ebp ; barsuk {
mov eax, 18
mov ebx, 7
int 0x40
mov ebp, eax ; barsuk }
 
.loop:
mov ecx, [app_list+edi*4]
cmp ecx, -1
841,9 → 701,7
add ebx, 12*10*10000h + 7*10000h + 54
; } // Alver //
mov ecx, 3*10000h + 14
 
; xor edx, edx
mov edx, 0x383838 ; barsuk
xor edx, edx
int 0x40
sub ebx, 10000h + 53
mov ecx, 4*10000h + 12
858,12 → 716,20
mov ecx, 5*10000h + 10
int 0x40
 
mov edx, [wcolor] ; barsuk
cmp ebp, [esp] ; [esp]=saved ecx=active slot number
mov edx, 0x88FF
xor [contrast], 1
jz @f
mov dh, 0x55
@@:
pop ecx
mov esi, [current_alt_tab_app]
cmp esi, -1
jz @f
cmp ecx, [alt_tab_list+esi*8]
jnz @f
mov edx, [system_colours.work_button]
; xor edx, 0xFFFFFF
mov edx, 0xFF8000
@@:
pop ecx
sub ebx, 55*10000h - 53
mov ecx, 4*10000h + 12
int 0x40
875,17 → 741,15
 
mov eax, 4
sub ebx, 51*10000h - 6
mov ecx, [system_colours.work_button_text] ;0xffffff
mov ecx, 0xffffff ;[wcolor]
mov edx, 0x8000+10
mov esi, 11
int 0x40
 
.nodraw:
inc edi
cmp edi, [max_applications]
jb .loop
.done:
pop ebp
ret
 
calculate_applications:
928,8 → 792,6
cmp eax,ecx
jge cnewpr
 
mov [app_tab_count], edi ; barsuk
 
ret
 
 
1382,7 → 1244,7
mov ecx,0*65536+0
mov edx,[wcolor]
add edx,0x161616
newline_: ; debug.inc has macros with the same name
newline:
sub edx,0x040404
mov eax,38
cmp [soften_up],1
1407,7 → 1269,7
 
add ecx,1*65536+1
cmp cx,5
jb newline_
jb newline
 
cmp [soften_middle],1
jne no_sm
1573,8 → 1435,7
mov eax,13
mov ebx,12 shl 16+44 ;51
mov ecx,1 shl 16+17
; xor edx,edx
mov edx, 0x383838
xor edx,edx
int 0x40
; mov ebx,63 shl 16+1
mov ebx,56 shl 16+1
2266,7 → 2127,7
popad
ret
 
;;;include 'detect.asm'
include 'detect.asm'
include 'ctx_menu.asm'
 
; DATA
2295,11 → 2156,11
lsz m_text,\
ru, "Œ…ž",\
en, "MENU",\
et, "MEN--"
et, "MENÜÜ"
 
mi_text db 'WAVETETRBGRDGPL '
 
flag_text db 'EnFiGeRuFrEtUa'
flag_text db 'EnFiGeRuFrEt'
 
type_lang db 0
;music_type db 1
2405,7 → 2266,7
 
this_slot dd 0 ; Slot of this process
max_slot dd 255
system_colours system_colors ; rd 10
system_colours rd 10
app_list rd 50
alt_tab_list rd 256*2
alt_tab_list_size dd ?
2421,10 → 2282,4
 
panel_x_pos rd 1
panel_y_pos rd 1
 
last_active_window dd 0
prev_active_window dd 0
active_window_changed dd 0
app_tab_count dd 0
 
image:
image:
/programs/system/panel/trunk/ctx_menu.asm
50,7 → 50,6
ctx_menu_button:
mov eax, 17
int 0x40
 
cmp ah, 1
; // Alver 26.08.2007 // {
; jne ctx_menu_still
105,7 → 104,6
jmp ctx_menu_still
 
ctx_menu_exit:
 
xor eax, eax
dec eax ; mov eax, -1
int 0x40
/programs/system/panel/trunk/detect.asm
0,0 → 1,98
; Detecting mouse right-clicks.
 
detect_start:
 
mov eax, 40
mov ebx, 00100000b
int 0x40
 
detect_still:
;mov eax, 10 ;  ¡®â ¥â ­¥ ᮢᥬ ª®à४⭮, ¯®ç¥¬ã å§.
mov eax, 23
mov ebx, 4
int 0x40
;cmp eax, 6
;jne detect_still
 
mov eax, 37
mov ebx, 2 ; Ž¯à è¨¢ ¥¬ ª­®¯ª¨ ¬ëè¨
int 0x40
 
test eax, ebx ; test eax, 00000010b ˆ­â¥à¥áã¥â ⮫쪮 ¯à ¢ ï ª­®¯ª 
jz detect_still ; ¥â - ? ‚®§¢à é ¥¬áï ¢ £« ¢­ë© 横« ¯®â®ª 
 
mouse_btn_up:
mov eax, 37
mov ebx, 2
int 0x40
 
test eax, ebx
jnz mouse_btn_up
 
mov eax, 37
xor ebx, ebx ; mov ebx, 0
int 0x40
 
mov ecx, [panel_y_pos]
shr ecx, 16
inc ecx
 
cmp ax, cx
jb detect_still
add ecx, 15
cmp ax, cx
ja detect_still
 
shr eax, 16
xor edx, edx ; mov edx, 1
inc edx
 
detect_button:
mov ebx, edx
imul ebx, 6 * 10
; // Alver 26.08.2007 // {
; add ebx, 4
add ebx, 64
; } \\ Alver \\
 
cmp eax, ebx
jb detect_still
 
add ebx, 60 - 1
cmp eax, ebx
ja @f
 
shl edx, 2
mov ecx, [app_list + edx - 4]
cmp ecx, -1
jz detect_still
 
mov [x_coord], ax
 
mov eax, 37
xor ebx, ebx ; mov ebx, 0
int 0x40
 
mov [y_coord], ax
 
mov [n_slot], ecx
 
mov eax, 9
mov ebx, procinfo_for_detect
int 0x40
 
mov eax, 51
mov ebx, 1
mov ecx, context_menu_start
mov edx, ctx_menu_stack
int 0x40
 
mov [ctx_menu_PID], eax
 
jmp detect_still
 
@@:
cmp edx, [max_applications]
jae detect_still
inc edx
jmp detect_button