强制结束并关闭窗口

23_day/Makefile

@@ -127,9 +127,31 @@ stars.bim : stars.obj a_nask.obj Makefile
 stars.hrb : stars.bim Makefile
 	$(BIM2HRB) stars.bim stars.hrb 47k
 
+stars2.bim : stars2.obj a_nask.obj Makefile
+	$(OBJ2BIM) @$(RULEFILE) out:stars2.bim stack:1k map:stars2.map \
+		stars2.obj a_nask.obj
+
+stars2.hrb : stars2.bim Makefile
+	$(BIM2HRB) stars2.bim stars2.hrb 47k
+
+lines.bim : lines.obj a_nask.obj Makefile
+	$(OBJ2BIM) @$(RULEFILE) out:lines.bim stack:1k map:lines.map \
+		lines.obj a_nask.obj
+
+lines.hrb : lines.bim Makefile
+	$(BIM2HRB) lines.bim lines.hrb 48k
+
+walk.bim : walk.obj a_nask.obj Makefile
+	$(OBJ2BIM) @$(RULEFILE) out:walk.bim stack:1k map:walk.map \
+		walk.obj a_nask.obj
+
+walk.hrb : walk.bim Makefile
+	$(BIM2HRB) walk.bim walk.hrb 48k
+
 haribote.img : ipl10.bin haribote.sys Makefile \
 		hello.hrb hello2.hrb a.hrb hello3.hrb hello4.hrb hello5.hrb \
-		winhelo.hrb winhelo2.hrb winhelo3.hrb star1.hrb stars.hrb
+		winhelo.hrb winhelo2.hrb winhelo3.hrb star1.hrb stars.hrb stars2.hrb \
+		lines.hrb walk.hrb
 	$(EDIMG)   imgin:../z_tools/fdimg0at.tek \
 		wbinimg src:ipl10.bin len:512 from:0 to:0 \
 		copy from:haribote.sys to:@: \
@@ -146,8 +168,11 @@ haribote.img : ipl10.bin haribote.sys Makefile \
 		copy from:winhelo3.hrb to:@: \
 		copy from:star1.hrb to:@: \
 		copy from:stars.hrb to:@: \
+		copy from:stars2.hrb to:@: \
+		copy from:lines.hrb to:@: \
+		copy from:walk.hrb to:@: \
 		imgout:haribote.img
-		
+
 # 其他指令
 
 %.gas : %.c bootpack.h Makefile

23_day/a_nask.nas

@@ -13,6 +13,10 @@
 		GLOBAL	_api_malloc
 		GLOBAL	_api_free
 		GLOBAL	_api_point
+		GLOBAL	_api_refreshwin
+		GLOBAL	_api_linewin
+		GLOBAL	_api_closewin
+		GLOBAL	_api_getkey
 
 [SECTION .text]
 
@@ -133,3 +137,52 @@ _api_point:		; void api_point(int win, int x, int y, int col);
 		POP		ESI
 		POP		EDI
 		RET
+
+_api_refreshwin:	; void api_refreshwin(int win, int x0, int y0, int x1, int y1);
+		PUSH	EDI
+		PUSH	ESI
+		PUSH	EBX
+		MOV		EDX,12
+		MOV		EBX,[ESP+16]	; win
+		MOV		EAX,[ESP+20]	; x0
+		MOV		ECX,[ESP+24]	; y0
+		MOV		ESI,[ESP+28]	; x1
+		MOV		EDI,[ESP+32]	; y1
+		INT		0x40
+		POP		EBX
+		POP		ESI
+		POP		EDI
+		RET
+
+_api_linewin:		; void api_linewin(int win, int x0, int y0, int x1, int y1, int col);
+		PUSH	EDI
+		PUSH	ESI
+		PUSH	EBP
+		PUSH	EBX
+		MOV		EDX,13
+		MOV		EBX,[ESP+20]	; win
+		MOV		EAX,[ESP+24]	; x0
+		MOV		ECX,[ESP+28]	; y0
+		MOV		ESI,[ESP+32]	; x1
+		MOV		EDI,[ESP+36]	; y1
+		MOV		EBP,[ESP+40]	; col
+		INT		0x40
+		POP		EBX
+		POP		EBP
+		POP		ESI
+		POP		EDI
+		RET
+
+_api_closewin:		; void api_closewin(int win);
+		PUSH	EBX
+		MOV		EDX,14
+		MOV		EBX,[ESP+8]	; win
+		INT		0x40
+		POP		EBX
+		RET
+
+_api_getkey:		; int api_getkey(int mode);
+		MOV		EDX,15
+		MOV		EAX,[ESP+4]	; mode
+		INT		0x40
+		RET

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;
@@ -237,6 +238,7 @@ void make_wtitle8(unsigned char *buf, int xsize, char *title, char act);
 struct CONSOLE {
 	struct SHEET *sht;
 	int cur_x, cur_y, cur_c;
+	struct TIMER *timer;
 };
 void console_task(struct SHEET *sheet, unsigned int memtotal);
 void cons_putchar(struct CONSOLE *cons, int chr, char move);

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");
@@ -321,6 +331,8 @@ int *hrb_api(int edi, int esi, int ebp, int esp, int ebx, int edx, int ecx, int
 	/*强行改写通过PUSHAD保存的值*/
 	/* reg[0] : EDI, reg[1] : ESI, reg[2] : EBP, reg[3] : ESP */
 	/* reg[4] : EBX, reg[5] : EDX, reg[6] : ECX, reg[7] : EAX */
+	int i;
+
 	if (edx == 1) {
 		cons_putchar(cons, eax & 0xff, 1);
 	} else if (edx == 2) {
@@ -331,19 +343,24 @@ 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);
 		sheet_updown(sht, 3); /*背景层高度3位于task_a之上*/
 		reg[7] = (int) sht; 
 	} else if (edx == 6) {
-		sht = (struct SHEET *) ebx;
+		sht = (struct SHEET *) (ebx & 0xfffffffe);
 		putfonts8_asc(sht->buf, sht->bxsize, esi, edi, eax, (char *) ebp + ds_base);
-		sheet_refresh(sht, esi, edi, esi + ecx * 8, edi + 16);
+		if ((ebx & 1) == 0) {
+			sheet_refresh(sht, esi, edi, esi + ecx * 8, edi + 16);
+		}
 	} else if (edx == 7) {
-		sht = (struct SHEET *) ebx;
+		sht = (struct SHEET *) (ebx & 0xfffffffe);
 		boxfill8(sht->buf, sht->bxsize, ebp, eax, ecx, esi, edi);
-		sheet_refresh(sht, eax, ecx, esi + 1, edi + 1);
+		if ((ebx & 1) == 0) {
+			sheet_refresh(sht, eax, ecx, esi + 1, edi + 1);
+		}
 	} else if (edx == 8) {
 		memman_init((struct MEMMAN *) (ebx + ds_base));
 		ecx &= 0xfffffff0; /*以16字节为单位*/
@@ -355,9 +372,52 @@ int *hrb_api(int edi, int esi, int ebp, int esp, int ebx, int edx, int ecx, int
 		ecx = (ecx + 0x0f) & 0xfffffff0; /*以16字节为单位进位取整*/
 		memman_free((struct MEMMAN *) (ebx + ds_base), eax, ecx);
 	} else if (edx == 11) {
-		sht = (struct SHEET *) ebx;
+		sht = (struct SHEET *) (ebx & 0xfffffffe);
 		sht->buf[sht->bxsize * edi + esi] = eax;
-		sheet_refresh(sht, esi, edi, esi + 1, edi + 1);
+		if ((ebx & 1) == 0) {
+			sheet_refresh(sht, esi, edi, esi + 1, edi + 1);
+		}
+	} else if (edx == 12) {
+		sht = (struct SHEET *) ebx;
+		sheet_refresh(sht, eax, ecx, esi, edi);
+	} else if (edx == 13) {
+		sht = (struct SHEET *) (ebx & 0xfffffffe);
+		hrb_api_linewin(sht, eax, ecx, esi, edi, ebp);
+		if ((ebx & 1) == 0) {
+			sheet_refresh(sht, eax, ecx, esi + 1, edi + 1);
+		}
+	} else if (edx == 14) {
+		sheet_free((struct SHEET *) ebx);
+	} else if (edx == 15) {
+		for (;;) {
+			io_cli();
+			if (fifo32_status(&task->fifo) == 0) {
+				if (eax != 0) {
+					task_sleep(task); /* FIFO为空，休眠并等待*/
+				} else {
+					io_sti();
+					reg[7] = -1;
+					return 0;
+				}
+			}
+			i = fifo32_get(&task->fifo);
+			io_sti();
+			if (i <= 1) { /*光标用定时器*/
+				/*应用程序运行时不需要显示光标，因此总是将下次显示用的值置为1*/
+				timer_init(cons->timer, &task->fifo, 1); /*下次置为1*/
+				timer_settime(cons->timer, 50);
+			}
+			if (i == 2) { /*光标ON */
+				cons->cur_c = COL8_FFFFFF;
+			}
+			if (i == 3) { /*光标OFF */
+				cons->cur_c = -1;
+			}
+			if (256 <= i && i <= 511) { /*键盘数据（通过任务A）*/
+				reg[7] = i - 256;
+				return 0;
+			}
+		}
 	}
 	return 0;
 }
@@ -383,3 +443,52 @@ int *inthandler0d(int *esp)
 	cons_putstr0(cons, s);
 	return &(task->tss.esp0);	/*强制结束程序*/
 }
+
+void hrb_api_linewin(struct SHEET *sht, int x0, int y0, int x1, int y1, int col)
+{
+	int i, x, y, len, dx, dy;
+
+	dx = x1 - x0;
+	dy = y1 - y0;
+	x = x0 << 10;
+	y = y0 << 10;
+	if (dx < 0) {
+		dx = - dx;
+	}
+	if (dy < 0) {
+		dy = - dy;
+	}
+	if (dx >= dy) {
+		len = dx + 1;
+		if (x0 > x1) {
+			dx = -1024;
+		} else {
+			dx =  1024;
+		}
+		if (y0 <= y1) {
+			dy = ((y1 - y0 + 1) << 10) / len;
+		} else {
+			dy = ((y1 - y0 - 1) << 10) / len;
+		}
+	} else {
+		len = dy + 1;
+		if (y0 > y1) {
+			dy = -1024;
+		} else {
+			dy =  1024;
+		}
+		if (x0 <= x1) {
+			dx = ((x1 - x0 + 1) << 10) / len;
+		} else {
+			dx = ((x1 - x0 - 1) << 10) / len;
+		}
+	}
+
+	for (i = 0; i < len; i++) {
+		sht->buf[(y >> 10) * sht->bxsize + (x >> 10)] = col;
+		x += dx;
+		y += dy;
+	}
+
+	return;
+}

23_day/lines.c

@@ -0,0 +1,29 @@
+int api_openwin(char *buf, int xsiz, int ysiz, int col_inv, char *title);
+void api_initmalloc(void);
+char *api_malloc(int size);
+void api_refreshwin(int win, int x0, int y0, int x1, int y1);
+void api_linewin(int win, int x0, int y0, int x1, int y1, int col);
+void api_closewin(int win);
+int api_getkey(int mode);
+void api_end(void);
+
+void HariMain(void)
+{
+	char *buf;
+	int win, i;
+	api_initmalloc();
+	buf = api_malloc(160 * 100);
+	win = api_openwin(buf, 160, 100, -1, "lines");
+	for (i = 0; i < 8; i++) {
+		api_linewin(win + 1,  8, 26, 77, i * 9 + 26, i);
+		api_linewin(win + 1, 88, 26, i * 9 + 88, 89, i);
+	}
+	api_refreshwin(win,  6, 26, 154, 90);
+	for (;;) {
+		if (api_getkey(1) == 0x0a) {
+			break; /*按下回车键则break; */
+		}
+	}
+	api_closewin(win);
+	api_end();
+}

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;
 		}
 	}

23_day/stars2.c

@@ -0,0 +1,26 @@
+int api_openwin(char *buf, int xsiz, int ysiz, int col_inv, char *title);
+void api_boxfilwin(int win, int x0, int y0, int x1, int y1, int col);
+void api_initmalloc(void);
+char *api_malloc(int size);
+void api_point(int win, int x, int y, int col);
+void api_refreshwin(int win, int x0, int y0, int x1, int y1);
+void api_end(void);
+
+int rand(void);		/*产生0～32767的随机数*/
+
+void HariMain(void)
+{
+	char *buf;
+	int win, i, x, y;
+	api_initmalloc();
+	buf = api_malloc(150 * 100);
+	win = api_openwin(buf, 150, 100, -1, "stars2");
+	api_boxfilwin(win + 1,  6, 26, 143, 93, 0);/*黑色*/
+	for (i = 0; i < 50; i++) {
+		x = (rand() % 137) +  6;
+		y = (rand() %  67) + 26;
+		api_point(win + 1, x, y, 3);/*黄色*/
+	}
+	api_refreshwin(win,  6, 26, 144, 94);
+	api_end();
+}

23_day/walk.c

@@ -0,0 +1,35 @@
+int api_openwin(char *buf, int xsiz, int ysiz, int col_inv, char *title);
+void api_putstrwin(int win, int x, int y, int col, int len, char *str);
+void api_boxfilwin(int win, int x0, int y0, int x1, int y1, int col);
+void api_initmalloc(void);
+char *api_malloc(int size);
+void api_refreshwin(int win, int x0, int y0, int x1, int y1);
+void api_linewin(int win, int x0, int y0, int x1, int y1, int col);
+void api_closewin(int win);
+int api_getkey(int mode);
+void api_end(void);
+
+void HariMain(void)
+{
+	char *buf;
+	int win, i, x, y;
+	api_initmalloc();
+	buf = api_malloc(160 * 100);
+	win = api_openwin(buf, 160, 100, -1, "walk");
+	api_boxfilwin(win, 4, 24, 155, 95, 0);/*黑色*/
+	x = 76;
+	y = 56;
+	api_putstrwin(win, x, y, 3, 1, "*");/*黄色*/
+	for (;;) {
+		i = api_getkey(1);
+		api_putstrwin(win, x, y, 0 , 1, "*"); /*用黑色擦除*/
+		if (i == '4' && x >   4) { x -= 8; }
+		if (i == '6' && x < 148) { x += 8; }
+		if (i == '8' && y >  24) { y -= 8; }
+		if (i == '2' && y <  80) { y += 8; }
+		if (i == 0x0a) { break; } /*按回车键结束*/
+		api_putstrwin(win, x, y, 3 , 1, "*");/*黄色*/
+	}	
+	api_closewin(win);
+	api_end();
+}