sync with sources, and don't use "syms" use scribble.acid$O Reference: /n/atom/patch/applied2013/grafitticlean Date: Wed Jun 19 16:16:57 CES 2013 Signed-off-by: quanstro@quanstro.net --- /sys/src/libscribble/mkfile Wed Jun 19 16:16:37 2013 +++ /sys/src/libscribble/mkfile Wed Jun 19 16:16:37 2013 @@ -19,12 +19,14 @@ ${OFILES:%.$O=%.c}\ ${LIB:/$objtype/%=/386/%}\ -all:V: $LIB syms +CLEANFILES= + +all:V: $LIB < /sys/src/cmd/mksyslib -syms: $HFILES - $CC -a li_recognizer.c >syms +scribble.acid$O: $HFILES + $CC -a li_recognizer.c >scribble.acid$O graffiti.$O: scribbleimpl.h graffiti.h hre_api.$O: scribbleimpl.h hre_internal.h --- /sys/src/libscribble/graffiti.c Wed Jun 19 16:16:38 2013 +++ /sys/src/libscribble/graffiti.c Wed Jun 19 16:16:39 2013 @@ -58,18 +58,18 @@ if (c != -1) delete_rec_alternative_array(nr, ret, false); - rune = L'\0'; + rune = '\0'; switch (c) { case '\0': if(ScribbleDebug)fprint(2, "(case '\\0')\n"); break; case 'A': /* space */ - rune = L' '; + rune = ' '; if(ScribbleDebug)fprint(2, "(case A) character = ' %C' (0x%x)\n", rune, rune); break; case 'B': /* backspace */ - rune = L'\b'; + rune = '\b'; if(ScribbleDebug)fprint(2, "(case B) character = \\b (0x%x)\n", rune); break; case 'N': /* numlock */ @@ -90,7 +90,7 @@ s->puncShift = 0; break; case 'R': /* newline */ - rune = L'\n'; + rune = '\n'; if(ScribbleDebug)fprint(2, "(case R) character = \\n (0x%x)\n", rune); break; case 'S': /* shift */ @@ -120,23 +120,26 @@ s->tmpShift = 0; return rune; } - rune = L'.'; + rune = '.'; if(0)fprint(2, "(case .) character = %c (0x%x)\n", rune, rune); break; default: - if (L'A' <= c && c <= L'Z') { + if ('A' <= c && c <= 'Z') { if(ScribbleDebug)fprint(2, "(bad case?) character = %c (0x%x)\n", c, c); return rune; } rune = c; - if (s->ctrlShift) { - if (c < L'a' || L'z' < c){ + if (s->ctrlShift) + { + if (c < 'a' || 'z' < c) + { if(ScribbleDebug)fprint(2, "(default) character = %c (0x%x)\n", rune, rune); return rune; } rune = rune & 0x1f; } else if ((s->capsLock && !s->tmpShift) || - (!s->capsLock && s->tmpShift)) { + (!s->capsLock && s->tmpShift)) + { if (rune < 0xff) rune = toupper(rune); }