From 9e12381471680f1456d1ed396f582d9f3f9ed8a6 Mon Sep 17 00:00:00 2001 From: cryy <19242445+cryy@users.noreply.github.com> Date: Fri, 18 Apr 2025 19:43:01 +0200 Subject: [PATCH 1/7] Implement basic virtual keyboard support - Listener for clicks inside of text fields and other text-based screens - Virtual keyboard screen in a QWERTY layout --- .../client/MidnightControlsClient.java | 1 + .../client/gui/VirtualKeyboardScreen.java | 108 +++++++++ .../mixin/AbstractSignEditScreenAccessor.java | 15 ++ .../client/mixin/BookEditScreenAccessor.java | 24 ++ .../CreativeInventoryScreenAccessor.java | 6 + .../resources/midnightcontrols.mixins.json | 2 + .../fabric/MidnightControlsClientFabric.java | 7 +- .../fabric/event/MouseClickListener.java | 217 ++++++++++++++++++ 8 files changed, 379 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/VirtualKeyboardScreen.java create mode 100644 common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/AbstractSignEditScreenAccessor.java create mode 100644 common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/BookEditScreenAccessor.java create mode 100644 fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/MouseClickListener.java diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java index 21df7d7..074250f 100644 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java @@ -204,6 +204,7 @@ public class MidnightControlsClient extends MidnightControls { RainbowColor.tick(); TouchInput.tick(); } + /** * Called when opening a screen. */ diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/VirtualKeyboardScreen.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/VirtualKeyboardScreen.java new file mode 100644 index 0000000..55ca8c4 --- /dev/null +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/VirtualKeyboardScreen.java @@ -0,0 +1,108 @@ +package eu.midnightdust.midnightcontrols.client.gui; + +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.widget.TextFieldWidget; +import net.minecraft.text.Text; +import org.thinkingstudio.obsidianui.Position; +import org.thinkingstudio.obsidianui.SpruceTexts; +import org.thinkingstudio.obsidianui.screen.SpruceScreen; +import org.thinkingstudio.obsidianui.widget.SpruceButtonWidget; +import org.thinkingstudio.obsidianui.widget.container.SpruceContainerWidget; + +public class VirtualKeyboardScreen extends SpruceScreen { + private SpruceContainerWidget container; + private TextFieldWidget bufferDisplay; + private final StringBuilder buffer; + private final CloseCallback closeCallback; + + @FunctionalInterface + public interface CloseCallback { + void onClose(String text); + } + + public VirtualKeyboardScreen(String initialText, CloseCallback closeCallback) { + super(Text.literal("Virtual Keyboard")); + + this.buffer = new StringBuilder(initialText); + this.closeCallback = closeCallback; + } + + @Override + protected void init() { + super.init(); + + this.bufferDisplay = new TextFieldWidget(this.textRenderer, this.width / 2 - 100, this.height / 4 - 40, 200, 20, Text.literal("")); + this.bufferDisplay.setEditable(false); + this.bufferDisplay.setMaxLength(1024); + this.bufferDisplay.setText(buffer.toString()); + this.addDrawableChild(this.bufferDisplay); + + rebuildKeyboard(); + + this.addDrawableChild(container); + this.addDrawableChild(new SpruceButtonWidget(Position.of(this, this.width / 2 - 50, this.height - 30), 100, 20, SpruceTexts.GUI_DONE, btn -> this.close())); + } + + @Override + public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) { + super.render(drawContext, mouseX, mouseY, delta); + drawContext.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 10, 0xFFFFFF); + } + + + private void rebuildKeyboard() { + this.container = new SpruceContainerWidget(Position.of(0, this.height / 4 - 10), this.width, this.height / 2); + + + var row1 = new String[]{"q", "w", "e", "r", "t", "y", "u", "i", "o", "p"}; + var row2 = new String[]{"a", "s", "d", "f", "g", "h", "j", "k", "l"}; + var row3 = new String[]{"z", "x", "c", "v", "b", "n", "m"}; + + addKeyRow(0, row1); + addKeyRow(1, row2); + addKeyRow(2, row3); + } + + private void addKeyRow(int rowOffset, String... keys) { + int keyWidth = 20; + int spacing = 2; + int totalWidth = (keyWidth + spacing) * keys.length - spacing; + int startX = (this.width - totalWidth) / 2; + int y = this.height / 4 + rowOffset * 24; + + for (int i = 0; i < keys.length; i++) { + String key = keys[i]; + this.container.addChild(new SpruceButtonWidget(Position.of(startX + i * (keyWidth + spacing), y), keyWidth, 20, Text.literal(key), btn -> handleKeyPress(key))); + } + } + + private void handleKeyPress(String key) { + if (this.client == null) return; + + // TODO + if (key.equals("\b")) { + if (!buffer.isEmpty()) { + buffer.deleteCharAt(buffer.length() - 1); + } + } else { + buffer.append(key); + } + + if (this.bufferDisplay != null) { + this.bufferDisplay.setText(buffer.toString()); + } + } + + @Override + public boolean shouldPause() { + return false; + } + + @Override + public void close() { + super.close(); + if (closeCallback != null) { + closeCallback.onClose(buffer.toString()); + } + } +} \ No newline at end of file diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/AbstractSignEditScreenAccessor.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/AbstractSignEditScreenAccessor.java new file mode 100644 index 0000000..fa5036c --- /dev/null +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/AbstractSignEditScreenAccessor.java @@ -0,0 +1,15 @@ +package eu.midnightdust.midnightcontrols.client.mixin; + +import net.minecraft.block.entity.SignText; +import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(AbstractSignEditScreen.class) +public interface AbstractSignEditScreenAccessor { + @Accessor("text") + SignText midnightcontrols$getText(); + + @Accessor("text") + void midnightcontrols$setText(SignText text); +} diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/BookEditScreenAccessor.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/BookEditScreenAccessor.java new file mode 100644 index 0000000..e26f51b --- /dev/null +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/BookEditScreenAccessor.java @@ -0,0 +1,24 @@ +package eu.midnightdust.midnightcontrols.client.mixin; + +import net.minecraft.client.gui.screen.ingame.BookEditScreen; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(BookEditScreen.class) +public interface BookEditScreenAccessor { + @Accessor("signing") + boolean midnightcontrols$isSigning(); + + @Accessor("title") + String midnightcontrols$getTitle(); + + @Accessor("title") + void midnightcontrols$setTitle(String title); + + @Invoker("getCurrentPageContent") + String midnightcontrols$getCurrentPageContent(); + + @Invoker("setPageContent") + void midnightcontrols$setPageContent(String newContent); +} diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/CreativeInventoryScreenAccessor.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/CreativeInventoryScreenAccessor.java index 94961cf..2ab6c1d 100644 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/CreativeInventoryScreenAccessor.java +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/CreativeInventoryScreenAccessor.java @@ -58,4 +58,10 @@ public interface CreativeInventoryScreenAccessor { */ @Invoker("hasScrollbar") boolean midnightcontrols$hasScrollbar(); + + /** + * Triggers searching the creative inventory from the current value of the internal {@link net.minecraft.client.gui.widget.TextFieldWidget} + */ + @Invoker("search") + void midnightcontrols$search(); } diff --git a/common/src/main/resources/midnightcontrols.mixins.json b/common/src/main/resources/midnightcontrols.mixins.json index b00371b..4a01ff8 100644 --- a/common/src/main/resources/midnightcontrols.mixins.json +++ b/common/src/main/resources/midnightcontrols.mixins.json @@ -4,6 +4,7 @@ "compatibilityLevel": "JAVA_21", "client": [ "AdvancementsScreenAccessor", + "BookEditScreenAccessor", "ChatScreenMixin", "ClickableWidgetAccessor", "ClientPlayerEntityMixin", @@ -22,6 +23,7 @@ "RecipeBookScreenAccessor", "RecipeBookWidgetAccessor", "ScreenMixin", + "AbstractSignEditScreenAccessor", "TabNavigationWidgetAccessor", "WorldRendererMixin" ], diff --git a/fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/MidnightControlsClientFabric.java b/fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/MidnightControlsClientFabric.java index 60d43ac..7c9f04c 100644 --- a/fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/MidnightControlsClientFabric.java +++ b/fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/MidnightControlsClientFabric.java @@ -3,6 +3,7 @@ package eu.midnightdust.midnightcontrols.fabric; import eu.midnightdust.midnightcontrols.MidnightControlsConstants; import eu.midnightdust.midnightcontrols.client.MidnightControlsClient; import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig; +import eu.midnightdust.midnightcontrols.fabric.event.MouseClickListener; import eu.midnightdust.midnightcontrols.packet.ControlsModePayload; import eu.midnightdust.midnightcontrols.packet.FeaturePayload; import eu.midnightdust.midnightcontrols.packet.HelloPayload; @@ -11,11 +12,12 @@ import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents; +import net.fabricmc.fabric.api.client.screen.v1.ScreenMouseEvents; import net.fabricmc.fabric.api.resource.ResourceManagerHelper; import net.fabricmc.fabric.api.resource.ResourcePackActivationType; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.ModContainer; -import org.thinkingstudio.obsidianui.fabric.event.OpenScreenCallback; import java.util.Optional; @@ -51,6 +53,9 @@ public class MidnightControlsClientFabric implements ClientModInitializer { ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> MidnightControlsClient.onLeave()); ClientTickEvents.START_CLIENT_TICK.register(MidnightControlsClient::onTick); + ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> { + ScreenMouseEvents.allowMouseClick(screen).register(new MouseClickListener(screen)); + }); FabricLoader.getInstance().getModContainer(MidnightControlsConstants.NAMESPACE).ifPresent(modContainer -> { ResourceManagerHelper.registerBuiltinResourcePack(id("bedrock"), modContainer, ResourcePackActivationType.NORMAL); diff --git a/fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/MouseClickListener.java b/fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/MouseClickListener.java new file mode 100644 index 0000000..6eefac9 --- /dev/null +++ b/fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/MouseClickListener.java @@ -0,0 +1,217 @@ +package eu.midnightdust.midnightcontrols.fabric.event; +import eu.midnightdust.midnightcontrols.client.gui.VirtualKeyboardScreen; +import eu.midnightdust.midnightcontrols.client.mixin.AbstractSignEditScreenAccessor; +import eu.midnightdust.midnightcontrols.client.mixin.BookEditScreenAccessor; +import eu.midnightdust.midnightcontrols.client.mixin.CreativeInventoryScreenAccessor; +import net.fabricmc.fabric.api.client.screen.v1.ScreenMouseEvents; +import net.minecraft.block.entity.SignText; +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.ParentElement; +import net.minecraft.client.gui.screen.ChatScreen; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ingame.BookEditScreen; +import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen; +import net.minecraft.client.gui.screen.ingame.SignEditScreen; +import net.minecraft.client.gui.widget.TextFieldWidget; +import org.lwjgl.glfw.GLFW; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +import static eu.midnightdust.midnightcontrols.MidnightControls.logger; +import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client; + +record ScreenLink(Screen screen, List elementPath) {} + +public class MouseClickListener implements ScreenMouseEvents.AllowMouseClick { + private final Screen screen; + + private ScreenLink link; + + public MouseClickListener(Screen screen) { + this.screen = screen; + } + + @Override + public boolean allowMouseClick(Screen screen, double mouseX, double mouseY, int button) { + interceptMouseClick(screen, mouseX, mouseY); + return true; + } + + private void interceptMouseClick(Screen screen, double mouseX, double mouseY) { + logger.info("In scr: {}", screen.getClass()); + switch(screen) { + case BookEditScreen bookEditScreen -> { + if(screen.hoveredElement(mouseX, mouseY).isPresent()) { + return; + } + handleBookEditScreenClick(bookEditScreen); + } + case SignEditScreen signEditScreen -> { + if(screen.hoveredElement(mouseX, mouseY).isPresent()) { + return; + } + handleSignEditScreenClick(signEditScreen); + } + default -> { + var textField = findClickedTextField(screen, mouseX, mouseY); + if (textField == null) { + return; + } + handleTextFieldClick(textField); + } + } + } + + // Add equals and hashCode to prevent duplicate registrations + @Override + public boolean equals(Object obj) { + if (obj instanceof MouseClickListener) { + return ((MouseClickListener) obj).screen == this.screen; + } + return false; + } + + @Override + public int hashCode() { + return screen.hashCode(); + } + + // handlers + + private void handleBookEditScreenClick(BookEditScreen bookEditScreen) { + var accessor = (BookEditScreenAccessor) screen; + + VirtualKeyboardScreen virtualKeyboardScreen; + if(accessor.midnightcontrols$isSigning()) { + virtualKeyboardScreen = new VirtualKeyboardScreen(accessor.midnightcontrols$getTitle(), (text) -> { + client.setScreen(bookEditScreen); + accessor.midnightcontrols$setTitle(text); + }); + } + else { + virtualKeyboardScreen = new VirtualKeyboardScreen(accessor.midnightcontrols$getCurrentPageContent(), (text) -> { + client.setScreen(bookEditScreen); + accessor.midnightcontrols$setPageContent(text); + }); + } + + client.setScreen(virtualKeyboardScreen); + } + + private void handleSignEditScreenClick(SignEditScreen signEditScreen) { + var accessor = (AbstractSignEditScreenAccessor) signEditScreen; + // TODO + } + + private void handleTextFieldClick(TextFieldWidget textField) { + this.link = new ScreenLink(screen, calculatePathToElement(screen, textField)); + var virtualKeyboardScreen = new VirtualKeyboardScreen(textField.getText(), this::handleKeyboardClose); + client.setScreen(virtualKeyboardScreen); + } + + private void handleKeyboardClose(String newText) { + if(this.link == null) { + return; + } + + client.setScreen(this.link.screen()); + var txtField = findTextFieldByPath(screen, this.link.elementPath()); + if (txtField == null) { + return; + } + + txtField.setText(newText); + + + switch (this.link.screen()) { + case CreativeInventoryScreen creativeInventoryScreen -> { + var accessor = (CreativeInventoryScreenAccessor) creativeInventoryScreen; + accessor.midnightcontrols$search(); + } + case ChatScreen chatScreen -> { + // send the chat message + chatScreen.keyPressed(GLFW.GLFW_KEY_ENTER, 0, 0); + } + default -> {} + } + } + + // utility + + private TextFieldWidget findClickedTextField(Screen screen, double mouseX, double mouseY) { + for (Element element : screen.children()) { + if (element instanceof TextFieldWidget textField) { + if (textField.isMouseOver(mouseX, mouseY) && textField.isFocused()) { + return textField; + } + } + } + + // not hovering over a text field + return null; + } + + /** + * Calculates the path between a parent and a target in the UI hierarchy + */ + private List calculatePathToElement(Element parent, Element target) { + if (parent instanceof ParentElement parentElement) { + List children = parentElement.children(); + + // check direct children first + for (int i = 0; i < children.size(); i++) { + if (children.get(i) == target) { + // found it, return the path to this element + return Collections.singletonList(i); + } + } + + // check each child's children + for (int i = 0; i < children.size(); i++) { + if (children.get(i) instanceof ParentElement childParent) { + List subPath = calculatePathToElement(childParent, target); + if (subPath != null) { + // found in this subtree, prepend current index + List fullPath = new ArrayList<>(); + fullPath.add(i); + fullPath.addAll(subPath); + return fullPath; + } + } + } + } + + // Not found + return null; + } + + private TextFieldWidget findTextFieldByPath(Element parent, List path) { + if (path == null || path.isEmpty()) { + return null; + } + + if (parent instanceof ParentElement parentElement) { + List children = parentElement.children(); + int index = path.getFirst(); + + if (index >= 0 && index < children.size()) { + Element child = children.get(index); + + if (path.size() == 1) { + // This should be our target + return (child instanceof TextFieldWidget) ? (TextFieldWidget) child : null; + } else { + // Continue traversing + if (child instanceof ParentElement) { + return findTextFieldByPath(child, path.subList(1, path.size())); + } + } + } + } + + return null; + } +} From 50103ce4cf411ca92efd30ee38ca9854b91f2878 Mon Sep 17 00:00:00 2001 From: cryy <19242445+cryy@users.noreply.github.com> Date: Sun, 20 Apr 2025 19:53:26 +0200 Subject: [PATCH 2/7] Move cursor to end of text in book --- .../midnightcontrols/client/mixin/BookEditScreenAccessor.java | 4 ++++ .../midnightcontrols/fabric/event/MouseClickListener.java | 1 + 2 files changed, 5 insertions(+) diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/BookEditScreenAccessor.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/BookEditScreenAccessor.java index e26f51b..e44a57c 100644 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/BookEditScreenAccessor.java +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/BookEditScreenAccessor.java @@ -1,6 +1,7 @@ package eu.midnightdust.midnightcontrols.client.mixin; import net.minecraft.client.gui.screen.ingame.BookEditScreen; +import net.minecraft.client.util.SelectionManager; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Invoker; @@ -16,6 +17,9 @@ public interface BookEditScreenAccessor { @Accessor("title") void midnightcontrols$setTitle(String title); + @Accessor("currentPageSelectionManager") + SelectionManager midnightcontrols$getCurrentPageSelectionManager(); + @Invoker("getCurrentPageContent") String midnightcontrols$getCurrentPageContent(); diff --git a/fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/MouseClickListener.java b/fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/MouseClickListener.java index 6eefac9..d8b3610 100644 --- a/fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/MouseClickListener.java +++ b/fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/MouseClickListener.java @@ -95,6 +95,7 @@ public class MouseClickListener implements ScreenMouseEvents.AllowMouseClick { virtualKeyboardScreen = new VirtualKeyboardScreen(accessor.midnightcontrols$getCurrentPageContent(), (text) -> { client.setScreen(bookEditScreen); accessor.midnightcontrols$setPageContent(text); + accessor.midnightcontrols$getCurrentPageSelectionManager().putCursorAtEnd(); }); } From 662bac30533252146ecf12b92a701068bedf86be Mon Sep 17 00:00:00 2001 From: cryy <19242445+cryy@users.noreply.github.com> Date: Tue, 22 Apr 2025 19:36:26 +0200 Subject: [PATCH 3/7] Finalize virtual keyboard screen - Added backspace support - Added space support - Added new line support - Added caps support - Added symbol support --- .../client/gui/VirtualKeyboardScreen.java | 108 ------ .../client/gui/virtualkeyboard/KeyInfo.java | 16 + .../gui/virtualkeyboard/KeyboardLayout.java | 60 ++++ .../VirtualKeyboardScreen.java | 308 ++++++++++++++++++ .../fabric/event/MouseClickListener.java | 11 +- 5 files changed, 388 insertions(+), 115 deletions(-) delete mode 100644 common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/VirtualKeyboardScreen.java create mode 100644 common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/KeyInfo.java create mode 100644 common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/KeyboardLayout.java create mode 100644 common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/VirtualKeyboardScreen.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/VirtualKeyboardScreen.java deleted file mode 100644 index 55ca8c4..0000000 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/VirtualKeyboardScreen.java +++ /dev/null @@ -1,108 +0,0 @@ -package eu.midnightdust.midnightcontrols.client.gui; - -import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.text.Text; -import org.thinkingstudio.obsidianui.Position; -import org.thinkingstudio.obsidianui.SpruceTexts; -import org.thinkingstudio.obsidianui.screen.SpruceScreen; -import org.thinkingstudio.obsidianui.widget.SpruceButtonWidget; -import org.thinkingstudio.obsidianui.widget.container.SpruceContainerWidget; - -public class VirtualKeyboardScreen extends SpruceScreen { - private SpruceContainerWidget container; - private TextFieldWidget bufferDisplay; - private final StringBuilder buffer; - private final CloseCallback closeCallback; - - @FunctionalInterface - public interface CloseCallback { - void onClose(String text); - } - - public VirtualKeyboardScreen(String initialText, CloseCallback closeCallback) { - super(Text.literal("Virtual Keyboard")); - - this.buffer = new StringBuilder(initialText); - this.closeCallback = closeCallback; - } - - @Override - protected void init() { - super.init(); - - this.bufferDisplay = new TextFieldWidget(this.textRenderer, this.width / 2 - 100, this.height / 4 - 40, 200, 20, Text.literal("")); - this.bufferDisplay.setEditable(false); - this.bufferDisplay.setMaxLength(1024); - this.bufferDisplay.setText(buffer.toString()); - this.addDrawableChild(this.bufferDisplay); - - rebuildKeyboard(); - - this.addDrawableChild(container); - this.addDrawableChild(new SpruceButtonWidget(Position.of(this, this.width / 2 - 50, this.height - 30), 100, 20, SpruceTexts.GUI_DONE, btn -> this.close())); - } - - @Override - public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) { - super.render(drawContext, mouseX, mouseY, delta); - drawContext.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 10, 0xFFFFFF); - } - - - private void rebuildKeyboard() { - this.container = new SpruceContainerWidget(Position.of(0, this.height / 4 - 10), this.width, this.height / 2); - - - var row1 = new String[]{"q", "w", "e", "r", "t", "y", "u", "i", "o", "p"}; - var row2 = new String[]{"a", "s", "d", "f", "g", "h", "j", "k", "l"}; - var row3 = new String[]{"z", "x", "c", "v", "b", "n", "m"}; - - addKeyRow(0, row1); - addKeyRow(1, row2); - addKeyRow(2, row3); - } - - private void addKeyRow(int rowOffset, String... keys) { - int keyWidth = 20; - int spacing = 2; - int totalWidth = (keyWidth + spacing) * keys.length - spacing; - int startX = (this.width - totalWidth) / 2; - int y = this.height / 4 + rowOffset * 24; - - for (int i = 0; i < keys.length; i++) { - String key = keys[i]; - this.container.addChild(new SpruceButtonWidget(Position.of(startX + i * (keyWidth + spacing), y), keyWidth, 20, Text.literal(key), btn -> handleKeyPress(key))); - } - } - - private void handleKeyPress(String key) { - if (this.client == null) return; - - // TODO - if (key.equals("\b")) { - if (!buffer.isEmpty()) { - buffer.deleteCharAt(buffer.length() - 1); - } - } else { - buffer.append(key); - } - - if (this.bufferDisplay != null) { - this.bufferDisplay.setText(buffer.toString()); - } - } - - @Override - public boolean shouldPause() { - return false; - } - - @Override - public void close() { - super.close(); - if (closeCallback != null) { - closeCallback.onClose(buffer.toString()); - } - } -} \ No newline at end of file diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/KeyInfo.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/KeyInfo.java new file mode 100644 index 0000000..513a5e4 --- /dev/null +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/KeyInfo.java @@ -0,0 +1,16 @@ +package eu.midnightdust.midnightcontrols.client.gui.virtualkeyboard; + +public record KeyInfo(String keySymbol, String displayText, double widthFactor) { + // Convenience constructor for standard width keys + KeyInfo(String keySymbol, double widthFactor) { + this(keySymbol, keySymbol, widthFactor); + } + + KeyInfo(String keySymbol) { + this(keySymbol, 1.0); + } + + KeyInfo(String keySymbol, String displayText) { + this(keySymbol, displayText, 1.0); + } +} diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/KeyboardLayout.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/KeyboardLayout.java new file mode 100644 index 0000000..ccaa4d3 --- /dev/null +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/KeyboardLayout.java @@ -0,0 +1,60 @@ +package eu.midnightdust.midnightcontrols.client.gui.virtualkeyboard; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class KeyboardLayout { + + public static KeyboardLayout QWERTY = new KeyboardLayout(createQwertyLetterLayout(), createSymbolLayout()); + + private final List> letters; + private final List> symbols; + + private KeyboardLayout(List> letters, List> symbols) { + this.letters = letters; + this.symbols = symbols; + } + + public List> getLetters() { + return letters; + } + + public List> getSymbols() { + return symbols; + } + + private static List> createQwertyLetterLayout() { + List> letters = new ArrayList<>(); + letters.add(Arrays.asList( + new KeyInfo("q"), new KeyInfo("w"), new KeyInfo("e"), new KeyInfo("r"), new KeyInfo("t"), + new KeyInfo("y"), new KeyInfo("u"), new KeyInfo("i"), new KeyInfo("o"), new KeyInfo("p") + )); + letters.add(Arrays.asList( + new KeyInfo("a"), new KeyInfo("s"), new KeyInfo("d"), new KeyInfo("f"), new KeyInfo("g"), + new KeyInfo("h"), new KeyInfo("j"), new KeyInfo("k"), new KeyInfo("l") + )); + letters.add(Arrays.asList( + new KeyInfo("z"), new KeyInfo("x"), new KeyInfo("c"), new KeyInfo("v"), + new KeyInfo("b"), new KeyInfo("n"), new KeyInfo("m") + )); + return letters; + } + + private static List> createSymbolLayout() { + List> symbols = new ArrayList<>(); + symbols.add(Arrays.asList( + new KeyInfo("1"), new KeyInfo("2"), new KeyInfo("3"), new KeyInfo("4"), new KeyInfo("5"), + new KeyInfo("6"), new KeyInfo("7"), new KeyInfo("8"), new KeyInfo("9"), new KeyInfo("0") + )); + symbols.add(Arrays.asList( + new KeyInfo("@"), new KeyInfo("#"), new KeyInfo("$"), new KeyInfo("%"), new KeyInfo("&"), + new KeyInfo("*"), new KeyInfo("-"), new KeyInfo("+"), new KeyInfo("("), new KeyInfo(")") + )); + symbols.add(Arrays.asList( + new KeyInfo("!"), new KeyInfo("\""), new KeyInfo("'"), new KeyInfo(":"), new KeyInfo(";"), + new KeyInfo(","), new KeyInfo("."), new KeyInfo("?"), new KeyInfo("/") + )); + return symbols; + } +} \ No newline at end of file diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java new file mode 100644 index 0000000..758089b --- /dev/null +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java @@ -0,0 +1,308 @@ +package eu.midnightdust.midnightcontrols.client.gui.virtualkeyboard; + +import net.minecraft.client.gui.DrawContext; +import net.minecraft.text.Text; +import org.thinkingstudio.obsidianui.Position; +import org.thinkingstudio.obsidianui.SpruceTexts; +import org.thinkingstudio.obsidianui.screen.SpruceScreen; +import org.thinkingstudio.obsidianui.widget.SpruceButtonWidget; +import org.thinkingstudio.obsidianui.widget.container.SpruceContainerWidget; +import org.thinkingstudio.obsidianui.widget.text.SpruceTextAreaWidget; + +import java.util.List; + +public class VirtualKeyboardScreen extends SpruceScreen { + + @FunctionalInterface + public interface CloseCallback { + void onClose(String text); + } + + private static final int STANDARD_KEY_WIDTH = 20; + public static final int SPECIAL_KEY_WIDTH = (int) (STANDARD_KEY_WIDTH * 1.5); + private static final int KEY_HEIGHT = 20; + private static final int HORIZONTAL_SPACING = 2; + private static final int VERTICAL_SPACING = 4; + private static final int CONTAINER_PADDING = 10; + + // Key symbols + private static final String BACKSPACE_SYMBOL = "\b"; + private static final String NEWLINE_SYMBOL = "\n"; + private static final String SPACE_SYMBOL = " "; + + private final StringBuilder buffer; + private final CloseCallback closeCallback; + private final KeyboardLayout layout; + private final boolean newLineSupport; + + private boolean capsMode; + private boolean symbolMode; + private SpruceTextAreaWidget bufferDisplayArea; + private SpruceContainerWidget keyboardContainer; + + public VirtualKeyboardScreen(String initialText, CloseCallback closeCallback, boolean newLineSupport) { + super(Text.literal("Virtual Keyboard")); + this.buffer = new StringBuilder(initialText); + this.closeCallback = closeCallback; + this.layout = KeyboardLayout.QWERTY; + this.capsMode = false; + this.symbolMode = false; + this.newLineSupport = newLineSupport; + } + + @Override + protected void init() { + super.init(); + + this.bufferDisplayArea = createBufferDisplayArea(); + this.addDrawableChild(this.bufferDisplayArea); + + rebuildKeyboard(); + + int doneButtonY = this.keyboardContainer.getY() + this.keyboardContainer.getHeight() + VERTICAL_SPACING * 2; + this.addDrawableChild( + new SpruceButtonWidget( + Position.of(this, this.width / 2 - 50, doneButtonY), + 100, + 20, + SpruceTexts.GUI_DONE, + btn -> this.close() + ) + ); + } + + @Override + public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) { + this.renderBackground(drawContext, mouseX, mouseY, delta); + drawContext.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 15, 0xFFFFFF); + super.render(drawContext, mouseX, mouseY, delta); + } + + @Override + public boolean shouldPause() { + return false; + } + + @Override + public void close() { + super.close(); + if (this.closeCallback != null) { + this.closeCallback.onClose(this.buffer.toString()); + } + } + + private void rebuildKeyboard() { + if (this.keyboardContainer != null) { + this.remove(this.keyboardContainer); + } + + var keys = getActiveKeyLayout(); + var keyboardContainer = createKeyboardContainer(keys); + + addLetterRows(keyboardContainer, keys); + addFunctionKeys(keyboardContainer); + addBottomRow(keyboardContainer); + + this.keyboardContainer = keyboardContainer; + this.addDrawableChild(this.keyboardContainer); + } + + private SpruceContainerWidget createKeyboardContainer(List> layoutKeys) { + int containerWidth = this.width; + int totalKeyboardHeight = calculateKeyboardHeight(layoutKeys); + int keyboardY = this.bufferDisplayArea.getY() + this.bufferDisplayArea.getHeight() + VERTICAL_SPACING * 2; + + return new SpruceContainerWidget( + Position.of(0, keyboardY), + containerWidth, + totalKeyboardHeight + ); + } + + private SpruceTextAreaWidget createBufferDisplayArea() { + int lineCount = this.newLineSupport ? 3 : 1; + int bufferX = this.width / 2 - 100; + int bufferY = this.height / 4 - VERTICAL_SPACING * 5 - 5; + int bufferWidth = 200; + int desiredHeight = (this.textRenderer.fontHeight + 2) * lineCount + 6; + + var bufferDisplay = new SpruceTextAreaWidget( + Position.of(bufferX, bufferY), + bufferWidth, + desiredHeight, + Text.literal("Buffer Display") + ); + bufferDisplay.setText(this.buffer.toString()); + bufferDisplay.setEditable(false); + bufferDisplay.setUneditableColor(0xFFFFFFFF); + bufferDisplay.setDisplayedLines(lineCount); + bufferDisplay.setCursorToEnd(); + + return bufferDisplay; + } + + private int calculateKeyboardHeight(List> keyRows) { + return keyRows.size() * (KEY_HEIGHT + VERTICAL_SPACING) + + (KEY_HEIGHT + VERTICAL_SPACING) + // space for bottom row + CONTAINER_PADDING * 2; // top and bottom padding + } + + private void addLetterRows(SpruceContainerWidget container, List> keyRows) { + int currentY = CONTAINER_PADDING; + + for (List row : keyRows) { + int rowWidth = calculateRowWidth(row); + // center row + int currentX = (container.getWidth() - rowWidth) / 2; + + for (KeyInfo keyInfo : row) { + int keyWidth = (int) (STANDARD_KEY_WIDTH * keyInfo.widthFactor()); + String displayText = getKeyDisplayText(keyInfo); + container.addChild( + new SpruceButtonWidget( + Position.of(currentX, currentY), + keyWidth, + KEY_HEIGHT, + Text.literal(displayText), + btn -> handleKeyPress(displayText) + ) + ); + + currentX += keyWidth + HORIZONTAL_SPACING; + } + + currentY += KEY_HEIGHT + VERTICAL_SPACING; + } + } + + private int calculateRowWidth(List row) { + int rowWidth = 0; + for (int i = 0; i < row.size(); i++) { + rowWidth += (int) (STANDARD_KEY_WIDTH * row.get(i).widthFactor()); + if (i < row.size() - 1) { + rowWidth += HORIZONTAL_SPACING; + } + } + return rowWidth; + } + + private void addFunctionKeys(SpruceContainerWidget container) { + List firstRow = getActiveKeyLayout().get(0); + int firstRowWidth = calculateRowWidth(firstRow); + + // position backspace at the right of the first row + int backspaceWidth = (int) (STANDARD_KEY_WIDTH * 1.5); + int backspaceX = (container.getWidth() + firstRowWidth) / 2 + HORIZONTAL_SPACING; + + container.addChild( + new SpruceButtonWidget( + Position.of(backspaceX, CONTAINER_PADDING), + backspaceWidth, + KEY_HEIGHT, + Text.literal("←"), + btn -> handleKeyPress(BACKSPACE_SYMBOL) + ) + ); + + + if (this.newLineSupport) { + // position newline at the right of the second row + List secondRow = getActiveKeyLayout().get(1); + int newlineWidth = (int) (STANDARD_KEY_WIDTH * 1.5); + int secondRowWidth = calculateRowWidth(secondRow); + int newlineX = (container.getWidth() + secondRowWidth) / 2 + HORIZONTAL_SPACING; + int newlineY = CONTAINER_PADDING + (KEY_HEIGHT + VERTICAL_SPACING); + + container.addChild( + new SpruceButtonWidget( + Position.of(newlineX, newlineY), + newlineWidth, + KEY_HEIGHT, + Text.literal("⏎"), + btn -> handleKeyPress(NEWLINE_SYMBOL) + ) + ); + } + } + + private void addBottomRow(SpruceContainerWidget container) { + // calculate positions for bottom row + int rowY = CONTAINER_PADDING + getActiveKeyLayout().size() * (KEY_HEIGHT + VERTICAL_SPACING); + + // space bar - wide key in the middle + double spaceWidthFactor = 5.0; + int spaceKeyWidth = (int) (STANDARD_KEY_WIDTH * spaceWidthFactor); + int spaceX = (container.getWidth() - spaceKeyWidth) / 2; + + container.addChild( + new SpruceButtonWidget( + Position.of(spaceX, rowY), + spaceKeyWidth, + KEY_HEIGHT, + Text.literal("Space"), + btn -> handleKeyPress(SPACE_SYMBOL) + ) + ); + + // caps key - left of space + if (!this.symbolMode) { + int capsX = spaceX - SPECIAL_KEY_WIDTH - HORIZONTAL_SPACING * 2; + var capsModeButton = new SpruceButtonWidget( + Position.of(capsX, rowY), + SPECIAL_KEY_WIDTH, + KEY_HEIGHT, + Text.literal(this.capsMode ? "caps" : "CAPS"), + btn -> toggleCapsMode()); + + container.addChild(capsModeButton); + } + + // symbols key - right of space + int symbolsX = spaceX + spaceKeyWidth + HORIZONTAL_SPACING * 2; + var symbolModeButton = new SpruceButtonWidget( + Position.of(symbolsX, rowY), + SPECIAL_KEY_WIDTH, + KEY_HEIGHT, + Text.literal(this.symbolMode ? "ABC" : "123?!"), + btn -> toggleSymbolMode() + ); + container.addChild(symbolModeButton); + } + + private void handleKeyPress(String key) { + if (key.equals(BACKSPACE_SYMBOL)) { + if (!this.buffer.isEmpty()) { + this.buffer.deleteCharAt(buffer.length() - 1); + } + } else { + this.buffer.append(key); + } + + if (this.bufferDisplayArea != null) { + this.bufferDisplayArea.setText(this.buffer.toString()); + this.bufferDisplayArea.setCursorToEnd(); + } + } + + private String getKeyDisplayText(KeyInfo keyInfo) { + if(this.capsMode && !this.symbolMode) { + return keyInfo.displayText().toUpperCase(); + } + + return keyInfo.displayText(); + } + + private List> getActiveKeyLayout() { + return this.symbolMode ? this.layout.getSymbols() : this.layout.getLetters(); + } + + private void toggleCapsMode() { + this.capsMode = !this.capsMode; + rebuildKeyboard(); + } + + private void toggleSymbolMode() { + this.symbolMode = !this.symbolMode; + rebuildKeyboard(); + } +} \ No newline at end of file diff --git a/fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/MouseClickListener.java b/fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/MouseClickListener.java index d8b3610..5980a85 100644 --- a/fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/MouseClickListener.java +++ b/fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/MouseClickListener.java @@ -1,10 +1,9 @@ package eu.midnightdust.midnightcontrols.fabric.event; -import eu.midnightdust.midnightcontrols.client.gui.VirtualKeyboardScreen; +import eu.midnightdust.midnightcontrols.client.gui.virtualkeyboard.VirtualKeyboardScreen; import eu.midnightdust.midnightcontrols.client.mixin.AbstractSignEditScreenAccessor; import eu.midnightdust.midnightcontrols.client.mixin.BookEditScreenAccessor; import eu.midnightdust.midnightcontrols.client.mixin.CreativeInventoryScreenAccessor; import net.fabricmc.fabric.api.client.screen.v1.ScreenMouseEvents; -import net.minecraft.block.entity.SignText; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.ParentElement; import net.minecraft.client.gui.screen.ChatScreen; @@ -18,7 +17,6 @@ import org.lwjgl.glfw.GLFW; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; import static eu.midnightdust.midnightcontrols.MidnightControls.logger; import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client; @@ -89,14 +87,14 @@ public class MouseClickListener implements ScreenMouseEvents.AllowMouseClick { virtualKeyboardScreen = new VirtualKeyboardScreen(accessor.midnightcontrols$getTitle(), (text) -> { client.setScreen(bookEditScreen); accessor.midnightcontrols$setTitle(text); - }); + }, true); } else { virtualKeyboardScreen = new VirtualKeyboardScreen(accessor.midnightcontrols$getCurrentPageContent(), (text) -> { client.setScreen(bookEditScreen); accessor.midnightcontrols$setPageContent(text); accessor.midnightcontrols$getCurrentPageSelectionManager().putCursorAtEnd(); - }); + }, true); } client.setScreen(virtualKeyboardScreen); @@ -109,7 +107,7 @@ public class MouseClickListener implements ScreenMouseEvents.AllowMouseClick { private void handleTextFieldClick(TextFieldWidget textField) { this.link = new ScreenLink(screen, calculatePathToElement(screen, textField)); - var virtualKeyboardScreen = new VirtualKeyboardScreen(textField.getText(), this::handleKeyboardClose); + var virtualKeyboardScreen = new VirtualKeyboardScreen(textField.getText(), this::handleKeyboardClose, false); client.setScreen(virtualKeyboardScreen); } @@ -126,7 +124,6 @@ public class MouseClickListener implements ScreenMouseEvents.AllowMouseClick { txtField.setText(newText); - switch (this.link.screen()) { case CreativeInventoryScreen creativeInventoryScreen -> { var accessor = (CreativeInventoryScreenAccessor) creativeInventoryScreen; From 041eeb29aaf801ed09590460f0ce1e54e3d041f6 Mon Sep 17 00:00:00 2001 From: cryy <19242445+cryy@users.noreply.github.com> Date: Tue, 22 Apr 2025 19:39:56 +0200 Subject: [PATCH 4/7] Make special key constant private --- .../client/gui/virtualkeyboard/VirtualKeyboardScreen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java index 758089b..00d5557 100644 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java @@ -19,7 +19,7 @@ public class VirtualKeyboardScreen extends SpruceScreen { } private static final int STANDARD_KEY_WIDTH = 20; - public static final int SPECIAL_KEY_WIDTH = (int) (STANDARD_KEY_WIDTH * 1.5); + private static final int SPECIAL_KEY_WIDTH = (int) (STANDARD_KEY_WIDTH * 1.5); private static final int KEY_HEIGHT = 20; private static final int HORIZONTAL_SPACING = 2; private static final int VERTICAL_SPACING = 4; From bb5c6976c0d5cf4fd0cb5519731f3de8aabf2c93 Mon Sep 17 00:00:00 2001 From: cryy <19242445+cryy@users.noreply.github.com> Date: Tue, 22 Apr 2025 20:16:08 +0200 Subject: [PATCH 5/7] Replace KeyInfo with String - KeyInfo was leftover code from toying around with various implementations. String is sufficient in current implementation. --- .../client/gui/virtualkeyboard/KeyInfo.java | 16 ------- .../gui/virtualkeyboard/KeyboardLayout.java | 42 +++++++++---------- .../VirtualKeyboardScreen.java | 41 +++++++----------- 3 files changed, 36 insertions(+), 63 deletions(-) delete mode 100644 common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/KeyInfo.java diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/KeyInfo.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/KeyInfo.java deleted file mode 100644 index 513a5e4..0000000 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/KeyInfo.java +++ /dev/null @@ -1,16 +0,0 @@ -package eu.midnightdust.midnightcontrols.client.gui.virtualkeyboard; - -public record KeyInfo(String keySymbol, String displayText, double widthFactor) { - // Convenience constructor for standard width keys - KeyInfo(String keySymbol, double widthFactor) { - this(keySymbol, keySymbol, widthFactor); - } - - KeyInfo(String keySymbol) { - this(keySymbol, 1.0); - } - - KeyInfo(String keySymbol, String displayText) { - this(keySymbol, displayText, 1.0); - } -} diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/KeyboardLayout.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/KeyboardLayout.java index ccaa4d3..69732a6 100644 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/KeyboardLayout.java +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/KeyboardLayout.java @@ -8,52 +8,52 @@ public class KeyboardLayout { public static KeyboardLayout QWERTY = new KeyboardLayout(createQwertyLetterLayout(), createSymbolLayout()); - private final List> letters; - private final List> symbols; + private final List> letters; + private final List> symbols; - private KeyboardLayout(List> letters, List> symbols) { + private KeyboardLayout(List> letters, List> symbols) { this.letters = letters; this.symbols = symbols; } - public List> getLetters() { + public List> getLetters() { return letters; } - public List> getSymbols() { + public List> getSymbols() { return symbols; } - private static List> createQwertyLetterLayout() { - List> letters = new ArrayList<>(); + private static List> createQwertyLetterLayout() { + List> letters = new ArrayList<>(); letters.add(Arrays.asList( - new KeyInfo("q"), new KeyInfo("w"), new KeyInfo("e"), new KeyInfo("r"), new KeyInfo("t"), - new KeyInfo("y"), new KeyInfo("u"), new KeyInfo("i"), new KeyInfo("o"), new KeyInfo("p") + "q", "w", "e", "r", "t", + "y", "u", "i", "o", "p" )); letters.add(Arrays.asList( - new KeyInfo("a"), new KeyInfo("s"), new KeyInfo("d"), new KeyInfo("f"), new KeyInfo("g"), - new KeyInfo("h"), new KeyInfo("j"), new KeyInfo("k"), new KeyInfo("l") + "a", "s", "d", "f", "g", + "h", "j", "k", "l" )); letters.add(Arrays.asList( - new KeyInfo("z"), new KeyInfo("x"), new KeyInfo("c"), new KeyInfo("v"), - new KeyInfo("b"), new KeyInfo("n"), new KeyInfo("m") + "z", "x", "c", "v", + "b", "n", "m" )); return letters; } - private static List> createSymbolLayout() { - List> symbols = new ArrayList<>(); + private static List> createSymbolLayout() { + List> symbols = new ArrayList<>(); symbols.add(Arrays.asList( - new KeyInfo("1"), new KeyInfo("2"), new KeyInfo("3"), new KeyInfo("4"), new KeyInfo("5"), - new KeyInfo("6"), new KeyInfo("7"), new KeyInfo("8"), new KeyInfo("9"), new KeyInfo("0") + "1", "2", "3", "4", "5", + "6", "7", "8", "9", "0" )); symbols.add(Arrays.asList( - new KeyInfo("@"), new KeyInfo("#"), new KeyInfo("$"), new KeyInfo("%"), new KeyInfo("&"), - new KeyInfo("*"), new KeyInfo("-"), new KeyInfo("+"), new KeyInfo("("), new KeyInfo(")") + "@", "#", "$", "%", "&", + "*", "-", "+", "(", ")" )); symbols.add(Arrays.asList( - new KeyInfo("!"), new KeyInfo("\""), new KeyInfo("'"), new KeyInfo(":"), new KeyInfo(";"), - new KeyInfo(","), new KeyInfo("."), new KeyInfo("?"), new KeyInfo("/") + "!", "\"", "'", ":", ";", + ",", ".", "?", "/" )); return symbols; } diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java index 00d5557..9b1d036 100644 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java @@ -74,7 +74,6 @@ public class VirtualKeyboardScreen extends SpruceScreen { @Override public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) { this.renderBackground(drawContext, mouseX, mouseY, delta); - drawContext.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 15, 0xFFFFFF); super.render(drawContext, mouseX, mouseY, delta); } @@ -96,10 +95,10 @@ public class VirtualKeyboardScreen extends SpruceScreen { this.remove(this.keyboardContainer); } - var keys = getActiveKeyLayout(); - var keyboardContainer = createKeyboardContainer(keys); + var layoutKeys = getActiveKeyLayout(); + var keyboardContainer = createKeyboardContainer(layoutKeys); - addLetterRows(keyboardContainer, keys); + addLayoutRows(keyboardContainer, layoutKeys); addFunctionKeys(keyboardContainer); addBottomRow(keyboardContainer); @@ -107,7 +106,7 @@ public class VirtualKeyboardScreen extends SpruceScreen { this.addDrawableChild(this.keyboardContainer); } - private SpruceContainerWidget createKeyboardContainer(List> layoutKeys) { + private SpruceContainerWidget createKeyboardContainer(List> layoutKeys) { int containerWidth = this.width; int totalKeyboardHeight = calculateKeyboardHeight(layoutKeys); int keyboardY = this.bufferDisplayArea.getY() + this.bufferDisplayArea.getHeight() + VERTICAL_SPACING * 2; @@ -141,44 +140,42 @@ public class VirtualKeyboardScreen extends SpruceScreen { return bufferDisplay; } - private int calculateKeyboardHeight(List> keyRows) { + private int calculateKeyboardHeight(List> keyRows) { return keyRows.size() * (KEY_HEIGHT + VERTICAL_SPACING) + (KEY_HEIGHT + VERTICAL_SPACING) + // space for bottom row CONTAINER_PADDING * 2; // top and bottom padding } - private void addLetterRows(SpruceContainerWidget container, List> keyRows) { + private void addLayoutRows(SpruceContainerWidget container, List> keyLayoutRows) { int currentY = CONTAINER_PADDING; - for (List row : keyRows) { + for (List row : keyLayoutRows) { int rowWidth = calculateRowWidth(row); // center row int currentX = (container.getWidth() - rowWidth) / 2; - for (KeyInfo keyInfo : row) { - int keyWidth = (int) (STANDARD_KEY_WIDTH * keyInfo.widthFactor()); - String displayText = getKeyDisplayText(keyInfo); + for (String key : row) { + String displayText = (this.capsMode && !this.symbolMode) ? key.toUpperCase() : key; container.addChild( new SpruceButtonWidget( Position.of(currentX, currentY), - keyWidth, + STANDARD_KEY_WIDTH, KEY_HEIGHT, Text.literal(displayText), btn -> handleKeyPress(displayText) ) ); - currentX += keyWidth + HORIZONTAL_SPACING; + currentX += STANDARD_KEY_WIDTH + HORIZONTAL_SPACING; } currentY += KEY_HEIGHT + VERTICAL_SPACING; } } - private int calculateRowWidth(List row) { + private int calculateRowWidth(List row) { int rowWidth = 0; for (int i = 0; i < row.size(); i++) { - rowWidth += (int) (STANDARD_KEY_WIDTH * row.get(i).widthFactor()); if (i < row.size() - 1) { rowWidth += HORIZONTAL_SPACING; } @@ -187,7 +184,7 @@ public class VirtualKeyboardScreen extends SpruceScreen { } private void addFunctionKeys(SpruceContainerWidget container) { - List firstRow = getActiveKeyLayout().get(0); + List firstRow = getActiveKeyLayout().get(0); int firstRowWidth = calculateRowWidth(firstRow); // position backspace at the right of the first row @@ -207,7 +204,7 @@ public class VirtualKeyboardScreen extends SpruceScreen { if (this.newLineSupport) { // position newline at the right of the second row - List secondRow = getActiveKeyLayout().get(1); + List secondRow = getActiveKeyLayout().get(1); int newlineWidth = (int) (STANDARD_KEY_WIDTH * 1.5); int secondRowWidth = calculateRowWidth(secondRow); int newlineX = (container.getWidth() + secondRowWidth) / 2 + HORIZONTAL_SPACING; @@ -284,15 +281,7 @@ public class VirtualKeyboardScreen extends SpruceScreen { } } - private String getKeyDisplayText(KeyInfo keyInfo) { - if(this.capsMode && !this.symbolMode) { - return keyInfo.displayText().toUpperCase(); - } - - return keyInfo.displayText(); - } - - private List> getActiveKeyLayout() { + private List> getActiveKeyLayout() { return this.symbolMode ? this.layout.getSymbols() : this.layout.getLetters(); } From 9ebd1a9ceafa20284b3f77b273d7f8250535887e Mon Sep 17 00:00:00 2001 From: cryy <19242445+cryy@users.noreply.github.com> Date: Tue, 22 Apr 2025 20:17:25 +0200 Subject: [PATCH 6/7] Increase displayed lines for newline support --- .../client/gui/virtualkeyboard/VirtualKeyboardScreen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java index 9b1d036..0ed71ae 100644 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java @@ -119,7 +119,7 @@ public class VirtualKeyboardScreen extends SpruceScreen { } private SpruceTextAreaWidget createBufferDisplayArea() { - int lineCount = this.newLineSupport ? 3 : 1; + int lineCount = this.newLineSupport ? 4 : 1; int bufferX = this.width / 2 - 100; int bufferY = this.height / 4 - VERTICAL_SPACING * 5 - 5; int bufferWidth = 200; From 0ef59057afc78204c1cf61c7de71c0f495ddf619 Mon Sep 17 00:00:00 2001 From: cryy <19242445+cryy@users.noreply.github.com> Date: Tue, 22 Apr 2025 20:21:02 +0200 Subject: [PATCH 7/7] Add missing row width calculation --- .../client/gui/virtualkeyboard/VirtualKeyboardScreen.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java index 0ed71ae..2f876a3 100644 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/virtualkeyboard/VirtualKeyboardScreen.java @@ -176,6 +176,8 @@ public class VirtualKeyboardScreen extends SpruceScreen { private int calculateRowWidth(List row) { int rowWidth = 0; for (int i = 0; i < row.size(); i++) { + rowWidth += STANDARD_KEY_WIDTH; + // padding if (i < row.size() - 1) { rowWidth += HORIZONTAL_SPACING; }