Merge branch 'release/3.0'

mabe02 · Jan 12, 2020 · 2a8042f · 2a8042f
2 parents c2ee9ca + 237b92a
commit 2a8042f
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 0 deletions.
diff --git a/src/main/java/com/googlecode/lanterna/terminal/swing/AWTTerminal.java b/src/main/java/com/googlecode/lanterna/terminal/swing/AWTTerminal.java
@@ -183,6 +183,30 @@ public void caretPositionChanged(InputMethodEvent event) {
         inputMethodRequests = new TerminalInputMethodRequests(this, terminalImplementation);
     }
 
+    /**
+     * Returns the current font configuration. Note that it is immutable and cannot be changed.
+     * @return This AWTTerminal's current font configuration
+     */
+    public AWTTerminalFontConfiguration getFontConfiguration() {
+        return terminalImplementation.getFontConfiguration();
+    }
+
+    /**
+     * Returns this terminal emulator's color configuration. Note that it is immutable and cannot be changed.
+     * @return This {@link AWTTerminal}'s color configuration
+     */
+    public TerminalEmulatorColorConfiguration getColorConfiguration() {
+        return terminalImplementation.getColorConfiguration();
+    }
+
+    /**
+     * Returns this terminal emulator's device configuration. Note that it is immutable and cannot be changed.
+     * @return This {@link AWTTerminal}'s device configuration
+     */
+    public TerminalEmulatorDeviceConfiguration getDeviceConfiguration() {
+        return terminalImplementation.getDeviceConfiguration();
+    }
+
     /**
      * Overridden method from AWT's {@code Component} class that returns the preferred size of the terminal (in pixels)
      * @return The terminal's preferred size in pixels

diff --git a/src/main/java/com/googlecode/lanterna/terminal/swing/AWTTerminalFrame.java b/src/main/java/com/googlecode/lanterna/terminal/swing/AWTTerminalFrame.java
@@ -123,6 +123,30 @@ private AWTTerminalFrame(String title, AWTTerminal awtTerminal, TerminalEmulator
         awtTerminal.requestFocusInWindow();
     }
 
+    /**
+     * Returns the current font configuration. Note that it is immutable and cannot be changed.
+     * @return This {@link AWTTerminalFrame}'s current font configuration
+     */
+    public AWTTerminalFontConfiguration getFontConfiguration() {
+        return awtTerminal.getFontConfiguration();
+    }
+
+    /**
+     * Returns this terminal emulator's color configuration. Note that it is immutable and cannot be changed.
+     * @return This {@link AWTTerminalFrame}'s color configuration
+     */
+    public TerminalEmulatorColorConfiguration getColorConfiguration() {
+        return awtTerminal.getColorConfiguration();
+    }
+
+    /**
+     * Returns this terminal emulator's device configuration. Note that it is immutable and cannot be changed.
+     * @return This {@link AWTTerminalFrame}'s device configuration
+     */
+    public TerminalEmulatorDeviceConfiguration getDeviceConfiguration() {
+        return awtTerminal.getDeviceConfiguration();
+    }
+
     /**
      * Returns the auto-close triggers used by the AWTTerminalFrame
      * @return Current auto-close trigger

diff --git a/src/main/java/com/googlecode/lanterna/terminal/swing/AWTTerminalImplementation.java b/src/main/java/com/googlecode/lanterna/terminal/swing/AWTTerminalImplementation.java
@@ -82,6 +82,10 @@ public void mouseClicked(MouseEvent e) {
         });
     }
 
+    public AWTTerminalFontConfiguration getFontConfiguration() {
+        return fontConfiguration;
+    }
+
     @Override
     protected int getFontHeight() {
         return fontConfiguration.getFontHeight();

diff --git a/src/main/java/com/googlecode/lanterna/terminal/swing/GraphicalTerminalImplementation.java b/src/main/java/com/googlecode/lanterna/terminal/swing/GraphicalTerminalImplementation.java
@@ -131,6 +131,14 @@ abstract class GraphicalTerminalImplementation implements IOSafeTerminal {
         virtualTerminal.setBacklogSize(deviceConfiguration.getLineBufferScrollbackSize());
     }
 
+    TerminalEmulatorDeviceConfiguration getDeviceConfiguration() {
+        return deviceConfiguration;
+    }
+
+    TerminalEmulatorColorConfiguration getColorConfiguration() {
+        return colorConfiguration;
+    }
+
     ///////////
     // First abstract methods that are implemented in AWTTerminalImplementation and SwingTerminalImplementation
     ///////////

diff --git a/src/main/java/com/googlecode/lanterna/terminal/swing/SwingTerminal.java b/src/main/java/com/googlecode/lanterna/terminal/swing/SwingTerminal.java
@@ -184,6 +184,30 @@ public void caretPositionChanged(InputMethodEvent event) {
         inputMethodRequests = new TerminalInputMethodRequests(this, terminalImplementation);
     }
 
+    /**
+     * Returns the current font configuration. Note that it is immutable and cannot be changed.
+     * @return This SwingTerminal's current font configuration
+     */
+    public SwingTerminalFontConfiguration getFontConfiguration() {
+        return terminalImplementation.getFontConfiguration();
+    }
+
+    /**
+     * Returns this terminal emulator's color configuration. Note that it is immutable and cannot be changed.
+     * @return This {@link SwingTerminal}'s color configuration
+     */
+    public TerminalEmulatorColorConfiguration getColorConfiguration() {
+        return terminalImplementation.getColorConfiguration();
+    }
+
+    /**
+     * Returns this terminal emulator's device configuration. Note that it is immutable and cannot be changed.
+     * @return This {@link SwingTerminal}'s device configuration
+     */
+    public TerminalEmulatorDeviceConfiguration getDeviceConfiguration() {
+        return terminalImplementation.getDeviceConfiguration();
+    }
+
     /**
      * Overridden method from Swing's {@code JComponent} class that returns the preferred size of the terminal (in
      * pixels)

diff --git a/src/main/java/com/googlecode/lanterna/terminal/swing/SwingTerminalFrame.java b/src/main/java/com/googlecode/lanterna/terminal/swing/SwingTerminalFrame.java
@@ -115,6 +115,30 @@ private SwingTerminalFrame(String title, SwingTerminal swingTerminal, TerminalEm
         setBackground(Color.BLACK); //This will reduce white flicker when resizing the window
     }
 
+    /**
+     * Returns the current font configuration. Note that it is immutable and cannot be changed.
+     * @return This {@link SwingTerminalFrame}'s current font configuration
+     */
+    public SwingTerminalFontConfiguration getFontConfiguration() {
+        return swingTerminal.getFontConfiguration();
+    }
+
+    /**
+     * Returns this terminal emulator's color configuration. Note that it is immutable and cannot be changed.
+     * @return This {@link SwingTerminalFrame}'s color configuration
+     */
+    public TerminalEmulatorColorConfiguration getColorConfiguration() {
+        return swingTerminal.getColorConfiguration();
+    }
+
+    /**
+     * Returns this terminal emulator's device configuration. Note that it is immutable and cannot be changed.
+     * @return This {@link SwingTerminalFrame}'s device configuration
+     */
+    public TerminalEmulatorDeviceConfiguration getDeviceConfiguration() {
+        return swingTerminal.getDeviceConfiguration();
+    }
+
     /**
      * Returns the auto-close triggers used by the SwingTerminalFrame
      * @return Current auto-close trigger