[Gzz-commits] gzz/gzz/view FallbackBinder.java LastOpDecorato...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/09/25 07:20:07

Modified files:
        gzz/view       : FallbackBinder.java LastOpDecorator.java 

Log message:
        Reassign arrowset done!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/FallbackBinder.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LastOpDecorator.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gzz/gzz/view/FallbackBinder.java
diff -c gzz/gzz/view/FallbackBinder.java:1.10 
gzz/gzz/view/FallbackBinder.java:1.11
*** gzz/gzz/view/FallbackBinder.java:1.10       Wed Sep 25 06:56:54 2002
--- gzz/gzz/view/FallbackBinder.java    Wed Sep 25 07:20:05 2002
***************
*** 40,46 ****
  /** Keybindings for the Fallback client.
   */
  public class FallbackBinder extends AbstractBinder {
! public static final String rcsid = "$Id: FallbackBinder.java,v 1.10 
2002/09/25 10:56:54 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 40,46 ----
  /** Keybindings for the Fallback client.
   */
  public class FallbackBinder extends AbstractBinder {
! public static final String rcsid = "$Id: FallbackBinder.java,v 1.11 
2002/09/25 11:20:05 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 55,60 ****
--- 55,61 ----
      static final int NEW = 4;
      static final int CLONE_R = 5;
      static final int CLONE_L = 6;
+     static final int REASSIGN_ARROWSET = 7;
  
      /** The current operation waiting for a directional operation.
       */
***************
*** 68,73 ****
--- 69,79 ----
       */
      String buffer;
  
+     /** The window in which the currently processed key event occurred.
+      *  XXX not thread-save
+      */
+     Fallback.Win wasInWindow;
+ 
      Cell searchStart;
  
      public FallbackBinder(Fallback fallback) {
***************
*** 99,104 ****
--- 105,116 ----
            w.cursor.insert(dims[dim], dir, c);
            w.cursor = c;
            break;
+       case REASSIGN_ARROWSET:
+           w = wasInWindow;
+           fallback.windows[win] = w;
+           n = w.dims[dim].s(w.cursor, dir);
+           if(n != null) w.cursor = n;
+           break;
        default:
                  if(dbg) pa("???");
        }
***************
*** 131,136 ****
--- 143,150 ----
            return;
        }
  
+       wasInWindow = (Fallback.Win)win;
+ 
        try {
            if(fallback.mode == NORMAL)
                normalModeKeystroke(k);
***************
*** 180,186 ****
              buffer = "";
              searchStart = fallback.windows[1].cursor;
        } else if(k.equals("Ctrl-Shift-F")) {
!           fallback.newWindow(fallback.windows[1].cursor);
        } else if(k.equals("Ctrl-Shift-N")) {
            fallback.newWindow(null);
        } else if(k.length() == 1) {
--- 194,205 ----
              buffer = "";
              searchStart = fallback.windows[1].cursor;
        } else if(k.equals("Ctrl-Shift-F")) {
!           fallback.windows[1] =
!               fallback.newWindow(fallback.windows[1].cursor);
!       } else if(k.equals("Ctrl-Shift-N")) {
!           fallback.windows[1] = fallback.newWindow(null);
!       } else if(k.equals("Ctrl-Shift-A")) {
!             op(REASSIGN_ARROWSET);
        } else if(k.equals("Ctrl-Shift-N")) {
            fallback.newWindow(null);
        } else if(k.length() == 1) {
Index: gzz/gzz/view/LastOpDecorator.java
diff -c gzz/gzz/view/LastOpDecorator.java:1.7 
gzz/gzz/view/LastOpDecorator.java:1.8
*** gzz/gzz/view/LastOpDecorator.java:1.7       Tue Sep 24 14:15:35 2002
--- gzz/gzz/view/LastOpDecorator.java   Wed Sep 25 07:20:06 2002
***************
*** 32,38 ****
   *  directional op entered.
   */
  public class LastOpDecorator implements FallbackSceneDecorator {
! String rcsid = "$Id: LastOpDecorator.java,v 1.7 2002/09/24 18:15:35 benja Exp 
$";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 32,38 ----
   *  directional op entered.
   */
  public class LastOpDecorator implements FallbackSceneDecorator {
! String rcsid = "$Id: LastOpDecorator.java,v 1.8 2002/09/25 11:20:06 benja Exp 
$";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 50,55 ****
--- 50,57 ----
            other = fallback.windows[fallback.RIGHT];
        else if(win == fallback.windows[fallback.RIGHT])
            other = fallback.windows[fallback.LEFT];
+       else if(fallback.binder.directOp == FallbackBinder.REASSIGN_ARROWSET)
+           other = null; // REASSIGN_ARROWSET is shown in all windows
        else
            return; // command doesn't apply to this window...
                    // hmm... should we still show something?
***************
*** 84,89 ****
--- 86,94 ----
                    ch.addBox(cell(fallback.windows[0].cursor, win));
                    ch.addBox(text(" [where?]", 2));
                      break;
+               case FallbackBinder.REASSIGN_ARROWSET:
+                   ch.addBox(text("Move cursor to reassign arrowset"));
+                   break;
                  default:
                      throw new IllegalArgumentException("DirOp not known: " +
                                                         
fallback.binder.directOp);