[Gzz-commits] gzz/gzz view/CellVobFactory.java vob/GLTextStyl...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/09/20 15:45:27

Modified files:
        gzz/view       : CellVobFactory.java 
        gzz/vob        : GLTextStyle.java 

Log message:
        a) Switch back to using TextCellContentView by default, which doesn't
        linebreak, but does scroll if you move the text cursor to the right.
        b) I cannot figure out how to use freetype for all mipmap levels
        (*someone* please do this), but I've alleviated the problem somewhat
        by tweaking GLTextStyle parameters-- now the mipmap level freetype
        *does* render seems to be about that used by the accursed cell,
        so the accursed cell's text is more or less readable.

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

Patches:
Index: gzz/gzz/view/CellVobFactory.java
diff -c gzz/gzz/view/CellVobFactory.java:1.6 
gzz/gzz/view/CellVobFactory.java:1.7
*** gzz/gzz/view/CellVobFactory.java:1.6        Wed Sep 18 08:04:46 2002
--- gzz/gzz/view/CellVobFactory.java    Fri Sep 20 15:45:26 2002
***************
*** 46,52 ****
   */
  
  public class CellVobFactory {
! public static final String rcsid = "$Id: CellVobFactory.java,v 1.6 2002/09/18 
12:04:46 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); }
--- 46,52 ----
   */
  
  public class CellVobFactory {
! public static final String rcsid = "$Id: CellVobFactory.java,v 1.7 2002/09/20 
19:45:26 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); }
***************
*** 55,63 ****
      static TextStyle style =
        GraphicsAPI.getInstance().getTextStyle("SansSerif", Font.PLAIN, 10);
  
!     //CellContentView ccv = new TextCellContentView(style);
      //CellContentView ccv = new SpanCellContentView(style);
!     CellContentView ccv = new LinebrokenCellContentView(style);
  
      Dim d_clone;
      /*
--- 55,63 ----
      static TextStyle style =
        GraphicsAPI.getInstance().getTextStyle("SansSerif", Font.PLAIN, 10);
  
!     CellContentView ccv = new TextCellContentView(style);
      //CellContentView ccv = new SpanCellContentView(style);
!     //CellContentView ccv = new LinebrokenCellContentView(style);
  
      Dim d_clone;
      /*
Index: gzz/gzz/vob/GLTextStyle.java
diff -c gzz/gzz/vob/GLTextStyle.java:1.10 gzz/gzz/vob/GLTextStyle.java:1.11
*** gzz/gzz/vob/GLTextStyle.java:1.10   Fri Sep 13 14:20:58 2002
--- gzz/gzz/vob/GLTextStyle.java        Fri Sep 20 15:45:27 2002
***************
*** 1,4 ****
! /*   
  GLTextStyle.java
   *    
   *    Copyright (c) 2000-2001, Ted Nelson and Tuomas Lukka
--- 1,4 ----
! /*
  GLTextStyle.java
   *    
   *    Copyright (c) 2000-2001, Ted Nelson and Tuomas Lukka
***************
*** 33,39 ****
   * it's much better to use GraphicsAPI.getTextStyle.
   */
  public class GLTextStyle extends TextStyle {
! public static final String rcsid = "$Id: GLTextStyle.java,v 1.10 2002/09/13 
18:20:58 tjl Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 33,39 ----
   * it's much better to use GraphicsAPI.getTextStyle.
   */
  public class GLTextStyle extends TextStyle {
! public static final String rcsid = "$Id: GLTextStyle.java,v 1.11 2002/09/20 
19:45:27 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 46,54 ****
        if(size > 200) size = 200;
        GLTextStyle s = instances[size];
        if(s == null) {
!           if(theStaticFont == null) 
!               theStaticFont = GZZGL.createFont("gfx/fonts/a010013l.pfb", 32);
!           s = new GLTextStyle(theStaticFont, size / (float)36);
            instances[size] = s;
        }
        return s;
--- 46,54 ----
        if(size > 200) size = 200;
        GLTextStyle s = instances[size];
        if(s == null) {
!           if(theStaticFont == null)
!               theStaticFont = GZZGL.createFont("gfx/fonts/a010013l.pfb", 16);
!           s = new GLTextStyle(theStaticFont, size / (float)16);
            instances[size] = s;
        }
        return s;