Changeset 266:b302f82224e1

Timestamp:

07/06/08 09:34:54 (2 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

Fix: bitfield access for PangoLayoutLine?

Files:

• dwt/internal/c/pango.d (modified) (5 diffs)
• dwt/internal/gtk/OS.d (modified) (3 diffs)

dwt/internal/c/pango.d

@@ -7 +7 @@
-import dwt.dwthelper.utils;
-
+//version=DYNLINK;
+
-public import dwt.internal.c.glib_object;
+
+version(DYNLINK){
+    import tango.sys.SharedLib : SharedLib;
+    import tango.util.log.Trace;
+    struct Symbol{
+        String name;
+        void** symbol;
+    }
+}
+
+void loadLib(){
+    version(DYNLINK){
+        String libname = "libpango-1.0.so";
+
+        SharedLib lib = SharedLib.load( libname );
+        if( lib is null ){
+            lib = SharedLib.load( libname ~ ".0" );
+        }
+        int loaded;
+        if ( lib !is null ) {
+            foreach( s; symbols ){
+                try{
+                    *s.symbol = lib.getSymbol( s.name.ptr );
+                }
+                catch(Exception e){}
+                if( *s.symbol is null ){
+                    Trace.formatln( "{}: Symbol '{}' not found", libname, s.name );
+                }
+                else{
+                    loaded++;
+                }
+            }
+        } else {
+            Trace.formatln( "Could not load the library {}", libname );
+        }
+    }
+}
+
+
+
-
-extern(C):
@@ -372 +414 @@
-// uint is_paragraph_start // bits 0 .. 1
-// uint resolved_dir // bits 1 .. 4
+uint is_paragraph_start(){ return ( bitfield0 >> 0 ) & 0x01; }
+uint resolved_dir      (){ return ( bitfield0 >> 1 ) & 0x07; }
+
+uint is_paragraph_start( uint v ){ bitfield0 &= ~( 0x01 << 0 ); bitfield0 |= ( v & 0x01 ) << 0; return is_paragraph_start(); }
+uint resolved_dir      ( uint v ){ bitfield0 &= ~( 0x07 << 1 ); bitfield0 |= ( v & 0x07 ) << 1; return resolved_dir      (); }
+
-}
-struct _PangoGlyphItem {
@@ -498 +546 @@
-}
-version(DYNLINK){
-extern (C) int function(_PangoLayoutLine*) pango_layout_line_get_resolved_dir; // manually added
-extern (C) char * function(int, int, int)pango_version_check;
-extern (C) char * function()pango_version_string;
@@ -850 +897 @@
-
-Symbol[] symbols = [
-    { "pango_layout_line_get_resolved_dir",  cast(void**)& pango_layout_line_get_resolved_dir}, // manually added
-    { "pango_version_check",  cast(void**)& pango_version_check},
-    { "pango_version_string",  cast(void**)& pango_version_string},
@@ -1202 +1248 @@
-
-} else { // version(DYNLINK)
-extern (C) int pango_layout_line_get_resolved_dir(_PangoLayoutLine*); // manually added
-extern (C) char * pango_version_check(int, int, int);
-extern (C) char * pango_version_string();

dwt/internal/gtk/OS.d

@@ -655 +655 @@
-    static this(){
-        dwt.internal.c.gtk.loadLib();
+        dwt.internal.c.pango.loadLib();
-        if (OS.GTK_VERSION >= OS.buildVERSION (2, 10, 0)){
-//            dwt.internal.c.gtk_unix_print_2_0.loadLib();
@@ -2241 +2242 @@
-    mixin ForwardGtkOsCFunc!(.pango_layout_line_get_extents);
-    mixin ForwardGtkOsCFunc!(.pango_layout_line_x_to_index);
-    mixin ForwardGtkOsCFunc!(.pango_layout_line_get_resolved_dir);
-    mixin ForwardGtkOsCFunc!(.pango_layout_new);
-    mixin ForwardGtkOsCFunc!(.pango_layout_set_alignment );
@@ -2264 +2264 @@
-
-    /* Field accessors */
+
+    public static uint pango_layout_line_get_resolved_dir( PangoLayoutLine* line ){
+        return line.resolved_dir();
+    }
-
-    static void    GTK_ACCEL_LABEL_SET_ACCEL_STRING( void *arg0, gchar * arg1 )