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.411 by root, Sun Jul 22 19:34:59 2007 UTC vs.
Revision 1.484 by root, Sun Jan 8 07:58:39 2012 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
6use List::Util (); 5use List::Util ();
6
7use Event; 7use AnyEvent ();
8use Guard ();
8 9
9use CFPlus; 10use DC;
10use CFPlus::Pod; 11use DC::Pod;
11use CFPlus::Texture; 12use DC::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
17our $TOOLTIP; 18our $TOOLTIP;
18our $BUTTON_STATE; 19our $BUTTON_STATE;
19 20
20our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
21 22
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 23our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
24 $_[0]->stop;
25
23 if (!$GRAB) { 26 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 27 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 28 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 29 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 30 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 33 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 34 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 35
33 return if $ENV{CFPLUS_DEBUG} & 8; 36 return if $ENV{CFPLUS_DEBUG} & 8;
34 37
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 38 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 39 $TOOLTIP->show;
41 } 40 }
42 41
43 return; 42 return;
… …
46 } 45 }
47 46
48 $TOOLTIP->hide; 47 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 48 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
51}); 50};
52 51
53sub get_layout { 52sub get_layout {
54 my $layout; 53 my $layout;
55 54
56 for (grep { $_->{name} } values %WIDGET) { 55 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
92 91
93 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 94
96 $TOOLTIP_WATCHER->start; 95 $TOOLTIP_WATCHER->again;
97 } 96 }
98} 97}
99 98
100sub feed_sdl_button_down_event { 99sub feed_sdl_button_down_event {
101 my ($ev) = @_; 100 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 106 my $widget = $ROOT->find_widget ($x, $y);
108 107
109 $GRAB = $widget; 108 $GRAB = $widget;
110 $GRAB->update if $GRAB; 109 $GRAB->update if $GRAB;
111 110
112 $TOOLTIP_WATCHER->cb->(); 111 $TOOLTIP_WATCHER->invoke;
113 } 112 }
114 113
115 if ($GRAB) { 114 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 115 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 116 # mousewheel
118 my $delta = $ev->{button} * 2 - 9; 117 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT; 118 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
120 119
121 $ev->{dx} = $shift ? $delta : 0; 120 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta; 121 $ev->{dy} = $shift ? 0 : $delta;
123 122
124 $GRAB->emit (mouse_wheel => $ev); 123 $GRAB->emit (mouse_wheel => $ev);
… …
142 my $grab = $GRAB; undef $GRAB; 141 my $grab = $GRAB; undef $GRAB;
143 $grab->update if $grab; 142 $grab->update if $grab;
144 $GRAB->update if $GRAB; 143 $GRAB->update if $GRAB;
145 144
146 check_hover $widget; 145 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->(); 146 $TOOLTIP_WATCHER->invoke;
148 } 147 }
149} 148}
150 149
151sub feed_sdl_motion_event { 150sub feed_sdl_motion_event {
152 my ($ev) = @_; 151 my ($ev) = @_;
… …
192# call when resolution changes etc. 191# call when resolution changes etc.
193sub rescale_widgets { 192sub rescale_widgets {
194 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
195 194
196 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
197 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
198 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 197 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 198 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
200 199
201 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 200 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
202 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 201 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
214 reconfigure_widgets; 213 reconfigure_widgets;
215} 214}
216 215
217############################################################################# 216#############################################################################
218 217
219package CFPlus::UI::Event; 218package DC::UI::Event;
220 219
221sub xy { 220sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 221 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223} 222}
224 223
225############################################################################# 224#############################################################################
226 225
227package CFPlus::UI::Base; 226package DC::UI::Base;
228 227
229use strict; 228use common::sense;
230 229
231use CFPlus::OpenGL; 230use DC::OpenGL;
232 231
233sub new { 232sub new {
234 my $class = shift; 233 my $class = shift;
235 234
236 my $self = bless { 235 my $self = bless {
… …
241 h => undef, 240 h => undef,
242 can_events => 1, 241 can_events => 1,
243 @_ 242 @_
244 }, $class; 243 }, $class;
245 244
246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 245 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
247 246
248 for (keys %$self) { 247 for (keys %$self) {
249 if (/^on_(.*)$/) { 248 if (/^on_(.*)$/) {
250 $self->connect ($1 => delete $self->{$_}); 249 $self->connect ($1 => delete $self->{$_});
251 } 250 }
252 } 251 }
253 252
254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 253 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 254 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 255 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 256 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 257 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
259 258
260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 259 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 260 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262 261
263 $self->show if $layout->{show}; 262 $self->show if $layout->{show};
… …
273 $self->emit ("destroy"); 272 $self->emit ("destroy");
274 %$self = (); 273 %$self = ();
275} 274}
276 275
277sub TO_JSON { 276sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 277 { "\fw" => $_[0]{s_id} }
279} 278}
280 279
281sub show { 280sub show {
282 my ($self) = @_; 281 my ($self) = @_;
283 282
284 return if $self->{parent}; 283 return if $self->{parent};
285 284
286 $CFPlus::UI::ROOT->add ($self); 285 $DC::UI::ROOT->add ($self);
287} 286}
288 287
289sub set_visible { 288sub set_visible {
290 my ($self) = @_; 289 my ($self) = @_;
291 290
292 return if $self->{visible}; 291 return if $self->{visible};
292
293 $self->{parent} && $self->{parent}{root}#d#
294 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
293 295
294 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
295 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
296 298
297 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
298 300
299 $self->realloc if !exists $self->{req_w}; 301 $self->realloc if !exists $self->{req_w};
300 302
301 $_->set_visible for $self->children; 303 $_->set_visible for $self->visible_children;
302} 304}
303 305
304sub set_invisible { 306sub set_invisible {
305 my ($self) = @_; 307 my ($self) = @_;
306 308
… …
312 delete $self->{root}; 314 delete $self->{root};
313 315
314 undef $GRAB if $GRAB == $self; 316 undef $GRAB if $GRAB == $self;
315 undef $HOVER if $HOVER == $self; 317 undef $HOVER if $HOVER == $self;
316 318
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 319 $DC::UI::TOOLTIP_WATCHER->invoke
318 if $TOOLTIP->{owner} == $self; 320 if $TOOLTIP->{owner} == $self;
319 321
320 $self->emit ("focus_out"); 322 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0); 323 $self->emit (visibility_change => 0);
322} 324}
… …
341sub hide { 343sub hide {
342 my ($self) = @_; 344 my ($self) = @_;
343 345
344 $self->set_invisible; 346 $self->set_invisible;
345 347
348 # extra $parent copy for 5.8.8+ bug workaround
349 # (otherwise $_[0] in remove gets freed
350 if (my $parent = $self->{parent}) {
346 $self->{parent}->remove ($self) 351 $parent->remove ($self);
347 if $self->{parent}; 352 }
348} 353}
349 354
350sub move_abs { 355sub move_abs {
351 my ($self, $x, $y, $z) = @_; 356 my ($self, $x, $y, $z) = @_;
352 357
… …
358} 363}
359 364
360sub set_size { 365sub set_size {
361 my ($self, $w, $h) = @_; 366 my ($self, $w, $h) = @_;
362 367
363 $self->{force_w} = $w; 368 $self->{force_w} = List::Util::min $w, ($self->{max_w} || $::WIDTH );
364 $self->{force_h} = $h; 369 $self->{force_h} = List::Util::min $h, ($self->{max_h} || $::HEIGHT);
365 370
366 $self->realloc; 371 $self->realloc;
372}
373
374# traverse the widget chain up to find the maximum "physical" size constraints
375sub get_max_wh {
376 my ($self) = @_;
377
378 my ($w, $h) = @$self{qw(max_w max_h)};
379
380 if ($w <= 0 || $h <= 0) {
381 my ($mw, $mh) = $self->{parent}
382 ? $self->{parent}->get_max_wh
383 : ($::WIDTH, $::HEIGHT);
384
385 $w = $mw if $w <= 0;
386 $h = $mh if $h <= 0;
387 }
388
389 ($w, $h)
367} 390}
368 391
369sub size_request { 392sub size_request {
370 require Carp; 393 require Carp;
371 Carp::confess "size_request is abstract"; 394 Carp::confess "size_request is abstract";
… …
379 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
380 403
381 if ($self->{aspect}) { 404 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
383 406
384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386 409
387 # use alignment to adjust x, y 410 # use alignment to adjust x, y
388 411
389 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
390 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
… …
431 454
432 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
433 456
434 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
435 458
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 461 $DC::UI::TOOLTIP_WATCHER->invoke;
439 } 462 }
440} 463}
441 464
442# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
443sub coord2local { 466sub coord2local {
444 my ($self, $x, $y) = @_; 467 my ($self, $x, $y) = @_;
445 468
446 Carp::confess unless $self->{parent};#d# 469 return (undef, undef) unless $self->{parent};
447 470
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 471 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 472}
450 473
451# translate local coordinates to global coordinate system 474# translate local coordinates to global coordinate system
452sub coord2global { 475sub coord2global {
453 my ($self, $x, $y) = @_; 476 my ($self, $x, $y) = @_;
454 477
455 Carp::confess unless $self->{parent};#d# 478 return (undef, undef) unless $self->{parent};
456 479
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 480 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 481}
459 482
460sub invoke_focus_in { 483sub invoke_focus_in {
… …
509sub connect { 532sub connect {
510 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
511 534
512 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
513 536
514 defined wantarray and CFPlus::guard { 537 defined wantarray and Guard::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
517 } 540 }
518} 541}
519 542
… …
557# in .xs 580# in .xs
558 581
559sub set_parent { 582sub set_parent {
560 my ($self, $parent) = @_; 583 my ($self, $parent) = @_;
561 584
562 CFPlus::weaken ($self->{parent} = $parent); 585 DC::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 586 $self->set_visible if $parent->{visible};
564} 587}
565 588
566sub realloc { 589sub realloc {
567 my ($self) = @_; 590 my ($self) = @_;
… …
605} 628}
606 629
607sub DESTROY { 630sub DESTROY {
608 my ($self) = @_; 631 my ($self) = @_;
609 632
610 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
611 634
635 local $@;
612 eval { $self->destroy }; 636 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 638
615 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
616} 640}
617 641
618############################################################################# 642#############################################################################
619 643
620package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
621 645
622our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
623 647
624use strict; 648use common::sense;
649
625use CFPlus::OpenGL; 650use DC::OpenGL;
626 651
627sub new { 652sub new {
628 my $class = shift; 653 my $class = shift;
629
630 # range [value, low, high, page]
631 654
632 $class->SUPER::new ( 655 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 656 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 657 #active_bg => [1, 1, 1, 0.5],
635 @_ 658 @_
636 ) 659 )
637} 660}
638 661
662sub set_bg {
663 my ($self, $bg) = @_;
664
665 $self->{bg} = $bg;
666 $self->update;
667}
668
639sub _draw { 669sub _draw {
640 my ($self) = @_; 670 my ($self) = @_;
641 671
642 my $color = $FOCUS == $self && $self->{active_bg} 672 my $color = $FOCUS == $self
643 ? $self->{active_bg} 673 ? $self->{active_bg} || $self->{bg}
644 : $self->{bg}; 674 : $self->{bg};
645 675
646 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
647 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
648 678
649 glEnable GL_BLEND; 679 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 681 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 682 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 683 glDisable GL_BLEND;
661 } 684 }
662} 685}
663 686
664############################################################################# 687#############################################################################
665 688
666package CFPlus::UI::Empty; 689package DC::UI::Empty;
667 690
668our @ISA = CFPlus::UI::Base::; 691our @ISA = DC::UI::Base::;
669 692
670sub new { 693sub new {
671 my ($class, %arg) = @_; 694 my ($class, %arg) = @_;
672 $class->SUPER::new (can_events => 0, %arg); 695 $class->SUPER::new (can_events => 0, %arg);
673} 696}
… …
680 703
681sub draw { } 704sub draw { }
682 705
683############################################################################# 706#############################################################################
684 707
685package CFPlus::UI::Container; 708package DC::UI::Container;
686 709
687our @ISA = CFPlus::UI::Base::; 710our @ISA = DC::UI::Base::;
688 711
689sub new { 712sub new {
690 my ($class, %arg) = @_; 713 my ($class, %arg) = @_;
691 714
692 my $children = delete $arg{children}; 715 my $children = delete $arg{children};
… …
725 @{$self->{children}}, @widgets 748 @{$self->{children}}, @widgets
726 ]; 749 ];
727 750
728 $self->realloc; 751 $self->realloc;
729 752
753 $self->emit (c_add => \@widgets);
754
730 map $_+0, @widgets 755 map $_+0, @widgets
731} 756}
732 757
733sub children { 758sub children {
734 @{ $_[0]{children} } 759 @{ $_[0]{children} }
735} 760}
736 761
737sub remove { 762sub remove {
738 my ($self, $child) = @_; 763 my ($self, @widgets) = @_;
739 764
765 $self->emit (c_remove => \@widgets);
766
767 for my $child (@widgets) {
740 delete $child->{parent}; 768 delete $child->{parent};
741 $child->hide; 769 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 770 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
771 }
744 772
745 $self->realloc; 773 $self->realloc;
746} 774}
747 775
748sub clear { 776sub clear {
… …
776} 804}
777 805
778sub _draw { 806sub _draw {
779 my ($self) = @_; 807 my ($self) = @_;
780 808
781 $_->draw for @{$self->{children}}; 809 $_->draw for $self->visible_children;
782} 810}
783 811
784############################################################################# 812#############################################################################
785 813
786package CFPlus::UI::Bin; 814package DC::UI::Bin;
787 815
788our @ISA = CFPlus::UI::Container::; 816our @ISA = DC::UI::Container::;
789 817
790sub new { 818sub new {
791 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
792 820
793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 821 my $child = (delete $arg{child}) || new DC::UI::Empty::;
794 822
795 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
796} 824}
797 825
798sub add { 826sub add {
799 my ($self, $child) = @_; 827 my ($self, $child) = @_;
800 828
801 $self->SUPER::remove ($_) for @{ $self->{children} }; 829 $self->clear;
802 $self->SUPER::add ($child); 830 $self->SUPER::add ($child);
803} 831}
804 832
805sub remove { 833sub remove {
806 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
807 835
808 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
809 837
810 $self->{children} = [new CFPlus::UI::Empty] 838 $self->{children} = [new DC::UI::Empty]
811 unless @{$self->{children}}; 839 unless @{$self->{children}};
812} 840}
813 841
814sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
815 843
… …
824 852
825 1 853 1
826} 854}
827 855
828############################################################################# 856#############################################################################
829
830# back-buffered drawing area 857# back-buffered drawing area
831 858
832package CFPlus::UI::Window; 859package DC::UI::Window;
833 860
834our @ISA = CFPlus::UI::Bin::; 861our @ISA = DC::UI::Bin::;
835 862
836use CFPlus::OpenGL; 863use DC::OpenGL;
837 864
838sub new { 865sub new {
839 my ($class, %arg) = @_; 866 my ($class, %arg) = @_;
840 867
841 my $self = $class->SUPER::new (%arg); 868 my $self = $class->SUPER::new (%arg);
… …
863} 890}
864 891
865sub render_child { 892sub render_child {
866 my ($self) = @_; 893 my ($self) = @_;
867 894
868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
869 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
870 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
871 898
872 { 899 {
873 package CFPlus::UI::Base; 900 package DC::UI::Base;
874 901
875 local ($draw_x, $draw_y, $draw_w, $draw_h) = 902 local ($draw_x, $draw_y, $draw_w, $draw_h) =
876 (0, 0, $self->{w}, $self->{h}); 903 (0, 0, $self->{w}, $self->{h});
877 904
878 $self->_render; 905 $self->_render;
… …
895 glDisable GL_TEXTURE_2D; 922 glDisable GL_TEXTURE_2D;
896} 923}
897 924
898############################################################################# 925#############################################################################
899 926
900package CFPlus::UI::ViewPort; 927package DC::UI::ViewPort;
901 928
902use List::Util qw(min max); 929use List::Util qw(min max);
903 930
904our @ISA = CFPlus::UI::Window::; 931our @ISA = DC::UI::Window::;
905 932
906sub new { 933sub new {
907 my $class = shift; 934 my $class = shift;
908 935
909 $class->SUPER::new ( 936 $class->SUPER::new (
… …
951 $self->emit (changed => $x, $y); 978 $self->emit (changed => $x, $y);
952 $self->update; 979 $self->update;
953 } 980 }
954} 981}
955 982
983sub set_center {
984 my ($self, $x, $y) = @_;
985
986 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
987}
988
989sub make_visible {
990 my ($self, $x, $y, $border) = @_;
991
992 if ( $x < $self->{view_x} + $self->{w} * $border
993 || $x > $self->{view_x} + $self->{w} * (1 - $border)
994 || $y < $self->{view_y} + $self->{h} * $border
995 || $y > $self->{view_y} + $self->{h} * (1 - $border)
996 ) {
997 $self->set_center ($x, $y);
998 }
999}
1000
956# hmm, this does not work for topleft of $self... but we should not ask for that 1001# hmm, this does not work for topleft of $self... but we should not ask for that
957sub coord2local { 1002sub coord2local {
958 my ($self, $x, $y) = @_; 1003 my ($self, $x, $y) = @_;
959 1004
960 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 1005 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1020 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
976 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1021 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
977 ) { 1022 ) {
978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1023 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
979 } else { 1024 } else {
980 $self->CFPlus::UI::Base::find_widget ($x, $y) 1025 $self->DC::UI::Base::find_widget ($x, $y)
981 } 1026 }
982} 1027}
983 1028
984sub _render { 1029sub _render {
985 my ($self) = @_; 1030 my ($self) = @_;
986 1031
987 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1032 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1033 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
989 1034
990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1035 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
991 1036
992 $self->SUPER::_render; 1037 $self->SUPER::_render;
993} 1038}
994 1039
995############################################################################# 1040#############################################################################
996 1041
997package CFPlus::UI::ScrolledWindow; 1042package DC::UI::ScrolledWindow;
998 1043
999our @ISA = CFPlus::UI::Table::; 1044our @ISA = DC::UI::Table::;
1000 1045
1001sub new { 1046sub new {
1002 my ($class, %arg) = @_; 1047 my ($class, %arg) = @_;
1003 1048
1004 my $child = delete $arg{child}; 1049 my $child = delete $arg{child};
1005 1050
1006 my $self; 1051 my $self;
1007 1052
1008 my $hslider = new CFPlus::UI::Slider 1053 my $hslider = new DC::UI::Slider
1009 col => 0, 1054 c_col => 0,
1010 row => 1, 1055 c_row => 1,
1011 vertical => 0, 1056 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub { 1058 on_changed => sub {
1014 $self->{hpos} = $_[1]; 1059 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 }, 1061 },
1017 ; 1062 ;
1018 1063
1019 my $vslider = new CFPlus::UI::Slider 1064 my $vslider = new DC::UI::Slider
1020 col => 1, 1065 c_col => 1,
1021 row => 0, 1066 c_row => 0,
1022 vertical => 1, 1067 vertical => 1,
1023 range => [0, 0, 1, 0.01], # HACK fix 1068 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub { 1069 on_changed => sub {
1025 $self->{vpos} = $_[1]; 1070 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1071 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1036 col_expand => [1, 0], 1081 col_expand => [1, 0],
1037 row_expand => [1, 0], 1082 row_expand => [1, 0],
1038 %arg, 1083 %arg,
1039 ); 1084 );
1040 1085
1041 $self->{vp} = new CFPlus::UI::ViewPort 1086 $self->{vp} = new DC::UI::ViewPort
1042 col => 0, 1087 c_col => 0,
1043 row => 0, 1088 c_row => 0,
1044 expand => 1, 1089 expand => 1,
1045 scroll_x => $self->{scroll_x}, 1090 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y}, 1091 scroll_y => $self->{scroll_y},
1047 on_changed => sub { 1092 on_changed => sub {
1048 my ($vp, $x, $y) = @_; 1093 my ($vp, $x, $y) = @_;
… …
1070 my ($self, $widget) = @_; 1115 my ($self, $widget) = @_;
1071 1116
1072 $self->{vp}->add ($self->{child} = $widget); 1117 $self->{vp}->add ($self->{child} = $widget);
1073} 1118}
1074 1119
1120sub set_offset { shift->{vp}->set_offset (@_) }
1121sub set_center { shift->{vp}->set_center (@_) }
1122sub make_visible { shift->{vp}->make_visible (@_) }
1123
1075sub update_slider { 1124sub update_slider {
1076 my ($self) = @_; 1125 my ($self) = @_;
1077 1126
1078 my $child = ($self->{vp} or return)->child; 1127 my $child = ($self->{vp} or return)->child;
1079 1128
… …
1168 $self->SUPER::invoke_size_allocate ($w, $h) 1217 $self->SUPER::invoke_size_allocate ($w, $h)
1169} 1218}
1170 1219
1171############################################################################# 1220#############################################################################
1172 1221
1173package CFPlus::UI::Frame; 1222package DC::UI::Frame;
1174 1223
1175our @ISA = CFPlus::UI::Bin::; 1224our @ISA = DC::UI::Bin::;
1176 1225
1177use CFPlus::OpenGL; 1226use DC::OpenGL;
1178 1227
1179sub new { 1228sub new {
1180 my $class = shift; 1229 my $class = shift;
1181 1230
1182 $class->SUPER::new ( 1231 $class->SUPER::new (
… …
1192 my ($w, $h) = @$self{qw(w h)}; 1241 my ($w, $h) = @$self{qw(w h)};
1193 1242
1194 glEnable GL_BLEND; 1243 glEnable GL_BLEND;
1195 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196 glColor_premultiply @{ $self->{bg} }; 1245 glColor_premultiply @{ $self->{bg} };
1197
1198 glBegin GL_QUADS;
1199 glVertex 0 , 0;
1200 glVertex 0 , $h;
1201 glVertex $w, $h; 1246 glRect 0, 0, $w, $h;
1202 glVertex $w, 0;
1203 glEnd;
1204
1205 glDisable GL_BLEND; 1247 glDisable GL_BLEND;
1206 } 1248 }
1207 1249
1208 $self->SUPER::_draw; 1250 $self->SUPER::_draw;
1209} 1251}
1210 1252
1211############################################################################# 1253#############################################################################
1212 1254
1213package CFPlus::UI::FancyFrame; 1255package DC::UI::FancyFrame;
1214 1256
1215our @ISA = CFPlus::UI::Bin::; 1257our @ISA = DC::UI::Bin::;
1216 1258
1217use CFPlus::OpenGL; 1259use DC::OpenGL;
1218 1260
1219sub new { 1261sub new {
1220 my ($class, %arg) = @_; 1262 my ($class, %arg) = @_;
1221 1263
1222 if ((exists $arg{label}) && !ref $arg{label}) { 1264 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label 1265 $arg{label} = new DC::UI::Label
1224 align => 1, 1266 align => 1,
1225 valign => 0, 1267 valign => 0.5,
1226 text => $arg{label}, 1268 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75; 1269 fontsize => ($arg{border} || 0.8) * 0.75;
1228 } 1270 }
1229 1271
1230 my $self = $class->SUPER::new ( 1272 my $self = $class->SUPER::new (
1231 # label => "", 1273 # label => "",
1232 fg => [0.6, 0.3, 0.1], 1274 fg => undef,
1233 border => 0.8, 1275 border => 0.8,
1234 style => 'single', 1276 style => 'single',
1235 %arg, 1277 %arg,
1236 ); 1278 );
1237 1279
… …
1240 1282
1241sub add { 1283sub add {
1242 my ($self, @widgets) = @_; 1284 my ($self, @widgets) = @_;
1243 1285
1244 $self->SUPER::add (@widgets); 1286 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1287 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1246} 1288}
1247 1289
1248sub border { 1290sub border {
1249 int $_[0]{border} * $::FONTSIZE 1291 int $_[0]{border} * $::FONTSIZE
1250} 1292}
… …
1290 my $border = $self->border; 1332 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h}); 1333 my ($w, $h) = ($self->{w}, $self->{h});
1292 1334
1293 $child->draw; 1335 $child->draw;
1294 1336
1295 glColor @{$self->{fg}}; 1337 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1296 glBegin GL_LINE_STRIP; 1338 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1339 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1342 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1308 } 1350 }
1309} 1351}
1310 1352
1311############################################################################# 1353#############################################################################
1312 1354
1313package CFPlus::UI::Toplevel; 1355package DC::UI::Toplevel;
1314 1356
1315our @ISA = CFPlus::UI::Bin::; 1357our @ISA = DC::UI::Bin::;
1316 1358
1317use CFPlus::OpenGL; 1359use DC::OpenGL;
1318 1360
1319my $bg = 1361my $bg =
1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1362 new_from_resource DC::Texture "d1_bg.png",
1321 mipmap => 1, wrap => 1; 1363 mipmap => 1, wrap => 1;
1322 1364
1323my @border = 1365my @border =
1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1366 map { new_from_resource DC::Texture $_, mipmap => 1 }
1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1367 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326 1368
1327my @icon = 1369my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1370 map { new_from_resource DC::Texture $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png); 1371 qw(x1_move.png x1_resize.png);
1330 1372
1331sub new { 1373sub new {
1332 my ($class, %arg) = @_; 1374 my ($class, %arg) = @_;
1333 1375
1334 my $self = $class->SUPER::new ( 1376 my $self = $class->SUPER::new (
1335 bg => [1, 1, 1, 1], 1377 bg => [1, 1, 1, 1],
1336 border_bg => [1, 1, 1, 1], 1378 border_bg => [1, 1, 1, 1],
1337 border => 0.6, 1379 border => 0.8,
1338 can_events => 1, 1380 can_events => 1,
1339 min_w => 64, 1381 min_w => 64,
1340 min_h => 32, 1382 min_h => 32,
1341 %arg, 1383 %arg,
1342 ); 1384 );
1343 1385
1344 $self->{title_widget} = new CFPlus::UI::Label 1386 $self->{title_widget} = new DC::UI::Label
1345 align => 0, 1387 align => 0.5,
1346 valign => 1, 1388 valign => 1,
1347 text => $self->{title}, 1389 text => $self->{title},
1348 fontsize => $self->{border}, 1390 fontsize => $self->{border},
1349 if exists $self->{title}; 1391 if exists $self->{title};
1350 1392
1351 if ($self->{has_close_button}) { 1393 if ($self->{has_close_button}) {
1352 $self->{close_button} = 1394 $self->{close_button} =
1353 new CFPlus::UI::ImageButton 1395 new DC::UI::ImageButton
1354 path => 'x1_close.png', 1396 path => 'x1_close.png',
1355 on_activate => sub { $self->emit ("delete") }; 1397 on_activate => sub { $self->emit ("delete") };
1356 1398
1357 $self->CFPlus::UI::Container::add ($self->{close_button}); 1399 $self->DC::UI::Container::add ($self->{close_button});
1358 } 1400 }
1359 1401
1360 $self 1402 $self
1361} 1403}
1362 1404
1363sub add { 1405sub add {
1364 my ($self, @widgets) = @_; 1406 my ($self, @widgets) = @_;
1365 1407
1366 $self->SUPER::add (@widgets); 1408 $self->SUPER::add (@widgets);
1367 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1409 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1410 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1369} 1411}
1370 1412
1371sub border { 1413sub border {
1372 int $_[0]{border} * $::FONTSIZE 1414 int $_[0]{border} * $::FONTSIZE
1415}
1416
1417sub get_max_wh {
1418 my ($self) = @_;
1419
1420 return ($self->{w}, $self->{h})
1421 if $self->{visible} && $self->{w};
1422
1423 $self->SUPER::get_max_wh
1373} 1424}
1374 1425
1375sub size_request { 1426sub size_request {
1376 my ($self) = @_; 1427 my ($self) = @_;
1377 1428
… …
1423 my ($self, $ev, $x, $y) = @_; 1474 my ($self, $ev, $x, $y) = @_;
1424 1475
1425 my ($w, $h) = @$self{qw(w h)}; 1476 my ($w, $h) = @$self{qw(w h)};
1426 my $border = $self->border; 1477 my $border = $self->border;
1427 1478
1428 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); 1479 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); # left-right
1429 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); 1480 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); # top-down
1430 1481
1431 if ($lr & $td) { 1482 if ($lr & $td) { # corners
1432 my ($wx, $wy) = ($self->{x}, $self->{y}); 1483 my ($wx, $wy) = ($self->{x}, $self->{y});
1433 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1484 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1434 my ($bw, $bh) = ($self->{w}, $self->{h}); 1485 my ($bw, $bh) = ($self->{w}, $self->{h});
1435 1486
1436 my $mx = $x < $border; 1487 my $mx = $x < $border;
… …
1440 my ($ev, $x, $y) = @_; 1491 my ($ev, $x, $y) = @_;
1441 1492
1442 my $dx = $ev->{x} - $ox; 1493 my $dx = $ev->{x} - $ox;
1443 my $dy = $ev->{y} - $oy; 1494 my $dy = $ev->{y} - $oy;
1444 1495
1496 $self->set_size (
1445 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1497 $bw + $dx * ($mx ? -1 : 1),
1446 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1498 $bh + $dy * ($my ? -1 : 1),
1499 );
1447 1500
1448 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my); 1501 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1449 $self->realloc; 1502 $self->realloc;
1450 }; 1503 };
1451 1504
1452 } elsif ($lr ^ $td) { 1505 } elsif ($lr ^ $td) { # edges
1453 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1506 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1454 my ($bx, $by) = ($self->{x}, $self->{y}); 1507 my ($bx, $by) = ($self->{x}, $self->{y});
1455 1508
1456 $self->{motion} = sub { 1509 $self->{motion} = sub {
1457 my ($ev, $x, $y) = @_; 1510 my ($ev, $x, $y) = @_;
… …
1502 glEnable GL_TEXTURE_2D; 1555 glEnable GL_TEXTURE_2D;
1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1504 1557
1505 my $border = $self->border; 1558 my $border = $self->border;
1506 1559
1560 if ($border) {
1507 glColor @{ $self->{border_bg} }; 1561 glColor @{ $self->{border_bg} };
1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1562 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1563 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1564 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1565 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512 1566
1513 # move 1567 # move
1514 my $w2 = ($w - $border) * .5; 1568 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5; 1569 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1570 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1571 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1572 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519 1573
1520 # resize 1574 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1575 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1576 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button}; 1577 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1578 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1579 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1580 }
1526 1581
1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1582 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1528 glColor @{ $self->{bg} }; 1583 glColor @{ $self->{bg} };
1529 1584
1530 # TODO: repeat texture not scale 1585 # TODO: repeat texture not scale
… …
1549 if $self->{close_button}; 1604 if $self->{close_button};
1550} 1605}
1551 1606
1552############################################################################# 1607#############################################################################
1553 1608
1554package CFPlus::UI::Table; 1609package DC::UI::Table;
1555 1610
1556our @ISA = CFPlus::UI::Container::; 1611our @ISA = DC::UI::Container::;
1557 1612
1558use List::Util qw(max sum); 1613use List::Util qw(max sum);
1559 1614
1560use CFPlus::OpenGL; 1615use DC::OpenGL;
1561 1616
1562sub new { 1617sub new {
1563 my $class = shift; 1618 my $class = shift;
1564 1619
1565 $class->SUPER::new ( 1620 $class->SUPER::new (
… …
1571 1626
1572sub add { 1627sub add {
1573 my ($self, @widgets) = @_; 1628 my ($self, @widgets) = @_;
1574 1629
1575 for my $child (@widgets) { 1630 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1; 1631 $child->{c_rowspan} ||= 1;
1577 $child->{colspan} ||= 1; 1632 $child->{c_colspan} ||= 1;
1578 } 1633 }
1579 1634
1580 $self->SUPER::add (@widgets); 1635 $self->SUPER::add (@widgets);
1581} 1636}
1582 1637
… …
1586 my @widgets; 1641 my @widgets;
1587 1642
1588 while (@_) { 1643 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, (); 1644 my ($col, $row, $child) = splice @_, 0, 3, ();
1590 1645
1591 $child->{row} = $row; 1646 $child->{c_row} = $row;
1592 $child->{col} = $col; 1647 $child->{c_col} = $col;
1593 1648
1594 push @widgets, $child; 1649 push @widgets, $child;
1595 } 1650 }
1596 1651
1597 $self->add (@widgets); 1652 $self->add (@widgets);
… …
1603 my (@w, @h); 1658 my (@w, @h);
1604 1659
1605 my @children = $self->children; 1660 my @children = $self->children;
1606 1661
1607 # first pass, columns 1662 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1663 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1664 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610 1665
1611 my $sw = sum @w[$c .. $c + $cs - 1]; 1666 my $sw = sum @w[$c .. $c + $cs - 1];
1612 1667
1613 if ($w > $sw) { 1668 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1669 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 } 1670 }
1616 } 1671 }
1617 1672
1618 # second pass, rows 1673 # second pass, rows
1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1674 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1675 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621 1676
1622 my $sh = sum @h[$r .. $r + $rs - 1]; 1677 my $sh = sum @h[$r .. $r + $rs - 1];
1623 1678
1624 if ($h > $sh) { 1679 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1680 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1626 } 1681 }
1627 } 1682 }
1628 1683
1629 (\@w, \@h) 1684 (\@w, \@h)
1630} 1685}
… …
1653 @col_expand = (1) x @$ws unless @col_expand; 1708 @col_expand = (1) x @$ws unless @col_expand;
1654 my $col_expand = (sum @col_expand) || 1; 1709 my $col_expand = (sum @col_expand) || 1;
1655 1710
1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1711 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1657 1712
1658 CFPlus::UI::harmonize $ws; 1713 DC::UI::harmonize $ws;
1659 1714
1660 my @row_expand = @{$self->{row_expand}}; 1715 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand; 1716 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1; 1717 my $row_expand = (sum @row_expand) || 1;
1663 1718
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1719 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665 1720
1666 CFPlus::UI::harmonize $hs; 1721 DC::UI::harmonize $hs;
1667 1722
1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1723 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1724 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670 1725
1671 for my $widget ($self->children) { 1726 for my $widget ($self->children) {
1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1727 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673 1728
1674 $widget->configure ( 1729 $widget->configure (
1675 $x[$c], $y[$r], 1730 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1731 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677 ); 1732 );
… …
1680 1 1735 1
1681} 1736}
1682 1737
1683############################################################################# 1738#############################################################################
1684 1739
1685package CFPlus::UI::Fixed; 1740package DC::UI::Fixed;
1686 1741
1687use List::Util qw(min max); 1742use List::Util qw(min max);
1688 1743
1689our @ISA = CFPlus::UI::Container::; 1744our @ISA = DC::UI::Container::;
1690 1745
1691sub _scale($$$) { 1746sub _scale($$$) {
1692 my ($rel, $val, $max) = @_; 1747 my ($rel, $val, $max) = @_;
1693 1748
1694 $rel ? $val * $max : $val 1749 $rel ? $val * $max : $val
… …
1738 my $y = _scale $child->{c_rel}, $child->{c_y}, $H; 1793 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1739 1794
1740 $x += $child->{c_halign} * $child->{req_w}; 1795 $x += $child->{c_halign} * $child->{req_w};
1741 $y += $child->{c_valign} * $child->{req_h}; 1796 $y += $child->{c_valign} * $child->{req_h};
1742 1797
1743 $child->configure ($x, $y, $child->{req_w}, $child->{req_h}); 1798 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1744 } 1799 }
1745 1800
1746 1 1801 1
1747} 1802}
1748 1803
1749############################################################################# 1804#############################################################################
1750 1805
1751package CFPlus::UI::Box; 1806package DC::UI::Box;
1752 1807
1753our @ISA = CFPlus::UI::Container::; 1808our @ISA = DC::UI::Container::;
1754 1809
1755sub size_request { 1810sub size_request {
1756 my ($self) = @_; 1811 my ($self) = @_;
1812
1813 my @children = $self->visible_children;
1757 1814
1758 $self->{vertical} 1815 $self->{vertical}
1759 ? ( 1816 ? (
1760 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1817 (List::Util::max map $_->{req_w}, @children),
1761 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1818 (List::Util::sum map $_->{req_h}, @children),
1762 ) 1819 )
1763 : ( 1820 : (
1764 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1821 (List::Util::sum map $_->{req_w}, @children),
1765 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1822 (List::Util::max map $_->{req_h}, @children),
1766 ) 1823 )
1767} 1824}
1768 1825
1769sub invoke_size_allocate { 1826sub invoke_size_allocate {
1770 my ($self, $w, $h) = @_; 1827 my ($self, $w, $h) = @_;
… …
1791 $req[$_] += $space * $children[$_]{expand} 1848 $req[$_] += $space * $children[$_]{expand}
1792 for 0 .. $#children; 1849 for 0 .. $#children;
1793 } 1850 }
1794 } 1851 }
1795 1852
1796 CFPlus::UI::harmonize \@req; 1853 DC::UI::harmonize \@req;
1797 1854
1798 my $pos = 0; 1855 my $pos = 0;
1799 for (0 .. $#children) { 1856 for (0 .. $#children) {
1800 my $alloc = $req[$_]; 1857 my $alloc = $req[$_];
1801 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1858 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1806 1 1863 1
1807} 1864}
1808 1865
1809############################################################################# 1866#############################################################################
1810 1867
1811package CFPlus::UI::HBox; 1868package DC::UI::HBox;
1812 1869
1813our @ISA = CFPlus::UI::Box::; 1870our @ISA = DC::UI::Box::;
1814 1871
1815sub new { 1872sub new {
1816 my $class = shift; 1873 my $class = shift;
1817 1874
1818 $class->SUPER::new ( 1875 $class->SUPER::new (
… …
1821 ) 1878 )
1822} 1879}
1823 1880
1824############################################################################# 1881#############################################################################
1825 1882
1826package CFPlus::UI::VBox; 1883package DC::UI::VBox;
1827 1884
1828our @ISA = CFPlus::UI::Box::; 1885our @ISA = DC::UI::Box::;
1829 1886
1830sub new { 1887sub new {
1831 my $class = shift; 1888 my $class = shift;
1832 1889
1833 $class->SUPER::new ( 1890 $class->SUPER::new (
… …
1836 ) 1893 )
1837} 1894}
1838 1895
1839############################################################################# 1896#############################################################################
1840 1897
1841package CFPlus::UI::Label; 1898package DC::UI::Label;
1842 1899
1843our @ISA = CFPlus::UI::DrawBG::; 1900our @ISA = DC::UI::DrawBG::;
1844 1901
1845use CFPlus::OpenGL; 1902use DC::OpenGL;
1846 1903
1847sub new { 1904sub new {
1848 my ($class, %arg) = @_; 1905 my ($class, %arg) = @_;
1849 1906
1850 my $self = $class->SUPER::new ( 1907 my $self = $class->SUPER::new (
… …
1855 #text => initial text 1912 #text => initial text
1856 #markup => initial narkup 1913 #markup => initial narkup
1857 #max_w => maximum pixel width 1914 #max_w => maximum pixel width
1858 #style => 0, # render flags 1915 #style => 0, # render flags
1859 ellipsise => 3, # end 1916 ellipsise => 3, # end
1860 layout => (new CFPlus::Layout), 1917 layout => (new DC::Layout),
1861 fontsize => 1, 1918 fontsize => 1,
1862 align => -1, 1919 align => 0.5,
1863 valign => -1, 1920 valign => 0.5,
1864 padding_x => 2, 1921 padding_x => 4,
1865 padding_y => 2, 1922 padding_y => 2,
1866 can_events => 0, 1923 can_events => 0,
1867 %arg 1924 %arg
1868 ); 1925 );
1869 1926
1870 if (exists $self->{template}) { 1927 if (exists $self->{template}) {
1871 my $layout = new CFPlus::Layout; 1928 my $layout = new DC::Layout;
1872 $layout->set_text (delete $self->{template}); 1929 $layout->set_text (delete $self->{template});
1873 $self->{template} = $layout; 1930 $self->{template} = $layout;
1874 } 1931 }
1875 1932
1876 if (exists $self->{markup}) { 1933 if (exists $self->{markup}) {
… …
1894 1951
1895 delete $self->{ox}; 1952 delete $self->{ox};
1896 $self->SUPER::realloc; 1953 $self->SUPER::realloc;
1897} 1954}
1898 1955
1956sub clear {
1957 my ($self) = @_;
1958
1959 $self->set_text ("");
1960}
1961
1899sub set_text { 1962sub set_text {
1900 my ($self, $text) = @_; 1963 my ($self, $text) = @_;
1901 1964
1902 return if $self->{text} eq "T$text"; 1965 return if $self->{text} eq "T$text";
1903 $self->{text} = "T$text"; 1966 $self->{text} = "T$text";
… …
1926 1989
1927sub size_request { 1990sub size_request {
1928 my ($self) = @_; 1991 my ($self) = @_;
1929 1992
1930 $self->{size_req} ||= do { 1993 $self->{size_req} ||= do {
1994 my ($max_w, $max_h) = $self->get_max_wh;
1995
1931 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1996 $self->{layout}->set_font ($self->{font}) if $self->{font};
1932 $self->{layout}->set_width ($self->{max_w} || -1); 1997 $self->{layout}->set_width ($max_w);
1933 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1998 $self->{layout}->set_ellipsise ($self->{ellipsise});
1934 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1999 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1935 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2000 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1936 2001
1937 my ($w, $h) = $self->{layout}->size; 2002 my ($w, $h) = $self->{layout}->size;
1938 2003
1939 if (exists $self->{template}) { 2004 if (exists $self->{template}) {
1940 $self->{template}->set_font ($self->{font}) if $self->{font}; 2005 $self->{template}->set_font ($self->{font}) if $self->{font};
1941 $self->{template}->set_width ($self->{max_w} || -1); 2006 $self->{template}->set_width ($max_w);
1942 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2007 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1943 2008
1944 my ($w2, $h2) = $self->{template}->size; 2009 my ($w2, $h2) = $self->{template}->size;
1945 2010
1946 $w = List::Util::max $w, $w2; 2011 $w = List::Util::max $w, $w2;
… …
2002 2067
2003 [$self->{layout}->size] 2068 [$self->{layout}->size]
2004 }; 2069 };
2005 2070
2006 unless (exists $self->{ox}) { 2071 unless (exists $self->{ox}) {
2007 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2072 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2008 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2073 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2009 : ($self->{w} - $size->[0]) * 0.5);
2010 2074
2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2075 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2013 : ($self->{h} - $size->[1]) * 0.5);
2014 }; 2076 };
2015 2077
2016# unless ($self->{list}) { 2078# unless ($self->{list}) {
2017# $self->{list} = CFPlus::OpenGL::glGenList; 2079# $self->{list} = DC::OpenGL::glGenList;
2018# CFPlus::OpenGL::glNewList $self->{list}; 2080# DC::OpenGL::glNewList $self->{list};
2019# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2081# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2020# CFPlus::OpenGL::glEndList; 2082# DC::OpenGL::glEndList;
2021# } 2083# }
2022# 2084#
2023# CFPlus::OpenGL::glCallList $self->{list}; 2085# DC::OpenGL::glCallList $self->{list};
2024 2086
2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2087 $self->{layout}->draw;
2026} 2088}
2027 2089
2028#sub destroy { 2090#sub destroy {
2029# my ($self) = @_; 2091# my ($self) = @_;
2030# 2092#
2031# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; 2093# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2032# 2094#
2033# $self->SUPER::destroy; 2095# $self->SUPER::destroy;
2034#} 2096#}
2035 2097
2036############################################################################# 2098#############################################################################
2037 2099
2038package CFPlus::UI::EntryBase; 2100package DC::UI::EntryBase;
2039 2101
2040our @ISA = CFPlus::UI::Label::; 2102our @ISA = DC::UI::Label::;
2041 2103
2042use CFPlus::OpenGL; 2104use DC::OpenGL;
2043 2105
2044sub new { 2106sub new {
2045 my $class = shift; 2107 my $class = shift;
2046 2108
2047 $class->SUPER::new ( 2109 $class->SUPER::new (
2048 fg => [1, 1, 1], 2110 fg => [1, 1, 1],
2049 bg => [0, 0, 0, 0.2], 2111 bg => [0, 0, 0, 0.2],
2112 outline => undef,
2050 active_bg => [1, 1, 1, 0.5], 2113 active_bg => [0, 0, 1, .2],
2051 active_fg => [0, 0, 0], 2114 active_fg => [1, 1, 1],
2115 active_outline => [1, 1, 0],
2052 can_hover => 1, 2116 can_hover => 1,
2053 can_focus => 1, 2117 can_focus => 1,
2118 align => 0,
2054 valign => 0, 2119 valign => 0.5,
2055 can_events => 1, 2120 can_events => 1,
2056 ellipsise => 0, 2121 ellipsise => 0,
2122 padding_x => 4,
2123 padding_y => 2,
2057 #text => ... 2124 #text => ...
2058 #hidden => "*", 2125 #hidden => "*",
2059 @_ 2126 @_
2060 ) 2127 )
2061} 2128}
… …
2108 2175
2109 my $text = $self->get_text; 2176 my $text = $self->get_text;
2110 2177
2111 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2178 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2112 2179
2113 if ($uni == 8) { 2180 if ($sym == DC::SDLK_BACKSPACE) {
2114 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2181 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2115 } elsif ($uni == 127) { 2182 } elsif ($sym == DC::SDLK_DELETE) {
2116 substr $text, $self->{cursor}, 1, ""; 2183 substr $text, $self->{cursor}, 1, "";
2117 } elsif ($sym == CFPlus::SDLK_LEFT) { 2184 } elsif ($sym == DC::SDLK_LEFT) {
2118 --$self->{cursor} if $self->{cursor}; 2185 --$self->{cursor} if $self->{cursor};
2119 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2186 } elsif ($sym == DC::SDLK_RIGHT) {
2120 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2187 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2121 } elsif ($sym == CFPlus::SDLK_HOME) { 2188 } elsif ($sym == DC::SDLK_HOME) {
2122 # what a hack 2189 # what a hack
2123 $self->{cursor} = 2190 $self->{cursor} =
2124 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2191 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2125 ? length $1 2192 ? length $1
2126 : 0; 2193 : 0;
2127 } elsif ($sym == CFPlus::SDLK_END) { 2194 } elsif ($sym == DC::SDLK_END) {
2128 # uh, again 2195 # uh, again
2129 $self->{cursor} = 2196 $self->{cursor} =
2130 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2197 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2131 ? $self->{cursor} + length $1 2198 ? $self->{cursor} + length $1
2132 : length $self->{text}; 2199 : length $self->{text};
… …
2196 glColor_premultiply @{$self->{bg}}; 2263 glColor_premultiply @{$self->{bg}};
2197 } 2264 }
2198 2265
2199 glEnable GL_BLEND; 2266 glEnable GL_BLEND;
2200 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2267 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2201 glBegin GL_QUADS;
2202 glVertex 0 , 0;
2203 glVertex 0 , $self->{h};
2204 glVertex $self->{w}, $self->{h}; 2268 glRect 0, 0, $self->{w}, $self->{h};
2205 glVertex $self->{w}, 0;
2206 glEnd;
2207 glDisable GL_BLEND; 2269 glDisable GL_BLEND;
2208 2270
2209 $self->SUPER::_draw; 2271 $self->SUPER::_draw;
2210 2272
2211 #TODO: force update every cursor change :( 2273 #TODO: force update every cursor change :(
… …
2213 2275
2214 unless (exists $self->{cur_h}) { 2276 unless (exists $self->{cur_h}) {
2215 my $text = substr $self->{text}, 0, $self->{cursor}; 2277 my $text = substr $self->{text}, 0, $self->{cursor};
2216 utf8::encode $text; 2278 utf8::encode $text;
2217 2279
2218 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2280 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2219 } 2281 }
2220 2282
2283 glColor_premultiply @{$self->{active_fg}};
2221 glBegin GL_LINES; 2284 glBegin GL_LINES;
2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2285 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2223 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2286 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2224 glEnd; 2287 glEnd;
2288
2289 glLineWidth 3;
2290 glColor @{$self->{active_outline}};
2291 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2292 glLineWidth 1;
2293
2294 } else {
2295 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2296 glBegin GL_LINE_STRIP;
2297 glVertex .5, $self->{h} * .5;
2298 glVertex .5, $self->{h} - 2.5;
2299 glVertex $self->{w} - .5, $self->{h} - 2.5;
2300 glVertex $self->{w} - .5, $self->{h} * .5;
2301 glEnd;
2225 } 2302 }
2226} 2303}
2227 2304
2228############################################################################# 2305#############################################################################
2229 2306
2230package CFPlus::UI::Entry; 2307package DC::UI::Entry;
2231 2308
2232our @ISA = CFPlus::UI::EntryBase::; 2309our @ISA = DC::UI::EntryBase::;
2233 2310
2234use CFPlus::OpenGL; 2311use DC::OpenGL;
2312
2313sub new {
2314 my $class = shift;
2315
2316 $class->SUPER::new (
2317 history_pointer => -1,
2318 @_
2319 )
2320}
2321
2235 2322
2236sub invoke_key_down { 2323sub invoke_key_down {
2237 my ($self, $ev) = @_; 2324 my ($self, $ev) = @_;
2238 2325
2239 my $sym = $ev->{sym}; 2326 my $sym = $ev->{sym};
… …
2245 $self->{history_pointer} = -1; 2332 $self->{history_pointer} = -1;
2246 $self->{history_saveback} = ''; 2333 $self->{history_saveback} = '';
2247 $self->emit (activate => $txt); 2334 $self->emit (activate => $txt);
2248 $self->update; 2335 $self->update;
2249 2336
2250 } elsif ($sym == CFPlus::SDLK_UP) { 2337 } elsif ($sym == DC::SDLK_UP) {
2251 if ($self->{history_pointer} < 0) { 2338 if ($self->{history_pointer} < 0) {
2252 $self->{history_saveback} = $self->get_text; 2339 $self->{history_saveback} = $self->get_text;
2253 } 2340 }
2254 if (@{$self->{history} || []} > 0) { 2341 if (@{$self->{history} || []} > 0) {
2255 $self->{history_pointer}++; 2342 $self->{history_pointer}++;
… …
2257 $self->{history_pointer} = @{$self->{history} || []} - 1; 2344 $self->{history_pointer} = @{$self->{history} || []} - 1;
2258 } 2345 }
2259 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2346 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2260 } 2347 }
2261 2348
2262 } elsif ($sym == CFPlus::SDLK_DOWN) { 2349 } elsif ($sym == DC::SDLK_DOWN) {
2263 $self->{history_pointer}--; 2350 $self->{history_pointer}--;
2264 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2351 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2265 2352
2266 if ($self->{history_pointer} >= 0) { 2353 if ($self->{history_pointer} >= 0) {
2267 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2354 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2268 } else { 2355 } else {
2356 if (defined $self->{history_saveback}) {
2269 $self->set_text ($self->{history_saveback}); 2357 $self->set_text ($self->{history_saveback});
2358 $self->{history_saveback} = undef;
2359 }
2270 } 2360 }
2271 2361
2272 } else { 2362 } else {
2273 return $self->SUPER::invoke_key_down ($ev) 2363 return $self->SUPER::invoke_key_down ($ev)
2274 } 2364 }
… …
2276 1 2366 1
2277} 2367}
2278 2368
2279############################################################################# 2369#############################################################################
2280 2370
2281package CFPlus::UI::TextEdit; 2371package DC::UI::TextEdit;
2282 2372
2283our @ISA = CFPlus::UI::EntryBase::; 2373our @ISA = DC::UI::EntryBase::;
2284 2374
2285use CFPlus::OpenGL; 2375use DC::OpenGL;
2376
2377sub new {
2378 my $class = shift;
2379
2380 $class->SUPER::new (
2381 padding_y => 4,
2382
2383 @_
2384 )
2385}
2286 2386
2287sub move_cursor_ver { 2387sub move_cursor_ver {
2288 my ($self, $dy) = @_; 2388 my ($self, $dy) = @_;
2289 2389
2290 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2390 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2291 2391
2292 $y += $dy; 2392 $line += $dy;
2293 2393
2294 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2394 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2295 $self->{cursor} = $index; 2395 $self->{cursor} = $index;
2296 delete $self->{cur_h}; 2396 delete $self->{cur_h};
2297 $self->update; 2397 $self->update;
2298 return; 2398 return;
2299 } 2399 }
… …
2302sub invoke_key_down { 2402sub invoke_key_down {
2303 my ($self, $ev) = @_; 2403 my ($self, $ev) = @_;
2304 2404
2305 my $sym = $ev->{sym}; 2405 my $sym = $ev->{sym};
2306 2406
2307 if ($sym == CFPlus::SDLK_UP) { 2407 if ($sym == DC::SDLK_UP) {
2308 $self->move_cursor_ver (-1); 2408 $self->move_cursor_ver (-1);
2309 } elsif ($sym == CFPlus::SDLK_DOWN) { 2409 } elsif ($sym == DC::SDLK_DOWN) {
2310 $self->move_cursor_ver (+1); 2410 $self->move_cursor_ver (+1);
2311 } else { 2411 } else {
2312 return $self->SUPER::invoke_key_down ($ev) 2412 return $self->SUPER::invoke_key_down ($ev)
2313 } 2413 }
2314 2414
2315 1 2415 1
2316} 2416}
2317 2417
2318############################################################################# 2418#############################################################################
2319 2419
2320package CFPlus::UI::Button; 2420package DC::UI::ButtonBin;
2321 2421
2322our @ISA = CFPlus::UI::Label::; 2422our @ISA = DC::UI::Bin::;
2323 2423
2324use CFPlus::OpenGL; 2424use DC::OpenGL;
2325 2425
2326my @tex = 2426my @tex =
2327 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2427 map { new_from_resource DC::Texture $_, mipmap => 1 }
2328 qw(b1_button_inactive.png b1_button_active.png); 2428 qw(b1_button_inactive.png b1_button_active.png);
2329 2429
2330sub new { 2430sub new {
2331 my $class = shift; 2431 my $class = shift;
2332 2432
2333 $class->SUPER::new ( 2433 $class->SUPER::new (
2434 can_hover => 1,
2435 align => 0.5,
2436 valign => 0.5,
2437 can_events => 1,
2438 @_
2439 )
2440}
2441
2442sub invoke_button_up {
2443 my ($self, $ev, $x, $y) = @_;
2444
2445 $self->emit ("activate")
2446 if $x >= 0 && $x < $self->{w}
2447 && $y >= 0 && $y < $self->{h};
2448
2449 1
2450}
2451
2452sub _draw {
2453 my ($self) = @_;
2454
2455 glEnable GL_TEXTURE_2D;
2456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2457 glColor 0, 0, 0, 1;
2458
2459 my $tex = $tex[$GRAB == $self];
2460 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2461
2462 glDisable GL_TEXTURE_2D;
2463
2464 $self->SUPER::_draw;
2465}
2466
2467#############################################################################
2468
2469package DC::UI::Button;
2470
2471our @ISA = DC::UI::Label::;
2472
2473use DC::OpenGL;
2474
2475my @tex =
2476 map { new_from_resource DC::Texture $_, mipmap => 1 }
2477 qw(b1_button_inactive.png b1_button_active.png);
2478
2479sub new {
2480 my $class = shift;
2481
2482 $class->SUPER::new (
2334 padding_x => 4, 2483 padding_x => 8,
2335 padding_y => 4, 2484 padding_y => 4,
2336 fg => [1.0, 1.0, 1.0], 2485 fg => [1.0, 1.0, 1.0],
2337 active_fg => [0.8, 0.8, 0.8], 2486 active_fg => [0.8, 0.8, 0.8],
2338 can_hover => 1, 2487 can_hover => 1,
2339 align => 0, 2488 align => 0.5,
2340 valign => 0, 2489 valign => 0.5,
2341 can_events => 1, 2490 can_events => 1,
2342 @_ 2491 @_
2343 ) 2492 )
2344} 2493}
2345 2494
… …
2370 $self->SUPER::_draw; 2519 $self->SUPER::_draw;
2371} 2520}
2372 2521
2373############################################################################# 2522#############################################################################
2374 2523
2375package CFPlus::UI::CheckBox; 2524package DC::UI::CheckBox;
2376 2525
2377our @ISA = CFPlus::UI::DrawBG::; 2526our @ISA = DC::UI::DrawBG::;
2378 2527
2379my @tex = 2528my @tex =
2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2529 map { new_from_resource DC::Texture $_, mipmap => 1 }
2381 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2530 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2382 2531
2383use CFPlus::OpenGL; 2532use DC::OpenGL;
2384 2533
2385sub new { 2534sub new {
2386 my $class = shift; 2535 my $class = shift;
2387 2536
2388 $class->SUPER::new ( 2537 $class->SUPER::new (
2538 fontsize => 1,
2389 padding_x => 2, 2539 padding_x => 2,
2390 padding_y => 2, 2540 padding_y => 2,
2391 fg => [1, 1, 1], 2541 fg => [1, 1, 1],
2392 active_fg => [1, 1, 0], 2542 active_fg => [1, 1, 0],
2393 bg => [0, 0, 0, 0.2], 2543 bg => [0, 0, 0, 0.2],
… …
2399} 2549}
2400 2550
2401sub size_request { 2551sub size_request {
2402 my ($self) = @_; 2552 my ($self) = @_;
2403 2553
2404 (6) x 2 2554 ($self->{fontsize} * $::FONTSIZE) x 2
2405} 2555}
2406 2556
2407sub toggle { 2557sub toggle {
2408 my ($self) = @_; 2558 my ($self) = @_;
2409 2559
… …
2428sub _draw { 2578sub _draw {
2429 my ($self) = @_; 2579 my ($self) = @_;
2430 2580
2431 $self->SUPER::_draw; 2581 $self->SUPER::_draw;
2432 2582
2433 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2583 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2434 2584
2435 my ($w, $h) = @$self{qw(w h)}; 2585 my ($w, $h) = @$self{qw(w h)};
2436 2586
2437 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2587 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2438 2588
… …
2445 glDisable GL_TEXTURE_2D; 2595 glDisable GL_TEXTURE_2D;
2446} 2596}
2447 2597
2448############################################################################# 2598#############################################################################
2449 2599
2450package CFPlus::UI::Image; 2600package DC::UI::Image;
2451 2601
2452our @ISA = CFPlus::UI::Base::; 2602our @ISA = DC::UI::DrawBG::;
2453 2603
2454use CFPlus::OpenGL; 2604use DC::OpenGL;
2455 2605
2456our %texture_cache; 2606our %texture_cache;
2457 2607
2458sub new { 2608sub new {
2459 my $class = shift; 2609 my $class = shift;
2460 2610
2461 my $self = $class->SUPER::new ( 2611 my $self = $class->SUPER::new (
2462 can_events => 0, 2612 can_events => 0,
2613 scale => 1,
2463 @_, 2614 @_,
2464 ); 2615 );
2465 2616
2466 $self->{path} || $self->{tex} 2617 $self->{path} || $self->{tex}
2467 or Carp::croak "'path' or 'tex' attributes required"; 2618 or Carp::croak "'path' or 'tex' attributes required";
2468 2619
2469 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2620 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2470 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2621 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2471 2622
2472 CFPlus::weaken $texture_cache{$self->{path}}; 2623 DC::weaken $texture_cache{$self->{path}};
2473 2624
2474 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2625 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2475 2626
2476 $self 2627 $self
2477} 2628}
2478 2629
2479sub STORABLE_freeze { 2630sub STORABLE_freeze {
2480 my ($self, $cloning) = @_; 2631 my ($self, $cloning) = @_;
2481 2632
2482 $self->{path} 2633 $self->{path}
2483 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2634 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2484 2635
2485 $self->{path} 2636 $self->{path}
2486} 2637}
2487 2638
2488sub STORABLE_attach { 2639sub STORABLE_attach {
2489 my ($self, $cloning, $path) = @_; 2640 my ($self, $cloning, $path) = @_;
2490 2641
2491 $self->new (path => $path) 2642 $self->new (path => $path)
2492} 2643}
2493 2644
2645sub set_texture {
2646 my ($self, $tex) = @_;
2647
2648 $self->{tex} = $tex;
2649 $self->update;
2650}
2651
2494sub size_request { 2652sub size_request {
2495 my ($self) = @_; 2653 my ($self) = @_;
2496 2654
2497 ($self->{tex}{w}, $self->{tex}{h}) 2655 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2498} 2656}
2499 2657
2500sub _draw { 2658sub _draw {
2501 my ($self) = @_; 2659 my ($self) = @_;
2660
2661 $self->SUPER::_draw;
2502 2662
2503 my $tex = $self->{tex}; 2663 my $tex = $self->{tex};
2504 2664
2505 my ($w, $h) = ($self->{w}, $self->{h}); 2665 my ($w, $h) = ($self->{w}, $self->{h});
2506 2666
… …
2512 } 2672 }
2513 2673
2514 glEnable GL_TEXTURE_2D; 2674 glEnable GL_TEXTURE_2D;
2515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2516 2676
2517 $tex->draw_quad (0, 0, $w, $h); 2677 $tex->draw_quad_alpha (0, 0, $w, $h);
2518 2678
2519 glDisable GL_TEXTURE_2D; 2679 glDisable GL_TEXTURE_2D;
2520} 2680}
2521 2681
2522############################################################################# 2682#############################################################################
2523 2683
2524package CFPlus::UI::ImageButton; 2684package DC::UI::ImageButton;
2525 2685
2526our @ISA = CFPlus::UI::Image::; 2686our @ISA = DC::UI::Image::;
2527 2687
2528use CFPlus::OpenGL; 2688use DC::OpenGL;
2529
2530my %textures;
2531 2689
2532sub new { 2690sub new {
2533 my $class = shift; 2691 my $class = shift;
2534 2692
2535 my $self = $class->SUPER::new ( 2693 my $self = $class->SUPER::new (
2536 padding_x => 4, 2694 padding_x => 4,
2537 padding_y => 4, 2695 padding_y => 4,
2538 fg => [1, 1, 1], 2696 fg => [1, 1, 1],
2539 active_fg => [0, 0, 1], 2697 active_fg => [0, 0, 1],
2540 can_hover => 1, 2698 can_hover => 1,
2541 align => 0, 2699 align => 0.5,
2542 valign => 0, 2700 valign => 0.5,
2543 can_events => 1, 2701 can_events => 1,
2544 @_ 2702 @_
2545 ); 2703 );
2546} 2704}
2547 2705
2706sub invoke_button_down {
2707 my ($self, $ev, $x, $y) = @_;
2708
2709 1
2710}
2711
2548sub invoke_button_up { 2712sub invoke_button_up {
2549 my ($self, $ev, $x, $y) = @_; 2713 my ($self, $ev, $x, $y) = @_;
2550 2714
2551 $self->emit ("activate") 2715 $self->emit ("activate")
2552 if $x >= 0 && $x < $self->{w} 2716 if $x >= 0 && $x < $self->{w}
… …
2555 1 2719 1
2556} 2720}
2557 2721
2558############################################################################# 2722#############################################################################
2559 2723
2560package CFPlus::UI::VGauge; 2724package DC::UI::VGauge;
2561 2725
2562our @ISA = CFPlus::UI::Base::; 2726our @ISA = DC::UI::Base::;
2563 2727
2564use List::Util qw(min max); 2728use List::Util qw(min max);
2565 2729
2566use CFPlus::OpenGL; 2730use DC::OpenGL;
2567 2731
2568my %tex = ( 2732my %tex = (
2569 food => [ 2733 food => [
2570 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2734 map { new_from_resource DC::Texture $_, mipmap => 1 }
2571 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2735 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2572 ], 2736 ],
2573 grace => [ 2737 grace => [
2574 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2738 map { new_from_resource DC::Texture $_, mipmap => 1 }
2575 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2739 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2576 ], 2740 ],
2577 hp => [ 2741 hp => [
2578 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2742 map { new_from_resource DC::Texture $_, mipmap => 1 }
2579 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2743 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2580 ], 2744 ],
2581 mana => [ 2745 mana => [
2582 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2746 map { new_from_resource DC::Texture $_, mipmap => 1 }
2583 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2747 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2584 ], 2748 ],
2585); 2749);
2586 2750
2587# eg. VGauge->new (gauge => 'food'), default gauge: food 2751# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2690 glDisable GL_TEXTURE_2D; 2854 glDisable GL_TEXTURE_2D;
2691} 2855}
2692 2856
2693############################################################################# 2857#############################################################################
2694 2858
2859package DC::UI::Progress;
2860
2861our @ISA = DC::UI::Label::;
2862
2863use DC::OpenGL;
2864
2865sub new {
2866 my ($class, %arg) = @_;
2867
2868 my $self = $class->SUPER::new (
2869 padding_x => 2,
2870 padding_y => 2,
2871 fg => [1, 1, 1],
2872 bg => [0, 0, 1, 0.2],
2873 bar => [0.7, 0.5, 0.1, 0.8],
2874 outline => [0.4, 0.3, 0],
2875 fontsize => 0.9,
2876 valign => 0.5,
2877 align => 0.5,
2878 can_events => 1,
2879 ellipsise => 1,
2880 label => "%d%%",
2881 %arg,
2882 );
2883
2884 $self->set_value ($arg{value} || -1);
2885
2886 $self
2887}
2888
2889sub set_label {
2890 my ($self, $label) = @_;
2891
2892 return if $self->{label} eq $label;
2893 $self->{label} = $label;
2894
2895 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2896}
2897
2898sub set_value {
2899 my ($self, $value) = @_;
2900
2901 if ($self->{value} ne $value) {
2902 $self->{value} = $value;
2903
2904 if ($value < 0) {
2905 $self->set_text ("-");
2906 } else {
2907 $self->set_text (sprintf $self->{label}, $value * 100);
2908 }
2909
2910 $self->update;
2911 }
2912}
2913
2914sub _draw {
2915 my ($self) = @_;
2916
2917 glEnable GL_BLEND;
2918 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2919
2920 my $px = $self->{padding_x};
2921 my $py = $self->{padding_y};
2922
2923 if ($self->{value} >= 0) {
2924 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2925
2926 glColor_premultiply @{$self->{bar}};
2927 glRect $px, $py, $s, $self->{h} - $py;
2928 glColor_premultiply @{$self->{bg}};
2929 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2930 }
2931
2932 glColor_premultiply @{$self->{outline}};
2933
2934 $px -= .5;
2935 $py -= .5;
2936
2937 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2938
2939 glDisable GL_BLEND;
2940
2941 {
2942 local $self->{bg}; # do not draw background
2943 $self->SUPER::_draw;
2944 }
2945}
2946
2947#############################################################################
2948
2949package DC::UI::ExperienceProgress;
2950
2951our @ISA = DC::UI::Progress::;
2952
2953sub new {
2954 my ($class, %arg) = @_;
2955
2956 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2957
2958 my $self = $class->SUPER::new (
2959 %arg,
2960 tooltip => sub {
2961 my ($self) = @_;
2962
2963 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2964 $tt,
2965 $self->{lvl},
2966 ::formsep ($self->{exp}),
2967 ::formsep ($self->{nxt}),
2968 ::formsep ($self->{nxt} - $self->{exp}),
2969 $self->_percent * 100,
2970 },
2971 );
2972
2973 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2974 if $::CONN;
2975
2976 $self
2977}
2978
2979sub DESTROY {
2980 my ($self) = @_;
2981
2982 delete $::CONN->{on_exp_update}{$self+0}
2983 if $::CONN;
2984
2985 $self->SUPER::DESTROY;
2986}
2987
2988sub _percent {
2989 my ($self) = @_;
2990
2991 my $table = $::CONN && $::CONN->{exp_table}
2992 or return -1;
2993
2994 my $l0 = $table->[$self->{lvl} - 1];
2995 my $l1 = $table->[$self->{lvl}];
2996
2997 $self->{nxt} = $l1;
2998
2999 ($self->{exp} - $l0) / ($l1 - $l0)
3000}
3001
3002sub set_value {
3003 my ($self, $lvl, $exp) = @_;
3004
3005 $self->{lvl} = $lvl;
3006 $self->{exp} = $exp;
3007
3008 $self->SUPER::set_value ($self->_percent);
3009}
3010
3011#############################################################################
3012
2695package CFPlus::UI::Gauge; 3013package DC::UI::Gauge;
2696 3014
2697our @ISA = CFPlus::UI::VBox::; 3015our @ISA = DC::UI::VBox::;
2698 3016
2699sub new { 3017sub new {
2700 my ($class, %arg) = @_; 3018 my ($class, %arg) = @_;
2701 3019
2702 my $self = $class->SUPER::new ( 3020 my $self = $class->SUPER::new (
… …
2704 can_hover => 1, 3022 can_hover => 1,
2705 can_events => 1, 3023 can_events => 1,
2706 %arg, 3024 %arg,
2707 ); 3025 );
2708 3026
2709 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3027 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2710 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3028 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2711 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3029 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2712 3030
2713 $self 3031 $self
2714} 3032}
2715 3033
2716sub set_fontsize { 3034sub set_fontsize {
… …
2737 $self->{value}->set_text ($val); 3055 $self->{value}->set_text ($val);
2738} 3056}
2739 3057
2740############################################################################# 3058#############################################################################
2741 3059
2742package CFPlus::UI::Slider; 3060package DC::UI::Slider;
2743 3061
2744use strict; 3062use common::sense;
2745 3063
2746use CFPlus::OpenGL; 3064use DC::OpenGL;
2747 3065
2748our @ISA = CFPlus::UI::DrawBG::; 3066our @ISA = DC::UI::DrawBG::;
2749 3067
2750my @tex = 3068my @tex =
2751 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3069 map { new_from_resource DC::Texture $_ }
2752 qw(s1_slider.png s1_slider_bg.png); 3070 qw(s1_slider.png s1_slider_bg.png);
2753 3071
2754sub new { 3072sub new {
2755 my $class = shift; 3073 my $class = shift;
2756 3074
… …
2793sub set_value { 3111sub set_value {
2794 my ($self, $value) = @_; 3112 my ($self, $value) = @_;
2795 3113
2796 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3114 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2797 3115
2798 $hi = $lo + 1 if $hi <= $lo; 3116 $hi = $lo if $hi < $lo;
2799 3117
2800 $page = $hi - $lo if $page > $hi - $lo; 3118 $value = $hi - $page if $value > $hi - $page;
2801
2802 $value = $lo if $value < $lo; 3119 $value = $lo if $value < $lo;
2803 $value = $hi - $page if $value > $hi - $page;
2804 3120
2805 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3121 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2806 if $unit; 3122 if $unit;
2807 3123
2808 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3124 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2837 if ($GRAB == $self) { 3153 if ($GRAB == $self) {
2838 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3154 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2839 3155
2840 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3156 my (undef, $lo, $hi, $page) = @{$self->{range}};
2841 3157
2842 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3158 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2843 3159
2844 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3160 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2845 } else { 3161 } else {
2846 return 0; 3162 return 0;
2847 } 3163 }
… …
2852sub invoke_mouse_wheel { 3168sub invoke_mouse_wheel {
2853 my ($self, $ev) = @_; 3169 my ($self, $ev) = @_;
2854 3170
2855 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3171 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2856 3172
2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3173 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2858 3174
2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3175 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2860 3176
2861 1 3177 1
2862} 3178}
… …
2872 my ($self) = @_; 3188 my ($self) = @_;
2873 3189
2874 unless ($self->{knob_w}) { 3190 unless ($self->{knob_w}) {
2875 $self->set_value ($self->{range}[0]); 3191 $self->set_value ($self->{range}[0]);
2876 3192
2877 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3193 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2878 my $range = ($hi - $page - $lo) || 1e-100; 3194 my $range = ($hi - $page - $lo) || 1e-10;
2879 3195
2880 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3196 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2881 3197
2882 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3198 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2883 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3199 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2884 3200
2885 $value = ($value - $lo) / $range; 3201 $value = ($value - $lo) / $range;
… …
2915 glDisable GL_TEXTURE_2D; 3231 glDisable GL_TEXTURE_2D;
2916} 3232}
2917 3233
2918############################################################################# 3234#############################################################################
2919 3235
2920package CFPlus::UI::ValSlider; 3236package DC::UI::ValSlider;
2921 3237
2922our @ISA = CFPlus::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
2923 3239
2924sub new { 3240sub new {
2925 my ($class, %arg) = @_; 3241 my ($class, %arg) = @_;
2926 3242
2927 my $range = delete $arg{range}; 3243 my $range = delete $arg{range};
2928 3244
2929 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
2930 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3246 slider => (new DC::UI::Slider expand => 1, range => $range),
2931 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3247 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2932 to_value => sub { shift }, 3248 to_value => sub { shift },
2933 from_value => sub { shift }, 3249 from_value => sub { shift },
2934 %arg, 3250 %arg,
2935 ); 3251 );
2936 3252
… …
2956sub set_range { shift->{slider}->set_range (@_) } 3272sub set_range { shift->{slider}->set_range (@_) }
2957sub set_value { shift->{slider}->set_value (@_) } 3273sub set_value { shift->{slider}->set_value (@_) }
2958 3274
2959############################################################################# 3275#############################################################################
2960 3276
2961package CFPlus::UI::TextScroller; 3277package DC::UI::TextScroller;
2962 3278
2963our @ISA = CFPlus::UI::HBox::; 3279our @ISA = DC::UI::HBox::;
2964 3280
2965use CFPlus::OpenGL; 3281use DC::OpenGL;
2966 3282
2967sub new { 3283sub new {
2968 my $class = shift; 3284 my $class = shift;
2969 3285
2970 my $self = $class->SUPER::new ( 3286 my $self = $class->SUPER::new (
… …
2972 can_events => 1, 3288 can_events => 1,
2973 indent => 0, 3289 indent => 0,
2974 #font => default_font 3290 #font => default_font
2975 @_, 3291 @_,
2976 3292
2977 layout => (new CFPlus::Layout), 3293 layout => (new DC::Layout),
2978 par => [],
2979 max_par => 0, 3294 max_par => 0,
2980 height => 0, 3295 height => 0,
2981 children => [ 3296 children => [
2982 (new CFPlus::UI::Empty expand => 1), 3297 (new DC::UI::Empty expand => 1),
2983 (new CFPlus::UI::Slider vertical => 1), 3298 (new DC::UI::Slider vertical => 1),
2984 ], 3299 ],
2985 ); 3300 );
2986 3301
2987 $self->{children}[1]->connect (changed => sub { $self->update }); 3302 $self->{children}[1]->connect (changed => sub { $self->update });
2988 3303
3304 $self->add_paragraph (@{ delete $self->{par} }) if @{ $self->{par} };
3305
2989 $self 3306 $self
2990} 3307}
2991 3308
2992sub set_fontsize { 3309sub set_fontsize {
2993 my ($self, $fontsize) = @_; 3310 my ($self, $fontsize) = @_;
… …
2997} 3314}
2998 3315
2999sub size_request { 3316sub size_request {
3000 my ($self) = @_; 3317 my ($self) = @_;
3001 3318
3002 my ($empty, $slider) = @{ $self->{children} }; 3319 my ($empty, $slider) = $self->visible_children;
3003 3320
3004 local $self->{children} = [$empty, $slider]; 3321 local $self->{children} = [$empty, $slider];
3005 $self->SUPER::size_request 3322 $self->SUPER::size_request
3006} 3323}
3007 3324
… …
3044 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3361 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3045 $layout->set_markup ($para->{markup}); 3362 $layout->set_markup ($para->{markup});
3046 3363
3047 $layout->set_shapes ( 3364 $layout->set_shapes (
3048 map 3365 map
3049 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3366 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3050 @{$para->{widget}} 3367 @{$para->{widget}}
3051 ); 3368 );
3052 3369
3053 $layout 3370 $layout
3054} 3371}
… …
3171 $ROOT->on_post_alloc ($self => sub { 3488 $ROOT->on_post_alloc ($self => sub {
3172 $self->force_uptodate; 3489 $self->force_uptodate;
3173 3490
3174 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3491 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3175 3492
3176 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3493 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3177 glClearColor 0, 0, 0, 0; 3494 glClearColor 0, 0, 0, 0;
3178 glClear GL_COLOR_BUFFER_BIT; 3495 glClear GL_COLOR_BUFFER_BIT;
3179 3496
3180 package CFPlus::UI::Base; 3497 package DC::UI::Base;
3181 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3498 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3182 (0, 0, $self->{w}, $self->{h}); 3499 (0, 0, $self->{w}, $self->{h});
3183 3500
3184 my $top = int $self->{children}[1]{range}[0]; 3501 my $top = int $self->{children}[1]{range}[0];
3185 3502
… …
3196 3513
3197 if ($y0 < $y + $h && $y < $y1) { 3514 if ($y0 < $y + $h && $y < $y1) {
3198 my $layout = $self->get_layout ($para); 3515 my $layout = $self->get_layout ($para);
3199 3516
3200 $layout->render ($para->{indent}, $y - $y0); 3517 $layout->render ($para->{indent}, $y - $y0);
3518 $layout->draw;
3201 3519
3202 if (my @w = @{ $para->{widget} }) { 3520 if (my @w = @{ $para->{widget} }) {
3203 my @s = $layout->get_shapes; 3521 my @s = $layout->get_shapes;
3204 3522
3205 for (@w) { 3523 for (@w) {
… …
3243 $self->{children}[1]->draw; 3561 $self->{children}[1]->draw;
3244} 3562}
3245 3563
3246############################################################################# 3564#############################################################################
3247 3565
3248package CFPlus::UI::Animator; 3566package DC::UI::Animator;
3249 3567
3250use CFPlus::OpenGL; 3568use DC::OpenGL;
3251 3569
3252our @ISA = CFPlus::UI::Bin::; 3570our @ISA = DC::UI::Bin::;
3253 3571
3254sub moveto { 3572sub moveto {
3255 my ($self, $x, $y) = @_; 3573 my ($self, $x, $y) = @_;
3256 3574
3257 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3575 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3285 glPopMatrix; 3603 glPopMatrix;
3286} 3604}
3287 3605
3288############################################################################# 3606#############################################################################
3289 3607
3290package CFPlus::UI::Flopper; 3608package DC::UI::Flopper;
3291 3609
3292our @ISA = CFPlus::UI::Button::; 3610our @ISA = DC::UI::Button::;
3293 3611
3294sub new { 3612sub new {
3295 my $class = shift; 3613 my $class = shift;
3296 3614
3297 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
… …
3309 $self->{other}->toggle_visibility; 3627 $self->{other}->toggle_visibility;
3310} 3628}
3311 3629
3312############################################################################# 3630#############################################################################
3313 3631
3314package CFPlus::UI::Tooltip; 3632package DC::UI::Tooltip;
3315 3633
3316our @ISA = CFPlus::UI::Bin::; 3634our @ISA = DC::UI::Bin::;
3317 3635
3318use CFPlus::OpenGL; 3636use DC::OpenGL;
3319 3637
3320sub new { 3638sub new {
3321 my $class = shift; 3639 my $class = shift;
3322 3640
3323 $class->SUPER::new ( 3641 $class->SUPER::new (
… …
3327} 3645}
3328 3646
3329sub set_tooltip_from { 3647sub set_tooltip_from {
3330 my ($self, $widget) = @_; 3648 my ($self, $widget) = @_;
3331 3649
3332 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3333 if $widget->{tooltip} =~ /^#(.*)$/;
3334
3335 my $tooltip = $widget->{tooltip}; 3650 my $tip = $widget->{tooltip};
3651 $tip = $tip->($widget) if "CODE" eq ref $tip;
3652
3653 $tip = DC::Pod::section_label tooltip => $1
3654 if $tip =~ /^#(.*)$/;
3336 3655
3337 if ($ENV{CFPLUS_DEBUG} & 2) { 3656 if ($ENV{CFPLUS_DEBUG} & 2) {
3338 $tooltip .= "\n\n" . (ref $widget) . "\n" 3657 $tip .= "\n\n" . (ref $widget) . "\n"
3339 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3658 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3340 . "req $widget->{req_w} $widget->{req_h}\n" 3659 . "req $widget->{req_w} $widget->{req_h}\n"
3341 . "visible $widget->{visible}"; 3660 . "visible $widget->{visible}";
3342 } 3661 }
3343 3662
3344 $tooltip =~ s/^\n+//; 3663 $tip =~ s/^\n+//;
3345 $tooltip =~ s/\n+$//; 3664 $tip =~ s/\n+$//;
3346 3665
3347 $self->add (new CFPlus::UI::Label 3666 $self->add (new DC::UI::Label
3667 fg => $DC::THEME{tooltip_fg},
3348 markup => $tooltip, 3668 markup => $tip,
3349 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3669 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3670 align => 0,
3350 fontsize => 0.8, 3671 fontsize => 0.8,
3351 style => 1, # FLAG_INVERSE 3672 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3352 ellipsise => 0, 3673 ellipsise => 0,
3353 font => ($widget->{tooltip_font} || $::FONT_PROP), 3674 font => ($widget->{tooltip_font} || $::FONT_PROP),
3354 ); 3675 );
3355} 3676}
3356 3677
… …
3391} 3712}
3392 3713
3393sub _draw { 3714sub _draw {
3394 my ($self) = @_; 3715 my ($self) = @_;
3395 3716
3396 glTranslate 0.375, 0.375;
3397
3398 my ($w, $h) = @$self{qw(w h)}; 3717 my ($w, $h) = @$self{qw(w h)};
3399 3718
3400 glColor 1, 0.8, 0.4; 3719 glColor @{ $DC::THEME{tooltip_bg} };
3401 glBegin GL_QUADS; 3720 glRect 0, 0, $w, $h;
3402 glVertex 0 , 0;
3403 glVertex 0 , $h;
3404 glVertex $w, $h;
3405 glVertex $w, 0;
3406 glEnd;
3407 3721
3408 glColor 0, 0, 0; 3722 glColor @{ $DC::THEME{tooltip_border} };
3409 glBegin GL_LINE_LOOP; 3723 glRect_lineloop .5, .5, $w + .5, $h + .5;
3410 glVertex 0 , 0;
3411 glVertex 0 , $h;
3412 glVertex $w, $h;
3413 glVertex $w, 0;
3414 glEnd;
3415 3724
3416 glTranslate 2 - 0.375, 2 - 0.375; 3725 glTranslate 2, 2;
3417 3726
3418 $self->SUPER::_draw; 3727 $self->SUPER::_draw;
3419} 3728}
3420 3729
3421############################################################################# 3730#############################################################################
3422 3731
3423package CFPlus::UI::Face; 3732package DC::UI::Face;
3424 3733
3425our @ISA = CFPlus::UI::DrawBG::; 3734our @ISA = DC::UI::DrawBG::;
3426 3735
3427use CFPlus::OpenGL; 3736use DC::OpenGL;
3428 3737
3429sub new { 3738sub new {
3430 my $class = shift; 3739 my $class = shift;
3431 3740
3432 my $self = $class->SUPER::new ( 3741 my $self = $class->SUPER::new (
… …
3435 aspect => 1, 3744 aspect => 1,
3436 can_events => 0, 3745 can_events => 0,
3437 @_, 3746 @_,
3438 ); 3747 );
3439 3748
3440 if ($self->{anim} && $self->{animspeed}) {
3441 CFPlus::weaken (my $widget = $self);
3442
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3445 $self->{timer} = Event->timer (
3446 parked => 1,
3447 cb => sub {
3448 return unless $::CONN && $widget;
3449
3450 ++$widget->{frame};
3451 $widget->update_face;
3452 $widget->update;
3453
3454 $widget->update_timer;
3455 },
3456 );
3457
3458 $self->update_face;
3459 $self->update_timer; 3749 $self->update_anim;
3460 }
3461 3750
3462 $self 3751 $self
3463} 3752}
3464 3753
3465sub update_timer { 3754sub update_timer {
3466 my ($self) = @_; 3755 my ($self) = @_;
3467 3756
3468 return unless $self->{timer}; 3757 return unless $self->{timer};
3469 3758
3470 if ($self->{visible}) { 3759 if ($self->{visible}) {
3471 $self->{timer}->at (
3472 $self->{anim_start}
3473 + $self->{animspeed}
3474 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3475 );
3476 $self->{timer}->start; 3760 $self->{timer}->start;
3477 } else { 3761 } else {
3478 $self->{timer}->stop; 3762 $self->{timer}->stop;
3479 } 3763 }
3480} 3764}
3481 3765
3482sub update_face { 3766sub update_face {
3483 my ($self) = @_; 3767 my ($self) = @_;
3484 3768
3485 return unless $::CONN;
3486
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) {
3489 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3492 }
3493 }
3494}
3495
3496sub size_request {
3497 my ($self) = @_;
3498
3499 if ($::CONN) { 3769 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3770 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) { 3771 if ($anim && @$anim) {
3502 $self->{tex} = $tex; 3772 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3773 delete $self->{face_change_cb};
3504 } else { 3774
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3775 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3506 $self->realloc; 3776 unless ($tex->{name} || $tex->{loading}) {
3777 $tex->upload (sub { $self->reconfigure });
3778 }
3507 }); 3779 }
3508 } 3780 }
3509 } 3781 }
3510 } 3782 }
3783}
3784
3785sub update_anim {
3786 my ($self) = @_;
3787
3788 if ($self->{anim} && $self->{animspeed}) {
3789 DC::weaken (my $widget = $self);
3790
3791 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3792 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3793 return unless $::CONN;
3794
3795 my $w = $widget
3796 or return;
3797
3798 ++$w->{frame};
3799 $w->update_face;
3800
3801 # somehow, $widget can go away
3802 $w->update;
3803 $w->update_timer;
3804 };
3805
3806 $self->update_face;
3807 $self->update_timer;
3808 } else {
3809 delete $self->{timer};
3810 }
3811}
3812
3813sub size_request {
3814 my ($self) = @_;
3815
3816 if ($::CONN) {
3817 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3818 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3819 if ($tex->{name}) {
3820 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3821 } elsif (!$tex->{loading}) {
3822 $tex->upload (sub { $self->reconfigure });
3823 }
3824 }
3825
3826 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3827 }
3828 }
3511 3829
3512 ($self->{size_w} || 8, $self->{size_h} || 8) 3830 ($self->{size_w} || 8, $self->{size_h} || 8)
3513} 3831}
3514 3832
3515sub update { 3833sub update {
3516 my ($self) = @_; 3834 my ($self) = @_;
3517 3835
3518 return unless $self->{visible}; 3836 return unless $self->{visible};
3519 3837
3520 $self->SUPER::update; 3838 $self->SUPER::update;
3839}
3840
3841sub set_face {
3842 my ($self, $face) = @_;
3843
3844 $self->{face} = $face;
3845 $self->reconfigure;
3846}
3847
3848sub set_anim {
3849 my ($self, $anim) = @_;
3850
3851 $self->{anim} = $anim;
3852 $self->update_anim;
3853}
3854
3855sub set_animspeed {
3856 my ($self, $animspeed) = @_;
3857
3858 $self->{animspeed} = $animspeed;
3859 $self->update_anim;
3521} 3860}
3522 3861
3523sub invoke_visibility_change { 3862sub invoke_visibility_change {
3524 my ($self) = @_; 3863 my ($self) = @_;
3525 3864
… …
3551 $self->SUPER::destroy; 3890 $self->SUPER::destroy;
3552} 3891}
3553 3892
3554############################################################################# 3893#############################################################################
3555 3894
3556package CFPlus::UI::Buttonbar; 3895package DC::UI::Buttonbar;
3557 3896
3558our @ISA = CFPlus::UI::HBox::; 3897our @ISA = DC::UI::HBox::;
3559 3898
3560# TODO: should actually wrap buttons and other goodies. 3899# TODO: should actually wrap buttons and other goodies.
3561 3900
3562############################################################################# 3901#############################################################################
3563 3902
3564package CFPlus::UI::Menu; 3903package DC::UI::Menu;
3565 3904
3566our @ISA = CFPlus::UI::Toplevel::; 3905our @ISA = DC::UI::Toplevel::;
3567 3906
3568use CFPlus::OpenGL; 3907use DC::OpenGL;
3569 3908
3570sub new { 3909sub new {
3571 my $class = shift; 3910 my $class = shift;
3572 3911
3573 my $self = $class->SUPER::new ( 3912 my $self = $class->SUPER::new (
3574 items => [], 3913 items => [],
3575 z => 100, 3914 z => 100,
3576 @_, 3915 @_,
3577 ); 3916 );
3578 3917
3579 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3918 $self->add ($self->{vbox} = new DC::UI::VBox);
3580 3919
3581 for my $item (@{ $self->{items} }) { 3920 for my $item (@{ $self->{items} }) {
3582 my ($widget, $cb, $tooltip) = @$item; 3921 my ($widget, $cb, $tooltip) = @$item;
3583 3922
3584 # handle various types of items, only text for now 3923 # handle various types of items, only text for now
3585 if (!ref $widget) { 3924 if (!ref $widget) {
3586 if ($widget =~ /\t/) { 3925 if ($widget =~ /\t/) {
3587 my ($left, $right) = split /\t/, $widget, 2; 3926 my ($left, $right) = split /\t/, $widget, 2;
3588 3927
3589 $widget = new CFPlus::UI::HBox 3928 $widget = new DC::UI::HBox
3590 can_hover => 1, 3929 can_hover => 1,
3591 can_events => 1, 3930 can_events => 1,
3592 tooltip => $tooltip, 3931 tooltip => $tooltip,
3593 children => [ 3932 children => [
3594 (new CFPlus::UI::Label markup => $left, expand => 1), 3933 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3595 (new CFPlus::UI::Label markup => $right, align => +1), 3934 (new DC::UI::Label markup => $right, align => 1),
3596 ], 3935 ],
3597 ; 3936 ;
3598 3937
3599 } else { 3938 } else {
3600 $widget = new CFPlus::UI::Label 3939 $widget = new DC::UI::Label
3601 can_hover => 1, 3940 can_hover => 1,
3602 can_events => 1, 3941 can_events => 1,
3942 align => 0,
3603 markup => $widget, 3943 markup => $widget,
3604 tooltip => $tooltip; 3944 tooltip => $tooltip;
3605 } 3945 }
3606 } 3946 }
3607 3947
… …
3622 # maybe save $GRAB? must be careful about events... 3962 # maybe save $GRAB? must be careful about events...
3623 $GRAB = $self; 3963 $GRAB = $self;
3624 $self->{button} = $ev->{button}; 3964 $self->{button} = $ev->{button};
3625 3965
3626 $self->show; 3966 $self->show;
3627 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3967
3968 my $x = $ev->{x};
3969 my $y = $ev->{y};
3970
3971 $self->{root}->on_post_alloc ($self => sub {
3972 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3973 });
3974
3975 1 # so it can be used inside event handlers
3628} 3976}
3629 3977
3630sub invoke_mouse_motion { 3978sub invoke_mouse_motion {
3631 my ($self, $ev, $x, $y) = @_; 3979 my ($self, $ev, $x, $y) = @_;
3632 3980
… …
3653 1 4001 1
3654} 4002}
3655 4003
3656############################################################################# 4004#############################################################################
3657 4005
3658package CFPlus::UI::Multiplexer; 4006package DC::UI::Multiplexer;
3659 4007
3660our @ISA = CFPlus::UI::Container::; 4008our @ISA = DC::UI::Container::;
3661 4009
3662sub new { 4010sub new {
3663 my $class = shift; 4011 my $class = shift;
3664 4012
3665 my $self = $class->SUPER::new ( 4013 my $self = $class->SUPER::new (
3666 @_, 4014 @_,
3667 ); 4015 );
3668 4016
3669 $self->{current} = $self->{children}[0] 4017 $self->set_current_page (0);
3670 if @{ $self->{children} };
3671 4018
3672 $self 4019 $self
3673} 4020}
3674 4021
3675sub add { 4022sub add {
3676 my ($self, @widgets) = @_; 4023 my ($self, @widgets) = @_;
3677 4024
3678 $self->SUPER::add (@widgets); 4025 $self->SUPER::add (@widgets);
3679 4026
3680 $self->{current} = $self->{children}[0] 4027 $self->set_current_page (0)
3681 if @{ $self->{children} }; 4028 if @widgets == @{ $self->{children} };
3682} 4029}
3683 4030
3684sub get_current_page { 4031sub get_current_page {
3685 my ($self) = @_; 4032 my ($self) = @_;
3686 4033
… …
3692 4039
3693 my $widget = ref $page_or_widget 4040 my $widget = ref $page_or_widget
3694 ? $page_or_widget 4041 ? $page_or_widget
3695 : $self->{children}[$page_or_widget]; 4042 : $self->{children}[$page_or_widget];
3696 4043
4044 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4045
3697 $self->{current} = $widget; 4046 if (($self->{current} = $widget)) {
4047 $self->{current}->set_visible if $self->{current} && $self->{visible};
3698 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4048 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3699 4049
3700 $self->emit (page_changed => $self->{current}); 4050 $self->emit (page_changed => $self->{current});
4051 }
3701 4052
3702 $self->realloc; 4053 $self->realloc;
3703} 4054}
3704 4055
3705sub visible_children { 4056sub visible_children {
3706 $_[0]{current} 4057 $_[0]{current} || ()
3707} 4058}
3708 4059
3709sub size_request { 4060sub size_request {
3710 my ($self) = @_; 4061 my ($self) = @_;
3711 4062
4063 $self->{current}
3712 $self->{current}->size_request 4064 ? $self->{current}->size_request
4065 : (0, 0)
3713} 4066}
3714 4067
3715sub invoke_size_allocate { 4068sub invoke_size_allocate {
3716 my ($self, $w, $h) = @_; 4069 my ($self, $w, $h) = @_;
3717 4070
3718 $self->{current}->configure (0, 0, $w, $h); 4071 $self->{current}->configure (0, 0, $w, $h)
4072 if $self->{current};
3719 4073
3720 1 4074 1
3721} 4075}
3722 4076
3723sub _draw { 4077sub _draw {
3724 my ($self) = @_; 4078 my ($self) = @_;
3725 4079
3726 $self->{current}->draw; 4080 $self->{current}->draw
4081 if $self->{current};
3727} 4082}
3728 4083
3729############################################################################# 4084#############################################################################
3730 4085
3731package CFPlus::UI::Notebook; 4086package DC::UI::Notebook;
3732 4087
4088use DC::OpenGL;
4089
3733our @ISA = CFPlus::UI::VBox::; 4090our @ISA = DC::UI::VBox::;
3734 4091
3735sub new { 4092sub new {
3736 my $class = shift; 4093 my $class = shift;
3737 4094
3738 my $self = $class->SUPER::new ( 4095 my $self = $class->SUPER::new (
3739 buttonbar => (new CFPlus::UI::Buttonbar), 4096 buttonbar => (new DC::UI::Buttonbar),
3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4097 multiplexer => (new DC::UI::Multiplexer expand => 1),
4098 active_outline => [.7, .7, 0.2],
3741 # filter => # will be put between multiplexer and $self 4099 # filter => # will be put between multiplexer and $self
3742 @_, 4100 @_,
3743 ); 4101 );
3744 4102
3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4103 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3746 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4104 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3747 4105
4106 {
4107 Scalar::Util::weaken (my $wself = $self);
4108
4109 $self->{multiplexer}->connect (c_add => sub {
4110 my ($mplex, $widgets) = @_;
4111
4112 for my $child (@$widgets) {
4113 Scalar::Util::weaken $child;
4114 $child->{c_tab_} ||= do {
4115 my $tab =
4116 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4117 ? $child->{c_tab}
4118 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4119
4120 $tab->connect (activate => sub {
4121 $wself->set_current_page ($child);
4122 });
4123
4124 $tab
4125 };
4126
4127 $self->{buttonbar}->add ($child->{c_tab_});
4128 }
4129 });
4130
4131 $self->{multiplexer}->connect (c_remove => sub {
4132 my ($mplex, $widgets) = @_;
4133
4134 for my $child (@$widgets) {
4135 $wself->{buttonbar}->remove ($child->{c_tab_});
4136 }
4137 });
4138 }
4139
3748 $self 4140 $self
3749} 4141}
3750 4142
3751sub add { 4143sub add {
4144 my ($self, @widgets) = @_;
4145
4146 $self->{multiplexer}->add (@widgets)
4147}
4148
4149sub remove {
4150 my ($self, @widgets) = @_;
4151
4152 $self->{multiplexer}->remove (@widgets)
4153}
4154
4155sub pages {
4156 my ($self) = @_;
4157 $self->{multiplexer}->children
4158}
4159
4160sub page_index {
4161 my ($self, $widget) = @_;
4162
4163 my $i = 0;
4164 for ($self->pages) {
4165 if ($_ eq $widget) { return $i };
4166 $i++;
4167 }
4168
4169 undef
4170}
4171
4172sub add_tab {
3752 my ($self, $title, $widget, $tooltip) = @_; 4173 my ($self, $title, $widget, $tooltip) = @_;
3753 4174
3754 CFPlus::weaken $self; 4175 $title = [$title, $tooltip] unless ref $title;
4176 $widget->{c_tab} = $title;
3755 4177
3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3758 markup => $title,
3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3764 $self->{buttonbar}->add ($title);
3765
3766 $self->{multiplexer}->add ($widget); 4178 $self->add ($widget);
3767} 4179}
3768 4180
3769sub get_current_page { 4181sub get_current_page {
3770 my ($self) = @_; 4182 my ($self) = @_;
3771 4183
… …
3777 4189
3778 $self->{multiplexer}->set_current_page ($page); 4190 $self->{multiplexer}->set_current_page ($page);
3779 $self->emit (page_changed => $self->{multiplexer}{current}); 4191 $self->emit (page_changed => $self->{multiplexer}{current});
3780} 4192}
3781 4193
4194sub _draw {
4195 my ($self) = @_;
4196
4197 $self->SUPER::_draw ();
4198
4199 if (my $cur = $self->{multiplexer}{current}) {
4200 if ($cur = $cur->{c_tab_}) {
4201 glTranslate $self->{buttonbar}{x} + $cur->{x},
4202 $self->{buttonbar}{y} + $cur->{y};
4203 glLineWidth 3;
4204 #glEnable GL_BLEND;
4205 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4206 glColor @{$self->{active_outline}};
4207 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4208 glLineWidth 1;
4209 #glDisable GL_BLEND;
4210 }
4211 }
4212}
4213
3782############################################################################# 4214#############################################################################
3783 4215
3784package CFPlus::UI::Selector; 4216package DC::UI::Selector;
3785 4217
3786use utf8; 4218use utf8;
3787 4219
3788our @ISA = CFPlus::UI::Button::; 4220our @ISA = DC::UI::Button::;
3789 4221
3790sub new { 4222sub new {
3791 my $class = shift; 4223 my $class = shift;
3792 4224
3793 my $self = $class->SUPER::new ( 4225 my $self = $class->SUPER::new (
… …
3810 my ($value, $title, $tooltip) = @$_; 4242 my ($value, $title, $tooltip) = @$_;
3811 4243
3812 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4244 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3813 } 4245 }
3814 4246
3815 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4247 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3816} 4248}
3817 4249
3818sub _set_value { 4250sub _set_value {
3819 my ($self, $value) = @_; 4251 my ($self, $value) = @_;
3820 4252
3821 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4253 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4254 $item ||= $self->{options}[0]
3822 or return; 4255 or return;
3823 4256
3824 $self->{value} = $item->[0]; 4257 $self->{value} = $item->[0];
3825 $self->set_markup ("$item->[1] ⇓"); 4258 $self->set_markup ("$item->[1] ⇓");
3826 $self->set_tooltip ($item->[2]); 4259# $self->set_tooltip ($item->[2]);
3827} 4260}
3828 4261
3829sub set_value { 4262sub set_value {
3830 my ($self, $value) = @_; 4263 my ($self, $value) = @_;
3831 4264
… …
3833 4266
3834 $self->_set_value ($value); 4267 $self->_set_value ($value);
3835 $self->emit (changed => $value); 4268 $self->emit (changed => $value);
3836} 4269}
3837 4270
4271sub set_options {
4272 my ($self, $options) = @_;
4273
4274 $self->{options} = $options;
4275 $self->_set_value ($self->{value});
4276}
4277
3838############################################################################# 4278#############################################################################
3839 4279
3840package CFPlus::UI::Statusbox; 4280package DC::UI::Statusbox;
3841 4281
3842our @ISA = CFPlus::UI::VBox::; 4282our @ISA = DC::UI::VBox::;
3843 4283
3844sub new { 4284sub new {
3845 my $class = shift; 4285 my $class = shift;
3846 4286
3847 my $self = $class->SUPER::new ( 4287 my $self = $class->SUPER::new (
3848 fontsize => 0.8, 4288 fontsize => 0.8,
3849 @_, 4289 @_,
3850 ); 4290 );
3851 4291
3852 CFPlus::weaken (my $this = $self); 4292 DC::weaken (my $this = $self);
3853 4293
3854 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4294 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3855 4295
3856 $self 4296 $self
3857} 4297}
3858 4298
3859sub reorder { 4299sub reorder {
3860 my ($self) = @_; 4300 my ($self) = @_;
3861 my $NOW = Time::HiRes::time; 4301 my $NOW = AE::time;
3862 4302
3863 # freeze display when hovering over any label 4303 # freeze display when hovering over any label
3864 return if $CFPlus::UI::TOOLTIP->{owner} 4304 return if $DC::UI::TOOLTIP->{owner}
3865 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4305 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3866 values %{ $self->{item} }; 4306 values %{ $self->{item} };
3867 4307
3868 while (my ($k, $v) = each %{ $self->{item} }) { 4308 while (my ($k, $v) = each %{ $self->{item} }) {
3869 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4309 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3870 } 4310 }
4311
4312 $self->{timer}->set (1, 1);
3871 4313
3872 my @widgets; 4314 my @widgets;
3873 4315
3874 my @items = sort { 4316 my @items = sort {
3875 $a->{pri} <=> $b->{pri} 4317 $a->{pri} <=> $b->{pri}
3876 or $b->{id} <=> $a->{id} 4318 or $b->{id} <=> $a->{id}
3877 } values %{ $self->{item} }; 4319 } values %{ $self->{item} };
3878
3879 $self->{timer}->interval (1);
3880 4320
3881 my $count = 10 + 1; 4321 my $count = 10 + 1;
3882 for my $item (@items) { 4322 for my $item (@items) {
3883 last unless --$count; 4323 last unless --$count;
3884 4324
… …
3891 for ($short) { 4331 for ($short) {
3892 s/^\s+//; 4332 s/^\s+//;
3893 s/\s+/ /g; 4333 s/\s+/ /g;
3894 } 4334 }
3895 4335
3896 new CFPlus::UI::Label 4336 new DC::UI::Label
3897 markup => $short, 4337 markup => $short,
3898 tooltip => $item->{tooltip}, 4338 tooltip => $item->{tooltip},
3899 tooltip_font => $::FONT_PROP, 4339 tooltip_font => $::FONT_PROP,
3900 tooltip_width => 0.67, 4340 tooltip_width => 0.67,
3901 fontsize => $item->{fontsize} || $self->{fontsize}, 4341 fontsize => $item->{fontsize} || $self->{fontsize},
3902 max_w => $::WIDTH * 0.44, 4342 max_w => $::WIDTH * 0.44,
4343 align => 0,
3903 fg => [@{ $item->{fg} }], 4344 fg => [@{ $item->{fg} }],
3904 can_events => 1, 4345 can_events => 1,
3905 can_hover => 1 4346 can_hover => 1
3906 }; 4347 };
3907 4348
3908 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4349 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3909 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4350 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3910 $label->update; 4351 $label->update;
3911 $label->set_max_size (undef, $label->{req_h} * $diff) 4352 $label->set_max_size (undef, $label->{req_h} * $diff)
3912 if $diff < 1; 4353 if $diff < 1;
3913 $self->{timer}->interval (1/30); 4354 $self->{timer}->set (1/30, 1/30);
3914 } else { 4355 } else {
3915 $label->{fg}[3] = $item->{fg}[3] || 1; 4356 $label->{fg}[3] = $item->{fg}[3] || 1;
3916 } 4357 }
3917 4358
3918 push @widgets, $label; 4359 push @widgets, $label;
3919 } 4360 }
4361
4362 my $hash = join ",", @widgets;
4363 return if $hash eq $self->{last_widget_hash};
4364 $self->{last_widget_hash} = $hash;
3920 4365
3921 $self->clear; 4366 $self->clear;
3922 $self->SUPER::add (reverse @widgets); 4367 $self->SUPER::add (reverse @widgets);
3923} 4368}
3924 4369
… …
3960 $ROOT->on_refresh (reorder => sub { 4405 $ROOT->on_refresh (reorder => sub {
3961 $self->reorder; 4406 $self->reorder;
3962 }); 4407 });
3963} 4408}
3964 4409
4410sub clr_group {
4411 my ($self, $group) = @_;
4412
4413 if (delete $self->{item}{$group}) {
4414 $ROOT->on_refresh (reorder => sub {
4415 $self->reorder;
4416 });
4417 }
4418}
4419
3965sub reconfigure { 4420sub reconfigure {
3966 my ($self) = @_; 4421 my ($self) = @_;
3967 4422
3968 delete $_->{label} 4423 delete $_->{label}
3969 for values %{ $self->{item} || {} }; 4424 for values %{ $self->{item} || {} };
… …
3980 $self->SUPER::destroy; 4435 $self->SUPER::destroy;
3981} 4436}
3982 4437
3983############################################################################# 4438#############################################################################
3984 4439
3985package CFPlus::UI::Root; 4440package DC::UI::Root;
3986 4441
3987our @ISA = CFPlus::UI::Container::; 4442our @ISA = DC::UI::Container::;
3988 4443
3989use List::Util qw(min max); 4444use List::Util qw(min max);
3990 4445
3991use CFPlus::OpenGL; 4446use DC::OpenGL;
3992 4447
3993sub new { 4448sub new {
3994 my $class = shift; 4449 my $class = shift;
3995 4450
3996 my $self = $class->SUPER::new ( 4451 my $self = $class->SUPER::new (
3997 visible => 1, 4452 visible => 1,
3998 @_, 4453 @_,
3999 ); 4454 );
4000 4455
4001 CFPlus::weaken ($self->{root} = $self); 4456 DC::weaken ($self->{root} = $self);
4002 4457
4003 $self 4458 $self
4004} 4459}
4005 4460
4006sub size_request { 4461sub size_request {
… …
4054} 4509}
4055 4510
4056sub update { 4511sub update {
4057 my ($self) = @_; 4512 my ($self) = @_;
4058 4513
4059 $::WANT_REFRESH++; 4514 $::WANT_REFRESH = 1;
4060} 4515}
4061 4516
4062sub add { 4517sub add {
4063 my ($self, @children) = @_; 4518 my ($self, @children) = @_;
4064 4519
… …
4131 4586
4132 delete $queue{$widget+0}; 4587 delete $queue{$widget+0};
4133 4588
4134 my ($w, $h) = $widget->size_request; 4589 my ($w, $h) = $widget->size_request;
4135 4590
4136 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4591 $w += $widget->{padding_x} * 2;
4137 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4592 $h += $widget->{padding_y} * 2;
4593
4594 $w = max $widget->{min_w}, $w;
4595 $h = max $widget->{min_h}, $h;
4138 4596
4139 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4597 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4140 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4598 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4141 4599
4142 $w = $widget->{force_w} if exists $widget->{force_w}; 4600 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4209 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4667 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4210 glMatrixMode GL_MODELVIEW; 4668 glMatrixMode GL_MODELVIEW;
4211 glLoadIdentity; 4669 glLoadIdentity;
4212 4670
4213 { 4671 {
4214 package CFPlus::UI::Base; 4672 package DC::UI::Base;
4215 4673
4216 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4674 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4217 (0, 0, $self->{w}, $self->{h}); 4675 (0, 0, $self->{w}, $self->{h});
4218 4676
4219 $self->_draw; 4677 $self->_draw;
4220 } 4678 }
4221} 4679}
4222 4680
4223############################################################################# 4681#############################################################################
4224 4682
4225package CFPlus::UI; 4683package DC::UI;
4226 4684
4227$ROOT = new CFPlus::UI::Root; 4685$ROOT = new DC::UI::Root;
4228$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4686$TOOLTIP = new DC::UI::Tooltip z => 900;
4229 4687
42301 46881
4231

Diff Legend

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