-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix using numbers with different bit widths (#219)
- Loading branch information
Showing
18 changed files
with
289 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,6 @@ kotlin { | |
| tvosX64() | ||
| tvosArm64() | ||
| tvosSimulatorArm64() | ||
| watchosArm32() | ||
| watchosArm64() | ||
| watchosX64() | ||
| } | ||
2 changes: 1 addition & 1 deletion
2
...pleNonDesktopMain/kotlin/com/github/ajalt/mordant/internal/MppInternal.appleNonDesktop.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| package com.github.ajalt.mordant.internal | ||
|
|
||
| internal actual fun hasFileSystem(): Boolean = false | ||
| internal actual fun testsHaveFileSystem(): Boolean = false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...alt/mordant/internal/MppInternal.apple.kt → ...ajalt/mordant/internal/MppInternal.ios.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| package com.github.ajalt.mordant.internal | ||
|
|
||
| import com.github.ajalt.mordant.terminal.TerminalInterface | ||
| import com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfaceNativeApple | ||
| import com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfaceNativeCopyPasted | ||
|
|
||
| internal actual fun getStandardTerminalInterface(): TerminalInterface { | ||
| return TerminalInterfaceNativeApple() | ||
| return TerminalInterfaceNativeCopyPasted() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 5 additions & 3 deletions
8
mordant/src/linuxMain/kotlin/com/github/ajalt/mordant/internal/MppInternal.linux.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| package com.github.ajalt.mordant.internal | ||
|
|
||
| import com.github.ajalt.mordant.terminal.TerminalInterface | ||
| import com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfaceNativeLinux | ||
| import com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfaceNativeCopyPasted | ||
|
|
||
| internal actual fun hasFileSystem(): Boolean = true | ||
| internal actual fun getStandardTerminalInterface(): TerminalInterface = TerminalInterfaceNativeLinux | ||
| internal actual fun testsHaveFileSystem(): Boolean = true | ||
| internal actual fun getStandardTerminalInterface(): TerminalInterface { | ||
| return TerminalInterfaceNativeCopyPasted() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 7 additions & 1 deletion
8
mordant/src/macosMain/kotlin/com/github/ajalt/mordant/internal/MppInternal.macos.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,9 @@ | ||
| package com.github.ajalt.mordant.internal | ||
|
|
||
| internal actual fun hasFileSystem(): Boolean = true | ||
| import com.github.ajalt.mordant.terminal.TerminalInterface | ||
| import com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfaceNativeCopyPasted | ||
|
|
||
| internal actual fun testsHaveFileSystem(): Boolean = true | ||
| internal actual fun getStandardTerminalInterface(): TerminalInterface { | ||
| return TerminalInterfaceNativeCopyPasted() | ||
| } |
72 changes: 72 additions & 0 deletions
72
...lin/com/github/ajalt/mordant/terminal/terminalinterface/TerminalInterface.native.linux.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| package com.github.ajalt.mordant.terminal.terminalinterface | ||
|
|
||
| import com.github.ajalt.mordant.rendering.Size | ||
| import kotlinx.cinterop.* | ||
| import platform.posix.* | ||
|
|
||
| // XXX: The source code for this file is identical between linux and the various apple targets, but | ||
| // they have different bit widths for some fields, so the compileMetadata task fails if we don't use | ||
| // separate files. Hopefully some day there will be solution that doesn't require copy-pasting. | ||
|
|
||
| internal class TerminalInterfaceNativeCopyPasted : TerminalInterfaceNativePosix() { | ||
| override val termiosConstants: TermiosConstants = TermiosConstants( | ||
| VTIME = VTIME, | ||
| VMIN = VMIN, | ||
| INPCK = INPCK.convert(), | ||
| ISTRIP = ISTRIP.convert(), | ||
| INLCR = INLCR.convert(), | ||
| IGNCR = IGNCR.convert(), | ||
| ICRNL = ICRNL.convert(), | ||
| IXON = IXON.convert(), | ||
| OPOST = OPOST.convert(), | ||
| CS8 = CS8.convert(), | ||
| ISIG = ISIG.convert(), | ||
| ICANON = ICANON.convert(), | ||
| ECHO = ECHO.convert(), | ||
| IEXTEN = IEXTEN.convert(), | ||
| ) | ||
|
|
||
| override fun readIntoBuffer(c: ByteVar): Long { | ||
| return read(platform.posix.STDIN_FILENO, c.ptr, 1u).convert() | ||
| } | ||
|
|
||
| override fun getTerminalSize(): Size? = memScoped { | ||
| val size = alloc<winsize>() | ||
| if (ioctl(STDIN_FILENO, TIOCGWINSZ.convert(), size) < 0) { | ||
| null | ||
| } else { | ||
| Size(width = size.ws_col.toInt(), height = size.ws_row.toInt()) | ||
| } | ||
| } | ||
|
|
||
| override fun getStdinTermios(): Termios = memScoped { | ||
| val termios = alloc<termios>() | ||
| if (tcgetattr(platform.posix.STDIN_FILENO, termios.ptr) != 0) { | ||
| throw RuntimeException("Error reading terminal attributes") | ||
| } | ||
| return Termios( | ||
| iflag = termios.c_iflag.convert(), | ||
| oflag = termios.c_oflag.convert(), | ||
| cflag = termios.c_cflag.convert(), | ||
| lflag = termios.c_lflag.convert(), | ||
| cc = ByteArray(NCCS) { termios.c_cc[it].convert() }, | ||
| ) | ||
| } | ||
|
|
||
| override fun setStdinTermios(termios: Termios) = memScoped { | ||
| val nativeTermios = alloc<termios>() | ||
| // different platforms have different fields in termios, so we need to read the current | ||
| // struct before we set the fields we care about. | ||
| if (tcgetattr(platform.posix.STDIN_FILENO, nativeTermios.ptr) != 0) { | ||
| throw RuntimeException("Error reading terminal attributes") | ||
| } | ||
| nativeTermios.c_iflag = termios.iflag.convert() | ||
| nativeTermios.c_oflag = termios.oflag.convert() | ||
| nativeTermios.c_cflag = termios.cflag.convert() | ||
| nativeTermios.c_lflag = termios.lflag.convert() | ||
| repeat(NCCS) { nativeTermios.c_cc[it] = termios.cc[it].convert<UByte>() } | ||
| if (tcsetattr(platform.posix.STDIN_FILENO, TCSADRAIN, nativeTermios.ptr) != 0) { | ||
| throw RuntimeException("Error setting terminal attributes") | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
mordant/src/tvosMain/kotlin/com/github/ajalt/mordant/internal/MppInternal.tvos.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package com.github.ajalt.mordant.internal | ||
|
|
||
| import com.github.ajalt.mordant.terminal.TerminalInterface | ||
| import com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfaceNativeCopyPasted | ||
|
|
||
| internal actual fun getStandardTerminalInterface(): TerminalInterface { | ||
| return TerminalInterfaceNativeCopyPasted() | ||
| } |
Oops, something went wrong.