diff options
author | cinap_lenrek <cinap_lenrek@centraldogma> | 2011-12-11 18:35:34 +0100 |
---|---|---|
committer | cinap_lenrek <cinap_lenrek@centraldogma> | 2011-12-11 18:35:34 +0100 |
commit | 2524319b4ce7f98d0d61a400ccbcfbd55eaf4098 (patch) | |
tree | 25d5c1563824d7025ec936e9b4856748706a8d6b /sys/src | |
parent | 3d189a44527a92743c8739d01b175757cdaf8c73 (diff) | |
parent | a01a9fc447e81495419de09234b7bb18faa6a932 (diff) |
merge
Diffstat (limited to 'sys/src')
-rw-r--r-- | sys/src/cmd/paint.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sys/src/cmd/paint.c b/sys/src/cmd/paint.c index 173efef9b..f09a597c0 100644 --- a/sys/src/cmd/paint.c +++ b/sys/src/cmd/paint.c @@ -40,6 +40,8 @@ main() Event e; Point last; int haslast; + int brushsize = 1; + char brush[128]; char file[128]; haslast = 0; @@ -47,7 +49,6 @@ main() fprint(2, "paint: initdraw failed: %r\n"); exits("initdraw"); } - einit(Emouse | Ekeyboard); draw(screen, screen->r, display->white, 0, ZP); flushimage(display, 1); @@ -56,9 +57,9 @@ main() case Emouse: if(e.mouse.buttons & 1){ if(haslast) - line(screen, last, e.mouse.xy, Enddisc, Enddisc, 5, display->black, ZP); + line(screen, last, e.mouse.xy, Enddisc, Enddisc, brushsize, display->black, ZP); else - fillellipse(screen, e.mouse.xy, 5, 5, display->black, ZP); + fillellipse(screen, e.mouse.xy, brushsize, brushsize, display->black, ZP); last = e.mouse.xy; haslast = 1; @@ -66,15 +67,20 @@ main() } else haslast = 0; if(e.mouse.buttons & 4){ - fillellipse(screen, e.mouse.xy, 5, 5, display->white, ZP); + fillellipse(screen, e.mouse.xy, brushsize, brushsize, display->white, ZP); flushimage(display, 1); } break; case Ekeyboard: - if(e.kbdc == 'q') - exits(nil); + if(e.kbdc == 'b'){ + if(eenter("Brush", brush, sizeof(brush), &e.mouse) <= 0) + break; + brushsize = atoi(brush); + } if(e.kbdc == 'c') draw(screen, screen->r, display->white, 0, ZP); + if(e.kbdc == 'q') + exits(nil); if(e.kbdc == 's'){ snprint(file, sizeof(file), "out.bit"); if(eenter("Save to", file, sizeof(file), &e.mouse) <= 0) |