[Gzz-commits] gzz/gzz client/gl/GLScreen.java view/FallbackBi...

[Benja Fallenstein]

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

Modified files:
        gzz/client/gl  : GLScreen.java 
        gzz/view       : FallbackBinder.java 

Log message:
        Use correct Alt- bindings in FallbackBinder (for Ted's cursorspec
        operations, e.g. Alt-F = Fork); simulate them with Ctrl-Shift- in
        GLScreen, for now (as long as Alt- doesn't work).

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/gl/GLScreen.java.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/FallbackBinder.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: gzz/gzz/client/gl/GLScreen.java
diff -c gzz/gzz/client/gl/GLScreen.java:1.29 
gzz/gzz/client/gl/GLScreen.java:1.30
*** gzz/gzz/client/gl/GLScreen.java:1.29        Wed Sep 25 06:56:54 2002
--- gzz/gzz/client/gl/GLScreen.java     Wed Sep 25 07:36:23 2002
***************
*** 33,39 ****
  import java.util.HashMap;
  
  public class GLScreen extends GraphicsAPI.Window {
! public static final String rcsid = "$Id: GLScreen.java,v 1.29 2002/09/25 
10:56:54 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 33,39 ----
  import java.util.HashMap;
  
  public class GLScreen extends GraphicsAPI.Window {
! public static final String rcsid = "$Id: GLScreen.java,v 1.30 2002/09/25 
11:36:23 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 75,80 ****
--- 75,83 ----
                          s = s.substring(0, s.length()-1) +
                              Character.toUpperCase(c);
                  }
+               if(s.startsWith("Ctrl-Shift-")) {
+                    s = "Alt-" + s.substring("Ctrl-Shift-".length());
+               }
                binder.keystroke(s, repr);
            }
            boolean didDrag = false;
Index: gzz/gzz/view/FallbackBinder.java
diff -c gzz/gzz/view/FallbackBinder.java:1.11 
gzz/gzz/view/FallbackBinder.java:1.12
*** gzz/gzz/view/FallbackBinder.java:1.11       Wed Sep 25 07:20:05 2002
--- gzz/gzz/view/FallbackBinder.java    Wed Sep 25 07:36:23 2002
***************
*** 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); }
  
--- 40,46 ----
  /** Keybindings for the Fallback client.
   */
  public class FallbackBinder extends AbstractBinder {
! public static final String rcsid = "$Id: FallbackBinder.java,v 1.12 
2002/09/25 11:36:23 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 193,207 ****
              fallback.mode = fallback.SEARCH;
              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) {
            switch(k.charAt(0)) {
                // Right Rose
--- 193,205 ----
              fallback.mode = fallback.SEARCH;
              buffer = "";
              searchStart = fallback.windows[1].cursor;
!       } else if(k.equals("Alt-F")) {
            fallback.windows[1] =
                fallback.newWindow(fallback.windows[1].cursor);
!       } else if(k.equals("Alt-N")) {
            fallback.windows[1] = fallback.newWindow(null);
!       } else if(k.equals("Alt-A")) {
              op(REASSIGN_ARROWSET);
        } else if(k.length() == 1) {
            switch(k.charAt(0)) {
                // Right Rose