mirror of https://github.com/0intro/wmii
added script which runs wmiibar(2), very rudimentary
This commit is contained in:
parent
51f09cc007
commit
07a14591d1
2
Makefile
2
Makefile
|
@ -6,7 +6,7 @@ include config.mk
|
||||||
SUBDIRS = libcext liblitz libixp libixp2 libwmii cmd
|
SUBDIRS = libcext liblitz libixp libixp2 libwmii cmd
|
||||||
|
|
||||||
BIN = cmd/wm/wmii cmd/wm/wmiiwm cmd/wmiibar cmd/wmiifs \
|
BIN = cmd/wm/wmii cmd/wm/wmiiwm cmd/wmiibar cmd/wmiifs \
|
||||||
cmd/wmiikeys cmd/wmiimenu cmd/wmiiplumb cmd/wmiir cmd/wmiiwarp
|
cmd/wmiikeys cmd/wmiimenu cmd/wmiiplumb cmd/wmiir cmd/wmiir2 cmd/wmiiwarp
|
||||||
|
|
||||||
MAN1 = cmd/wm/wmii.1 cmd/wm/wmiiwm.1 cmd/wmiibar.1 cmd/wmiifs.1 \
|
MAN1 = cmd/wm/wmii.1 cmd/wm/wmiiwm.1 cmd/wmiibar.1 cmd/wmiifs.1 \
|
||||||
cmd/wmiikeys.1 cmd/wmiimenu.1 cmd/wmiir.1
|
cmd/wmiikeys.1 cmd/wmiimenu.1 cmd/wmiir.1
|
||||||
|
|
|
@ -21,13 +21,11 @@ wmiiwm -s /tmp/.ixp-$USER/wmiiwm-$WMII_IDENT &
|
||||||
wmiiwmpid=$apid
|
wmiiwmpid=$apid
|
||||||
wmiifs -s /tmp/.ixp-$USER/wmiifs-$WMII_IDENT &
|
wmiifs -s /tmp/.ixp-$USER/wmiifs-$WMII_IDENT &
|
||||||
wmiikeys -s /tmp/.ixp-$USER/wmiikeys-$WMII_IDENT &
|
wmiikeys -s /tmp/.ixp-$USER/wmiikeys-$WMII_IDENT &
|
||||||
wmiibar -s /tmp/.ixp-$USER/wmiibar-$WMII_IDENT &
|
|
||||||
wmiimenu -s /tmp/.ixp-$USER/wmiimenu-$WMII_IDENT &
|
wmiimenu -s /tmp/.ixp-$USER/wmiimenu-$WMII_IDENT &
|
||||||
sleep 1
|
sleep 1
|
||||||
|
|
||||||
# mount ixp file systems:
|
# mount ixp file systems:
|
||||||
wmiir write /ctl 'bind /wm /tmp/.ixp-'^$USER/wmiiwm-$WMII_IDENT
|
wmiir write /ctl 'bind /wm /tmp/.ixp-'^$USER/wmiiwm-$WMII_IDENT
|
||||||
wmiir write /ctl 'bind /bar /tmp/.ixp-'^$USER/wmiibar-$WMII_IDENT
|
|
||||||
wmiir write /ctl 'bind /menu /tmp/.ixp-'^$USER/wmiimenu-$WMII_IDENT
|
wmiir write /ctl 'bind /menu /tmp/.ixp-'^$USER/wmiimenu-$WMII_IDENT
|
||||||
wmiir write /ctl 'bind /keys /tmp/.ixp-'^$USER/wmiikeys-$WMII_IDENT
|
wmiir write /ctl 'bind /keys /tmp/.ixp-'^$USER/wmiikeys-$WMII_IDENT
|
||||||
|
|
||||||
|
|
|
@ -735,7 +735,7 @@ xwrite(IXPConn *c)
|
||||||
i = qpath_item(m->qid.path);
|
i = qpath_item(m->qid.path);
|
||||||
switch (qpath_type(m->qid.path)) {
|
switch (qpath_type(m->qid.path)) {
|
||||||
case Fctl:
|
case Fctl:
|
||||||
if(c->fcall->count == 5) {
|
if(c->fcall->count == 4) {
|
||||||
memcpy(buf, c->fcall->data, 4);
|
memcpy(buf, c->fcall->data, 4);
|
||||||
buf[4] = 0;
|
buf[4] = 0;
|
||||||
if(!strncmp(buf, "quit", 5)) {
|
if(!strncmp(buf, "quit", 5)) {
|
||||||
|
|
|
@ -25,7 +25,7 @@ usage()
|
||||||
{
|
{
|
||||||
fprintf(stderr, "%s",
|
fprintf(stderr, "%s",
|
||||||
"usage: wmiir [-a <server address>] [-v] <command>\n"
|
"usage: wmiir [-a <server address>] [-v] <command>\n"
|
||||||
" -a server address (default: $WMIIR_SOCKET)\n"
|
" -a server address (default: $WMIIR_ADDRESS)\n"
|
||||||
" -v version info\n"
|
" -v version info\n"
|
||||||
"valid commands:\n"
|
"valid commands:\n"
|
||||||
" create <file> -- creates file and writes data from stdin to file\n"
|
" create <file> -- creates file and writes data from stdin to file\n"
|
||||||
|
@ -181,7 +181,7 @@ int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
int i = 0;
|
int i = 0;
|
||||||
char *cmd, *file, *sockfile = getenv("WMIIR_SOCKET");
|
char *cmd, *file, *sockfile = getenv("WMIIR_ADDRESS");
|
||||||
|
|
||||||
/* command line args */
|
/* command line args */
|
||||||
if(argc < 2)
|
if(argc < 2)
|
||||||
|
@ -208,7 +208,7 @@ main(int argc, char *argv[])
|
||||||
file = argv[argc - 1];
|
file = argv[argc - 1];
|
||||||
|
|
||||||
if(!sockfile) {
|
if(!sockfile) {
|
||||||
fprintf(stderr, "%s", "wmiir: error: WMIIR_SOCKET environment not set\n");
|
fprintf(stderr, "%s", "wmiir: error: $WMIIR_ADDRESS not set\n");
|
||||||
usage();
|
usage();
|
||||||
}
|
}
|
||||||
/* open socket */
|
/* open socket */
|
||||||
|
|
15
rc/status
15
rc/status
|
@ -1,24 +1,23 @@
|
||||||
#!9PREFIX/bin/rc
|
#!9PREFIX/bin/rc
|
||||||
# periodically print date and load average to the bar
|
# periodically print date and load average to the bar
|
||||||
|
|
||||||
|
WMIIR_ADDRESS='unix!/tmp/.ixp-'^$USER^'/wmiibar-'^$WMII_IDENT
|
||||||
PIDFILE=/tmp/.ixp-$USER/statuspid-$WMII_IDENT
|
PIDFILE=/tmp/.ixp-$USER/statuspid-$WMII_IDENT
|
||||||
|
|
||||||
|
fn xwrite { echo -n $2 | wmiir2 write $1 }
|
||||||
|
|
||||||
if(test -r $PIDFILE) {
|
if(test -r $PIDFILE) {
|
||||||
kill -2 `{cat $PIDFILE} >[2]/dev/null
|
kill -2 `{cat $PIDFILE} >[2]/dev/null
|
||||||
}
|
}
|
||||||
echo $pid >$PIDFILE
|
echo $pid >$PIDFILE
|
||||||
|
|
||||||
label=`{wmiir read /bar/new}
|
wmiibar -a $WMIIR_ADDRESS &
|
||||||
wmiir write /bar/$label/b1press 'wmiir write /wm/ctl ''select prev'''
|
|
||||||
wmiir write /bar/$label/b3press 'wmiir write /wm/ctl ''select next'''
|
|
||||||
wmiir write /bar/$label/b4press 'wmiir write /wm/ctl ''select prev'''
|
|
||||||
wmiir write /bar/$label/b5press 'wmiir write /wm/ctl ''select next'''
|
|
||||||
|
|
||||||
# install signal handler for artificial sigexit:
|
# install signal handler for artificial sigexit:
|
||||||
fn sigint {
|
fn sigint {
|
||||||
if(test -f $PIDFILE && ~ `{cat $PIDFILE} $pid)
|
if(test -f $PIDFILE && ~ `{cat $PIDFILE} $pid)
|
||||||
rm -f $PIDFILE
|
rm -f $PIDFILE
|
||||||
wmiir write /bar/ctl 'destroy '^$label
|
xwrite /ctl quit
|
||||||
exit
|
exit
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,7 +27,9 @@ fn statustext {
|
||||||
}
|
}
|
||||||
|
|
||||||
text=`{statustext}
|
text=`{statustext}
|
||||||
while(wmiir write /bar/$label/data $"text >[2]/dev/null) {
|
xwrite /new/data $"text
|
||||||
|
xwrite /display south
|
||||||
|
while(xwrite /1/data $"text) {
|
||||||
sleep 2
|
sleep 2
|
||||||
text=`{statustext}
|
text=`{statustext}
|
||||||
}
|
}
|
||||||
|
|
45
rc/wmiirc
45
rc/wmiirc
|
@ -60,45 +60,6 @@ fn clientsconf {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# WMIIBAR CONFIGURATION
|
|
||||||
|
|
||||||
fn barsucks {
|
|
||||||
wmiir write /bar/$1/b1press 'wmiir write /wm/ctl ''select prev'''
|
|
||||||
wmiir write /bar/$1/b3press 'wmiir write /wm/ctl ''select next'''
|
|
||||||
wmiir write /bar/$1/b4press 'wmiir write /wm/ctl ''select prev'''
|
|
||||||
wmiir write /bar/$1/b5press 'wmiir write /wm/ctl ''select next'''
|
|
||||||
}
|
|
||||||
|
|
||||||
wmiir write /bar/geometry $BAR_ALIGN
|
|
||||||
if(~ $BAR_ALIGN south)
|
|
||||||
wmiir write /bar/event/resize \
|
|
||||||
'val=`{wmiir read /bar/geometry | ' ^\
|
|
||||||
'awk ''{print "+0 +0 +0 -"$4}''} wmiir write /wm/default/geometry $"val'
|
|
||||||
if not
|
|
||||||
wmiir write /bar/event/resize \
|
|
||||||
'val=`{wmiir read /bar/geometry | ' ^\
|
|
||||||
'awk ''{print "+0 +"$4" +0 -"$4}''} wmiir write /wm/default/geometry $"val'
|
|
||||||
|
|
||||||
wmiir write /bar/ctl reset
|
|
||||||
wmiir write /bar/font $FONT
|
|
||||||
wmiir write /bar/fgcolor $NORM_FG_COLOR
|
|
||||||
wmiir write /bar/bgcolor $NORM_BG_COLOR
|
|
||||||
wmiir write /bar/bordercolor $NORM_BORDER_COLOR
|
|
||||||
|
|
||||||
plab=`{wmiir read /bar/new}
|
|
||||||
wmiir write /bar/$plab/b1press 'wmiir write /wm/ctl pager'
|
|
||||||
|
|
||||||
klab=`{wmiir read /bar/new}
|
|
||||||
|
|
||||||
clab=`{wmiir read /bar/new}
|
|
||||||
wmiir write /bar/$clab/fgcolor $SEL_FG_COLOR
|
|
||||||
wmiir write /bar/$clab/bgcolor $SEL_BG_COLOR
|
|
||||||
wmiir write /bar/$clab/bordercolor $SEL_BG_COLOR
|
|
||||||
barsucks $clab
|
|
||||||
|
|
||||||
wmiir write /bar/expandable $clab
|
|
||||||
wmiir write /bar/ctl 'display 1'
|
|
||||||
|
|
||||||
|
|
||||||
# WMIIWM CONFIGURATION
|
# WMIIWM CONFIGURATION
|
||||||
|
|
||||||
|
@ -108,12 +69,6 @@ wmiir write /wm/default/handleinc $HANDLEINC
|
||||||
wmiir write /wm/default/tab $TAB
|
wmiir write /wm/default/tab $TAB
|
||||||
|
|
||||||
wmiir write /wm/default/border 1
|
wmiir write /wm/default/border 1
|
||||||
wmiir write /wm/event/clientupdate \
|
|
||||||
's=`{wmiir read /wm/sel/layout/sel/frame/sel/name} ' ^\
|
|
||||||
'wmiir write /bar/'^$clab^'/data $"s'
|
|
||||||
wmiir write /wm/event/pageupdate \
|
|
||||||
's=`{wmiir read /wm/sel/name} wmiir write /bar/'$plab'/data $"s && ' ^\
|
|
||||||
's=`{wmiir read /keys/lookup | sed s,/mode/,,} wmiir write /bar/'$klab'/data $"s'
|
|
||||||
|
|
||||||
for(page in `{wmiir read /wm | grep '^[0-9]'})
|
for(page in `{wmiir read /wm | grep '^[0-9]'})
|
||||||
clientsconf /wm/$page/client
|
clientsconf /wm/$page/client
|
||||||
|
|
Loading…
Reference in New Issue