Merge remote-tracking branch 'origin/sixel-rebase' into sixel-rebase

complete.go

@@ -215,6 +215,9 @@ var (
 		"infotimefmtnew",
 		"infotimefmtold",
 		"truncatechar",
+		"sixel",
+		"nosixel",
+		"sixel!",
 	}
 )
 

eval.go

@@ -874,7 +874,7 @@ func (e *setExpr) eval(app *app, args []string) {
 			app.ui.echoerrf("sixel!: unexpected value: %s", e.val)
 			return
 		}
-		gOpts.wrapscroll = !gOpts.wrapscroll
+		gOpts.sixel= !gOpts.sixel
 	default:
 		// any key with the prefix user_ is accepted as a user defined option
 		if strings.HasPrefix(e.opt, "user_") {

os.go

@@ -250,3 +250,12 @@ func getTermPixels() (w, h int, err error) {
 	}
 	return int(ws.Xpixel), int(ws.Ypixel), nil
 }
+
+func getTermPixels() (w, h int, err error) {
+	fd := int(os.Stdin.Fd())
+	ws, err := unix.IoctlGetWinsize(fd, unix.TIOCGWINSZ)
+	if err != nil {
+		return -1, -1, err
+	}
+	return int(ws.Xpixel), int(ws.Ypixel), nil
+}

os_windows.go

@@ -204,3 +204,7 @@ func diskFree(wd string) string {
 func getTermPixels() (w, h int, err error) {
 	return -1, -1, nil
 }
+
+func getTermPixels() (w, h int, err error) {
+	return -1, -1, nil
+}