ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.202 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFPlus::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
25 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
26 34
27 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
28 36
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 37 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 38
31 $TOOLTIP->set_tooltip_from ($widget); 39 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 40 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 if ($x + $TOOLTIP->{w} > $::WIDTH) {
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
38 }
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 41 }
44 42
45 return; 43 return;
46 } 44 }
47 } 45 }
48 } 46 }
49 47
50 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
51 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51});
52
53sub get_layout {
54 my $layout;
55
56 for (grep { $_->{name} } values %WIDGET) {
57 my $win = $layout->{$_->{name}} = { };
58
59 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
60 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
61 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
62 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
63
64 $win->{show} = $_->{visible} && $_->{is_toplevel};
65 }
66
67 $layout
68}
69
70sub set_layout {
71 my ($layout) = @_;
72
73 $LAYOUT = $layout;
52} 74}
53 75
54# class methods for events 76# class methods for events
55sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 78 $FOCUS->emit (key_down => $_[0])
57 if $FOCUS; 79 if $FOCUS;
58} 80}
59 81
60sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
61 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 83 $FOCUS->emit (key_up => $_[0])
62 if $FOCUS; 84 if $FOCUS;
85}
86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
63} 98}
64 99
65sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
66 my ($ev) = @_; 101 my ($ev) = @_;
67 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
68 103
69 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
70 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
71 108
72 $GRAB = $widget; 109 $GRAB = $widget;
73 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
74 111
75 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
76 } 113 }
77
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 114
80 if ($GRAB) { 115 if ($GRAB) {
81 ($x, $y) = $GRAB->coord2local ($x, $y); 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
82 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); 117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
83 } 128 }
84} 129}
85 130
86sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
87 my ($ev) = @_; 132 my ($ev) = @_;
88 my ($x, $y) = ($ev->{x}, $ev->{y});
89 133
90 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
91 135
92 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93 137
94 if ($GRAB) { 138 $GRAB->emit (button_up => $ev)
95 ($x, $y) = $GRAB->coord2local ($x, $y); 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
96 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97 }
98 140
99 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
100 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
101 $grab->update if $grab; 143 $grab->update if $grab;
102 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
103 145
104 check_tooltip; 146 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->();
105 } 148 }
106} 149}
107 150
108sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
109 my ($ev) = @_; 152 my ($ev) = @_;
110 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
111 154
112 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
113 156
114 if ($widget != $HOVER) { 157 check_hover $widget;
115 my $hover = $HOVER; $HOVER = $widget;
116 158
117 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
118 $HOVER->update if $HOVER && $HOVER->{can_hover};
119
120 check_tooltip;
121 }
122
123 if ($HOVER) { 160 if $HOVER;
124 ($x, $y) = $HOVER->coord2local ($x, $y);
125 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
126 }
127} 161}
128 162
129# convert position array to integers 163# convert position array to integers
130sub harmonize { 164sub harmonize {
131 my ($vals) = @_; 165 my ($vals) = @_;
… …
137 $rem += $_ - $i; 171 $rem += $_ - $i;
138 $_ = $i; 172 $_ = $i;
139 } 173 }
140} 174}
141 175
176sub full_refresh {
177 # make a copy, otherwise for complains about freed values.
178 my @widgets = values %WIDGET;
179
180 $_->update
181 for @widgets;
182}
183
184sub reconfigure_widgets {
185 # make a copy, otherwise C<for> complains about freed values.
186 my @widgets = values %WIDGET;
187
188 $_->reconfigure
189 for @widgets;
190}
191
142# call when resolution changes etc. 192# call when resolution changes etc.
143sub rescale_widgets { 193sub rescale_widgets {
144 my ($sx, $sy) = @_; 194 my ($sx, $sy) = @_;
145 195
146 for my $widget (values %WIDGET) { 196 for my $widget (values %WIDGET) {
147 if ($widget->{toplevel}) { 197 if ($widget->{is_toplevel}) {
198 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
200
148 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 201 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
149 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 202 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 203 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
151 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 204 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
153 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 205 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 206 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
155 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 207
208 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
209 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
210
156 } 211 }
157
158 $widget->reconfigure;
159 } 212 }
213
214 reconfigure_widgets;
160} 215}
161 216
162############################################################################# 217#############################################################################
163 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
164package CFClient::UI::Base; 227package CFPlus::UI::Base;
165 228
166use strict; 229use strict;
167 230
168use CFClient::OpenGL; 231use CFPlus::OpenGL;
169 232
170sub new { 233sub new {
171 my $class = shift; 234 my $class = shift;
172 235
173 my $self = bless { 236 my $self = bless {
174 x => 0, 237 x => "center",
175 y => 0, 238 y => "center",
176 z => 0, 239 z => 0,
240 w => undef,
241 h => undef,
177 can_events => 1, 242 can_events => 1,
178 @_ 243 @_
179 }, $class; 244 }, $class;
180 245
246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
247
181 for (keys %$self) { 248 for (keys %$self) {
182 if (/^connect_(.*)$/) { 249 if (/^on_(.*)$/) {
183 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
184 } 251 }
185 } 252 }
186 253
187 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
259
260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262
263 $self->show if $layout->{show};
264 }
188 265
189 $self 266 $self
190} 267}
191 268
192sub destroy { 269sub destroy {
193 my ($self) = @_; 270 my ($self) = @_;
194 271
195 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
196 %$self = (); 274 %$self = ();
197} 275}
198 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
199sub show { 281sub show {
200 my ($self) = @_; 282 my ($self) = @_;
201 283
202 return if $self->{parent}; 284 return if $self->{parent};
203 285
204 $self->{toplevel} = 1;
205 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
206} 287}
207 288
208sub hide { 289sub set_visible {
209 my ($self) = @_; 290 my ($self) = @_;
291
292 return if $self->{visible};
293
294 $self->{root} = $self->{parent}{root};
295 $self->{visible} = $self->{parent}{visible} + 1;
296
297 $self->emit (visibility_change => 1);
298
299 $self->realloc if !exists $self->{req_w};
300
301 $_->set_visible for $self->children;
302}
303
304sub set_invisible {
305 my ($self) = @_;
306
307 return unless $self->{visible};
308
309 $_->set_invisible for $self->children;
310
311 delete $self->{visible};
312 delete $self->{root};
210 313
211 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
212 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
213 316
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
318 if $TOOLTIP->{owner} == $self;
319
320 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0);
322}
323
324sub set_visibility {
325 my ($self, $visible) = @_;
326
327 return if $self->{visible} == $visible;
328
329 $visible ? $self->show
330 : $self->hide;
331}
332
333sub toggle_visibility {
334 my ($self) = @_;
335
336 $self->{visible}
337 ? $self->hide
338 : $self->show;
339}
340
341sub hide {
342 my ($self) = @_;
343
344 $self->set_invisible;
345
214 $self->{parent}->remove ($self) 346 $self->{parent}->remove ($self)
215 if $self->{parent}; 347 if $self->{parent};
216} 348}
217 349
218sub move { 350sub move_abs {
219 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
220 352
221 $self->{x} = int $x; 353 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
222 $self->{y} = int $y; 354 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
223 $self->{z} = $z if defined $z; 355 $self->{z} = $z if defined $z;
224 356
225 $self->update; 357 $self->update;
226} 358}
227 359
228sub set_size { 360sub set_size {
229 my ($self, $w, $h) = @_; 361 my ($self, $w, $h) = @_;
230 362
231 $self->{user_w} = $w; 363 $self->{force_w} = $w;
232 $self->{user_h} = $h; 364 $self->{force_h} = $h;
233 365
234 $self->check_size; 366 $self->realloc;
235} 367}
236 368
237sub size_request { 369sub size_request {
238 require Carp; 370 require Carp;
239 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
240} 372}
241 373
374sub baseline_shift {
375 0
376}
377
242sub configure { 378sub configure {
243 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
244 380
245 if ($self->{aspect}) { 381 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h);
383
246 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
247 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
248 386
249 # use alignment to adjust x, y 387 # use alignment to adjust x, y
250 388
251 $x += int +($w - $w2) * 0.5; 389 $x += int 0.5 * ($ow - $w);
252 $y += int +($h - $h2) * 0.5; 390 $y += int 0.5 * ($oh - $h);
253
254 ($w, $h) = ($w2, $h2);
255 } 391 }
256 392
257 if ($self->{x} != $x || $self->{y} != $y) { 393 if ($self->{x} ne $x || $self->{y} ne $y) {
258 $self->{x} = $x; 394 $self->{x} = $x;
259 $self->{y} = $y; 395 $self->{y} = $y;
260 $self->update; 396 $self->update;
261 } 397 }
262 398
263 if ($self->{w} != $w || $self->{h} != $h) { 399 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
264 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 400 return unless $self->{visible};
265 }
266}
267 401
268sub size_allocate { 402 $self->{alloc_w} = $w;
269 # nothing to be done 403 $self->{alloc_h} = $h;
270}
271 404
272sub reconfigure { 405 $self->{root}{size_alloc}{$self+0} = $self;
273 my ($self) = @_; 406 }
274
275 $self->check_size (1);
276 $self->update;
277} 407}
278 408
279sub children { 409sub children {
410 # nop
411}
412
413sub visible_children {
414 $_[0]->children
280} 415}
281 416
282sub set_max_size { 417sub set_max_size {
283 my ($self, $w, $h) = @_; 418 my ($self, $w, $h) = @_;
284 419
285 delete $self->{max_w}; $self->{max_w} = $w if $w; 420 $self->{max_w} = int $w if defined $w;
286 delete $self->{max_h}; $self->{max_h} = $h if $h; 421 $self->{max_h} = int $h if defined $h;
422
423 $self->realloc;
424}
425
426sub set_tooltip {
427 my ($self, $tooltip) = @_;
428
429 $tooltip =~ s/^\s+//;
430 $tooltip =~ s/\s+$//;
431
432 return if $self->{tooltip} eq $tooltip;
433
434 $self->{tooltip} = $tooltip;
435
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
439 }
287} 440}
288 441
289# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
290sub coord2local { 443sub coord2local {
291 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
292 445
446 Carp::confess unless $self->{parent};#d#
447
293 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
294} 449}
295 450
296# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
297sub coord2global { 452sub coord2global {
298 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
299 454
455 Carp::confess unless $self->{parent};#d#
456
300 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
301} 458}
302 459
303sub focus_in { 460sub invoke_focus_in {
304 my ($self) = @_; 461 my ($self) = @_;
305 462
306 return if $FOCUS == $self; 463 return if $FOCUS == $self;
307 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
308 465
309 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
310 467
311 $self->emit (focus_in => $focus); 468 $self->update;
312 469
313 $focus->update if $focus; 470 0
314 $FOCUS->update;
315} 471}
316 472
317sub focus_out { 473sub invoke_focus_out {
318 my ($self) = @_; 474 my ($self) = @_;
319 475
320 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
321 477
322 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
323 479
324 $self->emit (focus_out => $focus); 480 $self->update;
325 481
326 $focus->update if $focus; #? 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
327} 483 unless $FOCUS;
328 484
485 0
486}
487
488sub grab_focus {
489 my ($self) = @_;
490
491 $FOCUS->emit ("focus_out") if $FOCUS;
492 $self->emit ("focus_in");
493}
494
329sub mouse_motion { } 495sub invoke_mouse_motion { 0 }
330sub button_up { } 496sub invoke_button_up { 0 }
331sub key_down { } 497sub invoke_key_down { 0 }
332sub key_up { } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
333 500
334sub button_down { 501sub invoke_button_down {
335 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
336 503
337 $self->focus_in; 504 $self->grab_focus;
338}
339 505
340sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 506 0
341sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 507}
342sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 508
343sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 509sub connect {
344sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 510 my ($self, $signal, $cb) = @_;
511
512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
532
533sub emit {
534 my ($self, $signal, @args) = @_;
535
536 # I do not really like this solution, but I do not like duplication
537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
553 $self->{parent} && $self->{parent}->emit ($signal, @args)
554}
555
556#sub find_widget {
557# in .xs
558
559sub set_parent {
560 my ($self, $parent) = @_;
561
562 CFPlus::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible};
564}
565
566sub realloc {
567 my ($self) = @_;
568
569 if ($self->{visible}) {
570 return if $self->{root}{realloc}{$self+0};
571
572 $self->{root}{realloc}{$self+0} = $self;
573 $self->{root}->update;
574 } else {
575 delete $self->{req_w};
576 delete $self->{req_h};
577 }
578}
579
580sub update {
581 my ($self) = @_;
582
583 $self->{parent}->update
584 if $self->{parent};
585}
586
587sub reconfigure {
588 my ($self) = @_;
589
590 $self->realloc;
591 $self->update;
592}
593
594# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
345 597
346sub draw { 598sub draw {
347 my ($self) = @_; 599 my ($self) = @_;
348 600
349 return unless $self->{h} && $self->{w}; 601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
350 610
351 glPushMatrix; 611 glPushMatrix;
352 glTranslate $self->{x}, $self->{y}, 0; 612 glTranslate $self->{x}, $self->{y}, 0;
353 $self->_draw;
354 glPopMatrix;
355 613
356 if ($self == $HOVER && $self->{can_hover}) { 614 if ($self == $HOVER && $self->{can_hover}) {
357 my ($x, $y) = @$self{qw(x y)};
358
359 glColor 1, 0.8, 0.5, 0.2; 615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
360 glEnable GL_BLEND; 616 glEnable GL_BLEND;
361 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
362 glBegin GL_QUADS; 618 glBegin GL_QUADS;
363 glVertex $x , $y;
364 glVertex $x + $self->{w}, $y;
365 glVertex $x + $self->{w}, $y + $self->{h};
366 glVertex $x , $y + $self->{h};
367 glEnd;
368 glDisable GL_BLEND;
369 }
370
371 if ($ENV{PCLIENT_DEBUG}) {
372 glPushMatrix;
373 glColor 1, 1, 0, 1;
374 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
375 glBegin GL_LINE_LOOP;
376 glVertex 0 , 0; 619 glVertex 0 , 0;
377 glVertex $self->{w}, 0; 620 glVertex $self->{w}, 0;
378 glVertex $self->{w}, $self->{h}; 621 glVertex $self->{w}, $self->{h};
379 glVertex 0 , $self->{h}; 622 glVertex 0 , $self->{h};
380 glEnd; 623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
381 glPopMatrix; 637 glPopMatrix;
382 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
383 } 639 }
640
641 $self->_draw;
642 glPopMatrix;
384} 643}
385 644
386sub _draw { 645sub _draw {
387 my ($self) = @_; 646 my ($self) = @_;
388 647
389 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
390} 649}
391 650
392sub find_widget { 651my $cntx;#d#
393 my ($self, $x, $y) = @_;
394
395 return () unless $self->{can_events};
396
397 return $self
398 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
399 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
400
401 ()
402}
403
404sub set_parent {
405 my ($self, $parent) = @_;
406
407 Scalar::Util::weaken ($self->{parent} = $parent);
408
409 # TODO: req_w _does_change after ->reconfigure
410 $self->check_size
411 unless exists $self->{req_w};
412}
413
414sub check_size {
415 my ($self, $forced) = @_;
416
417 $self->{force_alloc} = 1 if $forced;
418 $CFClient::UI::ROOT->{check_size}{$self} = $self;
419}
420
421sub update {
422 my ($self) = @_;
423
424 $self->{parent}->update
425 if $self->{parent};
426}
427
428sub connect {
429 my ($self, $signal, $cb) = @_;
430
431 push @{ $self->{signal_cb}{$signal} }, $cb;
432}
433
434sub emit {
435 my ($self, $signal, @args) = @_;
436
437 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
438}
439
440sub DESTROY { 652sub DESTROY {
441 my ($self) = @_; 653 my ($self) = @_;
442 654
655 return if CFPlus::in_destruct;
656
657 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659
443 delete $WIDGET{$self+0}; 660 delete $WIDGET{$self+0};
444 #$self->deactivate;
445} 661}
446 662
447############################################################################# 663#############################################################################
448 664
449package CFClient::UI::DrawBG; 665package CFPlus::UI::DrawBG;
450 666
451our @ISA = CFClient::UI::Base::; 667our @ISA = CFPlus::UI::Base::;
452 668
453use strict; 669use strict;
454use CFClient::OpenGL; 670use CFPlus::OpenGL;
455 671
456sub new { 672sub new {
457 my $class = shift; 673 my $class = shift;
458 674
459 # range [value, low, high, page] 675 # range [value, low, high, page]
460 676
461 $class->SUPER::new ( 677 $class->SUPER::new (
462 bg => [0, 0, 0, 0.2], 678 #bg => [0, 0, 0, 0.2],
463 active_bg => [1, 1, 1, 0.5], 679 #active_bg => [1, 1, 1, 0.5],
464 @_ 680 @_
465 ) 681 )
466} 682}
467 683
468sub _draw { 684sub _draw {
469 my ($self) = @_; 685 my ($self) = @_;
470 686
471 my ($w, $h) = @$self{qw(w h)}; 687 my $color = $FOCUS == $self && $self->{active_bg}
688 ? $self->{active_bg}
689 : $self->{bg};
472 690
473 glEnable GL_BLEND; 691 if ($color && (@$color < 4 || $color->[3])) {
474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
475 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
476
477 glBegin GL_QUADS;
478 glVertex 0 , 0;
479 glVertex 0 , $h;
480 glVertex $w, $h;
481 glVertex $w, 0;
482 glEnd;
483
484 glDisable GL_BLEND;
485}
486
487#############################################################################
488
489package CFClient::UI::Empty;
490
491our @ISA = CFClient::UI::Base::;
492
493sub new {
494 my ($class, %arg) = @_;
495 $class->SUPER::new (can_events => 0, %arg);
496}
497
498sub size_request {
499 (0, 0)
500}
501
502sub draw { }
503
504#############################################################################
505
506package CFClient::UI::Container;
507
508our @ISA = CFClient::UI::Base::;
509
510sub new {
511 my ($class, %arg) = @_;
512
513 my $children = delete $arg{children} || [];
514
515 my $self = $class->SUPER::new (
516 children => [],
517 can_events => 0,
518 %arg,
519 );
520 $self->add ($_) for @$children;
521
522 $self
523}
524
525sub add {
526 my ($self, @widgets) = @_;
527
528 $_->set_parent ($self)
529 for @widgets;
530
531 use sort 'stable';
532
533 $self->{children} = [
534 sort { $a->{z} <=> $b->{z} }
535 @{$self->{children}}, @widgets
536 ];
537
538 $self->check_size (1);
539 $self->update;
540}
541
542sub children {
543 @{ $_[0]{children} }
544}
545
546sub remove {
547 my ($self, $child) = @_;
548
549 delete $child->{parent};
550 $child->hide;
551
552 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
553
554 $self->check_size;
555 $self->update;
556}
557
558sub clear {
559 my ($self) = @_;
560
561 my $children = delete $self->{children};
562 $self->{children} = [];
563
564 for (@$children) {
565 delete $_->{parent};
566 $_->hide;
567 }
568
569 $self->check_size;
570 $self->update;
571}
572
573sub find_widget {
574 my ($self, $x, $y) = @_;
575
576 $x -= $self->{x};
577 $y -= $self->{y};
578
579 my $res;
580
581 for (reverse @{ $self->{children} }) {
582 $res = $_->find_widget ($x, $y)
583 and return $res;
584 }
585
586 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
587}
588
589sub _draw {
590 my ($self) = @_;
591
592 $_->draw for @{$self->{children}};
593}
594
595#############################################################################
596
597package CFClient::UI::Bin;
598
599our @ISA = CFClient::UI::Container::;
600
601sub new {
602 my ($class, %arg) = @_;
603
604 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
605
606 $class->SUPER::new (children => [$child], %arg)
607}
608
609sub add {
610 my ($self, $child) = @_;
611
612 $self->{children} = [];
613
614 $self->SUPER::add ($child);
615}
616
617sub remove {
618 my ($self, $widget) = @_;
619
620 $self->SUPER::remove ($widget);
621
622 $self->{children} = [new CFClient::UI::Empty]
623 unless @{$self->{children}};
624}
625
626sub child { $_[0]->{children}[0] }
627
628sub size_request {
629 $_[0]{children}[0]->size_request
630}
631
632sub size_allocate {
633 my ($self, $w, $h) = @_;
634
635 $self->{children}[0]->configure (0, 0, $w, $h);
636}
637
638#############################################################################
639
640package CFClient::UI::Window;
641
642our @ISA = CFClient::UI::Bin::;
643
644use CFClient::OpenGL;
645
646sub new {
647 my ($class, %arg) = @_;
648
649 my $self = $class->SUPER::new (%arg);
650}
651
652sub update {
653 my ($self) = @_;
654
655 $ROOT->on_post_alloc ($self => sub { $self->render_child });
656 $self->SUPER::update;
657}
658
659sub size_allocate {
660 my ($self, $w, $h) = @_;
661
662 $self->SUPER::size_allocate ($w, $h);
663 $self->update;
664}
665
666sub _render {
667 $_[0]{children}[0]->draw;
668}
669
670sub render_child {
671 my ($self) = @_;
672
673 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
674 glClearColor 0, 0, 0, 0;
675 glClear GL_COLOR_BUFFER_BIT;
676
677 $self->_render;
678# glColorMask 1, 1, 1, 0;
679# glEnable GL_BLEND;
680# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
681# glRasterPos 0, 0;
682# glCopyPixels 0, 0, $self->{w}, $self->{h};
683# glDisable GL_BLEND;
684# glColorMask 1, 1, 1, 1;
685 };
686}
687
688sub _draw {
689 my ($self) = @_;
690
691 my ($w, $h) = ($self->w, $self->h);
692
693 my $tex = $self->{texture}
694 or return;
695
696 glEnable GL_TEXTURE_2D;
697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
698 glColor 0, 0, 0, 1;
699
700 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
701
702 glDisable GL_TEXTURE_2D;
703}
704
705#############################################################################
706
707package CFClient::UI::ViewPort;
708
709our @ISA = CFClient::UI::Window::;
710
711sub size_request {
712 my ($self) = @_;
713
714 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
715 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
716
717 @$self{qw(child_w child_h)}
718}
719
720sub size_allocate {
721 my ($self, $w, $h) = @_;
722
723 $self->update;
724}
725
726sub set_offset {
727 my ($self, $x, $y) = @_;
728
729 $self->{view_x} = int $x;
730 $self->{view_y} = int $y;
731
732 $self->update;
733}
734
735# hmm, this does not work for topleft of $self... but we should not ask for that
736sub coord2local {
737 my ($self, $x, $y) = @_;
738
739 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
740}
741
742sub coord2global {
743 my ($self, $x, $y) = @_;
744
745 $x = List::Util::min $self->{w}, $x - $self->{view_x};
746 $y = List::Util::min $self->{h}, $y - $self->{view_y};
747
748 $self->SUPER::coord2global ($x, $y)
749}
750
751sub find_widget {
752 my ($self, $x, $y) = @_;
753
754 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
755 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
756 ) {
757 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
758 } else {
759 $self->CFClient::UI::Base::find_widget ($x, $y)
760 }
761}
762
763sub _render {
764 my ($self) = @_;
765
766 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
767
768 $self->SUPER::_render;
769}
770
771#############################################################################
772
773package CFClient::UI::ScrolledWindow;
774
775our @ISA = CFClient::UI::HBox::;
776
777sub new {
778 my $class = shift;
779
780 my $self;
781
782 my $slider = new CFClient::UI::Slider
783 vertical => 1,
784 range => [0, 0, 1, 0.01], # HACK fix
785 connect_changed => sub {
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
787 },
788 ;
789
790 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort),
792 slider => $slider,
793 @_,
794 );
795
796 $self->{vp}->add ($self->{scrolled});
797 $self->add ($self->{vp});
798 $self->add ($self->{slider});
799
800 $self
801}
802
803#TODO# update range on size_allocate depending on child
804# update viewport offset on scroll
805
806#############################################################################
807
808package CFClient::UI::Frame;
809
810our @ISA = CFClient::UI::Bin::;
811
812use CFClient::OpenGL;
813
814sub new {
815 my $class = shift;
816
817 $class->SUPER::new (
818 bg => undef,
819 @_,
820 )
821}
822
823sub _draw {
824 my ($self) = @_;
825
826 if ($self->{bg}) {
827 my ($w, $h) = @$self{qw(w h)}; 692 my ($w, $h) = @$self{qw(w h)};
828 693
829 glEnable GL_BLEND; 694 glEnable GL_BLEND;
830 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 695 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
831 glColor @{ $self->{bg} }; 696 glColor_premultiply @$color;
832 697
833 glBegin GL_QUADS; 698 glBegin GL_QUADS;
834 glVertex 0 , 0; 699 glVertex 0 , 0;
835 glVertex 0 , $h; 700 glVertex 0 , $h;
836 glVertex $w, $h; 701 glVertex $w, $h;
837 glVertex $w, 0; 702 glVertex $w, 0;
838 glEnd; 703 glEnd;
839 704
840 glDisable GL_BLEND; 705 glDisable GL_BLEND;
841 } 706 }
842
843 $self->SUPER::_draw;
844} 707}
845 708
846############################################################################# 709#############################################################################
847 710
848package CFClient::UI::FancyFrame; 711package CFPlus::UI::Empty;
849 712
713our @ISA = CFPlus::UI::Base::;
714
715sub new {
716 my ($class, %arg) = @_;
717 $class->SUPER::new (can_events => 0, %arg);
718}
719
720sub size_request {
721 my ($self) = @_;
722
723 ($self->{w} + 0, $self->{h} + 0)
724}
725
726sub draw { }
727
728#############################################################################
729
730package CFPlus::UI::Container;
731
732our @ISA = CFPlus::UI::Base::;
733
734sub new {
735 my ($class, %arg) = @_;
736
737 my $children = delete $arg{children};
738
739 my $self = $class->SUPER::new (
740 children => [],
741 can_events => 0,
742 %arg,
743 );
744
745 $self->add (@$children)
746 if $children;
747
748 $self
749}
750
751sub realloc {
752 my ($self) = @_;
753
754 $self->{force_realloc} = 1;
755 $self->{force_size_alloc} = 1;
756 $self->SUPER::realloc;
757}
758
759sub add {
760 my ($self, @widgets) = @_;
761
762 $_->set_parent ($self)
763 for @widgets;
764
765 use sort 'stable';
766
767 $self->{children} = [
768 sort { $a->{z} <=> $b->{z} }
769 @{$self->{children}}, @widgets
770 ];
771
772 $self->realloc;
773}
774
775sub children {
776 @{ $_[0]{children} }
777}
778
779sub remove {
780 my ($self, $child) = @_;
781
782 delete $child->{parent};
783 $child->hide;
784
785 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
786
787 $self->realloc;
788}
789
790sub clear {
791 my ($self) = @_;
792
793 my $children = delete $self->{children};
794 $self->{children} = [];
795
796 for (@$children) {
797 delete $_->{parent};
798 $_->hide;
799 }
800
801 $self->realloc;
802}
803
804sub find_widget {
805 my ($self, $x, $y) = @_;
806
807 $x -= $self->{x};
808 $y -= $self->{y};
809
810 my $res;
811
812 for (reverse $self->visible_children) {
813 $res = $_->find_widget ($x, $y)
814 and return $res;
815 }
816
817 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
818}
819
820sub _draw {
821 my ($self) = @_;
822
823 $_->draw for @{$self->{children}};
824}
825
826#############################################################################
827
828package CFPlus::UI::Bin;
829
830our @ISA = CFPlus::UI::Container::;
831
832sub new {
833 my ($class, %arg) = @_;
834
835 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
836
837 $class->SUPER::new (children => [$child], %arg)
838}
839
840sub add {
841 my ($self, $child) = @_;
842
843 $self->SUPER::remove ($_) for @{ $self->{children} };
844 $self->SUPER::add ($child);
845}
846
847sub remove {
848 my ($self, $widget) = @_;
849
850 $self->SUPER::remove ($widget);
851
852 $self->{children} = [new CFPlus::UI::Empty]
853 unless @{$self->{children}};
854}
855
856sub child { $_[0]->{children}[0] }
857
858sub size_request {
859 $_[0]{children}[0]->size_request
860}
861
862sub invoke_size_allocate {
863 my ($self, $w, $h) = @_;
864
865 $self->{children}[0]->configure (0, 0, $w, $h);
866
867 1
868}
869
870#############################################################################
871
872# back-buffered drawing area
873
874package CFPlus::UI::Window;
875
850our @ISA = CFClient::UI::Bin::; 876our @ISA = CFPlus::UI::Bin::;
851 877
852use CFClient::OpenGL; 878use CFPlus::OpenGL;
853 879
854my @tex = 880sub new {
855 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 881 my ($class, %arg) = @_;
856 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 882
883 my $self = $class->SUPER::new (%arg);
884}
885
886sub update {
887 my ($self) = @_;
888
889 $ROOT->on_post_alloc ($self => sub { $self->render_child });
890 $self->SUPER::update;
891}
892
893sub invoke_size_allocate {
894 my ($self, $w, $h) = @_;
895
896 $self->update;
897
898 $self->SUPER::invoke_size_allocate ($w, $h)
899}
900
901sub _render {
902 my ($self) = @_;
903
904 $self->{children}[0]->draw;
905}
906
907sub render_child {
908 my ($self) = @_;
909
910 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
911 glClearColor 0, 0, 0, 0;
912 glClear GL_COLOR_BUFFER_BIT;
913
914 {
915 package CFPlus::UI::Base;
916
917 local ($draw_x, $draw_y, $draw_w, $draw_h) =
918 (0, 0, $self->{w}, $self->{h});
919
920 $self->_render;
921 }
922 };
923}
924
925sub _draw {
926 my ($self) = @_;
927
928 my $tex = $self->{texture}
929 or return;
930
931 glEnable GL_TEXTURE_2D;
932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
933 glColor 0, 0, 0, 1;
934
935 $tex->draw_quad_alpha_premultiplied (0, 0);
936
937 glDisable GL_TEXTURE_2D;
938}
939
940#############################################################################
941
942package CFPlus::UI::ViewPort;
943
944use List::Util qw(min max);
945
946our @ISA = CFPlus::UI::Window::;
857 947
858sub new { 948sub new {
859 my $class = shift; 949 my $class = shift;
860 950
861 # TODO: user_x, user_y, overwrite moveto? 951 $class->SUPER::new (
952 scroll_x => 0,
953 scroll_y => 1,
954 @_,
955 )
956}
957
958sub size_request {
959 my ($self) = @_;
960
961 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
962
963 $w = 10 if $self->{scroll_x};
964 $h = 10 if $self->{scroll_y};
965
966 ($w, $h)
967}
968
969sub invoke_size_allocate {
970 my ($self, $w, $h) = @_;
971
972 my $child = $self->child;
973
974 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
975 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
976
977 $self->child->configure (0, 0, $w, $h);
978 $self->update;
979
980 1
981}
982
983sub set_offset {
984 my ($self, $x, $y) = @_;
985
986 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
987 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
988
989 if ($x != $self->{view_x} or $y != $self->{view_y}) {
990 $self->{view_x} = $x;
991 $self->{view_y} = $y;
992
993 $self->emit (changed => $x, $y);
994 $self->update;
995 }
996}
997
998# hmm, this does not work for topleft of $self... but we should not ask for that
999sub coord2local {
1000 my ($self, $x, $y) = @_;
1001
1002 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
1003}
1004
1005sub coord2global {
1006 my ($self, $x, $y) = @_;
1007
1008 $x = List::Util::min $self->{w}, $x - $self->{view_x};
1009 $y = List::Util::min $self->{h}, $y - $self->{view_y};
1010
1011 $self->SUPER::coord2global ($x, $y)
1012}
1013
1014sub find_widget {
1015 my ($self, $x, $y) = @_;
1016
1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1019 ) {
1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1021 } else {
1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
1023 }
1024}
1025
1026sub _render {
1027 my ($self) = @_;
1028
1029 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1030 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1031
1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1033
1034 $self->SUPER::_render;
1035}
1036
1037#############################################################################
1038
1039package CFPlus::UI::ScrolledWindow;
1040
1041our @ISA = CFPlus::UI::Table::;
1042
1043sub new {
1044 my ($class, %arg) = @_;
1045
1046 my $child = delete $arg{child};
1047
1048 my $self;
1049
1050 my $hslider = new CFPlus::UI::Slider
1051 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub {
1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 },
1057 ;
1058
1059 my $vslider = new CFPlus::UI::Slider
1060 vertical => 1,
1061 range => [0, 0, 1, 0.01], # HACK fix
1062 on_changed => sub {
1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1065 },
1066 ;
1067
1068 $self = $class->SUPER::new (
1069 scroll_x => 0,
1070 scroll_y => 1,
1071 can_events => 1,
1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
1076 %arg,
1077 );
1078
1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085
1086 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y);
1088
1089 0
1090 },
1091 ;
1092
1093 $self->SUPER::add_at (0, 0, $self->{vp});
1094
1095 $self->add ($child) if $child;
1096
1097 $self
1098}
1099
1100#TODO# update range on size_allocate depending on child
1101
1102sub add {
1103 my ($self, $widget) = @_;
1104
1105 $self->{vp}->add ($self->{child} = $widget);
1106}
1107
1108sub update_slider {
1109 my ($self) = @_;
1110
1111 my $child = ($self->{vp} or return)->child;
1112
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115
1116 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) {
1118 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1119 : $self->{hslider}->hide;
1120 }
1121
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124
1125 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) {
1127 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1128 : $self->{vslider}->hide;
1129 }
1130}
1131
1132sub update {
1133 my ($self) = @_;
1134
1135 $self->update_slider;
1136 $self->SUPER::update;
1137}
1138
1139sub invoke_mouse_wheel {
1140 my ($self, $ev) = @_;
1141
1142 $self->{vslider}->emit (mouse_wheel => $ev)
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev)
1146 if $ev->{dx};
1147
1148 1
1149}
1150
1151sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_;
1153
1154 if ($ev->{button} == 2) {
1155 $self->grab_focus;
1156
1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1162
1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1166
1167 return 1;
1168 }
1169
1170 0
1171}
1172
1173sub invoke_button_up {
1174 my ($self, $ev, $x, $y) = @_;
1175
1176 if (delete $self->{motion}) {
1177 return 1;
1178 }
1179
1180 0
1181}
1182
1183sub invoke_mouse_motion {
1184 my ($self, $ev, $x, $y) = @_;
1185
1186 if ($self->{motion}) {
1187 $self->{motion}->($ev, $x, $y);
1188 return 1;
1189 }
1190
1191 0
1192}
1193
1194sub invoke_size_allocate {
1195 my ($self, $w, $h) = @_;
1196
1197 $self->update_slider;
1198 $self->SUPER::invoke_size_allocate ($w, $h)
1199}
1200
1201#############################################################################
1202
1203package CFPlus::UI::Frame;
1204
1205our @ISA = CFPlus::UI::Bin::;
1206
1207use CFPlus::OpenGL;
1208
1209sub new {
1210 my $class = shift;
1211
1212 $class->SUPER::new (
1213 bg => undef,
1214 @_,
1215 )
1216}
1217
1218sub _draw {
1219 my ($self) = @_;
1220
1221 if ($self->{bg}) {
1222 my ($w, $h) = @$self{qw(w h)};
1223
1224 glEnable GL_BLEND;
1225 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1226 glColor_premultiply @{ $self->{bg} };
1227
1228 glBegin GL_QUADS;
1229 glVertex 0 , 0;
1230 glVertex 0 , $h;
1231 glVertex $w, $h;
1232 glVertex $w, 0;
1233 glEnd;
1234
1235 glDisable GL_BLEND;
1236 }
1237
1238 $self->SUPER::_draw;
1239}
1240
1241#############################################################################
1242
1243package CFPlus::UI::FancyFrame;
1244
1245our @ISA = CFPlus::UI::Bin::;
1246
1247use CFPlus::OpenGL;
1248
1249sub new {
1250 my ($class, %arg) = @_;
1251
1252 if ((exists $arg{label}) && !ref $arg{label}) {
1253 $arg{label} = new CFPlus::UI::Label
1254 align => 1,
1255 valign => 0,
1256 text => $arg{label},
1257 fontsize => ($arg{border} || 0.8) * 0.75;
1258 }
862 1259
863 my $self = $class->SUPER::new ( 1260 my $self = $class->SUPER::new (
1261 # label => "",
864 bg => [1, 1, 1, 1], 1262 fg => [0.6, 0.3, 0.1],
865 border_bg => [1, 1, 1, 1],
866 border => 0.6, 1263 border => 0.8,
867 toplevel => 1, 1264 style => 'single',
868 can_events => 1, 1265 %arg,
869 @_
870 ); 1266 );
871 1267
872 $self->{title} &&= new CFClient::UI::Label
873 align => 0,
874 valign => 1,
875 text => $self->{title},
876 fontsize => $self->{border};
877
878 $self 1268 $self
1269}
1270
1271sub add {
1272 my ($self, @widgets) = @_;
1273
1274 $self->SUPER::add (@widgets);
1275 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
879} 1276}
880 1277
881sub border { 1278sub border {
882 int $_[0]{border} * $::FONTSIZE 1279 int $_[0]{border} * $::FONTSIZE
883} 1280}
884 1281
885sub size_request { 1282sub size_request {
886 my ($self) = @_; 1283 my ($self) = @_;
1284
1285 ($self->{label_w}, undef) = $self->{label}->size_request
1286 if $self->{label};
887 1287
888 my ($w, $h) = $self->SUPER::size_request; 1288 my ($w, $h) = $self->SUPER::size_request;
889 1289
890 ( 1290 (
891 $w + $self->border * 2, 1291 $w + $self->border * 2,
892 $h + $self->border * 2, 1292 $h + $self->border * 2,
893 ) 1293 )
894} 1294}
895 1295
896sub size_allocate { 1296sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 1297 my ($self, $w, $h) = @_;
898 1298
899 $h -= List::Util::max 0, $self->border * 2; 1299 my $border = $self->border;
1300
900 $w -= List::Util::max 0, $self->border * 2; 1301 $w -= List::Util::max 0, $border * 2;
1302 $h -= List::Util::max 0, $border * 2;
901 1303
902 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1304 if (my $label = $self->{label}) {
903 if $self->{title}; 1305 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1306 $label->{h} = List::Util::min $h, $border;
1307 $label->invoke_size_allocate ($label->{w}, $label->{h});
1308 }
904 1309
905 $self->child->configure ($self->border, $self->border, $w, $h); 1310 $self->child->configure ($border, $border, $w, $h);
906}
907 1311
1312 1
1313}
1314
1315sub _draw {
1316 my ($self) = @_;
1317
1318 my $child = $self->{children}[0];
1319
1320 my $border = $self->border;
1321 my ($w, $h) = ($self->{w}, $self->{h});
1322
1323 $child->draw;
1324
1325 glColor @{$self->{fg}};
1326 glBegin GL_LINE_STRIP;
1327 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1328 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1330 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1331 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1333 glEnd;
1334
1335 if ($self->{label}) {
1336 glTranslate $border * 2, 0;
1337 $self->{label}->_draw;
1338 }
1339}
1340
1341#############################################################################
1342
1343package CFPlus::UI::Toplevel;
1344
1345our @ISA = CFPlus::UI::Bin::;
1346
1347use CFPlus::OpenGL;
1348
1349my $bg =
1350 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1351 mipmap => 1, wrap => 1;
1352
1353my @border =
1354 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1355 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1356
1357my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png);
1360
1361sub new {
1362 my ($class, %arg) = @_;
1363
1364 my $self = $class->SUPER::new (
1365 bg => [1, 1, 1, 1],
1366 border_bg => [1, 1, 1, 1],
1367 border => 0.6,
1368 can_events => 1,
1369 min_w => 64,
1370 min_h => 32,
1371 %arg,
1372 );
1373
1374 $self->{title_widget} = new CFPlus::UI::Label
1375 align => 0,
1376 valign => 1,
1377 text => $self->{title},
1378 fontsize => $self->{border},
1379 if exists $self->{title};
1380
1381 if ($self->{has_close_button}) {
1382 $self->{close_button} =
1383 new CFPlus::UI::ImageButton
1384 path => 'x1_close.png',
1385 on_activate => sub { $self->emit ("delete") };
1386
1387 $self->CFPlus::UI::Container::add ($self->{close_button});
1388 }
1389
1390 $self
1391}
1392
1393sub add {
1394 my ($self, @widgets) = @_;
1395
1396 $self->SUPER::add (@widgets);
1397 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1398 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1399}
1400
1401sub border {
1402 int $_[0]{border} * $::FONTSIZE
1403}
1404
1405sub size_request {
1406 my ($self) = @_;
1407
1408 $self->{title_widget}->size_request
1409 if $self->{title_widget};
1410
1411 $self->{close_button}->size_request
1412 if $self->{close_button};
1413
1414 my ($w, $h) = $self->SUPER::size_request;
1415
1416 (
1417 $w + $self->border * 2,
1418 $h + $self->border * 2,
1419 )
1420}
1421
1422sub invoke_size_allocate {
1423 my ($self, $w, $h) = @_;
1424
1425 if ($self->{title_widget}) {
1426 $self->{title_widget}{w} = $w;
1427 $self->{title_widget}{h} = $h;
1428 $self->{title_widget}->invoke_size_allocate ($w, $h);
1429 }
1430
1431 my $border = $self->border;
1432
1433 $h -= List::Util::max 0, $border * 2;
1434 $w -= List::Util::max 0, $border * 2;
1435
1436 $self->child->configure ($border, $border, $w, $h);
1437
1438 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1439 if $self->{close_button};
1440
1441 1
1442}
1443
1444sub invoke_delete {
1445 my ($self) = @_;
1446
1447 $self->hide;
1448
1449 1
1450}
1451
908sub button_down { 1452sub invoke_button_down {
909 my ($self, $ev, $x, $y) = @_; 1453 my ($self, $ev, $x, $y) = @_;
910 1454
911 my ($w, $h) = @$self{qw(w h)}; 1455 my ($w, $h) = @$self{qw(w h)};
912 my $border = $self->border; 1456 my $border = $self->border;
913 1457
… …
926 my ($ev, $x, $y) = @_; 1470 my ($ev, $x, $y) = @_;
927 1471
928 my $dx = $ev->{x} - $ox; 1472 my $dx = $ev->{x} - $ox;
929 my $dy = $ev->{y} - $oy; 1473 my $dy = $ev->{y} - $oy;
930 1474
931 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1475 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
932 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1476 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1477
933 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1478 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
934 $self->check_size; 1479 $self->realloc;
935 }; 1480 };
936 1481
937 } elsif ($lr ^ $td) { 1482 } elsif ($lr ^ $td) {
938 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1483 my ($ox, $oy) = ($ev->{x}, $ev->{y});
939 my ($bx, $by) = ($self->{x}, $self->{y}); 1484 my ($bx, $by) = ($self->{x}, $self->{y});
… …
941 $self->{motion} = sub { 1486 $self->{motion} = sub {
942 my ($ev, $x, $y) = @_; 1487 my ($ev, $x, $y) = @_;
943 1488
944 ($x, $y) = ($ev->{x}, $ev->{y}); 1489 ($x, $y) = ($ev->{x}, $ev->{y});
945 1490
946 $self->move ($bx + $x - $ox, $by + $y - $oy); 1491 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
947 $self->update; 1492 # HACK: the next line is required to enforce placement
1493 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
948 }; 1494 };
1495 } else {
1496 return 0;
1497 }
1498
949 } 1499 1
950} 1500}
951 1501
952sub button_up { 1502sub invoke_button_up {
953 my ($self, $ev, $x, $y) = @_; 1503 my ($self, $ev, $x, $y) = @_;
954 1504
955 delete $self->{motion}; 1505 ! ! delete $self->{motion}
956} 1506}
957 1507
958sub mouse_motion { 1508sub invoke_mouse_motion {
959 my ($self, $ev, $x, $y) = @_; 1509 my ($self, $ev, $x, $y) = @_;
960 1510
961 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1511 $self->{motion}->($ev, $x, $y) if $self->{motion};
1512
1513 ! ! $self->{motion}
1514}
1515
1516sub invoke_visibility_change {
1517 my ($self, $visible) = @_;
1518
1519 delete $self->{motion} unless $visible;
1520
1521 0
962} 1522}
963 1523
964sub _draw { 1524sub _draw {
965 my ($self) = @_; 1525 my ($self) = @_;
966 1526
1527 my $child = $self->{children}[0];
1528
967 my ($w, $h ) = ($self->{w}, $self->{h}); 1529 my ($w, $h ) = ($self->{w}, $self->{h});
968 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1530 my ($cw, $ch) = ($child->{w}, $child->{h});
969 1531
970 glEnable GL_TEXTURE_2D; 1532 glEnable GL_TEXTURE_2D;
971 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
972 1534
973 my $border = $self->border; 1535 my $border = $self->border;
974 1536
975 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
976 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
977 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
978 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
979 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542
1543 # move
1544 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549
1550 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
980 1556
981 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
982 my $bg = $tex[0]; 1558 glColor @{ $self->{bg} };
983 1559
984 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
1561 # solve this better(?)
985 my $rep_x = $cw / $bg->{w}; 1562 $bg->{s} = $cw / $bg->{w};
986 my $rep_y = $ch / $bg->{h}; 1563 $bg->{t} = $ch / $bg->{h};
987
988 glColor @{ $self->{bg} };
989
990 $bg->{s} = $rep_x;
991 $bg->{t} = $rep_y;
992 $bg->{wrap_mode} = 1;
993 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1564 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
994 } 1565 }
995 1566
996 glDisable GL_TEXTURE_2D; 1567 glDisable GL_TEXTURE_2D;
997 1568
998 $self->{title}->draw if $self->{title};
999
1000 $self->child->draw; 1569 $child->draw;
1570
1571 if ($self->{title_widget}) {
1572 glTranslate 0, $border - $self->{h};
1573 $self->{title_widget}->_draw;
1574
1575 glTranslate 0, - ($border - $self->{h});
1576 }
1577
1578 $self->{close_button}->draw
1579 if $self->{close_button};
1001} 1580}
1002 1581
1003############################################################################# 1582#############################################################################
1004 1583
1005package CFClient::UI::Table; 1584package CFPlus::UI::Table;
1006 1585
1007our @ISA = CFClient::UI::Base::; 1586our @ISA = CFPlus::UI::Base::;
1008 1587
1009use List::Util qw(max sum); 1588use List::Util qw(max sum);
1010 1589
1011use CFClient::OpenGL; 1590use CFPlus::OpenGL;
1012 1591
1013sub new { 1592sub new {
1014 my $class = shift; 1593 my $class = shift;
1015 1594
1016 $class->SUPER::new ( 1595 $class->SUPER::new (
1596 children => [],
1017 col_expand => [], 1597 col_expand => [],
1598 row_expand => [],
1018 @_ 1599 @_,
1019 ) 1600 )
1020}
1021
1022sub add {
1023 my ($self, $x, $y, $child) = @_;
1024
1025 $child->set_parent ($self);
1026 $self->{children}[$y][$x] = $child;
1027
1028 $child->check_size;
1029} 1601}
1030 1602
1031sub children { 1603sub children {
1032 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1604 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1033} 1605}
1034 1606
1607# TODO: store row/col info in child widget and use standard add/del
1608sub add {
1609 my $self = shift;
1610
1611 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1612 $self->add_at (@_);
1613}
1614
1615sub add_at {
1616 my $self = shift;
1617
1618 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620
1621 $child->set_parent ($self);
1622 $self->{children}[$row][$col] = $child;
1623 }
1624
1625 $self->{force_realloc} = 1;
1626 $self->{force_size_alloc} = 1;
1627 $self->realloc;
1628}
1629
1630sub remove {
1631 my ($self, $child) = @_;
1632
1633 for (@{ $self->{children} }) {
1634 for (@{ $_ || [] }) {
1635 $_ = undef if $_ == $child;
1636 }
1637 }
1638}
1639
1035# TODO: move to container class maybe? send childs a signal on removal? 1640# TODO: move to container class maybe? send children a signal on removal?
1036sub clear { 1641sub clear {
1037 my ($self) = @_; 1642 my ($self) = @_;
1038 1643
1039 my @children = $self->children; 1644 my @children = $self->children;
1040 delete $self->{children}; 1645 delete $self->{children};
… …
1042 for (@children) { 1647 for (@children) {
1043 delete $_->{parent}; 1648 delete $_->{parent};
1044 $_->hide; 1649 $_->hide;
1045 } 1650 }
1046 1651
1047 $self->update; 1652 $self->realloc;
1048} 1653}
1049 1654
1050sub get_wh { 1655sub get_wh {
1051 my ($self) = @_; 1656 my ($self) = @_;
1052 1657
… …
1078 (sum @$ws), 1683 (sum @$ws),
1079 (sum @$hs), 1684 (sum @$hs),
1080 ) 1685 )
1081} 1686}
1082 1687
1083sub size_allocate { 1688sub invoke_size_allocate {
1084 my ($self, $w, $h) = @_; 1689 my ($self, $w, $h) = @_;
1085 1690
1086 my ($ws, $hs) = $self->get_wh; 1691 my ($ws, $hs) = $self->get_wh;
1087 1692
1088 my $req_w = sum @$ws; 1693 my $req_w = (sum @$ws) || 1;
1089 my $req_h = sum @$hs; 1694 my $req_h = (sum @$hs) || 1;
1090 1695
1091 # TODO: nicer code && do row_expand 1696 # TODO: nicer code
1092 my @col_expand = @{$self->{col_expand}}; 1697 my @col_expand = @{$self->{col_expand}};
1093 @col_expand = (1) x @$ws unless @col_expand; 1698 @col_expand = (1) x @$ws unless @col_expand;
1094 my $col_expand = (sum @col_expand) || 1; 1699 my $col_expand = (sum @col_expand) || 1;
1095 1700
1096 # linearly scale sizes
1097 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1701 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1098 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1099 1702
1100 CFClient::UI::harmonize $ws; 1703 CFPlus::UI::harmonize $ws;
1704
1705 my @row_expand = @{$self->{row_expand}};
1706 @row_expand = (1) x @$ws unless @row_expand;
1707 my $row_expand = (sum @row_expand) || 1;
1708
1709 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1710
1101 CFClient::UI::harmonize $hs; 1711 CFPlus::UI::harmonize $hs;
1102 1712
1103 my $y; 1713 my $y;
1104 1714
1105 for my $r (0 .. $#{$self->{children}}) { 1715 for my $r (0 .. $#{$self->{children}}) {
1106 my $row = $self->{children}[$r] 1716 my $row = $self->{children}[$r]
… …
1120 } 1730 }
1121 1731
1122 $y += $row_h; 1732 $y += $row_h;
1123 } 1733 }
1124 1734
1735 1
1125} 1736}
1126 1737
1127sub find_widget { 1738sub find_widget {
1128 my ($self, $x, $y) = @_; 1739 my ($self, $x, $y) = @_;
1129 1740
… …
1148 } 1759 }
1149} 1760}
1150 1761
1151############################################################################# 1762#############################################################################
1152 1763
1153package CFClient::UI::HBox; 1764package CFPlus::UI::Fixed;
1154 1765
1155# TODO: wrap into common Box base class 1766use List::Util qw(min max);
1156 1767
1157our @ISA = CFClient::UI::Container::; 1768our @ISA = CFPlus::UI::Container::;
1769
1770sub add {
1771 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1772
1773 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1774 $self->SUPER::add ($child);
1775}
1776
1777sub _scale($$$) {
1778 my ($mode, $val, $max) = @_;
1779
1780 $mode eq "abs" ? $val
1781 : $mode eq "rel" ? $val * $max
1782 : 0
1783}
1158 1784
1159sub size_request { 1785sub size_request {
1160 my ($self) = @_; 1786 my ($self) = @_;
1161 1787
1162 my @alloc = map [$_->size_request], @{$self->{children}}; 1788 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1163 1789
1790 # determine overall size by querying abs widgets
1791 for my $child ($self->visible_children) {
1792 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1793
1794 if ($pos eq "abs") {
1795 $w = _scale $size, $w, $child->{req_w};
1796 $h = _scale $size, $h, $child->{req_h};
1797
1798 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1799 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1800 }
1164 ( 1801 }
1165 (List::Util::sum map $_->[0], @alloc), 1802
1166 (List::Util::max map $_->[1], @alloc), 1803 my $W = $x2 - $x1;
1804 my $H = $y2 - $y1;
1805
1806 # now layout remaining widgets
1807 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1809
1810 if ($pos ne "abs") {
1811 $x = _scale $pos, $x, $W;
1812 $y = _scale $pos, $x, $H;
1813 $w = _scale $size, $w, $child->{req_w};
1814 $h = _scale $size, $h, $child->{req_h};
1815
1816 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1817 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1818 }
1819 }
1820
1821 my $W = $x2 - $x1;
1822 my $H = $y2 - $y1;
1823
1824 ($W, $H)
1825}
1826
1827sub invoke_size_allocate {
1828 my ($self, $W, $H) = @_;
1829
1830 for my $child ($self->visible_children) {
1831 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1832
1833 $x = _scale $pos, $x, $W;
1834 $y = _scale $pos, $x, $H;
1835 $w = _scale $size, $w, $child->{req_w};
1836 $h = _scale $size, $h, $child->{req_h};
1837
1838 $child->configure ($x, $y, $w, $h);
1839 }
1840
1841 1
1842}
1843
1844#############################################################################
1845
1846package CFPlus::UI::Box;
1847
1848our @ISA = CFPlus::UI::Container::;
1849
1850sub size_request {
1851 my ($self) = @_;
1852
1853 $self->{vertical}
1854 ? (
1855 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1856 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1857 )
1858 : (
1859 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1860 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1861 )
1862}
1863
1864sub invoke_size_allocate {
1865 my ($self, $w, $h) = @_;
1866
1867 my $space = $self->{vertical} ? $h : $w;
1868 my @children = $self->visible_children;
1869
1870 my @req;
1871
1872 if ($self->{homogeneous}) {
1873 @req = ($space / (@children || 1)) x @children;
1874 } else {
1875 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1876 my $req = List::Util::sum @req;
1877
1878 if ($req > $space) {
1879 # ah well, not enough space
1880 $_ *= $space / $req for @req;
1881 } else {
1882 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1883
1884 $space = ($space - $req) / $expand; # remaining space to give away
1885
1886 $req[$_] += $space * $children[$_]{expand}
1887 for 0 .. $#children;
1888 }
1889 }
1890
1891 CFPlus::UI::harmonize \@req;
1892
1893 my $pos = 0;
1894 for (0 .. $#children) {
1895 my $alloc = $req[$_];
1896 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1897
1898 $pos += $alloc;
1899 }
1900
1901 1
1902}
1903
1904#############################################################################
1905
1906package CFPlus::UI::HBox;
1907
1908our @ISA = CFPlus::UI::Box::;
1909
1910sub new {
1911 my $class = shift;
1912
1913 $class->SUPER::new (
1914 vertical => 0,
1915 @_,
1167 ) 1916 )
1168} 1917}
1169 1918
1170sub size_allocate {
1171 my ($self, $w, $h) = @_;
1172
1173 ($h, $w) = ($w, $h);
1174
1175 my $children = $self->{children};
1176
1177 my @h = map $_->{req_w}, @$children;
1178
1179 my $req_h = List::Util::sum @h;
1180
1181 if ($req_h > $h) {
1182 # ah well, not enough space
1183 $_ *= $h / $req_h for @h;
1184 } else {
1185 my $exp = List::Util::sum map $_->{expand}, @$children;
1186 $exp ||= 1;
1187
1188 for (0 .. $#$children) {
1189 my $child = $children->[$_];
1190
1191 my $alloc_h = $h[$_];
1192 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1193 $h[$_] = $alloc_h;
1194 }
1195 }
1196
1197 CFClient::UI::harmonize \@h;
1198
1199 my $y = 0;
1200 for (0 .. $#$children) {
1201 my $child = $children->[$_];
1202 my $h = $h[$_];
1203 $child->configure ($y, 0, $h, $w);
1204
1205 $y += $h;
1206 }
1207
1208 1
1209}
1210
1211############################################################################# 1919#############################################################################
1212 1920
1213package CFClient::UI::VBox; 1921package CFPlus::UI::VBox;
1214 1922
1215# TODO: wrap into common Box base class 1923our @ISA = CFPlus::UI::Box::;
1216 1924
1217our @ISA = CFClient::UI::Container::; 1925sub new {
1926 my $class = shift;
1218 1927
1219sub size_request { 1928 $class->SUPER::new (
1220 my ($self) = @_; 1929 vertical => 1,
1221 1930 @_,
1222 my @alloc = map [$_->size_request], @{$self->{children}};
1223
1224 (
1225 (List::Util::max map $_->[0], @alloc),
1226 (List::Util::sum map $_->[1], @alloc),
1227 ) 1931 )
1228} 1932}
1229 1933
1230sub size_allocate {
1231 my ($self, $w, $h) = @_;
1232
1233 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1234
1235 my $children = $self->{children};
1236
1237 my @h = map $_->{req_h}, @$children;
1238
1239 my $req_h = List::Util::sum @h;
1240
1241 if ($req_h > $h) {
1242 # ah well, not enough space
1243 $_ *= $h / $req_h for @h;
1244 } else {
1245 my $exp = List::Util::sum map $_->{expand}, @$children;
1246 $exp ||= 1;
1247
1248 for (0 .. $#$children) {
1249 my $child = $children->[$_];
1250
1251 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1252 }
1253 }
1254
1255 CFClient::UI::harmonize \@h;
1256
1257 my $y = 0;
1258 for (0 .. $#$children) {
1259 my $child = $children->[$_];
1260 my $h = $h[$_];
1261 $child->configure (0, $y, $w, $h);
1262
1263 $y += $h;
1264 }
1265
1266 1
1267}
1268
1269############################################################################# 1934#############################################################################
1270 1935
1271package CFClient::UI::Label; 1936package CFPlus::UI::Label;
1272 1937
1273our @ISA = CFClient::UI::Base::; 1938our @ISA = CFPlus::UI::DrawBG::;
1274 1939
1275use CFClient::OpenGL; 1940use CFPlus::OpenGL;
1276 1941
1277sub new { 1942sub new {
1278 my ($class, %arg) = @_; 1943 my ($class, %arg) = @_;
1279 1944
1280 my $self = $class->SUPER::new ( 1945 my $self = $class->SUPER::new (
1281 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1947 #bg => none
1948 #active_bg => none
1282 #font => default_font 1949 #font => default_font
1283 #text => initial text 1950 #text => initial text
1284 #markup => initial narkup 1951 #markup => initial narkup
1952 #max_w => maximum pixel width
1953 #style => 0, # render flags
1954 ellipsise => 3, # end
1285 layout => (new CFClient::Layout), 1955 layout => (new CFPlus::Layout),
1286 fontsize => 1, 1956 fontsize => 1,
1287 align => -1, 1957 align => -1,
1288 valign => -1, 1958 valign => -1,
1289 padding => 2, 1959 padding_x => 2,
1960 padding_y => 2,
1290 can_events => 0, 1961 can_events => 0,
1291 %arg 1962 %arg
1292 ); 1963 );
1293 1964
1294 if (exists $self->{template}) { 1965 if (exists $self->{template}) {
1295 my $layout = new CFClient::Layout; 1966 my $layout = new CFPlus::Layout;
1296 $layout->set_text (delete $self->{template}); 1967 $layout->set_text (delete $self->{template});
1297 $self->{template} = $layout; 1968 $self->{template} = $layout;
1298 } 1969 }
1299 1970
1300 if (exists $self->{markup}) { 1971 if (exists $self->{markup}) {
… …
1304 } 1975 }
1305 1976
1306 $self 1977 $self
1307} 1978}
1308 1979
1309sub escape {
1310 local $_ = $_[1];
1311
1312 s/&/&amp;/g;
1313 s/>/&gt;/g;
1314 s/</&lt;/g;
1315
1316 $_[1]
1317}
1318
1319sub update { 1980sub update {
1320 my ($self) = @_; 1981 my ($self) = @_;
1321 1982
1322 delete $self->{texture}; 1983 delete $self->{texture};
1323 $self->SUPER::update; 1984 $self->SUPER::update;
1324} 1985}
1325 1986
1987sub realloc {
1988 my ($self) = @_;
1989
1990 delete $self->{ox};
1991 $self->SUPER::realloc;
1992}
1993
1326sub set_text { 1994sub set_text {
1327 my ($self, $text) = @_; 1995 my ($self, $text) = @_;
1328 1996
1329 return if $self->{text} eq "T$text"; 1997 return if $self->{text} eq "T$text";
1330 $self->{text} = "T$text"; 1998 $self->{text} = "T$text";
1331 1999
1332 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1333 $self->{layout}->set_text ($text); 2000 $self->{layout}->set_text ($text);
1334 2001
2002 delete $self->{size_req};
2003 $self->realloc;
1335 $self->update; 2004 $self->update;
1336 $self->check_size;
1337} 2005}
1338 2006
1339sub set_markup { 2007sub set_markup {
1340 my ($self, $markup) = @_; 2008 my ($self, $markup) = @_;
1341 2009
1342 return if $self->{text} eq "M$markup"; 2010 return if $self->{text} eq "M$markup";
1343 $self->{text} = "M$markup"; 2011 $self->{text} = "M$markup";
1344 2012
1345 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2013 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1346 2014
1347 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 2015 $self->{layout}->set_markup ($markup);
1349 2016
2017 delete $self->{size_req};
2018 $self->realloc;
1350 $self->update; 2019 $self->update;
1351 $self->check_size;
1352} 2020}
1353 2021
1354sub size_request { 2022sub size_request {
1355 my ($self) = @_; 2023 my ($self) = @_;
1356 2024
2025 $self->{size_req} ||= do {
1357 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2026 $self->{layout}->set_font ($self->{font}) if $self->{font};
1358 $self->{layout}->set_width ($self->{max_w} || -1); 2027 $self->{layout}->set_width ($self->{max_w} || -1);
2028 $self->{layout}->set_ellipsise ($self->{ellipsise});
2029 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1359 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2030 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1360 2031
1361 my ($w, $h) = $self->{layout}->size; 2032 my ($w, $h) = $self->{layout}->size;
1362 2033
1363 if (exists $self->{template}) { 2034 if (exists $self->{template}) {
1364 $self->{template}->set_font ($self->{font}) if $self->{font}; 2035 $self->{template}->set_font ($self->{font}) if $self->{font};
2036 $self->{template}->set_width ($self->{max_w} || -1);
1365 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2037 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1366 2038
1367 my ($w2, $h2) = $self->{template}->size; 2039 my ($w2, $h2) = $self->{template}->size;
1368 2040
1369 $w = List::Util::max $w, $w2; 2041 $w = List::Util::max $w, $w2;
1370 $h = List::Util::max $h, $h2; 2042 $h = List::Util::max $h, $h2;
2043 }
2044
2045 [$w, $h]
1371 } 2046 };
1372 2047
1373 ( 2048 @{ $self->{size_req} }
1374 $w + $self->{padding} * 2,
1375 $h + $self->{padding} * 2,
1376 )
1377} 2049}
1378 2050
2051sub baseline_shift {
2052 $_[0]{layout}->descent
2053}
2054
1379sub size_allocate { 2055sub invoke_size_allocate {
1380 my ($self, $w, $h) = @_; 2056 my ($self, $w, $h) = @_;
1381 2057
2058 delete $self->{ox};
2059
1382 delete $self->{texture}; 2060 delete $self->{texture}
2061 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2062
2063 1
1383} 2064}
1384 2065
1385sub set_fontsize { 2066sub set_fontsize {
1386 my ($self, $fontsize) = @_; 2067 my ($self, $fontsize) = @_;
1387 2068
1388 $self->{fontsize} = $fontsize; 2069 $self->{fontsize} = $fontsize;
2070 delete $self->{size_req};
1389 delete $self->{texture}; 2071 delete $self->{texture};
1390 2072
1391 $self->update; 2073 $self->realloc;
1392 $self->check_size; 2074}
2075
2076sub reconfigure {
2077 my ($self) = @_;
2078
2079 delete $self->{size_req};
2080 delete $self->{texture};
2081
2082 $self->SUPER::reconfigure;
1393} 2083}
1394 2084
1395sub _draw { 2085sub _draw {
1396 my ($self) = @_; 2086 my ($self) = @_;
1397 2087
2088 $self->SUPER::_draw; # draw background, if applicable
2089
1398 my $tex = $self->{texture} ||= do { 2090 my $size = $self->{texture} ||= do {
1399 $self->{layout}->set_foreground (@{$self->{fg}}); 2091 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2092 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $self->{layout}->set_width ($self->{w}); 2093 $self->{layout}->set_width ($self->{w});
2094 $self->{layout}->set_ellipsise ($self->{ellipsise});
2095 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 2096 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1403 2097
1404 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2098 [$self->{layout}->size]
1405
1406 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1407 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1408 : ($self->{w} - $tex->{w}) * 0.5;
1409
1410 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1411 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1412 : ($self->{h} - $tex->{h}) * 0.5;
1413
1414 $tex
1415 }; 2099 };
1416 2100
1417 glEnable GL_TEXTURE_2D; 2101 unless (exists $self->{ox}) {
1418 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2102 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
2103 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
2104 : ($self->{w} - $size->[0]) * 0.5);
1419 2105
1420 if ($tex->{format} == GL_ALPHA) { 2106 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1421 glColor @{$self->{fg}}; 2107 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1422 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 2108 : ($self->{h} - $size->[1]) * 0.5);
1423 } else {
1424 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1425 } 2109 };
1426 2110
1427 glDisable GL_TEXTURE_2D; 2111 my $w = List::Util::min $self->{w} + 4, $size->[0];
2112 my $h = List::Util::min $self->{h} + 2, $size->[1];
2113
2114 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1428} 2115}
1429 2116
1430############################################################################# 2117#############################################################################
1431 2118
1432package CFClient::UI::EntryBase; 2119package CFPlus::UI::EntryBase;
1433 2120
1434our @ISA = CFClient::UI::Label::; 2121our @ISA = CFPlus::UI::Label::;
1435 2122
1436use CFClient::OpenGL; 2123use CFPlus::OpenGL;
1437 2124
1438sub new { 2125sub new {
1439 my $class = shift; 2126 my $class = shift;
1440 2127
1441 $class->SUPER::new ( 2128 $class->SUPER::new (
… …
1445 active_fg => [0, 0, 0], 2132 active_fg => [0, 0, 0],
1446 can_hover => 1, 2133 can_hover => 1,
1447 can_focus => 1, 2134 can_focus => 1,
1448 valign => 0, 2135 valign => 0,
1449 can_events => 1, 2136 can_events => 1,
2137 ellipsise => 0,
2138 #text => ...
2139 #hidden => "*",
1450 @_ 2140 @_
1451 ) 2141 )
1452} 2142}
1453 2143
1454sub _set_text { 2144sub _set_text {
… …
1456 2146
1457 delete $self->{cur_h}; 2147 delete $self->{cur_h};
1458 2148
1459 return if $self->{text} eq $text; 2149 return if $self->{text} eq $text;
1460 2150
1461 delete $self->{texture};
1462
1463 $self->{last_activity} = $::NOW; 2151 $self->{last_activity} = $::NOW;
1464 $self->{text} = $text; 2152 $self->{text} = $text;
1465 2153
1466 $text =~ s/./*/g if $self->{hidden}; 2154 $text =~ s/./*/g if $self->{hidden};
1467 $self->{layout}->set_text ("$text "); 2155 $self->{layout}->set_text ("$text ");
2156 delete $self->{size_req};
1468 2157
1469 $self->emit (changed => $self->{text}); 2158 $self->emit (changed => $self->{text});
2159
2160 $self->realloc;
2161 $self->update;
1470} 2162}
1471 2163
1472sub set_text { 2164sub set_text {
1473 my ($self, $text) = @_; 2165 my ($self, $text) = @_;
1474 2166
1475 $self->{cursor} = length $text; 2167 $self->{cursor} = length $text;
1476 $self->_set_text ($text); 2168 $self->_set_text ($text);
1477 $self->check_size;
1478 $self->update;
1479} 2169}
1480 2170
1481sub get_text { 2171sub get_text {
1482 $_[0]{text} 2172 $_[0]{text}
1483} 2173}
… …
1488 my ($w, $h) = $self->SUPER::size_request; 2178 my ($w, $h) = $self->SUPER::size_request;
1489 2179
1490 ($w + 1, $h) # add 1 for cursor 2180 ($w + 1, $h) # add 1 for cursor
1491} 2181}
1492 2182
1493sub size_allocate {
1494 my ($self, $w, $h) = @_;
1495
1496 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1497}
1498
1499sub key_down { 2183sub invoke_key_down {
1500 my ($self, $ev) = @_; 2184 my ($self, $ev) = @_;
1501 2185
1502 my $mod = $ev->{mod}; 2186 my $mod = $ev->{mod};
1503 my $sym = $ev->{sym}; 2187 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 2188 my $uni = $ev->{unicode};
1505 2189
1506 my $text = $self->get_text; 2190 my $text = $self->get_text;
2191
2192 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1507 2193
1508 if ($uni == 8) { 2194 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2195 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($uni == 127) { 2196 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 2197 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 2198 } elsif ($sym == CFPlus::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 2199 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 2200 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2201 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 2202 } elsif ($sym == CFPlus::SDLK_HOME) {
2203 # what a hack
2204 $self->{cursor} =
2205 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2206 ? length $1
2207 : 0;
2208 } elsif ($sym == CFPlus::SDLK_END) {
2209 # uh, again
2210 $self->{cursor} =
2211 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2212 ? $self->{cursor} + length $1
2213 : length $self->{text};
2214 } elsif ($uni == 21) { # ctrl-u
2215 $text = "";
1517 $self->{cursor} = 0; 2216 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text;
1520 } elsif ($uni == 27) { 2217 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 2218 $self->emit ('escape');
1522 } elsif ($uni) { 2219 } elsif ($uni == 0x0d) {
2220 substr $text, $self->{cursor}++, 0, "\012";
2221 } elsif ($uni >= 0x20) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 2222 substr $text, $self->{cursor}++, 0, chr $uni;
2223 } else {
2224 return 0;
1524 } 2225 }
1525 2226
1526 $self->_set_text ($text); 2227 $self->_set_text ($text);
2228
2229 $self->realloc;
1527 $self->update; 2230 $self->update;
1528}
1529 2231
2232 1
2233}
2234
1530sub focus_in { 2235sub invoke_focus_in {
1531 my ($self) = @_; 2236 my ($self) = @_;
1532 2237
1533 $self->{last_activity} = $::NOW; 2238 $self->{last_activity} = $::NOW;
1534 2239
1535 $self->SUPER::focus_in; 2240 $self->SUPER::invoke_focus_in
1536} 2241}
1537 2242
1538sub button_down { 2243sub invoke_button_down {
1539 my ($self, $ev, $x, $y) = @_; 2244 my ($self, $ev, $x, $y) = @_;
1540 2245
1541 $self->SUPER::button_down ($ev, $x, $y); 2246 $self->SUPER::invoke_button_down ($ev, $x, $y);
1542 2247
1543 my $idx = $self->{layout}->xy_to_index ($x, $y); 2248 my $idx = $self->{layout}->xy_to_index ($x, $y);
1544 2249
1545 # byte-index to char-index 2250 # byte-index to char-index
1546 my $text = $self->{text}; 2251 my $text = $self->{text};
1547 utf8::encode $text; 2252 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1548 $self->{cursor} = length substr $text, 0, $idx; 2253 $self->{cursor} = length $text;
1549 2254
1550 $self->_set_text ($self->{text}); 2255 $self->_set_text ($self->{text});
1551 $self->update; 2256 $self->update;
2257
2258 1
1552} 2259}
1553 2260
1554sub mouse_motion { 2261sub invoke_mouse_motion {
1555 my ($self, $ev, $x, $y) = @_; 2262 my ($self, $ev, $x, $y) = @_;
1556# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2263# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2264
2265 1
1557} 2266}
1558 2267
1559sub _draw { 2268sub _draw {
1560 my ($self) = @_; 2269 my ($self) = @_;
1561 2270
1562 local $self->{fg} = $self->{fg}; 2271 local $self->{fg} = $self->{fg};
1563 2272
1564 if ($FOCUS == $self) { 2273 if ($FOCUS == $self) {
1565 glColor @{$self->{active_bg}}; 2274 glColor_premultiply @{$self->{active_bg}};
1566 $self->{fg} = $self->{active_fg}; 2275 $self->{fg} = $self->{active_fg};
1567 } else { 2276 } else {
1568 glColor @{$self->{bg}}; 2277 glColor_premultiply @{$self->{bg}};
1569 } 2278 }
1570 2279
1571 glEnable GL_BLEND; 2280 glEnable GL_BLEND;
1572 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1573 glBegin GL_QUADS; 2282 glBegin GL_QUADS;
1574 glVertex 0 , 0; 2283 glVertex 0 , 0;
1575 glVertex 0 , $self->{h}; 2284 glVertex 0 , $self->{h};
1576 glVertex $self->{w}, $self->{h}; 2285 glVertex $self->{w}, $self->{h};
1577 glVertex $self->{w}, 0; 2286 glVertex $self->{w}, 0;
… …
1588 utf8::encode $text; 2297 utf8::encode $text;
1589 2298
1590 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2299 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1591 } 2300 }
1592 2301
1593 glColor @{$self->{fg}};
1594 glBegin GL_LINES; 2302 glBegin GL_LINES;
1595 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2303 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1596 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2304 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1597 glEnd; 2305 glEnd;
1598 } 2306 }
1599} 2307}
1600 2308
2309#############################################################################
2310
1601package CFClient::UI::Entry; 2311package CFPlus::UI::Entry;
1602 2312
1603our @ISA = CFClient::UI::EntryBase::; 2313our @ISA = CFPlus::UI::EntryBase::;
1604 2314
1605use CFClient::OpenGL; 2315use CFPlus::OpenGL;
1606 2316
1607sub key_down { 2317sub invoke_key_down {
1608 my ($self, $ev) = @_; 2318 my ($self, $ev) = @_;
1609 2319
1610 my $sym = $ev->{sym}; 2320 my $sym = $ev->{sym};
1611 2321
1612 if ($sym == 13) { 2322 if ($ev->{uni} == 0x0d || $sym == 13) {
1613 unshift @{$self->{history}}, 2323 unshift @{$self->{history}},
1614 my $txt = $self->get_text; 2324 my $txt = $self->get_text;
2325
1615 $self->{history_pointer} = -1; 2326 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = ''; 2327 $self->{history_saveback} = '';
1617 $self->emit (activate => $txt); 2328 $self->emit (activate => $txt);
1618 $self->update; 2329 $self->update;
1619 2330
1620 } elsif ($sym == CFClient::SDLK_UP) { 2331 } elsif ($sym == CFPlus::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) { 2332 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text; 2333 $self->{history_saveback} = $self->get_text;
1623 } 2334 }
1624 if (@{$self->{history} || []} > 0) { 2335 if (@{$self->{history} || []} > 0) {
1625 $self->{history_pointer}++; 2336 $self->{history_pointer}++;
… …
1627 $self->{history_pointer} = @{$self->{history} || []} - 1; 2338 $self->{history_pointer} = @{$self->{history} || []} - 1;
1628 } 2339 }
1629 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2340 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1630 } 2341 }
1631 2342
1632 } elsif ($sym == CFClient::SDLK_DOWN) { 2343 } elsif ($sym == CFPlus::SDLK_DOWN) {
1633 $self->{history_pointer}--; 2344 $self->{history_pointer}--;
1634 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2345 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1635 2346
1636 if ($self->{history_pointer} >= 0) { 2347 if ($self->{history_pointer} >= 0) {
1637 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2348 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1638 } else { 2349 } else {
1639 $self->set_text ($self->{history_saveback}); 2350 $self->set_text ($self->{history_saveback});
1640 } 2351 }
1641 2352
1642 } else { 2353 } else {
1643 $self->SUPER::key_down ($ev); 2354 return $self->SUPER::invoke_key_down ($ev)
2355 }
2356
1644 } 2357 1
1645
1646} 2358}
1647 2359
1648############################################################################# 2360#############################################################################
1649 2361
2362package CFPlus::UI::TextEdit;
2363
2364our @ISA = CFPlus::UI::EntryBase::;
2365
2366use CFPlus::OpenGL;
2367
2368sub move_cursor_ver {
2369 my ($self, $dy) = @_;
2370
2371 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2372
2373 $y += $dy;
2374
2375 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2376 $self->{cursor} = $index;
2377 delete $self->{cur_h};
2378 $self->update;
2379 return;
2380 }
2381}
2382
2383sub invoke_key_down {
2384 my ($self, $ev) = @_;
2385
2386 my $sym = $ev->{sym};
2387
2388 if ($sym == CFPlus::SDLK_UP) {
2389 $self->move_cursor_ver (-1);
2390 } elsif ($sym == CFPlus::SDLK_DOWN) {
2391 $self->move_cursor_ver (+1);
2392 } else {
2393 return $self->SUPER::invoke_key_down ($ev)
2394 }
2395
2396 1
2397}
2398
2399#############################################################################
2400
1650package CFClient::UI::Button; 2401package CFPlus::UI::Button;
1651 2402
1652our @ISA = CFClient::UI::Label::; 2403our @ISA = CFPlus::UI::Label::;
1653 2404
1654use CFClient::OpenGL; 2405use CFPlus::OpenGL;
1655 2406
1656my @tex = 2407my @tex =
1657 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2408 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1658 qw(b1_button_active.png); 2409 qw(b1_button_inactive.png b1_button_active.png);
1659 2410
1660sub new { 2411sub new {
1661 my $class = shift; 2412 my $class = shift;
1662 2413
1663 $class->SUPER::new ( 2414 $class->SUPER::new (
1664 padding => 4, 2415 padding_x => 4,
2416 padding_y => 4,
2417 fg => [1.0, 1.0, 1.0],
2418 active_fg => [0.8, 0.8, 0.8],
2419 can_hover => 1,
2420 align => 0,
2421 valign => 0,
2422 can_events => 1,
2423 @_
2424 )
2425}
2426
2427sub invoke_button_up {
2428 my ($self, $ev, $x, $y) = @_;
2429
2430 $self->emit ("activate")
2431 if $x >= 0 && $x < $self->{w}
2432 && $y >= 0 && $y < $self->{h};
2433
2434 1
2435}
2436
2437sub _draw {
2438 my ($self) = @_;
2439
2440 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2441
2442 glEnable GL_TEXTURE_2D;
2443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2444 glColor 0, 0, 0, 1;
2445
2446 my $tex = $tex[$GRAB == $self];
2447 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2448
2449 glDisable GL_TEXTURE_2D;
2450
2451 $self->SUPER::_draw;
2452}
2453
2454#############################################################################
2455
2456package CFPlus::UI::CheckBox;
2457
2458our @ISA = CFPlus::UI::DrawBG::;
2459
2460my @tex =
2461 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2462 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2463
2464use CFPlus::OpenGL;
2465
2466sub new {
2467 my $class = shift;
2468
2469 $class->SUPER::new (
2470 padding_x => 2,
2471 padding_y => 2,
2472 fg => [1, 1, 1],
2473 active_fg => [1, 1, 0],
2474 bg => [0, 0, 0, 0.2],
2475 active_bg => [1, 1, 1, 0.5],
2476 state => 0,
2477 can_hover => 1,
2478 @_
2479 )
2480}
2481
2482sub size_request {
2483 my ($self) = @_;
2484
2485 (6) x 2
2486}
2487
2488sub toggle {
2489 my ($self) = @_;
2490
2491 $self->{state} = !$self->{state};
2492 $self->emit (changed => $self->{state});
2493 $self->update;
2494}
2495
2496sub invoke_button_down {
2497 my ($self, $ev, $x, $y) = @_;
2498
2499 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2500 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2501 $self->toggle;
2502 } else {
2503 return 0
2504 }
2505
2506 1
2507}
2508
2509sub _draw {
2510 my ($self) = @_;
2511
2512 $self->SUPER::_draw;
2513
2514 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2515
2516 my ($w, $h) = @$self{qw(w h)};
2517
2518 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2519
2520 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2521
2522 my $tex = $self->{state} ? $tex[1] : $tex[0];
2523
2524 glEnable GL_TEXTURE_2D;
2525 $tex->draw_quad_alpha (0, 0, $s, $s);
2526 glDisable GL_TEXTURE_2D;
2527}
2528
2529#############################################################################
2530
2531package CFPlus::UI::Image;
2532
2533our @ISA = CFPlus::UI::Base::;
2534
2535use CFPlus::OpenGL;
2536
2537our %texture_cache;
2538
2539sub new {
2540 my $class = shift;
2541
2542 my $self = $class->SUPER::new (
2543 can_events => 0,
2544 @_,
2545 );
2546
2547 $self->{path} || $self->{tex}
2548 or Carp::croak "'path' or 'tex' attributes required";
2549
2550 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2551 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2552
2553 CFPlus::weaken $texture_cache{$self->{path}};
2554
2555 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2556
2557 $self
2558}
2559
2560sub STORABLE_freeze {
2561 my ($self, $cloning) = @_;
2562
2563 $self->{path}
2564 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2565
2566 $self->{path}
2567}
2568
2569sub STORABLE_attach {
2570 my ($self, $cloning, $path) = @_;
2571
2572 $self->new (path => $path)
2573}
2574
2575sub size_request {
2576 my ($self) = @_;
2577
2578 ($self->{tex}{w}, $self->{tex}{h})
2579}
2580
2581sub _draw {
2582 my ($self) = @_;
2583
2584 my $tex = $self->{tex};
2585
2586 my ($w, $h) = ($self->{w}, $self->{h});
2587
2588 if ($self->{rot90}) {
2589 glRotate 90, 0, 0, 1;
2590 glTranslate 0, -$self->{w}, 0;
2591
2592 ($w, $h) = ($h, $w);
2593 }
2594
2595 glEnable GL_TEXTURE_2D;
2596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2597
2598 $tex->draw_quad (0, 0, $w, $h);
2599
2600 glDisable GL_TEXTURE_2D;
2601}
2602
2603#############################################################################
2604
2605package CFPlus::UI::ImageButton;
2606
2607our @ISA = CFPlus::UI::Image::;
2608
2609use CFPlus::OpenGL;
2610
2611my %textures;
2612
2613sub new {
2614 my $class = shift;
2615
2616 my $self = $class->SUPER::new (
2617 padding_x => 4,
2618 padding_y => 4,
1665 fg => [1, 1, 1], 2619 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 2620 active_fg => [0, 0, 1],
1668 can_hover => 1, 2621 can_hover => 1,
1669 align => 0, 2622 align => 0,
1670 valign => 0, 2623 valign => 0,
1671 can_events => 1, 2624 can_events => 1,
1672 @_ 2625 @_
1673 ) 2626 );
1674} 2627}
1675 2628
1676sub button_up { 2629sub invoke_button_up {
1677 my ($self, $ev, $x, $y) = @_; 2630 my ($self, $ev, $x, $y) = @_;
1678 2631
2632 $self->emit ("activate")
1679 if ($x >= 0 && $x < $self->{w} 2633 if $x >= 0 && $x < $self->{w}
1680 && $y >= 0 && $y < $self->{h}) { 2634 && $y >= 0 && $y < $self->{h};
1681 $self->emit ("activate"); 2635
1682 } 2636 1
1683}
1684
1685sub _draw {
1686 my ($self) = @_;
1687
1688 local $self->{fg} = $self->{fg};
1689
1690 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg};
1692 }
1693
1694 glEnable GL_TEXTURE_2D;
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1696 glColor 0, 0, 0, 1;
1697
1698 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1699
1700 glDisable GL_TEXTURE_2D;
1701
1702 $self->SUPER::_draw;
1703} 2637}
1704 2638
1705############################################################################# 2639#############################################################################
1706 2640
1707package CFClient::UI::CheckBox;
1708
1709our @ISA = CFClient::UI::DrawBG::;
1710
1711my @tex =
1712 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1713 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1714
1715use CFClient::OpenGL;
1716
1717sub new {
1718 my $class = shift;
1719
1720 $class->SUPER::new (
1721 padding => 2,
1722 fg => [1, 1, 1],
1723 active_fg => [1, 1, 0],
1724 state => 0,
1725 can_hover => 1,
1726 @_
1727 )
1728}
1729
1730sub size_request {
1731 my ($self) = @_;
1732
1733 ($self->{padding} * 2 + 6) x 2
1734}
1735
1736sub button_down {
1737 my ($self, $ev, $x, $y) = @_;
1738
1739 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1740 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1741 $self->{state} = !$self->{state};
1742 $self->emit (changed => $self->{state});
1743 }
1744}
1745
1746sub _draw {
1747 my ($self) = @_;
1748
1749 $self->SUPER::_draw;
1750
1751 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1752
1753 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1754
1755 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1756
1757 my $tex = $self->{state} ? $tex[1] : $tex[0];
1758
1759 glEnable GL_TEXTURE_2D;
1760 $tex->draw_quad_alpha (0, 0, $s, $s);
1761 glDisable GL_TEXTURE_2D;
1762}
1763
1764#############################################################################
1765
1766package CFClient::UI::Image; 2641package CFPlus::UI::VGauge;
1767 2642
1768our @ISA = CFClient::UI::Base::; 2643our @ISA = CFPlus::UI::Base::;
1769
1770use CFClient::OpenGL;
1771use Carp qw/confess/;
1772
1773our %loaded_images;
1774
1775sub new {
1776 my $class = shift;
1777
1778 my $self = $class->SUPER::new (can_events => 0, @_);
1779
1780 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1781
1782 $loaded_images{$self->{image}} ||=
1783 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1784
1785 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1786
1787 Scalar::Util::weaken $loaded_images{$self->{image}};
1788
1789 $self->{aspect} = $tex->{w} / $tex->{h};
1790
1791 $self
1792}
1793
1794sub size_request {
1795 my ($self) = @_;
1796
1797 ($self->{tex}->{w}, $self->{tex}->{h})
1798}
1799
1800sub _draw {
1801 my ($self) = @_;
1802
1803 my $tex = $self->{tex};
1804
1805 my ($w, $h) = ($self->{w}, $self->{h});
1806
1807 if ($self->{rot90}) {
1808 glRotate 90, 0, 0, 1;
1809 glTranslate 0, -$self->{w}, 0;
1810
1811 ($w, $h) = ($h, $w);
1812 }
1813
1814 glEnable GL_TEXTURE_2D;
1815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1816
1817 $tex->draw_quad_alpha (0, 0, $w, $h);
1818
1819 glDisable GL_TEXTURE_2D;
1820}
1821
1822#############################################################################
1823
1824package CFClient::UI::VGauge;
1825
1826our @ISA = CFClient::UI::Base::;
1827 2644
1828use List::Util qw(min max); 2645use List::Util qw(min max);
1829 2646
1830use CFClient::OpenGL; 2647use CFPlus::OpenGL;
1831 2648
1832my %tex = ( 2649my %tex = (
1833 food => [ 2650 food => [
1834 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2651 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1835 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2652 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1836 ], 2653 ],
1837 grace => [ 2654 grace => [
1838 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2655 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1839 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2656 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1840 ], 2657 ],
1841 hp => [ 2658 hp => [
1842 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2659 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1843 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2660 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1844 ], 2661 ],
1845 mana => [ 2662 mana => [
1846 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2663 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1847 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2664 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1848 ], 2665 ],
1849); 2666);
1850 2667
1851# eg. VGauge->new (gauge => 'food'), default gauge: food 2668# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1911 my $ycut1 = max 0, min 1, $ycut; 2728 my $ycut1 = max 0, min 1, $ycut;
1912 my $ycut2 = max 0, min 1, $ycut - 1; 2729 my $ycut2 = max 0, min 1, $ycut - 1;
1913 2730
1914 my $h1 = $self->{h} * (1 - $ycut1); 2731 my $h1 = $self->{h} * (1 - $ycut1);
1915 my $h2 = $self->{h} * (1 - $ycut2); 2732 my $h2 = $self->{h} * (1 - $ycut2);
2733 my $h3 = $self->{h};
2734
2735 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1916 2736
1917 glEnable GL_BLEND; 2737 glEnable GL_BLEND;
1918 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2738 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2739 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1919 glEnable GL_TEXTURE_2D; 2740 glEnable GL_TEXTURE_2D;
1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921 2742
1922 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2743 glBindTexture GL_TEXTURE_2D, $t1->{name};
1923 glBegin GL_QUADS; 2744 glBegin GL_QUADS;
… …
1938 2759
1939 if ($t3) { 2760 if ($t3) {
1940 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2761 glBindTexture GL_TEXTURE_2D, $t3->{name};
1941 glBegin GL_QUADS; 2762 glBegin GL_QUADS;
1942 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2763 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1943 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2764 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1944 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2765 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1945 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2766 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1946 glEnd; 2767 glEnd;
1947 } 2768 }
1948 2769
1949 glDisable GL_BLEND; 2770 glDisable GL_BLEND;
1950 glDisable GL_TEXTURE_2D; 2771 glDisable GL_TEXTURE_2D;
1951} 2772}
1952 2773
1953############################################################################# 2774#############################################################################
1954 2775
1955package CFClient::UI::Gauge; 2776package CFPlus::UI::Gauge;
1956 2777
1957our @ISA = CFClient::UI::VBox::; 2778our @ISA = CFPlus::UI::VBox::;
1958 2779
1959sub new { 2780sub new {
1960 my ($class, %arg) = @_; 2781 my ($class, %arg) = @_;
1961 2782
1962 my $self = $class->SUPER::new ( 2783 my $self = $class->SUPER::new (
… …
1964 can_hover => 1, 2785 can_hover => 1,
1965 can_events => 1, 2786 can_events => 1,
1966 %arg, 2787 %arg,
1967 ); 2788 );
1968 2789
1969 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2790 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
1970 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2791 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1971 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2792 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
1972 2793
1973 $self 2794 $self
1974} 2795}
1975 2796
1976sub set_fontsize { 2797sub set_fontsize {
… …
1997 $self->{value}->set_text ($val); 2818 $self->{value}->set_text ($val);
1998} 2819}
1999 2820
2000############################################################################# 2821#############################################################################
2001 2822
2002package CFClient::UI::Slider; 2823package CFPlus::UI::Slider;
2003 2824
2004use strict; 2825use strict;
2005 2826
2006use CFClient::OpenGL; 2827use CFPlus::OpenGL;
2007 2828
2008our @ISA = CFClient::UI::DrawBG::; 2829our @ISA = CFPlus::UI::DrawBG::;
2009 2830
2010my @tex = 2831my @tex =
2011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2832 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2012 qw(s1_slider.png s1_slider_bg.png); 2833 qw(s1_slider.png s1_slider_bg.png);
2013 2834
2014sub new { 2835sub new {
2015 my $class = shift; 2836 my $class = shift;
2016 2837
2017 # range [value, low, high, page] 2838 # range [value, low, high, page, unit]
2018 2839
2019 # TODO: 0-width page 2840 # TODO: 0-width page
2020 # TODO: req_w/h are wrong with vertical 2841 # TODO: req_w/h are wrong with vertical
2021 # TODO: calculations are off 2842 # TODO: calculations are off
2022 my $self = $class->SUPER::new ( 2843 my $self = $class->SUPER::new (
2023 fg => [1, 1, 1], 2844 fg => [1, 1, 1],
2024 active_fg => [0, 0, 0], 2845 active_fg => [0, 0, 0],
2846 bg => [0, 0, 0, 0.2],
2847 active_bg => [1, 1, 1, 0.5],
2025 range => [0, 0, 100, 10], 2848 range => [0, 0, 100, 10, 0],
2026 req_w => $::WIDTH / 80, 2849 min_w => $::WIDTH / 80,
2027 req_h => $::WIDTH / 80, 2850 min_h => $::WIDTH / 80,
2028 vertical => 0, 2851 vertical => 0,
2029 can_hover => 1, 2852 can_hover => 1,
2030 inner_pad => 5, 2853 inner_pad => 0.02,
2031 @_ 2854 @_
2032 ); 2855 );
2033 2856
2857 $self->set_value ($self->{range}[0]);
2858 $self->update;
2859
2034 $self 2860 $self
2035} 2861}
2036 2862
2863sub set_range {
2864 my ($self, $range) = @_;
2865
2866 ($range, $self->{range}) = ($self->{range}, $range);
2867
2868 if ("@$range" ne "@{$self->{range}}") {
2869 $self->update;
2870 $self->set_value ($self->{range}[0]);
2871 }
2872}
2873
2874sub set_value {
2875 my ($self, $value) = @_;
2876
2877 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2878
2879 $hi = $lo + 1 if $hi <= $lo;
2880
2881 $page = $hi - $lo if $page > $hi - $lo;
2882
2883 $value = $lo if $value < $lo;
2884 $value = $hi - $page if $value > $hi - $page;
2885
2886 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2887 if $unit;
2888
2889 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2890
2891 if ($value != $old_value) {
2892 $self->emit (changed => $value);
2893 $self->update;
2894 }
2895}
2896
2037sub size_request { 2897sub size_request {
2038 my ($self) = @_; 2898 my ($self) = @_;
2039 2899
2040 my $w = $self->{req_w}; 2900 ($self->{req_w}, $self->{req_h})
2041 my $h = $self->{req_h};
2042
2043 $self->{vertical} ? ($h, $w) : ($w, $h)
2044} 2901}
2045 2902
2046sub button_down { 2903sub invoke_button_down {
2047 my ($self, $ev, $x, $y) = @_; 2904 my ($self, $ev, $x, $y) = @_;
2048 2905
2049 $self->SUPER::button_down ($ev, $x, $y); 2906 $self->SUPER::invoke_button_down ($ev, $x, $y);
2907
2908 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2909
2050 $self->mouse_motion ($ev, $x, $y); 2910 $self->invoke_mouse_motion ($ev, $x, $y)
2051} 2911}
2052 2912
2053sub mouse_motion { 2913sub invoke_mouse_motion {
2054 my ($self, $ev, $x, $y) = @_; 2914 my ($self, $ev, $x, $y) = @_;
2055 2915
2056 if ($GRAB == $self) { 2916 if ($GRAB == $self) {
2917 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2918
2919 my (undef, $lo, $hi, $page) = @{$self->{range}};
2920
2921 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2922
2923 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2924 } else {
2925 return 0;
2926 }
2927
2928 1
2929}
2930
2931sub invoke_mouse_wheel {
2932 my ($self, $ev) = @_;
2933
2934 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2935
2936 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2937
2938 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2939
2940 ! ! $delta
2941}
2942
2943sub update {
2944 my ($self) = @_;
2945
2946 delete $self->{knob_w};
2947 $self->SUPER::update;
2948}
2949
2950sub _draw {
2951 my ($self) = @_;
2952
2953 unless ($self->{knob_w}) {
2954 $self->set_value ($self->{range}[0]);
2955
2057 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2956 my ($value, $lo, $hi, $page) = @{$self->{range}};
2957 my $range = ($hi - $page - $lo) || 1e-100;
2058 2958
2059 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2959 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2060 2960
2061 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2961 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2062 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2962 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2063 2963
2064 $x -= $inner_pad_px; # substract the padding 2964 $value = ($value - $lo) / $range;
2065 $x = $x * ($hi - $lo) / $inner_w + $lo; 2965 $value = $value * $self->{scale} + $self->{offset};
2066 $x = $lo if $x < $lo;
2067 $x = $hi - $page if $x > $hi - $page;
2068 $self->{range}[0] = $x;
2069 2966
2070 $self->emit (changed => $x); 2967 $self->{knob_x} = $value - $knob_w * 0.5;
2071 $self->update; 2968 $self->{knob_w} = $knob_w;
2072 } 2969 }
2073}
2074
2075# the inner_* stuff is for generating a padding for the slider handle,
2076# so that the handle doesn't leave the texture. This calculation isn't 100%
2077# correct propably, but it does the job for now
2078sub _calc_inner_pad_px {
2079 my ($self, $w) = @_;
2080 ($w / 100) * $self->{inner_pad} # % to pixels
2081}
2082
2083sub _draw {
2084 my ($self) = @_;
2085 2970
2086 $self->SUPER::_draw (); 2971 $self->SUPER::_draw ();
2087 2972
2088 my ($w, $h) = @$self{qw(w h)}; 2973 glScale $self->{w}, $self->{h};
2089 2974
2090 if ($self->{vertical}) { 2975 if ($self->{vertical}) {
2091 # draw a vertical slider like a rotated horizontal slider 2976 # draw a vertical slider like a rotated horizontal slider
2092 2977
2978 glTranslate 1, 0, 0;
2093 glRotate 90, 0, 0, 1; 2979 glRotate 90, 0, 0, 1;
2094 glTranslate 0, -$self->{w}, 0;
2095
2096 ($w, $h) = ($h, $w);
2097 } 2980 }
2098 2981
2099 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2982 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2100 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2983 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2101 2984
2102 my ($value, $lo, $hi, $page) = @{$self->{range}};
2103
2104 $hi = $value + 1 if $lo == $hi;
2105
2106 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2107 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2108
2109 $page = int $page * $inner_w / ($hi - $lo);
2110 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2111
2112 $w -= $page;
2113 $page &= ~1;
2114 glTranslate $page * 0.5, 0, 0;
2115 $page ||= 2;
2116
2117 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2118 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2119
2120 glEnable GL_TEXTURE_2D; 2985 glEnable GL_TEXTURE_2D;
2121 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2122 2987
2123 # draw background 2988 # draw background
2124 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2989 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2125 2990
2126 # draw handle 2991 # draw handle
2127 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2992 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2128 2993
2129 glDisable GL_TEXTURE_2D; 2994 glDisable GL_TEXTURE_2D;
2130} 2995}
2131 2996
2132############################################################################# 2997#############################################################################
2133 2998
2134package CFClient::UI::TextView; 2999package CFPlus::UI::ValSlider;
2135 3000
2136our @ISA = CFClient::UI::HBox::; 3001our @ISA = CFPlus::UI::HBox::;
2137 3002
3003sub new {
3004 my ($class, %arg) = @_;
3005
3006 my $range = delete $arg{range};
3007
3008 my $self = $class->SUPER::new (
3009 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
3010 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
3011 to_value => sub { shift },
3012 from_value => sub { shift },
3013 %arg,
3014 );
3015
3016 $self->{slider}->connect (changed => sub {
3017 my ($self, $value) = @_;
3018 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
3019 $self->{parent}->emit (changed => $value);
3020 });
3021
3022# $self->{entry}->connect (changed => sub {
3023# my ($self, $value) = @_;
3024# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
3025# $self->{parent}->emit (changed => $value);
3026# });
3027
3028 $self->add ($self->{slider}, $self->{entry});
3029
3030 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
3031
3032 $self
3033}
3034
3035sub set_range { shift->{slider}->set_range (@_) }
3036sub set_value { shift->{slider}->set_value (@_) }
3037
3038#############################################################################
3039
3040package CFPlus::UI::TextScroller;
3041
3042our @ISA = CFPlus::UI::HBox::;
3043
2138use CFClient::OpenGL; 3044use CFPlus::OpenGL;
2139 3045
2140sub new { 3046sub new {
2141 my $class = shift; 3047 my $class = shift;
2142 3048
2143 my $self = $class->SUPER::new ( 3049 my $self = $class->SUPER::new (
2144 fontsize => 1, 3050 fontsize => 1,
2145 can_events => 0, 3051 can_events => 1,
3052 indent => 0,
2146 #font => default_font 3053 #font => default_font
2147 @_, 3054 @_,
2148 3055
2149 layout => (new CFClient::Layout 1), 3056 layout => (new CFPlus::Layout),
2150 par => [], 3057 par => [],
3058 max_par => 0,
2151 height => 0, 3059 height => 0,
2152 children => [ 3060 children => [
2153 (new CFClient::UI::Empty expand => 1), 3061 (new CFPlus::UI::Empty expand => 1),
2154 (new CFClient::UI::Slider vertical => 1), 3062 (new CFPlus::UI::Slider vertical => 1),
2155 ], 3063 ],
2156 ); 3064 );
2157 3065
2158 $self->{children}[1]->connect (changed => sub { $self->update }); 3066 $self->{children}[1]->connect (changed => sub { $self->update });
2159 3067
… …
2165 3073
2166 $self->{fontsize} = $fontsize; 3074 $self->{fontsize} = $fontsize;
2167 $self->reflow; 3075 $self->reflow;
2168} 3076}
2169 3077
2170sub text_height { 3078sub size_request {
3079 my ($self) = @_;
3080
3081 my ($empty, $slider) = @{ $self->{children} };
3082
3083 local $self->{children} = [$empty, $slider];
3084 $self->SUPER::size_request
3085}
3086
3087sub invoke_size_allocate {
3088 my ($self, $w, $h) = @_;
3089
3090 my ($empty, $slider, @other) = @{ $self->{children} };
3091 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
3092
3093 $self->{layout}->set_font ($self->{font}) if $self->{font};
3094 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
3095 $self->{layout}->set_width ($empty->{w});
3096 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3097
3098 $self->reflow;
3099
3100 local $self->{children} = [$empty, $slider];
3101 $self->SUPER::invoke_size_allocate ($w, $h)
3102}
3103
3104sub invoke_mouse_wheel {
2171 my ($self, $text) = @_; 3105 my ($self, $ev) = @_;
3106
3107 return 0 unless $ev->{dy}; # only vertical movements
3108
3109 $self->{children}[1]->emit (mouse_wheel => $ev);
3110
3111 1
3112}
3113
3114sub get_layout {
3115 my ($self, $para) = @_;
2172 3116
2173 my $layout = $self->{layout}; 3117 my $layout = $self->{layout};
2174 3118
3119 $layout->set_font ($self->{font}) if $self->{font};
3120 $layout->set_foreground (@{$para->{fg}});
2175 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3121 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2176 $layout->set_width ($self->{children}[0]{w}); 3122 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3123 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2177 $layout->set_markup ($text); 3124 $layout->set_markup ($para->{markup});
3125
3126 $layout->set_shapes (
3127 map
3128 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3129 @{$para->{widget}}
2178 3130 );
2179 ($layout->size)[1] 3131
3132 $layout
2180} 3133}
2181 3134
2182sub reflow { 3135sub reflow {
2183 my ($self) = @_; 3136 my ($self) = @_;
2184 3137
2185 $self->{need_reflow}++; 3138 $self->{need_reflow}++;
2186 $self->update; 3139 $self->update;
2187} 3140}
2188 3141
2189sub size_allocate { 3142sub set_offset {
3143 my ($self, $offset) = @_;
3144
3145 # todo: base offset on lines or so, not on pixels
3146 $self->{children}[1]->set_value ($offset);
3147}
3148
3149sub current_paragraph {
3150 my ($self) = @_;
3151
3152 $self->{top_paragraph} - 1
3153}
3154
3155sub scroll_to {
2190 my ($self, $w, $h) = @_; 3156 my ($self, $para) = @_;
2191 3157
2192 $self->SUPER::size_allocate ($w, $h); 3158 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2193 3159
2194 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3160 $self->{scroll_to} = $para;
2195 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3161 $self->update;
2196 $self->{layout}->set_width ($self->{children}[0]{w}); 3162}
2197 3163
2198 $self->reflow; 3164sub clear {
3165 my ($self) = @_;
3166
3167 my (undef, undef, @other) = @{ $self->{children} };
3168 $self->remove ($_) for @other;
3169
3170 $self->{par} = [];
3171 $self->{height} = 0;
3172 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2199} 3173}
2200 3174
2201sub add_paragraph { 3175sub add_paragraph {
2202 my ($self, $color, $text) = @_; 3176 my $self = shift;
2203 3177
2204 #TODO: intelligently "reformat" paragraph 3178 for my $para (@_) {
3179 $para = {
3180 fg => [1, 1, 1, 1],
3181 indent => 0,
3182 markup => "",
3183 widget => [],
3184 ref $para ? %$para : (markup => $para),
3185 w => 1e10,
3186 wrapped => 1,
3187 };
2205 3188
2206 my $height = $self->text_height ($text); 3189 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3190 push @{$self->{par}}, $para;
3191 }
2207 3192
3193 if (my $max = $self->{max_par}) {
3194 shift @{$self->{par}} while @{$self->{par}} > $max;
3195 }
3196
3197 $self->{need_reflow}++;
3198 $self->update;
3199}
3200
3201sub scroll_to_bottom {
3202 my ($self) = @_;
3203
3204 $self->{scroll_to} = $#{$self->{par}};
3205 $self->update;
3206}
3207
3208sub force_uptodate {
3209 my ($self) = @_;
3210
3211 if (delete $self->{need_reflow}) {
3212 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3213
3214 my $height = 0;
3215
3216 for my $para (@{$self->{par}}) {
3217 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3218 my $layout = $self->get_layout ($para);
3219 my ($w, $h) = $layout->size;
3220
3221 $para->{w} = $w + $para->{indent};
3222 $para->{h} = $h;
3223 $para->{wrapped} = $layout->has_wrapped;
3224 }
3225
3226 $para->{y} = $height;
3227 $height += $para->{h};
3228 }
3229
2208 $self->{height} += $height; 3230 $self->{height} = $height;
3231 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2209 3232
2210 push @{$self->{par}}, [$height, $color, $text]; 3233 delete $self->{texture};
3234 }
2211 3235
2212 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3236 if (my $paridx = delete $self->{scroll_to}) {
2213 $self->{children}[1]->update; 3237 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3238 }
2214} 3239}
2215 3240
2216sub update { 3241sub update {
2217 my ($self) = @_; 3242 my ($self) = @_;
2218 3243
… …
2220 3245
2221 return unless $self->{h} > 0; 3246 return unless $self->{h} > 0;
2222 3247
2223 delete $self->{texture}; 3248 delete $self->{texture};
2224 3249
2225 $ROOT->on_post_alloc ($self, sub { 3250 $ROOT->on_post_alloc ($self => sub {
2226 if (delete $self->{need_reflow}) { 3251 $self->force_uptodate;
2227 my $height = 0;
2228 3252
2229 $height += $_->[0] = $self->text_height ($_->[2]) 3253 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2230 for @{$self->{par}};
2231 3254
2232 $self->{height} = $height; 3255 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2233
2234 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2235
2236 delete $self->{texture};
2237 }
2238
2239 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2240 glClearColor 0, 0, 0, 0; 3256 glClearColor 0, 0, 0, 0;
2241 glClear GL_COLOR_BUFFER_BIT; 3257 glClear GL_COLOR_BUFFER_BIT;
2242 3258
2243 glEnable GL_TEXTURE_2D; 3259 package CFPlus::UI::Base;
2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3260 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3261 (0, 0, $self->{w}, $self->{h});
2245 3262
2246 my $top = int $self->{children}[1]{range}[0]; 3263 my $top = int $self->{children}[1]{range}[0];
2247 3264
3265 my $paridx = 0;
3266 my $top_paragraph;
3267 my $top = int $self->{children}[1]{range}[0];
3268
2248 my $y0 = $top; 3269 my $y0 = $top;
2249 my $y1 = $top + $self->{h}; 3270 my $y1 = $top + $H;
2250 3271
2251 my $y = 0;
2252
2253 my $layout = $self->{layout};
2254
2255 $layout->set_font ($self->{font}) if $self->{font};
2256
2257 for my $par (@{$self->{par}}) { 3272 for my $para (@{$self->{par}}) {
2258 my $h = $par->[0]; 3273 my $h = $para->{h};
3274 my $y = $para->{y};
2259 3275
2260 if ($y0 < $y + $h && $y < $y1) { 3276 if ($y0 < $y + $h && $y < $y1) {
2261 $layout->set_foreground (@{ $par->[1] }); 3277 my $layout = $self->get_layout ($para);
2262 $layout->set_markup ($par->[2]);
2263 3278
2264 my ($W, $H) = $layout->size; 3279 $layout->render ($para->{indent}, $y - $y0);
2265 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 3280
3281 if (my @w = @{ $para->{widget} }) {
3282 my @s = $layout->get_shapes;
3283
3284 for (@w) {
3285 my ($dx, $dy) = splice @s, 0, 2, ();
3286
3287 $_->{x} = $dx + $para->{indent};
3288 $_->{y} = $dy + $y - $y0;
3289
3290 $_->draw;
3291 }
3292 }
2266 } 3293 }
2267 3294
2268 $y += $h; 3295 $paridx++;
3296 $top_paragraph ||= $paridx if $y >= $top;
2269 } 3297 }
2270 3298
2271 glDisable GL_TEXTURE_2D; 3299 $self->{top_paragraph} = $top_paragraph;
2272 }; 3300 };
2273 }); 3301 });
2274} 3302}
2275 3303
3304sub reconfigure {
3305 my ($self) = @_;
3306
3307 $self->SUPER::reconfigure;
3308
3309 $_->{w} = 1e10 for @{ $self->{par} };
3310 $self->reflow;
3311}
3312
2276sub _draw { 3313sub _draw {
2277 my ($self) = @_; 3314 my ($self) = @_;
2278 3315
2279 glEnable GL_TEXTURE_2D; 3316 glEnable GL_TEXTURE_2D;
2280 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3317 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2281 glColor 1, 1, 1, 1; 3318 glColor 0, 0, 0, 1;
2282 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3319 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2283 glDisable GL_TEXTURE_2D; 3320 glDisable GL_TEXTURE_2D;
2284 3321
2285 $self->{children}[1]->draw; 3322 $self->{children}[1]->draw;
2286
2287} 3323}
2288 3324
2289############################################################################# 3325#############################################################################
2290 3326
2291package CFClient::UI::Animator; 3327package CFPlus::UI::Animator;
2292 3328
2293use CFClient::OpenGL; 3329use CFPlus::OpenGL;
2294 3330
2295our @ISA = CFClient::UI::Bin::; 3331our @ISA = CFPlus::UI::Bin::;
2296 3332
2297sub moveto { 3333sub moveto {
2298 my ($self, $x, $y) = @_; 3334 my ($self, $x, $y) = @_;
2299 3335
2300 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3336 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2328 glPopMatrix; 3364 glPopMatrix;
2329} 3365}
2330 3366
2331############################################################################# 3367#############################################################################
2332 3368
2333package CFClient::UI::Flopper; 3369package CFPlus::UI::Flopper;
2334 3370
2335our @ISA = CFClient::UI::Button::; 3371our @ISA = CFPlus::UI::Button::;
2336 3372
2337sub new { 3373sub new {
2338 my $class = shift; 3374 my $class = shift;
2339 3375
2340 my $self = $class->SUPER::new ( 3376 my $self = $class->SUPER::new (
2341 state => 0, 3377 state => 0,
2342 connect_activate => \&toggle_flopper, 3378 on_activate => \&toggle_flopper,
2343 @_ 3379 @_
2344 ); 3380 );
2345 3381
2346 if ($self->{state}) {
2347 $self->{state} = 0;
2348 $self->toggle_flopper;
2349 }
2350
2351 $self 3382 $self
2352} 3383}
2353 3384
2354sub toggle_flopper { 3385sub toggle_flopper {
2355 my ($self) = @_; 3386 my ($self) = @_;
2356 3387
2357 # TODO: use animation 3388 $self->{other}->toggle_visibility;
2358 if ($self->{state} = !$self->{state}) {
2359 $CFClient::UI::ROOT->add ($self->{other});
2360 $self->{other}->move ($self->coord2global (0, $self->{h}));
2361 $self->emit ("open");
2362 } else {
2363 $CFClient::UI::ROOT->remove ($self->{other});
2364 $self->emit ("close");
2365 }
2366
2367 $self->emit (changed => $self->{state});
2368} 3389}
2369 3390
2370############################################################################# 3391#############################################################################
2371 3392
2372package CFClient::UI::Tooltip; 3393package CFPlus::UI::Tooltip;
2373 3394
2374our @ISA = CFClient::UI::Bin::; 3395our @ISA = CFPlus::UI::Bin::;
2375 3396
2376use CFClient::OpenGL; 3397use CFPlus::OpenGL;
2377 3398
2378sub new { 3399sub new {
2379 my $class = shift; 3400 my $class = shift;
2380 3401
2381 $class->SUPER::new ( 3402 $class->SUPER::new (
… …
2385} 3406}
2386 3407
2387sub set_tooltip_from { 3408sub set_tooltip_from {
2388 my ($self, $widget) = @_; 3409 my ($self, $widget) = @_;
2389 3410
3411 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3412 if $widget->{tooltip} =~ /^#(.*)$/;
3413
3414 my $tooltip = $widget->{tooltip};
3415
3416 if ($ENV{CFPLUS_DEBUG} & 2) {
3417 $tooltip .= "\n\n" . (ref $widget) . "\n"
3418 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3419 . "req $widget->{req_w} $widget->{req_h}\n"
3420 . "visible $widget->{visible}";
3421 }
3422
3423 $tooltip =~ s/^\n+//;
3424 $tooltip =~ s/\n+$//;
3425
2390 $self->add (new CFClient::UI::Label 3426 $self->add (new CFPlus::UI::Label
2391 markup => $widget->{tooltip}, 3427 markup => $tooltip,
2392 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3428 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2393 fontsize => 0.8, 3429 fontsize => 0.8,
2394 fg => [0, 0, 0, 1], 3430 style => 1, # FLAG_INVERSE
3431 ellipsise => 0,
2395 font => ($widget->{tooltip_font} || $::FONT_PROP), 3432 font => ($widget->{tooltip_font} || $::FONT_PROP),
2396 ); 3433 );
2397} 3434}
2398 3435
2399sub size_request { 3436sub size_request {
2400 my ($self) = @_; 3437 my ($self) = @_;
… …
2402 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3439 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2403 3440
2404 ($w + 4, $h + 4) 3441 ($w + 4, $h + 4)
2405} 3442}
2406 3443
2407sub size_allocate { 3444sub invoke_size_allocate {
2408 my ($self, $w, $h) = @_; 3445 my ($self, $w, $h) = @_;
2409 3446
2410 $self->SUPER::size_allocate ($w - 4, $h - 4); 3447 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3448}
3449
3450sub invoke_visibility_change {
3451 my ($self, $visible) = @_;
3452
3453 return unless $visible;
3454
3455 $self->{root}->on_post_alloc ("move_$self" => sub {
3456 my $widget = $self->{owner}
3457 or return;
3458
3459 if ($widget->{visible}) {
3460 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3461
3462 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3463 if $x + $self->{w} > $self->{root}{w};
3464
3465 $self->move_abs ($x, $y);
3466 } else {
3467 $self->hide;
3468 }
3469 });
2411} 3470}
2412 3471
2413sub _draw { 3472sub _draw {
2414 my ($self) = @_; 3473 my ($self) = @_;
2415 3474
… …
2432 glVertex $w, $h; 3491 glVertex $w, $h;
2433 glVertex $w, 0; 3492 glVertex $w, 0;
2434 glEnd; 3493 glEnd;
2435 3494
2436 glTranslate 2 - 0.375, 2 - 0.375; 3495 glTranslate 2 - 0.375, 2 - 0.375;
3496
2437 $self->SUPER::_draw; 3497 $self->SUPER::_draw;
2438} 3498}
2439 3499
2440############################################################################# 3500#############################################################################
2441 3501
2442package CFClient::UI::Face; 3502package CFPlus::UI::Face;
2443 3503
2444our @ISA = CFClient::UI::Base::; 3504our @ISA = CFPlus::UI::DrawBG::;
2445 3505
2446use CFClient::OpenGL; 3506use CFPlus::OpenGL;
2447 3507
2448sub new { 3508sub new {
2449 my $class = shift; 3509 my $class = shift;
2450 3510
2451 $class->SUPER::new ( 3511 my $self = $class->SUPER::new (
3512 size_w => 32,
3513 size_h => 8,
2452 aspect => 1, 3514 aspect => 1,
3515 can_events => 0,
2453 @_, 3516 @_,
2454 ) 3517 );
3518
3519 if ($self->{anim} && $self->{animspeed}) {
3520 CFPlus::weaken (my $widget = $self);
3521
3522 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3523 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3524 $self->{timer} = Event->timer (
3525 parked => 1,
3526 cb => sub {
3527 return unless $::CONN && $widget;
3528
3529 ++$widget->{frame};
3530 $widget->update_face;
3531 $widget->update;
3532
3533 $widget->update_timer;
3534 },
3535 );
3536
3537 $self->update_face;
3538 $self->update_timer;
3539 }
3540
3541 $self
3542}
3543
3544sub update_timer {
3545 my ($self) = @_;
3546
3547 return unless $self->{timer};
3548
3549 if ($self->{visible}) {
3550 $self->{timer}->at (
3551 $self->{anim_start}
3552 + $self->{animspeed}
3553 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3554 );
3555 $self->{timer}->start;
3556 } else {
3557 $self->{timer}->stop;
3558 }
3559}
3560
3561sub update_face {
3562 my ($self) = @_;
3563
3564 return unless $::CONN;
3565
3566 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3567 if ($anim && @$anim) {
3568 delete $self->{wait_face};
3569 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3570 }
3571 }
2455} 3572}
2456 3573
2457sub size_request { 3574sub size_request {
2458 (32, 8) 3575 my ($self) = @_;
3576
3577 if ($::CONN) {
3578 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3579 if (my $tex = $::CONN->{texture}[$faceid]) {
3580 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3581 } else {
3582 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3583 $self->realloc;
3584 });
3585 }
3586 }
3587 }
3588
3589 ($self->{size_w} || 8, $self->{size_h} || 8)
3590}
3591
3592sub update {
3593 my ($self) = @_;
3594
3595 return unless $self->{visible};
3596
3597 $self->SUPER::update;
3598}
3599
3600sub invoke_visibility_change {
3601 my ($self) = @_;
3602
3603 $self->update_timer;
3604
3605 0
2459} 3606}
2460 3607
2461sub _draw { 3608sub _draw {
2462 my ($self) = @_; 3609 my ($self) = @_;
2463 3610
2464 return unless $::CONN;#d# manage and cache textures differently 3611 return unless $::CONN;
3612
3613 $self->SUPER::_draw;
3614
3615 my $faceid = $::CONN->{faceid}[$self->{face}]
3616 or return;
3617
2465 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3618 my $tex = $::CONN->{texture}[$faceid];
2466 3619
2467 # TODO animation
2468 if ($tex) { 3620 if ($tex) {
2469 glEnable GL_TEXTURE_2D; 3621 glEnable GL_TEXTURE_2D;
2470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2471 glColor 1, 1, 1, 1; 3623 glColor 0, 0, 0, 1;
2472 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3624 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2473 glDisable GL_TEXTURE_2D; 3625 glDisable GL_TEXTURE_2D;
2474 } 3626 }
2475} 3627}
2476 3628
3629sub destroy {
3630 my ($self) = @_;
3631
3632 (delete $self->{timer})->cancel
3633 if $self->{timer};
3634
3635 $self->SUPER::destroy;
3636}
3637
2477############################################################################# 3638#############################################################################
2478 3639
2479package CFClient::UI::InventoryItem; 3640package CFPlus::UI::Buttonbar;
2480 3641
2481our @ISA = CFClient::UI::HBox::; 3642our @ISA = CFPlus::UI::HBox::;
2482 3643
2483sub new { 3644# TODO: should actually wrap buttons and other goodies.
2484 my $class = shift;
2485
2486 my %args = @_;
2487
2488 my $item = delete $args{item};
2489
2490 my $desc = $item->{nrof} < 2
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494
2495 my $self = $class->SUPER::new (
2496 can_hover => 1,
2497 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_;
2502
2503 # todo: maybe put examine on 1? but should just be a tooltip :(
2504 if ($ev->{button} == 1) {
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2506 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512 [
2513 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514 sub { $::CONN->send ("lock $item->{tag}") },
2515 ],
2516 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2517 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2518 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2519 ],
2520 )->popup ($ev);
2521 }
2522
2523 1
2524 },
2525 %args
2526 );
2527
2528 $self->add (new CFClient::UI::Face
2529 can_events => 0,
2530 face => $item->{face},
2531 anim => $item->{anim},
2532 animspeed => $item->{animspeed},
2533 );
2534
2535 $self->add (new CFClient::UI::Label
2536 can_events => 0,
2537 text => $desc,
2538 );
2539
2540 $self
2541}
2542 3645
2543############################################################################# 3646#############################################################################
2544 3647
2545package CFClient::UI::Inventory;
2546
2547our @ISA = CFClient::UI::ScrolledWindow::;
2548
2549sub new {
2550 my $class = shift;
2551
2552 my $self = $class->SUPER::new (
2553 scrolled => (new CFClient::UI::VBox),
2554 @_,
2555 );
2556
2557 $self
2558}
2559
2560sub set_items {
2561 my ($self, $items) = @_;
2562
2563 $self->{scrolled}->clear;
2564 return unless $items;
2565
2566 my @items = sort {
2567 ($a->{type} <=> $b->{type})
2568 or ($a->{name} cmp $b->{name})
2569 } @$items;
2570
2571 $self->{real_items} = \@items;
2572
2573 for my $item (@items) {
2574 my $desc = $item->{nrof} < 2
2575 ? $item->{name}
2576 : "$item->{nrof} $item->{name_pl}";
2577
2578 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2579 }
2580
2581 $self->{scrolled}->add (@items);
2582
2583# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2584}
2585
2586sub size_request {
2587 my ($self) = @_;
2588 ($self->{req_w}, $self->{req_h});
2589}
2590
2591#############################################################################
2592
2593package CFClient::UI::Menu; 3648package CFPlus::UI::Menu;
2594 3649
2595our @ISA = CFClient::UI::FancyFrame::; 3650our @ISA = CFPlus::UI::Toplevel::;
2596 3651
2597use CFClient::OpenGL; 3652use CFPlus::OpenGL;
2598 3653
2599sub new { 3654sub new {
2600 my $class = shift; 3655 my $class = shift;
2601 3656
2602 my $self = $class->SUPER::new ( 3657 my $self = $class->SUPER::new (
2603 items => [], 3658 items => [],
2604 z => 100, 3659 z => 100,
2605 @_, 3660 @_,
2606 ); 3661 );
2607 3662
2608 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3663 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2609 3664
2610 for my $item (@{ $self->{items} }) { 3665 for my $item (@{ $self->{items} }) {
2611 my ($widget, $cb) = @$item; 3666 my ($widget, $cb, $tooltip) = @$item;
2612 3667
2613 # handle various types of items, only text for now 3668 # handle various types of items, only text for now
2614 if (!ref $widget) { 3669 if (!ref $widget) {
3670 if ($widget =~ /\t/) {
3671 my ($left, $right) = split /\t/, $widget, 2;
3672
2615 $widget = new CFClient::UI::Label 3673 $widget = new CFPlus::UI::HBox
2616 can_hover => 1, 3674 can_hover => 1,
2617 can_events => 1, 3675 can_events => 1,
3676 tooltip => $tooltip,
3677 children => [
3678 (new CFPlus::UI::Label markup => $left, expand => 1),
3679 (new CFPlus::UI::Label markup => $right, align => +1),
3680 ],
3681 ;
3682
3683 } else {
3684 $widget = new CFPlus::UI::Label
3685 can_hover => 1,
3686 can_events => 1,
2618 text => $widget; 3687 markup => $widget,
3688 tooltip => $tooltip;
3689 }
2619 } 3690 }
2620 3691
2621 $self->{item}{$widget} = $item; 3692 $self->{item}{$widget} = $item;
2622 3693
2623 $self->{vbox}->add ($widget); 3694 $self->{vbox}->add ($widget);
… …
2635 # maybe save $GRAB? must be careful about events... 3706 # maybe save $GRAB? must be careful about events...
2636 $GRAB = $self; 3707 $GRAB = $self;
2637 $self->{button} = $ev->{button}; 3708 $self->{button} = $ev->{button};
2638 3709
2639 $self->show; 3710 $self->show;
2640 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3711 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2641} 3712}
2642 3713
2643sub mouse_motion { 3714sub invoke_mouse_motion {
2644 my ($self, $ev, $x, $y) = @_; 3715 my ($self, $ev, $x, $y) = @_;
2645 3716
2646 # TODO: should use vbox->find_widget or so 3717 # TODO: should use vbox->find_widget or so
2647 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3718 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2648 $self->{hover} = $self->{item}{$HOVER}; 3719 $self->{hover} = $self->{item}{$HOVER};
2649}
2650 3720
3721 0
3722}
3723
2651sub button_up { 3724sub invoke_button_up {
2652 my ($self, $ev, $x, $y) = @_; 3725 my ($self, $ev, $x, $y) = @_;
2653 3726
2654 if ($ev->{button} == $self->{button}) { 3727 if ($ev->{button} == $self->{button}) {
2655 undef $GRAB; 3728 undef $GRAB;
2656 $self->hide; 3729 $self->hide;
2657 3730
2658 $self->emit ("popdown"); 3731 $self->emit ("popdown");
2659 $self->{hover}[1]->() if $self->{hover}; 3732 $self->{hover}[1]->() if $self->{hover};
3733 } else {
3734 return 0
3735 }
3736
2660 } 3737 1
2661} 3738}
2662 3739
2663############################################################################# 3740#############################################################################
2664 3741
2665package CFClient::UI::Statusbox; 3742package CFPlus::UI::Multiplexer;
2666 3743
3744our @ISA = CFPlus::UI::Container::;
3745
3746sub new {
3747 my $class = shift;
3748
3749 my $self = $class->SUPER::new (
3750 @_,
3751 );
3752
3753 $self->{current} = $self->{children}[0]
3754 if @{ $self->{children} };
3755
3756 $self
3757}
3758
3759sub add {
3760 my ($self, @widgets) = @_;
3761
3762 $self->SUPER::add (@widgets);
3763
3764 $self->{current} = $self->{children}[0]
3765 if @{ $self->{children} };
3766}
3767
3768sub get_current_page {
3769 my ($self) = @_;
3770
3771 $self->{current}
3772}
3773
3774sub set_current_page {
3775 my ($self, $page_or_widget) = @_;
3776
3777 my $widget = ref $page_or_widget
3778 ? $page_or_widget
3779 : $self->{children}[$page_or_widget];
3780
3781 $self->{current} = $widget;
3782 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3783
3784 $self->emit (page_changed => $self->{current});
3785
3786 $self->realloc;
3787}
3788
3789sub visible_children {
3790 $_[0]{current}
3791}
3792
3793sub size_request {
3794 my ($self) = @_;
3795
3796 $self->{current}->size_request
3797}
3798
3799sub invoke_size_allocate {
3800 my ($self, $w, $h) = @_;
3801
3802 $self->{current}->configure (0, 0, $w, $h);
3803
3804 1
3805}
3806
3807sub _draw {
3808 my ($self) = @_;
3809
3810 $self->{current}->draw;
3811}
3812
3813#############################################################################
3814
3815package CFPlus::UI::Notebook;
3816
2667our @ISA = CFClient::UI::VBox::; 3817our @ISA = CFPlus::UI::VBox::;
3818
3819sub new {
3820 my $class = shift;
3821
3822 my $self = $class->SUPER::new (
3823 buttonbar => (new CFPlus::UI::Buttonbar),
3824 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3825 # filter => # will be put between multiplexer and $self
3826 @_,
3827 );
3828
3829 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3830 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3831
3832 $self
3833}
3834
3835sub add {
3836 my ($self, $title, $widget, $tooltip) = @_;
3837
3838 CFPlus::weaken $self;
3839
3840 $self->{buttonbar}->add (new CFPlus::UI::Button
3841 markup => $title,
3842 tooltip => $tooltip,
3843 on_activate => sub { $self->set_current_page ($widget) },
3844 );
3845
3846 $self->{multiplexer}->add ($widget);
3847}
3848
3849sub get_current_page {
3850 my ($self) = @_;
3851
3852 $self->{multiplexer}->get_current_page
3853}
3854
3855sub set_current_page {
3856 my ($self, $page) = @_;
3857
3858 $self->{multiplexer}->set_current_page ($page);
3859 $self->emit (page_changed => $self->{multiplexer}{current});
3860}
3861
3862#############################################################################
3863
3864package CFPlus::UI::Selector;
3865
3866use utf8;
3867
3868our @ISA = CFPlus::UI::Button::;
3869
3870sub new {
3871 my $class = shift;
3872
3873 my $self = $class->SUPER::new (
3874 options => [], # [value, title, longdesc], ...
3875 value => undef,
3876 @_,
3877 );
3878
3879 $self->_set_value ($self->{value});
3880
3881 $self
3882}
3883
3884sub invoke_button_down {
3885 my ($self, $ev) = @_;
3886
3887 my @menu_items;
3888
3889 for (@{ $self->{options} }) {
3890 my ($value, $title, $tooltip) = @$_;
3891
3892 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3893 }
3894
3895 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3896}
3897
3898sub _set_value {
3899 my ($self, $value) = @_;
3900
3901 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3902 or return;
3903
3904 $self->{value} = $item->[0];
3905 $self->set_markup ("$item->[1] ⇓");
3906 $self->set_tooltip ($item->[2]);
3907}
3908
3909sub set_value {
3910 my ($self, $value) = @_;
3911
3912 return unless $self->{value} ne $value;
3913
3914 $self->_set_value ($value);
3915 $self->emit (changed => $value);
3916}
3917
3918#############################################################################
3919
3920package CFPlus::UI::Statusbox;
3921
3922our @ISA = CFPlus::UI::VBox::;
3923
3924sub new {
3925 my $class = shift;
3926
3927 my $self = $class->SUPER::new (
3928 fontsize => 0.8,
3929 @_,
3930 );
3931
3932 CFPlus::weaken (my $this = $self);
3933
3934 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3935
3936 $self
3937}
2668 3938
2669sub reorder { 3939sub reorder {
2670 my ($self) = @_; 3940 my ($self) = @_;
2671 my $NOW = time; 3941 my $NOW = Time::HiRes::time;
3942
3943 # freeze display when hovering over any label
3944 return if $CFPlus::UI::TOOLTIP->{owner}
3945 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3946 values %{ $self->{item} };
2672 3947
2673 while (my ($k, $v) = each %{ $self->{item} }) { 3948 while (my ($k, $v) = each %{ $self->{item} }) {
2674 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3949 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2675 } 3950 }
2676 3951
… …
2679 my @items = sort { 3954 my @items = sort {
2680 $a->{pri} <=> $b->{pri} 3955 $a->{pri} <=> $b->{pri}
2681 or $b->{id} <=> $a->{id} 3956 or $b->{id} <=> $a->{id}
2682 } values %{ $self->{item} }; 3957 } values %{ $self->{item} };
2683 3958
3959 $self->{timer}->interval (1);
3960
2684 my $count = 10 + 1; 3961 my $count = 10 + 1;
2685 for my $item (@items) { 3962 for my $item (@items) {
2686 last unless --$count; 3963 last unless --$count;
2687 3964
2688 push @widgets, $item->{label} ||= do { 3965 my $label = $item->{label} ||= do {
2689 # TODO: doesn't handle markup well (read as: at all) 3966 # TODO: doesn't handle markup well (read as: at all)
2690 my $short = $item->{count} > 1 3967 my $short = $item->{count} > 1
2691 ? "<b>$item->{count} ×</b> $item->{text}" 3968 ? "<b>$item->{count} ×</b> $item->{text}"
2692 : $item->{text}; 3969 : $item->{text};
2693 3970
2694 for ($short) { 3971 for ($short) {
2695 s/^\s+//; 3972 s/^\s+//;
2696 s/\012.*/…/s; 3973 s/\s+/ /g;
2697 my $len = int 40 / $item->{fontsize};
2698 substr $_, $len, length, "…" if $len < length;
2699 } 3974 }
2700 3975
2701 new CFClient::UI::Label 3976 new CFPlus::UI::Label
2702 markup => $short, 3977 markup => $short,
2703 tooltip => $item->{tooltip}, 3978 tooltip => $item->{tooltip},
2704 tooltip_font => $::FONT_PROP, 3979 tooltip_font => $::FONT_PROP,
2705 tooltip_width => 0.67, 3980 tooltip_width => 0.67,
2706 fontsize => $item->{fontsize}, 3981 fontsize => $item->{fontsize} || $self->{fontsize},
2707 color => $item->{color}, 3982 max_w => $::WIDTH * 0.44,
3983 fg => [@{ $item->{fg} }],
2708 can_events => 1, 3984 can_events => 1,
2709 can_hover => 1 3985 can_hover => 1
2710 }; 3986 };
3987
3988 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3989 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3990 $label->update;
3991 $label->set_max_size (undef, $label->{req_h} * $diff)
3992 if $diff < 1;
3993 $self->{timer}->interval (1/30);
3994 } else {
3995 $label->{fg}[3] = $item->{fg}[3] || 1;
3996 }
3997
3998 push @widgets, $label;
2711 } 3999 }
2712 4000
2713 $self->clear; 4001 $self->clear;
2714 $self->SUPER::add (reverse @widgets); 4002 $self->SUPER::add (reverse @widgets);
2715} 4003}
… …
2718 my ($self, $text, %arg) = @_; 4006 my ($self, $text, %arg) = @_;
2719 4007
2720 $text =~ s/^\s+//; 4008 $text =~ s/^\s+//;
2721 $text =~ s/\s+$//; 4009 $text =~ s/\s+$//;
2722 4010
4011 return unless $text;
4012
2723 my $timeout = time + ((delete $arg{timeout}) || 60); 4013 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2724 4014
2725 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4015 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2726 4016
2727 if (my $item = $self->{item}{$group}) { 4017 if (my $item = $self->{item}{$group}) {
2728 if ($item->{text} eq $text) { 4018 if ($item->{text} eq $text) {
2729 $item->{count}++; 4019 $item->{count}++;
2730 } else { 4020 } else {
2731 $item->{count} = 1; 4021 $item->{count} = 1;
2732 $item->{text} = $item->{tooltip} = $text; 4022 $item->{text} = $item->{tooltip} = $text;
2733 } 4023 }
2734 $item->{id} = ++$self->{id}; 4024 $item->{id} += 0.2;#d#
2735 $item->{timeout} = $timeout; 4025 $item->{timeout} = $timeout;
2736 delete $item->{label}; 4026 delete $item->{label};
2737 } else { 4027 } else {
2738 $self->{item}{$group} = { 4028 $self->{item}{$group} = {
2739 id => ++$self->{id}, 4029 id => ++$self->{id},
2740 text => $text, 4030 text => $text,
2741 timeout => $timeout, 4031 timeout => $timeout,
2742 tooltip => $text, 4032 tooltip => $text,
2743 fontsize => 0.8,
2744 color => [0.8, 0.8, 0.8, 0.8], 4033 fg => [0.8, 0.8, 0.8, 0.8],
2745 pri => 0, 4034 pri => 0,
2746 count => 1, 4035 count => 1,
2747 %arg, 4036 %arg,
2748 }; 4037 };
2749 } 4038 }
2750 4039
4040 $ROOT->on_refresh (reorder => sub {
4041 $self->reorder;
4042 });
4043}
4044
4045sub reconfigure {
4046 my ($self) = @_;
4047
4048 delete $_->{label}
4049 for values %{ $self->{item} || {} };
4050
2751 $self->reorder; 4051 $self->reorder;
4052 $self->SUPER::reconfigure;
4053}
4054
4055sub destroy {
4056 my ($self) = @_;
4057
4058 $self->{timer}->cancel;
4059
4060 $self->SUPER::destroy;
2752} 4061}
2753 4062
2754############################################################################# 4063#############################################################################
2755 4064
2756package CFClient::UI::Root; 4065package CFPlus::UI::Root;
2757 4066
2758our @ISA = CFClient::UI::Container::; 4067our @ISA = CFPlus::UI::Container::;
2759 4068
4069use List::Util qw(min max);
4070
2760use CFClient::OpenGL; 4071use CFPlus::OpenGL;
2761 4072
2762sub new { 4073sub new {
2763 my $class = shift; 4074 my $class = shift;
2764 4075
2765 $class->SUPER::new ( 4076 my $self = $class->SUPER::new (
4077 visible => 1,
2766 @_, 4078 @_,
2767 ) 4079 );
2768}
2769 4080
2770sub configure { 4081 CFPlus::weaken ($self->{root} = $self);
2771 my ($self, $x, $y, $w, $h) = @_;
2772 4082
2773 $self->{w} = $w; 4083 $self
2774 $self->{h} = $h;
2775}
2776
2777sub check_size {
2778 my ($self) = @_;
2779
2780 $self->size_allocate ($self->{w}, $self->{h})
2781 if $self->{w};
2782} 4084}
2783 4085
2784sub size_request { 4086sub size_request {
2785 my ($self) = @_; 4087 my ($self) = @_;
2786 4088
2787 ($self->{w}, $self->{h}) 4089 ($self->{w}, $self->{h})
2788} 4090}
2789 4091
4092sub _to_pixel {
4093 my ($coord, $size, $max) = @_;
4094
4095 $coord =
4096 $coord eq "center" ? ($max - $size) * 0.5
4097 : $coord eq "max" ? $max
4098 : $coord;
4099
4100 $coord = 0 if $coord < 0;
4101 $coord = $max - $size if $coord > $max - $size;
4102
4103 int $coord + 0.5
4104}
4105
2790sub size_allocate { 4106sub invoke_size_allocate {
2791 my ($self, $w, $h) = @_; 4107 my ($self, $w, $h) = @_;
2792
2793 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2794 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2795
2796 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2797 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2798 4108
2799 for my $child ($self->children) { 4109 for my $child ($self->children) {
2800 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4110 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2801 4111
2802 $X = List::Util::max 0, List::Util::min $w - $W, $X; 4112 $X = $child->{force_x} if exists $child->{force_x};
2803 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 4113 $Y = $child->{force_y} if exists $child->{force_y};
4114
4115 $X = _to_pixel $X, $W, $self->{w};
4116 $Y = _to_pixel $Y, $H, $self->{h};
4117
2804 $child->configure ($X, $Y, $W, $H); 4118 $child->configure ($X, $Y, $W, $H);
2805 } 4119 }
4120
4121 1
2806} 4122}
2807 4123
2808sub coord2local { 4124sub coord2local {
2809 my ($self, $x, $y) = @_; 4125 my ($self, $x, $y) = @_;
2810 4126
… …
2818} 4134}
2819 4135
2820sub update { 4136sub update {
2821 my ($self) = @_; 4137 my ($self) = @_;
2822 4138
2823 $self->check_size;
2824 $::WANT_REFRESH++; 4139 $::WANT_REFRESH++;
2825} 4140}
2826 4141
2827sub add { 4142sub add {
2828 my ($self, $child) = @_; 4143 my ($self, @children) = @_;
2829 4144
2830 # integerise window positions 4145 $_->{is_toplevel} = 1
2831 $child->{x} = int $child->{x}; 4146 for @children;
2832 $child->{y} = int $child->{y};
2833 4147
2834 $self->SUPER::add ($child); 4148 $self->SUPER::add (@children);
4149}
4150
4151sub remove {
4152 my ($self, @children) = @_;
4153
4154 $self->SUPER::remove (@children);
4155
4156 delete $self->{is_toplevel}
4157 for @children;
4158
4159 while (@children) {
4160 my $w = pop @children;
4161 push @children, $w->children;
4162 $w->set_invisible;
4163 }
2835} 4164}
2836 4165
2837sub on_refresh { 4166sub on_refresh {
2838 my ($self, $id, $cb) = @_; 4167 my ($self, $id, $cb) = @_;
2839 4168
… …
2852 while ($self->{refresh_hook}) { 4181 while ($self->{refresh_hook}) {
2853 $_->() 4182 $_->()
2854 for values %{delete $self->{refresh_hook}}; 4183 for values %{delete $self->{refresh_hook}};
2855 } 4184 }
2856 4185
2857 if ($self->{check_size}) { 4186 if ($self->{realloc}) {
2858 my @queue = ([], []); 4187 my %queue;
4188 my @queue;
4189 my $widget;
2859 4190
2860 for (;;) { 4191 outer:
2861 if ($self->{check_size}) { 4192 while () {
2862 # heuristic: check containers last 4193 if (my $realloc = delete $self->{realloc}) {
2863 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 4194 for $widget (values %$realloc) {
2864 for values %{delete $self->{check_size}} 4195 $widget->{visible} or next; # do not resize invisible widgets
4196
4197 $queue{$widget+0}++ and next; # duplicates are common
4198
4199 push @{ $queue[$widget->{visible}] }, $widget;
4200 }
2865 } 4201 }
2866 4202
2867 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 4203 while () {
4204 @queue or last outer;
2868 4205
2869 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 4206 $widget = pop @{ $queue[-1] || [] }
2870 ? @$widget{qw(user_w user_h)} 4207 and last;
2871 : $widget->size_request;
2872
2873 if (delete $widget->{force_alloc}
2874 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2875 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2876 4208
4209 pop @queue;
4210 }
4211
4212 delete $queue{$widget+0};
4213
4214 my ($w, $h) = $widget->size_request;
4215
4216 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4217 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4218
4219 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4220 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4221
4222 $w = $widget->{force_w} if exists $widget->{force_w};
4223 $h = $widget->{force_h} if exists $widget->{force_h};
4224
4225 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4226 || delete $widget->{force_realloc}) {
2877 $widget->{req_w} = $w; 4227 $widget->{req_w} = $w;
2878 $widget->{req_h} = $h; 4228 $widget->{req_h} = $h;
2879 4229
2880 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 4230 $self->{size_alloc}{$widget+0} = $widget;
2881 4231
2882 $widget->{parent}->check_size
2883 if $widget->{parent}; 4232 if (my $parent = $widget->{parent}) {
4233 $self->{realloc}{$parent+0} = $parent
4234 unless $queue{$parent+0};
4235
4236 $parent->{force_size_alloc} = 1;
4237 $self->{size_alloc}{$parent+0} = $parent;
4238 }
2884 } 4239 }
4240
4241 delete $self->{realloc}{$widget+0};
2885 } 4242 }
2886 } 4243 }
2887 4244
2888 while ($self->{size_alloc}) { 4245 while (my $size_alloc = delete $self->{size_alloc}) {
2889 for (values %{delete $self->{size_alloc}}) { 4246 my @queue = sort { $b->{visible} <=> $a->{visible} }
2890 my ($widget, $w, $h) = @$_; 4247 values %$size_alloc;
4248
4249 while () {
4250 my $widget = pop @queue || last;
4251
4252 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2891 4253
2892 $w = 0 if $w < 0; 4254 $w = 0 if $w < 0;
2893 $h = 0 if $h < 0; 4255 $h = 0 if $h < 0;
2894 4256
4257 $w = max $widget->{min_w}, $w;
4258 $h = max $widget->{min_h}, $h;
4259
4260# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4261# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4262
4263 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4264 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4265
4266 $w = int $w + 0.5;
4267 $h = int $h + 0.5;
4268
4269 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4270 $widget->{old_w} = $widget->{w};
4271 $widget->{old_h} = $widget->{h};
4272
2895 $widget->{w} = $w; 4273 $widget->{w} = $w;
2896 $widget->{h} = $h; 4274 $widget->{h} = $h;
2897 $widget->size_allocate ($w, $h); 4275
2898 $widget->emit (size_allocate => $w, $h); 4276 $widget->emit (size_allocate => $w, $h);
4277 }
2899 } 4278 }
2900 } 4279 }
2901 4280
2902 while ($self->{post_alloc_hook}) { 4281 while ($self->{post_alloc_hook}) {
2903 $_->() 4282 $_->()
… …
2908 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4287 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2909 glClear GL_COLOR_BUFFER_BIT; 4288 glClear GL_COLOR_BUFFER_BIT;
2910 4289
2911 glMatrixMode GL_PROJECTION; 4290 glMatrixMode GL_PROJECTION;
2912 glLoadIdentity; 4291 glLoadIdentity;
2913 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4292 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2914 glMatrixMode GL_MODELVIEW; 4293 glMatrixMode GL_MODELVIEW;
2915 glLoadIdentity; 4294 glLoadIdentity;
2916 4295
4296 {
4297 package CFPlus::UI::Base;
4298
4299 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4300 (0, 0, $self->{w}, $self->{h});
4301
2917 $self->_draw; 4302 $self->_draw;
4303 }
2918} 4304}
2919 4305
2920############################################################################# 4306#############################################################################
2921 4307
2922package CFClient::UI; 4308package CFPlus::UI;
2923 4309
2924$ROOT = new CFClient::UI::Root; 4310$ROOT = new CFPlus::UI::Root;
2925$TOOLTIP = new CFClient::UI::Tooltip; 4311$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2926 4312
29271 43131
2928 4314

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines