Compare commits

..

70 Commits

Author SHA1 Message Date
462c48001f
libui: Add Buttons
Some checks failed
continuous-integration/drone/pr Build is failing
2023-08-16 09:23:41 +02:00
fda3954964
libui: Handle other mouse events 2023-08-16 09:23:40 +02:00
7482ec1d89
libui: Add aligned items using Containers, ImageWidget 2023-08-16 09:23:40 +02:00
d39c5a2dbe
libui: Add VerticalLayout 2023-08-16 09:23:40 +02:00
0ad2b33f5d
wind+libui+taskbar: Add GetScreenRect IPC, non-decorated windows, taskbar 2023-08-16 09:23:39 +02:00
3a1b9e1e73
libui: Actually fill window backgrounds with the correct color 2023-08-16 09:23:39 +02:00
7df2d44472
libui: Add basic widget and layout system =D 2023-08-16 09:23:39 +02:00
500a80a7f7
ui+wind: Send mouse move events through IPC 2023-08-16 09:23:38 +02:00
d1046e35a1
wind+libui: Add protocol for window close requests 2023-08-16 09:23:38 +02:00
c7abee3fb6
libos+libui+wind: Use uppercase for static struct IDs to avoid confusion with fields 2023-08-16 09:23:37 +02:00
a1a221ecb9
libui+gclient: Add basic OOP wrappers around the IPC protocol 2023-08-16 09:23:37 +02:00
6855067b21
wind+gclient: Add SetWindowTitle and support shm buffers 2023-08-16 09:23:37 +02:00
55ecc904c6
gclient: Create two example windows 2023-08-16 09:23:36 +02:00
ed57e4eeaf
wind: Handle CreateWindow IPC messages 2023-08-16 09:23:36 +02:00
b2015ed2a3
libui: Add CreateWindow IPC message definitions 2023-08-16 09:23:35 +02:00
a4637a3b47
libos: Add basic IPC message framework 2023-08-16 09:23:35 +02:00
b5a166ec91
kernel: Fix poll syscall 2023-08-16 09:23:35 +02:00
2ae5fcd318
wind: Monitor data on client connections 2023-08-16 09:23:34 +02:00
72f632a5d8
kernel: Add POLLHUP and store it when a polled socket's peer disconnects 2023-08-16 09:23:34 +02:00
573e42530f
libui: Add copyright/author text 2023-08-16 09:23:33 +02:00
e096f4a5df
libos: Add copyright/author comments to LocalServer and LocalClient 2023-08-16 09:23:33 +02:00
25e03e4816
wind: Use init --user and pledge() 2023-08-16 09:23:33 +02:00
ac47da3586
Update .gitignore 2023-08-16 09:23:32 +02:00
ef0ae8eef1
libos: Remove some shared pointers and change them to owned/live on the stack 2023-08-16 09:23:32 +02:00
e6c3ffcdf7
wind: Spawn a new client process after startup
Also, create the socket after dropping privileges.
2023-08-16 09:23:32 +02:00
4306039310
apps: Add gclient 2023-08-16 09:23:31 +02:00
f3f6284698
libos: Add os::LocalClient 2023-08-16 09:23:31 +02:00
a4c0b38fda
libui: Change 'into' to 'onto' 2023-08-16 09:23:30 +02:00
7b511bff4c
libui: Document ui::Font 2023-08-16 09:23:30 +02:00
8bf519b6ac
libui+wind: Move some static variables inside functions 2023-08-16 09:23:30 +02:00
5668fd068e
wind: Generate random windows on keypresses 2023-08-16 09:23:29 +02:00
877b201496
wind: Make sure windows have a minimum size to fit the titlebar 2023-08-16 09:23:29 +02:00
17f8ac4f70
libui: Properly cut off the last drawn character if necessary 2023-08-16 09:23:29 +02:00
8f00fc2643
libui: Add Rect::contains(Rect) 2023-08-16 09:23:28 +02:00
951f8365df
libui: Render font characters properly with no spacing, matching the width calculations 2023-08-16 09:23:28 +02:00
eb94a3d6b6
wind: Render an actual TGA mouse cursor 2023-08-16 09:23:28 +02:00
31caf10c98
wind: Add a close button to windows using a TGA icon 2023-08-16 09:23:27 +02:00
87c89ea568
libui: Add support for TGA image loading 2023-08-16 09:23:27 +02:00
99f954a583
libui: Add an interface to fill a Canvas with an array of pixels 2023-08-16 09:23:26 +02:00
a5a296e2b6
wind: Add window titlebars using ui::Font 2023-08-16 09:23:26 +02:00
8e086317fa
libui: Add PSF font loading and rendering 2023-08-16 09:23:26 +02:00
18024b6648
libui: Add Color::GRAY 2023-08-16 09:23:26 +02:00
890482a931
libui: Rename Rect::absolute to normalized and add a new absolute function 2023-08-16 09:23:25 +02:00
475d6aa39f
libluna: Add assignment operators to Buffer 2023-08-16 09:23:25 +02:00
9e0704d920
wind: Reorder drag sequence 2023-08-16 09:23:24 +02:00
3e72393d8f
libui: Add Rect::relative 2023-08-16 09:23:24 +02:00
40516ab469
libui: Remove redundant statement 2023-08-16 09:23:24 +02:00
3599d345ac
libui: Add getters for separate color values 2023-08-16 09:23:23 +02:00
8a47ac5e10
libui: Remove unnecessary stuff 2023-08-16 09:23:23 +02:00
ec02f09240
base: Remove startup items not necessary for GUI startup 2023-08-16 09:23:22 +02:00
7683040fe8
libui+wind: (Draggable) windows 2023-08-16 09:23:22 +02:00
845912dd49
wind: Create a local server object 2023-08-16 09:23:21 +02:00
04619a2063
libos: Add a new LocalServer class for local domain sockets 2023-08-16 09:23:21 +02:00
af61f7a952
kernel: Support listening sockets in poll() 2023-08-16 09:23:21 +02:00
c9162bf4ff
base: Start wind on startup instead of the shell 2023-08-16 09:23:20 +02:00
2a331564af
wind: Add a simple display server skeleton using libui
No client functionality yet, but it's a start.
2023-08-16 09:23:20 +02:00
0247b915b4
libui: Add a GUI and graphics library 2023-08-16 09:23:19 +02:00
dd197fed1a
kernel: Fix negative movement in the PS/2 mouse driver 2023-08-16 09:23:19 +02:00
7b88b9cea3
kernel/ext2: Replace a manually allocated buffer with Buffer
Some checks failed
continuous-integration/drone/push Build is failing
2023-08-16 09:15:29 +02:00
54cc80f649
kernel/ATA: Replace a manually allocated buffer with Buffer
This also lets us keep it empty unless it is used, in which case we resize it (if it wasn't already resized).
2023-08-16 09:15:00 +02:00
b8f81502b8
kernel: Fix some debug messages that are not shown by default 2023-08-16 09:03:25 +02:00
e8e05159c1
libluna+kernel: Make CRC32 a class 2023-08-15 19:27:09 +02:00
49a6c39c38
libc: Implement popen() and pclose() 2023-08-15 19:21:25 +02:00
706752d6b9
kernel: Return SIGPIPE/EPIPE when writing to a pipe with no more readers 2023-08-15 19:08:37 +02:00
1e68ac7312
Finally a working toolchain?
Some checks failed
continuous-integration/drone/push Build is failing
2023-08-15 15:40:44 +02:00
6761b3fcaf
tools: Finally a proper autoconf build?
Some checks failed
continuous-integration/drone/push Build is failing
2023-08-14 11:54:11 +02:00
71d1084be2 tools: Place autoconf in the correct path
Some checks failed
continuous-integration/drone/push Build is failing
2023-08-14 09:34:36 +00:00
f65deb727a
tools: Fix filename in setup-autoconf.sh
Some checks failed
continuous-integration/drone/push Build is failing
2023-08-14 11:27:47 +02:00
d07f592306
tools: Fix message printing in setup-autoconf.sh
Some checks failed
continuous-integration/drone/push Build is failing
2023-08-14 11:26:18 +02:00
cad0bd8c48
tools: Build autoconf if needed and use it to patch libstdc++
Some checks failed
continuous-integration/drone/push Build is failing
2023-08-14 11:18:53 +02:00
16 changed files with 199 additions and 32 deletions

View File

@ -6,6 +6,7 @@
#include "fs/MBR.h"
#include "memory/MemoryManager.h"
#include <luna/Alignment.h>
#include <luna/Buffer.h>
#include <luna/CType.h>
#include <luna/SafeArithmetic.h>
#include <luna/Vector.h>
@ -758,9 +759,7 @@ Result<u64> ATADevice::read(u8* buf, usize offset, usize size) const
ScopedKMutexLock<100> lock(m_drive->channel()->lock());
// FIXME: Don't always allocate this if we don't need it.
auto* temp = (u8*)TRY(malloc_impl(block_size));
auto guard = make_scope_guard([temp] { free_impl(temp); });
Buffer temp;
if (offset % block_size)
{
@ -769,8 +768,10 @@ Result<u64> ATADevice::read(u8* buf, usize offset, usize size) const
// Maybe we don't even want enough to get to the next block?
if (extra_size > size) extra_size = size;
TRY(m_drive->read_lba(offset / block_size, temp, 1));
memcpy(buf, temp + (offset % block_size), extra_size);
TRY(temp.try_resize(block_size));
TRY(m_drive->read_lba(offset / block_size, temp.data(), 1));
memcpy(buf, temp.data() + (offset % block_size), extra_size);
offset += extra_size;
size -= extra_size;
buf += extra_size;
@ -794,8 +795,9 @@ Result<u64> ATADevice::read(u8* buf, usize offset, usize size) const
if (size)
{
TRY(m_drive->read_lba(offset / block_size, temp, 1));
memcpy(buf, temp, size);
TRY(temp.try_resize(block_size));
TRY(m_drive->read_lba(offset / block_size, temp.data(), 1));
memcpy(buf, temp.data(), size);
}
return length;

View File

@ -66,6 +66,9 @@ namespace GPT
{
header.checksum = 0;
return CRC32::checksum((u8*)&header, 0x5c);
CRC32 crc;
crc.append((u8*)&header, 0x5c);
return crc.digest();
}
}

View File

@ -44,7 +44,11 @@ Result<usize> Pipe::read(u8* buf, usize, usize length)
Result<usize> Pipe::write(const u8* buf, usize, usize length)
{
if (!m_reader) return length;
if (!m_reader)
{
Scheduler::current()->send_signal(SIGPIPE);
return err(EPIPE);
}
u8* slice = TRY(m_data_buffer.slice_at_end(length));
memcpy(slice, buf, length);

View File

@ -63,7 +63,7 @@ namespace Ext2
#ifdef EXT2_DEBUG
kdbgln("ext2: Read inode %lu with mode %#x (%#x + %#o), size %lu", inum, inode->m_raw_inode.mode,
inode->m_raw_inode.mode & 0xf000, inode->mode(), inode->size());
inode->m_raw_inode.mode & 0xf000, inode->metadata().mode, inode->metadata().size);
#endif
m_inode_cache.try_set(inum, inode);

View File

@ -91,19 +91,18 @@ namespace Ext2
const usize inode_size = m_metadata.size;
const usize block_size = m_fs->m_block_size;
u8* const buf = (u8*)TRY(calloc_impl(block_size, 1));
auto guard = make_scope_guard([buf] { free_impl(buf); });
auto buf = TRY(Buffer::create_sized(block_size));
m_entries.clear();
for (usize offset = 0; offset < inode_size; offset += block_size)
{
TRY(read(buf, offset, block_size));
TRY(read(buf.data(), offset, block_size));
usize dir_offset = 0;
while (dir_offset < block_size)
{
auto& entry = *(Ext2::RawDirectoryEntry*)&buf[dir_offset];
auto& entry = *(Ext2::RawDirectoryEntry*)&buf.data()[dir_offset];
if (entry.inum != 0)
{

View File

@ -182,7 +182,7 @@ Result<u64> sys_fork(Registers* regs, SyscallArgs)
Scheduler::add_thread(thread);
#ifdef FORK_DEBUG
kdbgln("fork: thread %lu forked into child %lu", current->id, thread->id);
kdbgln("fork: thread %d forked into child %d", current->id, thread->id);
#endif
return thread->id;

View File

@ -183,7 +183,7 @@ namespace Scheduler
CPU::disable_interrupts();
#ifdef REAP_DEBUG
kdbgln("reap: reaping thread with id %zu", thread->id);
kdbgln("reap: reaping thread with id %d", thread->id);
#endif
if (thread->is_kernel)

View File

@ -27,6 +27,7 @@ typedef struct
int mode; // The buffering mode.
} _buf;
int _flags; // The file access mode with which the file was opened.
pid_t _pid; // For popen(3) files, the pid of the child process.
} FILE;
#define EOF -1
@ -52,6 +53,7 @@ extern "C"
{
#endif
/* Flush a stream's buffers. */
int fflush(FILE*);
/* Open a file and bind a stream to it. */
@ -201,6 +203,9 @@ extern "C"
/* Move a file's location across a file system. */
int rename(const char* oldpath, const char* newpath);
/* Pipe a stream to or from a process. */
FILE* popen(const char* command, const char* type);
#ifdef __cplusplus
}
#endif

View File

@ -6,6 +6,7 @@
#include <stdlib.h>
#include <string.h>
#include <sys/syscall.h>
#include <sys/wait.h>
#include <unistd.h>
FILE* stdin = nullptr;
@ -761,4 +762,87 @@ extern "C"
unlink(oldpath);
return 0;
}
FILE* popen(const char* command, const char* type)
{
int pfds[2];
if (pipe(pfds) < 0) return nullptr;
if (*type != 'r' && *type != 'w')
{
errno = EINVAL;
return nullptr;
}
pid_t child = fork();
if (child < 0)
{
close(pfds[0]);
close(pfds[1]);
return nullptr;
}
if (child == 0)
{
if (*type == 'r')
{
close(pfds[0]);
dup2(pfds[1], STDOUT_FILENO);
}
else
{
close(pfds[1]);
dup2(pfds[0], STDIN_FILENO);
}
execl("/bin/sh", "sh", "-c", command, nullptr);
_exit(127);
}
int fd;
if (*type == 'r')
{
close(pfds[1]);
fd = pfds[0];
}
else
{
close(pfds[0]);
fd = pfds[1];
}
int err = errno;
FILE* f = (FILE*)malloc(sizeof(FILE));
if (!f)
{
errno = err;
close(fd);
return nullptr;
}
f->_fd = fd;
f->_pid = child;
clearerr(f);
f->_flags = *type == 'r' ? O_RDONLY : O_WRONLY;
f->_buf.status = 0;
f->_buf.mode = _IOFBF;
f->_buf.size = f->_buf.index = 0;
f->_buf.buffer = nullptr;
setvbuf(f, NULL, f->_buf.mode, 0);
s_open_files[fd] = f;
return f;
}
int pclose(FILE* stream)
{
pid_t pid = stream->_pid;
fclose(stream);
int status;
if (waitpid(pid, &status, 0) < 0) return -1;
return status;
}
}

View File

@ -1,7 +1,13 @@
#pragma once
#include <luna/Types.h>
namespace CRC32
class CRC32
{
u32 checksum(const u8* data, usize size);
}
public:
void append(const u8* data, usize size);
u32 digest();
private:
u32 m_checksum = 0xffffffffu;
};

View File

@ -33,18 +33,16 @@ static const u32 crc_table[] = {
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
};
namespace CRC32
void CRC32::append(const u8* data, usize size)
{
u32 checksum(const u8* data, usize size)
{
u32 crc = 0xffffffffu;
for (usize i = 0; i < size; i++)
{
const u32 index = (crc & 0xff) ^ data[i];
crc = (crc >> 8) ^ (crc_table[index]);
}
return ~crc;
const u32 index = (m_checksum & 0xff) ^ data[i];
m_checksum = (m_checksum >> 8) ^ (crc_table[index]);
}
}
u32 CRC32::digest()
{
return ~m_checksum;
}

View File

@ -5,7 +5,7 @@ export LUNA_BASE=${LUNA_BASE:-$LUNA_ROOT/base}
[ -f "$LUNA_ROOT/env-local.sh" ] && source $LUNA_ROOT/env-local.sh
export LUNA_ARCH=${LUNA_ARCH:-x86_64}
export PATH=$LUNA_ROOT/toolchain/$LUNA_ARCH-luna/bin:$LUNA_ROOT/toolchain/dist:$LUNA_ROOT/tools/exec/:$PATH
export PATH=$LUNA_ROOT/toolchain/$LUNA_ARCH-luna/bin:$LUNA_ROOT/toolchain/dist:$LUNA_ROOT/toolchain/bin:$LUNA_ROOT/tools/exec/:$PATH
if [ "$USE_MAKE" = "1" ]
then

40
tools/setup-autoconf.sh Executable file
View File

@ -0,0 +1,40 @@
#!/usr/bin/env bash
set -e
source $(dirname $0)/setup-env.sh
cd $LUNA_ROOT
# libstdc++ needs autoconf (precisely version 2.69) so if the user has an older/more recent version, we must build autoconf from source.
export AUTOCONF_VERSION=2.69
mkdir -p toolchain/tarballs
mkdir -p toolchain/build
if [ ! -f toolchain/tarballs/autoconf-$AUTOCONF_VERSION.tar.gz ]; then
echo "Downloading autoconf (precisely version 2.69)..."
wget -Otoolchain/tarballs/autoconf-$AUTOCONF_VERSION.tar.gz https://ftp.gnu.org/gnu/autoconf/autoconf-$AUTOCONF_VERSION.tar.gz
fi
rm -rf toolchain/build/build-autoconf
rm -rf toolchain/build/autoconf-$AUTOCONF_VERSION
echo "Extracting autoconf (precisely version 2.69)..."
tar xf toolchain/tarballs/autoconf-$AUTOCONF_VERSION.tar.gz -C toolchain/build/
mkdir -p toolchain/build/build-autoconf
cd toolchain/build/build-autoconf
unset CC
unset CXX
unset LD
unset AR
echo "Building autoconf (precisely version 2.69)..."
../autoconf-$AUTOCONF_VERSION/configure --prefix=$LUNA_ROOT/toolchain
make
make install

View File

@ -36,6 +36,10 @@ patch -u -i $LUNA_ROOT/tools/gcc.patch -p 1 -d build
cd -
cd toolchain/build/gcc-$LUNA_GCC_VERSION_REQUIRED/libstdc++-v3
autoconf
cd -
echo Configuring GCC...
mkdir -p toolchain/build/gcc-$LUNA_ARCH

View File

@ -9,6 +9,12 @@ fi
if ! $(dirname $0)/test-gcc.sh
then
if ! $(dirname $0)/test-autoconf.sh
then
echo Building autoconf...
$(dirname $0)/setup-autoconf.sh
fi
echo Building GCC..
$(dirname $0)/setup-gcc.sh
fi

16
tools/test-autoconf.sh Executable file
View File

@ -0,0 +1,16 @@
#!/usr/bin/env bash
set -e
source $(dirname $0)/setup-env.sh
if [ -x "$(command -v autoconf)" ]
then
if [ "$(autoconf --version | head -n 1 | awk '{ print $4 }')" == "2.69" ]
then
exit 0
else
echo "You have autoconf installed, but it is not version 2.69, which is required by libstdc++. Thus, we must build autoconf from source."
exit 1
fi
else
exit 1
fi