@@ -1,2 +1,2 @@
1	#! /system/xbin/bash	1	#! /system/xbin/bash
2	echo "wm/wm" \| /data/inferno/Linux/arm/bin/emu-g	2	echo "wm/wm" \| /data/inferno/Android/arm/bin/emu-g

appl/wm/sms.b+53−1

@@ -83,6 +83,7 @@ init(ctxt: ref Draw->Context, nil: list of string) · 82 unmodified lines
83	tk->cmd(t, conv_window[i]);	83	tk->cmd(t, conv_window[i]);
84		84
85	convs := loadconvos();	85	convs := loadconvos();
		86	tk->cmd(t, ".f.lb insert end New");
86	for (; convs != nil; convs = tl convs)	87	for (; convs != nil; convs = tl convs)
87	tk->cmd(t, ".f.lb insert end '"+ hd convs);	88	tk->cmd(t, ".f.lb insert end '"+ hd convs);
88		89
@@ -110,7 +111,10 @@ init(ctxt: ref Draw->Context, nil: list of string) · 21 unmodified lines
110	sys->print("read %s\n", u);	111	sys->print("read %s\n", u);
111	if (u != nil) {	112	if (u != nil) {
112	#break;	113	#break;
113	spawn readthread(ctxt, u);	114	if (u == "New")
		115	spawn newmsg(ctxt);
		116	else
		117	spawn readthread(ctxt, u);
114	}	118	}
115	tk->cmd(t, ".f.lb selection clear 0");	119	tk->cmd(t, ".f.lb selection clear 0");
116	}	120	}
@@ -125,6 +129,53 @@ init(ctxt: ref Draw->Context, nil: list of string) · 8 unmodified lines
125	}	129	}
126	}	130	}
127		131
		132	newmsg(ctxt: ref Draw->Context)
		133	{
		134	(t, wmchan) := tkclient->toplevel(ctxt, nil, "New message", 0);
		135	cmd := chan of string;
		136	tk->namechan(t, cmd, "cmd");
		137
		138	tk->cmd(t, "frame .f");
		139	tk->cmd(t, "label .f.l -font /fonts/lucida/unicode.12.font -text {Enter Number}");
		140	tk->cmd(t, "entry .f.e -font /fonts/lucida/unicode.12.font");
		141	tk->cmd(t, "button .f.b -text {Ok} -font /fonts/lucida/unicode.12.font -command {send cmd ok}");
		142	tk->cmd(t, "pack .f.l .f.e .f.b -in .f");
		143	tk->cmd(t, "pack .f");
		144	tk->cmd(t, ".pack propagate . 0");
		145	tk->cmd(t, "update");
		146	tkclient->onscreen(t, "onscreen");
		147
		148	tkclient->startinput(t, "kbd"::"ptr"::nil);
		149	for (;;) {
		150	alt {
		151	s := <-t.ctxt.kbd =>
		152	tk->keyboard(t, s);
		153	s := <-t.ctxt.ptr =>
		154	tk->pointer(t, *s);
		155	s := <-t.ctxt.ctl or
		156	s = <-t.wreq or
		157	s = <-wmchan =>
		158	tkclient->wmctl(t, s);
		159	s := <-cmd =>
		160	sys->print("read %s\n", s);
		161	if (s == "ok") {
		162	num := tk->cmd(t, ".f.e get");
		163	sys->print("number: %s\n", num);
		164
		165	filename := "/usr/"+rf("/dev/user")+"/lib/sms/"+num;
		166
		167	(ret, dir) := sys->stat(filename);
		168	if (ret == -1) {
		169	fd := sys->create(filename, Sys->OWRITE, 8r770);
		170	#fd.close(fd);
		171	}
		172	spawn readthread(ctxt, num);
		173	return;
		174	}
		175	}
		176	}
		177	}
		178
128	# We spawn a new window so we could, theoretically, minimize this	179	# We spawn a new window so we could, theoretically, minimize this
129	# and go open a new thread to read at the same time.	180	# and go open a new thread to read at the same time.
130	readthread(ctxt: ref Draw->Context, u: string)	181	readthread(ctxt: ref Draw->Context, u: string)
@@ -216,6 +267,7 @@ convupdater(t: ref Tk->Toplevel, pid: chan of int) · 85 unmodified lines
216	if (dirstat.mtime > lastmtime) {	267	if (dirstat.mtime > lastmtime) {
217	convs := loadconvos();	268	convs := loadconvos();
218	tk->cmd(t, ".f.lb delete 0 end");	269	tk->cmd(t, ".f.lb delete 0 end");
		270	tk->cmd(t, ".f.lb insert end New");
219	for (; convs != nil; convs = tl convs)	271	for (; convs != nil; convs = tl convs)
220	tk->cmd(t, ".f.lb insert end '"+ hd convs);	272	tk->cmd(t, ".f.lb insert end '"+ hd convs);
221	tk->cmd(t, "update");	273	tk->cmd(t, "update");

emu/Android/emu-g.c+0−1

@@ -88,5 +88,4 @@ void modinit(void){ · 87 unmodified lines
88		88
89	int dontcompile = 1;	89	int dontcompile = 1;
90	char* conffile = "emu-g";	90	char* conffile = "emu-g";
91	#define KERNDATE 0
92	ulong kerndate = KERNDATE;	91	ulong kerndate = KERNDATE;

emu/Android/os.c+1−1

@@ -34,7 +34,7 @@ enum · 33 unmodified lines
34	NSTACKSPERALLOC = 16,	34	NSTACKSPERALLOC = 16,
35	X11STACK= 256*1024	35	X11STACK= 256*1024
36	};	36	};
37	char *hosttype = "Linux";	37	char *hosttype = "Android";
38		38
39	extern void unlockandexit(int*);	39	extern void unlockandexit(int*);
40	extern void executeonnewstack(void, void (f)(void), void);	40	extern void executeonnewstack(void, void (f)(void), void);

emu/Android/osp.c+1−1

@@ -30,7 +30,7 @@ enum · 29 unmodified lines
30	NSTACKSPERALLOC = 16,	30	NSTACKSPERALLOC = 16,
31	X11STACK= 256*1024	31	X11STACK= 256*1024
32	};	32	};
33	char *hosttype = "Linux";	33	char *hosttype = "Android";
34		34
35	typedef sem_t Sem;	35	typedef sem_t Sem;
36		36

emu/port/dat.h+8−4

 extern	Queue*	gkscanq;
 extern	int	Xsize;
 extern	int	Ysize;
-extern  int     rotation_opt;
-extern  char    **eventfiles;
-extern  int     eventfds[MAX_EVENTFDS];
-extern  Queue   *eventq;
 extern	Pool*	mainmem;
 extern	char	rootdir[MAXROOT];		/* inferno root */
 extern	Procs	procs;
 extern	int	greyscale;
 extern	uint	qiomaxatomic;
 extern	int	displaydepth;
+// Android stuff
+extern  char    **eventfiles;
+extern  int     eventfds[MAX_EVENTFDS];
+extern  Queue   *eventq;
+#ifdef ANDROID
+extern  int     rotation_opt;
 extern	char*	mousefile;
 extern	char	type;
 extern	int	maineventnum;
 extern	char*	homedevice;
 extern	char*	voldevice;
+#endif
 /*
  * floating point control and status register masks

emu/port/main.c+13−8

 #include	"draw.h"
 #include	"version.h"
-/* Android thing */
+#ifdef ANDROID
 #include <cutils/properties.h>
+#endif
 int		rebootargc = 0;
 char**		rebootargv;
 extern	char*	hosttype;
 char*	tkfont;	/* for libtk/utils.c */
 int	tkstylus;	/* libinterp/tk.c */
-char*	mousefile = "/dev/input/event0";
-char	type = 's';
-int	maineventnum = 5;
-char*	homedevice = "/dev/input/event5";
-char*	voldevice = "/dev/input/event2";
-char    **eventfiles = NULL;
 extern	int	mflag;
 	int	dflag;
 	int vflag;
 	int	displaydepth;
 char *cputype;
+#ifdef ANDROID
+char*	mousefile = "/dev/input/event0";
+char	type = 's';
+int	maineventnum = 5;
+char*	homedevice = "/dev/input/event5";
+char*	voldevice = "/dev/input/event2";
+#endif
+char    **eventfiles = NULL;
 static void
 usage(void)
 {
 	}
 	option(argc, argv, usage);
+#ifdef ANDROID
 	/* Set up Android-specific things */
-	/* This will definitely need to be factored out later */
 	tkfont = "/fonts/pelm/ascii.12.font";
 	property_get("ro.product.device", device, "");
 	print("read ro.product.device = %s\n", device);
 		voldevice = "/dev/input/event0";
 		maineventnum = 0;
 	}
+#endif
 	eve = strdup("inferno");

usr/root/lib/sms/.hgplaceholder+0−0

Empty file deleted.