Changeset 30

Timestamp:

12/15/06 10:44:12 (2 years ago)

Author:

lindquist

Message:

Changed version(Windows) to version(MinWin32) (for building with GTK on Windows).
Removed Motif support!!!

Files:

• trunk/minwin/app.d (modified) (4 diffs)
• trunk/minwin/button.d (modified) (3 diffs)
• trunk/minwin/canvas.d (modified) (2 diffs)
• trunk/minwin/combo.d (modified) (2 diffs)
• trunk/minwin/dialog.d (modified) (7 diffs)
• trunk/minwin/event.d (modified) (2 diffs)
• trunk/minwin/font.d (modified) (3 diffs)
• trunk/minwin/geometry.d (modified) (4 diffs)
• trunk/minwin/group.d (modified) (2 diffs)
• trunk/minwin/icon.d (modified) (2 diffs)
• trunk/minwin/image.d (modified) (2 diffs)
• trunk/minwin/index.html (deleted)
• trunk/minwin/label.d (modified) (2 diffs)
• trunk/minwin/listbox.d (modified) (2 diffs)
• trunk/minwin/menu.d (modified) (2 diffs)
• trunk/minwin/motif.brf (deleted)
• trunk/minwin/motif.d (deleted)
• trunk/minwin/motif_aux.d (deleted)
• trunk/minwin/paint.d (modified) (3 diffs)
• trunk/minwin/peer.d (modified) (2 diffs)
• trunk/minwin/peerimpl.d (modified) (2 diffs)
• trunk/minwin/samples/motif.brf (deleted)
• trunk/minwin/scroll.d (modified) (3 diffs)
• trunk/minwin/text.d (modified) (2 diffs)
• trunk/minwin/todo (modified) (3 diffs)
• trunk/minwin/win32.brf (modified) (1 diff)
• trunk/minwin/window.d (modified) (4 diffs)
• trunk/minwin/x11.d (deleted)

trunk/minwin/app.d

@@ -18 +18 @@
-}
-
-Windows
+MinWin32
-    private import minwin.mswindows;
-}
@@ -47 +47 @@
-void sysAssert(bool passed, char[] msg, int id = 0) {
-    if (!passed) {
-Windows
+MinWin32
-            if (GetVersion() < 0x80_00_00_00 || id != 0) {
-                throw new MinWinException(msg,id);
@@ -61 +61 @@
-Application gApp;
-
-Windows
+MinWin32
-
-    extern (Windows)
@@ -174 +174 @@
-    }
-
-} else version (Motif) {
-
-    private {
-        import minwin.motif;
-        import std.string;
-        import std.file;
-    }
-
-    extern (C)
-    void MinWinIdleProc(XtPointer closure,XtIntervalId* id) {
-        gApp.idleDelegate();
-        gApp.idleTime = gApp.idleTime; // reset timer
-    }
-
-    struct Application {
-
-        char[][] cmdLineArgs;
-
-        char[] rsrc(char[] id, char[] group = "strings") {
-            return "";
-        }
-
-        char[] resourcePath;
-
-        MultiDelegate!() idleDelegate;
-        uint fIdleTime;
-        uint idleTime() {
-            return fIdleTime;
-        }
-
-        XtIntervalId fTimerID;
-
-        static
-        void idleTime(uint t) {
-            gApp.fIdleTime = t;
-            if (gApp.fTimerID)
-                XtRemoveTimeOut(gApp.fTimerID);
-            if (t)
-                gApp.fTimerID = XtAppAddTimeOut(gApp.context,t,&MinWinIdleProc,null);
-        }
-
-        int enterEventLoop() {
-            XtAppMainLoop(context);
-            return 1;
-        }
-
-        void exitEventLoop() {
-            XtAppSetExitFlag(context);
-        }
-
-        XtAppContext context;
-        Display* display;
-        ImlibData* imlibdata;
-
-    }
-
-    int main(char[][] args) {
-        gApp.cmdLineArgs = args;
-
-        XtToolkitInitialize();
-        gApp.context = XtCreateApplicationContext();
-        char*[] argv;
-        argv.length = args.length;
-        foreach (int n, char[] str; args) {
-            argv[n] = toStringz(str);
-        }
-        int argc = args.length;
-        gApp.display = XtOpenDisplay(gApp.context,null,"test","appclass",null,0,
-                 &argc,argv.ptr);
-        gApp.imlibdata = Imlib_init(gApp.display);
-
-        int res = MinWinMain(&gApp);
-        version(LOG) log.close();
-        return res;
-    }
-
-} else version (GTK) {
-

trunk/minwin/button.d

@@ -47 +47 @@
-    void selected(bool x);
-}
-
-
-
-
+
-    version = SimpleToggleGroup;
-}
@@ -87 +84 @@
-}
-
-Windows
+MinWin32
-    private import minwin.mswindows;
-
@@ -232 +229 @@
-        SendMessageA(peer,WM_SETFONT,cast(WPARAM)f.peer,0);
-        parent.addChild(b);
-    }
-
-} else version (Motif) {
-    private import minwin.motif;
-
-    const int ButtonClickedCommand = 1;
-
-    template SelectedImpl() {
-        bool selected() {
-            return XmToggleButtonGetState(peer) != 0;
-        }
-        void selected(bool x) {
-            XmToggleButtonSetState(peer,x,false);
-        }
-    }
-
-    template IconTextImpl() {
-        Icon icon_data;
-        Icon icon() {
-            return icon_data;
-        }
-        void icon(Icon c) {
-            icon_data = c;
-            //            SendMessageA(peer,BM_SETIMAGE,cast(WPARAM)c.peer,0);
-        }
-        char[] text_data;
-        char[] text() { return text_data; }
-        void text(char[] c) {
-            text_data = c;
-            char* str = toStringz(c);
-            XmString xmstr = XmStringCreate(str,XmFONTLIST_DEFAULT_TAG);
-            Arg[6] args;
-            int n;
-            XtSetArg(args[n],XmNlabelString,cast(XtArgVal)xmstr);n++;
-            XtSetValues(peer,args.ptr,n);
-            XmStringFree(xmstr);
-        }
-    }
-
-    class Button : AbstractButton {
-        this(Component parent, char[] text, char[] name = "") {
-            PeerForAdd parentp = parent.getPeerForAdd();
-            this.name = name;
-            text_data = text;
-            char* str = toStringz(text);
-            XmString xmstr = XmStringCreate(str,XmFONTLIST_DEFAULT_TAG);
-            Arg[6] args;
-            int n;
-            XtSetArg(args[n],XmNlabelString,cast(XtArgVal)xmstr);n++;
-            peer = XmCreatePushButton(parentp,toStringz(name),args,n);
-            XmStringFree(xmstr);
-            XtAddEventHandler(peer,ExposureMask,false,&mw_exposechild_callback,this);
-            XtAddCallback(peer,XmNactivateCallback,
-                cast(XtCallbackProc)&mw_buttonactivate_callback,this);
-
-            setWindowChildPeer(this,peer,OWNS_PEER);
-            parent.addChild(this);
-            XtManageChild(peer);
-            XtRealizeWidget(peer);
-        }
-        mixin WindowChildImpl!();
-        mixin IconTextImpl!();
-    }
-    class CheckBox : AbstractToggleButton {
-        this(Component parent, char[] text, char[] name = "") {
-            PeerForAdd parentp = parent.getPeerForAdd();
-            text_data = text;
-            this.name = name;
-            char* str = toStringz(text);
-            XmString xmstr = XmStringCreate(str,XmFONTLIST_DEFAULT_TAG);
-            Arg[6] args;
-            int n;
-            XtSetArg(args[n],XmNlabelString,cast(XtArgVal)xmstr);n++;
-            XtSetArg(args[n],XmNindicatorType,cast(XtArgVal)XmN_OF_MANY);n++;
-            XtSetArg(args[n],XmNalignment,cast(XtArgVal)XmALIGNMENT_BEGINNING);n++;
-            //            XtSetArg(args[0],XmNlabelString,cast(XtArgVal)str);n++;
-            peer = XmCreateToggleButton(parentp,toStringz(name),args,n);
-            XmStringFree(xmstr);
-
-            XtAddEventHandler(peer,ExposureMask,false,&mw_exposechild_callback,this);
-            XtAddCallback(peer,XmNvalueChangedCallback,
-                cast(XtCallbackProc)&mw_buttonactivate_callback,this);
-
-            setWindowChildPeer(this,peer,OWNS_PEER);
-            parent.addChild(this);
-            XtManageChild(peer);
-            XtRealizeWidget(peer);
-        }
-        mixin WindowChildImpl!();
-        mixin SelectedImpl!();
-        mixin IconTextImpl!();
-    }
-    class RadioButton : AbstractToggleButton {
-        this(Component parent, char[] text, char[] name = "") {
-            PeerForAdd parentp = parent.getPeerForAdd();
-            text_data = text;
-            this.name = name;
-            char* str = toStringz(text);
-            XmString xmstr = XmStringCreate(str,XmFONTLIST_DEFAULT_TAG);
-            Arg[6] args;
-            int n;
-            XtSetArg(args[n],XmNlabelString,cast(XtArgVal)xmstr);n++;
-            XtSetArg(args[n],XmNindicatorType,cast(XtArgVal)XmONE_OF_MANY_ROUND);n++;
-            XtSetArg(args[n],XmNalignment,cast(XtArgVal)XmALIGNMENT_BEGINNING);n++;
-            //            XtSetArg(args[0],XmNlabelString,cast(XtArgVal)str);n++;
-            peer = XmCreateToggleButton(parentp,toStringz(name),args,n);
-            XmStringFree(xmstr);
-
-            XtAddEventHandler(peer,ExposureMask,false,&mw_exposechild_callback,this);
-            XtAddCallback(peer,XmNvalueChangedCallback,
-                cast(XtCallbackProc)&mw_buttonactivate_callback,this);
-
-            setWindowChildPeer(this,peer,OWNS_PEER);
-            parent.addChild(this);
-            XtManageChild(peer);
-            XtRealizeWidget(peer);
-        }
-        mixin WindowChildImpl!();
-        mixin SelectedImpl!();
-        mixin IconTextImpl!();
-    }
-    class ToggleButton : AbstractToggleButton {
-        this(Component parent, char[] text, char[] name = "") {
-            PeerForAdd parentp = parent.getPeerForAdd();
-            text_data = text;
-            this.name = name;
-            char* str = toStringz(text);
-            XmString xmstr = XmStringCreate(str,XmFONTLIST_DEFAULT_TAG);
-            Arg[6] args;
-            int n;
-            XtSetArg(args[n],XmNlabelString,cast(XtArgVal)xmstr);n++;
-            XtSetArg(args[n],XmNindicatorType,cast(XtArgVal)XmN_OF_MANY);n++;
-            XtSetArg(args[n],XmNindicatorOn,cast(XtArgVal)0);n++;
-            XtSetArg(args[n],XmNshadowThickness,cast(XtArgVal)2);n++;
-            //            XtSetArg(args[0],XmNlabelString,cast(XtArgVal)str);n++;
-            peer = XmCreateToggleButton(parentp,toStringz(name),args,n);
-            XmStringFree(xmstr);
-
-            XtAddEventHandler(peer,ExposureMask,false,&mw_exposechild_callback,this);
-            XtAddCallback(peer,XmNvalueChangedCallback,
-                cast(XtCallbackProc)&mw_buttonactivate_callback,this);
-
-            setWindowChildPeer(this,peer,OWNS_PEER);
-            parent.addChild(this);
-            XtManageChild(peer);
-            XtRealizeWidget(peer);
-        }
-        mixin WindowChildImpl!();
-        mixin SelectedImpl!();
-        mixin IconTextImpl!();
-    }
-    extern (C) void mw_buttonactivate_callback(Widget w, XtPointer ud, void* wd) {
-        Component c = cast(Component) ud;
-        if (c) {
-            c.doCommand(ButtonClickedCommand);
-        }
-    }
-

trunk/minwin/canvas.d

@@ -30 +30 @@
-}
-
-Windows
+MinWin32
-
-    private import minwin.mswindows;
@@ -120 +120 @@
-    }
-
-} else version (Motif) {
-
-    private import minwin.motif;
-
-    class Canvas : WindowChild {
-        Widget content;
-
-        this(Component parent, char[] name = "") {
-            PeerForAdd parentp = parent.getPeerForAdd();
-            this.name = name;
-            Arg[6] args;
-            int n;
-            //                        XtSetArg(args[0],XmNinitialFocus,cast(XtArgVal)true);n++;
-            peer = XmCreateDrawingArea(parentp,toStringz(name),args,n);
-            content = peer;
-            XtAddEventHandler(peer,ExposureMask,false,&mw_canvas_expose_callback,this);
-            XtAddEventHandler(peer,KeyPressMask|KeyReleaseMask,
-                                    false,&mw_canvas_key_callback,this);
-            XtAddEventHandler(content,ButtonPressMask | ButtonReleaseMask,
-                                    false,&mw_canvas_button_callback,this);
-            XtAddEventHandler(content,PointerMotionMask,false,
-                                    &mw_canvas_motion_callback,this);
-            setWindowChildPeer(this,peer,OWNS_PEER);
-            parent.addChild(this);
-            XtManageChild(peer);
-            XtRealizeWidget(peer);
-        }
-
-        void backgroundColor(Color c) {
-            // TODO
-        }
-
-        mixin CommonEventSourceImpl!();
-
-        GContext getGContext(Event* paintEvent = null) {
-            GContext gc = newGContext();
-            gc.display = XtDisplay(peer);
-            gc.drawable = XtWindow(peer);
-            XWindowAttributes attr;
-            Status stat = XGetWindowAttributes(gc.display,gc.drawable,&attr);
-            gc.colormap = attr.colormap;
-            gc.peer = XCreateGC(gc.display,gc.drawable,0,null);
-            gc.hasPeer = OWNS_PEER;
-            gc.paintEvent = cast(XExposeEvent*)paintEvent;
-            return gc;
-        }
-
-        Image getCompatibleImage(int width, int height) {
-            XWindowAttributes attr;
-            Display* disp = XtDisplay(peer);
-            minwin.motif.Window w = XtWindow(peer);
-            Status stat = XGetWindowAttributes(disp,w,&attr);
-            //                        sysAssert(stat == Success,"Failed to get window attributes in getCompatibleImage",stat);
-            ImagePeer bm = XCreatePixmap(disp,w,width,height,attr.depth);
-            version(LOG) log.writefln("create bitmap %x",cast(int)bm);
-            Image res = new Image(bm);
-            res.width = width;
-            res.height = height;
-            res.hasPeer = OWNS_PEER;
-            res.colormap = attr.colormap;
-            //                        res.ref = getWindowAncestor();
-            return res;
-        }
-
-        mixin SharedCanvasImpl!();
-        mixin WindowChildImpl!();
-    }
-    extern (C)
-    void mw_canvas_expose_callback(Widget w, XtPointer ud, XEvent* event, int* cont) {
-        Canvas c = cast(Canvas) ud;
-        if (c) {
-            c.repaintNow(cast(Event*)event);
-        }
-    }
-    extern (C)
-    void mw_canvas_key_callback(Widget w, XtPointer ud, XEvent* event, int* cont) {
-        Canvas c = cast(Canvas) ud;
-        if (c && !c.keyDelegate.isEmpty) {
-            c.keyDelegate(c,cast(KeyEvent*)event);
-        }
-    }
-    extern (C)
-    void mw_canvas_button_callback(Widget w, XtPointer ud, XEvent* event, int* cont) {
-        Canvas c = cast(Canvas) ud;
-        if (c && !c.mouseDelegate.isEmpty) {
-            // TODO: verify this is ok to cast
-            c.mouseDelegate(c,cast(MouseEvent*)event);
-        }
-    }
-    extern (C)
-    void mw_canvas_motion_callback(Widget w, XtPointer ud, XEvent* event, int* cont) {
-        Canvas c = cast(Canvas) ud;
-        if (c && !c.mouseDelegate.isEmpty) {
-            c.mouseDelegate(c,cast(MouseEvent*)event);
-        }
-    }
-
-} else version (GTK) {
-

trunk/minwin/combo.d

@@ -19 +19 @@
-}
-
-Windows
+MinWin32
-
-    // bug: clicking on the drop down button doesn't show the list
@@ -88 +88 @@
-    }
-    */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    private import minwin.gtk;

trunk/minwin/dialog.d

@@ -11 +11 @@
-
-private {
+    import std.string;
+    import std.c.string;
-    import minwin.peerimpl;
-    import minwin.font;
@@ -16 +18 @@
-    import minwin.component;
-    import minwin.menu;
-    import std.string;
-    import std.c.string;
-    import minwin.app;
-    import minwin.logging;
@@ -24 +24 @@
-}
-
-Windows
+MinWin32
-
-    private import minwin.mswindows;
@@ -144 +144 @@
-        wc.cbWndExtra = 0;
-        RegisterClassA(&wc);
-    }
-
-} else version (Motif) {
-
-    private import minwin.motif;
-
-    class Dialog : AbstractWindow {
-        AbstractWindow owner;
-        bool modal_data;
-        bool visible_data;
-
-        this(AbstractWindow owner, char[] title = "", bool modal = true, char[] name = "") {
-            String str = toStringz(title);
-            int n;
-            Arg[6] args;
-            XtSetArg(args[n],XtNtitle,cast(XtArgVal)str); n++;
-            XtSetArg(args[n],XtNheight,cast(XtArgVal)DefaultWindowHeight); n++;
-            XtSetArg(args[n],XtNwidth,cast(XtArgVal)DefaultWindowWidth); n++;
-            XtSetArg(args[n],XmNdeleteResponse,cast(XtArgVal)XmDO_NOTHING); n++;
-            if (!modal) {
-                XtSetArg(args[n],XmNtransientFor,cast(XtArgVal)null); n++;
-            }
-            // TODO: application name vs window name??
-            peer = XmCreateDialogShell(owner.peer,toStringz(name), args, n);
-            this.name = name;
-            this.owner = owner;
-            modal_data = modal;
-            XtAddEventHandler(peer,StructureNotifyMask,false,&mw_notify_callback,this);
-            XtAddCallback(peer,XtNdestroyCallback,&mw_destroy_callback,this);
-
-            Atom WM_DELETE_WINDOW;
-            WM_DELETE_WINDOW = XInternAtom(XtDisplay(peer),"WM_DELETE_WINDOW",false);
-            Atom proto = XInternAtom(XtDisplay(peer),"WM_PROTOCOLS",false);
-            XmAddProtocolCallback(peer,proto,WM_DELETE_WINDOW,
-                    cast(XtCallbackProc)&mw_dialog_close_callback,this);
-
-            setWindowPeer(this,peer,OWNS_PEER);
-            WindowList[this] = this; // prevent garbage collection
-
-            n = 0;
-            XtSetArg(args[n],XmCAllowOverlap,cast(XtArgVal)true); n++;
-            if (modal) {
-                XtSetArg(args[n],XmNdialogStyle,cast(XtArgVal)XmDIALOG_FULL_APPLICATION_MODAL); n++;
-            }
-            content = XmCreateBulletinBoard(peer,"Bulletin",args,n);
-            XtAddEventHandler(content,ExposureMask,false,&mw_expose_callback,this);
-            XtManageChild(content);
-            XtRealizeWidget(peer);
-        }
-
-        this(WindowPeer peer) {
-            setWindowPeer(this,peer,FOREIGN_PEER);
-            WindowList[this] = this; // prevent garbage collection
-        }
-
-        void visible(bool vis) {
-            super.visible(vis);
-            visible_data = vis;
-            if (modal_data && vis) {
-                while (visible_data && (XtAppGetExitFlag(gApp.context) == 0)) {
-                    XtAppProcessEvent(gApp.context,XtIMAll);
-                }
-            }
-        }
-    }
-    extern (C)
-    void mw_dialog_close_callback(Widget w, XtPointer clientdata, XtPointer calldata) {
-        Dialog win = cast(Dialog) clientdata;
-        if (win) {
-            win.visible = false;
-            //            win.close(); // destroys dialog so dont do this
-        }
-    }
-
@@ -316 +244 @@
-    char[][] extensions;
-}
-version (Motif) {
-    version = SharedFileDialogData;
-}
-version (GTK) {
-    version = SharedFileDialogData;
@@ -340 +265 @@
-}
-
-Windows
+MinWin32
-    private {
-        import minwin.mswindows;
@@ -452 +377 @@
-        */
-        return res;
-    }
-
-} else version(Motif) {
-
-    private import minwin.motif;
-    private import minwin.app;
-
-    void setupSimpleDialog(Arg[]args,inout int n,char* str) {
-        XmString xmstr = XmStringCreateLocalized(str);
-        XtSetArg(args[n],XmNmessageString,cast(XtArgVal)xmstr);n++;
-        XtSetArg(args[n], XmNautoUnmanage, cast(XtArgVal)false); n++;
-        XmString ok = XmStringCreateLocalized ("OK");
-        XtSetArg(args[n], XmNcancelLabelString, cast(XtArgVal)ok); n++;
-        XtSetArg(args[n], XmNdialogStyle, cast(XtArgVal)XmDIALOG_FULL_APPLICATION_MODAL); n++;
-    }
-    void processSimpleDialog(Widget dialog, int*answer) {
-        XtAddCallback (dialog,XmNcancelCallback, &mw_simple_dialog_callback,answer);
-        XtUnmanageChild (XtNameToWidget (dialog, "OK"));
-        XtUnmanageChild (XtNameToWidget (dialog, "Help"));
-        *answer = 0;
-        XtManageChild(dialog);
-        while (*answer == 0)
-            XtAppProcessEvent(gApp.context,XtIMAll);
-        XtUnmanageChild(dialog);
-    }
-    void informationDialog(AbstractWindow owner, char[] text, char[] title) {
-        Arg[4] args;
-        int n;
-        char* str = toStringz(text);
-        setupSimpleDialog(args,n,str);
-        Widget dialog = XmCreateInformationDialog (owner.peer, title.ptr, args, n);
-        int answer;
-        processSimpleDialog(dialog,&answer);
-    }
-    void warningDialog(AbstractWindow owner, char[] text, char[] title) {
-        Arg[4] args;
-        int n;
-        char* str = toStringz(text);
-        setupSimpleDialog(args,n,str);
-        Widget dialog = XmCreateWarningDialog (owner.peer, title.ptr, args, n);
-        int answer;
-        processSimpleDialog(dialog,&answer);
-    }
-    void errorDialog(AbstractWindow owner, char[] text, char[] title) {
-        Arg[4] args;
-        int n;
-        char* str = toStringz(text);
-        setupSimpleDialog(args,n,str);
-        Widget dialog = XmCreateErrorDialog (owner.peer, title.ptr, args, n);
-        int answer;
-        processSimpleDialog(dialog,&answer);
-    }
-    void messageDialog(AbstractWindow owner, char[] text, char[] title) {
-        Arg[4] args;
-        int n;
-        char* str = toStringz(text);
-        setupSimpleDialog(args,n,str);
-        Widget dialog = XmCreateMessageDialog (owner.peer, title.ptr, args, n);
-        int answer;
-        processSimpleDialog(dialog,&answer);
-    }
-    extern (C)
-    void mw_simple_dialog_callback(Widget w, XtPointer ud, XEvent* cbs) {
-        int*answer = cast(int*)ud;
-        *answer = 1;
-    }
-
-    bool openFileDialog(AbstractWindow owner,
-                    inout FileDialogData data) {
-        Widget dialog;
-        dialog = XmCreateFileSelectionDialog(owner.peer,toStringz(data.title),null,0);
-        XtSetSensitive(XtNameToWidget(dialog,"Help"),0);
-        XtAddCallback(dialog,XmNokCallback,
-            cast(XtCallbackProc)&mw_file_ok_callback,&data);
-        XtAddCallback(dialog,XmNcancelCallback,
-            cast(XtCallbackProc)&mw_file_cancel_callback,&data);
-        XtManageChild(dialog);
-        while (!data.done && (XtAppGetExitFlag(gApp.context) == 0)) {
-            XtAppProcessEvent(gApp.context,XtIMAll);
-        }
-        XtDestroyWidget(dialog);
-        return data.done == 1;
-    }
-    extern (C)
-    void mw_file_ok_callback(Widget dialog, XtPointer userdata, XtPointer event) {
-        FileDialogData* data = cast(FileDialogData*)userdata;
-        data.done = 1;
-        XmFileSelectionBoxCallbackStruct *cbs =
-            cast(XmFileSelectionBoxCallbackStruct *) event;
-        char* filename = cast(char *) XmStringUnparse (cbs.value,
-                                 XmSFONTLIST_DEFAULT_TAG_STRING,
-                                 XmCHARSET_TEXT,
-                                 XmCHARSET_TEXT,
-                                 null, 0, XmOUTPUT_ALL);
-        if (filename) {
-            int len = strlen(filename);
-            if (len > 0) {
-                data.result = filename[0 .. len].dup;
-            }
-            XtFree(filename);
-        }
-    }
-    extern (C)
-    void mw_file_cancel_callback(Widget dialog, XtPointer userdata, XtPointer unused) {
-        FileDialogData* data = cast(FileDialogData*)userdata;
-        data.done = 2;
-    }
-    bool saveFileDialog(AbstractWindow owner, inout FileDialogData data) {
-        return openFileDialog(owner,data); // hmm. looks like the same dialog?
-    }
-

trunk/minwin/event.d

@@ -20 +20 @@
-}
-
-Windows
+MinWin32
-    private import minwin.mswindows;
-
@@ -114 +114 @@
-    //    alias void* MouseEventPeer;
-    //    alias void* MotionEventPeer;
-} else version (Motif) {
-
-    private import minwin.motif;
-    private import minwin.app;
-
-    alias XEvent EventNative;
-
-    template EventBaseImpl() {
-        int modifiers() {
-            int mod;
-            int state;
-            if (native.type == KeyPress || native.type == KeyRelease) {
-                XKeyEvent* ke = cast(XKeyEvent*)(&native);
-                state = ke.state;
-            } else {
-    //            return event.message;
-            }
-            return mod;
-        }
-
-        int id() { return native.type; }
-    }
-
-    struct Event {
-        EventNative native;
-        mixin EventBaseImpl!();
-    }
-
-    alias XKeyEvent KeyEventNative;
-    struct KeyEvent {
-        KeyEventNative native;
-        // UTF-32 character typed
-        // TODO: add keysymdef.h to x11.d and make sure non-ascii works
-        // hmm - looks like we have to distiguish upper and lower case by hand
-        dchar keyChar() {
-            KeySym s = XLookupKeysym(&native,1);
-            if (s == 0)
-                s = XLookupKeysym(&native,2);
-            return cast(dchar)s;
-        }
-        // key code
-        int keyCode() { return native.keycode; }
-        int keyRepeat() { return 0; }
-        mixin EventBaseImpl!();
-    }
-    alias KeyPress KeyPressedEvent;
-    alias KeyPress KeyDownEvent;
-    alias KeyRelease KeyUpEvent;
-
-    alias XButtonEvent MouseEventNative;
-    alias XButtonEvent MotionEventNative;
-    struct MouseEvent {
-        MouseEventNative native;
-        Point point() {
-            return XY(cast(int)native.x,cast(int)native.y);
-        }
-        mixin EventBaseImpl!();
-    }
-
-    //    alias WM_ACTIVATE    WindowActivateEvent;
-    alias ConfigureNotify        WindowSizeEvent;
-    alias ConfigureNotify        WindowSizingEvent;
-    alias ConfigureNotify        WindowMoveEvent;
-    alias ConfigureNotify        WindowMovingEvent;
-
-    alias XConfigureEvent WindowEventNative;
-    struct WindowEvent {
-        WindowEventNative native;
-        mixin EventBaseImpl!();
-    }
-
-    // TODO: add event filter api
-
-    bool nextEvent(Event* event) {
-        if (XtAppGetExitFlag(gApp.context))
-            return false;
-        XtAppNextEvent(gApp.context,&event.native);
-        return true;
-    }
-
-    bool peekEvent(Event* event) {
-        return XtAppPeekEvent(gApp.context,&event.native) != 0;
-    }
-
-    void dispatchEvent(Event* event) {
-        XtDispatchEvent(&event.native);
-    }
-
-} else version (GTK) {
-

trunk/minwin/font.d

@@ -33 +33 @@
-}
-
-version (Motif) version = GenericFontDataStruct;
-version (GTK)    version = GenericFontDataStruct;
-version (GenericFontDataStruct) {
@@ -44 +43 @@
-}
-
-Windows
+MinWin32
-    private import minwin.mswindows;
-
@@ -121 +120 @@
-    }
-
-} else version (Motif) {
-
-    private import minwin.app;
-    private import minwin.motif;
-    private import std.string;
-
-    alias minwin.x11.Font FontPeer;
-
-    private void copyToBuf(inout char[] buf, inout int i, char[] str) {
-        buf[i .. i+str.length] = str[];
-        i += str.length;
-    }
-
-    private char[] fontToString(inout FontData d, char[] str) {
-        int i = 0;
-        copyToBuf(str,i,"-*-");
-        if (d.name.length == 0)
-            copyToBuf(str,i,"*-");
-        else {
-            copyToBuf(str,i,d.name);
-            copyToBuf(str,i,"-");
-        }
-        if (d.weight == FontWeight.Any) {
-            copyToBuf(str,i,"*-");
-        } else if (d.weight <= FontWeight.Medium) {
-            copyToBuf(str,i,"medium-");
-        } else {
-            copyToBuf(str,i,"bold-");
-        }
-        if (d.italic)
-            copyToBuf(str,i,"i-");
-        else
-            copyToBuf(str,i,"r-");
-        copyToBuf(str,i,"normal--*-");
-        copyToBuf(str,i,std.string.toString(d.size*10));
-        copyToBuf(str,i,"-*-*-*-*-iso10646-1");
-        //printf("font string is x%.*sx\n",str[0..i]);
-        str[i] = 0;
-        return str[0..i];
-    }
-
-    alias XFontStruct FontMetricsNative;
-    struct FontMetrics {
-        FontMetricsNative native;
-        int size() { return native.ascent+native.descent; }
-        int ascent() { return native.ascent; }
-        int descent() { return native.descent; }
-        int leading() { return native.descent; }
-        int maxWidth() { return native.max_bounds.width; }
-    }
-
-    class Font {
-        FontPeer peer;
-
-        this(inout FontData d) {
-            char[256] buf;
-            peer = XLoadFont(gApp.display,fontToString(d,buf));
-            hasPeer = OWNS_PEER;
-        }
-
-        //        mixin CommonFontCtor!();
-        this(FontPeer p) {
-            peer = p;
-            hasPeer = FOREIGN_PEER;
-        }
-
-        this(char[] name, int size = 0, FontWeight weight = FontWeight.Normal) {
-            FontData fd;
-            if (size > 0)
-                fd.size = size;
-            if (weight > 0)
-                fd.weight = weight;
-            if (name.length > 0)
-                fd.name = name;
-            this(fd);
-        }
-
-        mixin PeerMixin!();
-        void dispose() { disposePeer(); }
-        void disposePeer() {
-            if (hasPeer == OWNS_PEER)
-                XUnloadFont(gApp.display,peer);
-            hasPeer = NO_PEER;
-        }
-    }
-
-    Font standardFont(StandardFont id) {
-        static Font[5] fonts;
-        if (fonts[0] is null && id == StandardFont.Gui) {
-            fonts[0] = new Font(XLoadFont(gApp.display,"variable"));
-        } else if (fonts[1] is null && id == StandardFont.Fixed) {
-            fonts[1] = new Font(XLoadFont(gApp.display,"fixed"));
-        } else if (fonts[2] is null && id == StandardFont.Variable) {
-            fonts[2] = new Font(XLoadFont(gApp.display,"variable"));
-        }
-        return fonts[id];
-    }
-
-} else version (GTK) {
-

trunk/minwin/geometry.d

@@ -76 +76 @@
-}
-
-version(Motif)
-    version = WidthHeightRect;
-version(GTK)
-    version = WidthHeightRect;