Mercurial > projects > doodle
annotate doodle/gtk/cairo_canvas.d @ 88:100dd23c7bdf
Ch ch ch changes:
* Handle SIGINT like a geek for now
* GtkD Context has no destructor and hence it would seem, a memory leak
* No more gtk_* C-function invocations
* Configured my GtkD patches
* (Comments)
author | David Bryant <bagnose@gmail.com> |
---|---|
date | Wed, 18 Aug 2010 23:51:43 +0930 |
parents | 98980cee8c5b |
children | 467febed7367 |
rev | line source |
---|---|
83
06b4504cbcb0
Checkpoint of trying to get a different renderer going (OpenGL)
daveb
parents:
82
diff
changeset
|
1 module doodle.gtk.cairo_canvas; |
0 | 2 |
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
3 public { |
28
1754cb773d41
Part-way through getting to compile with configure/builder.
Graham St Jack <graham.stjack@internode.on.net>
parents:
27
diff
changeset
|
4 import doodle.dia.icanvas; |
72
5cc2de64f6d0
Cautious Saturday night commits
"David Bryant <bagnose@gmail.com>"
parents:
71
diff
changeset
|
5 import doodle.gtk.events; |
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
6 } |
0 | 7 |
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
8 private { |
40 | 9 import doodle.core.logging; |
81 | 10 import doodle.tk.screen_model; |
75
3cac0ee8ca35
Ok, things are seem on-track again
"David Bryant <bagnose@gmail.com>"
parents:
74
diff
changeset
|
11 import doodle.dia.layer_stack; |
84 | 12 import doodle.gtk.cairo_renderer; |
0 | 13 |
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
14 import cairo.Surface; |
81 | 15 import cairo.Context; |
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
16 |
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
17 import gtk.Widget; |
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
18 import gtk.Toolbar; |
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
19 import gtk.Table; |
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
20 import gtk.HRuler; |
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
21 import gtk.VRuler; |
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
22 import gtk.Range; |
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
23 import gtk.HScrollbar; |
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
24 import gtk.VScrollbar; |
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
25 import gtk.DrawingArea; |
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
26 import gtk.Adjustment; |
0 | 27 |
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
28 import gdk.Drawable; |
0 | 29 |
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
30 import gtkc.gtk; |
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
31 import gtkc.gtktypes; |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
32 //import gtkc.gdktypes; |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
33 |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
34 import std.math; |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
35 import std.stdio; |
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
36 } |
0 | 37 |
85 | 38 final class CairoCanvas : Table, private IViewport { |
69 | 39 this(in Layer[] layers, IEventHandler eventHandler, IGrid grid, in double pixelsPerMillimetre) { |
0 | 40 super(3, 3, 0); |
41 | |
73 | 42 _damageScreen = Rectangle.DEFAULT; |
17 | 43 |
48 | 44 _eventHandler = eventHandler; |
45 _grid = grid; | |
69 | 46 _pixelsPerMillimetre = pixelsPerMillimetre; |
0 | 47 |
79 | 48 _layerStack = new LayerStack(layers); |
49 | |
13 | 50 // Create our child widgets and register callbacks |
51 | |
48 | 52 _hRuler = new HRuler; |
53 attach(_hRuler, | |
0 | 54 1, 2, |
55 0, 1, | |
56 AttachOptions.FILL | AttachOptions.EXPAND, AttachOptions.SHRINK, | |
57 0, 0); | |
48 | 58 _hRuler.setMetric(MetricType.PIXELS); |
0 | 59 |
48 | 60 _vRuler = new VRuler; |
61 attach(_vRuler, | |
0 | 62 0, 1, |
63 1, 2, | |
64 AttachOptions.SHRINK, AttachOptions.FILL | AttachOptions.EXPAND, | |
65 0, 0); | |
48 | 66 _vRuler.setMetric(MetricType.PIXELS); |
0 | 67 |
48 | 68 _drawingArea = new DrawingArea; |
69 _drawingArea.addOnRealize(&onRealize); | |
70 _drawingArea.addOnConfigure(&onConfigure); | |
71 _drawingArea.addOnExpose(&onExpose); | |
81 | 72 _drawingArea.addOnButtonPress(&onButtonPress); |
48 | 73 _drawingArea.addOnButtonRelease(&onButtonRelease); |
81 | 74 _drawingArea.addOnKeyPress(&onKeyPressEvent); |
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
75 _drawingArea.addOnKeyRelease(&onKeyReleaseEvent); |
48 | 76 _drawingArea.addOnMotionNotify(&onMotionNotify); |
77 _drawingArea.addOnScroll(&onScroll); | |
81 | 78 _drawingArea.addOnEnterNotify(&onEnterNotify); |
48 | 79 _drawingArea.addOnLeaveNotify(&onLeaveNotify); |
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
80 |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
81 _drawingArea.addOnFocusIn(&onFocusIn); |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
82 _drawingArea.addOnFocusOut(&onFocusOut); |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
83 _drawingArea.addOnMoveFocus(&onMoveFocus); |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
84 _drawingArea.addOnGrabBroken(&onGrabBroken); |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
85 _drawingArea.addOnGrabFocus(&onGrabFocus); |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
86 _drawingArea.addOnGrabNotify(&onGrabNotify); |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
87 // addOnPopupMenu |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
88 // addOnQueryTooltip |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
89 // addOnSelection* |
48 | 90 _drawingArea.setEvents(EventMask.EXPOSURE_MASK | |
20 | 91 EventMask.POINTER_MOTION_MASK | |
92 EventMask.POINTER_MOTION_HINT_MASK | | |
93 EventMask.BUTTON_MOTION_MASK | | |
94 EventMask.BUTTON_PRESS_MASK | | |
95 EventMask.BUTTON_RELEASE_MASK | | |
96 EventMask.KEY_PRESS_MASK | | |
97 EventMask.KEY_RELEASE_MASK | | |
98 EventMask.ENTER_NOTIFY_MASK | | |
99 EventMask.LEAVE_NOTIFY_MASK | | |
100 EventMask.FOCUS_CHANGE_MASK | | |
101 EventMask.SCROLL_MASK); | |
102 | |
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
103 _drawingArea.setCanFocus(true); |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
104 |
48 | 105 attach(_drawingArea, |
0 | 106 1, 2, |
107 1, 2, | |
108 AttachOptions.FILL | AttachOptions.EXPAND, AttachOptions.FILL | AttachOptions.EXPAND, | |
109 0, 0); | |
110 | |
111 // value, lower, upper, step-inc, page-inc, page-size | |
112 // Give the adjustments dummy values until we receive a configure | |
48 | 113 _hAdjustment = new Adjustment(0.0, 0.0, 1.0, 0.2, 0.5, 0.5); |
67 | 114 _hAdjustment.addOnValueChanged(&onAdjustmentValueChanged); |
48 | 115 _hScrollbar = new HScrollbar(_hAdjustment); |
116 _hScrollbar.setInverted(false); | |
117 attach(_hScrollbar, | |
0 | 118 1, 2, |
119 2, 3, | |
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
120 AttachOptions.FILL | AttachOptions.EXPAND, |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
121 AttachOptions.SHRINK, |
0 | 122 0, 0); |
123 | |
48 | 124 _vAdjustment = new Adjustment(0.0, 0.0, 1.0, 0.2, 0.5, 0.5); |
67 | 125 _vAdjustment.addOnValueChanged(&onAdjustmentValueChanged); |
48 | 126 _vScrollbar = new VScrollbar(_vAdjustment); |
127 _vScrollbar.setInverted(true); | |
128 attach(_vScrollbar, | |
0 | 129 2, 3, |
130 1, 2, | |
131 AttachOptions.SHRINK, | |
132 AttachOptions.FILL | AttachOptions.EXPAND, | |
133 0, 0); | |
79 | 134 |
135 _cursors = [ | |
136 Cursor.DEFAULT : CursorType.ARROW, | |
137 Cursor.HAND : CursorType.HAND1, | |
138 Cursor.CROSSHAIR : CursorType.CROSSHAIR, | |
139 Cursor.PENCIL : CursorType.PENCIL | |
140 ]; | |
0 | 141 } |
142 | |
68 | 143 protected { // XXX the compiler complains about unimplemented methods if this is private |
62 | 144 |
68 | 145 // IViewport overrides: |
0 | 146 |
72
5cc2de64f6d0
Cautious Saturday night commits
"David Bryant <bagnose@gmail.com>"
parents:
71
diff
changeset
|
147 void zoomRelative(in Point screenDatum, in double factor) { |
77 | 148 _screenModel.zoomRelative(factor, screenDatum); |
68 | 149 consolidateBounds; |
150 updateAdjustments; | |
151 updateRulers; | |
77 | 152 _grid.zoomChanged(_screenModel.zoom); |
68 | 153 queueDraw; |
27 | 154 } |
155 | |
72
5cc2de64f6d0
Cautious Saturday night commits
"David Bryant <bagnose@gmail.com>"
parents:
71
diff
changeset
|
156 void panRelative(in Vector screenDisplacement) { |
77 | 157 _screenModel.panRelativeScreen(screenDisplacement); |
68 | 158 consolidateBounds; |
159 updateAdjustments; | |
160 updateRulers; | |
161 queueDraw; | |
162 } | |
163 | |
164 void setCursor(in Cursor cursor) { | |
79 | 165 _drawingArea.setCursor(new gdk.Cursor.Cursor(_cursors[cursor])); |
68 | 166 } |
167 | |
168 void damageModel(in Rectangle area) { | |
77 | 169 _damageScreen = _damageScreen | _screenModel.modelToScreen(area); |
68 | 170 } |
171 | |
77 | 172 void damageScreen(in Rectangle area) { |
73 | 173 _damageScreen = _damageScreen | area; |
68 | 174 } |
18 | 175 } |
176 | |
0 | 177 private { |
178 | |
77 | 179 void initialiseBounds(in Rectangle viewBoundsScreen) { |
79 | 180 Rectangle layerBounds = _layerStack.bounds; |
181 Rectangle paddedLayerBounds = growCentre(layerBounds, 2 * layerBounds.size); | |
77 | 182 _screenModel = new ScreenModel(0.25 * _pixelsPerMillimetre, paddedLayerBounds, viewBoundsScreen); |
183 _grid.zoomChanged(_screenModel.zoom); | |
62 | 184 |
185 updateAdjustments; | |
186 updateRulers; | |
187 } | |
188 | |
189 void consolidateBounds() { | |
79 | 190 Rectangle layerBounds = _layerStack.bounds; |
191 Rectangle paddedLayerBounds = growCentre(layerBounds, 2 * layerBounds.size); | |
77 | 192 _screenModel.consolidateCanvasBounds(paddedLayerBounds); |
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
193 |
62 | 194 updateAdjustments; |
195 updateRulers; | |
196 } | |
35 | 197 |
62 | 198 bool onConfigure(GdkEventConfigure * event, Widget widget) { |
199 assert(widget is _drawingArea); | |
200 | |
77 | 201 Rectangle viewBoundsScreen = Rectangle(Point(0.0, 0.0), Vector(cast(double)event.width, cast(double)event.height)); |
79 | 202 if (_screenModel is null) { initialiseBounds(viewBoundsScreen); } |
203 else { consolidateBounds; } | |
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
204 |
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
0
diff
changeset
|
205 return true; |
0 | 206 } |
207 | |
48 | 208 bool onExpose(GdkEventExpose * event, Widget widget) { |
209 assert(widget is _drawingArea); | |
0 | 210 |
88 | 211 auto dr = _drawingArea.getWindow; |
212 scope modelCr = new Context(dr); // Causing a memory leak! | |
213 scope screenCr = new Context(dr); // Causing a memory leak! | |
12 | 214 |
77 | 215 Rectangle screenDamage = |
216 event is null ? _screenModel.viewBoundsScreen : | |
217 Rectangle(_screenModel.viewBoundsScreen.position + Vector(cast(double)event.area.x, _screenModel.viewBoundsScreen.h - cast(double)(event.area.y + event.area.height)), | |
11 | 218 Vector(cast(double)event.area.width, cast(double)event.area.height)); |
0 | 219 |
77 | 220 Rectangle modelDamage = _screenModel.screenToModel(screenDamage); |
19 | 221 |
77 | 222 modelCr.save; screenCr.save; { |
67 | 223 { |
224 // Setup model context and clip | |
77 | 225 modelCr.translate(0.0, _screenModel.viewBoundsScreen.h); |
226 modelCr.scale(_screenModel.zoom, -_screenModel.zoom); | |
12 | 227 |
77 | 228 immutable Point viewLeftBottom = _screenModel.screenToModel(Point(0.0, 0.0)); |
67 | 229 modelCr.translate(-viewLeftBottom.x, -viewLeftBottom.y); |
0 | 230 |
81 | 231 modelCr.rectangle(modelDamage.x0, modelDamage.y0, modelDamage.w, modelDamage.h); |
67 | 232 modelCr.clip; |
233 } | |
12 | 234 |
67 | 235 { |
77 | 236 // Setup screen context and clip |
237 screenCr.translate(0.0, _screenModel.viewBoundsScreen.h); | |
238 screenCr.scale(1.0, -1.0); | |
19 | 239 |
81 | 240 screenCr.rectangle(screenDamage.x0, screenDamage.y0, screenDamage.w, screenDamage.h); |
77 | 241 screenCr.clip; |
67 | 242 } |
12 | 243 |
77 | 244 screenCr.save; { |
67 | 245 // Fill the background with light grey |
77 | 246 screenCr.setSourceRgba(0.9, 0.9, 0.9, 1.0); |
81 | 247 screenCr.rectangle(screenDamage.x0, screenDamage.y0, screenDamage.w, screenDamage.h); |
77 | 248 screenCr.fill; |
249 } screenCr.restore; | |
12 | 250 |
84 | 251 _layerStack.draw(screenDamage, new CairoRenderer(screenCr), |
252 modelDamage, new CairoRenderer(modelCr)); | |
77 | 253 } screenCr.restore; modelCr.restore; |
0 | 254 |
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
0
diff
changeset
|
255 return true; |
0 | 256 } |
257 | |
48 | 258 bool onButtonPress(GdkEventButton * event, Widget widget) { |
259 assert(widget is _drawingArea); | |
78 | 260 _eventHandler.handleButtonPress(this, makeButtonEvent(event, _screenModel)); |
48 | 261 fixDamage; |
5 | 262 return true; |
263 } | |
264 | |
48 | 265 bool onButtonRelease(GdkEventButton * event, Widget widget) { |
266 assert(widget is _drawingArea); | |
78 | 267 _eventHandler.handleButtonRelease(this, makeButtonEvent(event, _screenModel)); |
48 | 268 fixDamage; |
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
0
diff
changeset
|
269 return true; |
0 | 270 } |
271 | |
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
272 bool onKeyPressEvent(GdkEventKey * event, Widget widget) { |
48 | 273 assert(widget is _drawingArea); |
78 | 274 _eventHandler.handleKeyPress(this, makeKeyEvent(event, _screenModel)); |
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
275 fixDamage; |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
276 return true; |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
277 } |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
278 |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
279 bool onKeyReleaseEvent(GdkEventKey * event, Widget widget) { |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
280 assert(widget is _drawingArea); |
77 | 281 _eventHandler.handleKeyRelease(this, makeKeyEvent(event, _screenModel)); |
48 | 282 fixDamage; |
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
0
diff
changeset
|
283 return true; |
0 | 284 } |
285 | |
48 | 286 bool onMotionNotify(GdkEventMotion * event, Widget widget) { |
287 assert(widget is _drawingArea); | |
73 | 288 |
77 | 289 // Pass the events on to the rulers so that they update |
290 gtk_widget_event(_hRuler.getWidgetStruct(), cast(GdkEvent *)event); | |
291 gtk_widget_event(_vRuler.getWidgetStruct(), cast(GdkEvent *)event); | |
0 | 292 |
77 | 293 _eventHandler.handleMotion(this, makeMotionEvent(event, _screenModel)); |
48 | 294 fixDamage; |
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
0
diff
changeset
|
295 return true; |
0 | 296 } |
297 | |
48 | 298 bool onScroll(GdkEventScroll * event, Widget widget) { |
299 assert(widget is _drawingArea); | |
77 | 300 _eventHandler.handleScroll(this, makeScrollEvent(event, _screenModel)); |
48 | 301 fixDamage; |
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
0
diff
changeset
|
302 return true; |
0 | 303 } |
304 | |
48 | 305 bool onEnterNotify(GdkEventCrossing * event, Widget widget) { |
306 assert(widget is _drawingArea); | |
77 | 307 _eventHandler.handleEnter(this, makeCrossingEvent(event, _screenModel)); |
64
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
308 fixDamage; |
20 | 309 return true; |
310 } | |
311 | |
48 | 312 bool onLeaveNotify(GdkEventCrossing * event, Widget widget) { |
313 assert(widget is _drawingArea); | |
77 | 314 _eventHandler.handleLeave(this, makeCrossingEvent(event, _screenModel)); |
64
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
315 fixDamage; |
20 | 316 return true; |
317 } | |
318 | |
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
319 bool onFocusIn(GdkEventFocus * event, Widget widget) { |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
320 trace("onFocusIn"); |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
321 return true; |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
322 } |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
323 |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
324 bool onFocusOut(GdkEventFocus * event, Widget widget) { |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
325 trace("onFocusOut"); |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
326 return true; |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
327 } |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
328 |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
329 void onMoveFocus(GtkDirectionType direction, Widget widget) { |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
330 trace("onMoveFocus"); |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
331 } |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
332 |
64
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
333 bool onGrabBroken(gdk.Event.Event event, Widget widget) { |
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
334 trace("onGrabBroken"); |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
335 return true; |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
336 } |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
337 |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
338 void onGrabFocus(Widget widget) { |
64
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
339 //trace("onGrabFocus"); |
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
340 } |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
341 |
88 | 342 void onGrabNotify(gboolean what, Widget widget) { |
343 trace("onGrabNotify: %s", what); | |
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
344 } |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
345 |
67 | 346 void onAdjustmentValueChanged(Adjustment adjustment) { |
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
347 GtkAdjustment * hGtkAdjustment = _hAdjustment.getAdjustmentStruct; |
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
348 GtkAdjustment * vGtkAdjustment = _vAdjustment.getAdjustmentStruct; |
0 | 349 |
77 | 350 Point oldViewLeftBottom = _screenModel.screenToModel(Point(0.0, 0.0)); |
71
0f7cf6c6f206
Reimplemented gtk.canvas in terms of tk.pixel_model but
"David Bryant <bagnose@gmail.com>"
parents:
70
diff
changeset
|
351 Point newViewLeftBottom = Point(gtk_adjustment_get_value(hGtkAdjustment), |
0f7cf6c6f206
Reimplemented gtk.canvas in terms of tk.pixel_model but
"David Bryant <bagnose@gmail.com>"
parents:
70
diff
changeset
|
352 gtk_adjustment_get_value(vGtkAdjustment)); |
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
353 |
77 | 354 _screenModel.panRelativeModel(newViewLeftBottom - oldViewLeftBottom); |
0 | 355 |
48 | 356 updateRulers; |
13 | 357 queueDraw; |
0 | 358 } |
359 | |
48 | 360 void updateRulers() { |
79 | 361 immutable Point viewLeftBottom = _screenModel.screenToModel(_screenModel.viewBoundsScreen.corner0); |
77 | 362 immutable Point viewRightTop = _screenModel.screenToModel(_screenModel.viewBoundsScreen.corner1); |
0 | 363 |
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
364 // Define these just to obtain the position |
81 | 365 // below so we can preserve it |
48 | 366 double lower, upper, position, maxSize; |
12 | 367 |
48 | 368 _hRuler.getRange(lower, upper, position, maxSize); |
369 _hRuler.setRange(viewLeftBottom.x, | |
370 viewRightTop.x, | |
12 | 371 position, |
77 | 372 _screenModel.zoom * 50.0); |
12 | 373 |
48 | 374 _vRuler.getRange(lower, upper, position, maxSize); |
375 _vRuler.setRange(viewRightTop.y, | |
376 viewLeftBottom.y, | |
14 | 377 position, |
77 | 378 _screenModel.zoom * 50.0); |
0 | 379 } |
380 | |
48 | 381 void updateAdjustments() { |
77 | 382 immutable Point viewLeftBottom = _screenModel.screenToModel(Point(0.0, 0.0)); |
383 immutable Point viewRightTop = _screenModel.screenToModel(_screenModel.viewBoundsScreen.corner1); | |
0 | 384 |
79 | 385 // Adjust the canvas size if necessary |
77 | 386 _screenModel.canvasAccommodate(Rectangle(viewLeftBottom, viewRightTop)); |
71
0f7cf6c6f206
Reimplemented gtk.canvas in terms of tk.pixel_model but
"David Bryant <bagnose@gmail.com>"
parents:
70
diff
changeset
|
387 |
79 | 388 Rectangle viewBoundsModel = _screenModel.viewBoundsModel; |
0 | 389 |
390 // Update the adjustments | |
88 | 391 _hAdjustment.configure(viewLeftBottom.x, |
392 _screenModel.canvasBoundsModel.x0, | |
393 _screenModel.canvasBoundsModel.x1, | |
394 _screenModel.canvasBoundsModel.w / 16.0, | |
395 _screenModel.canvasBoundsModel.w / 4.0, | |
396 _screenModel.viewBoundsModel.w); | |
397 _vAdjustment.configure(viewLeftBottom.y, | |
398 _screenModel.canvasBoundsModel.y0, | |
399 _screenModel.canvasBoundsModel.y1, | |
400 _screenModel.canvasBoundsModel.h / 16.0, | |
401 _screenModel.canvasBoundsModel.h / 4.0, | |
402 _screenModel.viewBoundsModel.h); | |
0 | 403 } |
404 | |
48 | 405 void fixDamage() { |
73 | 406 if (_damageScreen.valid) { |
17 | 407 int x, y, w, h; |
73 | 408 _damageScreen.getQuantised(x, y, w, h); |
77 | 409 _drawingArea.queueDrawArea(x, cast(int)_screenModel.viewBoundsScreen.h - (y + h), w, h); |
73 | 410 _damageScreen = Rectangle.DEFAULT; |
17 | 411 } |
412 } | |
413 | |
48 | 414 void onRealize(Widget widget) { |
415 assert(widget is _drawingArea); | |
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
416 _drawingArea.grabFocus(); |
27 | 417 } |
418 | |
73 | 419 IEventHandler _eventHandler; |
420 IGrid _grid; | |
421 double _pixelsPerMillimetre; | |
79 | 422 LayerStack _layerStack; |
423 | |
10 | 424 // Child widgets: |
73 | 425 HRuler _hRuler; |
426 VRuler _vRuler; | |
427 DrawingArea _drawingArea; | |
428 Adjustment _hAdjustment; | |
429 HScrollbar _hScrollbar; | |
430 Adjustment _vAdjustment; | |
431 VScrollbar _vScrollbar; | |
11 | 432 |
79 | 433 Rectangle _damageScreen; |
77 | 434 ScreenModel _screenModel; |
81 | 435 |
436 immutable CursorType[Cursor] _cursors; | |
0 | 437 } |
438 } |