backup/30dayMakeOS
1
0
Fork 1
mirror of https://github.com/yourtion/30dayMakeOS.git synced 2026-04-25 19:20:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

启动时只打开一个命令行窗口

Browse Source
This commit is contained in:
Yourtion
2016-05-16 11:42:37 +08:00
parent d2fc0dc0f5
commit 935af85346
1 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
26_day/bootpack.c
View File

@@ -7,6 +7,7 @@
void keywin_off(struct SHEET *key_win); void keywin_off(struct SHEET *key_win);
void keywin_on(struct SHEET *key_win); void keywin_on(struct SHEET *key_win);
struct SHEET *open_console(struct SHTCTL *shtctl, unsigned int memtotal);
void HariMain(void) void HariMain(void)
{ {
@@ -76,29 +77,8 @@ void HariMain(void)
init_screen8(buf_back, binfo->scrnx, binfo->scrny); init_screen8(buf_back, binfo->scrnx, binfo->scrny);
/* sht_cons */ /* sht_cons */
for (i = 0; i < 2; i++) { sht_cons[0] = open_console(shtctl, memtotal);
sht_cons[i] = sheet_alloc(shtctl); sht_cons[1] = 0;
buf_cons[i] = (unsigned char *) memman_alloc_4k(memman, 256 * 165);
sheet_setbuf(sht_cons[i], buf_cons[i], 256, 165, -1); /*没有透明色*/
make_window8(buf_cons[i], 256, 165, "console", 0);
make_textbox8(sht_cons[i], 8, 28, 240, 128, COL8_000000);
task_cons[i] = task_alloc();
task_cons[i]->tss.esp = memman_alloc_4k(memman, 64 * 1024) + 64 * 1024 - 12;
task_cons[i]->tss.eip = (int) &console_task;
task_cons[i]->tss.es = 1 * 8;
task_cons[i]->tss.cs = 2 * 8;
task_cons[i]->tss.ss = 1 * 8;
task_cons[i]->tss.ds = 1 * 8;
task_cons[i]->tss.fs = 1 * 8;
task_cons[i]->tss.gs = 1 * 8;
*((int *) (task_cons[i]->tss.esp + 4)) = (int) sht_cons[i];
*((int *) (task_cons[i]->tss.esp + 8)) = memtotal;
task_run(task_cons[i], 2, 2); /* level=2, priority=2 */
sht_cons[i]->task = task_cons[i];
sht_cons[i]->flags |= 0x20; /*有光标*/
cons_fifo[i] = (int *) memman_alloc_4k(memman, 128 * 4);
fifo32_init(&task_cons[i]->fifo, 128, cons_fifo[i], task_cons[i]);
}
/* sht_mouse */ /* sht_mouse */
sht_mouse = sheet_alloc(shtctl); sht_mouse = sheet_alloc(shtctl);
@@ -107,14 +87,12 @@ void HariMain(void)
mx = (binfo->scrnx - 16) / 2; /* 计算坐标使其位于画面中央 */ mx = (binfo->scrnx - 16) / 2; /* 计算坐标使其位于画面中央 */
my = (binfo->scrny - 28 - 16) / 2; my = (binfo->scrny - 28 - 16) / 2;
sheet_slide(sht_back, 0, 0); sheet_slide(sht_back, 0, 0);
sheet_slide(sht_cons[1], 56, 6); sheet_slide(sht_cons[0], 32, 4);
sheet_slide(sht_cons[0], 8, 2);
sheet_slide(sht_mouse, mx, my); sheet_slide(sht_mouse, mx, my);
sheet_updown(sht_back, 0); sheet_updown(sht_back, 0);
sheet_updown(sht_cons[1], 1); sheet_updown(sht_cons[0], 1);
sheet_updown(sht_cons[0], 2); sheet_updown(sht_mouse, 2);
sheet_updown(sht_mouse, 3);
key_win = sht_cons[0]; key_win = sht_cons[0];
keywin_on(key_win); keywin_on(key_win);
@@ -216,6 +194,15 @@ void HariMain(void)
io_sti(); io_sti();
} }
} }
if (i == 256 + 0x3c && key_shift != 0 && sht_cons[1] == 0) { /* Shift+F2 */
sht_cons[1] = open_console(shtctl, memtotal);
sheet_slide(sht_cons[1], 32, 4);
sheet_updown(sht_cons[1], shtctl->top);
/*自动将输入焦点切换到新打开的命令行窗口（这样比较方便吧？） */
keywin_off(key_win);
key_win = sht_cons[1];
keywin_on(key_win);
}
if (i == 256 + 0x57) { /* F11 */ if (i == 256 + 0x57) { /* F11 */
sheet_updown(shtctl->sheets[1], shtctl->top - 1); sheet_updown(shtctl->sheets[1], shtctl->top - 1);
} }
@@ -321,3 +308,30 @@ void keywin_on(struct SHEET *key_win)
} }
return; return;
} }
struct SHEET *open_console(struct SHTCTL *shtctl, unsigned int memtotal)
{
struct MEMMAN *memman = (struct MEMMAN *) MEMMAN_ADDR;
struct SHEET *sht = sheet_alloc(shtctl);
unsigned char *buf = (unsigned char *) memman_alloc_4k(memman, 256 * 165);
struct TASK *task = task_alloc();
int *cons_fifo = (int *) memman_alloc_4k(memman, 128 * 4);
sheet_setbuf(sht, buf, 256, 165, -1); /*无透明色*/
make_window8(buf, 256, 165, "console", 0);
make_textbox8(sht, 8, 28, 240, 128, COL8_000000);
task->tss.esp = memman_alloc_4k(memman, 64 * 1024) + 64 * 1024 - 12;
task->tss.eip = (int) &console_task;
task->tss.es = 1 * 8;
task->tss.cs = 2 * 8;
task->tss.ss = 1 * 8;
task->tss.ds = 1 * 8;
task->tss.fs = 1 * 8;
task->tss.gs = 1 * 8;
*((int *) (task->tss.esp + 4)) = (int) sht;
*((int *) (task->tss.esp + 8)) = memtotal;
task_run(task, 2, 2); /* level=2, priority=2 */
sht->task = task;
sht->flags |= 0x20; /*有光标*/
fifo32_init(&task->fifo, 128, cons_fifo, task);
return sht;
}