Mercurial > projects > doodle
annotate doodle/dia/tool_layer.d @ 89:467febed7367
* Ignore excre
* Some tentative work in grid_layer.d
* Give the ScreenModel to all the layers. This needs refinement.
* A stroke wouldn't hurt occasionally in cairo_renderer.d
| author | David Bryant <bagnose@gmail.com> |
|---|---|
| date | Thu, 19 Aug 2010 00:19:42 +0930 |
| parents | cdd4fc728d94 |
| children | a98116479793 |
| rev | line source |
|---|---|
|
28
1754cb773d41
Part-way through getting to compile with configure/builder.
Graham St Jack <graham.stjack@internode.on.net>
parents:
26
diff
changeset
|
1 module doodle.dia.tool_layer; |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
2 |
| 36 | 3 public { |
| 4 import doodle.dia.tool; | |
| 5 } | |
| 6 | |
|
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
14
diff
changeset
|
7 private { |
|
58
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
8 import doodle.core.logging; |
|
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
9 } |
|
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
10 |
|
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
11 // This interface is used by the palette |
|
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
12 interface IToolStack { |
|
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
13 void use(Tool tool); |
|
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
14 } |
|
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
15 |
|
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
16 interface IToolStackObserver { |
|
60
e64baac3efb2
Attempt at a templatised palette
David Bryant <bagnose@gmail.com>
parents:
58
diff
changeset
|
17 void toolChanged(Tool tool); |
|
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
14
diff
changeset
|
18 } |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
19 |
|
58
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
20 final class ToolLayer : Layer, IEventHandler, IToolStack { |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
60
diff
changeset
|
21 this(in Tool[] staticTools, IToolStackObserver observer, in string name = "Tool") { |
| 12 | 22 super(name); |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
60
diff
changeset
|
23 _staticTools = staticTools.dup; |
|
58
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
24 _observer = observer; |
|
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
25 } |
|
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
26 |
|
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
27 // IToolStack overrides: |
|
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
28 |
|
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
29 void use(Tool tool) { |
|
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
30 assert(_grabbedTool is null); |
|
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
31 message("using new tool: %s", tool.name); |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
60
diff
changeset
|
32 _staticTools ~= tool; |
|
60
e64baac3efb2
Attempt at a templatised palette
David Bryant <bagnose@gmail.com>
parents:
58
diff
changeset
|
33 _observer.toolChanged(tool); |
| 7 | 34 } |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
35 |
| 36 | 36 // Layer overrides: |
| 37 | |
| 38 override Rectangle bounds() const { | |
| 39 return Rectangle(); | |
| 40 } | |
| 41 | |
| 84 | 42 override void draw(in Rectangle screenDamage, scope Renderer screenRenderer, |
| 89 | 43 in Rectangle modelDamage, scope Renderer modelRenderer, |
| 44 in ScreenModel screenModel) const { | |
| 56 | 45 if (_grabbedTool) { |
| 84 | 46 _grabbedTool.draw(screenDamage, screenRenderer); |
| 36 | 47 } |
| 48 } | |
| 49 | |
| 50 // EventHandler overrides: | |
| 51 | |
|
58
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
52 bool handleButtonPress(scope IViewport viewport, in ButtonEvent event) { |
| 14 | 53 // writefln("%s", event); |
| 7 | 54 |
| 48 | 55 if (_grabbedTool is null) { |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
60
diff
changeset
|
56 foreach_reverse(ref tool; _staticTools) { |
| 48 | 57 if (tool.handleButtonPress(viewport, event)) { |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
60
diff
changeset
|
58 _grabbedTool = tool; |
|
58
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
59 _grabbedButton = event.buttonName; |
| 7 | 60 break; |
| 61 } | |
| 62 } | |
| 63 } | |
| 64 else { | |
| 48 | 65 _grabbedTool.handleButtonPress(viewport, event); |
| 7 | 66 } |
| 67 | |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
68 return true; |
|
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
69 } |
|
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
70 |
|
58
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
71 bool handleButtonRelease(scope IViewport viewport, in ButtonEvent event) { |
| 14 | 72 // writefln("%s", event); |
| 7 | 73 |
| 48 | 74 if (_grabbedTool !is null) { |
| 75 _grabbedTool.handleButtonRelease(viewport, event); | |
| 7 | 76 |
|
58
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
77 if (_grabbedButton == event.buttonName) { |
| 48 | 78 _grabbedTool = null; |
| 7 | 79 } |
| 80 } | |
| 81 | |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
82 return true; |
|
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
83 } |
|
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
84 |
|
58
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
85 bool handleMotion(scope IViewport viewport, in MotionEvent event) { |
| 17 | 86 //writefln("%s", event); |
| 7 | 87 |
| 48 | 88 if (_grabbedTool is null) { |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
60
diff
changeset
|
89 foreach_reverse(ref tool; _staticTools) { |
| 48 | 90 if (tool.handleMotion(viewport, event)) { |
| 7 | 91 break; |
| 92 } | |
| 93 } | |
| 94 } | |
| 95 else { | |
| 48 | 96 _grabbedTool.handleMotion(viewport, event); |
| 7 | 97 } |
| 98 | |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
99 return true; |
|
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
100 } |
|
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
101 |
|
58
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
102 bool handleScroll(scope IViewport viewport, in ScrollEvent event) { |
| 14 | 103 // writefln("%s", event); |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
104 |
| 48 | 105 if (_grabbedTool is null) { |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
60
diff
changeset
|
106 foreach_reverse(ref tool; _staticTools) { |
| 48 | 107 if (tool.handleScroll(viewport, event)) { |
| 7 | 108 break; |
| 109 } | |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
110 } |
|
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
111 } |
|
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
112 else { |
| 48 | 113 _grabbedTool.handleScroll(viewport, event); |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
114 } |
|
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
115 |
|
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
116 return true; |
|
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
117 } |
|
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
118 |
|
64
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
119 bool handleEnter(scope IViewport viewport, CrossingEvent event) { |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
120 trace("Enter %s", event); |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
121 |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
122 if (_grabbedTool is null) { |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
123 foreach_reverse(ref tool; _staticTools) { |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
124 if (tool.handleEnter(viewport, event)) { |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
125 break; |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
126 } |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
127 } |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
128 } |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
129 else { |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
130 _grabbedTool.handleEnter(viewport, event); |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
131 } |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
132 |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
133 return true; |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
134 } |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
135 |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
136 bool handleLeave(scope IViewport viewport, CrossingEvent event) { |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
137 trace("Leave %s", event); |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
138 |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
139 if (_grabbedTool is null) { |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
140 foreach_reverse(ref tool; _staticTools) { |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
141 if (tool.handleLeave(viewport, event)) { |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
142 break; |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
143 } |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
144 } |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
145 } |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
146 else { |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
147 _grabbedTool.handleLeave(viewport, event); |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
148 } |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
149 |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
150 return true; |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
151 } |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
152 |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
153 bool handleKeyPress(scope IViewport viewport, in KeyEvent event) { |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
154 // writefln("%s", event); |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
155 |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
156 // FIXME not sure how these should work |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
157 foreach_reverse(ref tool; _staticTools) { |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
158 if (tool.handleKeyPress(viewport, event)) { |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
159 break; |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
160 } |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
161 } |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
162 |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
163 return true; |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
164 } |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
165 |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
166 bool handleKeyRelease(scope IViewport viewport, in KeyEvent event) { |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
167 // writefln("%s", event); |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
168 |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
169 // FIXME not sure how these should work |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
170 foreach_reverse(ref tool; _staticTools) { |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
171 if (tool.handleKeyRelease(viewport, event)) { |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
172 break; |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
173 } |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
174 } |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
175 |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
176 return true; |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
177 } |
|
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
178 |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
179 private { |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
60
diff
changeset
|
180 Tool[] _staticTools; |
|
58
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
181 IToolStackObserver _observer; |
|
c63719604adb
Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents:
57
diff
changeset
|
182 |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
60
diff
changeset
|
183 Tool _grabbedTool; |
| 48 | 184 ButtonName _grabbedButton; |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
185 } |
|
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
diff
changeset
|
186 } |