X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fbackend%2FTWindowBackend.java;h=f644b76ba4bf3d9e1642502ae330fc97146d1a5d;hb=12b90437b5f22c2ae6e9b9b14c3b62b60f6143e5;hp=41809cff5c5cd0452b8d9d508de8c02fe9d3bfb9;hpb=d36057dfab8def933a64be042b039d76708ac5ba;p=fanfix.git diff --git a/src/jexer/backend/TWindowBackend.java b/src/jexer/backend/TWindowBackend.java index 41809cf..f644b76 100644 --- a/src/jexer/backend/TWindowBackend.java +++ b/src/jexer/backend/TWindowBackend.java @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (C) 2017 Kevin Lamonte + * Copyright (C) 2019 Kevin Lamonte * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -28,15 +28,17 @@ */ package jexer.backend; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; -import jexer.bits.CellAttributes; +import jexer.TApplication; +import jexer.TWindow; +import jexer.event.TCommandEvent; import jexer.event.TInputEvent; import jexer.event.TKeypressEvent; import jexer.event.TMouseEvent; -import jexer.TApplication; -import jexer.TWindow; +import jexer.event.TResizeEvent; +import static jexer.TCommand.*; /** * TWindowBackend uses a window in one TApplication to provide a backend for @@ -69,24 +71,69 @@ public class TWindowBackend extends TWindow implements Backend { private List eventQueue; /** - * The screen to use. + * The screen this window is monitoring. */ private Screen otherScreen; /** - * The mouse X position as seen on the other screen. + * The application associated with otherScreen. */ - private int otherMouseX = -1; + private TApplication otherApplication; /** - * The mouse Y position as seen on the other screen. + * The session information. */ - private int otherMouseY = -1; + private SessionInfo sessionInfo; /** - * The session information. + * OtherScreen provides a hook to notify TWindowBackend of screen size + * changes. */ - private SessionInfo sessionInfo; + private class OtherScreen extends LogicalScreen { + + /** + * The TWindowBackend to notify. + */ + private TWindowBackend window; + + /** + * Public constructor. + */ + public OtherScreen(final TWindowBackend window) { + this.window = window; + } + + /** + * Resize the physical screen to match the logical screen dimensions. + */ + @Override + public void resizeToScreen() { + window.setWidth(getWidth() + 2); + window.setHeight(getHeight() + 2); + } + + /** + * Get the width of a character cell in pixels. + * + * @return the width in pixels of a character cell + */ + @Override + public int getTextWidth() { + return window.getScreen().getTextWidth(); + } + + /** + * Get the height of a character cell in pixels. + * + * @return the height in pixels of a character cell + */ + @Override + public int getTextHeight() { + return window.getScreen().getTextHeight(); + } + + } + // ------------------------------------------------------------------------ // Constructors ----------------------------------------------------------- @@ -109,11 +156,12 @@ public class TWindowBackend extends TWindow implements Backend { super(application, title, width, height); this.listener = listener; - eventQueue = new LinkedList(); + eventQueue = new ArrayList(); sessionInfo = new TSessionInfo(width, height); - otherScreen = new LogicalScreen(); + otherScreen = new OtherScreen(this); otherScreen.setDimensions(width - 2, height - 2); drawLock = otherScreen; + setHiddenMouse(true); } /** @@ -134,11 +182,12 @@ public class TWindowBackend extends TWindow implements Backend { super(application, title, width, height, flags); this.listener = listener; - eventQueue = new LinkedList(); + eventQueue = new ArrayList(); sessionInfo = new TSessionInfo(width, height); - otherScreen = new LogicalScreen(); + otherScreen = new OtherScreen(this); otherScreen.setDimensions(width - 2, height - 2); drawLock = otherScreen; + setHiddenMouse(true); } /** @@ -160,11 +209,12 @@ public class TWindowBackend extends TWindow implements Backend { super(application, title, x, y, width, height); this.listener = listener; - eventQueue = new LinkedList(); + eventQueue = new ArrayList(); sessionInfo = new TSessionInfo(width, height); - otherScreen = new LogicalScreen(); + otherScreen = new OtherScreen(this); otherScreen.setDimensions(width - 2, height - 2); drawLock = otherScreen; + setHiddenMouse(true); } /** @@ -188,17 +238,47 @@ public class TWindowBackend extends TWindow implements Backend { super(application, title, x, y, width, height, flags); this.listener = listener; - eventQueue = new LinkedList(); + eventQueue = new ArrayList(); sessionInfo = new TSessionInfo(width, height); - otherScreen = new LogicalScreen(); + otherScreen = new OtherScreen(this); otherScreen.setDimensions(width - 2, height - 2); drawLock = otherScreen; + setHiddenMouse(true); } // ------------------------------------------------------------------------ // Event handlers --------------------------------------------------------- // ------------------------------------------------------------------------ + /** + * Handle window/screen resize events. + * + * @param event resize event + */ + @Override + public void onResize(final TResizeEvent event) { + if (event.getType() == TResizeEvent.Type.WIDGET) { + int newWidth = event.getWidth() - 2; + int newHeight = event.getHeight() - 2; + if ((newWidth != otherScreen.getWidth()) + || (newHeight != otherScreen.getHeight()) + ) { + // I was resized, notify the screen I am watching to match my + // new size. + synchronized (eventQueue) { + eventQueue.add(new TResizeEvent(TResizeEvent.Type.SCREEN, + newWidth, newHeight)); + } + synchronized (listener) { + listener.notifyAll(); + } + } + return; + } else { + super.onResize(event); + } + } + /** * Returns true if the mouse is currently in the otherScreen window. * @@ -275,17 +355,12 @@ public class TWindowBackend extends TWindow implements Backend { event.setY(mouse.getY() - 1); event.setAbsoluteX(event.getX()); event.setAbsoluteY(event.getY()); - otherMouseX = event.getX() + getX() + 1; - otherMouseY = event.getY() + getY() + 1; synchronized (eventQueue) { eventQueue.add(event); } synchronized (listener) { listener.notifyAll(); } - } else { - otherMouseX = -1; - otherMouseY = -1; } super.onMouseMotion(mouse); } @@ -329,17 +404,6 @@ public class TWindowBackend extends TWindow implements Backend { } } - // If the mouse pointer is over the other window, draw its - // pointer again here. (Their TApplication drew it, then our - // TApplication drew it again (undo-ing it), so now we draw it a - // third time so that it is visible.) - if ((otherMouseX != -1) && (otherMouseY != -1)) { - CellAttributes attr = getAttrXY(otherMouseX, otherMouseY); - attr.setForeColor(attr.getForeColor().invert()); - attr.setBackColor(attr.getBackColor().invert()); - putAttrXY(otherMouseX, otherMouseY, attr, false); - } - // If their cursor is visible, draw that here too. if (otherScreen.isCursorVisible()) { setCursorX(otherScreen.getCursorX() + 1); @@ -349,6 +413,15 @@ public class TWindowBackend extends TWindow implements Backend { setCursorVisible(false); } } + + // Check if the other application has died. If so, unset hidden + // mouse. + if (otherApplication != null) { + if (otherApplication.isRunning() == false) { + setHiddenMouse(false); + } + } + } /** @@ -357,7 +430,9 @@ public class TWindowBackend extends TWindow implements Backend { */ @Override public void onClose() { - // TODO: send a screen disconnect + synchronized (eventQueue) { + eventQueue.add(new TCommandEvent(cmBackendDisconnect)); + } } // ------------------------------------------------------------------------ @@ -427,6 +502,13 @@ public class TWindowBackend extends TWindow implements Backend { this.listener = listener; } + /** + * Reload backend options from System properties. + */ + public void reloadOptions() { + // NOP + } + // ------------------------------------------------------------------------ // TWindowBackend --------------------------------------------------------- // ------------------------------------------------------------------------ @@ -449,4 +531,13 @@ public class TWindowBackend extends TWindow implements Backend { return otherScreen; } + /** + * Set the other screen's application. + * + * @param application the application driving the other screen + */ + public void setOtherApplication(final TApplication application) { + this.otherApplication = application; + } + }