WAGE: Started copy command implementation

scummvm · Feb 14, 2016 · fe40bb2 · fe40bb2
1 parent a2e3d33
commit fe40bb2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
@@ -707,8 +707,9 @@ Designed *Gui::mouseUp(int x, int y) {
 				(_selectionEndX == _selectionStartX && _selectionEndY == _selectionStartY)) {
 			_selectionStartY = _selectionEndY = -1;
 			_consoleFullRedraw = true;
+			_menu->enableCommand(kMenuEdit, kMenuActionCopy, false);
 		} else {
-
+			_menu->enableCommand(kMenuEdit, kMenuActionCopy, true);
 		}
 	}
 
@@ -794,4 +795,19 @@ void Gui::updateTextSelection(int x, int y) {
 	_consoleFullRedraw = true;
 }
 
+void Gui::actionCopy() {
+	if (_selectionStartX == -1)
+		return;
+
+	int startX = _selectionStartX;
+	int startY = _selectionStartY;
+	int endX = _selectionEndX;
+	int endY = _selectionEndY;
+
+	if (startY > endY) {
+		SWAP(startX, endX);
+		SWAP(endX, endY);
+	}
+}
+
 } // End of namespace Wage
diff --git a/engines/wage/gui.h b/engines/wage/gui.h
@@ -104,6 +104,8 @@ class Gui {
 	void pushArrowCursor();
 	void popCursor();
 
+	void actionCopy();
+
 private:
 	void paintBorder(Graphics::Surface *g, Common::Rect &r, WindowType windowType);
 	void renderConsole(Graphics::Surface *g, Common::Rect &r);
@@ -155,6 +157,8 @@ class Gui {
 	int _selectionStartY;
 	int _selectionEndX;
 	int _selectionEndY;
+
+	Common::String _clipboard;
 };
 
 } // End of namespace Wage

diff --git a/engines/wage/menu.cpp b/engines/wage/menu.cpp
@@ -517,7 +517,10 @@ void Menu::executeCommand(MenuSubItem *subitem) {
 
 	case kMenuActionUndo:
 	case kMenuActionCut:
+		break;
 	case kMenuActionCopy:
+		_gui->actionCopy();
+		break;
 	case kMenuActionPaste:
 	case kMenuActionClear:
 		break;