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 zcmV-h1f=_kP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+QpY^a^orxh5xgPy9BzM=CK^aqiS|A%bx?nvMoE4 zOzhMZ6@l7Kb96o=RZRQ+tDFCDu%&36hUk;`7KckNamFCp{n&f5Zl2eLy$tT+=J)|+ zt)Q3v(zlhL5!dU4;8uLQkDE|dowy3oQFtCQRvzP(7gr(SJx=S|q%|+Qo7-7`Tvpjt z{Cw>K%&3Zb!iJlWSe*S>MW8^EWEtaePDrv6F;?+7i_mlL%rQKfcZ^Qn*}UR%Z-udb zCHRv^D^7Zf%drffsa;mS`=M;d5)a<>USscVzq{-_obqPf)a6#@2#Fi4lsV0#1^g+- zVYY-8af=1SDrjzK#ZV%K+npR$%G9aNzEFWg$BhGe=E5>#Q359}6N(#+ItSpX21Hm2 zs0qS+XrZ}on(GycSh*51nNW-{n!SA%AQ14^w64`io1zkM$G-M2NF;djX5ZKwumXZQZH~CXY`49{rgYs~GC2$K)H-ALM}tCL1z-`@R)`@10qaSWJlVh; zh~Q%cpA6+JjyDh>Rjy<@*ob(*i9FWEoIo>|mG>}SEdVhdkpMJ!fB?%m#r_E{Vh?2% zbw*Xa2926Dd-2Yz_dfXXj>zrQ-3gz6MicO*J=a*hvCP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1b%C+jrn7#Wm)qt1`QCaY zqX_&NR$L7kjjQWX3=o)TlIe24Mi^-mAd7Lh8slH*PMzXY@=oa~cRDS-xu-&Dw+!4< zj+UO}NpH?D{LI>pe0#t}d;NGk-F2CVfm7htO49X7FraC)z4KTZ4RA4v-?m7JwlG2DBq12`=~$LJTQ#G+4qUy69C5F~*b- zG{JSk+X)sa9ekL>9&)(DAK{2c$|#>~vt*Zj4msvjxR`?WFRpl1LWw0+swkyut5jEg z4K>!(P;1RJ+oZYXTWGPRleNX_oi%!5?t9i~vDO*0!_Hrfr9Ex!N^+WQPgsA!BX+WK`c6 zAgykMY|b_;wr}7}6l%jDxAfT$KPi7ULG|K6S*{*}63wZXX!7v|c{x%?1n3l+=w@X) zuvqD*7(@6eEcIo^dga~nM-bJC?KL!C$O>8PjWPt}bDE;@)AAa-v4UiITI)O=1nSE) zGy+s7gX_JbgOORlH-6PCg70Nzik?QX@2fo`)|k+i4=O{0uMw;QL%N`@S?I6@eM}R> zZq7NxF9_9u_=nPaLU`1b`(ooZ!J55-K0`eL+9fz`>Q3`&a%ZP8HbLwnE7LiA)DaiF zJmINM@k&LGZiU>=^@4tK?f6Rfv7y)9B8NEv{vMxN0MpLjS$Xu0?9u1t@G+t#4L$CE_b`qsarY>XX>n#)h^#YePOJD13=F zUMoV>*onq-sX12cV_jA#pe~#yO5m!5aCWd6fz)iqoztDAhn6|<)hFn{;kQ(+`hekA_>PTFT>uv>{DG@? zs!?3>R0U_+%zj+~$8iDtJw7!6#=4illf;Y7m828ah2|>Pn$&#~gs-q4R^U?ss`r&h zt9X7ks`myzfblRY{Re}ejvqV1AEZ`LBI;jIt?gqumuYVR000JJOGiWi{{a60|De66 zlK=n!32;bRa{vG?BLDy{BLR4&KXw2B00(qQO+^Re0tp8=B?1_sUjP6BFG)l}R5;76 zlTAtlF%U-Imjv94IN)6b!IdWwch1T)xYC_?9?v2OqJs|Os8c^K+G$%vThOeEB=z|6 zsK6hW*2UT3ZvM7udU>T!fV0Ehl*IMT-Dva9Wb+fG2ORA0v9&$AfSVEKcsTAsW)N<81euAyLk1oIXzPt| zC)B-367Ei9p=9T)RQ2(P5_^D0fC)8`=Cme+C+|mbwsL9%A*_l9n28bvHAl6M0NgsI2~`CoDvp$Rh{8yM2*<3qhzLLwbpskXl3-;< zOQDuv2^mxpsI-96H12>DP|2E5gjUwgdr8v&=`#&y;9u4oFaw?E?^ziT00000NkvXX Hu0mjf()A62 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 zcmb`F>q-Jq6oq}Co}r$hM+gcuBhgYz(MIh;R*->_MHZTAnU~D2^uwSi5R9bql9iXr z40?yvKBHqIIR-Vb;ml#yx7XTxB$EGmI;HdYZ8djfx-OXw9o?F?CG==yusfqa1N+&h zXbJopqmB^tTrdYqD39?-5mV6@SdYq>Ij&&#q*CWH#!q^k_a27rEV#fU%%NvY?3FON z|BC6uH)6aKWoLG$cHLlv z7}NM94>!d>oYd{;l+?^=qCnx+(aeEW|MF=Brs~9&Em?^oo@@RBH)n zTuEp>RR;6H?c^v+ffz+my?p5sidAAb6Bu?=7V@F@rC{)X&qJ)gbnyZM4q`0FF~oeh zli;&#Wq1Y`$cgsvU5G(uKZo3Lg+a=qBp>RU51ltn|5sL2-!pfLK3fb@V)WOtD4jG@ YVrV^gwA)lmy|6 zaB^>EX>4U6ba`-PAZ2)IW&i+q+P#-)mg^`Ch5u_6y#ypNE(bH5(>v(p_XT5TtW@fy zy3L8f3_{#bauRC){N3pq7L&dxOg+n@JX7o8r=Qx zP~pBN%{toSo-oH~MBAyy9sBQ|f|iiM1E)jR*Vil0>2Q4^zd?Go_>2B4(liA<2K0`Q zKkKLc>@NLujdXIm+S&Va=bQe*=N2b9I`H*gWAAN0UA7)a_Ull`QDzJCwxQNsn1r!PFWO>?`#5gS*Igy>-yV=Vco&^wcQ9|^^5;;9wM{U{;DLiPtRP@Kt7Fe5 zh)`gLkP(0~To<*n0Sh}P6;6s(^?-vcz}{FBcuo~3dpBN$0D;^i4Pb-R1T1SE;wRXM z7|Kqab z`4(DispXDP>)LI1-S^OAPt@~CZDD;VKcL2onoLq-VmPUxH-y6kkJpJC%s@;m19%t& zSV?3sGm)*8L2fWJNstvz;G`RHDi2~HXd8>`e6qWcbA*@XuW%!Pkl!Fj1Kk_s9=ScE zR`dL#(@AKg;Skj*vahG!VwRZ4H|5KkzMJrF{XZD$-sRcG?||D{i_Z^>=vUmi7`kk) zv3%u-@oQPx9;eXLHSgA1(_x&N9`50{!=1ye+-p(zFd^+zYR^>ASm`_GH+f5BrWZP#4sgB<9>==qQS7K`4Ey$W zxO`dDtMItQfP2v7UXtmNyEp%>B9DU5v&cAu;2EALbbcI=uL6|b%Gn*v4VQZ!^ugQg zh7Vox_p|h+&(+z*xjxzlDT_GzC5gT|+7GgI)%52y{D4^000SaNLh0L04^f{04^f|c%?sf00007 zbV*G`2jc<>2RJX{%}7B2000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-} z0002sNklwboj<5Otb3#u#JV1R;bF!k!2f zay>sR(k;Ip?*gV+pqfV5y8T#u$LsT5Anp&N=7Y-=Uz}9iXj7VsuQ2wboi| zxqPAkuGO65Qc5XBDQm5@b_?c+MaMKtnz3`vIrn+iVh5yFbEBq?Zwrusf^gKQP7f=9 rJ5ExozkUnuUa7|)BQD!h#D9YqR}vqk2*hgs00000NkvXXu0mjf9V?H3 literal 0 HcmV?d00001 diff --git a/Base/res/icons/link16.rgb b/Base/res/icons/link16.rgb new file mode 100644 index 0000000000000000000000000000000000000000..11e968d17fdfa2188648da59488aafdb541b6e63 GIT binary patch literal 1024 zcmchTTMED+37>%HH%);gmauSS}D|?pLK5T1kbyoh9xBp|$Mtaj%yPj1JdA|9Id&;cY>EO$bbktYx$&>w^ ZXP)KBFFwlRMFw$M77hM5(i!IKdjW9oupj^c literal 0 HcmV?d00001 diff --git a/FileManager/.gitignore b/FileManager/.gitignore new file mode 100644 index 00000000000..2b598593606 --- /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 00000000000..9b6126ee556 --- /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 00000000000..3b06783f084 --- /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 00000000000..d66690d5b7b --- /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 00000000000..e8bb8469766 --- /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 a92b9a02e53..a43746103bb 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 efdb843520e..bde081dd659 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 2204055064e..0d99d8b1608 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