Skip to content

Commit

Permalink
refactor: remaned GuiHandler to LinuxGuiHandler
Browse files Browse the repository at this point in the history
  • Loading branch information
@JasonHK
JasonHK committed Aug 7, 2020
1 parent d5f8404 commit aad564d
Show file tree
Hide file tree
Showing 2 changed files with 102 additions and 92 deletions.
13 changes: 9 additions & 4 deletions ...orvaldsinput/gui/handlers/GuiHandler.java → ...dsinput/gui/handlers/LinuxGuiHandler.java
View file
@@ -1,19 +1,24 @@
package net.jasonhk.minecraft.mods.torvaldsinput.gui.handlers;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import net.jasonhk.minecraft.mods.torvaldsinput.input.LinuxKeyboard;

@Data
@EqualsAndHashCode(callSuper = false)
public final class GuiHandler extends AbstractGuiHandler
@ToString
public final class LinuxGuiHandler extends AbstractGuiHandler
{
/**
* The pointer to the input context of an X client.
* The pointer to an X input context.
*/
private final long xic;

public LinuxGuiHandler(long xic)
{
this.xic = xic;
}

@Override
protected void setInputFocus(boolean focused)
{
Expand Down
181 changes: 93 additions & 88 deletions src/main/java/net/jasonhk/minecraft/mods/torvaldsinput/input/mixins/MixinLinuxKeyboard.java
View file
@@ -1,88 +1,93 @@
package net.jasonhk.minecraft.mods.torvaldsinput.input.mixins;

import net.minecraftforge.common.MinecraftForge;

import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

import net.jasonhk.minecraft.mods.torvaldsinput.gui.handlers.GuiHandler;
import net.jasonhk.minecraft.mods.torvaldsinput.input.LinuxKeyboard;

/**
* The mixin injector class targeting {@link org.lwjgl.opengl.LinuxKeyboard}.
*/
@SuppressWarnings({ "JavadocReference", "UnusedMixin" })
@Mixin(targets = "org.lwjgl.opengl.LinuxKeyboard", remap = false)
public abstract class MixinLinuxKeyboard
{
/**
* The pointer to the input context of an X client.
*
* @see org.lwjgl.opengl.LinuxKeyboard#xic
*/
@Shadow
@Final
private long xic;

/**
* The {@code GuiHandler} event handler.
*/
@Unique
private GuiHandler guiHandler;

/**
* Redirects the invocations of {@link org.lwjgl.opengl.LinuxKeyboard#openIM(long)} to my own
* {@linkplain LinuxKeyboard#openIM(long) implementation}.
*
* @param display The pointer to an X display connection.
* @return The pointer to an X input method.
*
* @see org.lwjgl.opengl.LinuxKeyboard#LinuxKeyboard(long, long)
*/
@Redirect(method = "<init>",
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/LinuxKeyboard;openIM(J)J"))
private long redirect_init_INVOKE_openIM(long display)
{
return LinuxKeyboard.openIM(display);
}

/**
* Injects the codes to initialise and register the {@link #guiHandler GuiHandler} event handler.
*
* @param callback The information on the method call.
*
* @see org.lwjgl.opengl.LinuxKeyboard#LinuxKeyboard(long, long)
*/
@Inject(method = "<init>", at = @At(value = "RETURN"))
private void inject_init_RETURN(CallbackInfo callback)
{
if (xic != 0)
{
guiHandler = new GuiHandler(xic);
MinecraftForge.EVENT_BUS.register(guiHandler);
}
}

/**
* Injects the codes to unregister and remove the {@link #guiHandler GuiHandler} event handler.
*
* @param callback The information on the method call.
*
* @see org.lwjgl.opengl.LinuxKeyboard#destroy(long)
*/
@Inject(method = "destroy", at = @At(value = "HEAD"))
private void inject_destroy_HEAD(CallbackInfo callback)
{
if (guiHandler != null)
{
MinecraftForge.EVENT_BUS.unregister(guiHandler);
guiHandler = null;
}
}
}
//#if MINECRAFT>=11300
// This mixin class is meant for LWJGL 2.X, which is used by Minecraft 1.12.2 or older.
//#else
//$$ package net.jasonhk.minecraft.mods.torvaldsinput.input.mixins;
//$$
//$$ import net.minecraftforge.common.MinecraftForge;
//$$
//$$ import org.spongepowered.asm.mixin.Final;
//$$ import org.spongepowered.asm.mixin.Mixin;
//$$ import org.spongepowered.asm.mixin.Shadow;
//$$ import org.spongepowered.asm.mixin.Unique;
//$$ import org.spongepowered.asm.mixin.injection.At;
//$$ import org.spongepowered.asm.mixin.injection.Inject;
//$$ import org.spongepowered.asm.mixin.injection.Redirect;
//$$ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
//$$
//$$ import net.jasonhk.minecraft.mods.torvaldsinput.gui.handlers.AbstractGuiHandler;
//$$ import net.jasonhk.minecraft.mods.torvaldsinput.gui.handlers.LinuxGuiHandler;
//$$ import net.jasonhk.minecraft.mods.torvaldsinput.input.LinuxKeyboard;
//$$
//$$ /**
//$$ * The mixin class targeting {@link org.lwjgl.opengl.LinuxKeyboard}.
//$$ */
//$$ @SuppressWarnings({ "JavadocReference", "UnusedMixin" })
//$$ @Mixin(targets = "org.lwjgl.opengl.LinuxKeyboard", remap = false)
//$$ public abstract class MixinLinuxKeyboard
//$$ {
//$$ /**
//$$ * The pointer to the input context of an X client.
//$$ *
//$$ * @see org.lwjgl.opengl.LinuxKeyboard#xic
//$$ */
//$$ @Shadow
//$$ @Final
//$$ private long xic;
//$$
//$$ /**
//$$ * The {@code GuiHandler} event handler.
//$$ */
//$$ @Unique
//$$ private AbstractGuiHandler guiHandler;
//$$
//$$ /**
//$$ * Redirects the invocations of {@link org.lwjgl.opengl.LinuxKeyboard#openIM(long)} to my own
//$$ * {@linkplain LinuxKeyboard#openIM(long) implementation}.
//$$ *
//$$ * @param display The pointer to an X display connection.
//$$ * @return The pointer to an X input method.
//$$ *
//$$ * @see org.lwjgl.opengl.LinuxKeyboard#LinuxKeyboard(long, long)
//$$ */
//$$ @Redirect(method = "<init>",
//$$ at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/LinuxKeyboard;openIM(J)J"))
//$$ private long redirect_init_INVOKE_openIM(long display)
//$$ {
//$$ return LinuxKeyboard.openIM(display);
//$$ }
//$$
//$$ /**
//$$ * Injects the codes to initialise and register the {@link #guiHandler GuiHandler} event handler.
//$$ *
//$$ * @param callback The information on the method call.
//$$ *
//$$ * @see org.lwjgl.opengl.LinuxKeyboard#LinuxKeyboard(long, long)
//$$ */
//$$ @Inject(method = "<init>", at = @At(value = "RETURN"))
//$$ private void inject_init_RETURN(CallbackInfo callback)
//$$ {
//$$ if (xic != 0)
//$$ {
//$$ guiHandler = new LinuxGuiHandler(xic);
//$$ MinecraftForge.EVENT_BUS.register(guiHandler);
//$$ }
//$$ }
//$$
//$$ /**
//$$ * Injects the codes to unregister and remove the {@link #guiHandler GuiHandler} event handler.
//$$ *
//$$ * @param callback The information on the method call.
//$$ *
//$$ * @see org.lwjgl.opengl.LinuxKeyboard#destroy(long)
//$$ */
//$$ @Inject(method = "destroy", at = @At(value = "HEAD"))
//$$ private void inject_destroy_HEAD(CallbackInfo callback)
//$$ {
//$$ if (guiHandler != null)
//$$ {
//$$ MinecraftForge.EVENT_BUS.unregister(guiHandler);
//$$ guiHandler = null;
//$$ }
//$$ }
//$$ }
//#endif

0 comments on commit aad564d

Please sign in to comment.