Changeset 15:1bea9f0c6f63

Timestamp:

01/25/08 13:16:45 (7 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

FontData?, Font

Files:

• .hgignore (modified) (1 diff)
• dwt/dwthelper/Float.d (added)
• dwt/dwthelper/Integer.d (modified) (3 diffs)
• dwt/dwthelper/utils.d (modified) (3 diffs)
• dwt/graphics/Device.d (modified) (1 diff)
• dwt/graphics/Font.d (added)
• dwt/graphics/FontData.d (added)
• dwt/internal/win32/OS.d (modified) (9 diffs)
• dwt/internal/win32/WINAPI.d (modified) (1 diff)

.hgignore

@@ -2 +2 @@
-
-*.obj
-a
+lib
-*.swp
-*.proto

dwt/dwthelper/Integer.d

@@ -1 @@
-
+
- * Authors: Frank Benoit <keinfarbton@googlemail.com>
- */
@@ -8 +8 @@
-
-static import tango.text.convert.Integer;
+private import tango.core.Exception;
-
+public final class Byte {
+    public static byte parseByte( char[] s ){
+        try{
+            int res = tango.text.convert.Integer.parse( s );
+            if( res < byte.min || res > byte.max ){
+                throw new NumberFormatException( "out of range" );
+            }
+            return res;
+        }
+        catch( IllegalArgumentException e ){
+            throw new NumberFormatException( e );
+        }
+    }
+}
-public final class Integer {
-
@@ -56 +71 @@
-
-    public static int parseInt( char[] s, int radix ){
-
+
+
+
+
+
+
-    }
-
-    public static int parseInt( char[] s ){
-
+
+
+
+
+
+
-    }
-

dwt/dwthelper/utils.d

@@ -1 @@
-
+
- * Authors: Frank Benoit <keinfarbton@googlemail.com>
- */
@@ -5 +5 @@
-
-public import dwt.dwthelper.System;
+public import Math = tango.math.Math;
-
-import tango.io.Stdout;
+import tango.stdc.stringz;
+import tango.text.Util;
-import tango.text.Unicode;
+import tango.text.convert.Utf;
+import tango.core.Exception;
-import tango.stdc.stdlib : exit;
-
@@ -46 +51 @@
-}
-
+public int indexOf( char[] str, char searched ){
+    int res = tango.text.Util.locate( str, searched );
+    if( res is str.length ) res = -1;
+    return res;
+}
+
+public int indexOf( char[] str, char searched, int startpos ){
+    int res = tango.text.Util.locate( str, searched, startpos );
+    if( res is str.length ) res = -1;
+    return res;
+}
+
+public int indexOf(char[] str, char[] ch, int start){
+    int res = tango.text.Util.locatePattern( str, ch, start );
+    if( res is str.length ) res = -1;
+    return res;
+}
+
+public char[] substring( char[] str, int start ){
+    return str[ start .. $ ].dup;
+}
+
+public char[] substring( char[] str, int start, int end ){
+    return str[ start .. end ].dup;
+}
+
+public wchar[] substring( wchar[] str, int start ){
+    return str[ start .. $ ].dup;
+}
+
+public wchar[] substring( wchar[] str, int start, int end ){
+    return str[ start .. end ].dup;
+}
+
+public char charAt( char[] str, int pos ){
+    return str[ pos ];
+}
+
+static char[] toHex(uint value, bool prefix = true, int radix = 8){
+    return tango.text.convert.Integer.toString( 
+            value, 
+            radix is 10 ? tango.text.convert.Integer.Style.Signed :
+            radix is  8 ? tango.text.convert.Integer.Style.Octal  :
+            radix is 16 ? tango.text.convert.Integer.Style.Hex    :
+                          tango.text.convert.Integer.Style.Signed,
+            prefix ? tango.text.convert.Integer.Flags.Prefix : tango.text.convert.Integer.Flags.None
+            );
+}
+
+class NumberFormatException : IllegalArgumentException {
+    this( char[] e ){
+        super(e);
+    }
+    this( TracedException e ){
+        super(e.toString);
+    }
+}
+
+
+
+
+
+

dwt/graphics/Device.d

@@ -12 +12 @@
-
-//PORTING_TYPE
+import dwt.internal.win32.OS;
-class Device{
+    static Device getDevice();
+    void new_Object (Object object);
+    bool tracking;
+    public bool isDisposed () ;
+    void dispose_Object (Object object) ;
+    float computePoints(LOGFONT* logFont, HFONT hFont);
+    int computePixels(float height) ;
-}
-/+++

dwt/internal/win32/OS.d

@@ -13 +13 @@
-public import dwt.internal.win32.WINTYPES;
-private import dwt.internal.win32.WINAPI;
+alias dwt.internal.win32.WINAPI WINAPI;
-
-import dwt.internal.C;
@@ -18 +19 @@
-
-public class OS : C {
+
+    private static int getNOTIFYICONDATAA_V2_SIZE (){
+        // hm, NOTIFYICONDATAA.dwInfoFlags.offsetof did not compile
+        return IsWinCE ? NOTIFYICONDATAA.sizeof : cast(int)(&(cast(NOTIFYICONDATAA*)null).dwInfoFlags) + int.sizeof;
+    }
+
+    private static int getNOTIFYICONDATAW_V2_SIZE (){
+        return IsWinCE ? NOTIFYICONDATAW.sizeof : cast(int)(&(cast(NOTIFYICONDATAW*)null).dwInfoFlags) + int.sizeof;
+    }
+
-    /*
-    * DWT Windows flags
@@ -66 +77 @@
-    public static const int LANG_KOREAN = 0x12;
-    public static const int MAX_PATH = 260;
+
+    static this(){
+        NOTIFYICONDATAA_V2_SIZE = getNOTIFYICONDATAA_V2_SIZE ();
+        NOTIFYICONDATAW_V2_SIZE = getNOTIFYICONDATAW_V2_SIZE ();
+        NOTIFYICONDATA_V2_SIZE = IsUnicode ? getNOTIFYICONDATAW_V2_SIZE : getNOTIFYICONDATAA_V2_SIZE;
+        OSVERSIONINFO info;
+        IsWin32s = (info.dwPlatformId is VER_PLATFORM_WIN32s);
+        IsWin95 = (info.dwPlatformId is VER_PLATFORM_WIN32_WINDOWS);
+        IsWinNT = (info.dwPlatformId is VER_PLATFORM_WIN32_NT);
+        IsSP_ = false;
+        IsPPC_ = false;
+        IsHPC = false;
+        IsDBLocale = false;
+        WIN32_MAJOR = info.dwMajorVersion;
+        WIN32_MINOR = info.dwMinorVersion;
+        WIN32_VERSION = VERSION (WIN32_MAJOR, WIN32_MINOR);
+        //IsUnicode = !IsWin32s && !IsWin95;
+        DLLVERSIONINFO dvi;
+        COMCTL32_MAJOR = dvi.dwMajorVersion;
+        COMCTL32_MINOR = dvi.dwMinorVersion;
+        COMCTL32_VERSION = VERSION (COMCTL32_MAJOR, COMCTL32_MINOR);
+        SHELL32_MAJOR = dvi.dwMajorVersion;
+        SHELL32_MINOR = dvi.dwMinorVersion;
+        SHELL32_VERSION = VERSION (SHELL32_MAJOR, SHELL32_MINOR);
+    }
+//PORTING_LEFT
-/++
-    /* Get the Windows version and the flags */
@@ -215 +252 @@
-        SHELL32_VERSION = VERSION (SHELL32_MAJOR, SHELL32_MINOR);
-    }
+++/
-
-    /* Flag used on WinCE */
@@ -1170 +1208 @@
-    public static const int NM_RELEASEDCAPTURE = NM_FIRST - 16;
-    public static const int NM_RETURN = 0xfffffffc;
-const int NOTIFYICONDATAA_V2_SIZE = NOTIFYICONDATAA_V2_SIZE ()
-const int NOTIFYICONDATAW_V2_SIZE = NOTIFYICONDATAW_V2_SIZE ()
-const int NOTIFYICONDATA_V2_SIZE = IsUnicode ? NOTIFYICONDATAW_V2_SIZE : NOTIFYICONDATA
+int NOTIFYICONDATAA_V2_SIZE
+int NOTIFYICONDATAW_V2_SIZE
+int NOTIFYICONDAT
-    public static const int NOTSRCCOPY = 0x330008;
-    public static const int NULLREGION = 0x1;
@@ -2007 +2045 @@
-    public static const int WS_CAPTION = 0xc00000;
-    public static const int WS_CHILD = 0x40000000;
+    public static const int WS_MINIMIZE = 0x20000000; //PORTING_TODO: from dwt, why?
-    public static const int WS_CLIPCHILDREN = 0x2000000;
-    public static const int WS_CLIPSIBLINGS = 0x4000000;
@@ -2042 +2081 @@
-    public static const int XBUTTON2 = 0x2;
-    
-
-
-
-
-
+
+
+
-/** Ansi/Unicode wrappers */
-
@@ -3520 +3557 @@
-public static final native BOOL MoveToEx (int /*long*/ hdc, int x1, int x2, int /*long*/ lPoint);
-public static final native int MsgWaitForMultipleObjectsEx (int nCount, int /*long*/ pHandles, int dwMilliseconds, int dwWakeMask, int dwFlags);
-
-
+
-public static final native void NotifyWinEvent (int event, int /*long*/ hwnd, int idObject, int idChild);
-public static final native BOOL OffsetRect (RECT lprc, int dx, int dy);
@@ -3772 +3808 @@
-public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);
-
-public static final native BOOL WaitMessage ();
-public static final native int WideCharToMultiByte (int CodePage, int dwFlags, char [] lpWideCharStr, int cchWideChar, byte [] lpMultiByteStr, int cchMultiByte, byte [] lpDefaultChar, BOOL [] lpUsedDefaultChar);
-public static final native int WideCharToMultiByte (int CodePage, int dwFlags, char [] lpWideCharStr, int cchWideChar, int /*long*/ lpMultiByteStr, int cchMultiByte, byte [] lpDefaultChar, BOOL [] lpUsedDefaultChar);
-public static final native int /*long*/ WindowFromDC (int /*long*/ hDC);
-public static final native int /*long*/ WindowFromPoint (POINT lpPoint);
-public static final native int wcslen (int /*long*/ string);
-++/
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+