Mercurial > projects > doodle
annotate doodle/gtk/cairo_canvas.d @ 103:345fb56d89fc
Blind checkpoint
| author | David Bryant <bagnose@gmail.com> |
|---|---|
| date | Thu, 18 Nov 2010 12:00:02 +1030 |
| parents | a274d16ab6ce |
| children | 10ad5417bf07 |
| 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 { |
| 103 | 39 static this() { |
| 40 _cursors = [ | |
| 41 Cursor.DEFAULT : CursorType.ARROW, | |
| 42 Cursor.HAND : CursorType.HAND1, | |
| 43 Cursor.CROSSHAIR : CursorType.CROSSHAIR, | |
| 44 Cursor.PENCIL : CursorType.PENCIL | |
| 45 ]; | |
| 46 } | |
| 47 | |
| 69 | 48 this(in Layer[] layers, IEventHandler eventHandler, IGrid grid, in double pixelsPerMillimetre) { |
| 0 | 49 super(3, 3, 0); |
| 50 | |
| 48 | 51 _eventHandler = eventHandler; |
| 52 _grid = grid; | |
| 69 | 53 _pixelsPerMillimetre = pixelsPerMillimetre; |
| 0 | 54 |
| 79 | 55 _layerStack = new LayerStack(layers); |
| 56 | |
| 13 | 57 // Create our child widgets and register callbacks |
| 58 | |
| 48 | 59 _hRuler = new HRuler; |
| 60 attach(_hRuler, | |
| 0 | 61 1, 2, |
| 62 0, 1, | |
| 63 AttachOptions.FILL | AttachOptions.EXPAND, AttachOptions.SHRINK, | |
| 64 0, 0); | |
| 48 | 65 _hRuler.setMetric(MetricType.PIXELS); |
| 0 | 66 |
| 48 | 67 _vRuler = new VRuler; |
| 68 attach(_vRuler, | |
| 0 | 69 0, 1, |
| 70 1, 2, | |
| 71 AttachOptions.SHRINK, AttachOptions.FILL | AttachOptions.EXPAND, | |
| 72 0, 0); | |
| 48 | 73 _vRuler.setMetric(MetricType.PIXELS); |
| 0 | 74 |
| 48 | 75 _drawingArea = new DrawingArea; |
| 76 _drawingArea.addOnRealize(&onRealize); | |
| 77 _drawingArea.addOnConfigure(&onConfigure); | |
| 78 _drawingArea.addOnExpose(&onExpose); | |
| 81 | 79 _drawingArea.addOnButtonPress(&onButtonPress); |
| 48 | 80 _drawingArea.addOnButtonRelease(&onButtonRelease); |
| 81 | 81 _drawingArea.addOnKeyPress(&onKeyPressEvent); |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
82 _drawingArea.addOnKeyRelease(&onKeyReleaseEvent); |
| 48 | 83 _drawingArea.addOnMotionNotify(&onMotionNotify); |
| 84 _drawingArea.addOnScroll(&onScroll); | |
| 81 | 85 _drawingArea.addOnEnterNotify(&onEnterNotify); |
| 48 | 86 _drawingArea.addOnLeaveNotify(&onLeaveNotify); |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
87 |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
88 _drawingArea.addOnFocusIn(&onFocusIn); |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
89 _drawingArea.addOnFocusOut(&onFocusOut); |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
90 _drawingArea.addOnMoveFocus(&onMoveFocus); |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
91 _drawingArea.addOnGrabBroken(&onGrabBroken); |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
92 _drawingArea.addOnGrabFocus(&onGrabFocus); |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
93 _drawingArea.addOnGrabNotify(&onGrabNotify); |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
94 // addOnPopupMenu |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
95 // addOnQueryTooltip |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
96 // addOnSelection* |
| 48 | 97 _drawingArea.setEvents(EventMask.EXPOSURE_MASK | |
| 20 | 98 EventMask.POINTER_MOTION_MASK | |
| 99 EventMask.POINTER_MOTION_HINT_MASK | | |
| 100 EventMask.BUTTON_MOTION_MASK | | |
| 101 EventMask.BUTTON_PRESS_MASK | | |
| 102 EventMask.BUTTON_RELEASE_MASK | | |
| 103 EventMask.KEY_PRESS_MASK | | |
| 104 EventMask.KEY_RELEASE_MASK | | |
| 105 EventMask.ENTER_NOTIFY_MASK | | |
| 106 EventMask.LEAVE_NOTIFY_MASK | | |
| 107 EventMask.FOCUS_CHANGE_MASK | | |
| 108 EventMask.SCROLL_MASK); | |
| 109 | |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
110 _drawingArea.setCanFocus(true); |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
111 |
| 48 | 112 attach(_drawingArea, |
| 0 | 113 1, 2, |
| 114 1, 2, | |
| 115 AttachOptions.FILL | AttachOptions.EXPAND, AttachOptions.FILL | AttachOptions.EXPAND, | |
| 116 0, 0); | |
| 117 | |
| 118 // value, lower, upper, step-inc, page-inc, page-size | |
| 119 // Give the adjustments dummy values until we receive a configure | |
| 48 | 120 _hAdjustment = new Adjustment(0.0, 0.0, 1.0, 0.2, 0.5, 0.5); |
| 67 | 121 _hAdjustment.addOnValueChanged(&onAdjustmentValueChanged); |
| 48 | 122 _hScrollbar = new HScrollbar(_hAdjustment); |
| 123 _hScrollbar.setInverted(false); | |
| 124 attach(_hScrollbar, | |
| 0 | 125 1, 2, |
| 126 2, 3, | |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
127 AttachOptions.FILL | AttachOptions.EXPAND, |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
128 AttachOptions.SHRINK, |
| 0 | 129 0, 0); |
| 130 | |
| 48 | 131 _vAdjustment = new Adjustment(0.0, 0.0, 1.0, 0.2, 0.5, 0.5); |
| 67 | 132 _vAdjustment.addOnValueChanged(&onAdjustmentValueChanged); |
| 48 | 133 _vScrollbar = new VScrollbar(_vAdjustment); |
| 134 _vScrollbar.setInverted(true); | |
| 135 attach(_vScrollbar, | |
| 0 | 136 2, 3, |
| 137 1, 2, | |
| 138 AttachOptions.SHRINK, | |
| 139 AttachOptions.FILL | AttachOptions.EXPAND, | |
| 140 0, 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 |
| 92 | 147 void zoomRelative(in double factor, in Point screenDatum) { |
| 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 | |
| 62 | 179 void consolidateBounds() { |
| 79 | 180 Rectangle layerBounds = _layerStack.bounds; |
| 181 Rectangle paddedLayerBounds = growCentre(layerBounds, 2 * layerBounds.size); | |
| 77 | 182 _screenModel.consolidateCanvasBounds(paddedLayerBounds); |
|
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
183 |
| 62 | 184 updateAdjustments; |
| 185 updateRulers; | |
| 186 } | |
| 35 | 187 |
| 62 | 188 bool onConfigure(GdkEventConfigure * event, Widget widget) { |
| 189 assert(widget is _drawingArea); | |
| 190 | |
| 91 | 191 auto viewBoundsScreen = Rectangle(Point(0.0, 0.0), Vector(cast(double)event.width, cast(double)event.height)); |
| 192 | |
| 193 if (_screenModel is null) { | |
| 194 Rectangle layerBounds = _layerStack.bounds; | |
| 195 Rectangle paddedLayerBounds = growCentre(layerBounds, 2 * layerBounds.size); | |
| 196 _screenModel = new ScreenModel(0.25 * _pixelsPerMillimetre, paddedLayerBounds, viewBoundsScreen); | |
| 197 _grid.zoomChanged(_screenModel.zoom); | |
| 198 | |
| 199 updateAdjustments; | |
| 200 updateRulers; | |
| 201 } | |
| 202 else { | |
| 203 _screenModel.setViewBoundsScreen(viewBoundsScreen); | |
| 204 consolidateBounds; | |
| 205 } | |
|
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
206 |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
0
diff
changeset
|
207 return true; |
| 0 | 208 } |
| 209 | |
| 48 | 210 bool onExpose(GdkEventExpose * event, Widget widget) { |
| 211 assert(widget is _drawingArea); | |
| 0 | 212 |
| 88 | 213 auto dr = _drawingArea.getWindow; |
| 214 scope modelCr = new Context(dr); // Causing a memory leak! | |
| 215 scope screenCr = new Context(dr); // Causing a memory leak! | |
| 12 | 216 |
| 77 | 217 Rectangle screenDamage = |
| 218 event is null ? _screenModel.viewBoundsScreen : | |
| 219 Rectangle(_screenModel.viewBoundsScreen.position + Vector(cast(double)event.area.x, _screenModel.viewBoundsScreen.h - cast(double)(event.area.y + event.area.height)), | |
| 11 | 220 Vector(cast(double)event.area.width, cast(double)event.area.height)); |
| 0 | 221 |
| 77 | 222 Rectangle modelDamage = _screenModel.screenToModel(screenDamage); |
| 19 | 223 |
| 77 | 224 modelCr.save; screenCr.save; { |
| 67 | 225 { |
| 226 // Setup model context and clip | |
| 77 | 227 modelCr.translate(0.0, _screenModel.viewBoundsScreen.h); |
| 228 modelCr.scale(_screenModel.zoom, -_screenModel.zoom); | |
| 12 | 229 |
| 77 | 230 immutable Point viewLeftBottom = _screenModel.screenToModel(Point(0.0, 0.0)); |
| 67 | 231 modelCr.translate(-viewLeftBottom.x, -viewLeftBottom.y); |
| 0 | 232 |
| 81 | 233 modelCr.rectangle(modelDamage.x0, modelDamage.y0, modelDamage.w, modelDamage.h); |
| 67 | 234 modelCr.clip; |
| 235 } | |
| 12 | 236 |
| 67 | 237 { |
| 77 | 238 // Setup screen context and clip |
| 239 screenCr.translate(0.0, _screenModel.viewBoundsScreen.h); | |
| 240 screenCr.scale(1.0, -1.0); | |
| 19 | 241 |
| 81 | 242 screenCr.rectangle(screenDamage.x0, screenDamage.y0, screenDamage.w, screenDamage.h); |
| 77 | 243 screenCr.clip; |
| 67 | 244 } |
| 12 | 245 |
| 77 | 246 screenCr.save; { |
| 67 | 247 // Fill the background with light grey |
| 77 | 248 screenCr.setSourceRgba(0.9, 0.9, 0.9, 1.0); |
| 81 | 249 screenCr.rectangle(screenDamage.x0, screenDamage.y0, screenDamage.w, screenDamage.h); |
| 77 | 250 screenCr.fill; |
| 251 } screenCr.restore; | |
| 12 | 252 |
| 84 | 253 _layerStack.draw(screenDamage, new CairoRenderer(screenCr), |
| 89 | 254 modelDamage, new CairoRenderer(modelCr), |
| 255 _screenModel); | |
| 77 | 256 } screenCr.restore; modelCr.restore; |
| 0 | 257 |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
0
diff
changeset
|
258 return true; |
| 0 | 259 } |
| 260 | |
| 48 | 261 bool onButtonPress(GdkEventButton * event, Widget widget) { |
| 262 assert(widget is _drawingArea); | |
| 78 | 263 _eventHandler.handleButtonPress(this, makeButtonEvent(event, _screenModel)); |
| 48 | 264 fixDamage; |
| 5 | 265 return true; |
| 266 } | |
| 267 | |
| 48 | 268 bool onButtonRelease(GdkEventButton * event, Widget widget) { |
| 269 assert(widget is _drawingArea); | |
| 78 | 270 _eventHandler.handleButtonRelease(this, makeButtonEvent(event, _screenModel)); |
| 48 | 271 fixDamage; |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
0
diff
changeset
|
272 return true; |
| 0 | 273 } |
| 274 | |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
275 bool onKeyPressEvent(GdkEventKey * event, Widget widget) { |
| 48 | 276 assert(widget is _drawingArea); |
| 78 | 277 _eventHandler.handleKeyPress(this, makeKeyEvent(event, _screenModel)); |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
278 fixDamage; |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
279 return true; |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
280 } |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
281 |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
282 bool onKeyReleaseEvent(GdkEventKey * event, Widget widget) { |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
283 assert(widget is _drawingArea); |
| 77 | 284 _eventHandler.handleKeyRelease(this, makeKeyEvent(event, _screenModel)); |
| 48 | 285 fixDamage; |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
0
diff
changeset
|
286 return true; |
| 0 | 287 } |
| 288 | |
| 48 | 289 bool onMotionNotify(GdkEventMotion * event, Widget widget) { |
| 290 assert(widget is _drawingArea); | |
| 73 | 291 |
| 77 | 292 // Pass the events on to the rulers so that they update |
| 293 gtk_widget_event(_hRuler.getWidgetStruct(), cast(GdkEvent *)event); | |
| 294 gtk_widget_event(_vRuler.getWidgetStruct(), cast(GdkEvent *)event); | |
| 0 | 295 |
| 77 | 296 _eventHandler.handleMotion(this, makeMotionEvent(event, _screenModel)); |
| 48 | 297 fixDamage; |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
0
diff
changeset
|
298 return true; |
| 0 | 299 } |
| 300 | |
| 48 | 301 bool onScroll(GdkEventScroll * event, Widget widget) { |
| 302 assert(widget is _drawingArea); | |
| 77 | 303 _eventHandler.handleScroll(this, makeScrollEvent(event, _screenModel)); |
| 48 | 304 fixDamage; |
|
2
d6f44347373d
* Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents:
0
diff
changeset
|
305 return true; |
| 0 | 306 } |
| 307 | |
| 48 | 308 bool onEnterNotify(GdkEventCrossing * event, Widget widget) { |
| 309 assert(widget is _drawingArea); | |
| 77 | 310 _eventHandler.handleEnter(this, makeCrossingEvent(event, _screenModel)); |
|
64
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
311 fixDamage; |
| 20 | 312 return true; |
| 313 } | |
| 314 | |
| 48 | 315 bool onLeaveNotify(GdkEventCrossing * event, Widget widget) { |
| 316 assert(widget is _drawingArea); | |
| 77 | 317 _eventHandler.handleLeave(this, makeCrossingEvent(event, _screenModel)); |
|
64
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
318 fixDamage; |
| 20 | 319 return true; |
| 320 } | |
| 321 | |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
322 bool onFocusIn(GdkEventFocus * event, Widget widget) { |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
323 trace("onFocusIn"); |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
324 return true; |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
325 } |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
326 |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
327 bool onFocusOut(GdkEventFocus * event, Widget widget) { |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
328 trace("onFocusOut"); |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
329 return true; |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
330 } |
|
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 void onMoveFocus(GtkDirectionType direction, Widget widget) { |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
333 trace("onMoveFocus"); |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
334 } |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
335 |
|
64
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
336 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
|
337 trace("onGrabBroken"); |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
338 return true; |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
339 } |
|
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 void onGrabFocus(Widget widget) { |
|
64
eb5436b47d13
Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents:
63
diff
changeset
|
342 //trace("onGrabFocus"); |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
343 } |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
344 |
| 88 | 345 void onGrabNotify(gboolean what, Widget widget) { |
| 346 trace("onGrabNotify: %s", what); | |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
347 } |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
348 |
| 67 | 349 void onAdjustmentValueChanged(Adjustment adjustment) { |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
350 GtkAdjustment * hGtkAdjustment = _hAdjustment.getAdjustmentStruct; |
|
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
351 GtkAdjustment * vGtkAdjustment = _vAdjustment.getAdjustmentStruct; |
| 0 | 352 |
| 77 | 353 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
|
354 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
|
355 gtk_adjustment_get_value(vGtkAdjustment)); |
|
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
356 |
| 77 | 357 _screenModel.panRelativeModel(newViewLeftBottom - oldViewLeftBottom); |
| 0 | 358 |
| 48 | 359 updateRulers; |
| 13 | 360 queueDraw; |
| 0 | 361 } |
| 362 | |
| 48 | 363 void updateRulers() { |
| 79 | 364 immutable Point viewLeftBottom = _screenModel.screenToModel(_screenModel.viewBoundsScreen.corner0); |
| 77 | 365 immutable Point viewRightTop = _screenModel.screenToModel(_screenModel.viewBoundsScreen.corner1); |
| 0 | 366 |
|
16
9e63308b749c
* Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents:
15
diff
changeset
|
367 // Define these just to obtain the position |
| 81 | 368 // below so we can preserve it |
| 48 | 369 double lower, upper, position, maxSize; |
| 12 | 370 |
| 48 | 371 _hRuler.getRange(lower, upper, position, maxSize); |
| 372 _hRuler.setRange(viewLeftBottom.x, | |
| 373 viewRightTop.x, | |
| 12 | 374 position, |
| 77 | 375 _screenModel.zoom * 50.0); |
| 12 | 376 |
| 48 | 377 _vRuler.getRange(lower, upper, position, maxSize); |
| 378 _vRuler.setRange(viewRightTop.y, | |
| 379 viewLeftBottom.y, | |
| 14 | 380 position, |
| 77 | 381 _screenModel.zoom * 50.0); |
| 0 | 382 } |
| 383 | |
| 48 | 384 void updateAdjustments() { |
| 77 | 385 immutable Point viewLeftBottom = _screenModel.screenToModel(Point(0.0, 0.0)); |
| 386 immutable Point viewRightTop = _screenModel.screenToModel(_screenModel.viewBoundsScreen.corner1); | |
| 0 | 387 |
| 79 | 388 // Adjust the canvas size if necessary |
| 77 | 389 _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
|
390 |
| 79 | 391 Rectangle viewBoundsModel = _screenModel.viewBoundsModel; |
| 0 | 392 |
| 393 // Update the adjustments | |
| 88 | 394 _hAdjustment.configure(viewLeftBottom.x, |
| 395 _screenModel.canvasBoundsModel.x0, | |
| 396 _screenModel.canvasBoundsModel.x1, | |
| 397 _screenModel.canvasBoundsModel.w / 16.0, | |
| 398 _screenModel.canvasBoundsModel.w / 4.0, | |
| 399 _screenModel.viewBoundsModel.w); | |
| 400 _vAdjustment.configure(viewLeftBottom.y, | |
| 401 _screenModel.canvasBoundsModel.y0, | |
| 402 _screenModel.canvasBoundsModel.y1, | |
| 403 _screenModel.canvasBoundsModel.h / 16.0, | |
| 404 _screenModel.canvasBoundsModel.h / 4.0, | |
| 405 _screenModel.viewBoundsModel.h); | |
| 0 | 406 } |
| 407 | |
| 48 | 408 void fixDamage() { |
| 73 | 409 if (_damageScreen.valid) { |
| 17 | 410 int x, y, w, h; |
| 73 | 411 _damageScreen.getQuantised(x, y, w, h); |
| 77 | 412 _drawingArea.queueDrawArea(x, cast(int)_screenModel.viewBoundsScreen.h - (y + h), w, h); |
| 100 | 413 _damageScreen = Rectangle(); |
| 17 | 414 } |
| 415 } | |
| 416 | |
| 48 | 417 void onRealize(Widget widget) { |
| 418 assert(widget is _drawingArea); | |
|
63
20d6327c4a75
Event progress. Got key press/release working and panning via keyboard.
daveb
parents:
62
diff
changeset
|
419 _drawingArea.grabFocus(); |
| 27 | 420 } |
| 421 | |
| 73 | 422 IEventHandler _eventHandler; |
| 423 IGrid _grid; | |
| 424 double _pixelsPerMillimetre; | |
| 79 | 425 LayerStack _layerStack; |
| 426 | |
| 10 | 427 // Child widgets: |
| 73 | 428 HRuler _hRuler; |
| 429 VRuler _vRuler; | |
| 430 DrawingArea _drawingArea; | |
| 431 Adjustment _hAdjustment; | |
| 432 HScrollbar _hScrollbar; | |
| 433 Adjustment _vAdjustment; | |
| 434 VScrollbar _vScrollbar; | |
| 11 | 435 |
| 79 | 436 Rectangle _damageScreen; |
| 77 | 437 ScreenModel _screenModel; |
| 81 | 438 |
| 103 | 439 static immutable CursorType[Cursor] _cursors; |
| 0 | 440 } |
| 441 } |