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

Eolite: fix handling the '\' in the end of the path

Browse Source 
tmpdisk: do not add '\' in the end of the path

git-svn-id: svn://kolibrios.org@9275 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2021-11-16 00:35:51 +00:00
parent 98d39923c6
commit 8f7c883c1a
2 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,11 +6,13 @@ BUGS:
- F1 in KFM (move Properties to an external app) - F1 in KFM (move Properties to an external app)
TODO: TODO:
- 70.5 - get volume info and label - 70.5 - get volume info and label
- add option Preserve all timestamps (Created, Opened, Modified)
http://board.kolibrios.org/viewtopic.php?f=23&t=4521&p=77334#p77334
*/ */
#define ABOUT_TITLE "EOLITE 5.05 Gold" #define ABOUT_TITLE "EOLITE 5.06"
#define TITLE_EOLITE "Eolite File Manager 5.05 Gold" #define TITLE_EOLITE "Eolite File Manager 5.06 Gold"
#define TITLE_KFM "Kolibri File Manager 2.05 Gold"; #define TITLE_KFM "Kolibri File Manager 2.06 Gold";
#define MEMSIZE 1024 * 250 #define MEMSIZE 1024 * 250
#include "../lib/clipboard.h" #include "../lib/clipboard.h"
@ -163,7 +165,7 @@ void handle_param()
ExitProcess(); ExitProcess();
} }
if (param[strlen(#param)-1]=='/') ESBYTE[strlen(#param)-1]=NULL; //no "/" at the end if (param[strlen(#param)-1]=='/') param[strlen(#param)-1]='\0'; //no "/" at the end
if (dir_exists(p)) { if (dir_exists(p)) {
strcpy(path, p); strcpy(path, p);
@ -219,20 +221,21 @@ void main()
//select file //select file
if (mouse.key&MOUSE_LEFT) && (mouse.up) if (mouse.key&MOUSE_LEFT) && (mouse.up)
{ {
GetKeyModifier();
old_cur_y = files.cur_y; old_cur_y = files.cur_y;
if (files.ProcessMouse(mouse.x, mouse.y)) && (!key_modifier) { if (files.ProcessMouse(mouse.x, mouse.y)) {
List_ReDraw(); List_ReDraw();
break;
} }
if (key_modifier&KEY_LSHIFT) || (key_modifier&KEY_RSHIFT) { if (!GetKeyModifier()) {
EventChooseFilesRange(old_cur_y, files.cur_y); if (mouse.y-files.y/files.item_h+files.first==files.cur_y)
&& (old_cur_y==files.cur_y) {
EventOpen(0);
}
} else if (key_modifier&KEY_LSHIFT) || (key_modifier&KEY_RSHIFT) {
EventChooseFilesRange(old_cur_y, files.cur_y);
} else if (key_modifier&KEY_LCTRL) || (key_modifier&KEY_RCTRL) { } else if (key_modifier&KEY_LCTRL) || (key_modifier&KEY_RCTRL) {
EventChooseFile(files.cur_y); EventChooseFile(files.cur_y);
DrawStatusBar(); DrawStatusBar();
List_ReDraw(); List_ReDraw();
} else {
if (mouse.y - files.y / files.item_h + files.first == files.cur_y) EventOpen(0);
} }
} }
//file menu //file menu
@ -786,6 +789,22 @@ void List_ReDraw()
DrawScroll(scroll_used); DrawScroll(scroll_used);
} }
dword GetVolumeLabel(dword _path)
{
BDVK bdvk;
f70.func = 5;
f70.param1 = 0;
f70.param2 = 0;
f70.param3 = 1;
f70.param4 = #bdvk;
f70.rezerv = 0;
f70.name = _path;
$mov eax,70
$mov ebx,#f70.func
$int 0x40
return #bdvk.name;
}
void Line_ReDraw(dword bgcol, filenum){ void Line_ReDraw(dword bgcol, filenum){
dword text_col=col.list_gb_text, dword text_col=col.list_gb_text,
ext1, attr, ext1, attr,
@ -820,10 +839,17 @@ void Line_ReDraw(dword bgcol, filenum){
ESI = items.get(filenum+files.first)*304 + buf+32; ESI = items.get(filenum+files.first)*304 + buf+32;
attr = ESDWORD[ESI]; attr = ESDWORD[ESI];
file.sizelo = ESDWORD[ESI+32]; file.sizelo = ESI.BDVK.sizelo;
file.sizehi = ESDWORD[ESI+36]; file.sizehi = ESI.BDVK.sizehi;
file_name_off = ESI+40; file_name_off = #ESI.BDVK.name;
$push esi
sprintf(#full_path,"%s/%s",path,file_name_off); sprintf(#full_path,"%s/%s",path,file_name_off);
$pop esi
if (ESI.BDVK.volume_label) {
debug("volume: ");
debugln(#full_path);
file_name_off = GetFileInfo(#full_path);
}
if (attr&ATR_FOLDER) if (attr&ATR_FOLDER)
{ {

2
programs/cmm/tmpdisk/t_gui.c
View File

@ -178,7 +178,7 @@ void OpenTmpDisk()
{ {
unsigned char eol_param[10]; unsigned char eol_param[10];
if (!disk_num) return; if (!disk_num) return;
strcpy(#eol_param, "/tmp#/1/"); strcpy(#eol_param, "/tmp#/1");
eol_param[4] = disk_list[selected].Item[3]; eol_param[4] = disk_list[selected].Item[3];
RunProgram("/sys/File managers/Eolite", #eol_param); RunProgram("/sys/File managers/Eolite", #eol_param);
} }