badpork/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Eolite: fix get volume size (thank dunkaist for a found issue)

Browse Source 
Keyascii: bigger font

git-svn-id: svn://kolibrios.org@9044 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2021-07-09 08:03:31 +00:00
parent 6beb99fc30
commit 34a4c12412
3 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
programs/cmm/eolite/Eolite.c
View File

@ -8,9 +8,9 @@ TODO:
- 70.5 - get volume info and label - 70.5 - get volume info and label
*/ */
#define ABOUT_TITLE "EOLITE 5.02 Gold" #define ABOUT_TITLE "EOLITE 5.03 Gold"
#define TITLE_EOLITE "Eolite File Manager 5.02 Gold" #define TITLE_EOLITE "Eolite File Manager 5.03 Gold"
#define TITLE_KFM "Kolibri File Manager 2.02 Gold"; #define TITLE_KFM "Kolibri File Manager 2.03 Gold";
#define MEMSIZE 1024 * 250 #define MEMSIZE 1024 * 250
#include "../lib/clipboard.h" #include "../lib/clipboard.h"
@ -1233,8 +1233,11 @@ dword GetDeviceSize(dword p)
if (ESBYTE[p+1] == '/') p++; if (ESBYTE[p+1] == '/') p++;
if (ESBYTE[p+1] == 'c') && (ESBYTE[p+2] == 'd') if (ESBYTE[p+1] == 'c') && (ESBYTE[p+2] == 'd')
&& (ESBYTE[p+4] == 0) return 0; && (ESBYTE[p+4] == 0) return 0;
GetFileInfo(p, #bdvk); if (GetFileInfo(p, #bdvk)) {
return ConvertSize64(bdvk.sizelo, bdvk.sizehi); return 0;
} else {
ConvertSize64(bdvk.sizelo, bdvk.sizehi);
}
} }
int GetRealFileCountInFolder(dword folder_path) int GetRealFileCountInFolder(dword folder_path)

2
programs/cmm/eolite/include/left_panel.h
View File

@ -33,7 +33,7 @@ void _SystemDiscs::Get()
{ {
sprintf(#dev_name,"/%s",i1*304+ devbuf+72); sprintf(#dev_name,"/%s",i1*304+ devbuf+72);
GetDir(#diskbuf, #dev_disc_num, #dev_name, DIRS_NOROOT); GetDir(#diskbuf, #dev_disc_num, #dev_name, DIRS_NOROOT);
for (j1=0; j1<dev_disc_num; j1++;) if (!EAX) for (j1=0; j1<dev_disc_num; j1++;)
{ {
sprintf(#sys_discs,"%s/%s",#dev_name,j1*304+ diskbuf+72); sprintf(#sys_discs,"%s/%s",#dev_name,j1*304+ diskbuf+72);
if (sys_discs[1]=='r') { if (sys_discs[1]=='r') {

59
programs/develop/keyascii/trunk/keyascii.asm
View File

@ -18,7 +18,7 @@ include 'lang.inc'
include '..\..\..\macros.inc' include '..\..\..\macros.inc'
START: ; start of execution START: ; start of execution
red: red:
call draw_window call draw_window
still: still:
@ -63,48 +63,47 @@ still:
draw_window: draw_window:
; function 12:tell os about windowdraw ; 1, start of draw ; function 12:tell os about windowdraw ; 1, start of draw
mcall 12,1 mcall 12,1
; DRAW WINDOW ; DRAW WINDOW
mov eax,0 ; function 0 : define and draw window mov eax,0 ; function 0 : define and draw window
mov ebx,100*65536+270 ; [x start] *65536 + [x size] mov ebx,200*65536+250 ; [x start] *65536 + [x size]
mov ecx,100*65536+100 ; [y start] *65536 + [y size] mov ecx,200*65536+106 ; [y start] *65536 + [y size]
mov edx,0x34ffffff ; color of work area RRGGBB,8->color gl mov edx,0x34ffffff ; color of work area RRGGBB,8->color gl
mov edi,title mov edi,title
mcall mcall
; function 4 : write text to window ; function 4 : write text to window
xor ecx,ecx mcall 4,<55,8>,0x10000000,text1,5
mcall 4,<33,8>,,text1,6 mcall ,<130,8>,,text2,9
mcall ,<85,8>,,text2,9 mcall ,<8,30>,,tdec,4
mcall ,<8,28>,,tdec,4 add ebx,23
add ebx,23 mcall ,,,thex
mcall ,,,thex
movzx ecx,byte [keyid] movzx ecx,byte [keyid]
mcall 47,0x30000,,<40,28>,0x224466 mcall 47,0x30000,,<55,30>,0x10224466
add edx,23 add edx,23
mov bh,1 mov bh,1
mcall mcall
mov bh,0 mov bh,0
movzx ecx,byte [scan_keyid] movzx ecx,byte [scan_keyid]
mcall ,,,<100,28> mcall ,,,<130,30>
add edx,23 add edx,23
mov bh,1 mov bh,1
mcall mcall
; function 12:tell os about windowdraw ; 2, end of draw ; function 12:tell os about windowdraw ; 2, end of draw
mcall 12,2 mcall 12,2
ret ret
; DATA AREA ; DATA AREA
text1: db 'ASCII:' text1: db 'ASCII'
text2: db 'SCANCODE:' text2: db 'SCANCODE'
tdec: db 'DEC:' tdec: db 'DEC:'
thex: db 'HEX:' thex: db 'HEX:'
title: db 'KEYBOARD ASCIICODES-PRESS ANY KEY',0 title: db 'Keyboard ASCII codes',0
I_END: I_END:
keyid: rb 1 keyid: rb 1
scan_keyid: rb 1 scan_keyid: rb 1