[Gzz-commits] gzz ./Makefile gzz/view/DefaultBinder.java gzz/...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/10/07 13:27:02

Modified files:
        .              : Makefile 
        gzz/view       : DefaultBinder.java DimDecorator.java 
        gzz/vob        : TextCursorVob.java TextVob.java 

Log message:
        awt fixes, make delete key work (partly work of osk group)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.178&tr2=1.179&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/DefaultBinder.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/DimDecorator.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/TextCursorVob.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/TextVob.java.diff?tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: gzz/Makefile
diff -c gzz/Makefile:1.178 gzz/Makefile:1.179
*** gzz/Makefile:1.178  Mon Oct  7 01:51:23 2002
--- gzz/Makefile        Mon Oct  7 13:27:02 2002
***************
*** 177,183 ****
  
  # Can't add ZZClangOps since javac complains of doubly defined class...
  # maybe should use uniq?
! SRC0:=$(GENERATED) $(wildcard gzz/*.java gzz/errors/*.java gzz/diff/*.java 
gzz/impl/*.java gzz/impl/mirror/*.java gzz/media/*.java gzz/fuzzy/*.java 
gzz/control/*.java lava/gzz/media/*.java gzz/media/impl/*.java gzz/index/*.java 
gzz/index/impl/*.java gzz/zzutil/*.java gzz/impl/clasm/*.java gzz/util/*.java 
gzz/vob/*.java gzz/vob/buoy/*.java gzz/gfx/gl/*.java gzz/mediaserver/*.java 
lava/gzz/mediaserver/*.java gzz/mediaserver/*/*.java 
lava/gzz/mediaserver/*/*.java gzz/mediaserver/http/*/*.java 
lava/gzz/mediaserver/*/*/*.java gzz/ideas/*.java gzz/client/*.java 
gzz/view/*.java gzz/client/awt/*.java gzz/client/gl/*.java $(PP) 
gzz/modules/contraints/*.java gzz/modules/mm/*.java lava/gzz/media/*.java 
lava/gzz/media/impl/*.java gzz/slices/*.java gzz/storm/*.java) $(TESTS)
  # gzz/impl/zob/*.java 
  
  LAVASRC:= $(wildcard lava/gzz/*.java lava/gzz/impl/*.java 
lava/gzz/impl/errors/*.java lava/gzz/impl/mirror/*.java lava/gzz/storm/*.java 
lava/gzz/util/*.java lava/gzz/storm/impl/*.java)
--- 177,193 ----
  
  # Can't add ZZClangOps since javac complains of doubly defined class...
  # maybe should use uniq?
! SRC0:=$(GENERATED) $(wildcard gzz/*.java gzz/errors/*.java gzz/diff/*.java \
!     gzz/impl/*.java gzz/impl/mirror/*.java gzz/media/*.java gzz/fuzzy/*.java \
!     gzz/control/*.java lava/gzz/media/*.java gzz/media/impl/*.java \
!     gzz/index/*.java gzz/index/impl/*.java gzz/zzutil/*.java 
gzz/impl/clasm/*.java \
!     gzz/util/*.java gzz/vob/*.java gzz/vob/buoy/*.java gzz/gfx/gl/*.java \
!     gzz/mediaserver/*.java lava/gzz/mediaserver/*.java 
gzz/mediaserver/*/*.java \
!     lava/gzz/mediaserver/*/*.java gzz/mediaserver/http/*/*.java \
!     lava/gzz/mediaserver/*/*/*.java gzz/ideas/*.java gzz/client/*.java \
!     gzz/view/*.java gzz/client/awt/*.java gzz/client/gl/*.java \
!     gzz/modules/contraints/*.java gzz/modules/mm/*.java lava/gzz/media/*.java 
\
!     lava/gzz/media/impl/*.java gzz/slices/*.java gzz/storm/*.java) $(TESTS) 
$(PP)
  # gzz/impl/zob/*.java 
  
  LAVASRC:= $(wildcard lava/gzz/*.java lava/gzz/impl/*.java 
lava/gzz/impl/errors/*.java lava/gzz/impl/mirror/*.java lava/gzz/storm/*.java 
lava/gzz/util/*.java lava/gzz/storm/impl/*.java)
***************
*** 349,355 ****
  batchtest-junit::
        $(JAVA) -Dzdir=$(Z_DIR) junit.textui.TestRunner $(TESTCLASS)
  
! JVMFLAGS= -Xms64M -Xmx128M -Xincgc
  
  ifeq (,$(JYTHONPATH))
   
JYTHONPATH=$(GZZ_DEPENDS)/jythonlib.jar:$(GZZ_DEPENDS)/pythonlib.jar:$(GZZ_DEPENDS)/yaml.jar
--- 359,365 ----
  batchtest-junit::
        $(JAVA) -Dzdir=$(Z_DIR) junit.textui.TestRunner $(TESTCLASS)
  
! JVMFLAGS= -Xms64M -Xmx128M # -Xincgc
  
  ifeq (,$(JYTHONPATH))
   
JYTHONPATH=$(GZZ_DEPENDS)/jythonlib.jar:$(GZZ_DEPENDS)/pythonlib.jar:$(GZZ_DEPENDS)/yaml.jar
Index: gzz/gzz/view/DefaultBinder.java
diff -c gzz/gzz/view/DefaultBinder.java:1.3 gzz/gzz/view/DefaultBinder.java:1.4
*** gzz/gzz/view/DefaultBinder.java:1.3 Thu Oct  3 12:12:31 2002
--- gzz/gzz/view/DefaultBinder.java     Mon Oct  7 13:27:02 2002
***************
*** 42,48 ****
  /** Keybindings for the Fallback client.
   */
  public class DefaultBinder implements FallbackBinder {
! public static final String rcsid = "$Id: DefaultBinder.java,v 1.3 2002/10/03 
16:12:31 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 42,48 ----
  /** Keybindings for the Fallback client.
   */
  public class DefaultBinder implements FallbackBinder {
! public static final String rcsid = "$Id: DefaultBinder.java,v 1.4 2002/10/07 
17:27:02 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 255,260 ****
--- 255,269 ----
            op(REASSIGN_ARROWSET);
        } else if(k.equals("Alt-A")) {
              op(REASSIGN_ARROWSET);
+         } else if(k.equals("Delete") || k.equals("Ctrl-Backspace")) {
+             Cell cell = fallback.windows[1].cursor;
+             Cell home = fallback.space.getHomeCell();
+             if(!cell.equals(home)) {
+                 cell.delete();
+                 fallback.windows[1].cursor = home;
+             } else {
+                 pa("Cannot delete home cell");
+             }
        } else if(k.length() == 1) {
            switch(k.charAt(0)) {
                // Right Rose
Index: gzz/gzz/view/DimDecorator.java
diff -c gzz/gzz/view/DimDecorator.java:1.9 gzz/gzz/view/DimDecorator.java:1.10
*** gzz/gzz/view/DimDecorator.java:1.9  Sun Sep 29 12:30:27 2002
--- gzz/gzz/view/DimDecorator.java      Mon Oct  7 13:27:02 2002
***************
*** 32,38 ****
   *  vob scene.
   */
  public class DimDecorator implements FallbackSceneDecorator {
! String rcsid = "$Id: DimDecorator.java,v 1.9 2002/09/29 16:30:27 benja Exp $";
      public static boolean dbg = true;
      private static void p(String s) { if(dbg) pa(s); }
      private static void pa(String s) { System.err.println(s); }
--- 32,38 ----
   *  vob scene.
   */
  public class DimDecorator implements FallbackSceneDecorator {
! String rcsid = "$Id: DimDecorator.java,v 1.10 2002/10/07 17:27:02 benja Exp 
$";
      public static boolean dbg = true;
      private static void p(String s) { if(dbg) pa(s); }
      private static void pa(String s) { System.err.println(s); }
***************
*** 71,77 ****
  
        for(int i=0; i<3; i++) {
            sc.map.put(conn, targ[i], orig);
!             int cs_box = sc.coordsys(targ[i], boxKey, 0, 0, 0, w, h);
            sc.map.put(bg, cs_box);
              
            int cs = sc.coordsys(targ[i], dimKeys[i], 0, 5, 5, 2, 2);
--- 71,77 ----
  
        for(int i=0; i<3; i++) {
            sc.map.put(conn, targ[i], orig);
!             int cs_box = sc.coordsys(targ[i], boxKey, 1, 0, 0, w, h);
            sc.map.put(bg, cs_box);
              
            int cs = sc.coordsys(targ[i], dimKeys[i], 0, 5, 5, 2, 2);
***************
*** 90,96 ****
              int cs = sc.coordsys(into, viewKey, 0, vx, 10, 2, 2);
              int cs_wh = sc.coords.coordsys(0, 0, 0, 0, vw, vh);
              ((DefaultVobMatcher)sc.matcher).addSub(cs, cs_wh, whKey);
!             sc.map.put(new TextVob(style, 1.6f, name), cs);
          }
      }
  }
--- 90,96 ----
              int cs = sc.coordsys(into, viewKey, 0, vx, 10, 2, 2);
              int cs_wh = sc.coords.coordsys(0, 0, 0, 0, vw, vh);
              ((DefaultVobMatcher)sc.matcher).addSub(cs, cs_wh, whKey);
!             sc.map.put(new TextVob(style, 1.6f, name), cs, cs_wh);
          }
      }
  }
Index: gzz/gzz/vob/TextCursorVob.java
diff -c gzz/gzz/vob/TextCursorVob.java:1.5 gzz/gzz/vob/TextCursorVob.java:1.6
*** gzz/gzz/vob/TextCursorVob.java:1.5  Mon Sep 23 04:24:26 2002
--- gzz/gzz/vob/TextCursorVob.java      Mon Oct  7 13:27:02 2002
***************
*** 37,43 ****
   */
  
  public class TextCursorVob extends Vob {
! String rcsid = "$Id: TextCursorVob.java,v 1.5 2002/09/23 08:24:26 tjl Exp $";
      public static boolean dbg = false;
      private static void p(String s) { if(dbg) pa(s); }
      private static void pa(String s) { System.err.println(s); }
--- 37,43 ----
   */
  
  public class TextCursorVob extends Vob {
! String rcsid = "$Id: TextCursorVob.java,v 1.6 2002/10/07 17:27:02 benja Exp 
$";
      public static boolean dbg = false;
      private static void p(String s) { if(dbg) pa(s); }
      private static void pa(String s) { System.err.println(s); }
***************
*** 62,87 ****
          String text = textvob.text;
          TextStyle style = textvob.style;
  
!       Shape oldClip = g.getClip();
        info1.getClipRect(rect);
        g.clipRect(rect.x, rect.y,
                        rect.width+2, rect.height);
  
!       info1.getExtRect(rect);
  
          float scale = textvob.scale;
        if(scale < 0)
!           scale = style.getScaleByHeight(rect.height-3);
  
        float h = style.getHeight(scale);
          float text_w = style.getWidth(text.substring(0, offs), scale);
  
!         int x = (int)(rect.x + text_w);
!       int y = (int)(rect.y + rect.height/2 - h/2);
  
          g.drawLine(x, y, x, y + (int)h);
  
!       g.setClip(oldClip);
      }
  }
  
--- 62,92 ----
          String text = textvob.text;
          TextStyle style = textvob.style;
  
!         info1.getExtRect(rect);
!         float bx = rect.x, by = rect.y;
!         info2.getExtRect(rect);
!         float bw = rect.width, bh = rect.height;
!       
!         /*Shape oldClip = g.getClip();
        info1.getClipRect(rect);
        g.clipRect(rect.x, rect.y,
                        rect.width+2, rect.height);
  
!       info1.getExtRect(rect);*/
  
          float scale = textvob.scale;
        if(scale < 0)
!           scale = style.getScaleByHeight(bh-3);
  
        float h = style.getHeight(scale);
          float text_w = style.getWidth(text.substring(0, offs), scale);
  
!         int x = (int)(bx + text_w);
!       int y = (int)(by + bh/2 - h/2);
  
          g.drawLine(x, y, x, y + (int)h);
  
!       //g.setClip(oldClip);
      }
  }
  
Index: gzz/gzz/vob/TextVob.java
diff -c gzz/gzz/vob/TextVob.java:1.35 gzz/gzz/vob/TextVob.java:1.36
*** gzz/gzz/vob/TextVob.java:1.35       Sat Oct  5 09:59:47 2002
--- gzz/gzz/vob/TextVob.java    Mon Oct  7 13:27:02 2002
***************
*** 31,37 ****
   * from these and use a LineBreaker.
   */
  public class TextVob extends HBox.VobHBox {
! String rcsid = "$Id: TextVob.java,v 1.35 2002/10/05 13:59:47 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 31,37 ----
   * from these and use a LineBreaker.
   */
  public class TextVob extends HBox.VobHBox {
! String rcsid = "$Id: TextVob.java,v 1.36 2002/10/07 17:27:02 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 79,85 ****
                       RenderInfo info1,
                       RenderInfo info2) {
          g.setColor(info1.getMixedFgColor());
!       info1.getClipRect(rect);
  
          info1.getExtRect(rect);
          float x = rect.x, y = rect.y;
--- 79,85 ----
                       RenderInfo info1,
                       RenderInfo info2) {
          g.setColor(info1.getMixedFgColor());
!       //info1.getClipRect(rect);
  
          info1.getExtRect(rect);
          float x = rect.x, y = rect.y;