diff options
| author | Russ Cox <rsc@swtch.com> | 2017-01-06 14:57:18 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@swtch.com> | 2017-01-06 20:20:33 +0000 |
| commit | 9e0d3750c543de49ccc43512cb3fbaa1f42f1648 (patch) | |
| tree | a4616f3a4563b83d165af0558f20930228687284 | |
| parent | d296c18e379547218c4c50445c56e725ec3be91d (diff) | |
| download | plan9port-9e0d3750c543de49ccc43512cb3fbaa1f42f1648.tar.gz plan9port-9e0d3750c543de49ccc43512cb3fbaa1f42f1648.tar.bz2 plan9port-9e0d3750c543de49ccc43512cb3fbaa1f42f1648.zip | |
9term, win: work around bsd linker nonsense
Change-Id: Ifcef0636ee1e1fd0f9b06a8d1a99d58fae831318
Reviewed-on: https://plan9port-review.googlesource.com/2780
Reviewed-by: Russ Cox <rsc@swtch.com>
| -rw-r--r-- | include/draw.h | 2 | ||||
| -rw-r--r-- | src/cmd/9term/bsdpty.c | 4 | ||||
| -rw-r--r-- | src/libdraw/init.c | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/include/draw.h b/include/draw.h index 2bc9b4be..3a012959 100644 --- a/include/draw.h +++ b/include/draw.h @@ -525,6 +525,8 @@ extern int _drawdebug; /* set to 1 to see errors from flushimage */ extern void _setdrawop(Display*, Drawop); extern Display *_initdisplay(void(*)(Display*,char*), char*); +extern void needdisplay(void); /* call instead of initdraw to get (null) variable linked in */ + #define BGSHORT(p) (((p)[0]<<0) | ((p)[1]<<8)) #define BGLONG(p) ((BGSHORT(p)<<0) | (BGSHORT(p+2)<<16)) #define BPSHORT(p, v) ((p)[0]=(v), (p)[1]=((v)>>8)) diff --git a/src/cmd/9term/bsdpty.c b/src/cmd/9term/bsdpty.c index fe0367f0..31281325 100644 --- a/src/cmd/9term/bsdpty.c +++ b/src/cmd/9term/bsdpty.c @@ -77,10 +77,10 @@ updatewinsize(int row, int col, int dx, int dy) ws.ws_col = col; ws.ws_xpixel = dx; - + needdisplay(); // in case this is 'win' and not 9term // Leave "is this a hidpi display" in the low bit of the ypixel height for mc. dy &= ~1; - if(display->dpi >= DefaultDPI*3/2) + if(display != nil && display->dpi >= DefaultDPI*3/2) dy |= 1; ws.ws_ypixel = dy; diff --git a/src/libdraw/init.c b/src/libdraw/init.c index 452b6da7..e5a367f3 100644 --- a/src/libdraw/init.c +++ b/src/libdraw/init.c @@ -19,6 +19,11 @@ Image *mousebuttons; Image *mousesave; Mouse _drawmouse; +void +needdisplay(void) +{ +} + /* static void drawshutdown(void) |