From 96525edaae6e1fb076b4286fdd41032dafff651c Mon Sep 17 00:00:00 2001 From: ftrvxmtrx Date: Sat, 13 Dec 2014 21:58:49 +0100 Subject: [PATCH] various cmds: replace magic numbers with Kdel/Keof, etc --- sys/src/cmd/aux/statusbar.c | 3 ++- sys/src/cmd/aux/statusmsg.c | 3 ++- sys/src/cmd/histogram.c | 2 +- sys/src/cmd/jpg/bmp.c | 3 ++- sys/src/cmd/jpg/gif.c | 3 ++- sys/src/cmd/jpg/jpg.c | 3 ++- sys/src/cmd/jpg/png.c | 3 ++- sys/src/cmd/jpg/ppm.c | 3 ++- sys/src/cmd/jpg/tga.c | 3 ++- sys/src/cmd/jpg/tif.c | 3 ++- sys/src/cmd/jpg/v210.c | 3 ++- sys/src/cmd/jpg/yuv.c | 3 ++- sys/src/cmd/kbmap.c | 3 ++- sys/src/cmd/lens.c | 5 +++-- sys/src/cmd/plot/plot.c | 4 ++-- sys/src/cmd/spred/cmdw.c | 2 +- sys/src/cmd/vnc/kbdv.c | 4 ++-- sys/src/cmd/winwatch.c | 3 ++- 18 files changed, 35 insertions(+), 21 deletions(-) diff --git a/sys/src/cmd/aux/statusbar.c b/sys/src/cmd/aux/statusbar.c index be3314af1..17cfd84e3 100644 --- a/sys/src/cmd/aux/statusbar.c +++ b/sys/src/cmd/aux/statusbar.c @@ -3,6 +3,7 @@ #include #include #include +#include int newwin(char*); @@ -135,7 +136,7 @@ bar(Biobuf *b) case 0: sleep(1000); while(!die && (k = eread(Ekeyboard|Emouse, &e))) { - if(nokill==0 && k == Ekeyboard && (e.kbdc == 0x7F || e.kbdc == 0x03)) { /* del, ctl-c */ + if(nokill==0 && k == Ekeyboard && (e.kbdc == Kdel || e.kbdc == Ketx)) { die = 1; postnote(PNPROC, parent, "interrupt"); _exits("interrupt"); diff --git a/sys/src/cmd/aux/statusmsg.c b/sys/src/cmd/aux/statusmsg.c index d98446d89..7f7fef2fc 100644 --- a/sys/src/cmd/aux/statusmsg.c +++ b/sys/src/cmd/aux/statusmsg.c @@ -3,6 +3,7 @@ #include #include #include +#include int newwin(char*); @@ -77,7 +78,7 @@ msg(Biobuf *b) case 0: sleep(1000); while(!die && (k = eread(Ekeyboard|Emouse, &e))) { - if(nokill==0 && k == Ekeyboard && (e.kbdc == 0x7F || e.kbdc == 0x03)) { /* del, ctl-c */ + if(nokill==0 && k == Ekeyboard && (e.kbdc == Kdel || e.kbdc == Ketx)) { die = 1; postnote(PNPROC, parent, "interrupt"); _exits("interrupt"); diff --git a/sys/src/cmd/histogram.c b/sys/src/cmd/histogram.c index 3de1950fb..3fe5a160c 100644 --- a/sys/src/cmd/histogram.c +++ b/sys/src/cmd/histogram.c @@ -251,7 +251,7 @@ histogram(char *rect) goto done; break; case 2: - if(km == 0x7F) + if(km == Kdel) goto done; break; case 3: diff --git a/sys/src/cmd/jpg/bmp.c b/sys/src/cmd/jpg/bmp.c index c1775b71e..1df48bca0 100644 --- a/sys/src/cmd/jpg/bmp.c +++ b/sys/src/cmd/jpg/bmp.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "imagefile.h" int cflag = 0; @@ -186,7 +187,7 @@ show(int fd, char *name) } image = i; eresized(0); - if((ch=ekbd())=='q' || ch==0x7F || ch==0x04) + if((ch=ekbd())=='q' || ch==Kdel || ch==Keof) exits(nil); draw(screen, screen->clipr, display->white, nil, ZP); image = nil; diff --git a/sys/src/cmd/jpg/gif.c b/sys/src/cmd/jpg/gif.c index 235a9dce1..228fb2637 100644 --- a/sys/src/cmd/jpg/gif.c +++ b/sys/src/cmd/jpg/gif.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "imagefile.h" int cflag = 0; @@ -382,7 +383,7 @@ show(int fd, char *name) dt = 50; while(n==1 || ecankbd()){ /* an odd, democratic list */ - if((ch=ekbd())=='q' || ch==0x7F || ch==0x04) + if((ch=ekbd())=='q' || ch==Kdel || ch==Keof) exits(nil); if(ch == '\n') goto Out; diff --git a/sys/src/cmd/jpg/jpg.c b/sys/src/cmd/jpg/jpg.c index cf1eb4127..4bc9cf4bc 100644 --- a/sys/src/cmd/jpg/jpg.c +++ b/sys/src/cmd/jpg/jpg.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "imagefile.h" int cflag = 0; @@ -321,7 +322,7 @@ rpt: array = Breadjpg(&b, colorspace); free(array); goto rpt; } - if((ch=ekbd())=='q' || ch==0x7F || ch==0x04) + if((ch=ekbd())=='q' || ch==Kdel || ch==Keof) exits(nil); draw(screen, screen->clipr, display->white, nil, ZP); image = nil; diff --git a/sys/src/cmd/jpg/png.c b/sys/src/cmd/jpg/png.c index cf8803e87..d3e27c21a 100644 --- a/sys/src/cmd/jpg/png.c +++ b/sys/src/cmd/jpg/png.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "imagefile.h" extern int debug; @@ -198,7 +199,7 @@ show(int fd, char *name, int outc) draw(i2, i2->r, i, nil, i->r.min); image = i2; eresized(0); - if((ch=ekbd())=='q' || ch==0x7F || ch==0x04) + if((ch=ekbd())=='q' || ch==Kdel || ch==Keof) exits(nil); draw(screen, screen->clipr, display->white, nil, ZP); image = nil; diff --git a/sys/src/cmd/jpg/ppm.c b/sys/src/cmd/jpg/ppm.c index 89945ae63..86a6b9193 100644 --- a/sys/src/cmd/jpg/ppm.c +++ b/sys/src/cmd/jpg/ppm.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "imagefile.h" int cflag = 0; @@ -183,7 +184,7 @@ show(int fd, char *name) } image = i; eresized(0); - if((ch=ekbd())=='q' || ch==0x7F || ch==0x04) + if((ch=ekbd())=='q' || ch==Kdel || ch==Keof) exits(nil); draw(screen, screen->clipr, display->white, nil, ZP); image = nil; diff --git a/sys/src/cmd/jpg/tga.c b/sys/src/cmd/jpg/tga.c index a505792fb..9655f2f5a 100644 --- a/sys/src/cmd/jpg/tga.c +++ b/sys/src/cmd/jpg/tga.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "imagefile.h" int cflag = 0; @@ -189,7 +190,7 @@ show(int fd, char *name) } image = i; eresized(0); - if((ch=ekbd())=='q' || ch==0x7F || ch==0x04) + if((ch=ekbd())=='q' || ch==Kdel || ch==Keof) exits(nil); draw(screen, screen->clipr, display->white, nil, ZP); image = nil; diff --git a/sys/src/cmd/jpg/tif.c b/sys/src/cmd/jpg/tif.c index 9f7bc8a60..7be1a5f3f 100644 --- a/sys/src/cmd/jpg/tif.c +++ b/sys/src/cmd/jpg/tif.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "imagefile.h" int cflag = 0; @@ -220,7 +221,7 @@ show(int fd, char *name, int outchan) image = i; eresized(0); ch = ekbd(); - if(ch == 'q' || ch == 0x7f || ch == 0x04) + if(ch == 'q' || ch == Kdel || ch == Keof) exits(nil); draw(screen, screen->clipr, display->white, nil, ZP); diff --git a/sys/src/cmd/jpg/v210.c b/sys/src/cmd/jpg/v210.c index 65f5ff5de..619b5a20d 100644 --- a/sys/src/cmd/jpg/v210.c +++ b/sys/src/cmd/jpg/v210.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "imagefile.h" int cflag = 0; @@ -186,7 +187,7 @@ show(int fd, char *name) } image = i; eresized(0); - if((ch=ekbd())=='q' || ch==0x7F || ch==0x04) + if((ch=ekbd())=='q' || ch==Kdel || ch==Keof) exits(nil); draw(screen, screen->clipr, display->white, nil, ZP); image = nil; diff --git a/sys/src/cmd/jpg/yuv.c b/sys/src/cmd/jpg/yuv.c index 47811ab22..aca122b00 100644 --- a/sys/src/cmd/jpg/yuv.c +++ b/sys/src/cmd/jpg/yuv.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "imagefile.h" int cflag = 0; @@ -186,7 +187,7 @@ show(int fd, char *name) } image = i; eresized(0); - if((ch=ekbd())=='q' || ch==0x7F || ch==0x04) + if((ch=ekbd())=='q' || ch==Kdel || ch==Keof) exits(nil); draw(screen, screen->clipr, display->white, nil, ZP); image = nil; diff --git a/sys/src/cmd/kbmap.c b/sys/src/cmd/kbmap.c index 03f9a40da..c621edc39 100644 --- a/sys/src/cmd/kbmap.c +++ b/sys/src/cmd/kbmap.c @@ -2,6 +2,7 @@ #include #include #include +#include typedef struct KbMap KbMap; struct KbMap { @@ -245,7 +246,7 @@ main(int argc, char **argv) for(;;){ switch(eread(Emouse|Ekeyboard, &e)){ case Ekeyboard: - if(e.kbdc==0x7F || e.kbdc=='q') + if(e.kbdc==Kdel || e.kbdc=='q') exits(0); break; case Emouse: diff --git a/sys/src/cmd/lens.c b/sys/src/cmd/lens.c index 5d2619917..c1cb5a5e5 100644 --- a/sys/src/cmd/lens.c +++ b/sys/src/cmd/lens.c @@ -2,6 +2,7 @@ #include #include #include +#include enum { Edge = 5, @@ -109,8 +110,8 @@ main(int argc, char *argv[]) case Ekeyboard: switch(e.kbdc){ case 'q': - case 0x7f: - case '\04': + case Kdel: + case Keof: caseexit: exits(nil); case '=': diff --git a/sys/src/cmd/plot/plot.c b/sys/src/cmd/plot/plot.c index 3633750ae..a7341c4e4 100644 --- a/sys/src/cmd/plot/plot.c +++ b/sys/src/cmd/plot/plot.c @@ -210,8 +210,8 @@ mouseproc(void*) case Akbd: switch(r){ case 'q': - case 0x7f: - case 0x04: + case Kdel: + case Keof: threadexitsall(""); } break; diff --git a/sys/src/cmd/spred/cmdw.c b/sys/src/cmd/spred/cmdw.c index 1f98ec51f..63445be2d 100644 --- a/sys/src/cmd/spred/cmdw.c +++ b/sys/src/cmd/spred/cmdw.c @@ -195,7 +195,7 @@ cmdkey(Win *w, Rune r) cmddel(w, w->toprune + w->fr.p0, w->toprune + w->fr.p1); switch(r){ case 0x00: - case 0x1b: + case Kesc: break; case '\b': if(w->fr.p0 > 0 && w->toprune + w->fr.p0 != w->opoint) diff --git a/sys/src/cmd/vnc/kbdv.c b/sys/src/cmd/vnc/kbdv.c index acd58ec44..5dd4e1eae 100644 --- a/sys/src/cmd/vnc/kbdv.c +++ b/sys/src/cmd/vnc/kbdv.c @@ -18,9 +18,9 @@ static struct { {'\n', 0xff0d}, /* {0x0b, 0xff0b}, */ {'\r', 0xff0d}, - {0x1b, 0xff1b}, /* escape */ + {Kesc, 0xff1b}, {Kins, 0xff63}, - {0x7F, 0xffff}, + {Kdel, 0xffff}, {Khome, 0xff50}, {Kend, 0xff57}, {Kpgup, 0xff55}, diff --git a/sys/src/cmd/winwatch.c b/sys/src/cmd/winwatch.c index c86ff7a66..8a68f1d58 100644 --- a/sys/src/cmd/winwatch.c +++ b/sys/src/cmd/winwatch.c @@ -3,6 +3,7 @@ #include #include #include +#include enum { VISIBLE = 1, @@ -318,7 +319,7 @@ main(int argc, char **argv) for(;;){ switch(eread(Emouse|Ekeyboard|Etimer, &e)){ case Ekeyboard: - if(e.kbdc==0x7F || e.kbdc=='q') + if(e.kbdc==Kdel || e.kbdc=='q') exits(0); break; case Emouse: