Removed some debugging prints. Fixed problem where cursor would occasionally be drawn in the upper left (origin) by mistake.

John Floren committed 15 years ago

Commit 2b75c6d1 parent 9fedd644 files · +68 −14Browse files

Unified · Split

4 files

emu/Linux/errstr.h +65 −0
emu/Linux/screen.c +0 −12
emu/port/devpointer.c +1 −1
mkfiles/mkfile-Linux-arm +2 −1

@@ -0,0 +1,65 @@
	1	char Enoerror[] = "no error";
	2	char Emount[] = "inconsistent mount";
	3	char Eunmount[] = "not mounted";
	4	char Eunion[] = "not in union";
	5	char Emountrpc[] = "mount rpc error";
	6	char Eshutdown[] = "mounted device shut down";
	7	char Eowner[] = "not owner";
	8	char Eunknown[] = "unknown user or group id";
	9	char Enocreate[] = "mounted directory forbids creation";
	10	char Enonexist[] = "file does not exist";
	11	char Eexist[] = "file already exists";
	12	char Ebadsharp[] = "unknown device in # filename";
	13	char Enotdir[] = "not a directory";
	14	char Eisdir[] = "file is a directory";
	15	char Ebadchar[] = "bad character in file name";
	16	char Efilename[] = "file name syntax";
	17	char Eperm[] = "permission denied";
	18	char Ebadusefd[] = "inappropriate use of fd";
	19	char Ebadarg[] = "bad arg in system call";
	20	char Einuse[] = "device or object already in use";
	21	char Eio[] = "i/o error";
	22	char Etoobig[] = "read or write too large";
	23	char Etoosmall[] = "read or write too small";
	24	char Enetaddr[] = "bad network address";
	25	char Emsgsize[] = "message is too big for protocol";
	26	char Enetbusy[] = "network device is busy or allocated";
	27	char Enoproto[] = "network protocol not supported";
	28	char Enoport[] = "network port not available";
	29	char Enoifc[] = "bad interface or no free interface slots";
	30	char Enolisten[] = "not announced";
	31	char Ehungup[] = "i/o on hungup channel";
	32	char Ebadctl[] = "bad process or channel control request";
	33	char Enodev[] = "no free devices";
	34	char Enoenv[] = "no free environment resources";
	35	char Ethread[] = "thread exited";
	36	char Enochild[] = "no living children";
	37	char Eioload[] = "i/o error in demand load";
	38	char Enovmem[] = "out of memory: virtual memory";
	39	char Ebadld[] = "illegal line discipline";
	40	char Ebadfd[] = "fd out of range or not open";
	41	char Eisstream[] = "seek on a stream";
	42	char Ebadexec[] = "exec header invalid";
	43	char Etimedout[] = "connection timed out";
	44	char Econrefused[] = "connection refused";
	45	char Econinuse[] = "connection in use";
	46	char Enetunreach[] = "network unreachable";
	47	char Eintr[] = "interrupted";
	48	char Enomem[] = "out of memory: kernel";
	49	char Esfnotcached[] = "subfont not cached";
	50	char Esoverlap[] = "segments overlap";
	51	char Emouseset[] = "mouse type already set";
	52	char Eshort[] = "i/o count too small";
	53	char Enobitstore[] = "out of screen memory";
	54	char Egreg[] = "jim'll fix it";
	55	char Ebadspec[] = "bad attach specifier";
	56	char Estopped[] = "thread must be stopped";
	57	char Enoattach[] = "mount/attach disallowed";
	58	char Eshortstat[] = "stat buffer too small";
	59	char Enegoff[] = "negative i/o offset";
	60	char Ebadstat[] = "malformed stat buffer";
	61	char Ecmdargs[] = "wrong #args in control message";
	62	char Enofd[] = "no free file descriptors";
	63	char Enoctl[] = "unknown control request";
	64
	65	void error(char*);

emu/Linux/screen.c+0−12

 				}
 				break;
 			case EV_SYN:
-				print("touch = %d, b = %d, lastb = %d\n", touch, b, lastb);
 				if (i == 2) {
-					print("just moving\n");
 					mousetrack(b, x, y, 0);
 				} else if (i > 2 && touch) {
-					print("clicky\n");
 					mousetrack(b, x, y, 0);
 				} else if (!touch && lastb) {
-					print("unclicky\n");
 					mousetrack(b, x, y, 0);
 				}
 //				if (i==2 && p>0)		// motion
       if ((rd = read (eventfd, ev, sizeof(ev))) < size)
           //perror_exit ("read()");
 	print("gaaack\n");
-      //value = ev[0].value;
-      for (i = 0; i < rd / size; i++) {
-      	print("Type = %d, Code = %d, Value = %d\n", ev[i].type, (ev[i].code), ev[i].value);
-      }
-	print("read rd/size = %d\n", rd / size);
 	touchscreen(ev, (rd / size));
   }
 }

emu/port/devpointer.c+1−1

@@ -275,7 +275,7 @@ pointerwrite(Chan* c, void* va, long n, vlong off) · 274 unmodified lines
275	if(n == 0){	275	if(n == 0){
276	cur.data = nil;	276	cur.data = nil;
277	//drawcursor(&cur);	277	//drawcursor(&cur);
278	drawPointer(cur.hotx, cur.hoty);	278	//drawPointer(cur.hotx, cur.hoty);
279	break;	279	break;
280	}	280	}
281	if(n < 8)	281	if(n < 8)

mkfiles/mkfile-Linux-arm+2−1

@@ -15,7 +15,8 @@ CC= agcc -c · 14 unmodified lines
15	CFLAGS= -O\	15	CFLAGS= -O\
16	-I$ROOT/Linux/arm/include\	16	-I$ROOT/Linux/arm/include\
17	-I$ROOT/include\	17	-I$ROOT/include\
18	-DLINUX_ARM	18	-DLINUX_ARM\
		19	-DINFERNO
19		20
20	ANSICPP=	21	ANSICPP=
21	LD= agcc	22	LD= agcc