From 3aa0980b8d803fd718ad4992ab9fb3594ffa7d2f Mon Sep 17 00:00:00 2001 From: Marko Semet Date: Mon, 25 Dec 2017 18:05:27 +0100 Subject: [PATCH 1/9] Initial commit --- .gitignore | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..74b926f --- /dev/null +++ b/.gitignore @@ -0,0 +1,24 @@ +# Compiled Object files +*.o +*.obj + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Compiled Static libraries +*.a +*.lib + +# Executables +*.exe + +# DUB +.dub +docs.json +__dummy.html +docs/ + +# Code coverage +*.lst From 0ceddb3569968dda1db07850b01e8cb4178fc3bf Mon Sep 17 00:00:00 2001 From: Marko Semet Date: Mon, 25 Dec 2017 18:47:45 +0100 Subject: [PATCH 2/9] Init project --- .gitignore | 5 + dub.json | 17 ++ source/drawofpages/draw.d | 68 +++++ source/drawofpages/elements/basetypes.d | 47 +++ source/drawofpages/elements/package.d | 64 +++++ source/drawofpages/gui/drawArea.d | 361 ++++++++++++++++++++++++ source/drawofpages/gui/mainWindow.d | 31 ++ source/drawofpages/gui/package.d | 35 +++ source/drawofpages/package.d | 38 +++ 9 files changed, 666 insertions(+) create mode 100644 dub.json create mode 100644 source/drawofpages/draw.d create mode 100644 source/drawofpages/elements/basetypes.d create mode 100644 source/drawofpages/elements/package.d create mode 100644 source/drawofpages/gui/drawArea.d create mode 100644 source/drawofpages/gui/mainWindow.d create mode 100644 source/drawofpages/gui/package.d create mode 100644 source/drawofpages/package.d diff --git a/.gitignore b/.gitignore index 74b926f..a318e98 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,8 @@ docs/ # Code coverage *.lst +/bin +/bin +/drawofpages.* +/drawofpages.* +/dub.selections.json diff --git a/dub.json b/dub.json new file mode 100644 index 0000000..92ec132 --- /dev/null +++ b/dub.json @@ -0,0 +1,17 @@ +{ + "authors": ["Marko Semet"], + "description": "Take notes with touchscreen input.", + "homepage": "https://marko10000.tk/redirect/drawofpages", + "dependencies": { + "gtk-d": "~>3.7.0", + "structuresd": "~>1.0.0-beta2" + }, + "license": "GPL-3.0", + "name": "drawofpages", + "sourcePaths": [ + "source" + ], + "targetName": "drawofpages", + "targetPath": "bin", + "targetType": "executable" +} diff --git a/source/drawofpages/draw.d b/source/drawofpages/draw.d new file mode 100644 index 0000000..a91d4ee --- /dev/null +++ b/source/drawofpages/draw.d @@ -0,0 +1,68 @@ +/* DrawOfPages: Take notes with touchscreen input. + * Copyright (C) 2017 Marko Semet(Marko10_000) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +module drawofpages.draw; + +private +{ + import structuresd.dimension; +} + +public alias Point2D = Point!2; +public alias Square = Cuboid!2; +public alias Circle = Sphere!2; + +public struct Color { + float r = 0; + float g = 0; + float b = 0; + float a = 1; + + public this(float r, float g, float b) + { + this.r = r; + this.g = g; + this.b = b; + this.a = 1; + } + public this(float r, float g, float b, float a) + { + this.r = r; + this.g = g; + this.b = b; + this.a = a; + } + + public enum RED = Color(1, 0, 0); + public enum GREEN = Color(0, 1, 0); + public enum BLUE = Color(0, 0, 1); + public enum YELLOW = Color(1, 1, 0); + public enum ORANGE = Color(1, 0.5, 0); + public enum CYAN = Color(0, 1, 1); + public enum PURPLE = Color(1, 0, 1); + public enum BLACK = Color(0, 0, 0); + public enum GRAY = Color(0.5, 0.5, 0.5); + public enum WHITE = Color(1, 1, 1); + public enum TRANSPARENT = Color(0, 0, 0, 0); +} + +public interface Draw +{ + void drawCirc(Point2D center, float radius, Color color); + void drawLine(Point2D from, Point2D to, double size, Color color); + void drawRect(Square square, Color color); + void redraw(); +} diff --git a/source/drawofpages/elements/basetypes.d b/source/drawofpages/elements/basetypes.d new file mode 100644 index 0000000..62089f4 --- /dev/null +++ b/source/drawofpages/elements/basetypes.d @@ -0,0 +1,47 @@ +/* DrawOfPages: Take notes with touchscreen input. + * Copyright (C) 2017 Marko Semet(Marko10_000) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +module drawofpages.elements.basetypes; + +private +{ + import std.algorithm.comparison; + import structuresd.dimension; +} + +public struct Line +{ + Point!2 a; + Point!2 b; + double size; + + @nogc + public pure nothrow this(Point!2 a, Point!2 b, double size) + { + this.a = a; + this.b = b; + this.size = size; + } + + @nogc + public pure nothrow T opCast(T)() if(is(T == Cuboid!2)) + { + Cuboid!2 result = Cuboid!2(this.a, this.b); + result.a -= Point!2([this.size, this.size]); + result.b += Point!2([this.size, this.size]); + return result; + } +} diff --git a/source/drawofpages/elements/package.d b/source/drawofpages/elements/package.d new file mode 100644 index 0000000..6a8c631 --- /dev/null +++ b/source/drawofpages/elements/package.d @@ -0,0 +1,64 @@ +/* DrawOfPages: Take notes with touchscreen input. + * Copyright (C) 2017 Marko Semet(Marko10_000) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +module drawofpages.elements; + +private +{ + import drawofpages.draw; + import drawofpages.elements.basetypes; + import drawofpages.gui; + import structuresd.dimension; + import structuresd.dimension.rtree; +} + +public class Interaction : GuiInteraction +{ + private Point2D c; + private Draw draw; + private RTree!(Line, Cuboid!2, 127, 64) data; + + public this(Draw draw) + { + this.draw = draw; + this.data = new RTree!(Line, Cuboid!2, 127, 64); + } + + public void down(Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) + { + this.c = point; + } + public void contin(Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) + { + this.draw.drawLine(this.c, point, 2, Color.BLUE); + this.data.insert(Line(Point!2([this.c.dims[0], this.c.dims[1]]), Point!2([point.dims[0], point.dims[1]]), 2)); + this.draw.redraw(); + this.c = point; + } + public void up(Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) + { + this.draw.drawLine(this.c, point, 2, Color.BLUE); + this.data.insert(Line(Point!2([this.c.dims[0], this.c.dims[1]]), Point!2([point.dims[0], point.dims[1]]), 2)); + this.draw.redraw(); + } + public void redraw(Square area, Draw target) + { + foreach(Line line; this.data.query(area)) + { + target.drawLine(line.a, line.b, line.size, Color.RED); + } + } +} diff --git a/source/drawofpages/gui/drawArea.d b/source/drawofpages/gui/drawArea.d new file mode 100644 index 0000000..760c280 --- /dev/null +++ b/source/drawofpages/gui/drawArea.d @@ -0,0 +1,361 @@ +/* DrawOfPages: Take notes with touchscreen input. + * Copyright (C) 2017 Marko Semet(Marko10_000) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +module drawofpages.gui.drawArea; + +private +{ + import cairo.Context; + import cairo.ImageSurface; + import cairo.Surface; + import drawofpages.draw; + import drawofpages.gui; + import gdk.Device; + import gtk.DrawingArea; + import gdk.Event; + import gtk.Widget; + import std.math; +} + +private final class DrawPart +{ + package ImageSurface surface; + private Context context; + + public Point2D pos; + public double scale; + public Square box; + + pragma(inline, true) + private pure nothrow void updatePoint(ref Point2D p) + { + p = (p - this.pos) * this.scale; + } + pragma(inline, true) + private pure nothrow void updateScale(ref double s) + { + s *= this.scale; + } + + public this(Point2D pos, double scale) + { + this.surface = ImageSurface.create(cairo_format_t.ARGB32, 512, 512); + this.context = Context.create(this.surface); + this.pos = pos; + this.scale = scale; + + // Set background color + this.context.setSourceRgb(1, 1, 1); + this.context.rectangle(0, 0, 512, 512); + this.context.fill(); + + // Box + this.box = Square(pos, pos + Point2D([512 / this.scale, 512 / this.scale])); + } + public ~this() + { + this.surface.destroy; + } + + public void drawLine(Point2D from, Point2D to, double size, Color color) + { + this.updatePoint(from); + this.updatePoint(to); + this.updateScale(size); + + this.context.setSourceRgba(color.r, color.g, color.b, color.a); + this.context.moveTo(from.dims[0], from.dims[1]); + this.context.setLineWidth(size); + this.context.lineTo(to.dims[0], to.dims[1]); + this.context.stroke(); + this.context.moveTo(0, 0); + } +} + +private final class PardDraw : Draw +{ + private DrawPart dp; + + public this(DrawPart dp) + { + this.dp = dp; + } + + public void drawCirc(Point2D center, float radius, Color color) + { + assert(false); + } + public void drawLine(Point2D from, Point2D to, double size, Color color) + { + dp.drawLine(from, to, size, color); + } + public void drawRect(Square square, Color color) + { + assert(false); // TODO: draw rect + } + public void redraw() {} +} + +private final class Grid +{ + public DrawPart[][] parts; + + public Point2D rel; + public Point2D relZero; + public double scale; + public long x; + public long y; + public ulong width; + public ulong height; + + private pure void calcRelZero() + { + this.relZero = Point2D([this.x, this.y]) * this.scale; + } + + public this() + { + this.scale = 1; + this.x = -256; + this.y = -256; + this.rel = Point2D([this.x, this.y]); + this.width = 0; + this.height = 0; + this.parts = new DrawPart[][0]; + this.calcRelZero(); + } + + public void resize(ulong width, ulong height, GuiInteraction interatcion) + { + synchronized + { + ulong partsX = (width - this.x) / 512 + ((width - this.x) % 512 == 0 ? 0 : 1); + ulong partsY = (height - this.y) / 512 + ((height - this.y) % 512 == 0 ? 0 : 1); + DrawPart[][] newParts = new DrawPart[][partsY]; + for(ulong y = 0; y < partsY; y++) + { + if(this.parts.length > y) + { + // Use old data + DrawPart[] old = this.parts[y]; + DrawPart[] tmp = new DrawPart[partsX]; + for(ulong x = 0; x < partsX; x++) + { + if(old.length > x) + { + tmp[x] = old[x]; + } + else + { + tmp[x] = new DrawPart(Point2D([x, y]) * (512 / this.scale) + this.rel, this.scale); + interatcion.redraw(tmp[x].box, new PardDraw(tmp[x])); + } + } + newParts[y] = tmp; + } + else + { + // Gen new array + DrawPart[] tmp = new DrawPart[partsX]; + for(ulong x = 0; x < partsX; x++) + { + tmp[x] = new DrawPart(Point2D([x, y]) * (512 / this.scale) + this.rel, this.scale); + interatcion.redraw(tmp[x].box, new PardDraw(tmp[x])); + } + newParts[y] = tmp; + } + } + + // Set new data + { + DrawPart[][] tmp = this.parts; + this.parts = newParts; + tmp.destroy; + this.width = width; + this.height = height; + } + } + } +} + +private final class DrawHandler : Draw +{ + private DrawElement de; + package Grid grid; + + public this(DrawElement de) + { + this.de = de; + this.grid = new Grid(); + } + + public void drawCirc(Point2D center, float radius, Color color) + { + assert(false); + } + public void drawLine(Point2D from, Point2D to, double size, Color color) + { + foreach(DrawPart[] dps; this.grid.parts) + { + foreach(DrawPart dp; dps) + { + dp.drawLine(from, to, size, color); + } + } + } + public void drawRect(Square square, Color color) + { + assert(false); + } + public void redraw() + { + this.de.queueDraw(); + } + + package void _draw(Context cr) + { + for(long i = 0; i < this.grid.parts.length; i++) + { + DrawPart[] io = this.grid.parts[i]; + for(long j = 0; j < io.length; j++) + { + cr.setSourceSurface(io[j].surface, (j * 512) + (cast(long) this.grid.x), (i * 512) + (cast(long) this.grid.y)); + cr.rectangle((j * 512) + (cast(long) this.grid.x), (i * 512) + (cast(long) this.grid.y), 512, 512); + cr.fill(); + } + } + cr.save(); + cr.destroy; + } +} + +public class DrawElement : DrawingArea +{ + private DrawHandler dh; + private GuiInteraction interatcion = null; + private bool hasDown = false; + + private static pure CURSOR_TYPE _getCursor(GdkInputSource gis) + { + if(gis == GdkInputSource.PEN) + { + return CURSOR_TYPE.PEN; + } + else if(gis == GdkInputSource.ERASER) + { + return CURSOR_TYPE.ERASER; + } + else if(gis == GdkInputSource.MOUSE) + { + return CURSOR_TYPE.MOUSE; + } + return CURSOR_TYPE.HAND; + } + + private struct _pointerData + { + string deviceID = null; + double pressure; + CURSOR_TYPE ctype; + + this(Device device) + { + if(device.getDeviceType() != GdkDeviceType.MASTER) + { + this.deviceID = device.getProductId(); + } + GdkAxisFlags axes = device.getAxes(); + this.pressure = axes.PRESSURE; + this.ctype = _getCursor(device.getSource()); + } + } + + public this() + { + super(); + this.dh = new DrawHandler(this); + this.addOnDraw(delegate bool(Context cr, Widget w) { + synchronized + { + this._draw(cr); + } + return false; + }); + this.addOnButtonPress(delegate bool(Event e, Widget w) { + if(this.interatcion is null) + { + return false; + } + + GdkEventButton* geb = e.button(); + _pointerData tmp = _pointerData(e.getDevice()); + synchronized + { + this.interatcion.down(Point2D([geb.x, geb.y]), tmp.ctype, tmp.pressure, tmp.deviceID); + } + this.hasDown = true; + return false; + }); + this.addOnMotionNotify(delegate bool(Event e, Widget w) { + if((this.interatcion is null) || (!this.hasDown)) + { + return false; + } + + GdkEventMotion* motion = e.motion(); + _pointerData tmp = _pointerData(e.getDevice()); + synchronized + { + this.interatcion.contin(Point2D([motion.x, motion.y]), tmp.ctype, tmp.pressure, tmp.deviceID); + } + return false; + }); + this.addOnButtonRelease(delegate bool(Event e, Widget w) { + if(this.interatcion is null) + { + return false; + } + + GdkEventButton* geb = e.button(); + _pointerData tmp = _pointerData(e.getDevice()); + this.hasDown = false; + synchronized + { + this.interatcion.up(Point2D([geb.x, geb.y]), tmp.ctype, tmp.pressure, tmp.deviceID); + } + return false; + }); + this.addOnSizeAllocate(delegate void(Allocation alloc, Widget w) { + synchronized(this) + { + this.dh.grid.resize(alloc.width, alloc.height, this.interatcion); + } + }); + } + + private void _draw(Context cr) + { + this.dh._draw(cr); + } + public DrawHandler getDrawHanlder() + { + return this.dh; + } + public ref GuiInteraction getGuiInteraction() + { + return this.interatcion; + } +} diff --git a/source/drawofpages/gui/mainWindow.d b/source/drawofpages/gui/mainWindow.d new file mode 100644 index 0000000..4a31aac --- /dev/null +++ b/source/drawofpages/gui/mainWindow.d @@ -0,0 +1,31 @@ +/* DrawOfPages: Take notes with touchscreen input. + * Copyright (C) 2017 Marko Semet(Marko10_000) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +module drawofpages.gui.mainWindow; + +private +{ + import gtk.Window; + import gtk.MainWindow; +} + +public class DBMain : MainWindow +{ + public this() + { + super("Drawbook"); + } +} diff --git a/source/drawofpages/gui/package.d b/source/drawofpages/gui/package.d new file mode 100644 index 0000000..02bd74c --- /dev/null +++ b/source/drawofpages/gui/package.d @@ -0,0 +1,35 @@ +/* DrawOfPages: Take notes with touchscreen input. + * Copyright (C) 2017 Marko Semet(Marko10_000) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +module drawofpages.gui; + +private import drawofpages.draw; + +public enum CURSOR_TYPE +{ + MOUSE, + PEN, + ERASER, + HAND +} + +public interface GuiInteraction +{ + void down(Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID); + void contin(Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID); + void up(Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID); + void redraw(Square square, Draw target); +} diff --git a/source/drawofpages/package.d b/source/drawofpages/package.d new file mode 100644 index 0000000..9e293ac --- /dev/null +++ b/source/drawofpages/package.d @@ -0,0 +1,38 @@ +/* DrawOfPages: Take notes with touchscreen input. + * Copyright (C) 2017 Marko Semet(Marko10_000) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +module drawofpages; + +private import drawofpages.elements; +private import drawofpages.gui.drawArea; +private import drawofpages.draw; +private import gtk.MainWindow; +private import gtk.Main; + + +void main(string[] args) +{ + Main.init(args); + MainWindow win = new MainWindow("Hello World"); + win.setDefaultSize(800, 600); + DrawElement de = new DrawElement(); + de.getDrawHanlder().drawLine(Point2D([50, 50]), Point2D([100, 100]), 5, Color.RED); + de.getGuiInteraction() = new Interaction(de.getDrawHanlder()); + win.add(de); + de.queueDraw(); + win.showAll(); + Main.run(); +} From 17c61a320b283335823260af35cd14d791101841 Mon Sep 17 00:00:00 2001 From: Marko Semet Date: Mon, 25 Dec 2017 18:48:12 +0100 Subject: [PATCH 3/9] Add license --- LICENSE.md | 675 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 675 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..2fb2e74 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,675 @@ +### GNU GENERAL PUBLIC LICENSE + +Version 3, 29 June 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. + + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + +### Preamble + +The GNU General Public License is a free, copyleft license for +software and other kinds of works. + +The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom +to share and change all versions of a program--to make sure it remains +free software for all its users. We, the Free Software Foundation, use +the GNU General Public License for most of our software; it applies +also to any other work released this way by its authors. You can apply +it to your programs, too. + +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + +To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you +have certain responsibilities if you distribute copies of the +software, or if you modify it: responsibilities to respect the freedom +of others. + +For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + +Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + +Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the +manufacturer can do so. This is fundamentally incompatible with the +aim of protecting users' freedom to change the software. The +systematic pattern of such abuse occurs in the area of products for +individuals to use, which is precisely where it is most unacceptable. +Therefore, we have designed this version of the GPL to prohibit the +practice for those products. If such problems arise substantially in +other domains, we stand ready to extend this provision to those +domains in future versions of the GPL, as needed to protect the +freedom of users. + +Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish +to avoid the special danger that patents applied to a free program +could make it effectively proprietary. To prevent this, the GPL +assures that patents cannot be used to render the program non-free. + +The precise terms and conditions for copying, distribution and +modification follow. + +### TERMS AND CONDITIONS + +#### 0. Definitions. + +"This License" refers to version 3 of the GNU General Public License. + +"Copyright" also means copyright-like laws that apply to other kinds +of works, such as semiconductor masks. + +"The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + +To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of +an exact copy. The resulting work is called a "modified version" of +the earlier work or a work "based on" the earlier work. + +A "covered work" means either the unmodified Program or a work based +on the Program. + +To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + +To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user +through a computer network, with no transfer of a copy, is not +conveying. + +An interactive user interface displays "Appropriate Legal Notices" to +the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + +#### 1. Source Code. + +The "source code" for a work means the preferred form of the work for +making modifications to it. "Object code" means any non-source form of +a work. + +A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + +The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + +The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can +regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same +work. + +#### 2. Basic Permissions. + +All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, +without conditions so long as your license otherwise remains in force. +You may convey covered works to others for the sole purpose of having +them make modifications exclusively for you, or provide you with +facilities for running those works, provided that you comply with the +terms of this License in conveying all material for which you do not +control copyright. Those thus making or running the covered works for +you must do so exclusively on your behalf, under your direction and +control, on terms that prohibit them from making any copies of your +copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the +conditions stated below. Sublicensing is not allowed; section 10 makes +it unnecessary. + +#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + +No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + +When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such +circumvention is effected by exercising rights under this License with +respect to the covered work, and you disclaim any intention to limit +operation or modification of the work as a means of enforcing, against +the work's users, your or third parties' legal rights to forbid +circumvention of technological measures. + +#### 4. Conveying Verbatim Copies. + +You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + +#### 5. Conveying Modified Source Versions. + +You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these +conditions: + +- a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. +- b) The work must carry prominent notices stating that it is + released under this License and any conditions added under + section 7. This requirement modifies the requirement in section 4 + to "keep intact all notices". +- c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. +- d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + +A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + +#### 6. Conveying Non-Source Forms. + +You may convey a covered work in object code form under the terms of +sections 4 and 5, provided that you also convey the machine-readable +Corresponding Source under the terms of this License, in one of these +ways: + +- a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. +- b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the Corresponding + Source from a network server at no charge. +- c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. +- d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. +- e) Convey the object code using peer-to-peer transmission, + provided you inform other peers where the object code and + Corresponding Source of the work are being offered to the general + public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + +A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, +family, or household purposes, or (2) anything designed or sold for +incorporation into a dwelling. In determining whether a product is a +consumer product, doubtful cases shall be resolved in favor of +coverage. For a particular product received by a particular user, +"normally used" refers to a typical or common use of that class of +product, regardless of the status of the particular user or of the way +in which the particular user actually uses, or expects or is expected +to use, the product. A product is a consumer product regardless of +whether the product has substantial commercial, industrial or +non-consumer uses, unless such uses represent the only significant +mode of use of the product. + +"Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to +install and execute modified versions of a covered work in that User +Product from a modified version of its Corresponding Source. The +information must suffice to ensure that the continued functioning of +the modified object code is in no case prevented or interfered with +solely because modification has been made. + +If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + +The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or +updates for a work that has been modified or installed by the +recipient, or for the User Product in which it has been modified or +installed. Access to a network may be denied when the modification +itself materially and adversely affects the operation of the network +or violates the rules and protocols for communication across the +network. + +Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + +#### 7. Additional Terms. + +"Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders +of that material) supplement the terms of this License with terms: + +- a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or +- b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or +- c) Prohibiting misrepresentation of the origin of that material, + or requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or +- d) Limiting the use for publicity purposes of names of licensors + or authors of the material; or +- e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or +- f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions + of it) with contractual assumptions of liability to the recipient, + for any liability that these contractual assumptions directly + impose on those licensors and authors. + +All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; the +above requirements apply either way. + +#### 8. Termination. + +You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + +#### 9. Acceptance Not Required for Having Copies. + +You are not required to accept this License in order to receive or run +a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + +#### 10. Automatic Licensing of Downstream Recipients. + +Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + +An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + +#### 11. Patents. + +A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + +A contributor's "essential patent claims" are all patent claims owned +or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + +In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + +If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + +A patent license is "discriminatory" if it does not include within the +scope of its coverage, prohibits the exercise of, or is conditioned on +the non-exercise of one or more of the rights that are specifically +granted under this License. You may not convey a covered work if you +are a party to an arrangement with a third party that is in the +business of distributing software, under which you make payment to the +third party based on the extent of your activity of conveying the +work, and under which the third party grants, to any of the parties +who would receive the covered work from you, a discriminatory patent +license (a) in connection with copies of the covered work conveyed by +you (or copies made from those copies), or (b) primarily for and in +connection with specific products or compilations that contain the +covered work, unless you entered into that arrangement, or that patent +license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + +#### 12. No Surrender of Others' Freedom. + +If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under +this License and any other pertinent obligations, then as a +consequence you may not convey it at all. For example, if you agree to +terms that obligate you to collect a royalty for further conveying +from those to whom you convey the Program, the only way you could +satisfy both those terms and this License would be to refrain entirely +from conveying the Program. + +#### 13. Use with the GNU Affero General Public License. + +Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + +#### 14. Revised Versions of this License. + +The Free Software Foundation may publish revised and/or new versions +of the GNU General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in +detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies that a certain numbered version of the GNU General Public +License "or any later version" applies to it, you have the option of +following the terms and conditions either of that numbered version or +of any later version published by the Free Software Foundation. If the +Program does not specify a version number of the GNU General Public +License, you may choose any version ever published by the Free +Software Foundation. + +If the Program specifies that a proxy can decide which future versions +of the GNU General Public License can be used, that proxy's public +statement of acceptance of a version permanently authorizes you to +choose that version for the Program. + +Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + +#### 15. Disclaimer of Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT +WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR +CORRECTION. + +#### 16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR +CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT +NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR +LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM +TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER +PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +#### 17. Interpretation of Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS + +### How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. + +To do so, attach the following notices to the program. It is safest to +attach them to the start of each source file to most effectively state +the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper +mail. + +If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands \`show w' and \`show c' should show the +appropriate parts of the General Public License. Of course, your +program's commands might be different; for a GUI interface, you would +use an "about box". + +You should also get your employer (if you work as a programmer) or +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. For more information on this, and how to apply and follow +the GNU GPL, see . + +The GNU General Public License does not permit incorporating your +program into proprietary programs. If your program is a subroutine +library, you may consider it more useful to permit linking proprietary +applications with the library. If this is what you want to do, use the +GNU Lesser General Public License instead of this License. But first, +please read . From 23d7feb971cdebefaf204bb627471edb2643ae36 Mon Sep 17 00:00:00 2001 From: Marko Semet Date: Tue, 26 Dec 2017 00:13:38 +0100 Subject: [PATCH 4/9] Make touch interaction multi threaded --- source/drawofpages/elements/basetypes.d | 5 +- source/drawofpages/elements/package.d | 36 ----- source/drawofpages/gui/mainWindow.d | 5 + source/drawofpages/package.d | 9 +- source/drawofpages/tools/drawer.d | 43 ++++++ source/drawofpages/tools/interaction.d | 176 ++++++++++++++++++++++++ source/drawofpages/tools/package.d | 75 ++++++++++ 7 files changed, 310 insertions(+), 39 deletions(-) create mode 100644 source/drawofpages/tools/drawer.d create mode 100644 source/drawofpages/tools/interaction.d create mode 100644 source/drawofpages/tools/package.d diff --git a/source/drawofpages/elements/basetypes.d b/source/drawofpages/elements/basetypes.d index 62089f4..9f1c1ab 100644 --- a/source/drawofpages/elements/basetypes.d +++ b/source/drawofpages/elements/basetypes.d @@ -18,6 +18,7 @@ module drawofpages.elements.basetypes; private { + import drawofpages.draw; import std.algorithm.comparison; import structuresd.dimension; } @@ -27,13 +28,15 @@ public struct Line Point!2 a; Point!2 b; double size; + Color color; @nogc - public pure nothrow this(Point!2 a, Point!2 b, double size) + public pure nothrow this(Point!2 a, Point!2 b, double size, Color color) { this.a = a; this.b = b; this.size = size; + this.color = color; } @nogc diff --git a/source/drawofpages/elements/package.d b/source/drawofpages/elements/package.d index 6a8c631..877bc9c 100644 --- a/source/drawofpages/elements/package.d +++ b/source/drawofpages/elements/package.d @@ -25,40 +25,4 @@ private import structuresd.dimension.rtree; } -public class Interaction : GuiInteraction -{ - private Point2D c; - private Draw draw; - private RTree!(Line, Cuboid!2, 127, 64) data; - public this(Draw draw) - { - this.draw = draw; - this.data = new RTree!(Line, Cuboid!2, 127, 64); - } - - public void down(Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) - { - this.c = point; - } - public void contin(Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) - { - this.draw.drawLine(this.c, point, 2, Color.BLUE); - this.data.insert(Line(Point!2([this.c.dims[0], this.c.dims[1]]), Point!2([point.dims[0], point.dims[1]]), 2)); - this.draw.redraw(); - this.c = point; - } - public void up(Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) - { - this.draw.drawLine(this.c, point, 2, Color.BLUE); - this.data.insert(Line(Point!2([this.c.dims[0], this.c.dims[1]]), Point!2([point.dims[0], point.dims[1]]), 2)); - this.draw.redraw(); - } - public void redraw(Square area, Draw target) - { - foreach(Line line; this.data.query(area)) - { - target.drawLine(line.a, line.b, line.size, Color.RED); - } - } -} diff --git a/source/drawofpages/gui/mainWindow.d b/source/drawofpages/gui/mainWindow.d index 4a31aac..efc1a8c 100644 --- a/source/drawofpages/gui/mainWindow.d +++ b/source/drawofpages/gui/mainWindow.d @@ -22,6 +22,11 @@ private import gtk.MainWindow; } +private class Menu +{ + +} + public class DBMain : MainWindow { public this() diff --git a/source/drawofpages/package.d b/source/drawofpages/package.d index 9e293ac..1a16832 100644 --- a/source/drawofpages/package.d +++ b/source/drawofpages/package.d @@ -16,7 +16,8 @@ */ module drawofpages; -private import drawofpages.elements; +private import drawofpages.tools.drawer; +private import drawofpages.tools.interaction; private import drawofpages.gui.drawArea; private import drawofpages.draw; private import gtk.MainWindow; @@ -30,9 +31,13 @@ void main(string[] args) win.setDefaultSize(800, 600); DrawElement de = new DrawElement(); de.getDrawHanlder().drawLine(Point2D([50, 50]), Point2D([100, 100]), 5, Color.RED); - de.getGuiInteraction() = new Interaction(de.getDrawHanlder()); + DrawThread dt = new DrawThread(de.getDrawHanlder()); + InteractionSafer ints = new InteractionSafer(dt); + ints.currentTool = new DrawLine(de.getDrawHanlder()); + de.getGuiInteraction() = ints; win.add(de); de.queueDraw(); win.showAll(); Main.run(); + dt.stop = true; } diff --git a/source/drawofpages/tools/drawer.d b/source/drawofpages/tools/drawer.d new file mode 100644 index 0000000..06f2c83 --- /dev/null +++ b/source/drawofpages/tools/drawer.d @@ -0,0 +1,43 @@ +/* DrawOfPages: Take notes with touchscreen input. + * Copyright (C) 2017 Marko Semet(Marko10_000) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +module drawofpages.tools.drawer; + +private +{ + import drawofpages.draw; + import drawofpages.elements.basetypes; + import drawofpages.gui; + import drawofpages.tools; +} + +public final class DrawLine : Tool +{ + mixin CURSOR_FROM_TO!(); + + private Draw draw; + + public this(Draw draw) + { + this.draw = draw; + } + + private void _cursorFromTo(Document doc, Point2D from, double fromPressure, Point2D to, double toPressure, CURSOR_TYPE cursor, string cursorID) + { + doc.data.insert(Line(from, to, 2, Color.BLACK)); + this.draw.drawLine(from, to, 2, Color.BLUE); + } +} diff --git a/source/drawofpages/tools/interaction.d b/source/drawofpages/tools/interaction.d new file mode 100644 index 0000000..ad0d5f5 --- /dev/null +++ b/source/drawofpages/tools/interaction.d @@ -0,0 +1,176 @@ +/* DrawOfPages: Take notes with touchscreen input. + * Copyright (C) 2017 Marko Semet(Marko10_000) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +module drawofpages.tools.interaction; + +private +{ + import core.thread; + import drawofpages.draw; + import drawofpages.gui; + import drawofpages.tools; + import structuresd.containers.queue; + import std.stdio; +} + +package struct CursorInteraction +{ + Point2D pos; + CURSOR_TYPE ctype; + double pressure; + string id; +} + +public class DrawThread : Thread +{ + private enum INTERACTION_TYPE + { + CURSOR_DOWN = 0, + CURSOR_CONTIN = 1, + CURSOR_UP = 2 + } + private static struct Interaction + { + public INTERACTION_TYPE itype; + public Document doc; + public Tool tool; + union + { + public CursorInteraction cursor; + } + } + + private Draw draw; + private Queue!(Interaction, true) queue; + public bool stop; + + private void run() + { + Interaction tmp; + while(!this.stop) + { + bool redraw = false; + while(this.queue.fetch(tmp)) + { + if(tmp.tool is null) + { + continue; + } + final switch(tmp.itype) + { + case INTERACTION_TYPE.CURSOR_DOWN: + redraw = true; + tmp.tool.cursorDown(tmp.doc, tmp.cursor.pos, tmp.cursor.ctype, tmp.cursor.pressure, tmp.cursor.id); + break; + case INTERACTION_TYPE.CURSOR_CONTIN: + redraw = true; + tmp.tool.cursorContin(tmp.doc, tmp.cursor.pos, tmp.cursor.ctype, tmp.cursor.pressure, tmp.cursor.id); + break; + case INTERACTION_TYPE.CURSOR_UP: + redraw = true; + tmp.tool.cursorUp(tmp.doc, tmp.cursor.pos, tmp.cursor.ctype, tmp.cursor.pressure, tmp.cursor.id); + break; + } + } + if(redraw) + { + this.draw.redraw(); + } + yield(); + } + } + + public this(Draw draw) + { + this.draw = draw; + this.queue = new Queue!(Interaction, true); + this.stop = false; + super(&this.run); + this.start(); + } + + pragma(inline, true) + public void add(string TYPE)(Document doc, Tool tool, CursorInteraction ci) + { + Interaction tmp; + static if(TYPE == "DOWN") + { + tmp.itype = INTERACTION_TYPE.CURSOR_DOWN; + } + else static if(TYPE == "CONTIN") + { + tmp.itype = INTERACTION_TYPE.CURSOR_CONTIN; + } + else static if(TYPE == "UP") + { + tmp.itype = INTERACTION_TYPE.CURSOR_UP; + } + else + { + static assert(false); + } + tmp.doc = doc; + tmp.tool = tool; + tmp.cursor = ci; + this.queue.insert(tmp); + } +}; + +public class InteractionSafer : GuiInteraction +{ + private Document document; + public Tool currentTool; + private DrawThread thread; + + public this(DrawThread thread) + { + this.document = new Document(); + this.currentTool = null; + this.thread = thread; + } + + public void down(Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) + { + CursorInteraction ci; + ci.pos = point; + ci.ctype = cursor; + ci.pressure = pressure; + ci.id = cursorID; + thread.add!"DOWN"(this.document, this.currentTool, ci); + } + public void contin(Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) + { + CursorInteraction ci; + ci.pos = point; + ci.ctype = cursor; + ci.pressure = pressure; + ci.id = cursorID; + thread.add!"CONTIN"(this.document, this.currentTool, ci); + } + public void up(Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) + { + CursorInteraction ci; + ci.pos = point; + ci.ctype = cursor; + ci.pressure = pressure; + ci.id = cursorID; + thread.add!"UP"(this.document, this.currentTool, ci); + } + public void redraw(Square area, Draw target) + { + this.document.redraw(area, target); + } +} diff --git a/source/drawofpages/tools/package.d b/source/drawofpages/tools/package.d new file mode 100644 index 0000000..b5cd58c --- /dev/null +++ b/source/drawofpages/tools/package.d @@ -0,0 +1,75 @@ +/* DrawOfPages: Take notes with touchscreen input. + * Copyright (C) 2017 Marko Semet(Marko10_000) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +module drawofpages.tools; + +private +{ + import drawofpages.draw; + import drawofpages.elements.basetypes; + import drawofpages.gui; + import drawofpages.tools.drawer; + import structuresd.dimension; + import structuresd.dimension.rtree; +} + +public class Document +{ + public RTree!(Line, Cuboid!2, 127, 64) data; + + public this() + { + this.data = new RTree!(Line, Cuboid!2, 127, 64)(); + } + + public void redraw(Square area, Draw target) + { + foreach(Line line; this.data.query(area)) + { + target.drawLine(line.a, line.b, line.size, line.color); + } + } +} + +public interface Tool +{ + void cursorDown(Document doc, Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID); + void cursorContin(Document doc, Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID); + void cursorUp(Document doc, Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID); +} + +public mixin template CURSOR_FROM_TO() +{ + private Point2D __cursorPosition; + private double __cursorPressure; + + public void cursorDown(Document doc, Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) + { + this.__cursorPosition = point; + this.__cursorPressure = pressure; + } + public void cursorContin(Document doc, Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) + { + this._cursorFromTo(doc, this.__cursorPosition, this.__cursorPressure, point, pressure, cursor, cursorID); + this.__cursorPosition = point; + this.__cursorPressure = pressure; + } + public void cursorUp(Document doc, Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) + { + this._cursorFromTo(doc, this.__cursorPosition, this.__cursorPressure, point, pressure, cursor, cursorID); + } + private void _cursorFromTo(Document doc, Point2D from, double fromPressure, Point2D to, double toPressure, CURSOR_TYPE cursor, string cursorID); +} From 96cfbf9d1751ebf24126f5e248dea5eaea5a6b74 Mon Sep 17 00:00:00 2001 From: Marko Semet Date: Tue, 26 Dec 2017 01:12:17 +0100 Subject: [PATCH 5/9] Mulithreaded redraw, reduce main function and remove unused imports --- dub.json | 2 +- source/drawofpages/elements/basetypes.d | 1 - source/drawofpages/elements/package.d | 11 ---- source/drawofpages/gui/mainWindow.d | 38 +++++++++++-- source/drawofpages/package.d | 20 +------ source/drawofpages/tools/interaction.d | 73 ++++++++++++++++++------- source/drawofpages/tools/package.d | 10 +++- 7 files changed, 100 insertions(+), 55 deletions(-) diff --git a/dub.json b/dub.json index 92ec132..27aad4c 100644 --- a/dub.json +++ b/dub.json @@ -4,7 +4,7 @@ "homepage": "https://marko10000.tk/redirect/drawofpages", "dependencies": { "gtk-d": "~>3.7.0", - "structuresd": "~>1.0.0-beta2" + "structuresd": "~>1.0.0-beta3" }, "license": "GPL-3.0", "name": "drawofpages", diff --git a/source/drawofpages/elements/basetypes.d b/source/drawofpages/elements/basetypes.d index 9f1c1ab..2c92ee9 100644 --- a/source/drawofpages/elements/basetypes.d +++ b/source/drawofpages/elements/basetypes.d @@ -19,7 +19,6 @@ module drawofpages.elements.basetypes; private { import drawofpages.draw; - import std.algorithm.comparison; import structuresd.dimension; } diff --git a/source/drawofpages/elements/package.d b/source/drawofpages/elements/package.d index 877bc9c..82ba541 100644 --- a/source/drawofpages/elements/package.d +++ b/source/drawofpages/elements/package.d @@ -15,14 +15,3 @@ * along with this program. If not, see . */ module drawofpages.elements; - -private -{ - import drawofpages.draw; - import drawofpages.elements.basetypes; - import drawofpages.gui; - import structuresd.dimension; - import structuresd.dimension.rtree; -} - - diff --git a/source/drawofpages/gui/mainWindow.d b/source/drawofpages/gui/mainWindow.d index efc1a8c..dfd5dfc 100644 --- a/source/drawofpages/gui/mainWindow.d +++ b/source/drawofpages/gui/mainWindow.d @@ -18,7 +18,9 @@ module drawofpages.gui.mainWindow; private { - import gtk.Window; + import drawofpages.gui.drawArea; + import drawofpages.tools.drawer; + import drawofpages.tools.interaction; import gtk.MainWindow; } @@ -27,10 +29,38 @@ private class Menu } -public class DBMain : MainWindow +public class Tab { - public this() + package string name; + package DrawElement drawElement; + private InteractionSafer interaction; + + package this(DrawThread drawThread) { - super("Drawbook"); + this.drawElement = new DrawElement(); + this.interaction = new InteractionSafer(drawThread, this.drawElement.getDrawHanlder()); + this.interaction.currentTool = new DrawLine(this.drawElement.getDrawHanlder()); + this.drawElement.getGuiInteraction() = this.interaction; + } +} + +public class DOPMain : MainWindow +{ + DrawThread drawThread; + Tab tab; + + public this() + { + super("DrawOfPapers"); + this.setDefaultSize(800, 600); // TODO: Load size from config + this.drawThread = new DrawThread(); + this.tab = new Tab(this.drawThread); + this.add(this.tab.drawElement); // TODO: Tab support + this.showAll(); + } + + public void stop() + { + this.drawThread.stop = true; } } diff --git a/source/drawofpages/package.d b/source/drawofpages/package.d index 1a16832..7420db7 100644 --- a/source/drawofpages/package.d +++ b/source/drawofpages/package.d @@ -16,28 +16,14 @@ */ module drawofpages; -private import drawofpages.tools.drawer; -private import drawofpages.tools.interaction; -private import drawofpages.gui.drawArea; -private import drawofpages.draw; -private import gtk.MainWindow; +private import drawofpages.gui.mainWindow; private import gtk.Main; void main(string[] args) { Main.init(args); - MainWindow win = new MainWindow("Hello World"); - win.setDefaultSize(800, 600); - DrawElement de = new DrawElement(); - de.getDrawHanlder().drawLine(Point2D([50, 50]), Point2D([100, 100]), 5, Color.RED); - DrawThread dt = new DrawThread(de.getDrawHanlder()); - InteractionSafer ints = new InteractionSafer(dt); - ints.currentTool = new DrawLine(de.getDrawHanlder()); - de.getGuiInteraction() = ints; - win.add(de); - de.queueDraw(); - win.showAll(); + DOPMain mainWindow = new DOPMain(); Main.run(); - dt.stop = true; + mainWindow.stop(); } diff --git a/source/drawofpages/tools/interaction.d b/source/drawofpages/tools/interaction.d index ad0d5f5..d3babab 100644 --- a/source/drawofpages/tools/interaction.d +++ b/source/drawofpages/tools/interaction.d @@ -23,7 +23,6 @@ private import drawofpages.gui; import drawofpages.tools; import structuresd.containers.queue; - import std.stdio; } package struct CursorInteraction @@ -33,27 +32,34 @@ package struct CursorInteraction double pressure; string id; } +package struct RedrawInteraction +{ + Square box; + Draw target; +} public class DrawThread : Thread { private enum INTERACTION_TYPE { - CURSOR_DOWN = 0, - CURSOR_CONTIN = 1, - CURSOR_UP = 2 + REDRAW = 0, + CURSOR_DOWN = 1, + CURSOR_CONTIN = 2, + CURSOR_UP = 3 } private static struct Interaction { public INTERACTION_TYPE itype; public Document doc; public Tool tool; + public Draw draw; union { public CursorInteraction cursor; + public RedrawInteraction redraw; } } - private Draw draw; private Queue!(Interaction, true) queue; public bool stop; @@ -62,7 +68,7 @@ public class DrawThread : Thread Interaction tmp; while(!this.stop) { - bool redraw = false; + bool[Draw] redraw; while(this.queue.fetch(tmp)) { if(tmp.tool is null) @@ -71,31 +77,34 @@ public class DrawThread : Thread } final switch(tmp.itype) { + case INTERACTION_TYPE.REDRAW: + redraw[tmp.draw] = true; + tmp.doc.redraw(tmp.redraw.box, tmp.redraw.target); + break; case INTERACTION_TYPE.CURSOR_DOWN: - redraw = true; + redraw[tmp.draw] = true; tmp.tool.cursorDown(tmp.doc, tmp.cursor.pos, tmp.cursor.ctype, tmp.cursor.pressure, tmp.cursor.id); break; case INTERACTION_TYPE.CURSOR_CONTIN: - redraw = true; + redraw[tmp.draw] = true; tmp.tool.cursorContin(tmp.doc, tmp.cursor.pos, tmp.cursor.ctype, tmp.cursor.pressure, tmp.cursor.id); break; case INTERACTION_TYPE.CURSOR_UP: - redraw = true; + redraw[tmp.draw] = true; tmp.tool.cursorUp(tmp.doc, tmp.cursor.pos, tmp.cursor.ctype, tmp.cursor.pressure, tmp.cursor.id); break; } } - if(redraw) + foreach(Draw draw; redraw.keys) { - this.draw.redraw(); + draw.redraw(); } yield(); } } - public this(Draw draw) + public this() { - this.draw = draw; this.queue = new Queue!(Interaction, true); this.stop = false; super(&this.run); @@ -103,7 +112,13 @@ public class DrawThread : Thread } pragma(inline, true) - public void add(string TYPE)(Document doc, Tool tool, CursorInteraction ci) + private void add(ref Interaction interact) + { + this.queue.insert(interact); + } + + pragma(inline, true) + public void add(string TYPE)(Document doc, Draw draw, Tool tool, CursorInteraction ci) { Interaction tmp; static if(TYPE == "DOWN") @@ -125,7 +140,20 @@ public class DrawThread : Thread tmp.doc = doc; tmp.tool = tool; tmp.cursor = ci; - this.queue.insert(tmp); + tmp.draw = draw; + this.add(tmp); + } + + pragma(inline, true) + public void add(Document doc, Draw draw, RedrawInteraction redraw) + { + Interaction tmp; + tmp.itype = INTERACTION_TYPE.REDRAW; + tmp.doc = doc; + tmp.tool = voidTool; + tmp.draw = draw; + tmp.redraw = redraw; + this.add(tmp); } }; @@ -134,12 +162,14 @@ public class InteractionSafer : GuiInteraction private Document document; public Tool currentTool; private DrawThread thread; + private Draw draw; - public this(DrawThread thread) + public this(DrawThread thread, Draw draw) { this.document = new Document(); this.currentTool = null; this.thread = thread; + this.draw = draw; } public void down(Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) @@ -149,7 +179,7 @@ public class InteractionSafer : GuiInteraction ci.ctype = cursor; ci.pressure = pressure; ci.id = cursorID; - thread.add!"DOWN"(this.document, this.currentTool, ci); + thread.add!"DOWN"(this.document, this.draw, this.currentTool, ci); } public void contin(Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) { @@ -158,7 +188,7 @@ public class InteractionSafer : GuiInteraction ci.ctype = cursor; ci.pressure = pressure; ci.id = cursorID; - thread.add!"CONTIN"(this.document, this.currentTool, ci); + thread.add!"CONTIN"(this.document, this.draw, this.currentTool, ci); } public void up(Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) { @@ -167,10 +197,13 @@ public class InteractionSafer : GuiInteraction ci.ctype = cursor; ci.pressure = pressure; ci.id = cursorID; - thread.add!"UP"(this.document, this.currentTool, ci); + thread.add!"UP"(this.document, this.draw, this.currentTool, ci); } public void redraw(Square area, Draw target) { - this.document.redraw(area, target); + RedrawInteraction ri; + ri.box = area; + ri.target = target; + this.thread.add(this.document, this.draw, ri); } } diff --git a/source/drawofpages/tools/package.d b/source/drawofpages/tools/package.d index b5cd58c..3a03a61 100644 --- a/source/drawofpages/tools/package.d +++ b/source/drawofpages/tools/package.d @@ -21,7 +21,6 @@ private import drawofpages.draw; import drawofpages.elements.basetypes; import drawofpages.gui; - import drawofpages.tools.drawer; import structuresd.dimension; import structuresd.dimension.rtree; } @@ -51,6 +50,15 @@ public interface Tool void cursorUp(Document doc, Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID); } +private class VoidTool : Tool +{ + void cursorDown(Document doc, Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) {} + void cursorContin(Document doc, Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) {} + void cursorUp(Document doc, Point2D point, CURSOR_TYPE cursor, double pressure, string cursorID) {} +} + +public __gshared Tool voidTool = new VoidTool(); + public mixin template CURSOR_FROM_TO() { private Point2D __cursorPosition; From 41bdea14c9b1ad8af5b2744cf95dd41f54794267 Mon Sep 17 00:00:00 2001 From: Marko Semet Date: Thu, 28 Dec 2017 18:27:27 +0100 Subject: [PATCH 6/9] Fix performance and add gui --- source/drawofpages/gui/drawArea.d | 17 +++---- source/drawofpages/gui/mainWindow.d | 70 ++++++++++++++++++++++++-- source/drawofpages/tools/interaction.d | 2 +- 3 files changed, 76 insertions(+), 13 deletions(-) diff --git a/source/drawofpages/gui/drawArea.d b/source/drawofpages/gui/drawArea.d index 760c280..68b7514 100644 --- a/source/drawofpages/gui/drawArea.d +++ b/source/drawofpages/gui/drawArea.d @@ -237,8 +237,6 @@ private final class DrawHandler : Draw cr.fill(); } } - cr.save(); - cr.destroy; } } @@ -292,12 +290,13 @@ public class DrawElement : DrawingArea { this._draw(cr); } + cr.destroy; return false; }); this.addOnButtonPress(delegate bool(Event e, Widget w) { if(this.interatcion is null) { - return false; + return true; } GdkEventButton* geb = e.button(); @@ -307,12 +306,12 @@ public class DrawElement : DrawingArea this.interatcion.down(Point2D([geb.x, geb.y]), tmp.ctype, tmp.pressure, tmp.deviceID); } this.hasDown = true; - return false; + return true; }); this.addOnMotionNotify(delegate bool(Event e, Widget w) { if((this.interatcion is null) || (!this.hasDown)) { - return false; + return true; } GdkEventMotion* motion = e.motion(); @@ -321,12 +320,12 @@ public class DrawElement : DrawingArea { this.interatcion.contin(Point2D([motion.x, motion.y]), tmp.ctype, tmp.pressure, tmp.deviceID); } - return false; + return true; }); this.addOnButtonRelease(delegate bool(Event e, Widget w) { if(this.interatcion is null) { - return false; + return true; } GdkEventButton* geb = e.button(); @@ -336,12 +335,12 @@ public class DrawElement : DrawingArea { this.interatcion.up(Point2D([geb.x, geb.y]), tmp.ctype, tmp.pressure, tmp.deviceID); } - return false; + return true; }); this.addOnSizeAllocate(delegate void(Allocation alloc, Widget w) { synchronized(this) { - this.dh.grid.resize(alloc.width, alloc.height, this.interatcion); + this.dh.grid.resize(alloc.width > 0 ? alloc.width : 1, alloc.height, this.interatcion); } }); } diff --git a/source/drawofpages/gui/mainWindow.d b/source/drawofpages/gui/mainWindow.d index dfd5dfc..197c2f0 100644 --- a/source/drawofpages/gui/mainWindow.d +++ b/source/drawofpages/gui/mainWindow.d @@ -21,7 +21,16 @@ private import drawofpages.gui.drawArea; import drawofpages.tools.drawer; import drawofpages.tools.interaction; + import gtk.Box; + import gtk.DrawingArea; + import gtk.HBox; + import gtk.HeaderBar; import gtk.MainWindow; + import gtk.Separator; + import gtk.SizeGroup; + import gtk.Widget; + import std.conv; + import std.stdio; } private class Menu @@ -46,17 +55,72 @@ public class Tab public class DOPMain : MainWindow { - DrawThread drawThread; - Tab tab; + private DrawThread drawThread; + private Tab tab; + + private HeaderBar mainHeaderBar; + private HeaderBar sideHeaderBar; + + private Box sideBar; + private Box sideBarContainer; + private Box main; public this() { + // Startup super("DrawOfPapers"); this.setDefaultSize(800, 600); // TODO: Load size from config this.drawThread = new DrawThread(); + + // Header bar + { + this.mainHeaderBar = new HeaderBar(); + this.mainHeaderBar.setTitle("DrawOfPapers"); + this.mainHeaderBar.setShowCloseButton(true); + + this.sideHeaderBar = new HeaderBar(); + this.sideHeaderBar.setTitle("SideTitle"); + this.sideHeaderBar.setShowCloseButton(false); + + HBox head = new HBox(false, 0); + this.setTitlebar(head); + head.packStart(this.sideHeaderBar, false, true, 0); + head.packEnd(this.mainHeaderBar, true, true, 0); + } + + // Main container + { + this.sideBar = new HBox(false, 0); + this.sideBarContainer = new HBox(false, 0); + this.sideBarContainer.packStart(this.sideBar, true, true, 0); + this.sideBarContainer.packEnd(new Separator(GtkOrientation.VERTICAL), false, true, 0); + + this.main = new HBox(false, 0); + + Box tmp = new HBox(false, 0); + tmp.packStart(this.sideBarContainer, false, true, 0); + tmp.packEnd(this.main, true, true, 0); + this.add(tmp); + } + + // Sizegroup + { + SizeGroup tmp = new SizeGroup(GtkSizeGroupMode.HORIZONTAL); + tmp.addWidget(this.sideHeaderBar); + tmp.addWidget(this.sideBar); + } + + // Generate new tab this.tab = new Tab(this.drawThread); - this.add(this.tab.drawElement); // TODO: Tab support + this.main.packStart(this.tab.drawElement, true, true, 0); this.showAll(); + //this.sidebarInvisible(); + } + + public void sidebarInvisible() + { + this.sideBarContainer.setVisible(false); + this.sideHeaderBar.setVisible(false); } public void stop() diff --git a/source/drawofpages/tools/interaction.d b/source/drawofpages/tools/interaction.d index d3babab..66ea89c 100644 --- a/source/drawofpages/tools/interaction.d +++ b/source/drawofpages/tools/interaction.d @@ -99,7 +99,7 @@ public class DrawThread : Thread { draw.redraw(); } - yield(); + this.sleep(dur!("msecs")(10)); } } From c18b5ef0a122efb2b42f0d8b8863b76e5816e9dd Mon Sep 17 00:00:00 2001 From: Marko Semet Date: Tue, 10 Apr 2018 16:03:35 +0200 Subject: [PATCH 7/9] Sidebar support --- source/drawofpages/gui/mainWindow.d | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/source/drawofpages/gui/mainWindow.d b/source/drawofpages/gui/mainWindow.d index 197c2f0..64c6aa3 100644 --- a/source/drawofpages/gui/mainWindow.d +++ b/source/drawofpages/gui/mainWindow.d @@ -103,7 +103,7 @@ public class DOPMain : MainWindow this.add(tmp); } - // Sizegroup + // Sizegroup sidebar { SizeGroup tmp = new SizeGroup(GtkSizeGroupMode.HORIZONTAL); tmp.addWidget(this.sideHeaderBar); @@ -114,7 +114,7 @@ public class DOPMain : MainWindow this.tab = new Tab(this.drawThread); this.main.packStart(this.tab.drawElement, true, true, 0); this.showAll(); - //this.sidebarInvisible(); + this.sidebarInvisible(); } public void sidebarInvisible() @@ -123,6 +123,28 @@ public class DOPMain : MainWindow this.sideHeaderBar.setVisible(false); } + public void sidebarShow(string title, Widget data, Widget[] headerFront = [], Widget[] headerBack = []) + { + // Insert + this.sideHeaderBar.setTitle(title); + this.sideHeaderBar.removeAll(); + foreach(Widget i; headerFront) + { + this.sideHeaderBar.packStart(i); + } + foreach(Widget i; headerBack) + { + this.sideHeaderBar.packEnd(i); + } + + this.sideBar.removeAll(); + this.sideBar.add(data); + + // Show + this.sideHeaderBar.setVisible(true); + this.sideBarContainer.setVisible(true); + } + public void stop() { this.drawThread.stop = true; From 9c407e304c1240b7202880c750805069490ad798 Mon Sep 17 00:00:00 2001 From: Marko Semet Date: Wed, 11 Apr 2018 01:45:36 +0200 Subject: [PATCH 8/9] Add support of HiDPI DrawArea is know rendering HiDPI correctly. Fixed #1 --- source/drawofpages/gui/drawArea.d | 60 ++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/source/drawofpages/gui/drawArea.d b/source/drawofpages/gui/drawArea.d index 68b7514..5a97f6d 100644 --- a/source/drawofpages/gui/drawArea.d +++ b/source/drawofpages/gui/drawArea.d @@ -38,6 +38,7 @@ private final class DrawPart public Point2D pos; public double scale; public Square box; + package float dpiScale; pragma(inline, true) private pure nothrow void updatePoint(ref Point2D p) @@ -50,16 +51,17 @@ private final class DrawPart s *= this.scale; } - public this(Point2D pos, double scale) + public this(Point2D pos, double scale, float dpiScale) { - this.surface = ImageSurface.create(cairo_format_t.ARGB32, 512, 512); + this.surface = ImageSurface.create(cairo_format_t.ARGB32, cast(int)(512 * dpiScale), cast(int)(512 * dpiScale)); this.context = Context.create(this.surface); this.pos = pos; this.scale = scale; + this.dpiScale = dpiScale; // Set background color this.context.setSourceRgb(1, 1, 1); - this.context.rectangle(0, 0, 512, 512); + this.context.rectangle(0, 0, 512 * dpiScale, 512 * dpiScale); this.context.fill(); // Box @@ -77,9 +79,9 @@ private final class DrawPart this.updateScale(size); this.context.setSourceRgba(color.r, color.g, color.b, color.a); - this.context.moveTo(from.dims[0], from.dims[1]); - this.context.setLineWidth(size); - this.context.lineTo(to.dims[0], to.dims[1]); + this.context.moveTo(from.dims[0] * this.dpiScale, from.dims[1] * this.dpiScale); + this.context.setLineWidth(size * this.dpiScale); + this.context.lineTo(to.dims[0] * this.dpiScale, to.dims[1] * this.dpiScale); this.context.stroke(); this.context.moveTo(0, 0); } @@ -116,6 +118,7 @@ private final class Grid public Point2D rel; public Point2D relZero; public double scale; + public double dpiScale; public long x; public long y; public ulong width; @@ -126,7 +129,7 @@ private final class Grid this.relZero = Point2D([this.x, this.y]) * this.scale; } - public this() + public this(float scale) { this.scale = 1; this.x = -256; @@ -134,6 +137,7 @@ private final class Grid this.rel = Point2D([this.x, this.y]); this.width = 0; this.height = 0; + this.dpiScale = scale; this.parts = new DrawPart[][0]; this.calcRelZero(); } @@ -160,7 +164,7 @@ private final class Grid } else { - tmp[x] = new DrawPart(Point2D([x, y]) * (512 / this.scale) + this.rel, this.scale); + tmp[x] = new DrawPart(Point2D([x, y]) * (512 / this.scale) + this.rel, this.scale, this.dpiScale); interatcion.redraw(tmp[x].box, new PardDraw(tmp[x])); } } @@ -172,7 +176,7 @@ private final class Grid DrawPart[] tmp = new DrawPart[partsX]; for(ulong x = 0; x < partsX; x++) { - tmp[x] = new DrawPart(Point2D([x, y]) * (512 / this.scale) + this.rel, this.scale); + tmp[x] = new DrawPart(Point2D([x, y]) * (512 / this.scale) + this.rel, this.scale, this.dpiScale); interatcion.redraw(tmp[x].box, new PardDraw(tmp[x])); } newParts[y] = tmp; @@ -189,6 +193,19 @@ private final class Grid } } } + + package void newDPI(float dpi) + { + this.dpiScale = dpi; + foreach(ref DrawPart[] part; this.parts) + { + foreach(ulong i; 0..part.length - 1) + { + DrawPart tmp = part[i]; + part[i] = new DrawPart(tmp.pos, tmp.scale, this.dpiScale); + } + } + } } private final class DrawHandler : Draw @@ -196,10 +213,10 @@ private final class DrawHandler : Draw private DrawElement de; package Grid grid; - public this(DrawElement de) + public this(DrawElement de, float dpiScale) { this.de = de; - this.grid = new Grid(); + this.grid = new Grid(dpiScale); } public void drawCirc(Point2D center, float radius, Color color) @@ -225,18 +242,21 @@ private final class DrawHandler : Draw this.de.queueDraw(); } - package void _draw(Context cr) + package void _draw(Context cr, float scaling) { + cr.save(); + cr.scale(1 / scaling, 1 / scaling); for(long i = 0; i < this.grid.parts.length; i++) { DrawPart[] io = this.grid.parts[i]; for(long j = 0; j < io.length; j++) { - cr.setSourceSurface(io[j].surface, (j * 512) + (cast(long) this.grid.x), (i * 512) + (cast(long) this.grid.y)); - cr.rectangle((j * 512) + (cast(long) this.grid.x), (i * 512) + (cast(long) this.grid.y), 512, 512); + cr.setSourceSurface(io[j].surface, ((j * 512) + (cast(long) this.grid.x)) * scaling, ((i * 512) + (cast(long) this.grid.y)) * scaling); + cr.rectangle(((j * 512) + (cast(long) this.grid.x)) * scaling, ((i * 512) + (cast(long) this.grid.y)) * scaling, 512 * scaling, 512 * scaling); cr.fill(); } } + cr.restore(); } } @@ -245,6 +265,7 @@ public class DrawElement : DrawingArea private DrawHandler dh; private GuiInteraction interatcion = null; private bool hasDown = false; + private float dpiTmp; private static pure CURSOR_TYPE _getCursor(GdkInputSource gis) { @@ -284,7 +305,8 @@ public class DrawElement : DrawingArea public this() { super(); - this.dh = new DrawHandler(this); + this.dpiTmp = this.getScaleFactor(); + this.dh = new DrawHandler(this, this.dpiTmp); this.addOnDraw(delegate bool(Context cr, Widget w) { synchronized { @@ -341,13 +363,19 @@ public class DrawElement : DrawingArea synchronized(this) { this.dh.grid.resize(alloc.width > 0 ? alloc.width : 1, alloc.height, this.interatcion); + float tmp = this.getScaleFactor(); + if(abs(tmp - this.dpiTmp) > float.epsilon) + { + this.dpiTmp = tmp; + this.dh.grid.newDPI(tmp); + } } }); } private void _draw(Context cr) { - this.dh._draw(cr); + this.dh._draw(cr, this.dpiTmp); } public DrawHandler getDrawHanlder() { From a9b3fba1662d0ef7cb6cdaf6ad4a873d7399fbe7 Mon Sep 17 00:00:00 2001 From: Marko Semet Date: Tue, 24 Apr 2018 03:32:31 +0200 Subject: [PATCH 9/9] Fix create points and worker thread --- source/drawofpages/gui/drawArea.d | 14 +++++++------- source/drawofpages/tools/interaction.d | 4 +--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/source/drawofpages/gui/drawArea.d b/source/drawofpages/gui/drawArea.d index 5a97f6d..561a4bf 100644 --- a/source/drawofpages/gui/drawArea.d +++ b/source/drawofpages/gui/drawArea.d @@ -126,7 +126,7 @@ private final class Grid private pure void calcRelZero() { - this.relZero = Point2D([this.x, this.y]) * this.scale; + this.relZero = Point2D(this.x, this.y) * this.scale; } public this(float scale) @@ -134,7 +134,7 @@ private final class Grid this.scale = 1; this.x = -256; this.y = -256; - this.rel = Point2D([this.x, this.y]); + this.rel = Point2D(this.x, this.y); this.width = 0; this.height = 0; this.dpiScale = scale; @@ -164,7 +164,7 @@ private final class Grid } else { - tmp[x] = new DrawPart(Point2D([x, y]) * (512 / this.scale) + this.rel, this.scale, this.dpiScale); + tmp[x] = new DrawPart(Point2D(x, y) * (512 / this.scale) + this.rel, this.scale, this.dpiScale); interatcion.redraw(tmp[x].box, new PardDraw(tmp[x])); } } @@ -176,7 +176,7 @@ private final class Grid DrawPart[] tmp = new DrawPart[partsX]; for(ulong x = 0; x < partsX; x++) { - tmp[x] = new DrawPart(Point2D([x, y]) * (512 / this.scale) + this.rel, this.scale, this.dpiScale); + tmp[x] = new DrawPart(Point2D(x, y) * (512 / this.scale) + this.rel, this.scale, this.dpiScale); interatcion.redraw(tmp[x].box, new PardDraw(tmp[x])); } newParts[y] = tmp; @@ -325,7 +325,7 @@ public class DrawElement : DrawingArea _pointerData tmp = _pointerData(e.getDevice()); synchronized { - this.interatcion.down(Point2D([geb.x, geb.y]), tmp.ctype, tmp.pressure, tmp.deviceID); + this.interatcion.down(Point2D(geb.x, geb.y), tmp.ctype, tmp.pressure, tmp.deviceID); } this.hasDown = true; return true; @@ -340,7 +340,7 @@ public class DrawElement : DrawingArea _pointerData tmp = _pointerData(e.getDevice()); synchronized { - this.interatcion.contin(Point2D([motion.x, motion.y]), tmp.ctype, tmp.pressure, tmp.deviceID); + this.interatcion.contin(Point2D(motion.x, motion.y), tmp.ctype, tmp.pressure, tmp.deviceID); } return true; }); @@ -355,7 +355,7 @@ public class DrawElement : DrawingArea this.hasDown = false; synchronized { - this.interatcion.up(Point2D([geb.x, geb.y]), tmp.ctype, tmp.pressure, tmp.deviceID); + this.interatcion.up(Point2D(geb.x, geb.y), tmp.ctype, tmp.pressure, tmp.deviceID); } return true; }); diff --git a/source/drawofpages/tools/interaction.d b/source/drawofpages/tools/interaction.d index 66ea89c..9979d24 100644 --- a/source/drawofpages/tools/interaction.d +++ b/source/drawofpages/tools/interaction.d @@ -61,7 +61,7 @@ public class DrawThread : Thread } private Queue!(Interaction, true) queue; - public bool stop; + public shared bool stop; private void run() { @@ -117,7 +117,6 @@ public class DrawThread : Thread this.queue.insert(interact); } - pragma(inline, true) public void add(string TYPE)(Document doc, Draw draw, Tool tool, CursorInteraction ci) { Interaction tmp; @@ -144,7 +143,6 @@ public class DrawThread : Thread this.add(tmp); } - pragma(inline, true) public void add(Document doc, Draw draw, RedrawInteraction redraw) { Interaction tmp;