UScreen: improved input handling (via optional interface) #125
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -270,40 +270,69 @@ object UKeyboard { | |
| //#endif | ||
| } | ||
|
|
||
| @Deprecated("Use isOSModifierKeyDown() instead if you want the platform-appropriate modifier key (Ctrl on Windows/Linux, Command on Mac). " + | ||
| "Alternatively use isControlKeyDown() or isCommandKeyDown() if you specifically want to check for Ctrl or Command respectively.") | ||
| @JvmStatic | ||
| fun isCtrlKeyDown(): Boolean = if (UMinecraft.isRunningOnMac) { | ||
| isKeyDown(KEY_LMETA) || isKeyDown(KEY_RMETA) | ||
| } else isKeyDown(KEY_LCONTROL) || isKeyDown(KEY_RCONTROL) | ||
|
|
||
| @Deprecated("If using from a key event, use the provided modifiers instead of calling this method.") | ||
| @JvmStatic | ||
| fun isOSModifierKeyDown(): Boolean = | ||
| if (UMinecraft.isRunningOnMac) isCommandKeyDown() | ||
| else isControlKeyDown() | ||
|
|
||
| @Deprecated("If using from a key event, use the provided modifiers instead of calling this method.") | ||
| @JvmStatic | ||
| fun isCommandKeyDown(): Boolean = isKeyDown(KEY_LMETA) || isKeyDown(KEY_RMETA) | ||
|
|
||
| @Deprecated("If using from a key event, use the provided modifiers instead of calling this method.") | ||
| @JvmStatic | ||
| fun isControlKeyDown(): Boolean = isKeyDown(KEY_LCONTROL) || isKeyDown(KEY_RCONTROL) | ||
|
|
||
| @Deprecated("If using from a key event, use the provided modifiers instead of calling this method.") | ||
| @JvmStatic | ||
| fun isShiftKeyDown(): Boolean = isKeyDown(KEY_LSHIFT) || isKeyDown(KEY_RSHIFT) | ||
|
|
||
| @Deprecated("If using from a key event, use the provided modifiers instead of calling this method.") | ||
| @JvmStatic | ||
| fun isAltKeyDown(): Boolean = isKeyDown(KEY_LMENU) || isKeyDown(KEY_RMENU) | ||
|
|
||
| @Deprecated("Inconsistent ctrl modifier behaviour depending on OS and MC versions", replaceWith = ReplaceWith("getKeyModifiers()")) | ||
| @JvmStatic | ||
| fun getModifiers(): Modifiers = Modifiers(isCtrlKeyDown(), isShiftKeyDown(), isAltKeyDown(), isCommandKeyDown()) | ||
|
|
||
| @JvmStatic | ||
| fun getKeyModifiers(): Modifiers = Modifiers(isControlKeyDown(), isShiftKeyDown(), isAltKeyDown(), isCommandKeyDown()) | ||
|
Collaborator
There was a problem hiding this comment. thought: Not sure we should even provide this new variant of the You usually shouldn't be using |
||
|
|
||
| @Deprecated("If using from a key event, use the provided modifiers instead of calling this method.") | ||
| @JvmStatic | ||
| fun isKeyComboCtrlA(key: Int): Boolean = key == KEY_A && isOSModifierKeyDown() && !isShiftKeyDown() && !isAltKeyDown() | ||
|
|
||
| @Deprecated("If using from a key event, use the provided modifiers instead of calling this method.") | ||
| @JvmStatic | ||
| fun isKeyComboCtrlC(key: Int): Boolean = key == KEY_C && isOSModifierKeyDown() && !isShiftKeyDown() && !isAltKeyDown() | ||
|
|
||
| @Deprecated("If using from a key event, use the provided modifiers instead of calling this method.") | ||
| @JvmStatic | ||
| fun isKeyComboCtrlV(key: Int): Boolean = key == KEY_V && isOSModifierKeyDown() && !isShiftKeyDown() && !isAltKeyDown() | ||
|
|
||
| @Deprecated("If using from a key event, use the provided modifiers instead of calling this method.") | ||
| @JvmStatic | ||
| fun isKeyComboCtrlX(key: Int): Boolean = key == KEY_X && isOSModifierKeyDown() && !isShiftKeyDown() && !isAltKeyDown() | ||
|
|
||
| @Deprecated("If using from a key event, use the provided modifiers instead of calling this method.") | ||
| @JvmStatic | ||
| fun isKeyComboCtrlY(key: Int): Boolean = key == KEY_Y && isOSModifierKeyDown() && !isShiftKeyDown() && !isAltKeyDown() | ||
|
|
||
| @Deprecated("If using from a key event, use the provided modifiers instead of calling this method.") | ||
| @JvmStatic | ||
| fun isKeyComboCtrlZ(key: Int): Boolean = key == KEY_Z && isOSModifierKeyDown() && !isShiftKeyDown() && !isAltKeyDown() | ||
|
|
||
| @Deprecated("If using from a key event, use the provided modifiers instead of calling this method.") | ||
| @JvmStatic | ||
| fun isKeyComboCtrlShiftZ(key: Int): Boolean = key == KEY_Z && isOSModifierKeyDown() && isShiftKeyDown() && !isAltKeyDown() | ||
|
|
||
| //#if STANDALONE | ||
| //$$ internal val keysDown = mutableSetOf<Int>() | ||
|
|
@@ -390,19 +419,40 @@ object UKeyboard { | |
| @JvmStatic | ||
| fun getKeyName(keyCode: Int): String? = getKeyName(keyCode, -1) | ||
|
|
||
| data class Modifiers( | ||
| val isCtrl: Boolean, | ||
| val isShift: Boolean, | ||
| val isAlt: Boolean, | ||
| val isSuper: Boolean, | ||
| ) { | ||
|
Comment on lines
-393
to
+427
Collaborator
There was a problem hiding this comment. issue: Breaking change. Also need to supply a three-args |
||
| @Deprecated("Old constructor") | ||
| constructor(isCtrl: Boolean, isShift: Boolean, isAlt: Boolean) : | ||
| this(isCtrl, isShift, isAlt, isSuper = isCommandKeyDown()) | ||
|
|
||
| /** | ||
| * Checks that only the OS specific modifier key is active (Ctrl on Windows/Linux, Command (super) on Mac). | ||
| */ | ||
| fun isPlatformModifierActive() = if (UMinecraft.isRunningOnMac) isSuper else isCtrl | ||
|
|
||
| fun isOnlyPlatformModifierActive() = | ||
| if (UMinecraft.isRunningOnMac) isSuper && !isShift && !isAlt && !isCtrl | ||
| else isCtrl && !isShift && !isAlt && !isSuper | ||
|
|
||
| } | ||
|
|
||
| //#if MC>=11502 | ||
| //$$ internal fun Modifiers?.toInt() = listOf( | ||
| //$$ this?.isCtrl to GLFW.GLFW_MOD_CONTROL, | ||
| //$$ this?.isShift to GLFW.GLFW_MOD_SHIFT, | ||
| //$$ this?.isAlt to GLFW.GLFW_MOD_ALT, | ||
| //$$ this?.isSuper to GLFW.GLFW_MOD_SUPER, | ||
| //$$ ).sumOf { (modifier, value) -> if (modifier == true) value else 0 } | ||
| //$$ | ||
| //$$ internal fun Int.toModifiers() = Modifiers( | ||
| //$$ isCtrl = (this and GLFW.GLFW_MOD_CONTROL) != 0, | ||
| //$$ isShift = (this and GLFW.GLFW_MOD_SHIFT) != 0, | ||
| //$$ isAlt = (this and GLFW.GLFW_MOD_ALT) != 0, | ||
| //$$ isSuper = (this and GLFW.GLFW_MOD_SUPER) != 0, | ||
| //$$ ) | ||
| //#endif | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggestion: Would call this
isSuperKeyDown, for consistency with ourModifier.isSuper.That, or
isMetaKeyDown, since that's what we call ourKEY_constants. But I think staying consistent with the new stuff (and lwjgl3, which also calls themGLFW_KEY_LEFT/RIGHT_SUPER) is better here.I don't think we're calling it
Commandanywhere else.