kernel: keep segment locked for data2txt

[plan9front.git] / sys / src / cmd / winwatch.c

diff --git a/sys/src/cmd/winwatch.c b/sys/src/cmd/winwatch.c
old mode 100755 (executable)
new mode 100644 (file)
index 0f5a9c4..6819108
--- a/sys/src/cmd/winwatch.c
+++ b/sys/src/cmd/winwatch.c
@@ -20,7 +20,6 @@ int nwin;
 int mwin;
 int onwin;
 int rows, cols;
-Font *font;
 Image *lightblue;
 
 enum {
@@ -243,11 +242,10 @@ usage(void)
 void
 main(int argc, char **argv)
 {
-       char *fontname;
+       char *fontname = nil;
        int Etimer;
        Event e;
 
-       fontname = "/lib/font/bit/lucidasans/unicode.8.font";
        ARGBEGIN{
        case 'f':
                fontname = EARGF(usage());
@@ -264,12 +262,11 @@ main(int argc, char **argv)
        if(argc)
                usage();
 
-       initdraw(0, 0, "winwatch");
+       if(initdraw(0, fontname, "winwatch") < 0)
+               sysfatal("initdraw: %r");
        lightblue = allocimagemix(display, DPalebluegreen, DWhite);
        if(lightblue == nil)
                sysfatal("allocimagemix: %r");
-       if((font = openfont(display, fontname)) == nil)
-               sysfatal("font '%s' not found", fontname);
 
        refreshwin();
        redraw(screen, 1);