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.265 by root, Thu Jun 1 02:59:46 2006 UTC vs.
Revision 1.453 by root, Wed Dec 26 20:46:39 2007 UTC

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

Diff Legend

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