From 4d5fe394941e4edab53b84b89a9647d99a5b4abf Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 9 Feb 2019 09:22:04 +0100 Subject: [PATCH] FileManager: Start building a file manager. --- Base/res/icons/file16.png | Bin 0 -> 1115 bytes Base/res/icons/file16.rgb | Bin 0 -> 1024 bytes Base/res/icons/folder16.png | Bin 0 -> 1661 bytes Base/res/icons/folder16.rgb | Bin 0 -> 1024 bytes Base/res/icons/link16.png | Bin 0 -> 1385 bytes Base/res/icons/link16.rgb | Bin 0 -> 1024 bytes FileManager/.gitignore | 3 + FileManager/DirectoryView.cpp | 126 ++++++++++++++++++++++++++++++++++ FileManager/DirectoryView.h | 50 ++++++++++++++ FileManager/Makefile | 35 ++++++++++ FileManager/main.cpp | 47 +++++++++++++ Kernel/init.cpp | 4 ++ Kernel/makeall.sh | 2 + Kernel/sync.sh | 5 +- 14 files changed, 270 insertions(+), 2 deletions(-) create mode 100644 Base/res/icons/file16.png create mode 100644 Base/res/icons/file16.rgb create mode 100644 Base/res/icons/folder16.png create mode 100644 Base/res/icons/folder16.rgb create mode 100644 Base/res/icons/link16.png create mode 100644 Base/res/icons/link16.rgb create mode 100644 FileManager/.gitignore create mode 100644 FileManager/DirectoryView.cpp create mode 100644 FileManager/DirectoryView.h create mode 100644 FileManager/Makefile create mode 100644 FileManager/main.cpp diff --git a/Base/res/icons/file16.png b/Base/res/icons/file16.png new file mode 100644 index 0000000000000000000000000000000000000000..bb4e84f9e31967e6ec5df012f8ce3cbbf3def933 GIT binary patch literal 1115 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!tov#UZPN`ey06$*;-(=u~X z6-p`#QWa7wGSe6sDsCN}o?Y}Zn zwDFd2afzKusL$`et7rc&*swHXPTPyg-^JR!^$L$E-1>W?dQ;xK>#civ-aUHugE4jO zg6V%RZJ#<{@cQeP2Vph4`)3D)&E3IuF|b0;C`|70RPk`dhqivNZ!Iy^-#z0T@L2P@fJBDhv?9;(S$xHE6oYtgQVokB)419}V|FPxcv@cov>0q>Jv3*D@!V2!o; zW|G2F^teZdVc|ZTt1sW@JWIQOLwW;KlT~itj)OVd_a0eRayQz@lKayYtK{$Q%}%kb z34+(cIuschUwclmxp_dQ<3TdZe4eK|edYoRq3cqtZgf-}=(M?ZY>tER^r_zs;&d4d zRkYMCbT3=)ER*Vw=T?8W`|+{wlw%XOR1Jq>n@G`=7mM8F zoqG(A&avQ(OPp21rFL{m(76bc#U;ny^z_Uzzn4-xJFkvA`p%_k+}r#MUAy%c9+~8| zE@tVYkL&lb1ti;Q3W>y)l{Imc7-ULl=rm+QNUw}rDz&+B*jI6T&rnHTl4Vx!{1qh}2J z^Dk|${+!kLymeQ0W#7k*Kce)P{;<5c$Msy?3oYkcZu2!W_!pH2zW>M(b!M?dj!3=V zm$!ivue_afz4PqNE&mTLmUd;Y^QaEJ>E5+3>&n6#HQO%Mom$La{rSj|`t2`I|9)}V zY2V)^O260M+v9j<>xJ%bf0iiyJ}Vb>M*4`4?lazRe3yx8R;VzmR?w$v`p-C z(~RAR^fh;FJ@Ul7_Rsy073IMn?{ECcy!+7El8D{XstgPaY)RhkE)4%caKYZ?lNlHo zI14-?iy0X7ltGxWVyS%@0|NtliKnkC`(q|fb_@9?~@4EqKbnI1rf_u zIfbr|c8S@QGjr>;v%-Q564`U#2%d3VyEWRkTsWIKd$NJ!lBf!1fBVMI!t*nfHI_aI ao@@3t!SBghp>hTW1_n=8KbLh*2~7aDP!M1M literal 0 HcmV?d00001 diff --git a/Base/res/icons/file16.rgb b/Base/res/icons/file16.rgb new file mode 100644 index 0000000000000000000000000000000000000000..ca21f9272a0d43af556160142d338c57851c29e8 GIT binary patch literal 1024 zcmZReBJlI``;QG1YXwN}e>4CR17Tv!0I36MpEz;ie-H+-L1Mdi?*_YzkQpGgAU((! zBnHwC!XP$2GeGhny&$_m7{msNp<`TTfYgEX;KLv_g!F^##)d)W5~Cla4i_dyKQ_BT nVjwe#(GOCG3lpOsWEVCJGLsnnAa%Gft@VSoRAiK{zQ%A%R%Qn}|nST4}pP%=t zR2FmmkqnFBmF!*pI*>oNMI;g@ADq=V%U{Rj(J?{&V23A88(fT2jyzqzylUy6vz1m^Yp3f?U{SFdlIk2l!?z8IMr%>#M>`~MyGwqNl?F~WgFdG6UjG0 z>4;c^A~V|-W#uOx)oK1MHf$dzH_YjM%FHu?Lp+H0j>KaJzXx*C?<=IX>DXM2h;ner z7v#^n;Gl3i%JFZ7bbzyGPlT$H-yW9ENplLXbrzr7z0XZGf6v!PbHCgDcoA%Hkd0IC zhkz50W|2w6A(dS(LU|02O%X6TSbFF-reQ(kx=Led*6NV(T3*v@R|2xnn%rKp^I3Gp#-)?D9(^^}v?}Rc^|g$R z*CaO|J{P~n@$KI-$6CvY=OiVPy%X+~vjtqZV|lr8&C_!+&wbq8f;pN^C;9m;JSQQs zWom@f+&i&nYERD=`Yo9Mr_b{0%HQ@gg6Hl!dMEr|+=j4AHv-QntSC=BztW7CTbd`! zLni3{FS||Iyd$AIl)F^QUoj z`KrK}Pa&-7x6ahXG9E8v{9|ip%5ZGg^aGQRbf2BNMEF|kGp*~huG9*(tluCX_8^#X z)%U3$t1IfvR()r)Z}@1S^_RVQexJPcA^9a?0ZOmp1J=Gxww#`s&%nUImgMd3!tfsi z7wla=nSp_Uv%n*=n1Ml08H5=tmfDvwFfg!}c>21sKW5@&w@_u0SQyX1z^L!(;uvCa zdhKLiFBU@qxBJss?sQu`h-EoARb8pM{sO%e;BNajWgmjX%Hq zN#eNpN-&>=? zQLpc!Y`A*MvmH#ECcggso?%;27PI1-F18t+Lae6lTl*O9SS{rYWmVDYn^Mtn$fJql z_?qn<91bF-%u<$<5>nl~7fwsylnfDCv8CaX$-4%TfRnQVTEecKt@gb1|D`c+`h)mu Y(gw_PpTCck1XV5!p00i_>zopr0MhjhfdBvi literal 0 HcmV?d00001 diff --git a/Base/res/icons/folder16.rgb b/Base/res/icons/folder16.rgb new file mode 100644 index 0000000000000000000000000000000000000000..a155b843045bb80ea1665ec0e4ded114102c89e5 GIT binary patch literal 1024 zcmZRe60lA0|4%GNw-Th!E@Q%f?SN8(7^D`2k<9?{YggU)Kjpw1yclLaNWE=(Kimiq zAEdv2?d|_f>+b(=-uUo;+vdmrJGVdk-?ih#|L&bH;O2tN0I5gUU%Bk+|C*II|JSd% z^S^Q3z5gwn9{q3K^5lQVwx|EQc0B*zz4Im5448hn-W5mf!eayYlA$y0v%zH?6<- zzh&d2|E-&!{O{QM3~WD0El3YC28k8UKldMGM#WN?J8u53Uwij|!-o41zifVtSAX8D zQ~wL+o&8_B@Z$fnB@i<}?x$vFPwY!fAOLV|I3$x z{BrGo%_>BAfZ`YAR%Ew>*dVd=sYm{2&p7r!Z|150MId)9y7(XLmlZd_X4J2_jo1F< ziTnR&Oga2NYsT^axwB6FFPMAwe+kqbmCLUGuU&N$ul|Id-TzZ2?EjxWWBFONB{r; literal 0 HcmV?d00001 diff --git a/Base/res/icons/link16.png b/Base/res/icons/link16.png new file mode 100644 index 0000000000000000000000000000000000000000..83044421161d1c9e6b7674b9d1a83b8814e6ae39 GIT binary patch literal 1385 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd0X7B(2LEJbB?boOr&S>lB|(Yh3I#>^X_+~x z3MG{VsS2qTnQ06R6}R?I&z$yJgQxX>w&-3K6+=CC<2jeDUp)QJnw-8Shb8-gByjpOZMa^OiMgcbb~RC-JEqTAlhdpSevgXgSG zQg{A-2zaR zk_oFV+n2rx_OF-!eWUlcq_?DK_pO`1i=WT_cj&p8x~0{JuW`xmbM0fd$+>@f9dJA_ zjr;Sqh1X)91~S>5JEHhagHu&WmFv+8r4wdT4t26hSVym$v$J@1=|d**wI-Y^T)Q;H zozhu)R8k*pTU;=m;e+T3SMEcO7qyq`+idqO-hD_=I=rvtMWRHq&d(JWtS48=a~{ok zv{LlXq=}gyk|rdp9iG9abZ7dCJg%B4zq1QM1xkXSbug!G=H))H-*O+zbiWH-oqS*C z9gult#L)SmvDtWyLW0feiW8r8Q%}~n`iM!?;dVHJooV0JK2Fh3>4o6XPpnZ5b@Ibxp}4cBF%5}J&Klk%&j$2i%ZTzvHzHk1r z^!(MEM|axYV%O}p_@&yp&*~QcrqZilo;#Mz=KtcEG~<5PoB!t~l>OOq@PE`V@x9Mq ztjyRjF_nRVfi20~-G$*l2rk&Wd@=(A180FpWHAGSo-znCRxGtIV_;xlFY)wsWq-`X z$!?+l=&Xk$0|SF(iEBiObAE1aYF-J0b5UwyNotBhd1gt5g1e`0KzJjcI0FO215X#n z5Rc<$LpSm=D+*ZGNo2V#bVw3sOAr@eUF_g|&}fO3VrBqRjvXOR2x*$uK2gwgea^noxTy&yFpjBYPT9|(iY#fCw4g7ksp(Dj1E@L^=V zAax*fK>h{M`0NC!1z~jkATbaoRX<2QNFNA;*u>ZkQVYT`H-PkkFe!RL`au|^2Zlj> GdSC!>@30^M literal 0 HcmV?d00001 diff --git a/FileManager/.gitignore b/FileManager/.gitignore new file mode 100644 index 0000000000..2b59859360 --- /dev/null +++ b/FileManager/.gitignore @@ -0,0 +1,3 @@ +*.o +*.d +FileManager diff --git a/FileManager/DirectoryView.cpp b/FileManager/DirectoryView.cpp new file mode 100644 index 0000000000..9b6126ee55 --- /dev/null +++ b/FileManager/DirectoryView.cpp @@ -0,0 +1,126 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include "DirectoryView.h" + +DirectoryView::DirectoryView(GWidget* parent) + : GWidget(parent) +{ + m_directory_icon = GraphicsBitmap::load_from_file("/res/icons/folder16.rgb", { 16, 16 }); + m_file_icon = GraphicsBitmap::load_from_file("/res/icons/file16.rgb", { 16, 16 }); + m_symlink_icon = GraphicsBitmap::load_from_file("/res/icons/link16.rgb", { 16, 16 }); +} + +DirectoryView::~DirectoryView() +{ +} + +void DirectoryView::open(const String& path) +{ + if (m_path == path) + return; + m_path = path; + reload(); + if (on_path_change) + on_path_change(m_path); + update(); +} + +void DirectoryView::reload() +{ + DIR* dirp = opendir(m_path.characters()); + if (!dirp) { + perror("opendir"); + exit(1); + } + m_directories.clear(); + m_files.clear(); + while (auto* de = readdir(dirp)) { + Entry entry; + entry.name = de->d_name; + struct stat st; + int rc = lstat(String::format("%s/%s", m_path.characters(), de->d_name).characters(), &st); + if (rc < 0) { + perror("lstat"); + continue; + } + entry.size = st.st_size; + entry.mode = st.st_mode; + auto& entries = S_ISDIR(st.st_mode) ? m_directories : m_files; + entries.append(move(entry)); + } + closedir(dirp); +} + +const GraphicsBitmap& DirectoryView::icon_for(const Entry& entry) const +{ + if (S_ISDIR(entry.mode)) + return *m_directory_icon; + if (S_ISLNK(entry.mode)) + return *m_symlink_icon; + return *m_file_icon; +} + +static String pretty_byte_size(size_t size) +{ + return String::format("%u", size); +} + +bool DirectoryView::should_show_size_for(const Entry& entry) const +{ + return S_ISREG(entry.mode); +} + +Rect DirectoryView::row_rect(int item_index) const +{ + return { 0, item_index * item_height(), width(), item_height() }; +} + +void DirectoryView::mousedown_event(GMouseEvent& event) +{ + for (int i = 0; i < item_count(); ++i) { + if (row_rect(i).contains(event.position())) { + auto& entry = this->entry(i); + if (entry.is_directory()) { + FileSystemPath new_path(String::format("%s/%s", m_path.characters(), entry.name.characters())); + open(new_path.string()); + } + } + } +} + +void DirectoryView::paint_event(GPaintEvent&) +{ + Painter painter(*this); + + int horizontal_padding = 5; + int icon_size = 16; + int painted_item_index = 0; + + auto process_entries = [&] (const Vector& entries) { + for (size_t i = 0; i < entries.size(); ++i, ++painted_item_index) { + auto& entry = entries[i]; + int y = painted_item_index * item_height(); + Rect icon_rect(horizontal_padding, y, icon_size, item_height()); + Rect name_rect(icon_rect.right() + horizontal_padding, y, 100, item_height()); + Rect size_rect(name_rect.right() + horizontal_padding, y, 64, item_height()); + painter.fill_rect(row_rect(painted_item_index), i % 2 ? Color::LightGray : Color::White); + painter.blit_with_alpha(icon_rect.location(), icon_for(entry), { 0, 0, icon_size, icon_size }); + painter.draw_text(name_rect, entry.name, Painter::TextAlignment::CenterLeft, Color::Black); + if (should_show_size_for(entry)) + painter.draw_text(size_rect, pretty_byte_size(entry.size), Painter::TextAlignment::CenterRight, Color::Black); + } + }; + + process_entries(m_directories); + process_entries(m_files); + + Rect unpainted_rect(0, painted_item_index * item_height(), width(), height()); + unpainted_rect.intersect(rect()); + painter.fill_rect(unpainted_rect, Color::White); +} diff --git a/FileManager/DirectoryView.h b/FileManager/DirectoryView.h new file mode 100644 index 0000000000..3b06783f08 --- /dev/null +++ b/FileManager/DirectoryView.h @@ -0,0 +1,50 @@ +#pragma once + +#include +#include +#include + +class DirectoryView final : public GWidget { +public: + DirectoryView(GWidget* parent); + virtual ~DirectoryView() override; + + void open(const String& path); + void reload(); + + Function on_path_change; + + int item_height() const { return 16; } + int item_count() const { return m_directories.size() + m_files.size(); } + +private: + virtual void paint_event(GPaintEvent&) override; + virtual void mousedown_event(GMouseEvent&) override; + + Rect row_rect(int item_index) const; + + struct Entry { + String name; + size_t size { 0 }; + mode_t mode { 0 }; + + bool is_directory() const { return S_ISDIR(mode); } + }; + + const Entry& entry(size_t index) const + { + if (index < m_directories.size()) + return m_directories[index]; + return m_files[index - m_directories.size()]; + } + const GraphicsBitmap& icon_for(const Entry&) const; + bool should_show_size_for(const Entry&) const; + + Vector m_files; + Vector m_directories; + + String m_path; + RetainPtr m_directory_icon; + RetainPtr m_file_icon; + RetainPtr m_symlink_icon; +}; diff --git a/FileManager/Makefile b/FileManager/Makefile new file mode 100644 index 0000000000..d66690d5b7 --- /dev/null +++ b/FileManager/Makefile @@ -0,0 +1,35 @@ +OBJS = \ + DirectoryView.o \ + main.o + +APP = FileManager + +ARCH_FLAGS = +STANDARD_FLAGS = -std=c++17 -nostdinc++ -nostdlib -nostdinc +USERLAND_FLAGS = -ffreestanding -fno-stack-protector -fno-ident +WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings +FLAVOR_FLAGS = -march=i386 -m32 -fno-exceptions -fno-rtti -fmerge-all-constants -fno-unroll-loops -fno-pie -fno-pic +OPTIMIZATION_FLAGS = -Oz -fno-asynchronous-unwind-tables +INCLUDE_FLAGS = -I.. -I. -I../LibC + +DEFINES = -DSERENITY -DSANITIZE_PTRS -DUSERLAND + +CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(USERLAND_FLAGS) $(FLAVOR_FLAGS) $(ARCH_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) +CXX = clang +LD = ld +AR = ar +LDFLAGS = -static --strip-debug -melf_i386 -e _start --gc-sections + +all: $(APP) + +$(APP): $(OBJS) + $(LD) -o $(APP) $(LDFLAGS) $(OBJS) ../LibGUI/LibGUI.a ../LibC/LibC.a + +.cpp.o: + @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< + +-include $(OBJS:%.o=%.d) + +clean: + @echo "CLEAN"; rm -f $(APPS) $(OBJS) *.d + diff --git a/FileManager/main.cpp b/FileManager/main.cpp new file mode 100644 index 0000000000..e8bb846976 --- /dev/null +++ b/FileManager/main.cpp @@ -0,0 +1,47 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "DirectoryView.h" + +static GWindow* make_window(); + +int main(int, char**) +{ + GEventLoop loop; + + auto* window = make_window(); + window->set_should_exit_app_on_close(true); + window->show(); + + return loop.exec(); +} + +GWindow* make_window() +{ + auto* window = new GWindow; + window->set_title("FileManager"); + window->set_rect(20, 200, 240, 300); + + auto* widget = new GWidget; + window->set_main_widget(widget); + + auto* directory_view = new DirectoryView(widget); + directory_view->set_relative_rect({ 0, 0, 240, 300 }); + + directory_view->on_path_change = [window] (const String& new_path) { + window->set_title(String::format("FileManager: %s", new_path.characters())); + }; + + directory_view->open("/"); + + return window; +} + diff --git a/Kernel/init.cpp b/Kernel/init.cpp index a92b9a02e5..a43746103b 100644 --- a/Kernel/init.cpp +++ b/Kernel/init.cpp @@ -29,6 +29,7 @@ #define SPAWN_LAUNCHER //#define SPAWN_GUITEST2 #define SPAWN_CLOCK +#define SPAWN_FILE_MANAGER //#define SPAWN_FONTEDITOR //#define SPAWN_MULTIPLE_SHELLS //#define STRESS_TEST_SPAWNING @@ -120,6 +121,9 @@ static void init_stage2() #ifdef SPAWN_CLOCK Process::create_user_process("/bin/Clock", (uid_t)100, (gid_t)100, (pid_t)0, error, { }, move(environment), tty0); #endif +#ifdef SPAWN_FILE_MANAGER + Process::create_user_process("/bin/FileManager", (uid_t)100, (gid_t)100, (pid_t)0, error, { }, move(environment), tty0); +#endif #ifdef SPAWN_FONTEDITOR Process::create_user_process("/bin/FontEditor", (uid_t)100, (gid_t)100, (pid_t)0, error, { }, move(environment), tty0); #endif diff --git a/Kernel/makeall.sh b/Kernel/makeall.sh index efdb843520..bde081dd65 100755 --- a/Kernel/makeall.sh +++ b/Kernel/makeall.sh @@ -16,6 +16,8 @@ make -C ../Clock clean && \ make -C ../Clock && \ make -C ../Launcher clean && \ make -C ../Launcher && \ +make -C ../FileManager clean && \ +make -C ../FileManager && \ make clean &&\ make && \ sudo ./sync.sh diff --git a/Kernel/sync.sh b/Kernel/sync.sh index 2204055064..0d99d8b160 100755 --- a/Kernel/sync.sh +++ b/Kernel/sync.sh @@ -8,6 +8,8 @@ mount -o loop _fs_contents mnt/ mkdir -vp mnt/bin mkdir -vp mnt/etc mkdir -vp mnt/proc +mkdir -vp mnt/tmp +chmod 1777 mnt/tmp mkdir -vp mnt/dev mkdir -vp mnt/dev/pts mknod mnt/dev/tty0 c 4 0 @@ -54,13 +56,12 @@ cp -v ../Terminal/Terminal mnt/bin/Terminal cp -v ../FontEditor/FontEditor mnt/bin/FontEditor cp -v ../Launcher/Launcher mnt/bin/Launcher cp -v ../Clock/Clock mnt/bin/Clock +cp -v ../FileManager/FileManager mnt/bin/FileManager cp -v ../Userland/pape mnt/bin/pape cp -v ../Userland/dmesg mnt/bin/dmesg cp -v ../Userland/chmod mnt/bin/chmod cp -v ../Userland/top mnt/bin/top cp -v kernel.map mnt/ -ln -s dir_a mnt/dir_cur -ln -s nowhere mnt/bad_link sh sync-local.sh umount mnt sync