Mercurial > projects > doodle

annotate doodle/gtk/canvas.d @ 70:0e61702c6ea6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Checkpoint
author "David Bryant <bagnose@gmail.com>"
date Sat, 14 Aug 2010 20:05:55 +0930
parents d540f7e4af9e
children 0f7cf6c6f206
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;
1754cb773d41 Part-way through getting to compile with configure/builder.
Graham St Jack <graham.stjack@internode.on.net>
parents: 27
diff changeset
5 import doodle.tk.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 {
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
9 import doodle.core.misc;
40
1f97022e5c6d Checkpoint. Development continues...
daveb
parents: 35
diff changeset
10 import doodle.core.logging;
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
11 import doodle.cairo.routines;
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;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
13
16
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
14 import cairo.Surface;
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
15
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
16 import gtk.Widget;
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
17 import gtk.Toolbar;
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
18 import gtk.Table;
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
19 import gtk.HRuler;
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
20 import gtk.VRuler;
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
21 import gtk.Range;
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
22 import gtk.HScrollbar;
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
23 import gtk.VScrollbar;
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
24 import gtk.DrawingArea;
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
25 import gtk.Adjustment;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
26
16
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
27 import gdk.Drawable;
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 gtkc.gtk;
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
30 import gtkc.gtktypes;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
31 //import gtkc.gdktypes;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
32
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
33 import std.math;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
34 import std.stdio;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
35
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
36 import core.stdc.string : strlen;
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
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
39 // x and y run right and up respectively
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
40
68
daveb
parents: 67
diff changeset
41 final class Canvas : Table, private IViewport {
69
d540f7e4af9e Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 68
diff changeset
42 this(in Layer[] layers, IEventHandler eventHandler, IGrid grid, in double pixelsPerMillimetre) {
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
43 super(3, 3, 0);
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
44
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
45 _damage = Rectangle.DEFAULT;
17
c643c04e3f5e Checkpoint
David Bryant <daveb@acres.com.au>
parents: 16
diff changeset
46
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
47 _layers = layers.dup;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
48 _eventHandler = eventHandler;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
49 _grid = grid;
69
d540f7e4af9e Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 68
diff changeset
50 _pixelsPerMillimetre = pixelsPerMillimetre;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
51
13
f0ade1b49fe7 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 12
diff changeset
52 // Create our child widgets and register callbacks
f0ade1b49fe7 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 12
diff changeset
53
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
54 _hRuler = new HRuler;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
55 attach(_hRuler,
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
56 1, 2,
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
57 0, 1,
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
58 AttachOptions.FILL | AttachOptions.EXPAND, AttachOptions.SHRINK,
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
59 0, 0);
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
60 _hRuler.setMetric(MetricType.PIXELS);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
61
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
62 _vRuler = new VRuler;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
63 attach(_vRuler,
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
64 0, 1,
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
65 1, 2,
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
66 AttachOptions.SHRINK, AttachOptions.FILL | AttachOptions.EXPAND,
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
67 0, 0);
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
68 _vRuler.setMetric(MetricType.PIXELS);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
69
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
70 _drawingArea = new DrawingArea;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
71 _drawingArea.addOnRealize(&onRealize);
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
72 _drawingArea.addOnConfigure(&onConfigure);
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
73 _drawingArea.addOnExpose(&onExpose);
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
74 _drawingArea.addOnButtonPress(&onButtonPress); // FIXME merge delegate with next
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
75 _drawingArea.addOnButtonRelease(&onButtonRelease);
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
76 _drawingArea.addOnKeyPress(&onKeyPressEvent); // FIXME merge delegate with next
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
77 _drawingArea.addOnKeyRelease(&onKeyReleaseEvent);
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
78 _drawingArea.addOnMotionNotify(&onMotionNotify);
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
79 _drawingArea.addOnScroll(&onScroll);
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
80 _drawingArea.addOnEnterNotify(&onEnterNotify); // FIXME merge delegate with next
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
81 _drawingArea.addOnLeaveNotify(&onLeaveNotify);
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
82
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
83 _drawingArea.addOnFocusIn(&onFocusIn);
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
84 _drawingArea.addOnFocusOut(&onFocusOut);
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
85 _drawingArea.addOnMoveFocus(&onMoveFocus);
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
86 _drawingArea.addOnGrabBroken(&onGrabBroken);
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
87 _drawingArea.addOnGrabFocus(&onGrabFocus);
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
88 _drawingArea.addOnGrabNotify(&onGrabNotify);
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
89 // addOnPopupMenu
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
90 // addOnQueryTooltip
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
91 // addOnSelection*
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
92 _drawingArea.setEvents(EventMask.EXPOSURE_MASK |
20
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
93 EventMask.POINTER_MOTION_MASK |
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
94 EventMask.POINTER_MOTION_HINT_MASK |
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
95 EventMask.BUTTON_MOTION_MASK |
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
96 EventMask.BUTTON_PRESS_MASK |
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
97 EventMask.BUTTON_RELEASE_MASK |
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
98 EventMask.KEY_PRESS_MASK |
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
99 EventMask.KEY_RELEASE_MASK |
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
100 EventMask.ENTER_NOTIFY_MASK |
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
101 EventMask.LEAVE_NOTIFY_MASK |
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
102 EventMask.FOCUS_CHANGE_MASK |
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
103 EventMask.SCROLL_MASK);
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
104
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
105 _drawingArea.setCanFocus(true);
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
106
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
107 attach(_drawingArea,
0
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 1, 2,
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
110 AttachOptions.FILL | AttachOptions.EXPAND, AttachOptions.FILL | AttachOptions.EXPAND,
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
111 0, 0);
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
112
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
113 // value, lower, upper, step-inc, page-inc, page-size
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
114 // Give the adjustments dummy values until we receive a configure
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
115 _hAdjustment = new Adjustment(0.0, 0.0, 1.0, 0.2, 0.5, 0.5);
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
116 _hAdjustment.addOnValueChanged(&onAdjustmentValueChanged);
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
117 _hScrollbar = new HScrollbar(_hAdjustment);
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
118 _hScrollbar.setInverted(false);
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
119 attach(_hScrollbar,
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
120 1, 2,
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
121 2, 3,
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
122 AttachOptions.FILL | AttachOptions.EXPAND,
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
123 AttachOptions.SHRINK,
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
124 0, 0);
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
125
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
126 _vAdjustment = new Adjustment(0.0, 0.0, 1.0, 0.2, 0.5, 0.5);
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
127 _vAdjustment.addOnValueChanged(&onAdjustmentValueChanged);
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
128 _vScrollbar = new VScrollbar(_vAdjustment);
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
129 _vScrollbar.setInverted(true);
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
130 attach(_vScrollbar,
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
131 2, 3,
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
132 1, 2,
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
133 AttachOptions.SHRINK,
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
134 AttachOptions.FILL | AttachOptions.EXPAND,
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
135 0, 0);
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
136 }
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
137
68
daveb
parents: 67
diff changeset
138 protected { // XXX the compiler complains about unimplemented methods if this is private
62
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
139
68
daveb
parents: 67
diff changeset
140 // IViewport overrides:
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
141
68
daveb
parents: 67
diff changeset
142 void zoomRelative(in Point pixelDatum, in double factor) {
daveb
parents: 67
diff changeset
143 // Work out pixel distance from current centre to datum,
daveb
parents: 67
diff changeset
144 // Do the zoom, then work out the new centre that keeps the
daveb
parents: 67
diff changeset
145 // pixel distance the same
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
146
68
daveb
parents: 67
diff changeset
147 Point oldModelDatum = pixelToModel(pixelDatum);
daveb
parents: 67
diff changeset
148 Vector pixelDistance = modelToPixel(oldModelDatum - _viewCentre);
daveb
parents: 67
diff changeset
149 _zoom = clampZoom(factor * _zoom);
daveb
parents: 67
diff changeset
150 _viewCentre = oldModelDatum - pixelToModel(pixelDistance);
27
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
151
68
daveb
parents: 67
diff changeset
152 consolidateBounds;
daveb
parents: 67
diff changeset
153
daveb
parents: 67
diff changeset
154 updateAdjustments;
daveb
parents: 67
diff changeset
155 updateRulers;
daveb
parents: 67
diff changeset
156 _grid.zoomChanged(_zoom);
daveb
parents: 67
diff changeset
157 queueDraw;
27
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
158 }
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
159
68
daveb
parents: 67
diff changeset
160 void panRelative(in Vector pixelDisplacement) {
daveb
parents: 67
diff changeset
161 _viewCentre = _viewCentre + pixelToModel(pixelDisplacement);
daveb
parents: 67
diff changeset
162
daveb
parents: 67
diff changeset
163 consolidateBounds;
daveb
parents: 67
diff changeset
164
daveb
parents: 67
diff changeset
165 updateAdjustments;
daveb
parents: 67
diff changeset
166 updateRulers;
daveb
parents: 67
diff changeset
167 queueDraw;
daveb
parents: 67
diff changeset
168 }
daveb
parents: 67
diff changeset
169
daveb
parents: 67
diff changeset
170 void setCursor(in Cursor cursor) {
daveb
parents: 67
diff changeset
171 CursorType cursorType;
27
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
172
68
daveb
parents: 67
diff changeset
173 switch (cursor) {
daveb
parents: 67
diff changeset
174 case Cursor.DEFAULT:
daveb
parents: 67
diff changeset
175 cursorType = CursorType.ARROW;
daveb
parents: 67
diff changeset
176 break;
daveb
parents: 67
diff changeset
177 case Cursor.HAND:
daveb
parents: 67
diff changeset
178 cursorType = CursorType.HAND1;
daveb
parents: 67
diff changeset
179 break;
daveb
parents: 67
diff changeset
180 case Cursor.CROSSHAIR:
daveb
parents: 67
diff changeset
181 cursorType = CursorType.CROSSHAIR;
daveb
parents: 67
diff changeset
182 break;
daveb
parents: 67
diff changeset
183 case Cursor.PENCIL:
daveb
parents: 67
diff changeset
184 cursorType = CursorType.PENCIL;
daveb
parents: 67
diff changeset
185 break;
daveb
parents: 67
diff changeset
186 default:
daveb
parents: 67
diff changeset
187 assert(0);
daveb
parents: 67
diff changeset
188 }
17
c643c04e3f5e Checkpoint
David Bryant <daveb@acres.com.au>
parents: 16
diff changeset
189
68
daveb
parents: 67
diff changeset
190 _drawingArea.setCursor(new gdk.Cursor.Cursor(cursorType));
daveb
parents: 67
diff changeset
191 }
daveb
parents: 67
diff changeset
192
daveb
parents: 67
diff changeset
193 void damageModel(in Rectangle area) {
daveb
parents: 67
diff changeset
194 _damage = _damage | modelToPixel(area);
daveb
parents: 67
diff changeset
195 }
daveb
parents: 67
diff changeset
196
daveb
parents: 67
diff changeset
197 void damagePixel(in Rectangle area) {
daveb
parents: 67
diff changeset
198 _damage = _damage | area;
daveb
parents: 67
diff changeset
199 }
18
df8d81d9f499 Lasso fiddling
David Bryant <daveb@acres.com.au>
parents: 17
diff changeset
200 }
df8d81d9f499 Lasso fiddling
David Bryant <daveb@acres.com.au>
parents: 17
diff changeset
201
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
202 private {
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
203
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
204 Rectangle layerBounds() {
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
205 Rectangle bounds = Rectangle.DEFAULT;
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
206 foreach (layer; _layers) { bounds = bounds | layer.bounds; }
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
207 assert(bounds.valid);
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
208 return bounds;
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
209 }
41
daveb
parents: 40
diff changeset
210
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
211 void initialiseBounds() {
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
212 Rectangle lb = layerBounds;
41
daveb
parents: 40
diff changeset
213
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
214 // FIXME use a function that grows a rectangle about its centre
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
215 // and change 2.0 to a class-level constant
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
216 Rectangle paddedLayerBounds = expand(move(lb, - lb.size), 2.0 * lb.size);
41
daveb
parents: 40
diff changeset
217
62
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
218 //
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
219
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
220 // FIXME 0.25
69
d540f7e4af9e Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 68
diff changeset
221 _zoom = 0.25 * _pixelsPerMillimetre; // ie 0.25 pixels represents a millimetre
62
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
222
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
223 _canvasBounds = paddedLayerBounds;
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
224 _viewCentre = _canvasBounds.centre;
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
225
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
226 _grid.zoomChanged(_zoom);
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
227
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
228 updateAdjustments;
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
229 updateRulers;
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
230 }
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
231
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
232 void consolidateBounds() {
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
233 Rectangle lb = layerBounds;
16
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
234
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
235 // FIXME likewise as above
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
236 Rectangle paddedLayerBounds = expand(move(lb, - lb.size), 2.0 * lb.size);
62
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
237
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
238 Rectangle r = pixelToModel(_viewBounds);
62
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
239 _canvasBounds = r | paddedLayerBounds;
16
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
240
62
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
241 updateAdjustments;
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
242 updateRulers;
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
243 }
35
3f6bb0bb22dc Beginnings of grid
David Bryant <bagnose@gmail.com>
parents: 34
diff changeset
244
62
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
245 bool onConfigure(GdkEventConfigure * event, Widget widget) {
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
246 assert(widget is _drawingArea);
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
247
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
248 _viewBounds = Rectangle(Point(0.0, 0.0), Vector(cast(double)event.width, cast(double)event.height));
62
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
249
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
250 if (!_boundsValid) {
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
251 initialiseBounds;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
252 _boundsValid = true;
16
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
253 }
41
daveb
parents: 40
diff changeset
254 else {
62
6c3993f4c3eb Checkpoint
daveb
parents: 58
diff changeset
255 consolidateBounds;
41
daveb
parents: 40
diff changeset
256 }
16
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
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
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
259 }
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
260
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
261 bool onExpose(GdkEventExpose * event, Widget widget) {
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
262 assert(widget is _drawingArea);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
263
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
264 Drawable dr = _drawingArea.getWindow;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
265
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
266 int width, height;
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
267 dr.getSize(width, height);
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
268 //trace("Got expose %dx%d\n", width, height);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
269
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
270 scope modelCr = new Context(dr);
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
271 scope pixelCr = new Context(dr);
12
a093c4fbdd43 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 11
diff changeset
272
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
273 Rectangle pixelDamage =
11
fb571a3b1f0d Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 10
diff changeset
274 event is null ?
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
275 _viewBounds : // XXX can we do something nice with the next line?
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
276 Rectangle(_viewBounds.position + Vector(cast(double)event.area.x, _viewBounds.h - cast(double)(event.area.y + event.area.height)),
11
fb571a3b1f0d Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 10
diff changeset
277 Vector(cast(double)event.area.width, cast(double)event.area.height));
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
278
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
279 Rectangle modelDamage = pixelToModel(pixelDamage);
19
22abbf4cde96 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 18
diff changeset
280
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
281 //trace("Pixel damage: %s, model damage: %s", pixelDamage, modelDamage);
19
22abbf4cde96 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 18
diff changeset
282
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
283 modelCr.save; pixelCr.save; {
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
284 {
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
285 // Setup model context and clip
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
286 modelCr.translate(0.0, _viewBounds.h);
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
287 modelCr.scale(_zoom, -_zoom);
12
a093c4fbdd43 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 11
diff changeset
288
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
289 // XXX revisit
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
290 immutable Vector modelSize = pixelToModel(_viewBounds.size);
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
291 immutable Point viewLeftBottom = _viewCentre - modelSize / 2.0;
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
292 modelCr.translate(-viewLeftBottom.x, -viewLeftBottom.y);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
293
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
294 rectangle(modelCr, modelDamage);
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
295 modelCr.clip;
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
296 }
12
a093c4fbdd43 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 11
diff changeset
297
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
298 {
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
299 // Setup pixel context and clip
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
300 pixelCr.translate(0.0, _viewBounds.h);
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
301 pixelCr.scale(1.0, -1.0);
19
22abbf4cde96 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 18
diff changeset
302
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
303 rectangle(pixelCr, pixelDamage);
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
304 pixelCr.clip;
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
305 }
12
a093c4fbdd43 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 11
diff changeset
306
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
307 pixelCr.save; {
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
308 // Fill the background with light grey
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
309 pixelCr.setSourceRgba(0.9, 0.9, 0.9, 1.0);
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
310 rectangle(pixelCr, pixelDamage);
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
311 pixelCr.fill;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
312 } pixelCr.restore;
12
a093c4fbdd43 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 11
diff changeset
313
a093c4fbdd43 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 11
diff changeset
314 // Draw each layer
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
315 foreach(layer; _layers) {
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
316 layer.draw(this, pixelDamage, pixelCr, modelDamage, modelCr);
11
fb571a3b1f0d Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 10
diff changeset
317 }
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
318 } pixelCr.restore; modelCr.restore;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
319
2
d6f44347373d * Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents: 0
diff changeset
320 return true;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
321 }
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
322
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
323 bool onButtonPress(GdkEventButton * event, Widget widget) {
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
324 assert(widget is _drawingArea);
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
325 //trace("Got button event\n");
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
326
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
327 Point pixelPoint = Point(event.x + 0.5, _viewBounds.h - (event.y + 0.5));
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
328 Point modelPoint = pixelToModel(pixelPoint);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
329
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
330 auto buttonEvent = new ButtonEvent(gtk2tkButtonAction(event.type),
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
331 gtk2tkButtonName(event.button),
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
332 pixelPoint,
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
333 modelPoint,
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
334 gtk2tkMask(event.state));
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
335
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
336 _eventHandler.handleButtonPress(this, buttonEvent);
5
8a39b13cd3e6 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 3
diff changeset
337
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
338 fixDamage;
17
c643c04e3f5e Checkpoint
David Bryant <daveb@acres.com.au>
parents: 16
diff changeset
339
5
8a39b13cd3e6 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 3
diff changeset
340 return true;
8a39b13cd3e6 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 3
diff changeset
341 }
8a39b13cd3e6 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 3
diff changeset
342
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
343 bool onButtonRelease(GdkEventButton * event, Widget widget) {
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
344 assert(widget is _drawingArea);
5
8a39b13cd3e6 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 3
diff changeset
345
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
346 Point pixelPoint = Point(event.x + 0.5, _viewBounds.h - (event.y + 0.5));
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
347 Point modelPoint = pixelToModel(pixelPoint);
5
8a39b13cd3e6 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 3
diff changeset
348
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
349 auto buttonEvent = new ButtonEvent(gtk2tkButtonAction(event.type),
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
350 gtk2tkButtonName(event.button),
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
351 pixelPoint,
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
352 modelPoint,
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
353 gtk2tkMask(event.state));
5
8a39b13cd3e6 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 3
diff changeset
354
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
355 _eventHandler.handleButtonRelease(this, buttonEvent);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
356
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
357 fixDamage;
17
c643c04e3f5e Checkpoint
David Bryant <daveb@acres.com.au>
parents: 16
diff changeset
358
2
d6f44347373d * Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents: 0
diff changeset
359 return true;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
360 }
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
361
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
362 /*
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
363 public struct GdkEventKey {
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
364 GdkEventType type;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
365 GdkWindow *window;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
366 byte sendEvent;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
367 uint time;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
368 uint state;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
369 uint keyval;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
370 int length;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
371 char *string;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
372 ushort hardwareKeycode;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
373 ubyte group;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
374 uint bitfield0;
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
375 uint isModifier : 1;
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
376 }
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
377 */
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
378 bool onKeyPressEvent(GdkEventKey * event, Widget widget) {
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
379 assert(widget is _drawingArea);
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
380
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
381 auto keyEvent = new KeyEvent(event.string[0..strlen(event.string)].idup,
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
382 event.keyval,
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
383 gtk2tkMask(event.state));
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
384 message("Got key press %s", keyEvent);
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
385 _eventHandler.handleKeyPress(this, keyEvent);
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
386
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
387 fixDamage;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
388
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
389 return true;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
390 }
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
391
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
392 bool onKeyReleaseEvent(GdkEventKey * event, Widget widget) {
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
393 assert(widget is _drawingArea);
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
394
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
395 auto keyEvent = new KeyEvent(event.string[0..strlen(event.string)].idup,
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
396 event.keyval,
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
397 gtk2tkMask(event.state));
64
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
398 //message("Got key release %s", keyEvent);
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
399 _eventHandler.handleKeyRelease(this, keyEvent);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
400
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
401 fixDamage;
17
c643c04e3f5e Checkpoint
David Bryant <daveb@acres.com.au>
parents: 16
diff changeset
402
2
d6f44347373d * Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents: 0
diff changeset
403 return true;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
404 }
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
405
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
406 bool onMotionNotify(GdkEventMotion * event, Widget widget) {
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
407 assert(widget is _drawingArea);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
408 //writefln("Got motion notify\n");
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
409 gtk_widget_event(_hRuler.getWidgetStruct(), cast(GdkEvent *)event);
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
410 gtk_widget_event(_vRuler.getWidgetStruct(), cast(GdkEvent *)event);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
411
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
412 Point pixelPoint = Point(event.x + 0.5, _viewBounds.h - (event.y + 0.5));
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
413 Point modelPoint = pixelToModel(pixelPoint);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
414
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
415 auto motionEvent = new MotionEvent(pixelPoint,
64
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
416 modelPoint,
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
417 gtk2tkMask(event.state));
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
418
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
419 _eventHandler.handleMotion(this, motionEvent);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
420
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
421 fixDamage;
17
c643c04e3f5e Checkpoint
David Bryant <daveb@acres.com.au>
parents: 16
diff changeset
422
2
d6f44347373d * Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents: 0
diff changeset
423 return true;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
424 }
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
425
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
426 bool onScroll(GdkEventScroll * event, Widget widget) {
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
427 assert(widget is _drawingArea);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
428 //writefln("Got scroll\n");
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
429
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
430 Point pixelPoint = Point(event.x + 0.5, _viewBounds.h - (event.y + 0.5));
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
431 Point modelPoint = pixelToModel(pixelPoint);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
432
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
433 auto scrollEvent = new ScrollEvent(gtk2tkDirection(event.direction),
64
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
434 pixelPoint,
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
435 modelPoint,
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
436 gtk2tkMask(event.state));
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
437
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
438 _eventHandler.handleScroll(this, scrollEvent);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
439
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
440 fixDamage;
17
c643c04e3f5e Checkpoint
David Bryant <daveb@acres.com.au>
parents: 16
diff changeset
441
2
d6f44347373d * Switched over to geometry done with structs instead of classes.
David Bryant <daveb@acres.com.au>
parents: 0
diff changeset
442 return true;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
443 }
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
444
20
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
445 /*
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
446 public enum GdkCrossingMode {
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
447 NORMAL,
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
448 GRAB,
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
449 UNGRAB,
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
450 GTK_GRAB,
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
451 GTK_UNGRAB,
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
452 STATE_CHANGED
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
453 }
20
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
454
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
455 public struct GdkEventCrossing {
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
456 GdkEventType type;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
457 GdkWindow *window;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
458 byte sendEvent;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
459 GdkWindow *subwindow;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
460 uint time;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
461 double x;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
462 double y;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
463 double xRoot;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
464 double yRoot;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
465 GdkCrossingMode mode;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
466 GdkNotifyType detail;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
467 int focus;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
468 uint state;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
469 }
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
470 */
20
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
471
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
472 bool onEnterNotify(GdkEventCrossing * event, Widget widget) {
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
473 assert(widget is _drawingArea);
64
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
474
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
475 Point pixelPoint = Point(event.x + 0.5, _viewBounds.h - (event.y + 0.5));
64
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
476 Point modelPoint = pixelToModel(pixelPoint);
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
477
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
478 auto crossingEvent = new CrossingEvent(gtk2tkCrossingMode(event.mode),
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
479 pixelPoint,
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
480 modelPoint,
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
481 gtk2tkMask(event.state));
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
482
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
483 _eventHandler.handleEnter(this, crossingEvent);
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
484
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
485 fixDamage;
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
486
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
487 //message("Enter %d %d %d", cast(int)event.mode, event.focus, event.state);
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
488
20
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
489 return true;
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
490 }
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
491
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
492 bool onLeaveNotify(GdkEventCrossing * event, Widget widget) {
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
493 assert(widget is _drawingArea);
64
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
494
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
495 Point pixelPoint = Point(event.x + 0.5, _viewBounds.h - (event.y + 0.5));
64
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
496 Point modelPoint = pixelToModel(pixelPoint);
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
497
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
498 auto crossingEvent = new CrossingEvent(gtk2tkCrossingMode(event.mode),
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
499 pixelPoint,
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
500 modelPoint,
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
501 gtk2tkMask(event.state));
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
502
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
503 _eventHandler.handleLeave(this, crossingEvent);
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
504
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
505 fixDamage;
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
506
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
507 //message("Leave %d %d %d", cast(int)event.mode, event.focus, event.state);
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
508
20
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
509 return true;
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
510 }
d6e7a5a6f008 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 19
diff changeset
511
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
512 /*
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
513 public struct GdkEventFocus {
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
514 GdkEventType type;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
515 GdkWindow *window;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
516 byte sendEvent;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
517 short inn;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
518 }
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
519 */
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
520 bool onFocusIn(GdkEventFocus * event, Widget widget) {
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
521 trace("onFocusIn");
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
522 return true;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
523 }
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
524
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
525 bool onFocusOut(GdkEventFocus * event, Widget widget) {
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
526 trace("onFocusOut");
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
527 return true;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
528 }
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
529
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
530 void onMoveFocus(GtkDirectionType direction, Widget widget) {
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
531 trace("onMoveFocus");
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
532 }
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
533
64
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
534 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
535 trace("onGrabBroken");
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
536 return true;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
537 }
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
538
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
539 void onGrabFocus(Widget widget) {
64
eb5436b47d13 Implemented crossing events
"David Bryant <bagnose@gmail.com>"
parents: 63
diff changeset
540 //trace("onGrabFocus");
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
541 }
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
542
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
543 void onGrabNotify(gboolean what, Widget widget){
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
544 trace("onGrabNotify");
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
545 }
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
546
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
547 void onAdjustmentValueChanged(Adjustment adjustment) {
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
548 GtkAdjustment * hGtkAdjustment = _hAdjustment.getAdjustmentStruct;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
549 GtkAdjustment * vGtkAdjustment = _vAdjustment.getAdjustmentStruct;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
550
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
551 Point viewLeftBottom = Point(gtk_adjustment_get_value(hGtkAdjustment),
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
552 gtk_adjustment_get_value(vGtkAdjustment));
16
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
553
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
554 Vector modelSize = pixelToModel(_viewBounds.size); // XXX
16
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
555
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
556 _viewCentre = viewLeftBottom + modelSize / 2.0;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
557
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
558 updateRulers;
13
f0ade1b49fe7 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 12
diff changeset
559 queueDraw;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
560 }
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
561
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
562 void updateRulers() {
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
563 immutable Vector modelSize = pixelToModel(_viewBounds.size); // XXX
58
c63719604adb Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents: 57
diff changeset
564 immutable Point viewLeftBottom = _viewCentre - modelSize / 2.0;
c63719604adb Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents: 57
diff changeset
565 immutable Point viewRightTop = _viewCentre + modelSize / 2.0;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
566
16
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
567 // Define these just to obtain the position
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
568 // below and we can preserve it
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
569 double lower, upper, position, maxSize;
12
a093c4fbdd43 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 11
diff changeset
570
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
571 _hRuler.getRange(lower, upper, position, maxSize);
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
572 _hRuler.setRange(viewLeftBottom.x,
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
573 viewRightTop.x,
12
a093c4fbdd43 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 11
diff changeset
574 position,
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
575 _zoom * 50.0);
12
a093c4fbdd43 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 11
diff changeset
576
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
577 _vRuler.getRange(lower, upper, position, maxSize);
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
578 _vRuler.setRange(viewRightTop.y,
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
579 viewLeftBottom.y,
14
0b7e7d43a79d Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 13
diff changeset
580 position,
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
581 _zoom * 50.0);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
582 }
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
583
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
584 void updateAdjustments() {
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
585 immutable Vector modelSize = pixelToModel(_viewBounds.size); // XXX
58
c63719604adb Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents: 57
diff changeset
586 immutable Point viewLeftBottom = _viewCentre - modelSize / 2.0;
c63719604adb Beginnings of creating a rectangle...
"David Bryant <bagnose@gmail.com>"
parents: 57
diff changeset
587 immutable Point viewRightTop = _viewCentre + modelSize / 2.0;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
588
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
589 // Adjust the canvas size if necessary
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
590 _canvasBounds = Rectangle(minExtents(_canvasBounds.corner0, viewLeftBottom),
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
591 maxExtents(_canvasBounds.corner1, viewRightTop));
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
592
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
593 // Update the adjustments
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
594
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
595 GtkAdjustment * hGtkAdjustment = _hAdjustment.getAdjustmentStruct;
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
596 GtkAdjustment * vGtkAdjustment = _vAdjustment.getAdjustmentStruct;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
597
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
598 gtk_adjustment_set_lower(hGtkAdjustment, _canvasBounds.corner0.x);
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
599 gtk_adjustment_set_upper(hGtkAdjustment, _canvasBounds.corner1.x);
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
600 gtk_adjustment_set_value(hGtkAdjustment, viewLeftBottom.x);
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
601 gtk_adjustment_set_step_increment(hGtkAdjustment, _canvasBounds.size.x / 16.0);
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
602 gtk_adjustment_set_page_increment(hGtkAdjustment, _canvasBounds.size.x / 4.0);
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
603 gtk_adjustment_set_page_size(hGtkAdjustment, modelSize.x);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
604
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
605 gtk_adjustment_set_lower(vGtkAdjustment, _canvasBounds.corner0.y);
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
606 gtk_adjustment_set_upper(vGtkAdjustment, _canvasBounds.corner1.y);
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
607 gtk_adjustment_set_value(vGtkAdjustment, viewLeftBottom.y);
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
608 gtk_adjustment_set_step_increment(vGtkAdjustment, _canvasBounds.size.y / 16.0);
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
609 gtk_adjustment_set_page_increment(vGtkAdjustment, _canvasBounds.size.y / 4.0);
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
610 gtk_adjustment_set_page_size(vGtkAdjustment, modelSize.y);
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
611
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
612 _hAdjustment.changed;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
613 _hAdjustment.valueChanged;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
614 _vAdjustment.changed;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
615 _vAdjustment.valueChanged;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
616 }
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
617
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
618 void fixDamage() {
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
619 if (_damage.valid) {
17
c643c04e3f5e Checkpoint
David Bryant <daveb@acres.com.au>
parents: 16
diff changeset
620 int x, y, w, h;
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
621 _damage.getQuantised(x, y, w, h);
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
622 _drawingArea.queueDrawArea(x, cast(int)_viewBounds.h - (y + h), w, h);
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
623 _damage = Rectangle.DEFAULT;
17
c643c04e3f5e Checkpoint
David Bryant <daveb@acres.com.au>
parents: 16
diff changeset
624 }
c643c04e3f5e Checkpoint
David Bryant <daveb@acres.com.au>
parents: 16
diff changeset
625 }
c643c04e3f5e Checkpoint
David Bryant <daveb@acres.com.au>
parents: 16
diff changeset
626
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
627 static double clampZoom(in double zoom) { return clamp(zoom, 0.2, 10.0); }
16
9e63308b749c * Fix up public/private includes
David Bryant <daveb@acres.com.au>
parents: 15
diff changeset
628
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
629 Point modelToPixel(in Point model) const {
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
630 return _viewBounds.centre + _zoom * (model - _viewCentre);
27
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
631 }
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
632
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
633 Point pixelToModel(in Point pixel) const {
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
634 return _viewCentre + (pixel - _viewBounds.centre) / _zoom;
27
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
635 }
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
636
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
637 Vector modelToPixel(in Vector model) const {
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
638 return _zoom * model;
27
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
639 }
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
640
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
641 Vector pixelToModel(in Vector pixel) const {
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
642 return pixel / _zoom;
27
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
643 }
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
644
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
645 Rectangle modelToPixel(in Rectangle model) const {
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
646 return Rectangle(modelToPixel(model.position), modelToPixel(model.size));
27
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
647 }
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
648
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
649 Rectangle pixelToModel(in Rectangle model) const {
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
650 return Rectangle(pixelToModel(model.position), pixelToModel(model.size));
27
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
651 }
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
652
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
653 void onRealize(Widget widget) {
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
654 assert(widget is _drawingArea);
27
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
655 //writefln("Got realize\n");
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
656 _drawingArea.grabFocus();
27
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
657 }
f3d91579bb28 Checkpoint
David Bryant <daveb@acres.com.au>
parents: 26
diff changeset
658
63
20d6327c4a75 Event progress. Got key press/release working and panning via keyboard.
daveb
parents: 62
diff changeset
659 bool _boundsValid;
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
660 Rectangle _damage; // pixels
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
661
67
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
662 // Model units are millimetres
31d10176415d Checkpoint
daveb
parents: 64
diff changeset
663 // Screen units are pixels
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
664 double _zoom; // pixels-per-model-unit
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
665 Rectangle _viewBounds; // pixel: bounds of the viewport in pixels
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
666 Point _viewCentre; // model: where in the model is the centre of our view
70
0e61702c6ea6 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 69
diff changeset
667 Rectangle _canvasBounds; // model: bounds of the canvas in millimetres
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
668
10
71ca82e0eb76 Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 9
diff changeset
669 // Child widgets:
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
670 HRuler _hRuler;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
671 VRuler _vRuler;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
672 DrawingArea _drawingArea;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
673 Adjustment _hAdjustment;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
674 HScrollbar _hScrollbar;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
675 Adjustment _vAdjustment;
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
676 VScrollbar _vScrollbar;
11
fb571a3b1f0d Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 10
diff changeset
677
48
1b4c9ba58673 Stylistic overhaul.
daveb
parents: 41
diff changeset
678 Layer[] _layers;
57
9960c4fbd0dd I is for Interface
"David Bryant <bagnose@gmail.com>"
parents: 54
diff changeset
679 IEventHandler _eventHandler;
9960c4fbd0dd I is for Interface
"David Bryant <bagnose@gmail.com>"
parents: 54
diff changeset
680 IGrid _grid;
69
d540f7e4af9e Checkpoint
"David Bryant <bagnose@gmail.com>"
parents: 68
diff changeset
681 double _pixelsPerMillimetre;
0
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
682 }
e907d2c54ec3 Initial import
David Bryant <daveb@acres.com.au>
parents:
diff changeset
683 }