X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTWidget.java;h=d60efd8d3a321236e2069199c6db2fb364505d69;hb=d442b96e0b1453c21abf7f34bfaf73dcbed2a7ee;hp=d48ffe4c9ad6e477123c1e940e659360b347a1ab;hpb=fc2af49443133106c95da9aaf8b7126be8c7dedd;p=fanfix.git diff --git a/src/jexer/TWidget.java b/src/jexer/TWidget.java index d48ffe4..d60efd8 100644 --- a/src/jexer/TWidget.java +++ b/src/jexer/TWidget.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import jexer.backend.Screen; import jexer.bits.Cell; import jexer.bits.CellAttributes; +import jexer.bits.Clipboard; import jexer.bits.ColorTheme; import jexer.event.TCommandEvent; import jexer.event.TInputEvent; @@ -184,14 +185,7 @@ public abstract class TWidget implements Comparable { * @param enabled if true assume enabled */ protected TWidget(final TWidget parent, final boolean enabled) { - this.enabled = enabled; - this.parent = parent; - children = new ArrayList(); - - if (parent != null) { - this.window = parent.window; - parent.addChild(this); - } + this(parent, enabled, 0, 0, 0, 0); } /** @@ -598,9 +592,8 @@ public abstract class TWidget implements Comparable { * @param command command event */ public void onCommand(final TCommandEvent command) { - // Default: do nothing, pass to children instead - for (TWidget widget: children) { - widget.onCommand(command); + if (activeChild != null) { + activeChild.onCommand(command); } } @@ -729,6 +722,15 @@ public abstract class TWidget implements Comparable { } } + /** + * Remove a child widget from this container. + * + * @param child the child widget to remove + */ + public final void remove(final TWidget child) { + remove(child, true); + } + /** * Remove a child widget from this container. * @@ -746,6 +748,7 @@ public abstract class TWidget implements Comparable { } children.remove(child); child.parent = null; + child.window = null; if (layout != null) { layout.remove(this); } @@ -763,29 +766,31 @@ public abstract class TWidget implements Comparable { if (parent != null) { parent.remove(this, doClose); + window = null; } assert (parent == null); - window = newParent.window; - newParent.addChild(this); + assert (window == null); + parent = newParent; + setWindow(parent.window); + parent.addChild(this); } /** - * Set this widget's window to a specific window. Parent must already be - * null. Having a null parent with a specified window is only used - * within Jexer by TStatusBar because TApplication routes events directly - * to it and calls its draw() method. Any other non-parented widgets - * will require similar special case functionality to receive events or - * be drawn to screen. + * Set this widget's window to a specific window. + * + * Having a null parent with a specified window is only used within Jexer + * by TStatusBar because TApplication routes events directly to it and + * calls its draw() method. Any other non-parented widgets will require + * similar special case functionality to receive events or be drawn to + * screen. * * @param window the window to use */ public final void setWindow(final TWindow window) { - - if (parent != null) { - throw new IllegalArgumentException("Cannot have different " + - "windows for parent and child"); - } this.window = window; + for (TWidget child: getChildren()) { + child.setWindow(window); + } } /** @@ -921,8 +926,9 @@ public abstract class TWidget implements Comparable { public final void setDimensions(final int x, final int y, final int width, final int height) { - setX(x); - setY(y); + this.x = x; + this.y = y; + // Call the functions so that subclasses can choose how to handle it. setWidth(width); setHeight(height); if (layout != null) { @@ -1042,6 +1048,11 @@ public abstract class TWidget implements Comparable { assert (window != null); + if (window instanceof TDesktop) { + // Desktop doesn't have a window border. + return cursorVisible; + } + // If cursor is out of my window's bounds, it is not visible. if ((getCursorAbsoluteX() >= window.getAbsoluteX() + window.getWidth() - 1) @@ -1094,19 +1105,37 @@ public abstract class TWidget implements Comparable { /** * Get this TWidget's parent TApplication. * - * @return the parent TApplication + * @return the parent TApplication, or null if not assigned */ public TApplication getApplication() { - return window.getApplication(); + if (window != null) { + return window.getApplication(); + } + return null; } /** * Get the Screen. * - * @return the Screen + * @return the Screen, or null if not assigned */ public Screen getScreen() { - return window.getScreen(); + if (window != null) { + return window.getScreen(); + } + return null; + } + + /** + * Get the Clipboard. + * + * @return the Clipboard, or null if not assigned + */ + public Clipboard getClipboard() { + if (window != null) { + return window.getApplication().getClipboard(); + } + return null; } /** @@ -1121,7 +1150,8 @@ public abstract class TWidget implements Comparable { * @return difference between this.tabOrder and that.tabOrder, or * difference between this.z and that.z, or String.compareTo(text) */ - public final int compareTo(final TWidget that) { + @Override + public int compareTo(final TWidget that) { if ((this instanceof TWindow) && (that instanceof TWindow) ) { @@ -1220,6 +1250,25 @@ public abstract class TWidget implements Comparable { return window.getApplication().getTheme(); } + /** + * See if this widget can be drawn onto a screen. + * + * @return true if this widget is part of the hierarchy that can draw to + * a screen + */ + public final boolean isDrawable() { + if ((window == null) + || (window.getScreen() == null) + || (parent == null) + ) { + return false; + } + if (parent == this) { + return true; + } + return (parent.isDrawable()); + } + /** * Draw my specific widget. When called, the screen rectangle I draw * into is already setup (offset and clipping). @@ -1232,6 +1281,10 @@ public abstract class TWidget implements Comparable { * Called by parent to render to TWindow. Note package private access. */ final void drawChildren() { + if (!isDrawable()) { + return; + } + // Set my clipping rectangle assert (window != null); assert (getScreen() != null); @@ -1248,10 +1301,16 @@ public abstract class TWidget implements Comparable { int absoluteRightEdge = window.getAbsoluteX() + window.getWidth(); int absoluteBottomEdge = window.getAbsoluteY() + window.getHeight(); - if (!(this instanceof TWindow) && !(this instanceof TVScroller)) { + if (!(this instanceof TWindow) + && !(this instanceof TVScroller) + && !(window instanceof TDesktop) + ) { absoluteRightEdge -= 1; } - if (!(this instanceof TWindow) && !(this instanceof THScroller)) { + if (!(this instanceof TWindow) + && !(this instanceof THScroller) + && !(window instanceof TDesktop) + ) { absoluteBottomEdge -= 1; } int myRightEdge = getAbsoluteX() + width; @@ -1277,6 +1336,12 @@ public abstract class TWidget implements Comparable { // Draw me draw(); + if (!isDrawable()) { + // An action taken by a draw method unhooked me from the UI. + // Bail out. + return; + } + assert (visible == true); // Continue down the chain. Draw the active child last so that it @@ -1284,6 +1349,11 @@ public abstract class TWidget implements Comparable { for (TWidget widget: children) { if (widget.isVisible() && (widget != activeChild)) { widget.drawChildren(); + if (!isDrawable()) { + // An action taken by a draw method unhooked me from the UI. + // Bail out. + return; + } } } if (activeChild != null) { @@ -1304,7 +1374,7 @@ public abstract class TWidget implements Comparable { * * @param child TWidget to add */ - private void addChild(final TWidget child) { + public void addChild(final TWidget child) { children.add(child); if ((child.enabled) @@ -1334,6 +1404,29 @@ public abstract class TWidget implements Comparable { children.get(i).tabOrder = i; } } + + /** + * Remove and {@link TWidget#close()} the given child from this {@link TWidget}. + *

+ * Will also reorder the tab values of the remaining children. + * + * @param child the child to remove + * + * @return TRUE if the child was removed, FALSE if it was not found + */ + public boolean removeChild(final TWidget child) { + if (children.remove(child)) { + child.close(); + child.parent = null; + child.window = null; + + resetTabOrder(); + + return true; + } + + return false; + } /** * Switch the active child. @@ -1358,9 +1451,9 @@ public abstract class TWidget implements Comparable { if (activeChild != null) { activeChild.active = false; } - child.active = true; - activeChild = child; } + child.active = true; + activeChild = child; } } @@ -1412,6 +1505,19 @@ public abstract class TWidget implements Comparable { } } + /** + * Make this widget, all of its parents, the active child. + */ + public final void activateAll() { + activate(); + if (parent == this) { + return; + } + if (parent != null) { + parent.activateAll(); + } + } + /** * Switch the active widget with the next in the tab order. * @@ -1514,6 +1620,153 @@ public abstract class TWidget implements Comparable { return this; } + /** + * Insert a vertical split between this widget and parent, and optionally + * put another widget in the other side of the split. + * + * @param newWidgetOnLeft if true, the new widget (if specified) will be + * on the left pane, and this widget will be placed on the right pane + * @param newWidget the new widget to add to the other pane, or null + * @return the new split pane widget + */ + public TSplitPane splitVertical(final boolean newWidgetOnLeft, + final TWidget newWidget) { + + TSplitPane splitPane = new TSplitPane(null, x, y, width, height, true); + TWidget myParent = parent; + remove(false); + if (myParent instanceof TSplitPane) { + // TSplitPane has a left/right/top/bottom link to me somewhere, + // replace it with a link to splitPane. + ((TSplitPane) myParent).replaceWidget(this, splitPane); + } + splitPane.setParent(myParent, false); + if (newWidgetOnLeft) { + splitPane.setLeft(newWidget); + splitPane.setRight(this); + } else { + splitPane.setLeft(this); + splitPane.setRight(newWidget); + } + if (newWidget != null) { + newWidget.activateAll(); + } else { + activateAll(); + } + + assert (parent != null); + assert (window != null); + assert (splitPane.getWindow() != null); + assert (splitPane.getParent() != null); + assert (splitPane.isActive() == true); + assert (parent == splitPane); + if (newWidget != null) { + assert (newWidget.parent == parent); + assert (newWidget.active == true); + assert (active == false); + } else { + assert (active == true); + } + return splitPane; + } + + /** + * Insert a horizontal split between this widget and parent, and + * optionally put another widget in the other side of the split. + * + * @param newWidgetOnTop if true, the new widget (if specified) will be + * on the top pane, and this widget's children will be placed on the + * bottom pane + * @param newWidget the new widget to add to the other pane, or null + * @return the new split pane widget + */ + public TSplitPane splitHorizontal(final boolean newWidgetOnTop, + final TWidget newWidget) { + + TSplitPane splitPane = new TSplitPane(null, x, y, width, height, false); + TWidget myParent = parent; + remove(false); + if (myParent instanceof TSplitPane) { + // TSplitPane has a left/right/top/bottom link to me somewhere, + // replace it with a link to splitPane. + ((TSplitPane) myParent).replaceWidget(this, splitPane); + } + splitPane.setParent(myParent, false); + if (newWidgetOnTop) { + splitPane.setTop(newWidget); + splitPane.setBottom(this); + } else { + splitPane.setTop(this); + splitPane.setBottom(newWidget); + } + if (newWidget != null) { + newWidget.activateAll(); + } else { + activateAll(); + } + + assert (parent != null); + assert (window != null); + assert (splitPane.getWindow() != null); + assert (splitPane.getParent() != null); + assert (splitPane.isActive() == true); + assert (parent == splitPane); + if (newWidget != null) { + assert (newWidget.parent == parent); + assert (newWidget.active == true); + assert (active == false); + } else { + assert (active == true); + } + return splitPane; + } + + /** + * Generate a human-readable string for this widget. + * + * @return a human-readable string + */ + @Override + public String toString() { + return String.format("%s(%8x) position (%d, %d) geometry %dx%d " + + "active %s enabled %s visible %s", getClass().getName(), + hashCode(), x, y, width, height, active, enabled, visible); + } + + /** + * Generate a string for this widget's hierarchy. + * + * @param prefix a prefix to use for this widget's place in the hierarchy + * @return a pretty-printable string of this hierarchy + */ + protected String toPrettyString(final String prefix) { + StringBuilder sb = new StringBuilder(prefix); + sb.append(toString()); + String newPrefix = ""; + for (int i = 0; i < prefix.length(); i++) { + newPrefix += " "; + } + for (int i = 0; i < children.size(); i++) { + TWidget child= children.get(i); + sb.append("\n"); + if (i == children.size() - 1) { + sb.append(child.toPrettyString(newPrefix + " \u2514\u2500")); + } else { + sb.append(child.toPrettyString(newPrefix + " \u251c\u2500")); + } + } + return sb.toString(); + } + + /** + * Generate a string for this widget's hierarchy. + * + * @return a pretty-printable string of this hierarchy + */ + public String toPrettyString() { + return toPrettyString(""); + } + // ------------------------------------------------------------------------ // Passthru for Screen functions ------------------------------------------ // ------------------------------------------------------------------------ @@ -1927,6 +2180,21 @@ public abstract class TWidget implements Comparable { return new TRadioGroup(this, x, y, label); } + /** + * Convenience function to add a radio button group to this + * container/window. + * + * @param x column relative to parent + * @param y row relative to parent + * @param width width of group + * @param label label to display on the group box + */ + public final TRadioGroup addRadioGroup(final int x, final int y, + final int width, final String label) { + + return new TRadioGroup(this, x, y, width, label); + } + /** * Convenience function to add a text field to this container/window. * @@ -2507,4 +2775,20 @@ public abstract class TWidget implements Comparable { return new TPanel(this, x, y, width, height); } + /** + * Convenience function to add a split pane to this container/window. + * + * @param x column relative to parent + * @param y row relative to parent + * @param width width of text area + * @param height height of text area + * @param vertical if true, split vertically + * @return the new split pane + */ + public final TSplitPane addSplitPane(final int x, final int y, + final int width, final int height, final boolean vertical) { + + return new TSplitPane(this, x, y, width, height, vertical); + } + }