From b1cf9e5dfbc8967bd7cb2a22ec1e5e521f4e0e6e Mon Sep 17 00:00:00 2001 From: Benji Dial Date: Wed, 31 Jul 2024 13:36:53 -0400 Subject: add clock --- applications/clock/makefile | 12 ++++++++ applications/clock/source/main.cpp | 63 ++++++++++++++++++++++++++++++++++++++ applications/init/source/main.cpp | 2 +- 3 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 applications/clock/makefile create mode 100644 applications/clock/source/main.cpp (limited to 'applications') diff --git a/applications/clock/makefile b/applications/clock/makefile new file mode 100644 index 0000000..949e6ce --- /dev/null +++ b/applications/clock/makefile @@ -0,0 +1,12 @@ +SOURCES = \ + main.cpp + +build/%.cpp.o: source/%.cpp + @mkdir -p $(@D) + $(HILBERT_CC) -c $^ -o $@ + +build/clock.elf: $(SOURCES:%=build/%.o) + $(HILBERT_CC) $^ -ldaguerre -lpake -o $@ + +clean: + rm -rf build diff --git a/applications/clock/source/main.cpp b/applications/clock/source/main.cpp new file mode 100644 index 0000000..3a1270d --- /dev/null +++ b/applications/clock/source/main.cpp @@ -0,0 +1,63 @@ +#include +#include +#include +#include + +static daguerre::fixed_font *font; + +std::string the_time() { + + time_t t = time(0); + + //convert to edt - TODO: timezones in euler + t -= 4 * 3600 * 1024; + + tm *gt = gmtime(&t); + + int hour = (gt->tm_hour - 1) % 12 + 1; + int min = gt->tm_min; + int sec = gt->tm_sec; + bool pm = gt->tm_hour >= 12; + + std::string s; + s.resize(8); + + s[0] = hour / 10 + '0'; s[1] = hour % 10 + '0'; + s[3] = min / 10 + '0'; s[4] = min % 10 + '0'; + + s[2] = sec % 2 == 0 ? ':' : ' '; + + s[5] = ' '; + s[6] = pm ? 'p' : 'a'; + s[7] = 'm'; + + if (s[0] == '0') + s.erase(0, 1); + + return s; + +} + +int main(int, char **) { + + font = new daguerre::fixed_font( + daguerre::try_load_psf("/assets/terminus/10x18-bold.psf").value()); + + pake::widgets::fixed_text *text = + new pake::widgets::fixed_text(the_time(), font, + euler::syscall::encode_color(0xaa, 0xaa, 0xaa), + euler::syscall::encode_color(0x00, 0x00, 0x00), + pake::halign::center, pake::valign::center); + + pake::window w(90, 28, "Clock"); + w.set_root(std::unique_ptr(text)); + w.render_and_send_to_compositor(); + w.show(); + + while (1) { + euler::syscall::sleep(512); + text->set_text(the_time()); + w.render_and_send_to_compositor(); + } + +} diff --git a/applications/init/source/main.cpp b/applications/init/source/main.cpp index ca137a4..c281bc0 100644 --- a/applications/init/source/main.cpp +++ b/applications/init/source/main.cpp @@ -6,6 +6,6 @@ int main(int, char **) { euler::syscall::process_handle dummy; euler::syscall::start_process("/bin/compositor", {}, {}, dummy); - euler::syscall::start_process("/bin/hello", {}, {}, dummy); + euler::syscall::start_process("/bin/clock", {}, {}, dummy); return 0; } -- cgit v1.2.3