doco writing.

[jalview.git] / src / jalview / gui / AlignmentPanel.java

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index a04c5bf..2800f85 100755 (executable)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -156,16 +156,16 @@ public class AlignmentPanel extends GAlignmentPanel
           case KeyEvent.VK_SPACE:\r
             if(av.cursorMode)\r
             {\r
-              seqPanel.insertGapAtCursor(evt.isControlDown());\r
+              seqPanel.insertGapAtCursor(evt.isControlDown() || evt.isShiftDown());\r
             }\r
             break;\r
 \r
           case KeyEvent.VK_DELETE:\r
             if(av.cursorMode)\r
             {\r
-              seqPanel.deleteGapAtCursor(evt.isControlDown());\r
-              break;\r
+              seqPanel.deleteGapAtCursor(evt.isControlDown() || evt.isShiftDown());\r
             }\r
+            break;\r
 \r
           case KeyEvent.VK_BACK_SPACE:\r
             if(!av.cursorMode)\r
@@ -175,6 +175,33 @@ public class AlignmentPanel extends GAlignmentPanel
             }\r
             break;\r
 \r
+          case KeyEvent.VK_S:\r
+            if(av.cursorMode)\r
+            {\r
+              seqPanel.setCursorRow();\r
+            }\r
+            break;\r
+          case KeyEvent.VK_C:\r
+            if(av.cursorMode)\r
+            {\r
+              seqPanel.setCursorColumn();\r
+            }\r
+            break;\r
+          case KeyEvent.VK_P:\r
+            if(av.cursorMode)\r
+            {\r
+              seqPanel.setCursorPosition();\r
+            }\r
+            break;\r
+\r
+          case KeyEvent.VK_ENTER:\r
+          case KeyEvent.VK_COMMA:\r
+            if(av.cursorMode)\r
+            {\r
+              seqPanel.setCursorRowAndColumn();\r
+            }\r
+            break;\r
+\r
           case KeyEvent.VK_Q:\r
             if(av.cursorMode)\r
             {\r
@@ -344,16 +371,21 @@ public class AlignmentPanel extends GAlignmentPanel
       }\r
       else\r
       {\r
-        int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());\r
-        if( start<av.getStartRes() || start>(av.getStartRes()+cwidth) )\r
-        {\r
-          vscroll.setValue(start / cwidth);\r
-          av.startRes = vscroll.getValue() * cwidth;\r
-        }\r
+        scrollToWrappedVisible(start);\r
       }\r
     }\r
   }\r
 \r
+  void scrollToWrappedVisible(int res)\r
+  {\r
+    int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());\r
+    if( res<=av.getStartRes() || res>=(av.getStartRes()+cwidth) )\r
+    {\r
+      vscroll.setValue(res / cwidth);\r
+      av.startRes = vscroll.getValue() * cwidth;\r
+    }\r
+  }\r
+\r
   /**\r
    * DOCUMENT ME!\r
    *\r