History

Eliminated second log

jjlandg committed 15 years ago

Commit 8a87fc11 parent 7779bca4 files · +222 −211Browse files

Unified · Split

4 files
  1. appl/wm/toolbar.b +2 −1
  2. appl/wm/toolbar.sbl +175 −165
  3. appl/wm/windowbar.b +46 −46
  4. dis/wm/toolbar.dis +0 −0
appl/wm/toolbar.b+2−1
@@ -513,7 +513,8 @@ consoleproc(ctxt: ref Draw->Context, sync: chan of string) · 512 unmodified lines
513 " -y " + string (r.dy() / 3 + top.screenr.min.y));513 " -y " + string (r.dy() / 3 + top.screenr.min.y));
514 514
515 tkclient->startinput(top, "ptr"::"kbd"::nil);515 tkclient->startinput(top, "ptr"::"kbd"::nil);
516# tkclient->onscreen(top, "onscreen");516 tkclient->onscreen(top, "onscreen");
517 tkclient->wmctl(top, "task");
517 518
518 for(;;) alt {519 for(;;) alt {
519 c := <-titlectl or520 c := <-titlectl or
appl/wm/toolbar.sbl+175−165
@@ -9,7 +9,7 @@ tkclient.m · 8 unmodified lines
9sh.m9sh.m
10string.m10string.m
11arg.m11arg.m
121091121101
1345.13,21 01345.13,21 0
1413,21 01413,21 0
1513,21 01513,21 0
@@ -951,156 +951,166 @@ arg.m · 935 unmodified lines
95127,44 32595127,44 325
95227,44 32695227,44 326
9531,45 3259531,45 325
954519.8,16 327954516.1,36 327
9558,16 32795520,23 327
956520.7,15 32795625,35 327
9577,15 3279571,36 327
958521.7,15 327958517.1,29 328
9597,19 32795917,20 328
9607,19 32896022,28 328
9617,19 3279611,29 328
962525.8,16 3279621,29 328
9638,20 3279631,29 329
9648,20 329964520.8,16 330
9658,20 3279658,16 330
966527.8,16 327966521.7,15 330
9678,20 3279677,15 330
968522.7,15 330
9697,19 330
9707,19 331
9717,19 330
972526.8,16 330
9688,20 3309738,20 330
9698,20 3279748,20 332
970529.26,39 3279758,20 330
97126,39 327976528.8,16 330
972532.26,39 3279778,20 330
97326,39 3279788,20 333
974535.27,41 3279798,20 330
97527,41 327980530.26,39 330
976537.27,41 32798126,39 330
97727,41 327982533.26,39 330
978518.9,15 32798326,39 330
9799,15 327984536.27,41 330
9809,15 32798527,41 330
9819,15 327986538.27,41 330
9829,15 32798727,41 330
9839,15 327988519.9,15 330
984522.5,16 3319899,15 330
985523.3,13 3329909,15 330
986524.2,25 3339919,15 330
98718,21 3339929,15 330
98823,24 3339939,15 330
9892,25 333994523.5,16 334
9902,25 333995524.3,13 335
9912,25 334996525.2,25 336
9922,25 33599718,21 336
9932,25 32799823,24 336
994526.2,22 3369992,25 336
99515,18 33610002,25 336
99620,21 33610012,25 337
9972,22 33610022,25 338
9982,22 32710032,25 330
999528.2,22 3371004527.2,22 339
100014,17 337100515,18 339
100119,21 337100620,21 339
10022,22 33710072,22 339
10032,22 33810082,22 330
10042,22 3271009529.2,22 340
1005529.17,19 327101014,17 340
100617,19 339101119,21 340
1007530.5,14 34010122,22 340
1008531.11,14 34110132,22 341
100916,43 34110142,22 330
10103,44 3411015530.17,19 330
10113,44 342101617,19 342
10123,44 3431017531.5,14 343
1018532.11,14 344
101916,43 344
10133,44 34410203,44 344
10143,44 32710213,44 345
1015532.17,19 32710223,44 346
101617,19 345
1017533.5,14 346
1018534.11,14 347
101916,43 347
10203,44 34710233,44 347
10213,44 34810243,44 330
10223,44 3491025533.17,19 330
102617,19 348
1027534.5,14 349
1028535.11,14 350
102916,43 350
10233,44 35010303,44 350
10243,44 32710313,44 351
1025535.7,11 32710323,44 352
102618,20 32710333,44 353
102718,20 35110343,44 330
102818,20 3521035536.7,11 330
1029536.2,23 353103618,20 330
10309,12 353103718,20 354
103114,18 353103818,20 355
103220,22 3531039537.2,23 356
10332,23 35310409,12 356
10342,23 354104114,18 356
10352,23 355104220,22 356
10362,23 32710432,23 356
1037537.7,11 32710442,23 357
103818,20 327
103918,20 356
104018,20 357
1041538.2,23 358
10429,12 358
104314,18 358
104420,22 358
10452,23 35810452,23 358
1046539.5,14 35910462,23 330
1047540.3,33 3601047538.7,11 330
104819,22 360104818,20 330
104924,32 360104918,20 359
10503,33 360105018,20 360
10513,33 3601051539.2,23 361
10523,33 36110529,12 361
10533,33 362105314,18 361
105420,22 361
10552,23 361
1056540.5,14 362
1057541.3,33 363
105819,22 363
105924,32 363
10603,33 363
10543,33 36310613,33 363
10553,33 32710623,33 364
1056546.4,13 36410633,33 365
1057547.2,8 36510643,33 366
1058549.1,17 36610653,33 330
1059550.1,40 3671066547.4,13 367
10609,12 3671067548.2,8 368
106114,39 3671068550.1,17 369
10621,40 3671069551.1,40 370
10631,40 36710709,12 370
10641,40 368107114,39 370
1065552.1,3 36910721,40 370
10669,17 36910731,40 370
106719,22 36910741,40 371
10681,3 3691075553.1,3 372
1069551.1,7 36910769,17 372
10701,7 369107719,22 372
10711,7 36910781,3 372
10721,7 3691079552.1,7 372
10731,7 37010801,7 372
10741,7 36910811,7 372
10751,7 36910821,7 372
1076556.5,11 37110831,7 373
107717,22 37210841,7 372
107813,22 37210851,7 372
1079557.5,9 3731086557.5,11 374
10805,17 373108717,22 375
1081558.3,11 374108813,22 375
1082556.24,27 3751089558.5,9 376
108324,27 37510905,17 376
1084559.4,28 3761091559.3,11 377
1085560.2,68 3771092557.24,27 378
10866,9 377109324,27 378
108742,52 3771094560.4,28 379
108835,52 3771095561.2,68 380
108911,52 37710966,9 380
109011,67 377109742,52 380
109111,67 378109835,52 380
10922,68 377109911,52 380
10932,68 377110011,67 380
10942,68 379110111,67 381
1095561.12,22 38011022,68 380
10962,22 38011032,68 380
1097564.1,40 38111042,68 382
10989,12 3811105562.12,22 383
109914,39 38111062,22 383
11001,40 3811107565.1,40 384
11011,40 38111089,12 384
11021,40 382110914,39 384
1103565.0,1 38311101,40 384
11111,40 384
11121,40 385
1113566.0,1 386
110424111424
1105aSys->Dir 1:26.1,39.2 641115aSys->Dir 1:26.1,39.2 64
110611111611
@@ -1473,37 +1483,37 @@ n849:consoleproc · 366 unmodified lines
147340:top:507.2,5 R@12148340:top:507.2,5 R@12
1474 1484
147544:titlectl:7,15 Cs148544:titlectl:7,15 Cs
147648:c:519.1,2 s148648:c:520.1,2 s
147752:i:508.5,6 i148752:i:508.5,6 i
147856:iostderr:499.1,9 R@22148856:iostderr:499.1,9 R@22
1479 1489
148060:iostdout:494.1,9 R@22149060:iostdout:494.1,9 R@22
1481 1491
148264:rc:529.17,19 @23149264:rc:530.17,19 @23
1483 1493
148468:rc:532.17,19 @23149468:rc:533.17,19 @23
1485 1495
148672:wc:537.18,20 @21149672:wc:538.18,20 @21
1487 1497
148876:c:525.1,2 i149876:c:526.1,2 i
148980:data:535.7,11 Ab149980:data:536.7,11 Ab
149084:data:537.7,11 Ab150084:data:538.7,11 Ab
149188:p:527.1,2 R@10150188:p:528.1,2 R@10
1492 1502
149392:wc:535.18,20 @21150392:wc:536.18,20 @21
1494 1504
1495124:r:511.1,2 @61505124:r:511.1,2 @6
1496 1506
1497n1043:conout1507n1053:conout
1498315083
149932:top:544.7,10 R@12150932:top:545.7,10 R@12
1500 1510
150136:data:30,34 Ab151136:data:30,34 Ab
150240:wc:51,53 @21151240:wc:51,53 @21
1503 1513
1504215142
150544:i:556.5,6 i151544:i:557.5,6 i
150648:s:549.1,2 s151648:s:550.1,2 s
1507n111517n11
1508436:con_cfg:477.0,7 As1518436:con_cfg:477.0,7 As
1509456:draw:5.1,5 mDraw1519456:draw:5.1,5 mDraw
@@ -1513,22 +1523,22 @@ n11 · 3 unmodified lines
15135:97.0,106.1 015235:97.0,106.1 0
1514 1524
1515532:nlines:0:490.0,6 i1525532:nlines:0:490.0,6 i
1516556:screenr:41.0,7 @61526560:screenr:41.0,7 @6
1517 1527
1518572:shell:12.1,6 mSh1528576:shell:12.1,6 mSh
15195:8.0,95.1 015295:8.0,95.1 0
1520 1530
1521580:str:0:15.1,4 mString1531584:str:0:15.1,4 mString
15226:1.0,40.1 015326:1.0,40.1 0
1523 1533
1524584:sys:0:3.1,4 mSys1534588:sys:0:3.1,4 mSys
15251:4.0,161.1 015351:4.0,161.1 0
1526 1536
1527592:tbtop:0:40.0,5 R@121537596:tbtop:0:40.0,5 R@12
1528 1538
1529596:tk:8.1,3 mTk1539600:tk:8.1,3 mTk
15303:1.0,25.1 015403:1.0,25.1 0
1531 1541
1532604:tkclient:0:10.1,9 mTkclient1542608:tkclient:0:10.1,9 mTkclient
15334:1.0,26.1 015434:1.0,26.1 0
1534 1544
appl/wm/windowbar.b+46−46
@@ -493,55 +493,55 @@ nlines := 0; # transcript length · 492 unmodified lines
493 493
494consoleproc(ctxt: ref Draw->Context, sync: chan of string)494consoleproc(ctxt: ref Draw->Context, sync: chan of string)
495{495{
496 iostdout := sys->file2chan("/chan", "wmstdout");496# iostdout := sys->file2chan("/chan", "wmstdout");
497 if(iostdout == nil){497# if(iostdout == nil){
498 sync <-= sys->sprint("cannot make /chan/wmstdout: %r");498# sync <-= sys->sprint("cannot make /chan/wmstdout: %r");
499 return;499# return;
500 }500# }
501 iostderr := sys->file2chan("/chan", "wmstderr");501# iostderr := sys->file2chan("/chan", "wmstderr");
502 if(iostderr == nil){502# if(iostderr == nil){
503 sync <-= sys->sprint("cannot make /chan/wmstdout: %r");503# sync <-= sys->sprint("cannot make /chan/wmstdout: %r");
504 return;504# return;
505 }505# }
506 506
507 sync <-= nil;507 sync <-= nil;
508 508
509 (top, titlectl) := tkclient->toplevel(ctxt, "", "Log", tkclient->Appl); 509# (top, titlectl) := tkclient->toplevel(ctxt, "", "Log", tkclient->Appl);
510 for(i := 0; i < len con_cfg; i++)510# for(i := 0; i < len con_cfg; i++)
511 cmd(top, con_cfg[i]);511# cmd(top, con_cfg[i]);
512 512
513 r := tk->rect(top, ".", Tk->Border|Tk->Required);513# r := tk->rect(top, ".", Tk->Border|Tk->Required);
514 cmd(top, ". configure -x " + string ((top.screenr.dx() - r.dx()) / 2 + top.screenr.min.x) +514# cmd(top, ". configure -x " + string ((top.screenr.dx() - r.dx()) / 2 + top.screenr.min.x) +
515 " -y " + string (r.dy() / 3 + top.screenr.min.y));515# " -y " + string (r.dy() / 3 + top.screenr.min.y));
516 516
517 tkclient->startinput(top, "ptr"::"kbd"::nil);517# tkclient->startinput(top, "ptr"::"kbd"::nil);
518 tkclient->onscreen(top, "onscreen");518# tkclient->onscreen(top, "onscreen");
519 tkclient->wmctl(top, "task");519# tkclient->wmctl(top, "task");
520 520
521 for(;;) alt {521# for(;;) alt {
522 c := <-titlectl or522# c := <-titlectl or
523 c = <-top.wreq or523# c = <-top.wreq or
524 c = <-top.ctxt.ctl =>524# c = <-top.ctxt.ctl =>
525 if(c == "exit")525# if(c == "exit")
526 c = "task";526# c = "task";
527 tkclient->wmctl(top, c);527# tkclient->wmctl(top, c);
528 c := <-top.ctxt.kbd =>528# c := <-top.ctxt.kbd =>
529 tk->keyboard(top, c);529# tk->keyboard(top, c);
530 p := <-top.ctxt.ptr =>530# p := <-top.ctxt.ptr =>
531 tk->pointer(top, *p);531# tk->pointer(top, *p);
532 (nil, nil, nil, rc) := <-iostdout.read =>532# (nil, nil, nil, rc) := <-iostdout.read =>
533 if(rc != nil)533# if(rc != nil)
534 rc <-= (nil, "inappropriate use of file");534# rc <-= (nil, "inappropriate use of file");
535 (nil, nil, nil, rc) := <-iostderr.read =>535# (nil, nil, nil, rc) := <-iostderr.read =>
536 if(rc != nil)536# if(rc != nil)
537 rc <-= (nil, "inappropriate use of file");537# rc <-= (nil, "inappropriate use of file");
538 (nil, data, nil, wc) := <-iostdout.write =>538# (nil, data, nil, wc) := <-iostdout.write =>
539 conout(top, data, wc);539# conout(top, data, wc);
540 (nil, data, nil, wc) := <-iostderr.write =>540# (nil, data, nil, wc) := <-iostderr.write =>
541 conout(top, data, wc);541# conout(top, data, wc);
542 if(wc != nil)542# if(wc != nil)
543 tkclient->wmctl(top, "untask");543# tkclient->wmctl(top, "untask");
544 }544# }
545}545}
546 546
547conout(top: ref Tk->Toplevel, data: array of byte, wc: Sys->Rwrite)547conout(top: ref Tk->Toplevel, data: array of byte, wc: Sys->Rwrite)
dis/wm/toolbar.dis+0−0

Binary file not shown.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t