bagle-commits Mailing List for Bagle: Anders GL engine
Status: Planning
Brought to you by:
andersrson
Menu
▾
▴
bagle-commits — All repository commits will be logged to this list
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(16) |
Sep
(22) |
Oct
(1) |
Nov
(1) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
|
From: <and...@us...> - 2007-10-02 19:40:57
|
Revision: 45
http://bagle.svn.sourceforge.net/bagle/?rev=45&view=rev
Author: andersrson
Date: 2007-10-02 12:40:57 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
Moves and deletes
Added Paths:
-----------
tests/
Copied: tests (from rev 43, Bagle/trunk/tests)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-02 19:40:40
|
Revision: 44
http://bagle.svn.sourceforge.net/bagle/?rev=44&view=rev
Author: andersrson
Date: 2007-10-02 12:40:41 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
Moves and deletes
Removed Paths:
-------------
Bagle/trunk/doc/
Bagle/trunk/tests/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-02-16 18:04:24
|
Revision: 43
http://svn.sourceforge.net/bagle/?rev=43&view=rev
Author: andersrson
Date: 2007-02-16 10:04:22 -0800 (Fri, 16 Feb 2007)
Log Message:
-----------
Start move to std.signals.
Modified Paths:
--------------
Bagle/trunk/bagle/ui/bdiget.d
Modified: Bagle/trunk/bagle/ui/bdiget.d
===================================================================
--- Bagle/trunk/bagle/ui/bdiget.d 2007-02-16 18:03:56 UTC (rev 42)
+++ Bagle/trunk/bagle/ui/bdiget.d 2007-02-16 18:04:22 UTC (rev 43)
@@ -28,6 +28,7 @@
private import bagle.ui.events;
+private import std.signals;
debug import std.stdio;
/* Events that digets care about. */
@@ -64,26 +65,8 @@
private bool isVisible;
private uint border;
- public alias bool delegate(in BKeyPressedEvent) KeyPressedDelegate;
- public alias bool delegate(in BKeyReleasedEvent) KeyReleasedDelegate;
- public alias bool delegate(in BMousePressedEvent) MousePressedDelegate;
- public alias bool delegate(in BMouseReleasedEvent) MouseReleasedDelegate;
- public alias bool delegate(in BMouseDraggedEvent) MouseDraggedDelegate;
- public alias bool delegate(in BMouseMovedEvent) MouseMovedDelegate;
- public alias bool delegate(in BMouseEnteredEvent) MouseEnteredDelegate;
- public alias bool delegate(in BMouseExitedEvent) MouseExitedDelegate;
- public alias bool delegate(in BMouseScrolledEvent) MouseScrolledDelegate;
- public alias bool delegate(in BMouseTiltedEvent) MouseTiltedDelegate;
- private KeyPressedDelegate[] keyPressedHandlers;
- private KeyReleasedDelegate[] keyReleasedHandlers;
- private MousePressedDelegate[] mousePressedHandlers;
- private MouseReleasedDelegate[] mouseReleasedHandlers;
- private MouseDraggedDelegate[] mouseDraggedHandlers;
- private MouseMovedDelegate[] mouseMovedHandlers;
- private MouseEnteredDelegate[] mouseEnteredHandlers;
- private MouseExitedDelegate[] mouseExitedHandlers;
- private MouseScrolledDelegate[] mouseScrolledHandlers;
- private MouseTiltedDelegate[] mouseTiltedHandlers;
+ mixin Signal!(BKeyPressedEvent) SignalKeyPressed;
+ mixin Signal!(BKeyReleasedEvent) SignalKeyReleased;
this() {
this("", 0, 0, 0, 0, 0);
@@ -137,111 +120,7 @@
public bool Contains(int ox, int oy) { return ( (ox >= X && ox < Width) && (oy >= Y && oy < Height) ); }
- /**
- * Runs the callback routines associated with an event, in
- * the order they were registered.
- */
- public void HandleEvent(BKeyPressedEvent e) {
- debug(events) writefln("BDiget.HandleKeyPressed entered..");
- CallEventHandler!(BKeyPressedEvent, KeyPressedDelegate)(e, keyPressedHandlers);
- debug(events) writefln("BDiget.HandleKeyPressed exiting..");
- }
- public void HandleEvent(BKeyReleasedEvent e) {
- debug(events) writefln("BDiget.HandleKeyReleased entered..");
- CallEventHandler!(BKeyReleasedEvent, KeyReleasedDelegate)(e, keyReleasedHandlers);
- debug(events) writefln("BDiget.HandleKeyReleased exiting..");
- }
-
- public void HandleEvent(BMousePressedEvent e) {
- debug(events) writefln("BDiget.HandleMousePressed entered..");
- CallEventHandler!(BMousePressedEvent, MousePressedDelegate)(e, mousePressedHandlers);
- debug(events) writefln("BDiget.HandleMousePressed exiting..");
- }
-
- public void HandleEvent(BMouseReleasedEvent e) {
- debug(events) writefln("BDiget.HandleMouseReleased entered..");
- CallEventHandler!(BMouseReleasedEvent, MouseReleasedDelegate)(e, mouseReleasedHandlers);
- debug(events) writefln("BDiget.HandleMouseReleased exiting..");
- }
-
- public void HandleEvent(BMouseMovedEvent e) {
- debug(events) writefln("BDiget.HandleMouseMoved entered..");
- CallEventHandler!(BMouseMovedEvent, MouseMovedDelegate)(e, mouseMovedHandlers);
- debug(events) writefln("BDiget.HandleMouseMoved exiting..");
- }
-
- public void HandleEvent(BMouseDraggedEvent e) {
- debug(events) writefln("BDiget.HandleMouseDragged entered..");
- CallEventHandler!(BMouseDraggedEvent, MouseDraggedDelegate)(e, mouseDraggedHandlers);
- debug(events) writefln("BDiget.HandleMouseDragged exiting..");
- }
-
- public void HandleEvent(BMouseEnteredEvent e) {
- debug(events) writefln("BDiget.HandleMouseEntered entered..");
- CallEventHandler!(BMouseEnteredEvent, MouseEnteredDelegate)(e, mouseEnteredHandlers);
- debug(events) writefln("BDiget.HandleMouseEntered exiting..");
- }
-
- public void HandleEvent(BMouseExitedEvent e) {
- debug(events) writefln("BDiget.HandleMouseExited entered..");
- CallEventHandler!(BMouseExitedEvent, MouseExitedDelegate)(e, mouseExitedHandlers);
- debug(events) writefln("BDiget.HandleMouseExited exiting..");
- }
-
- public void HandleEvent(BMouseScrolledEvent e) {
- debug(events) writefln("BDiget.HandleMouseScrolled entered..");
- CallEventHandler!(BMouseScrolledEvent, MouseScrolledDelegate)(e, mouseScrolledHandlers);
- debug(events) writefln("BDiget.HandleMouseScrolled exiting..");
- }
-
- public void HandleEvent(BMouseTiltedEvent e) {
- debug(events) writefln("BDiget.HandleMouseTilted entered..");
- CallEventHandler!(BMouseTiltedEvent, MouseTiltedDelegate)(e, mouseTiltedHandlers);
- debug(events) writefln("BDiget.HandleMouseTilted exiting..");
- }
-
- /* private routine that does the actual calling of the callbacks. Saves us
- * _at least_ 5 lines of code in every handleXX-member. Yay! */
- private void CallEventHandler(Event: BEvent, Callback)(Event event, Callback[] handlerList)
- in {
- assert(event !is null);
- } body {
- foreach(Callback dg; handlerList)
- dg(event);
- }
-
- /**
- * Registers a callback to be executed whenever a particular event
- * occurs on the BDiget. Any number of handlers can be registered
- * for any event, and the will be called in the order they were
- * registered.
- */
- public void EventHandler(KeyPressedDelegate callback) {
- debug(events) writefln("BDiget.KeyPressedHandler entered");
- //debug int origlen = keyPressedHandlers.length;
-
- keyPressedHandlers = RegisterEventHandler!(KeyPressedDelegate)(callback, keyPressedHandlers);
-
- //debug assert(origlen != keyPressedHandlers.length);
- debug(events) writefln("BDiget.KeyPressedHandler exiting..");
- }
-
- public void EventHandler(MousePressedDelegate callback) {
- debug(events) writefln("BDiget.EventHandler entered");
- mousePressedHandlers = RegisterEventHandler!(MousePressedDelegate)(callback, mousePressedHandlers);
- debug(events) writefln("BDiget.EventHandler exiting..");
- }
-
- private T[] RegisterEventHandler(T)(T handler, T[] hList)
- in {
- assert(handler !is null);
- } body {
- hList.length = hList.length + 1;
- hList[length - 1] = handler;
- return hList;
- }
-
public int Repaint();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-02-16 18:04:00
|
Revision: 42
http://svn.sourceforge.net/bagle/?rev=42&view=rev
Author: andersrson
Date: 2007-02-16 10:03:56 -0800 (Fri, 16 Feb 2007)
Log Message:
-----------
Start move to std.signals.
Modified Paths:
--------------
Bagle/trunk/bagle/ui/events.d
Modified: Bagle/trunk/bagle/ui/events.d
===================================================================
--- Bagle/trunk/bagle/ui/events.d 2007-02-08 20:13:35 UTC (rev 41)
+++ Bagle/trunk/bagle/ui/events.d 2007-02-16 18:03:56 UTC (rev 42)
@@ -25,23 +25,22 @@
**/
module bagle.ui.events;
-
-private import bagle.ui.bdiget;
private import std.c.time;
+private import std.signals;
-debug import std.stdio;
+private debug import std.stdio;
version(linux) {
private import x11.x;
/* symbols cleverly chosen to match x11's */
public enum {
- BK_BUTTON1 = 1,
- BK_BUTTON2 = 2,
- BK_BUTTON3 = 3,
- BK_BUTTON4 = 4,
- BK_BUTTON5 = 5,
+ BK_BUTTON1 = Button1,
+ BK_BUTTON2 = Button2,
+ BK_BUTTON3 = Button3,
+ BK_BUTTON4 = Button4,
+ BK_BUTTON5 = Button5,
BK_BUTTON6 = 6,
BK_BUTTON7 = 7,
BK_BUTTON8 = 8,
@@ -81,42 +80,84 @@
ALT = (1 << 2),
ALT_GR = (1 << 3),
SUPER = (1 << 4),
- META = (1 << 4)
+ META = (1 << 5)
}
}
-class BEvent{
-
- private BDiget source; /* Where did this event come from? */
+struct BKeyEvent {
+ private Object source; /* Where did this event come from? */
private uint time;
+ char[] key;
+ uint modifiers;
+}
+
+typedef BKeyEvent BKeyPressedEvent;
+typedef BKeyEvent BKeyReleasedEvent;
+
+struct BMouseEvent {
+ private Object source; /* Where did this event come from? */
+ private uint time;
+ private ubyte buttons;
+ private uint modifiers;
+ private int x, y;
+}
+
+typedef BMouseEvent BMousePressedEvent;
+typedef BMouseEvent BMouseReleasedEvent;
+typedef BMouseEvent BMouseMovedEvent;
+typedef BMouseEvent BMouseDraggedEvent;
+typedef BMouseEvent BMouseEnteredEvent;
+typedef BMouseEvent BMouseExitedEvent;
+
+
+unittest {
- this() {}
- this(BDiget src, uint time)
- in {
- assert(src !is null);
- } body {
- debug(events) writefln("BEvent.ctor() entered.");
- Source = src;
- Time = time;
- debug(events) writefln("BEvent.ctor() exited.");
+ class send {
+ mixin Signal!(BMousePressedEvent) onMousePressed;
+ mixin Signal!(BMouseReleasedEvent) onMouseReleased;
+
+ void talk() {
+ BMousePressedEvent bmpe;
+ bmpe.time = 1000;
+ bmpe.buttons = 1;
+ BMouseReleasedEvent bmre;
+ bmre.time = 2000;
+ bmre.buttons = 2;
+
+ onMousePressed.emit(bmpe);
+ onMouseReleased.emit(bmre);
+ }
}
- public void Set(BDiget src, uint time)
- in {
- assert(src !is null);
- } body {
- Source = src;
- Time = time;
+ class recieve {
+
+ void recievepress(BMousePressedEvent e) {
+ writefln("MousePressed recieved: ", e.time, ", ", e.buttons);
+ }
+
+ void recieverelease(BMouseReleasedEvent e) {
+ writefln("MouseReleased recieved: ", e.time, ", ", e.buttons);
+ }
}
- public BDiget Source() { return source; }
- public BDiget Source(BDiget src) { return source = src; }
- public uint Time(uint time) { return this.time = time; }
- public uint Time() { return time; }
+ send s = new send();
+ recieve r = new recieve();
+
+ s.onMousePressed.connect(&r.recievepress);
+ s.onMouseReleased.connect(&r.recieverelease);
+
+ s.talk();
}
-
+
+/*
+void main() {
+
+ return;
+}*/
+
+/*
class BKeyEvent: BEvent {
char[] key;
uint modifiers;
@@ -274,3 +315,4 @@
super(src, time, x, y, buttons, modifiers);
}
}
+*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-02-08 21:29:46
|
Revision: 41
http://svn.sourceforge.net/bagle/?rev=41&view=rev
Author: andersrson
Date: 2007-02-08 12:13:35 -0800 (Thu, 08 Feb 2007)
Log Message:
-----------
Some tiny changes/cleanups.
Modified Paths:
--------------
Bagle/trunk/bagle/ui/blabel.d
Bagle/trunk/bagle/ui/bwidget.d
Bagle/trunk/bagle/ui/events.d
Modified: Bagle/trunk/bagle/ui/blabel.d
===================================================================
--- Bagle/trunk/bagle/ui/blabel.d 2006-11-04 10:07:12 UTC (rev 40)
+++ Bagle/trunk/bagle/ui/blabel.d 2007-02-08 20:13:35 UTC (rev 41)
@@ -36,5 +36,8 @@
this(char[] text) {
this.text = text;
}
+
+ char[] Text(char[] text) { return this.text = text; }
+ char[] Text() { return this.text; }
}
Modified: Bagle/trunk/bagle/ui/bwidget.d
===================================================================
--- Bagle/trunk/bagle/ui/bwidget.d 2006-11-04 10:07:12 UTC (rev 40)
+++ Bagle/trunk/bagle/ui/bwidget.d 2007-02-08 20:13:35 UTC (rev 41)
@@ -34,9 +34,6 @@
private alias LinkedList!(BWidget) List;
private alias List.IIterator ListIter;
-//private import gl.gl;
-//private import gl.glu;
-
debug private import std.stdio;
/**
@@ -50,8 +47,6 @@
* to assume that orthographic projection is used.
*/
-debug import std.stdio;
-
abstract class BWidget : BDiget {
private uint insets; /** Spacing between border and contents */
Modified: Bagle/trunk/bagle/ui/events.d
===================================================================
--- Bagle/trunk/bagle/ui/events.d 2006-11-04 10:07:12 UTC (rev 40)
+++ Bagle/trunk/bagle/ui/events.d 2007-02-08 20:13:35 UTC (rev 41)
@@ -35,7 +35,7 @@
version(linux) {
private import x11.x;
- /* symbols cleverly chosen & assigned to match x11 */
+ /* symbols cleverly chosen to match x11's */
public enum {
BK_BUTTON1 = 1,
BK_BUTTON2 = 2,
@@ -88,7 +88,7 @@
class BEvent{
- private BDiget source; /* Is this redundant? */
+ private BDiget source; /* Where did this event come from? */
private uint time;
this() {}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-11-04 10:07:16
|
Revision: 40
http://svn.sourceforge.net/bagle/?rev=40&view=rev
Author: andersrson
Date: 2006-11-04 02:07:12 -0800 (Sat, 04 Nov 2006)
Log Message:
-----------
Removed unused Makefile
Removed Paths:
-------------
Makefile
Deleted: Makefile
===================================================================
--- Makefile 2006-10-13 12:46:33 UTC (rev 39)
+++ Makefile 2006-11-04 10:07:12 UTC (rev 40)
@@ -1,33 +0,0 @@
-export TOPDIR=`pwd`
-export OBJDIR=${TOPDIR}/build
-
-export INCDIR=/home/anders/usr/include
-
-XSOURCES=${INCDIR}/x11/x.d ${INCDIR}/x11/xlib.d ${INCDIR}/x11/extensions/xf86vmode.d
-GLSOURCES=${INCDIR}/gl/gl.d ${INCDIR}/gl/glx.d ${INCDIR}/gl/glu.d
-XOBJS=#x.o xlib.o xf86vmode.o
-GLOBJS=#gl.o glx.o glu.o
-COLLOBJS=../collections/linkedlist.o ../collections/collections.o
-
-SOURCES=$(XSOURCES) $(GLSOURCES) bglrenderer.d events.d bdiget.d bwidget.d bbutton.d blabel.d bpanel.d bwindow.d bvmmanager.d uicentral.d main.d
-OBJECTS=bglrenderer.o events.o bdiget.o bwidget.o bbutton.o blabel.o bpanel.o bwindow.o uicentral.o bvmmanager.o
-INCLUDE=-I/home/anders/devel/Bagle -I/home/anders/usr/include -I/home/anders/usr/include/dmd
-LDFLAGS=-L-lX11 -L-lXxf86vm -L-lGL -L-lGLU
-DEBUG=-debug -debug=events -debug=winevent -debug=bwindow -debug=bglrenderer -debug=repaint
-COMPILE=dmd -w -unittest $(INCLUDE) $(LDFLAGS) $(DEBUG)
-OCOMPILE=$(COMPILE) -c $(DEBUG)
-
-.PHONY: clean
-
-all: ui collections ${OBJDIR}/x.o ${OBJDIR}/gl.o
-
-x.o:
-
-ui:
- @echo Compiling main.d and linking to objects... ${OBJDIR}
- build bagle/ui/test.d -clean -Tuitest -I/home/anders/usr/include
-
-clean:
- @echo Cleaning up everything.
- @rm -f *.o uitest
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-10-13 12:46:50
|
Revision: 39
http://svn.sourceforge.net/bagle/?rev=39&view=rev
Author: andersrson
Date: 2006-10-13 05:46:33 -0700 (Fri, 13 Oct 2006)
Log Message:
-----------
Removed phobos from include dir
Removed Paths:
-------------
include/phobos/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 13:50:24
|
Revision: 38
http://svn.sourceforge.net/bagle/?rev=38&view=rev
Author: andersrson
Date: 2006-09-01 06:49:54 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
build system
Modified Paths:
--------------
Bagle/trunk/Makefile
Bagle/trunk/bagle/ui/ui_all.d
Bagle/trunk/tests/Makefile
Modified: Bagle/trunk/Makefile
===================================================================
--- Bagle/trunk/Makefile 2006-09-01 13:43:07 UTC (rev 37)
+++ Bagle/trunk/Makefile 2006-09-01 13:49:54 UTC (rev 38)
@@ -9,9 +9,8 @@
bagle/ui/ui_all.o:
make -C bagle/ui
-uitest:
- build tests/uitest.d -I/home/anders/usr/include -I./
-
+uitest: tests/uitest.d
+ make -C tests uitest
clean:
rm *.o -f
rm build/* -rf
Modified: Bagle/trunk/bagle/ui/ui_all.d
===================================================================
--- Bagle/trunk/bagle/ui/ui_all.d 2006-09-01 13:43:07 UTC (rev 37)
+++ Bagle/trunk/bagle/ui/ui_all.d 2006-09-01 13:49:54 UTC (rev 38)
@@ -26,7 +26,7 @@
module bagle.ui.ui_all;
-version(build){ pragma(ignore); }
+//version(build){ pragma(ignore); }
public import bagle.ui.bdiget;
public import bagle.ui.bwidget;
Modified: Bagle/trunk/tests/Makefile
===================================================================
--- Bagle/trunk/tests/Makefile 2006-09-01 13:43:07 UTC (rev 37)
+++ Bagle/trunk/tests/Makefile 2006-09-01 13:49:54 UTC (rev 38)
@@ -0,0 +1,9 @@
+
+all: uitest
+
+uitest:
+ build uitest.d -I/home/anders/usr/include -I../
+
+clean:
+ rm *.o -f
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 13:43:22
|
Revision: 37
http://svn.sourceforge.net/bagle/?rev=37&view=rev
Author: andersrson
Date: 2006-09-01 06:43:07 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Build stuff
Modified Paths:
--------------
include/x11/x11_all.d
Added Paths:
-----------
Bagle/trunk/tests/Makefile
Added: Bagle/trunk/tests/Makefile
===================================================================
Modified: include/x11/x11_all.d
===================================================================
--- include/x11/x11_all.d 2006-09-01 13:39:11 UTC (rev 36)
+++ include/x11/x11_all.d 2006-09-01 13:43:07 UTC (rev 37)
@@ -24,7 +24,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
**/
-module x11.x11_all.d;
+module x11.x11_all;
version(build) { pragma(ignore); }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 13:39:38
|
Revision: 36
http://svn.sourceforge.net/bagle/?rev=36&view=rev
Author: andersrson
Date: 2006-09-01 06:39:11 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Include build stuff
Modified Paths:
--------------
include/x11/Makefile
include/x11/x11_all.d
Added Paths:
-----------
include/x11/extensions/Makefile
include/x11/extensions/all.d
Modified: include/x11/Makefile
===================================================================
--- include/x11/Makefile 2006-09-01 13:18:38 UTC (rev 35)
+++ include/x11/Makefile 2006-09-01 13:39:11 UTC (rev 36)
@@ -1,3 +1,7 @@
all:
- build x11_all.d -I/home/anders/usr/include -cleanup
+ build x11_all.d -obj -I/home/anders/usr/include -cleanup
+ make -C extensions
rm -f *~
+clean:
+ rm -f *.o *~
+ make -C extensions clean
Added: include/x11/extensions/Makefile
===================================================================
--- include/x11/extensions/Makefile (rev 0)
+++ include/x11/extensions/Makefile 2006-09-01 13:39:11 UTC (rev 36)
@@ -0,0 +1,4 @@
+all:
+ dmd xf86vmode.d -c -I/home/anders/usr/include
+clean:
+ rm -f *.o *~
Added: include/x11/extensions/all.d
===================================================================
--- include/x11/extensions/all.d (rev 0)
+++ include/x11/extensions/all.d 2006-09-01 13:39:11 UTC (rev 36)
@@ -0,0 +1,32 @@
+/**
+ * ©2006 Anders Runesson an...@ru...
+ *
+ * This software is distributed as "open source", under the conditions
+ * of the following licence:
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ **/
+
+module x11.extensions.all.d;
+
+version(build) { pragma(ignore); }
+
+import x11.extensions.xf86vmode;
+
Modified: include/x11/x11_all.d
===================================================================
--- include/x11/x11_all.d 2006-09-01 13:18:38 UTC (rev 35)
+++ include/x11/x11_all.d 2006-09-01 13:39:11 UTC (rev 36)
@@ -26,9 +26,10 @@
module x11.x11_all.d;
+version(build) { pragma(ignore); }
+
import x11.x;
import x11.xlib;
import x11.xatom;
import x11.xutil;
import x11.xmd;
-import x11.extensions.xf86vmode;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 13:18:49
|
Revision: 35
http://svn.sourceforge.net/bagle/?rev=35&view=rev
Author: andersrson
Date: 2006-09-01 06:18:38 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Makefile stuff
Modified Paths:
--------------
Bagle/trunk/Makefile
Modified: Bagle/trunk/Makefile
===================================================================
--- Bagle/trunk/Makefile 2006-09-01 13:17:35 UTC (rev 34)
+++ Bagle/trunk/Makefile 2006-09-01 13:18:38 UTC (rev 35)
@@ -1,17 +1,20 @@
tests: all uitest
-all: build/libbagle.a
+all: bagle/collections/collections.o bagle/ui/ui_all.o
-build/libbagle.a:
- build libbagle.d -I/home/anders/usr/include
- rm *.o
- mv libbagle.a build
+bagle/collections/collections.o:
+ make -C bagle/collections
+bagle/ui/ui_all.o:
+ make -C bagle/ui
+
uitest:
build tests/uitest.d -I/home/anders/usr/include -I./
clean:
rm *.o -f
rm build/* -rf
+ make -C bagle/collections clean
+ make -C bagle/ui clean
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 13:17:50
|
Revision: 34
http://svn.sourceforge.net/bagle/?rev=34&view=rev
Author: andersrson
Date: 2006-09-01 06:17:35 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Removed old test file
Removed Paths:
-------------
Bagle/trunk/bagle/ui/main.d
Deleted: Bagle/trunk/bagle/ui/main.d
===================================================================
--- Bagle/trunk/bagle/ui/main.d 2006-09-01 13:14:55 UTC (rev 33)
+++ Bagle/trunk/bagle/ui/main.d 2006-09-01 13:17:35 UTC (rev 34)
@@ -1,112 +0,0 @@
-/**
- * ©2005, 2006 Anders Runesson an...@ru...
- *
- * This software is distributed as "open source", under the conditions
- * of the following licence:
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- **/
-
-module bagle.ui.test;
-
-import std.stdio;
-
-import gl.gl;
-import gl.glu;
-import gl.glx;
-
-import bagle.ui.all;
-
-alias BWindowGLX BWindow;
-
-BWindow win;
-
-int main(char[][] args) {
-
-
- bool handleEvent(BMousePressedEvent e) {
- debug(events) writefln("Event handler called, on ", e.X, ".", e.Y, " at ", e.Time);
- return true;
- }
-
- bool handleEvent2(BMousePressedEvent e) {
- debug(events) writefln("Event2 handler called, on ", e.X, ".", e.Y, " at ", e.Time);
- return true;
- }
-
- float angle = 0.0;
-
- void repaint(BWidget w) {
-
- debug(repaint) writefln("Custom drawing routine running..");
- glMatrixMode(GL_PROJECTION);
-
- glPushMatrix();
- glMatrixMode(GL_MODELVIEW);
-
- glLoadIdentity();
-
- glTranslatef(400, 300, -150.0);
-
- glRotatef(angle, 0.0, 1.0, 0.0);
-
- glBegin(GL_TRIANGLES);
- glColor3f(1.0, 0.0, 0.0);
- glVertex3f(0.0, 100.0, 0.0);
-
- glColor3f(0.0, 1.0, 0.0);
- glVertex3f(-100.0, -100.0, 0.0);
-
- glColor3f(0.0, 0.0, 1.0);
- glVertex3f(100.0, -100.0, 0.0);
- glEnd();
-
- angle += 0.5;
-
- glMatrixMode(GL_PROJECTION);
- glPopMatrix();
-
- glMatrixMode(GL_MODELVIEW);
- }
-
-
- BPanel panel = new BPanel("panel", 0, 0, 800, 600, 0, null);
- panel.EventHandler(&handleEvent);
- panel.EventHandler(&handleEvent2);
- panel.RepaintHandler(&repaint);
-
- writefln("uitest: Creating new window..");
- BWindow win = new BWindow("Hello", 100, 100, 800, 600, 0, false);
-
- writefln("uitest: Adding the panel..");
- win.Container = panel;
-
- writefln("uitest: Showing the window..");
- win.Show();
-
- //writefln("XXXXXXXXXXXXXXX main sleeping.. XXXXXXXXXXXXXXXXXx");
- //std.c.time.sleep(10);
-
- int result = win.Wait();
- writefln("XXXXXXXXXXXXXXX main exiting: ", result, " XXXXXXXXXXXXXXXXXx");
-
- exit(0);
-
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 13:15:07
|
Revision: 33
http://svn.sourceforge.net/bagle/?rev=33&view=rev
Author: andersrson
Date: 2006-09-01 06:14:55 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Removed executable file that was not supposed to be there
Removed Paths:
-------------
Bagle/trunk/bagle/math/main
Deleted: Bagle/trunk/bagle/math/main
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 13:13:07
|
Revision: 32
http://svn.sourceforge.net/bagle/?rev=32&view=rev
Author: andersrson
Date: 2006-09-01 06:12:48 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Makefile fixing
Modified Paths:
--------------
Bagle/trunk/bagle/collections/Makefile
Bagle/trunk/bagle/ui/Makefile
Added Paths:
-----------
Bagle/trunk/bagle/collections/collections_all.d
Modified: Bagle/trunk/bagle/collections/Makefile
===================================================================
--- Bagle/trunk/bagle/collections/Makefile 2006-09-01 12:56:56 UTC (rev 31)
+++ Bagle/trunk/bagle/collections/Makefile 2006-09-01 13:12:48 UTC (rev 32)
@@ -1,35 +1,6 @@
-CC=dmd -c
-CC_LINK=dmd
-CCOPTS=-I/home/anders/devel/Bagle
-LDFLAGS=
-DEBUG=-debug
-UTEST=-unittest $(DEBUG)
-RM=rm
-COMPILE=$(CC) $(CCOPTS)
-LINK=$(CC_LINK) $(CCOPTS) $(LDFLAGS)
-
-OBJS=linkedlist.o stack.o queue.o collections.o vector.o
-LIBTARGET=libcollections.so.0.1.1
-
-SOURCEFILES=collections.d linkedlist.d queue.d stack.d vector.d
-
-all : $(OBJS)
-# $(LINK) -shared -fPIC -o $(LIBTARGET) $(OBJS)
-
-collections.o: collections.d
- $(COMPILE) collections.d
-linkedlist.o: linkedlist.d
- $(COMPILE) linkedlist.d
-stack.o: stack.d linkedlist.d
- $(COMPILE) stack.d
-queue.o: queue.d linkedlist.d
- $(COMPILE) queue.d
-vector.o: vector.d
- $(COMPILE) vector.d
-
-tests : $(SOURCEFILES) $(OBJS)
- $(LINK) $(UTEST) $(OBJS) utests.d -oftest
-
+all: collections.o
+collections.o:
+ build collections_all.d -obj -I/home/anders/include -I../../
clean:
- $(RM) -f *.o $(LIBTARGET) test
+ rm *.o -f
Added: Bagle/trunk/bagle/collections/collections_all.d
===================================================================
--- Bagle/trunk/bagle/collections/collections_all.d (rev 0)
+++ Bagle/trunk/bagle/collections/collections_all.d 2006-09-01 13:12:48 UTC (rev 32)
@@ -0,0 +1,35 @@
+/**
+ * ©2006 Anders Runesson an...@ru...
+ *
+ * This software is distributed as "open source", under the conditions
+ * of the following licence:
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ **/
+
+module bagle.collections.collections_all;
+
+version(build) { pragma(ignore); }
+
+import bagle.collections.collections;
+import bagle.collections.linkedlist;
+import bagle.collections.stack;
+import bagle.collections.queue;
+import bagle.collections.vector;
Modified: Bagle/trunk/bagle/ui/Makefile
===================================================================
--- Bagle/trunk/bagle/ui/Makefile 2006-09-01 12:56:56 UTC (rev 31)
+++ Bagle/trunk/bagle/ui/Makefile 2006-09-01 13:12:48 UTC (rev 32)
@@ -1,32 +1,10 @@
-INCPATH=/home/anders/usr/include
-OBJDIR=/home/anders/devel/Bagle/build
-XSOURCES=$(INCPATH)/x11/x.d $(INCPATH)/x11/xlib.d ${INCPATH}/x11/xatom.d ${INCPATH}/x11/xmd.d $(INCPATH)/x11/extensions/xf86vmode.d
-GLSOURCES=$(INCPATH)/gl/gl.d $(INCPATH)/gl/glx.d $(INCPATH)/gl/glu.d
-XINCPATH=/home/anders/usr/include/x11
-GLINCPATH=/home/anders/usr/include/gl
-XOBJS=${OBJDIR}/x.o ${OBJDIR}/xlib.o ${OBJDIR}/xatom.o ${OBJDIR}/xmd.o ${OBJDIR}/xf86vmode.o
-GLOBJS=${OBJDIR}/gl.o ${OBJDIR}/glx.o ${OBJDIR}/glu.o
-COLLOBJS=../collections/linkedlist.o ../collections/collections.o
-
-SOURCES=$(XSOURCES) $(GLSOURCES) bglrenderer.d events.d bdiget.d bwidget.d bbutton.d blabel.d bpanel.d bwindow.d bvmmanager.d uicentral.d main.d
-OBJECTS=bglrenderer.o events.o bdiget.o bwidget.o bbutton.o blabel.o bpanel.o bwindow.o uicentral.o bvmmanager.o
-INCLUDE=-I/home/anders/devel/Bagle -I/home/anders/usr/include -I/home/anders/usr/include/dmd
-LDFLAGS=-L-lX11 -L-lXxf86vm -L-lGL -L-lGLU
-DEBUG=-debug -debug=events -debug=winevent -debug=bwindow -debug=bwindowx11 -debug=bwindowglx -debug=repaint
-COMPILE=dmd -w -unittest $(INCLUDE) $(LDFLAGS) $(DEBUG)
-OCOMPILE=$(COMPILE) -c $(DEBUG)
-
.PHONY: clean
-all: ${XOBJS} ${GLOBJS}
- @echo Compiling main.d and linking to objects...
- build test.d -v -names ${DEBUG} -I/home/anders/usr/include -I/home/anders/devel/Bagle ${XOBJS} ${GLOBJS}
-${OBJDIR}/x.o:
- build ${XSOURCES} -obj -od${OBJDIR} -I${INCPATH}
-${OBJDIR}/gl.o:
- build ${GLSOURCES} -obj -od${OBJDIR} -I${INCPATH}
-
+all: ui_all.o
+
+ui_all.o:
+ build ui_all.d -obj -I/home/anders/usr/include -I../../
clean:
@echo Cleaning up everything.
- @rm -f *.o ftest
+ @rm -f *.o
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 12:57:00
|
Revision: 31
http://svn.sourceforge.net/bagle/?rev=31&view=rev
Author: andersrson
Date: 2006-09-01 05:56:56 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Removed old file
Removed Paths:
-------------
Bagle/trunk/bagle/collections/utests.d
Deleted: Bagle/trunk/bagle/collections/utests.d
===================================================================
--- Bagle/trunk/bagle/collections/utests.d 2006-09-01 12:46:49 UTC (rev 30)
+++ Bagle/trunk/bagle/collections/utests.d 2006-09-01 12:56:56 UTC (rev 31)
@@ -1,13 +0,0 @@
-/**
- * ©2004 Anders Runesson an...@ru...
- **/
-import bagle.collections.linkedlist;
-import bagle.collections.stack;
-import bagle.collections.queue;
-import bagle.collections.vector;
-
-int main(char[][] argv){
- return 0;
-}
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 12:46:54
|
Revision: 30
http://svn.sourceforge.net/bagle/?rev=30&view=rev
Author: andersrson
Date: 2006-09-01 05:46:49 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Makefile changes
Modified Paths:
--------------
include/gl/Makefile
include/x11/Makefile
Modified: include/gl/Makefile
===================================================================
--- include/gl/Makefile 2006-09-01 12:46:11 UTC (rev 29)
+++ include/gl/Makefile 2006-09-01 12:46:49 UTC (rev 30)
@@ -1,3 +1,3 @@
all:
build gl_all.d -I/home/anders/usr/include -cleanup
- rm -f *.o *~
+ rm -f *~
Modified: include/x11/Makefile
===================================================================
--- include/x11/Makefile 2006-09-01 12:46:11 UTC (rev 29)
+++ include/x11/Makefile 2006-09-01 12:46:49 UTC (rev 30)
@@ -1,3 +1,3 @@
all:
build x11_all.d -I/home/anders/usr/include -cleanup
- rm -f *.o *~
+ rm -f *~
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 12:46:19
|
Revision: 29
http://svn.sourceforge.net/bagle/?rev=29&view=rev
Author: andersrson
Date: 2006-09-01 05:46:11 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
small changes
Modified Paths:
--------------
Bagle/trunk/Makefile
Bagle/trunk/bagle/ui/ui_all.d
Bagle/trunk/libbagle.d
Bagle/trunk/tests/uitest.d
Modified: Bagle/trunk/Makefile
===================================================================
--- Bagle/trunk/Makefile 2006-09-01 10:58:28 UTC (rev 28)
+++ Bagle/trunk/Makefile 2006-09-01 12:46:11 UTC (rev 29)
@@ -1,10 +1,15 @@
-all: libbagle.a
-libbagle.a:
+tests: all uitest
+
+all: build/libbagle.a
+
+build/libbagle.a:
build libbagle.d -I/home/anders/usr/include
rm *.o
mv libbagle.a build
+uitest:
+ build tests/uitest.d -I/home/anders/usr/include -I./
clean:
rm *.o -f
Modified: Bagle/trunk/bagle/ui/ui_all.d
===================================================================
--- Bagle/trunk/bagle/ui/ui_all.d 2006-09-01 10:58:28 UTC (rev 28)
+++ Bagle/trunk/bagle/ui/ui_all.d 2006-09-01 12:46:11 UTC (rev 29)
@@ -25,7 +25,9 @@
**/
module bagle.ui.ui_all;
-
+
+version(build){ pragma(ignore); }
+
public import bagle.ui.bdiget;
public import bagle.ui.bwidget;
public import bagle.ui.bwindow;
Modified: Bagle/trunk/libbagle.d
===================================================================
--- Bagle/trunk/libbagle.d 2006-09-01 10:58:28 UTC (rev 28)
+++ Bagle/trunk/libbagle.d 2006-09-01 12:46:11 UTC (rev 29)
@@ -26,6 +26,8 @@
module libbagle;
+version(build) { pragma(ignore); }
+
import bagle.ui.ui_all;
import bagle.collections.collections;
Modified: Bagle/trunk/tests/uitest.d
===================================================================
--- Bagle/trunk/tests/uitest.d 2006-09-01 10:58:28 UTC (rev 28)
+++ Bagle/trunk/tests/uitest.d 2006-09-01 12:46:11 UTC (rev 29)
@@ -24,15 +24,16 @@
* OTHER DEALINGS IN THE SOFTWARE.
**/
-module bagle.ui.test;
+module uitest;
import std.stdio;
+
import gl.gl;
import gl.glu;
import gl.glx;
-import bagle.ui.all;
+import bagle.ui.ui_all;
alias BWindowGLX BWindow;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 10:58:35
|
Revision: 28
http://svn.sourceforge.net/bagle/?rev=28&view=rev
Author: andersrson
Date: 2006-09-01 03:58:28 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Added directory for tests
Added Paths:
-----------
Bagle/trunk/tests/
Bagle/trunk/tests/uitest.d
Removed Paths:
-------------
Bagle/trunk/bagle/ui/test.d
Deleted: Bagle/trunk/bagle/ui/test.d
===================================================================
--- Bagle/trunk/bagle/ui/test.d 2006-09-01 10:56:55 UTC (rev 27)
+++ Bagle/trunk/bagle/ui/test.d 2006-09-01 10:58:28 UTC (rev 28)
@@ -1,106 +0,0 @@
-/**
- * ©2005, 2006 Anders Runesson an...@ru...
- *
- * This software is distributed as "open source", under the conditions
- * of the following licence:
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- **/
-
-module bagle.ui.test;
-
-import std.stdio;
-
-import gl.gl;
-import gl.glu;
-import gl.glx;
-
-import bagle.ui.all;
-
-alias BWindowGLX BWindow;
-
-BWindow win;
-
-int main(char[][] args) {
-
-
- bool handleEvent(BMousePressedEvent e) {
- debug(events) writefln("Event handler called, on ", e.X, ".", e.Y, " at ", e.Time);
- return true;
- }
-
- bool handleEvent2(BMousePressedEvent e) {
- debug(events) writefln("Event2 handler called, on ", e.X, ".", e.Y, " at ", e.Time);
- return true;
- }
-
- float angle = 0.0;
-
- void repaint(BWidget w) {
-
- debug(repaint) writefln("Custom drawing routine running..");
- glMatrixMode(GL_PROJECTION);
-
- glPushMatrix();
- glMatrixMode(GL_MODELVIEW);
-
- glLoadIdentity();
-
- glTranslatef(400, 300, -150.0);
-
- glRotatef(angle, 0.0, 1.0, 0.0);
-
- glBegin(GL_TRIANGLES);
- glColor3f(1.0, 0.0, 0.0);
- glVertex3f(0.0, 100.0, 0.0);
-
- glColor3f(0.0, 1.0, 0.0);
- glVertex3f(-100.0, -100.0, 0.0);
-
- glColor3f(0.0, 0.0, 1.0);
- glVertex3f(100.0, -100.0, 0.0);
- glEnd();
-
- angle += 0.5;
-
- glMatrixMode(GL_PROJECTION);
- glPopMatrix();
-
- glMatrixMode(GL_MODELVIEW);
- }
-
-
- BPanel panel = new BPanel("panel", 0, 0, 800, 600, 0, null);
- panel.EventHandler(&handleEvent);
- panel.EventHandler(&handleEvent2);
- panel.RepaintHandler(&repaint);
-
- BWindow win = new BWindow("Hello", 100, 100, 800, 600, 0, false);
-
- win.Container = panel;
-
- win.Show();
-
- int result = win.Wait();
- writefln("XXXXXXXXXXXXXXX main exiting: ", result, " XXXXXXXXXXXXXXXXXx");
-
- return 0;
-
-}
Copied: Bagle/trunk/tests/uitest.d (from rev 15, Bagle/trunk/bagle/ui/test.d)
===================================================================
--- Bagle/trunk/tests/uitest.d (rev 0)
+++ Bagle/trunk/tests/uitest.d 2006-09-01 10:58:28 UTC (rev 28)
@@ -0,0 +1,106 @@
+/**
+ * ©2005, 2006 Anders Runesson an...@ru...
+ *
+ * This software is distributed as "open source", under the conditions
+ * of the following licence:
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ **/
+
+module bagle.ui.test;
+
+import std.stdio;
+
+import gl.gl;
+import gl.glu;
+import gl.glx;
+
+import bagle.ui.all;
+
+alias BWindowGLX BWindow;
+
+BWindow win;
+
+int main(char[][] args) {
+
+
+ bool handleEvent(BMousePressedEvent e) {
+ debug(events) writefln("Event handler called, on ", e.X, ".", e.Y, " at ", e.Time);
+ return true;
+ }
+
+ bool handleEvent2(BMousePressedEvent e) {
+ debug(events) writefln("Event2 handler called, on ", e.X, ".", e.Y, " at ", e.Time);
+ return true;
+ }
+
+ float angle = 0.0;
+
+ void repaint(BWidget w) {
+
+ debug(repaint) writefln("Custom drawing routine running..");
+ glMatrixMode(GL_PROJECTION);
+
+ glPushMatrix();
+ glMatrixMode(GL_MODELVIEW);
+
+ glLoadIdentity();
+
+ glTranslatef(400, 300, -150.0);
+
+ glRotatef(angle, 0.0, 1.0, 0.0);
+
+ glBegin(GL_TRIANGLES);
+ glColor3f(1.0, 0.0, 0.0);
+ glVertex3f(0.0, 100.0, 0.0);
+
+ glColor3f(0.0, 1.0, 0.0);
+ glVertex3f(-100.0, -100.0, 0.0);
+
+ glColor3f(0.0, 0.0, 1.0);
+ glVertex3f(100.0, -100.0, 0.0);
+ glEnd();
+
+ angle += 0.5;
+
+ glMatrixMode(GL_PROJECTION);
+ glPopMatrix();
+
+ glMatrixMode(GL_MODELVIEW);
+ }
+
+
+ BPanel panel = new BPanel("panel", 0, 0, 800, 600, 0, null);
+ panel.EventHandler(&handleEvent);
+ panel.EventHandler(&handleEvent2);
+ panel.RepaintHandler(&repaint);
+
+ BWindow win = new BWindow("Hello", 100, 100, 800, 600, 0, false);
+
+ win.Container = panel;
+
+ win.Show();
+
+ int result = win.Wait();
+ writefln("XXXXXXXXXXXXXXX main exiting: ", result, " XXXXXXXXXXXXXXXXXx");
+
+ return 0;
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 10:56:58
|
Revision: 27
http://svn.sourceforge.net/bagle/?rev=27&view=rev
Author: andersrson
Date: 2006-09-01 03:56:55 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
tweaking makefile
Modified Paths:
--------------
Bagle/trunk/Makefile
Modified: Bagle/trunk/Makefile
===================================================================
--- Bagle/trunk/Makefile 2006-09-01 10:48:39 UTC (rev 26)
+++ Bagle/trunk/Makefile 2006-09-01 10:56:55 UTC (rev 27)
@@ -1,27 +1,12 @@
-INCLUDEDIR=/home/anders/usr/include
-SRCROOT=$(shell pwd)
+all: libbagle.a
-all: deps ui
+libbagle.a:
+ build libbagle.d -I/home/anders/usr/include
+ rm *.o
+ mv libbagle.a build
-tests: uitest
-deps: build/gl_all.a build/x11_all.a
-
-build/gl_all.a:
- make -C $(INCLUDEDIR)/gl
- cp $(INCLUDEDIR)/gl/gl_all.a build
-build/x11_all.a:
- make -C $(INCLUDEDIR)/x11
- cp $(INCLUDEDIR)/x11/x11_all.a build
-
-ui: build/gl_all.a build/x11_all.a
- build bagle/ui/ui_all.d -I$(INCLUDEDIR) -cleanup -odbuild
- mv bagle/ui/ui_all.a $(SRCROOT)/build/ui_all.a
-
-
-
-uitest:
-
-clean:
+clean:
+ rm *.o -f
rm build/* -rf
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 10:48:43
|
Revision: 26
http://svn.sourceforge.net/bagle/?rev=26&view=rev
Author: andersrson
Date: 2006-09-01 03:48:39 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
fix typo
Modified Paths:
--------------
Bagle/trunk/libbagle.d
Modified: Bagle/trunk/libbagle.d
===================================================================
--- Bagle/trunk/libbagle.d 2006-09-01 10:45:54 UTC (rev 25)
+++ Bagle/trunk/libbagle.d 2006-09-01 10:48:39 UTC (rev 26)
@@ -26,6 +26,6 @@
module libbagle;
-import bagle.ui.ui_all.d
+import bagle.ui.ui_all;
import bagle.collections.collections;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 10:46:02
|
Revision: 25
http://svn.sourceforge.net/bagle/?rev=25&view=rev
Author: andersrson
Date: 2006-09-01 03:45:54 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Added top-level file libbagle.d
Added Paths:
-----------
Bagle/trunk/libbagle.d
Added: Bagle/trunk/libbagle.d
===================================================================
--- Bagle/trunk/libbagle.d (rev 0)
+++ Bagle/trunk/libbagle.d 2006-09-01 10:45:54 UTC (rev 25)
@@ -0,0 +1,31 @@
+/**
+ * ©2006 Anders Runesson an...@ru...
+ *
+ * This software is distributed as "open source", under the conditions
+ * of the following licence:
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ **/
+
+module libbagle;
+
+import bagle.ui.ui_all.d
+import bagle.collections.collections;
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 10:45:16
|
Revision: 24
http://svn.sourceforge.net/bagle/?rev=24&view=rev
Author: andersrson
Date: 2006-09-01 03:45:11 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Removing unused directory
Removed Paths:
-------------
Bagle/trunk/lib/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 10:44:49
|
Revision: 23
http://svn.sourceforge.net/bagle/?rev=23&view=rev
Author: andersrson
Date: 2006-09-01 03:44:44 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Makefile changes
Modified Paths:
--------------
Bagle/trunk/Makefile
Modified: Bagle/trunk/Makefile
===================================================================
--- Bagle/trunk/Makefile 2006-09-01 10:24:20 UTC (rev 22)
+++ Bagle/trunk/Makefile 2006-09-01 10:44:44 UTC (rev 23)
@@ -1,7 +1,27 @@
INCLUDEDIR=/home/anders/usr/include
-SRCROOT=../../
+SRCROOT=$(shell pwd)
-all: ui
+all: deps ui
-ui: ${SRCROOT}/build/ui_all.a
- build
+tests: uitest
+
+deps: build/gl_all.a build/x11_all.a
+
+build/gl_all.a:
+ make -C $(INCLUDEDIR)/gl
+ cp $(INCLUDEDIR)/gl/gl_all.a build
+build/x11_all.a:
+ make -C $(INCLUDEDIR)/x11
+ cp $(INCLUDEDIR)/x11/x11_all.a build
+
+ui: build/gl_all.a build/x11_all.a
+ build bagle/ui/ui_all.d -I$(INCLUDEDIR) -cleanup -odbuild
+ mv bagle/ui/ui_all.a $(SRCROOT)/build/ui_all.a
+
+
+
+uitest:
+
+clean:
+ rm build/* -rf
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 10:24:23
|
Revision: 22
http://svn.sourceforge.net/bagle/?rev=22&view=rev
Author: andersrson
Date: 2006-09-01 03:24:20 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Added rm -f
Modified Paths:
--------------
include/gl/Makefile
Modified: include/gl/Makefile
===================================================================
--- include/gl/Makefile 2006-09-01 10:22:15 UTC (rev 21)
+++ include/gl/Makefile 2006-09-01 10:24:20 UTC (rev 22)
@@ -1,3 +1,3 @@
all:
build gl_all.d -I/home/anders/usr/include -cleanup
- rm *.o *~
+ rm -f *.o *~
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2006-09-01 10:22:26
|
Revision: 21
http://svn.sourceforge.net/bagle/?rev=21&view=rev
Author: andersrson
Date: 2006-09-01 03:22:15 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Added *_all.d files and makefiles for includes
Added Paths:
-----------
include/gl/Makefile
include/gl/gl_all.d
include/x11/Makefile
include/x11/x11_all.d
Added: include/gl/Makefile
===================================================================
--- include/gl/Makefile (rev 0)
+++ include/gl/Makefile 2006-09-01 10:22:15 UTC (rev 21)
@@ -0,0 +1,3 @@
+all:
+ build gl_all.d -I/home/anders/usr/include -cleanup
+ rm *.o *~
Added: include/gl/gl_all.d
===================================================================
--- include/gl/gl_all.d (rev 0)
+++ include/gl/gl_all.d 2006-09-01 10:22:15 UTC (rev 21)
@@ -0,0 +1,31 @@
+/**
+ * ©2006 Anders Runesson an...@ru...
+ *
+ * This software is distributed as "open source", under the conditions
+ * of the following licence:
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ **/
+
+module gl.gl_all;
+
+import gl.gl;
+import gl.glu;
+import gl.glx;
Added: include/x11/Makefile
===================================================================
--- include/x11/Makefile (rev 0)
+++ include/x11/Makefile 2006-09-01 10:22:15 UTC (rev 21)
@@ -0,0 +1,3 @@
+all:
+ build x11_all.d -I/home/anders/usr/include -cleanup
+ rm -f *.o *~
Added: include/x11/x11_all.d
===================================================================
--- include/x11/x11_all.d (rev 0)
+++ include/x11/x11_all.d 2006-09-01 10:22:15 UTC (rev 21)
@@ -0,0 +1,34 @@
+/**
+ * ©2006 Anders Runesson an...@ru...
+ *
+ * This software is distributed as "open source", under the conditions
+ * of the following licence:
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ **/
+
+module x11.x11_all.d;
+
+import x11.x;
+import x11.xlib;
+import x11.xatom;
+import x11.xutil;
+import x11.xmd;
+import x11.extensions.xf86vmode;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|