annotate doodle/gtk/canvas.d @ 81:d92b9f04b1e8

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