X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=instimg;a=blobdiff_plain;f=src%2Fmain.c;fp=src%2Fmain.c;h=12c6cedffafed962303a2bcba241162ce0daf794;hp=b49c9e32fb8d7f7400b41ac7a4586c6b27d781fd;hb=9f8f8c6cde6f5d9174aa8bc88f530436aecb70d9;hpb=5ac430128e1fa0e70e1cb232bd5d756b7e8c6abf

diff --git a/src/main.c b/src/main.c
index b49c9e3..12c6ced 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,29 +1,28 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 #include <windows.h>
 #include "widgets.h"
 #include "rawdisk.h"
 
 static struct wgt_window *win;
 static struct wgt_widget *lb_instto, *bn_inst, *bn_cancel, *cb_devs, *ck_usbonly;
+
 static struct rawdisk_device rawdev[64];
+static const char *items[64];
 static int num_rawdev;
 
+
+static void update_disks(void);
 static void onclick(struct wgt_widget *w);
 static void onmodify(struct wgt_widget *w);
 
+
 int WINAPI WinMain(HINSTANCE hinst, HINSTANCE hprevinst, char *cmdline, int showcmd)
 {
-	int i, x, y;
+	int x, y;
 	MSG msg;
-	static const char *items[64];
 
-	if((num_rawdev = rawdisk_detect(rawdev, sizeof rawdev / sizeof *rawdev)) == -1) {
-		return 1;
-	}
-	for(i=0; i<num_rawdev; i++) {
-		items[i] = rawdev[i].name;
-	}
 
 	if(!(win = wgt_window("256boss USB stick installer", 400, 300))) {
 		return 1;
@@ -31,8 +30,7 @@ int WINAPI WinMain(HINSTANCE hinst, HINSTANCE hprevinst, char *cmdline, int show
 	lb_instto = wgt_label(win, "Install to device:", 10, 10);
 
 	x = wgt_xpos_after(lb_instto, WGT_AUTO);
-	cb_devs = wgt_combo(win, items, num_rawdev, 0, x, 10, WGT_AUTOMIN(30), WGT_AUTO,
-			onmodify);
+	cb_devs = wgt_combo(win, items, num_rawdev, 0, x, 10, 200, WGT_AUTO, onmodify);
 
 	y = wgt_ypos_after(cb_devs, 16);
 	ck_usbonly = wgt_checkbox(win, "only show USB devices", 1, x, y,
@@ -44,10 +42,7 @@ int WINAPI WinMain(HINSTANCE hinst, HINSTANCE hprevinst, char *cmdline, int show
 	x = wgt_xpos_after(bn_inst, WGT_AUTO);
 	bn_cancel = wgt_button(win, "Cancel", x, y, WGT_AUTO, WGT_AUTO, onclick);
 
-	if(!num_rawdev) {
-		wgt_disable_widget(cb_devs);
-		wgt_disable_widget(bn_inst);
-	}
+	update_disks();
 
 	while(GetMessage(&msg, 0, 0, 0)) {
 		TranslateMessage(&msg);
@@ -58,9 +53,71 @@ int WINAPI WinMain(HINSTANCE hinst, HINSTANCE hprevinst, char *cmdline, int show
 	return 0;
 }
 
+static int isusbdev(struct rawdisk_device *dev)
+{
+	char *ptr = dev->path;
+	while(*ptr) {
+		int i;
+		char buf[3];
+		for(i=0; i<3; i++) {
+			buf[i] = tolower(ptr[i]);
+		}
+		if(memcmp(buf, "usb", 3) == 0) {
+			return 1;
+		}
+		ptr++;
+	}
+	return 0;
+}
+
+static void update_disks(void)
+{
+	int i;
+
+	for(i=0; i<num_rawdev; i++) {
+		free(rawdev[i].name);
+		free(rawdev[i].path);
+	}
+
+	if((num_rawdev = rawdisk_detect(rawdev, sizeof rawdev / sizeof *rawdev)) == -1) {
+		MessageBox(0, "Failed to detect storage devices!", 0, MB_OK);
+		exit(1);
+	}
+
+	if(wgt_checkbox_checked(ck_usbonly)) {
+		for(i=0; i<num_rawdev; i++) {
+			if(!isusbdev(rawdev + i)) {
+				free(rawdev[i].name);
+				free(rawdev[i].path);
+				rawdev[i] = rawdev[--num_rawdev];
+			}
+		}
+	}
+
+	for(i=0; i<num_rawdev; i++) {
+		items[i] = rawdev[i].name;
+	}
+
+	wgt_combo_setitems(cb_devs, items, num_rawdev);
+
+	if(num_rawdev) {
+		wgt_enable_widget(cb_devs);
+		wgt_enable_widget(bn_inst);
+	} else {
+		wgt_disable_widget(cb_devs);
+		wgt_disable_widget(bn_inst);
+	}
+}
+
 static void onclick(struct wgt_widget *w)
 {
-	MessageBox(0, "clicked", "clicked", MB_OK);
+	if(w == bn_inst) {
+		MessageBox(0, "clicked", "clicked", MB_OK);
+	} else if(w == bn_cancel) {
+		PostQuitMessage(0);
+	} else if(w == ck_usbonly) {
+		update_disks();
+	}
 }
 
 static void onmodify(struct wgt_widget *w)