diff options
| -rw-r--r-- | boot/Makefile | 2 | ||||
| -rw-r--r-- | boot/load.c | 4 | ||||
| -rw-r--r-- | kernel/features/fs.c | 4 | ||||
| -rw-r--r-- | libgui/gui.c | 20 | ||||
| -rwxr-xr-x | run | 4 |
5 files changed, 9 insertions, 25 deletions
diff --git a/boot/Makefile b/boot/Makefile index 44743d7..a3cec04 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -5,7 +5,7 @@ LD = ../cross/opt/bin/i686-elf-ld OC = ../cross/opt/bin/i686-elf-objcopy AS = nasm -CFLAGS = -Wall -Wextra -nostdlib -nostdinc -ffreestanding -ffunction-sections -fno-builtin -std=c99 -m32 -pedantic-errors +CFLAGS = -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -std=c99 -m32 -pedantic-errors ASFLAGS = -f elf32 diff --git a/boot/load.c b/boot/load.c index 20d25a1..2a77a0d 100644 --- a/boot/load.c +++ b/boot/load.c @@ -350,13 +350,13 @@ void *read_inode(struct inode *in) indirect = in->block[12]; blocknum = read_indirect(indirect, i - 12); data = buffer_read(blocknum); - memcpy((u32 *)((u32)buf + (i - 1) * BLOCK_SIZE), data, BLOCK_SIZE); + memcpy((u32 *)((u32)buf + i * BLOCK_SIZE), data, BLOCK_SIZE); } else { indirect = in->block[13]; blocknum = read_indirect(indirect, (i - (BLOCK_COUNT + 12)) / BLOCK_COUNT); blocknum = read_indirect(blocknum, (i - (BLOCK_COUNT + 12)) % BLOCK_COUNT); data = buffer_read(blocknum); - memcpy((u32 *)((u32)buf + (i - 1) * BLOCK_SIZE), data, BLOCK_SIZE); + memcpy((u32 *)((u32)buf + i * BLOCK_SIZE), data, BLOCK_SIZE); } } diff --git a/kernel/features/fs.c b/kernel/features/fs.c index a0c8735..2db0a97 100644 --- a/kernel/features/fs.c +++ b/kernel/features/fs.c @@ -83,13 +83,13 @@ void *read_inode(struct inode *in) indirect = in->block[12]; blocknum = read_indirect(indirect, i - 12); data = buffer_read(blocknum); - memcpy((u32 *)((u32)buf + (i - 1) * BLOCK_SIZE), data, BLOCK_SIZE); + memcpy((u32 *)((u32)buf + i * BLOCK_SIZE), data, BLOCK_SIZE); } else { indirect = in->block[13]; blocknum = read_indirect(indirect, (i - (BLOCK_COUNT + 12)) / BLOCK_COUNT); blocknum = read_indirect(blocknum, (i - (BLOCK_COUNT + 12)) % BLOCK_COUNT); data = buffer_read(blocknum); - memcpy((u32 *)((u32)buf + (i - 1) * BLOCK_SIZE), data, BLOCK_SIZE); + memcpy((u32 *)((u32)buf + i * BLOCK_SIZE), data, BLOCK_SIZE); } /* printf("Loaded %d of %d\n", i + 1, num_blocks); */ } diff --git a/libgui/gui.c b/libgui/gui.c index 50a6f62..d973835 100644 --- a/libgui/gui.c +++ b/libgui/gui.c @@ -86,23 +86,7 @@ void gui_load_image(struct window *win, char *path, int x, int y) void gui_load_wallpaper(struct window *win, char *path) { - struct bmp *bmp = bmp_load(path); - assert(bmp && bmp->width <= win->width); - assert(bmp && bmp->height <= win->height); - - // TODO: Support padding with odd widths - int bypp = bmp->bpp >> 3; - // TODO: Find out why bigger images need some kind of offset - int magic_offset = bmp->pitch + 1024; - u8 *srcfb = &bmp->data[bypp + bmp->height * bmp->pitch - magic_offset]; - u8 *destfb = &win->fb[bypp]; - for (u32 cy = 0; cy < bmp->height; cy++) { - memcpy(destfb, srcfb, bmp->pitch); - srcfb -= bmp->pitch; - destfb += win->pitch; - } - gui_redraw(); - /* gui_load_image(win, path, 0, 0); */ + gui_load_image(win, path, 0, 0); } void gui_copy(struct window *dest, struct window *src, int x, int y, u32 width, u32 height) @@ -131,7 +115,7 @@ void gui_win_on_win(struct window *dest, struct window *src, int x, int y) u8 *srcfb = src->fb; u8 *destfb = &dest->fb[x * bypp + y * dest->pitch]; for (u32 cy = 0; cy < src->height && cy + y < dest->height; cy++) { - for (u32 cx = 0; cx < src->width; cx++) { + for (u32 cx = 0; cx < src->width && cx + x < dest->width; cx++) { if (srcfb[bypp * cx + 3]) { destfb[bypp * cx + 0] = srcfb[bypp * cx + 0]; destfb[bypp * cx + 1] = srcfb[bypp * cx + 1]; @@ -154,7 +154,7 @@ ${data}" } make_sync() { - ctags -R --exclude=.git --exclude=build --exclude=disk --exclude=cross --exclude=ext2util . + ctags -R --exclude=.git --exclude=build --exclude=disk --exclude=cross --exclude=ext2util --exclude=boot . rm -f compile_commands.json output=$(make --always-make --dry-run) @@ -162,7 +162,7 @@ make_sync() { echo "$output" | make_append_commands libk libgui libgui echo "$output" | make_append_commands libgui kernel kernel echo "$output" | make_append_commands kernel boot boot - echo "$output" | make_append_commands kernel apps apps + echo "$output" | make_append_commands boot apps apps tr <compile_commands.json '\n' '\r' | sed -e 's/\r]\r\[/,/g' | tr '\r' '\n' >tmp mv tmp compile_commands.json } |