summaryrefslogtreecommitdiff
path: root/acme/bin/source/win/main.c
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2016-06-30 00:46:52 +0200
committercinap_lenrek <cinap_lenrek@felloff.net>2016-06-30 00:46:52 +0200
commit828ec57d652618e1d9cecb8fb6cc588afc063dca (patch)
tree76720c72de4a127f75463fd9a73bec8668f4e081 /acme/bin/source/win/main.c
parent65977417e7cc5919f7c9787f97a528e8c24d2423 (diff)
downloadplan9front-828ec57d652618e1d9cecb8fb6cc588afc063dca.tar.xz
acme/win: implement /dev/wdir file in win to change directory tagline, remove awd
Diffstat (limited to 'acme/bin/source/win/main.c')
-rw-r--r--acme/bin/source/win/main.c27
1 files changed, 12 insertions, 15 deletions
diff --git a/acme/bin/source/win/main.c b/acme/bin/source/win/main.c
index 916f2b05f..214356a48 100644
--- a/acme/bin/source/win/main.c
+++ b/acme/bin/source/win/main.c
@@ -16,6 +16,8 @@ int notepg;
int eraseinput;
int dirty = 0;
+char *wname;
+char *wdir;
Window *win; /* the main window */
void
@@ -29,7 +31,6 @@ void
threadmain(int argc, char *argv[])
{
int i, j;
- char *dir, *tag, *name;
char buf[1024], **av;
quotefmtinstall();
@@ -52,27 +53,23 @@ threadmain(int argc, char *argv[])
av = emalloc(3*sizeof(char*));
av[0] = "rc";
av[1] = "-i";
- name = getenv("sysname");
}else{
av = argv;
- name = utfrrune(av[0], '/');
- if(name)
- name++;
- else
- name = av[0];
}
-
+ wname = utfrrune(av[0], '/');
+ if(wname)
+ wname++;
+ else
+ wname = av[0];
if(getwd(buf, sizeof buf) == 0)
- dir = "/";
+ wdir = "/";
else
- dir = buf;
- dir = estrdup(dir);
- tag = estrdup(dir);
- tag = eappend(estrdup(tag), "/-", name);
+ wdir = buf;
+ wdir = estrdup(wdir);
win = newwindow();
snprint(buf, sizeof buf, "%d", win->id);
putenv("winid", buf);
- winname(win, tag);
+ winsetdir(win, wdir, wname);
wintagwrite(win, "Send Noscroll", 5+8);
threadcreate(mainctl, win, STACK);
mountcons();
@@ -89,7 +86,7 @@ threadmain(int argc, char *argv[])
}
ctlprint(win->ctl, "scroll");
- winsetdump(win, dir, buf);
+ winsetdump(win, wdir, buf);
}
int