Update to beta3

NuVanDibe · Apr 5, 2022 · d1385ab · d1385ab
1 parent cb48d3c
commit d1385ab
Show file tree

Hide file tree

Showing 96 changed files with 71 additions and 79 deletions.
diff --git a/data/fonts/fixed4.font b/data/fonts/fixed4.font
diff --git a/data/fonts/fixed5.font b/data/fonts/fixed5.font
diff --git a/data/fonts/fixed6.font b/data/fonts/fixed6.font
diff --git a/data/fonts/nokia.font b/data/fonts/nokia.font
diff --git a/data/fonts/screenfox.font b/data/fonts/screenfox.font
diff --git a/libfc_visoly_xg1/dual.o b/libfc_visoly_xg1/dual.o
diff --git a/libfc_visoly_xg1/libflashcart.a b/libfc_visoly_xg1/libflashcart.a
diff --git a/libfc_visoly_xg1/main.o b/libfc_visoly_xg1/main.o
diff --git a/libfc_xrom/go.o b/libfc_xrom/go.o
diff --git a/libfc_xrom/go.s.bak b/libfc_xrom/go.s.bak
diff --git a/libfc_xrom/libflashcart.a b/libfc_xrom/libflashcart.a
diff --git a/libfc_xrom/main.o b/libfc_xrom/main.o
diff --git a/libpogo/lib/libpogo.a b/libpogo/lib/libpogo.a
diff --git a/libpogo/lib/libpogod.a b/libpogo/lib/libpogod.a
diff --git a/libpogo/source/obj/aes.o b/libpogo/source/obj/aes.o
diff --git a/libpogo/source/obj/console.o b/libpogo/source/obj/console.o
diff --git a/libpogo/source/obj/core.o b/libpogo/source/obj/core.o
diff --git a/libpogo/source/obj/core_misc.o b/libpogo/source/obj/core_misc.o
diff --git a/libpogo/source/obj/cursor.o b/libpogo/source/obj/cursor.o
diff --git a/libpogo/source/obj/debug.o b/libpogo/source/obj/debug.o
diff --git a/libpogo/source/obj/device.o b/libpogo/source/obj/device.o
diff --git a/libpogo/source/obj/editbuf.o b/libpogo/source/obj/editbuf.o
diff --git a/libpogo/source/obj/font.o b/libpogo/source/obj/font.o
diff --git a/libpogo/source/obj/io.o b/libpogo/source/obj/io.o
diff --git a/libpogo/source/obj/keyboard.o b/libpogo/source/obj/keyboard.o
diff --git a/libpogo/source/obj/memory.o b/libpogo/source/obj/memory.o
diff --git a/libpogo/source/obj/misc.o b/libpogo/source/obj/misc.o
diff --git a/libpogo/source/obj/romfilesys.o b/libpogo/source/obj/romfilesys.o
diff --git a/libpogo/source/obj/rtc.o b/libpogo/source/obj/rtc.o
diff --git a/libpogo/source/obj/screen.o b/libpogo/source/obj/screen.o
diff --git a/libpogo/source/obj/sema.o b/libpogo/source/obj/sema.o
diff --git a/libpogo/source/obj/smartkey.o b/libpogo/source/obj/smartkey.o
diff --git a/libpogo/source/obj/sram_access.o b/libpogo/source/obj/sram_access.o
diff --git a/libpogo/source/obj/sramfile.o b/libpogo/source/obj/sramfile.o
diff --git a/libpogo/source/obj/string.o b/libpogo/source/obj/string.o
diff --git a/libpogo/source/obj/vkeyboard.o b/libpogo/source/obj/vkeyboard.o
diff --git a/libpogo/source/objd/aes.o b/libpogo/source/objd/aes.o
diff --git a/libpogo/source/objd/console.o b/libpogo/source/objd/console.o
diff --git a/libpogo/source/objd/core.o b/libpogo/source/objd/core.o
diff --git a/libpogo/source/objd/core_misc.o b/libpogo/source/objd/core_misc.o
diff --git a/libpogo/source/objd/cursor.o b/libpogo/source/objd/cursor.o
diff --git a/libpogo/source/objd/debug.o b/libpogo/source/objd/debug.o
diff --git a/libpogo/source/objd/device.o b/libpogo/source/objd/device.o
diff --git a/libpogo/source/objd/editbuf.o b/libpogo/source/objd/editbuf.o
diff --git a/libpogo/source/objd/font.o b/libpogo/source/objd/font.o
diff --git a/libpogo/source/objd/io.o b/libpogo/source/objd/io.o
diff --git a/libpogo/source/objd/keyboard.o b/libpogo/source/objd/keyboard.o
diff --git a/libpogo/source/objd/memory.o b/libpogo/source/objd/memory.o
diff --git a/libpogo/source/objd/misc.o b/libpogo/source/objd/misc.o
diff --git a/libpogo/source/objd/romfilesys.o b/libpogo/source/objd/romfilesys.o
diff --git a/libpogo/source/objd/rtc.o b/libpogo/source/objd/rtc.o
diff --git a/libpogo/source/objd/screen.o b/libpogo/source/objd/screen.o
diff --git a/libpogo/source/objd/sema.o b/libpogo/source/objd/sema.o
diff --git a/libpogo/source/objd/smartkey.o b/libpogo/source/objd/smartkey.o
diff --git a/libpogo/source/objd/sram_access.o b/libpogo/source/objd/sram_access.o
diff --git a/libpogo/source/objd/sramfile.o b/libpogo/source/objd/sramfile.o
diff --git a/libpogo/source/objd/string.o b/libpogo/source/objd/string.o
diff --git a/libpogo/source/objd/vkeyboard.o b/libpogo/source/objd/vkeyboard.o
diff --git a/shell2/backdrop.o b/shell2/backdrop.o
diff --git a/shell2/bitmap.o b/shell2/bitmap.o
diff --git a/shell2/bmpview.o b/shell2/bmpview.o
diff --git a/shell2/crt0.o b/shell2/crt0.o
diff --git a/shell2/filesys.c b/shell2/filesys.c
@@ -4,13 +4,22 @@
 #include "filesys.h"
 #include "filetype.h"
 
+#define MARKED_STACK_DEPTH 128
+
+extern uint16 marked;
+
 //static int dot_hide = 0;
 static char current[128];
+#if 0
 static char return_dir[128];
+#endif
+static uint16 marked_stack[MARKED_STACK_DEPTH];
 static char currtemp[128];
 static DirList *lastlist;
 static uint64 key[2];
 
+int current_marked_level = 0;
+
 /*
 static char *tmp_item;
 static int item_size;
@@ -209,7 +218,7 @@ int filesys_change_hidden_dir(void)
 			{
 				ioctl(rfd, RM_SETKEY, key);
 				close(rfd);
-				return filesys_cd(tmp);
+				return filesys_cd(tmp, marked);
 			}
 		}
 		close(rfd);
@@ -269,7 +278,9 @@ char *filesys_get_current(void)
 int filesys_parent(void)
 {
 	char *p = strrchr(current, '/');
+#if 0
 	*return_dir = 0;
+#endif
 
 	//if(p)
 	//	fprintf(stderr, "%s => %s\n", current, p);
@@ -279,12 +290,18 @@ int filesys_parent(void)
 	if(p)
 	{
 		*p = 0;
-		return 1;
+		current_marked_level--;
+		if (current_marked_level < MARKED_STACK_DEPTH)
+			marked = marked_stack[current_marked_level];
+		else
+			marked = 0;
+		return 0;
 	}
 
-	return 0;
+	return -1;
 }
 
+#if 0
 int filesys_back(void)
 {
 	if(*return_dir)
@@ -297,7 +314,9 @@ int filesys_back(void)
 	return filesys_parent();
 
 }
+#endif
 
+#if 0
 int filesys_enter(int i)
 {
 	if(i < 0) return NULL;
@@ -311,6 +330,7 @@ int filesys_enter(int i)
 	}
 	return 0;
 }
+#endif
 
 char *filesys_fullname(int i)
 {
@@ -321,15 +341,42 @@ char *filesys_fullname(int i)
 	return currtemp;
 }
 
-int filesys_cd(char *name)
+int filesys_cd_marked(char *name)
+{
+	char *p;
+	int slash = 0;
+
+	if (filesys_cd(name, 0)) {
+		p = current;
+		while (*p) {
+			if (*p == '/') {
+				if (slash < MARKED_STACK_DEPTH)
+					marked_stack[slash] = 0;
+				slash++;
+			}
+			p++;
+		}
+		current_marked_level = slash;
+		return 1;
+	}
+	return 0;
+}
+
+int filesys_cd(char *name, uint16 prev_marked)
 {
 	DIR *dir;
 
 	if((dir = opendir(name)))
 	{
 		closedir(dir);
+#if 0
 		strcpy(return_dir, current);
+#endif
 		strcpy(current, name);
+		if (current_marked_level < MARKED_STACK_DEPTH)
+			marked_stack[current_marked_level] = prev_marked;
+		current_marked_level++;
+		marked = 0;
 		return 1;
 	}
 	//fprintf(stderr, "Couldnt open %s\n", name);

diff --git a/shell2/filesys.h b/shell2/filesys.h
@@ -18,7 +18,8 @@ int filesys_parent(void);
 int filesys_back(void);
 int filesys_enter(int i);
 char *filesys_fullname(int i);
-int filesys_cd(char *name);
+int filesys_cd_marked(char *name);
+int filesys_cd(char *name, uint16 marked);
 char *filesys_get_current(void);
 
 enum { FSTATE_NORMAL, FSTATE_ROOT, FSTATE_SRAM, FSTATE_GAMES };

diff --git a/shell2/filetype.c b/shell2/filetype.c
@@ -13,6 +13,8 @@
 #include "settings.h"
 #include "misc.h" 
 
+extern uint16 marked;
+
 void bmp_view(char *fname);
 void jpg_view(char *fname);
 void jpe_view(char *fname);
@@ -56,15 +58,15 @@ static int check_extention(char *data, DirList *entry)
 	return 0;
 }
 
-/* void clear_vram(void)
+void clear_vram(void)
 {
 	unsigned short *vram = (unsigned short *) VRAM;
 	int i;
 
 	// Start after screen.
 	for (i = 240*160; i < (VRAM_END-VRAM)/sizeof(unsigned short); i++)
 		vram[i] = 0;
-}*/
+}
 
 int execute_mb(char *cmd, char *fname, int keys)
 {
@@ -74,7 +76,7 @@ int execute_mb(char *cmd, char *fname, int keys)
 	//close(fd);
 
 	save_state();
-	//clear_vram();
+	clear_vram();
 
 	set_ram_start(0);
 
@@ -133,7 +135,7 @@ int execute_plugin(char *cmd, char *fname, int keys)
 	args[0] = fname;
 
 	save_state();
-	//clear_vram();
+	clear_vram();
 
 	//sprintf(tmp, ".shell/plugins/%s", cmd);
 	strcpy(tmp, GET_PATH(PLUGINS));
@@ -187,7 +189,7 @@ int set_font(char *cmd, char *fname, int keys)
 
 int changedir(char *cmd, char *fname, int keys)
 {
-	filesys_cd(fname);
+	filesys_cd(fname, marked);
 	return 2;
 }
 

diff --git a/shell2/gameromfs.o b/shell2/gameromfs.o
diff --git a/shell2/guiparser.o b/shell2/guiparser.o
diff --git a/shell2/iwram.o b/shell2/iwram.o
diff --git a/shell2/jpeg.o b/shell2/jpeg.o
diff --git a/shell2/jpgview.o b/shell2/jpgview.o
diff --git a/shell2/main.c b/shell2/main.c
@@ -57,13 +57,14 @@ char *path[4];
 
 int sram_game_size = 64;
 
+uint16 marked;
+
 const char *PogoVersion = "2.0b3mod5";
 
 /* State, saved to  /sram/.state */
 struct {
 	unsigned /*short*/ char settings[NO_SETTINGS];
-	char dirstart;
-	char marked;
+	uint16 marked;
 }  __attribute__ ((packed)) state;
 
 /* Save current state to SRAM */
@@ -74,6 +75,7 @@ void save_state(void)
 	char *name = filesys_get_current();
 
 	memcpy(state.settings, settings, NO_SETTINGS);
+	state.marked = marked;
 
 	fd = open("/sram/.state", O_CREAT);
 	if(fd >= 0)
@@ -132,7 +134,8 @@ int load_state(int what)
 		read(fd, &state, sizeof(state));
 		read(fd, tmp, 100);
 		close(fd);
-		filesys_cd(tmp);
+		filesys_cd_marked(tmp);
+		marked = state.marked;
 		memcpy(settings, state.settings, NO_SETTINGS);
 		/*if (settings[SF_THEME] >= theme_count)
 			settings[SF_THEME] = 0;
@@ -374,7 +377,7 @@ void update_list(void)
 		listview_addline(MainList, filetype_icon(t), &dirname[i*32], &dirsize[i*10]);
 	}
 
-	listview_set_marked(MainList, 0);
+	listview_set_marked(MainList, marked);
 
 	if(filesys_getstate() == FSTATE_SRAM)
 		pprintf(tmp, TEXT(TITLEBAR_SRAM));
@@ -391,7 +394,7 @@ static BitMap **icon_list;
 void textreader_set_font(int n, Font *f);
 
 
-void setup_screen()
+void setup_screen(void)
 {
 	char tmp[80];
 	int i, count;
@@ -593,7 +596,6 @@ int main(int argc, char **argv)
 	int converted = 0;
 	int have_state;
 	int count = 0;
-	int marked = 1;
 	int srsize = -1;
 	//uint32 *mem = (uint32 *)0x02000000;
 
@@ -672,7 +674,7 @@ int main(int argc, char **argv)
 
 	sram_fd = open("/sram", 0);
 
-	filesys_cd("");
+	filesys_cd_marked("");
 
 	read_texts(config_fp);
 	read_users(config_fp);
@@ -834,10 +836,10 @@ int main(int argc, char **argv)
 
 		case RAWKEY_B:
 			if(qualifiers == 2)
-				filesys_cd("");
+				filesys_cd_marked("");
 			else
 			if(qualifiers == 1)
-				filesys_cd("/sram");
+				filesys_cd_marked("/sram");
 			else
 				filesys_parent();
 			update_list();

diff --git a/shell2/misc.o b/shell2/misc.o
diff --git a/shell2/msgbox.o b/shell2/msgbox.o
diff --git a/shell2/pogo_visoly_xg1.elf b/shell2/pogo_visoly_xg1.elf
diff --git a/shell2/pogo_visoly_xg1.gba b/shell2/pogo_visoly_xg1.gba
diff --git a/shell2/pogo_xrom.elf b/shell2/pogo_xrom.elf
diff --git a/shell2/pogo_xrom.gba b/shell2/pogo_xrom.gba
diff --git a/shell2/rle.o b/shell2/rle.o
diff --git a/shell2/savesystem.o b/shell2/savesystem.o
diff --git a/shell2/settings.o b/shell2/settings.o
diff --git a/shell2/sram_convert.o b/shell2/sram_convert.o
diff --git a/shell2/syscall.o b/shell2/syscall.o
diff --git a/shell2/text.o b/shell2/text.o
diff --git a/shell2/users.o b/shell2/users.o
diff --git a/shell2/visoly_xg1_obj/filesys.o b/shell2/visoly_xg1_obj/filesys.o
diff --git a/shell2/visoly_xg1_obj/filetype.o b/shell2/visoly_xg1_obj/filetype.o
diff --git a/shell2/visoly_xg1_obj/main.o b/shell2/visoly_xg1_obj/main.o
diff --git a/shell2/widgets/listview.o b/shell2/widgets/listview.o
diff --git a/shell2/widgets/textbar.o b/shell2/widgets/textbar.o
diff --git a/shell2/widgets/textflow.o b/shell2/widgets/textflow.o
diff --git a/shell2/widgets/textreader.o b/shell2/widgets/textreader.o
diff --git a/shell2/widgets/tricontainer.o b/shell2/widgets/tricontainer.o
diff --git a/shell2/window.o b/shell2/window.o
diff --git a/shell2/xrom_obj/filesys.o b/shell2/xrom_obj/filesys.o
diff --git a/shell2/xrom_obj/filetype.o b/shell2/xrom_obj/filetype.o
diff --git a/shell2/xrom_obj/main.o b/shell2/xrom_obj/main.o