From 698022572ae16aa53feb6856f088fd593388732d Mon Sep 17 00:00:00 2001
From: Yourtion <yourtion@gmail.com>
Date: Tue, 10 May 2016 17:44:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E7=BB=93=E6=9D=9F=E5=B9=B6?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 23_day/bootpack.h |  1 +
 23_day/console.c  | 11 +++++++++++
 23_day/sheet.c    |  1 +
 3 files changed, 13 insertions(+)

diff --git a/23_day/bootpack.h b/23_day/bootpack.h
index 5b86aa0..cea84d2 100644
--- a/23_day/bootpack.h
+++ b/23_day/bootpack.h
@@ -156,6 +156,7 @@ struct SHEET {
 	unsigned char *buf;
 	int bxsize, bysize, vx0, vy0, col_inv, height, flags;
 	struct SHTCTL *ctl;
+	struct TASK *task;
 };
 struct SHTCTL {
 	unsigned char *vram, *map;
diff --git a/23_day/console.c b/23_day/console.c
index 70daf72..37586b0 100644
--- a/23_day/console.c
+++ b/23_day/console.c
@@ -259,6 +259,8 @@ int cmd_app(struct CONSOLE *cons, int *fat, char *cmdline)
 	char name[18], *p, *q;
 	struct TASK *task = task_now();
 	int i, segsiz, datsiz, esp, dathrb;
+	struct SHTCTL *shtctl;
+	struct SHEET *sht;
 
 	/*根据命令行生成文件名*/
 	for (i = 0; i < 13; i++) {
@@ -298,6 +300,14 @@ int cmd_app(struct CONSOLE *cons, int *fat, char *cmdline)
 				q[esp + i] = p[dathrb + i];
 			}
 			start_app(0x1b, 1003 * 8, esp, 1004 * 8, &(task->tss.esp0));
+			shtctl = (struct SHTCTL *) *((int *) 0x0fe4);
+			for (i = 0; i < MAX_SHEETS; i++) {
+				sht = &(shtctl->sheets0[i]);
+				if (sht->flags != 0 && sht->task == task) {
+					/*找到被应用程序遗留的窗口*/
+					sheet_free(sht); /*关闭*/
+				}
+			}
 			memman_free_4k(memman, (int) q, segsiz);
 		} else {
 			cons_putstr0(cons, ".hrb file format error.\n");
@@ -333,6 +343,7 @@ int *hrb_api(int edi, int esi, int ebp, int esp, int ebx, int edx, int ecx, int
 		return &(task->tss.esp0);
 	} else if (edx == 5) {
 		sht = sheet_alloc(shtctl);
+		sht->task = task;
 		sheet_setbuf(sht, (char *) ebx + ds_base, esi, edi, eax);
 		make_window8((char *) ebx + ds_base, esi, edi, (char *) ecx + ds_base, 0);
 		sheet_slide(sht, 100, 50);
diff --git a/23_day/sheet.c b/23_day/sheet.c
index add69cc..a51c756 100644
--- a/23_day/sheet.c
+++ b/23_day/sheet.c
@@ -38,6 +38,7 @@ struct SHEET *sheet_alloc(struct SHTCTL *ctl)
 			sht = &ctl->sheets0[i];
 			sht->flags = SHEET_USE; /* 标记为正在使用*/
 			sht->height = -1; /* 隐藏 */
+			sht->task = 0; /*不使用自动关闭功能*/
 			return sht;
 		}
 	}