// resources.
closeAllWindows();
+ // Close the desktop.
+ if (desktop != null) {
+ setDesktop(null);
+ }
+
// Give the overarching application an opportunity to release
// resources.
onExit();
oldMouseY = 0;
}
if (desktop != null) {
- desktop.setDimensions(0, 0, resize.getWidth(),
- resize.getHeight() - (hideStatusBar ? 0 : 1));
+ desktop.setDimensions(0, desktopTop, resize.getWidth(),
+ (desktopBottom - desktopTop));
desktop.onResize(resize);
}
}
} else if (event instanceof TKeypressEvent) {
dispatchToDesktop = false;
+ } else if (event instanceof TMenuEvent) {
+ dispatchToDesktop = false;
}
if (debugEvents) {
*/
public final void setDesktop(final TDesktop desktop) {
if (this.desktop != null) {
+ this.desktop.onPreClose();
+ this.desktop.onUnfocus();
this.desktop.onClose();
}
this.desktop = desktop;
}
}
+ // If this cell is on top of the desktop, and the desktop has
+ // requested a hidden mouse, bail out.
+ if ((desktop != null) && (activeWindow == null) && (activeMenu == null)) {
+ if ((desktop.hasHiddenMouse() == true)
+ && (x > desktop.getX())
+ && (x < desktop.getX() + desktop.getWidth() - 1)
+ && (y > desktop.getY())
+ && (y < desktop.getY() + desktop.getHeight() - 1)
+ ) {
+ return;
+ }
+ }
+
Cell cell = getScreen().getCharXY(x, y);
if (cell.isImage()) {
cell.invertImage();
// Place the cursor if it is visible
if (!menuIsActive) {
+
+ int visibleWindowCount = 0;
+ for (TWindow window: sorted) {
+ if (window.isShown()) {
+ visibleWindowCount++;
+ }
+ }
+ if (visibleWindowCount == 0) {
+ // No windows are visible, only the desktop. Allow it to
+ // have the cursor.
+ if (desktop != null) {
+ sorted.add(desktop);
+ }
+ }
+
TWidget activeWidget = null;
if (sorted.size() > 0) {
activeWidget = sorted.get(sorted.size() - 1).getActiveChild();
+ int cursorClipTop = desktopTop;
+ int cursorClipBottom = desktopBottom;
if (activeWidget.isCursorVisible()) {
- if ((activeWidget.getCursorAbsoluteY() < desktopBottom)
- && (activeWidget.getCursorAbsoluteY() > desktopTop)
+ if ((activeWidget.getCursorAbsoluteY() <= cursorClipBottom)
+ && (activeWidget.getCursorAbsoluteY() >= cursorClipTop)
) {
getScreen().putCursor(true,
activeWidget.getCursorAbsoluteX(),
assert (!window.isActive());
if (activeWindow != null) {
- // TODO: see if this assertion is really necessary.
- // assert (activeWindow.getZ() == 0);
-
activeWindow.setActive(false);
// Increment every window Z that is on top of window