xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

handle initdraw errors

Browse source
This commit is contained in:
cinap_lenrek 2011-12-10 23:01:15 +01:00
parent 92874574e4
commit 4dd4213677
8 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/src/cmd/kbmap.c
View file

@ -229,7 +229,10 @@ main(int argc, char **argv)
} else } else
init(); init();
initdraw(0, 0, "kbmap"); if(initdraw(0, 0, "kbmap") < 0){
fprint(2, "kbmap: initdraw failed: %r\n");
exits("initdraw");
}
lightblue = allocimagemix(display, DPalebluegreen, DWhite); lightblue = allocimagemix(display, DPalebluegreen, DWhite);
if(lightblue == nil) if(lightblue == nil)
sysfatal("allocimagemix: %r"); sysfatal("allocimagemix: %r");

4
sys/src/cmd/mothra/mothra.c
View file

@ -292,8 +292,8 @@ void main(int argc, char *argv[]){
close(errfile); close(errfile);
} }
logfile=mkmfile("mothra.log", 0666|DMAPPEND); logfile=mkmfile("mothra.log", 0666|DMAPPEND);
if(initdraw(err, 0, "mothra") < 0)
initdraw(err,0,"mothra"); sysfatal("initdraw: %r");
display->locking = 1; display->locking = 1;
chrwidth=stringwidth(font, "0"); chrwidth=stringwidth(font, "0");
pltabsize(chrwidth, 8*chrwidth); pltabsize(chrwidth, 8*chrwidth);

2
sys/src/cmd/mug.c
View file

@ -1041,7 +1041,7 @@ main(int argc, char **argv)
fd = 0; fd = 0;
if (initdraw(0, 0, "mug") < 0) if (initdraw(0, 0, "mug") < 0)
sysfatal("initdraw failed"); sysfatal("initdraw failed: %r");
if((orig = readimage(display, fd, 0)) == nil) if((orig = readimage(display, fd, 0)) == nil)
sysfatal("readimage: %r"); sysfatal("readimage: %r");

3
sys/src/cmd/page.c
View file

@ -1228,7 +1228,8 @@ main(int argc, char *argv[])
sysfatal("newwindow: %r"); sysfatal("newwindow: %r");
free(s); free(s);
} }
initdraw(drawerr, nil, argv0); if(initdraw(drawerr, nil, argv0) < 0)
sysfatal("initdraw: %r");
paper = display->white; paper = display->white;
frame = display->black; frame = display->black;
ground = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x777777FF); ground = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x777777FF);

6
sys/src/cmd/paint.c
View file

@ -43,7 +43,11 @@ main()
char file[128]; char file[128];
haslast = 0; haslast = 0;
initdraw(0, 0, 0); if(initdraw(0, 0, "paint") < 0){
fprint(2, "paint: initdraw failed: %r\n");
exits("initdraw");
}
einit(Emouse | Ekeyboard); einit(Emouse | Ekeyboard);
draw(screen, screen->r, display->white, 0, ZP); draw(screen, screen->r, display->white, 0, ZP);
flushimage(display, 1); flushimage(display, 1);

5
sys/src/cmd/vnc/rlist.c
View file

@ -273,7 +273,10 @@ void main(int argc, char * argv[])
Rectangle r3 = Rect(200, 100, 500, 300); Rectangle r3 = Rect(200, 100, 500, 300);
Region reg; Region reg;
initdraw(0, 0, "vncviewer"); if(initdraw(0, 0, "vncviewer") < 0){
fprint(2, "%s: initdraw failed: %r\n", argv[0]);
exits("initdraw");
}
region_init(&reg); region_init(&reg);
region_union(&reg, r1, r1); region_union(&reg, r1, r1);
region_union(&reg, r2, r2); region_union(&reg, r2, r2);

3
sys/src/cmd/vnc/vncv.c
View file

@ -132,7 +132,8 @@ main(int argc, char **argv)
if(vncstart(vnc, shared) < 0) if(vncstart(vnc, shared) < 0)
sysfatal("init failure: %r"); sysfatal("init failure: %r");
initdraw(0, 0, "vncv"); if(initdraw(0, 0, "vncv") < 0)
sysfatal("initdraw: %r");
display->locking = 1; display->locking = 1;
unlockdisplay(display); unlockdisplay(display);

7
sys/src/cmd/winwatch.c
View file

@ -262,15 +262,12 @@ main(int argc, char **argv)
if(argc) if(argc)
usage(); usage();
initdraw(0, 0, "winwatch"); if(initdraw(0, fontname, "winwatch") < 0)
sysfatal("initdraw: %r");
lightblue = allocimagemix(display, DPalebluegreen, DWhite); lightblue = allocimagemix(display, DPalebluegreen, DWhite);
if(lightblue == nil) if(lightblue == nil)
sysfatal("allocimagemix: %r"); sysfatal("allocimagemix: %r");
if(fontname)
if((font = openfont(display, fontname)) == nil)
sysfatal("font '%s' not found", fontname);
refreshwin(); refreshwin();
redraw(screen, 1); redraw(screen, 1);
einit(Emouse|Ekeyboard); einit(Emouse|Ekeyboard);