benji/portland-os
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

making win+space work when no tasks are running

Browse source
This commit is contained in:
Benji Dial 2021-02-17 09:11:39 -05:00
parent 642c3c69a6
commit 49d76d30a5
3 changed files with 64 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/kernel/paging.c
View file

@ -132,7 +132,8 @@ void init_paging() {
__attribute__ ((pure)) __attribute__ ((pure))
void *vma_to_pma(void *pd, const void *vma) { void *vma_to_pma(void *pd, const void *vma) {
return (void *)(((uint32_t *)(((uint32_t *)pd)[(uint32_t)vma >> 22] & PE_ADDR_MASK))[((uint32_t)vma >> 12) % 1024] & PE_ADDR_MASK) + (uint32_t)vma % 4096; //this is maybe not good - in the case where pd is zero, vma is returned unconsted. hopefully this doesn't become a problem.
return pd ? (void *)(((uint32_t *)(((uint32_t *)pd)[(uint32_t)vma >> 22] & PE_ADDR_MASK))[((uint32_t)vma >> 12) % 1024] & PE_ADDR_MASK) + (uint32_t)vma % 4096 : (void *)(uint32_t)vma;
} }
void switch_to_kernel_cr3() { void switch_to_kernel_cr3() {
@ -143,7 +144,8 @@ void switch_to_kernel_cr3() {
} }
void switch_to_task_cr3() { void switch_to_task_cr3() {
asm volatile ( if (active_task->page_directory)
"mov %0, %%cr3" asm volatile (
: : "a" (active_task->page_directory)); "mov %0, %%cr3"
: : "a" (active_task->page_directory));
} }

12
src/kernel/task.c
View file

@ -86,12 +86,12 @@ void advance_active_task() {
} }
void make_sure_tasks() { void make_sure_tasks() {
for (uint8_t n = 0; n < MAX_TASKS; ++n) while (1) {
if (tasks[n].page_directory) for (uint8_t n = 0; n < MAX_TASKS; ++n)
return; if (tasks[n].page_directory)
logf(LOG_INFO, "No tasks, halting."); return;
while (1) tmp_halt();
asm("hlt"); }
} }
//IPC stuff isn't fully implemented, or tested in this version. //IPC stuff isn't fully implemented, or tested in this version.

97
src/kernel/window.c
View file

@ -289,63 +289,70 @@ void on_action(struct window_action packet) {
if (packet.action_type == NOT_READY) if (packet.action_type == NOT_READY)
return; return;
if (top_window) { if (packet.action_type == KEY_DOWN)
if (packet.action_type == KEY_DOWN) for (uint8_t i = 0; i < N_WM_ACTIONS; ++i)
for (uint8_t i = 0; i < N_WM_ACTIONS; ++i) if (fuzzy_key_match(keybinds[i], packet.as_key)) {
if (fuzzy_key_match(keybinds[i], packet.as_key)) { switch_to_kernel_cr3();
switch_to_kernel_cr3(); struct window *old_top, *old_bottom;
struct window *old_top, *old_bottom; switch (i) {
switch (i) { case WM_SHUFFLE_UP:
case WM_SHUFFLE_UP: if (!top_window || !top_window->below)
if (!top_window->below)
break;
old_top = top_window;
old_bottom = bottom_window;
top_window = old_top->below;
top_window->above = 0;
old_top->below = 0;
old_top->above = old_bottom;
old_bottom->below = old_top;
bottom_window = old_top;
paint_and_above(bottom_window->above);
break; break;
case WM_SHUFFLE_DOWN: old_top = top_window;
if (!top_window->below) old_bottom = bottom_window;
break; top_window = old_top->below;
old_top = top_window; top_window->above = 0;
old_bottom = bottom_window; old_top->below = 0;
bottom_window = old_bottom->above; old_top->above = old_bottom;
bottom_window->below = 0; old_bottom->below = old_top;
old_bottom->above = 0; bottom_window = old_top;
old_bottom->below = old_top; paint_and_above(bottom_window->above);
old_top->above = old_bottom; break;
top_window = old_bottom; case WM_SHUFFLE_DOWN:
paint_and_above(top_window); if (!top_window || !top_window->below)
break; break;
case WM_MOVE_LEFT: old_top = top_window;
old_bottom = bottom_window;
bottom_window = old_bottom->above;
bottom_window->below = 0;
old_bottom->above = 0;
old_bottom->below = old_top;
old_top->above = old_bottom;
top_window = old_bottom;
paint_and_above(top_window);
break;
case WM_MOVE_LEFT:
if (top_window) {
--top_window->xpos; --top_window->xpos;
paint_all(); paint_all();
break; }
case WM_MOVE_RIGHT: break;
case WM_MOVE_RIGHT:
if (top_window) {
++top_window->xpos; ++top_window->xpos;
paint_all(); paint_all();
break; }
case WM_MOVE_UP: break;
case WM_MOVE_UP:
if (top_window) {
--top_window->ypos; --top_window->ypos;
paint_all(); paint_all();
break; }
case WM_MOVE_DOWN: break;
case WM_MOVE_DOWN:
if (top_window) {
++top_window->ypos; ++top_window->ypos;
paint_all(); paint_all();
break;
case WM_RUN_COMMAND:
if (!try_elf_run(drives, run_command, run_command_pass, 0))
PANIC("Couldn't run program listed in " RUN_COMMAND_FILE ".");
} }
switch_to_task_cr3(); break;
return; case WM_RUN_COMMAND:
if (!try_elf_run(drives, run_command, run_command_pass, 0))
PANIC("Couldn't run program listed in " RUN_COMMAND_FILE ".");
} }
switch_to_task_cr3();
return;
}
if (top_window)
send_action(top_window, packet); send_action(top_window, packet);
}
} }