customdrawn-android: Advances the text drawing code

git-svn-id: trunk@33909 -

examples/androidlcl/android/src/com/pascal/lcltest/LCLActivity.java

@@ -10,7 +10,9 @@ import android.view.*;
 
 public class LCLActivity extends Activity 
 {
+  // -------------------------------------------
   // Our drawing surface
+  // -------------------------------------------
   private class LCLSurface extends SurfaceView
   {
     public LCLSurface(Context context)
@@ -30,9 +32,9 @@ public class LCLActivity extends Activity
       //Log.v("lclproject", "LCLSurface.onDraw width=" + Integer.toString(lWidth)
       //  + " height=" + Integer.toString(lHeight));
  
-      Bitmap lclbitmap = Bitmap.createBitmap(lWidth, lHeight, Bitmap.Config.ARGB_8888);
+      Bitmap localbitmap = Bitmap.createBitmap(lWidth, lHeight, Bitmap.Config.ARGB_8888);
-      LCLDrawToBitmap(lWidth, lHeight, lclbitmap);
+      LCLDrawToBitmap(lWidth, lHeight, localbitmap);
-      canvas.drawBitmap(lclbitmap, 0, 0, null);
+      canvas.drawBitmap(localbitmap, 0, 0, null);
     }
 
 
@@ -44,6 +46,10 @@ public class LCLActivity extends Activity
     }
   }    
 
+  // -------------------------------------------
+  // Activity Events
+  // -------------------------------------------
+
   /** Called when the activity is first created. */
   @Override
   public void onCreate(Bundle savedInstanceState) 
@@ -57,39 +63,56 @@ public class LCLActivity extends Activity
     LCLOnCreate(this);
   }
   
+  // -------------------------------------------
   // JNI table of Pascal functions
+  // -------------------------------------------
   public native int LCLDrawToBitmap(int width, int height, Bitmap bitmap);
   public native int LCLOnTouch(float x, float y, int action);
   public native int LCLOnCreate(LCLActivity lclactivity);
 
+  // -------------------------------------------
   // Functions exported to the Pascal side
+  // -------------------------------------------
 
   // input: String lcltext
   // output: int lclwidth, int lclheight
   public void LCLDoGetTextBounds()
   {
-    Paint paint = new Paint();
+    Paint localpaint = new Paint();
-    Rect bounds = new Rect();
+    Rect localbounds = new Rect();
-    paint.getTextBounds(lcltext, 0, lcltext.length(), bounds);
+    localpaint.getTextBounds(lcltext, 0, lcltext.length(), localbounds);
-    lclwidth = bounds.width();
+    lclwidth = localbounds.width();
-    lclheight = bounds.height();
+    lclheight = localbounds.height();
   }
 
+  // input: String lcltext, int lclwidth, int lclheight
+  // output: lclbitmap
+  public void LCLDoDrawText()
+  {
+    lclbitmap = Bitmap.createBitmap(lclwidth, lclheight, Bitmap.Config.ARGB_8888);
+    Canvas localcanvas = new Canvas(lclbitmap);
+    Paint localpaint = new Paint();
+    localcanvas.drawText(lcltext, 0, 0, localpaint);
+  }
+
+  // -------------------------------------------
   // Fields exported to the Pascal side for easier data communication
+  // -------------------------------------------
   public String lcltext;
   public int lclwidth;
   public int lclheight;
+  public Bitmap lclbitmap;
 
   static
   {
     try 
     {
-      Log.i("lclproject", "Trying to load liblclapp.so");
+      Log.i("lclapp", "Trying to load liblclapp.so");
       System.loadLibrary("lclapp");
     } 
     catch(UnsatisfiedLinkError ule) 
     {
-      Log.e("lclproject", "WARNING: Could not load liblclapp.so");
+      Log.e("lclapp", "WARNING: Could not load liblclapp.so");
       ule.printStackTrace();
     }
   }

lcl/interfaces/customdrawn/customdrawnint.pas

@@ -219,6 +219,7 @@ var
 
   // Methods of our Activity
   javaMethod_LCLDoGetTextBounds: jmethodid = nil;
+  javaMethod_LCLDoDrawText: jmethodid = nil;
 
   // This is utilized to store the information such as invalidate requests in events
   eventResult: jint;

lcl/interfaces/customdrawn/customdrawnobject_android.inc

@@ -171,6 +171,7 @@ begin
 
   // Read all method IDs
   javaMethod_LCLDoGetTextBounds := javaEnvRef^^.GetMethodID(javaEnvRef, javaActivityClass, 'LCLDoGetTextBounds', '()V');
+  javaMethod_LCLDoDrawText := javaEnvRef^^.GetMethodID(javaEnvRef, javaActivityClass, 'LCLDoDrawText', '()V');
 
   result:=JNI_VERSION_1_4;// 1_6 is another option
 end;

lcl/interfaces/customdrawn/customdrawnwinapi_android.inc

@@ -2179,23 +2179,45 @@ end;*)
  ------------------------------------------------------------------------------}
 function TCDWidgetSet.ExtTextOut(DC: HDC; X, Y: Integer; Options: Longint;
   Rect: PRect; Str: PChar; Count: Longint; Dx: PInteger): Boolean;
-{var
+var
-  WideStr: WideString;
+  lJavaString: jstring;
-  QtDC: TQtDeviceContext absolute DC;
-  B: Boolean;      }
 begin
-  {$ifdef VerboseCDWinAPI}
+  {$ifdef VerboseCDText}
-    WriteLn('[WinAPI ExtTextOut]');
+    DebugLn(Format('[WinAPI ExtTextOut] DC=%x javaEnvRef=%x Str=%s', [DC, PtrInt(javaEnvRef), StrPas(Str)]));
   {$endif}
 
   Result := False;
 
-{  if ((Options and (ETO_OPAQUE + ETO_CLIPPED)) <> 0) and (Rect = nil) then
+  if (Str = nil) or (Str = '') then Exit;
+
+  if ((Options and (ETO_OPAQUE + ETO_CLIPPED)) <> 0) and (Rect = nil) then
     exit;
 
   if not IsValidDC(DC) then Exit;
 
-   if ((Options and ETO_OPAQUE) <> 0) then
+  if (javaEnvRef = nil) then Exit;
+
+  // Prepare the input
+  lJavaString :=javaEnvRef^^.NewStringUTF(javaEnvRef, Str);
+  javaEnvRef^^.SetObjectField(javaEnvRef, javaActivityObject, JavaField_lcltext, lJavaString);
+
+  // Call the method
+  javaEnvRef^^.CallVoidMethod(javaEnvRef, javaActivityObject, javaMethod_LCLDoGetTextBounds);
+
+  // Call the method
+  javaEnvRef^^.CallVoidMethod(javaEnvRef, javaActivityObject, javaMethod_LCLDoDrawText);
+
+{  // Read the output
+  Size.cx := javaEnvRef^^.GetLongField(javaEnvRef, javaActivityObject, javaField_lclwidth);
+  Size.cy := javaEnvRef^^.GetLongField(javaEnvRef, javaActivityObject, javaField_lclheight);}
+
+  {$ifdef VerboseCDText}
+    DebugLn('[WinAPI ExtTextOut]');
+  {$endif}
+
+  Result := True;
+
+{   if ((Options and ETO_OPAQUE) <> 0) then
      QtDC.fillRect(Rect^.Left, Rect^.Top, Rect^.Right - Rect^.Left, Rect^.Bottom - Rect^.Top);
 
   if Str <> nil then
@@ -4129,8 +4151,8 @@ function TCDWidgetSet.GetTextMetrics(DC: HDC; var TM: TTextMetric): Boolean;
   QtDC: TQtDeviceContext absolute DC;
   FontWeight: Integer;}
 begin
-  {$ifdef VerboseCDWinAPI}
+  {$ifdef VerboseCDText}
-    DebugLn('[WinAPI GetTextMetrics]');
+    DebugLn(Format('[WinAPI GetTextMetrics] DC=%x javaEnvRef=%x', [DC, PtrInt(javaEnvRef)]));
   {$endif}
 
   Result := IsValidDC(DC);