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.372 by root, Sun Jul 15 22:13:43 2007 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 2008 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use DC;
10use CFPlus::Pod; 9use DC::Pod;
11use CFPlus::Texture; 10use DC::Texture;
12 11
13our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
14 13
15our $LAYOUT; 14our $LAYOUT;
16our $ROOT; 15our $ROOT;
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 33
33 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
34 35
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 37 $TOOLTIP->show;
41 } 38 }
42 39
43 return; 40 return;
… …
46 } 43 }
47 44
48 $TOOLTIP->hide; 45 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
51}); 48};
52 49
53sub get_layout { 50sub get_layout {
54 my $layout; 51 my $layout;
55 52
56 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
92 89
93 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 92
96 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
97 } 94 }
98} 95}
99 96
100sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
101 my ($ev) = @_; 98 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
108 105
109 $GRAB = $widget; 106 $GRAB = $widget;
110 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
111 108
112 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
113 } 110 }
114 111
115 if ($GRAB) { 112 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 114 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
117
118 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta;
120
120 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
121 } else { 122 } else {
122 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
123 } 124 }
124 } 125 }
… …
138 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
139 $grab->update if $grab; 140 $grab->update if $grab;
140 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
141 142
142 check_hover $widget; 143 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
144 } 145 }
145} 146}
146 147
147sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
148 my ($ev) = @_; 149 my ($ev) = @_;
… …
210 reconfigure_widgets; 211 reconfigure_widgets;
211} 212}
212 213
213############################################################################# 214#############################################################################
214 215
215package CFPlus::UI::Event; 216package DC::UI::Event;
216 217
217sub xy { 218sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219} 220}
220 221
221############################################################################# 222#############################################################################
222 223
223package CFPlus::UI::Base; 224package DC::UI::Base;
224 225
225use strict; 226use strict;
226 227
227use CFPlus::OpenGL; 228use DC::OpenGL;
228 229
229sub new { 230sub new {
230 my $class = shift; 231 my $class = shift;
231 232
232 my $self = bless { 233 my $self = bless {
… …
237 h => undef, 238 h => undef,
238 can_events => 1, 239 can_events => 1,
239 @_ 240 @_
240 }, $class; 241 }, $class;
241 242
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 243 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
243 244
244 for (keys %$self) { 245 for (keys %$self) {
245 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
246 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
247 } 248 }
248 } 249 }
249 250
250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
255 256
256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258 259
259 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
269 $self->emit ("destroy"); 270 $self->emit ("destroy");
270 %$self = (); 271 %$self = ();
271} 272}
272 273
273sub TO_JSON { 274sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 275 { "\fw" => $_[0]{s_id} }
275} 276}
276 277
277sub show { 278sub show {
278 my ($self) = @_; 279 my ($self) = @_;
279 280
280 return if $self->{parent}; 281 return if $self->{parent};
281 282
282 $CFPlus::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
283} 284}
284 285
285sub set_visible { 286sub set_visible {
286 my ($self) = @_; 287 my ($self) = @_;
287 288
… …
308 delete $self->{root}; 309 delete $self->{root};
309 310
310 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
311 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
312 313
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $DC::UI::TOOLTIP_WATCHER->invoke
314 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
315 316
316 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
318} 319}
… …
337sub hide { 338sub hide {
338 my ($self) = @_; 339 my ($self) = @_;
339 340
340 $self->set_invisible; 341 $self->set_invisible;
341 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
342 $self->{parent}->remove ($self) 346 $parent->remove ($self);
343 if $self->{parent}; 347 }
344} 348}
345 349
346sub move_abs { 350sub move_abs {
347 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
348 352
… …
360 $self->{force_h} = $h; 364 $self->{force_h} = $h;
361 365
362 $self->realloc; 366 $self->realloc;
363} 367}
364 368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 my ($w, $h) = @$self{qw(max_w max_h)};
374
375 if ($w <= 0 || $h <= 0) {
376 my ($mw, $mh) = $self->{parent}
377 ? $self->{parent}->get_max_wh
378 : ($::WIDTH, $::HEIGHT);
379
380 $w = $mw if $w <= 0;
381 $h = $mh if $h <= 0;
382 }
383
384 ($w, $h)
385}
386
365sub size_request { 387sub size_request {
366 require Carp; 388 require Carp;
367 Carp::confess "size_request is abstract"; 389 Carp::confess "size_request is abstract";
368} 390}
369 391
… …
375 my ($self, $x, $y, $w, $h) = @_; 397 my ($self, $x, $y, $w, $h) = @_;
376 398
377 if ($self->{aspect}) { 399 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h); 400 my ($ow, $oh) = ($w, $h);
379 401
380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 402 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 403 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
382 404
383 # use alignment to adjust x, y 405 # use alignment to adjust x, y
384 406
385 $x += int 0.5 * ($ow - $w); 407 $x += int 0.5 * ($ow - $w);
386 $y += int 0.5 * ($oh - $h); 408 $y += int 0.5 * ($oh - $h);
… …
427 449
428 return if $self->{tooltip} eq $tooltip; 450 return if $self->{tooltip} eq $tooltip;
429 451
430 $self->{tooltip} = $tooltip; 452 $self->{tooltip} = $tooltip;
431 453
432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 454 if ($DC::UI::TOOLTIP->{owner} == $self) {
433 delete $CFPlus::UI::TOOLTIP->{owner}; 455 delete $DC::UI::TOOLTIP->{owner};
434 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 456 $DC::UI::TOOLTIP_WATCHER->invoke;
435 } 457 }
436} 458}
437 459
438# translate global coordinates to local coordinate system 460# translate global coordinates to local coordinate system
439sub coord2local { 461sub coord2local {
440 my ($self, $x, $y) = @_; 462 my ($self, $x, $y) = @_;
441 463
442 Carp::confess unless $self->{parent};#d# 464 return (undef, undef) unless $self->{parent};
443 465
444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 466 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445} 467}
446 468
447# translate local coordinates to global coordinate system 469# translate local coordinates to global coordinate system
448sub coord2global { 470sub coord2global {
449 my ($self, $x, $y) = @_; 471 my ($self, $x, $y) = @_;
450 472
451 Carp::confess unless $self->{parent};#d# 473 return (undef, undef) unless $self->{parent};
452 474
453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 475 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454} 476}
455 477
456sub invoke_focus_in { 478sub invoke_focus_in {
… …
505sub connect { 527sub connect {
506 my ($self, $signal, $cb) = @_; 528 my ($self, $signal, $cb) = @_;
507 529
508 push @{ $self->{signal_cb}{$signal} }, $cb; 530 push @{ $self->{signal_cb}{$signal} }, $cb;
509 531
510 defined wantarray and CFPlus::guard { 532 defined wantarray and DC::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 533 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} }; 534 @{ $self->{signal_cb}{$signal} };
513 } 535 }
514} 536}
515 537
… …
547 569
548 # parent 570 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 571 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 572}
551 573
552sub find_widget { 574#sub find_widget {
553 my ($self, $x, $y) = @_; 575# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 576
564sub set_parent { 577sub set_parent {
565 my ($self, $parent) = @_; 578 my ($self, $parent) = @_;
566 579
567 CFPlus::weaken ($self->{parent} = $parent); 580 DC::weaken ($self->{parent} = $parent);
568 $self->set_visible if $parent->{visible}; 581 $self->set_visible if $parent->{visible};
569} 582}
570 583
571sub realloc { 584sub realloc {
572 my ($self) = @_; 585 my ($self) = @_;
… …
598 611
599# using global variables seems a bit hacky, but passing through all drawing 612# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless. 613# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 614our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602 615
603sub draw { 616#sub draw {
604 my ($self) = @_; 617#CFPlus.xs
605
606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616 glPushMatrix;
617 glTranslate $self->{x}, $self->{y}, 0;
618
619 if ($self == $HOVER && $self->{can_hover}) {
620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621 glEnable GL_BLEND;
622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glBegin GL_QUADS;
624 glVertex 0 , 0;
625 glVertex $self->{w}, 0;
626 glVertex $self->{w}, $self->{h};
627 glVertex 0 , $self->{h};
628 glEnd;
629 glDisable GL_BLEND;
630 }
631
632 if ($ENV{CFPLUS_DEBUG} & 1) {
633 glPushMatrix;
634 glColor 1, 1, 0, 1;
635 glTranslate 0.375, 0.375;
636 glBegin GL_LINE_LOOP;
637 glVertex 0 , 0;
638 glVertex $self->{w} - 1, 0;
639 glVertex $self->{w} - 1, $self->{h} - 1;
640 glVertex 0 , $self->{h} - 1;
641 glEnd;
642 glPopMatrix;
643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644 }
645
646 $self->_draw;
647 glPopMatrix;
648}
649 618
650sub _draw { 619sub _draw {
651 my ($self) = @_; 620 my ($self) = @_;
652 621
653 warn "no draw defined for $self\n"; 622 warn "no draw defined for $self\n";
654} 623}
655 624
656my $cntx;#d#
657sub DESTROY { 625sub DESTROY {
658 my ($self) = @_; 626 my ($self) = @_;
659 627
660 return if CFPlus::in_destruct; 628 return if DC::in_destruct;
661 629
630 local $@;
662 eval { $self->destroy }; 631 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 632 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 633
665 delete $WIDGET{$self+0}; 634 delete $WIDGET{$self+0};
666} 635}
667 636
668############################################################################# 637#############################################################################
669 638
670package CFPlus::UI::DrawBG; 639package DC::UI::DrawBG;
671 640
672our @ISA = CFPlus::UI::Base::; 641our @ISA = DC::UI::Base::;
673 642
674use strict; 643use strict;
675use CFPlus::OpenGL; 644use DC::OpenGL;
676 645
677sub new { 646sub new {
678 my $class = shift; 647 my $class = shift;
679
680 # range [value, low, high, page]
681 648
682 $class->SUPER::new ( 649 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 650 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 651 #active_bg => [1, 1, 1, 0.5],
685 @_ 652 @_
… …
697 my ($w, $h) = @$self{qw(w h)}; 664 my ($w, $h) = @$self{qw(w h)};
698 665
699 glEnable GL_BLEND; 666 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 667 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 668 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 669 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 670 glDisable GL_BLEND;
711 } 671 }
712} 672}
713 673
714############################################################################# 674#############################################################################
715 675
716package CFPlus::UI::Empty; 676package DC::UI::Empty;
717 677
718our @ISA = CFPlus::UI::Base::; 678our @ISA = DC::UI::Base::;
719 679
720sub new { 680sub new {
721 my ($class, %arg) = @_; 681 my ($class, %arg) = @_;
722 $class->SUPER::new (can_events => 0, %arg); 682 $class->SUPER::new (can_events => 0, %arg);
723} 683}
… …
730 690
731sub draw { } 691sub draw { }
732 692
733############################################################################# 693#############################################################################
734 694
735package CFPlus::UI::Container; 695package DC::UI::Container;
736 696
737our @ISA = CFPlus::UI::Base::; 697our @ISA = DC::UI::Base::;
738 698
739sub new { 699sub new {
740 my ($class, %arg) = @_; 700 my ($class, %arg) = @_;
741 701
742 my $children = delete $arg{children}; 702 my $children = delete $arg{children};
… …
746 can_events => 0, 706 can_events => 0,
747 %arg, 707 %arg,
748 ); 708 );
749 709
750 $self->add (@$children) 710 $self->add (@$children)
751 if $children; 711 if $children && @$children;
752 712
753 $self 713 $self
754} 714}
755 715
756sub realloc { 716sub realloc {
… …
765 my ($self, @widgets) = @_; 725 my ($self, @widgets) = @_;
766 726
767 $_->set_parent ($self) 727 $_->set_parent ($self)
768 for @widgets; 728 for @widgets;
769 729
730 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 731 use sort 'stable';
771 732
772 $self->{children} = [ 733 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 734 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 735 @{$self->{children}}, @widgets
775 ]; 736 ];
776 737
777 $self->realloc; 738 $self->realloc;
739
740 $self->emit (c_add => \@widgets);
741
742 map $_+0, @widgets
778} 743}
779 744
780sub children { 745sub children {
781 @{ $_[0]{children} } 746 @{ $_[0]{children} }
782} 747}
783 748
784sub remove { 749sub remove {
785 my ($self, $child) = @_; 750 my ($self, @widgets) = @_;
786 751
752 $self->emit (c_remove => \@widgets);
753
754 for my $child (@widgets) {
787 delete $child->{parent}; 755 delete $child->{parent};
788 $child->hide; 756 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 757 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
758 }
791 759
792 $self->realloc; 760 $self->realloc;
793} 761}
794 762
795sub clear { 763sub clear {
796 my ($self) = @_; 764 my ($self) = @_;
797 765
798 my $children = delete $self->{children}; 766 my $children = $self->{children};
799 $self->{children} = []; 767 $self->{children} = [];
800 768
801 for (@$children) { 769 for (@$children) {
802 delete $_->{parent}; 770 delete $_->{parent};
803 $_->hide; 771 $_->hide;
… …
823} 791}
824 792
825sub _draw { 793sub _draw {
826 my ($self) = @_; 794 my ($self) = @_;
827 795
828 $_->draw for @{$self->{children}}; 796 $_->draw for $self->visible_children;
829} 797}
830 798
831############################################################################# 799#############################################################################
832 800
833package CFPlus::UI::Bin; 801package DC::UI::Bin;
834 802
835our @ISA = CFPlus::UI::Container::; 803our @ISA = DC::UI::Container::;
836 804
837sub new { 805sub new {
838 my ($class, %arg) = @_; 806 my ($class, %arg) = @_;
839 807
840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 808 my $child = (delete $arg{child}) || new DC::UI::Empty::;
841 809
842 $class->SUPER::new (children => [$child], %arg) 810 $class->SUPER::new (children => [$child], %arg)
843} 811}
844 812
845sub add { 813sub add {
846 my ($self, $child) = @_; 814 my ($self, $child) = @_;
847 815
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 816 $self->clear;
849 $self->SUPER::add ($child); 817 $self->SUPER::add ($child);
850} 818}
851 819
852sub remove { 820sub remove {
853 my ($self, $widget) = @_; 821 my ($self, $widget) = @_;
854 822
855 $self->SUPER::remove ($widget); 823 $self->SUPER::remove ($widget);
856 824
857 $self->{children} = [new CFPlus::UI::Empty] 825 $self->{children} = [new DC::UI::Empty]
858 unless @{$self->{children}}; 826 unless @{$self->{children}};
859} 827}
860 828
861sub child { $_[0]->{children}[0] } 829sub child { $_[0]->{children}[0] }
862 830
… …
871 839
872 1 840 1
873} 841}
874 842
875############################################################################# 843#############################################################################
876
877# back-buffered drawing area 844# back-buffered drawing area
878 845
879package CFPlus::UI::Window; 846package DC::UI::Window;
880 847
881our @ISA = CFPlus::UI::Bin::; 848our @ISA = DC::UI::Bin::;
882 849
883use CFPlus::OpenGL; 850use DC::OpenGL;
884 851
885sub new { 852sub new {
886 my ($class, %arg) = @_; 853 my ($class, %arg) = @_;
887 854
888 my $self = $class->SUPER::new (%arg); 855 my $self = $class->SUPER::new (%arg);
… …
910} 877}
911 878
912sub render_child { 879sub render_child {
913 my ($self) = @_; 880 my ($self) = @_;
914 881
915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 882 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
916 glClearColor 0, 0, 0, 0; 883 glClearColor 0, 0, 0, 0;
917 glClear GL_COLOR_BUFFER_BIT; 884 glClear GL_COLOR_BUFFER_BIT;
918 885
919 { 886 {
920 package CFPlus::UI::Base; 887 package DC::UI::Base;
921 888
922 local ($draw_x, $draw_y, $draw_w, $draw_h) = 889 local ($draw_x, $draw_y, $draw_w, $draw_h) =
923 (0, 0, $self->{w}, $self->{h}); 890 (0, 0, $self->{w}, $self->{h});
924 891
925 $self->_render; 892 $self->_render;
… …
942 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
943} 910}
944 911
945############################################################################# 912#############################################################################
946 913
947package CFPlus::UI::ViewPort; 914package DC::UI::ViewPort;
948 915
916use List::Util qw(min max);
917
949our @ISA = CFPlus::UI::Window::; 918our @ISA = DC::UI::Window::;
950 919
951sub new { 920sub new {
952 my $class = shift; 921 my $class = shift;
953 922
954 $class->SUPER::new ( 923 $class->SUPER::new (
… …
961sub size_request { 930sub size_request {
962 my ($self) = @_; 931 my ($self) = @_;
963 932
964 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 933 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965 934
966 $w = 10 if $self->{scroll_x}; 935 $w = 1 if $self->{scroll_x};
967 $h = 10 if $self->{scroll_y}; 936 $h = 1 if $self->{scroll_y};
968 937
969 ($w, $h) 938 ($w, $h)
970} 939}
971 940
972sub invoke_size_allocate { 941sub invoke_size_allocate {
… …
984} 953}
985 954
986sub set_offset { 955sub set_offset {
987 my ($self, $x, $y) = @_; 956 my ($self, $x, $y) = @_;
988 957
958 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
959 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
960
961 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 962 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 963 $self->{view_y} = $y;
991 964
965 $self->emit (changed => $x, $y);
992 $self->update; 966 $self->update;
967 }
968}
969
970sub set_center {
971 my ($self, $x, $y) = @_;
972
973 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
974}
975
976sub make_visible {
977 my ($self, $x, $y, $border) = @_;
978
979 if ( $x < $self->{view_x} + $self->{w} * $border
980 || $x > $self->{view_x} + $self->{w} * (1 - $border)
981 || $y < $self->{view_y} + $self->{h} * $border
982 || $y > $self->{view_y} + $self->{h} * (1 - $border)
983 ) {
984 $self->set_center ($x, $y);
985 }
993} 986}
994 987
995# hmm, this does not work for topleft of $self... but we should not ask for that 988# hmm, this does not work for topleft of $self... but we should not ask for that
996sub coord2local { 989sub coord2local {
997 my ($self, $x, $y) = @_; 990 my ($self, $x, $y) = @_;
… …
1012 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
1013 1006
1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016 ) { 1009 ) {
1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1018 } else { 1011 } else {
1019 $self->CFPlus::UI::Base::find_widget ($x, $y) 1012 $self->DC::UI::Base::find_widget ($x, $y)
1020 } 1013 }
1021} 1014}
1022 1015
1023sub _render { 1016sub _render {
1024 my ($self) = @_; 1017 my ($self) = @_;
1025 1018
1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1019 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1020 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1028 1021
1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1030 1023
1031 $self->SUPER::_render; 1024 $self->SUPER::_render;
1032} 1025}
1033 1026
1034############################################################################# 1027#############################################################################
1035 1028
1036package CFPlus::UI::ScrolledWindow; 1029package DC::UI::ScrolledWindow;
1037 1030
1038our @ISA = CFPlus::UI::Table::; 1031our @ISA = DC::UI::Table::;
1039 1032
1040sub new { 1033sub new {
1041 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
1042 1035
1043 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
1044 1037
1045 my $self; 1038 my $self;
1046 1039
1047 my $hslider = new CFPlus::UI::Slider 1040 my $hslider = new DC::UI::Slider
1041 c_col => 0,
1042 c_row => 1,
1048 vertical => 0, 1043 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix 1044 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1045 on_changed => sub {
1051 $self->{hpos} = $_[1]; 1046 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 }, 1048 },
1054 ; 1049 ;
1055 1050
1056 my $vslider = new CFPlus::UI::Slider 1051 my $vslider = new DC::UI::Slider
1052 c_col => 1,
1053 c_row => 0,
1057 vertical => 1, 1054 vertical => 1,
1058 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1059 on_changed => sub { 1056 on_changed => sub {
1060 $self->{vpos} = $_[1]; 1057 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1071 col_expand => [1, 0], 1068 col_expand => [1, 0],
1072 row_expand => [1, 0], 1069 row_expand => [1, 0],
1073 %arg, 1070 %arg,
1074 ); 1071 );
1075 1072
1076 $self->{vp} = new CFPlus::UI::ViewPort 1073 $self->{vp} = new DC::UI::ViewPort
1074 c_col => 0,
1075 c_row => 0,
1077 expand => 1, 1076 expand => 1,
1078 scroll_x => $self->{scroll_x}, 1077 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y}, 1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 on_size_allocate => sub {
1088 my ($vp, $w, $h) = @_;
1089 $vp->{parent}->update_slider;
1090 0
1091 },
1080 ; 1092 ;
1081 1093
1082 $self->SUPER::add (0, 0, $self->{vp}); 1094 $self->SUPER::add ($self->{vp});
1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085 1095
1086 $self->add ($child) if $child; 1096 $self->add ($child) if $child;
1087 1097
1088 $self 1098 $self
1089} 1099}
1090
1091#TODO# update range on size_allocate depending on child
1092 1100
1093sub add { 1101sub add {
1094 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
1095 1103
1096 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
1097} 1105}
1098 1106
1107sub set_offset { shift->{vp}->set_offset (@_) }
1108sub set_center { shift->{vp}->set_center (@_) }
1109sub make_visible { shift->{vp}->make_visible (@_) }
1110
1111sub update_slider {
1112 my ($self) = @_;
1113
1114 my $child = ($self->{vp} or return)->child;
1115
1116 if ($self->{scroll_x}) {
1117 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1118 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1119
1120 my $visible = $w1 > $w2;
1121 if ($visible != $self->{hslider_visible}) {
1122 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->SUPER::remove ($self->{hslider});
1125 }
1126 }
1127
1128 if ($self->{scroll_y}) {
1129 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131
1132 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible;
1135 $visible ? $self->SUPER::add ($self->{vslider})
1136 : $self->SUPER::remove ($self->{vslider});
1137 }
1138 }
1139}
1140
1141sub start_dragging {
1142 my ($self, $ev) = @_;
1143
1144 $self->grab_focus;
1145
1146 my $ox = $self->{vp}{view_x};
1147 my $oy = $self->{vp}{view_y};
1148
1149 $self->{motion} = sub {
1150 my ($ev, $x, $y) = @_;
1151
1152 $ox -= $ev->{xrel};
1153 $oy -= $ev->{yrel};
1154
1155 $self->{vp}->set_offset ($ox, $oy);
1156 };
1157}
1158
1099sub invoke_mouse_wheel { 1159sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_; 1160 my ($self, $ev) = @_;
1101 1161
1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $self->{vslider}->emit (mouse_wheel => $ev); 1162 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1163 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1105 1164
1106 1 1165 1
1107} 1166}
1108 1167
1109sub update_slider { 1168sub invoke_button_down {
1110 my ($self) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1111 1170
1112 my $child = ($self->{vp} or return)->child; 1171 if ($ev->{button} == 2) {
1172 $self->start_dragging ($ev);
1173 return 1;
1174 }
1113 1175
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1176 0
1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1121} 1177}
1122 1178
1123sub update { 1179sub invoke_button_up {
1124 my ($self) = @_; 1180 my ($self, $ev, $x, $y) = @_;
1125 1181
1126 $self->SUPER::update; 1182 if (delete $self->{motion}) {
1127 $self->update_slider; 1183 return 1;
1184 }
1185
1186 0
1187}
1188
1189sub invoke_mouse_motion {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($self->{motion}) {
1193 $self->{motion}->($ev, $x, $y);
1194 return 1;
1195 }
1196
1197 0
1128} 1198}
1129 1199
1130sub invoke_size_allocate { 1200sub invoke_size_allocate {
1131 my ($self, $w, $h) = @_; 1201 my ($self, $w, $h) = @_;
1132 1202
… …
1134 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1135} 1205}
1136 1206
1137############################################################################# 1207#############################################################################
1138 1208
1139package CFPlus::UI::Frame; 1209package DC::UI::Frame;
1140 1210
1141our @ISA = CFPlus::UI::Bin::; 1211our @ISA = DC::UI::Bin::;
1142 1212
1143use CFPlus::OpenGL; 1213use DC::OpenGL;
1144 1214
1145sub new { 1215sub new {
1146 my $class = shift; 1216 my $class = shift;
1147 1217
1148 $class->SUPER::new ( 1218 $class->SUPER::new (
… …
1158 my ($w, $h) = @$self{qw(w h)}; 1228 my ($w, $h) = @$self{qw(w h)};
1159 1229
1160 glEnable GL_BLEND; 1230 glEnable GL_BLEND;
1161 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1162 glColor_premultiply @{ $self->{bg} }; 1232 glColor_premultiply @{ $self->{bg} };
1163
1164 glBegin GL_QUADS;
1165 glVertex 0 , 0;
1166 glVertex 0 , $h;
1167 glVertex $w, $h; 1233 glRect 0, 0, $w, $h;
1168 glVertex $w, 0;
1169 glEnd;
1170
1171 glDisable GL_BLEND; 1234 glDisable GL_BLEND;
1172 } 1235 }
1173 1236
1174 $self->SUPER::_draw; 1237 $self->SUPER::_draw;
1175} 1238}
1176 1239
1177############################################################################# 1240#############################################################################
1178 1241
1179package CFPlus::UI::FancyFrame; 1242package DC::UI::FancyFrame;
1180 1243
1181our @ISA = CFPlus::UI::Bin::; 1244our @ISA = DC::UI::Bin::;
1182 1245
1183use CFPlus::OpenGL; 1246use DC::OpenGL;
1184 1247
1185sub new { 1248sub new {
1186 my ($class, %arg) = @_; 1249 my ($class, %arg) = @_;
1187 1250
1188 if ((exists $arg{label}) && !ref $arg{label}) { 1251 if ((exists $arg{label}) && !ref $arg{label}) {
1189 $arg{label} = new CFPlus::UI::Label 1252 $arg{label} = new DC::UI::Label
1190 align => 1, 1253 align => 1,
1191 valign => 0, 1254 valign => 0.5,
1192 text => $arg{label}, 1255 text => $arg{label},
1193 fontsize => ($arg{border} || 0.8) * 0.75; 1256 fontsize => ($arg{border} || 0.8) * 0.75;
1194 } 1257 }
1195 1258
1196 my $self = $class->SUPER::new ( 1259 my $self = $class->SUPER::new (
… …
1206 1269
1207sub add { 1270sub add {
1208 my ($self, @widgets) = @_; 1271 my ($self, @widgets) = @_;
1209 1272
1210 $self->SUPER::add (@widgets); 1273 $self->SUPER::add (@widgets);
1211 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1274 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1212} 1275}
1213 1276
1214sub border { 1277sub border {
1215 int $_[0]{border} * $::FONTSIZE 1278 int $_[0]{border} * $::FONTSIZE
1216} 1279}
… …
1274 } 1337 }
1275} 1338}
1276 1339
1277############################################################################# 1340#############################################################################
1278 1341
1279package CFPlus::UI::Toplevel; 1342package DC::UI::Toplevel;
1280 1343
1281our @ISA = CFPlus::UI::Bin::; 1344our @ISA = DC::UI::Bin::;
1282 1345
1283use CFPlus::OpenGL; 1346use DC::OpenGL;
1284 1347
1285my $bg = 1348my $bg =
1286 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1349 new_from_resource DC::Texture "d1_bg.png",
1287 mipmap => 1, wrap => 1; 1350 mipmap => 1, wrap => 1;
1288 1351
1289my @border = 1352my @border =
1290 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1353 map { new_from_resource DC::Texture $_, mipmap => 1 }
1291 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1354 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1355
1356my @icon =
1357 map { new_from_resource DC::Texture $_, mipmap => 1 }
1358 qw(x1_move.png x1_resize.png);
1292 1359
1293sub new { 1360sub new {
1294 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1295 1362
1296 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
1297 bg => [1, 1, 1, 1], 1364 bg => [1, 1, 1, 1],
1298 border_bg => [1, 1, 1, 1], 1365 border_bg => [1, 1, 1, 1],
1299 border => 0.6, 1366 border => 1,
1300 can_events => 1, 1367 can_events => 1,
1301 min_w => 64, 1368 min_w => 64,
1302 min_h => 32, 1369 min_h => 32,
1303 %arg, 1370 %arg,
1304 ); 1371 );
1305 1372
1306 $self->{title_widget} = new CFPlus::UI::Label 1373 $self->{title_widget} = new DC::UI::Label
1307 align => 0, 1374 align => 0.5,
1308 valign => 1, 1375 valign => 1,
1309 text => $self->{title}, 1376 text => $self->{title},
1310 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1311 if exists $self->{title}; 1378 if exists $self->{title};
1312 1379
1313 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1314 $self->{close_button} = 1381 $self->{close_button} =
1315 new CFPlus::UI::ImageButton 1382 new DC::UI::ImageButton
1316 path => 'x1_close.png', 1383 path => 'x1_close.png',
1317 on_activate => sub { $self->emit ("delete") }; 1384 on_activate => sub { $self->emit ("delete") };
1318 1385
1319 $self->CFPlus::UI::Container::add ($self->{close_button}); 1386 $self->DC::UI::Container::add ($self->{close_button});
1320 } 1387 }
1321 1388
1322 $self 1389 $self
1323} 1390}
1324 1391
1325sub add { 1392sub add {
1326 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1327 1394
1328 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1329 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1396 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1330 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1397 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1331} 1398}
1332 1399
1333sub border { 1400sub border {
1334 int $_[0]{border} * $::FONTSIZE 1401 int $_[0]{border} * $::FONTSIZE
1402}
1403
1404sub get_max_wh {
1405 my ($self) = @_;
1406
1407 return ($self->{w}, $self->{h})
1408 if $self->{visible} && $self->{w};
1409
1410 $self->SUPER::get_max_wh
1335} 1411}
1336 1412
1337sub size_request { 1413sub size_request {
1338 my ($self) = @_; 1414 my ($self) = @_;
1339 1415
… …
1465 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1466 1542
1467 my $border = $self->border; 1543 my $border = $self->border;
1468 1544
1469 glColor @{ $self->{border_bg} }; 1545 glColor @{ $self->{border_bg} };
1470 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1471 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1472 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1473 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1549 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1550
1551 # move
1552 my $w2 = ($w - $border) * .5;
1553 my $h2 = ($h - $border) * .5;
1554 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1557
1558 # resize
1559 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1560 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1561 unless $self->{has_close_button};
1562 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1563 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1474 1564
1475 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1476 glColor @{ $self->{bg} }; 1566 glColor @{ $self->{bg} };
1477 1567
1478 # TODO: repeat texture not scale 1568 # TODO: repeat texture not scale
… …
1497 if $self->{close_button}; 1587 if $self->{close_button};
1498} 1588}
1499 1589
1500############################################################################# 1590#############################################################################
1501 1591
1502package CFPlus::UI::Table; 1592package DC::UI::Table;
1503 1593
1504our @ISA = CFPlus::UI::Base::; 1594our @ISA = DC::UI::Container::;
1505 1595
1506use List::Util qw(max sum); 1596use List::Util qw(max sum);
1507 1597
1508use CFPlus::OpenGL; 1598use DC::OpenGL;
1509 1599
1510sub new { 1600sub new {
1511 my $class = shift; 1601 my $class = shift;
1512 1602
1513 $class->SUPER::new ( 1603 $class->SUPER::new (
… …
1515 row_expand => [], 1605 row_expand => [],
1516 @_, 1606 @_,
1517 ) 1607 )
1518} 1608}
1519 1609
1520sub children {
1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1522}
1523
1524sub add { 1610sub add {
1611 my ($self, @widgets) = @_;
1612
1613 for my $child (@widgets) {
1614 $child->{c_rowspan} ||= 1;
1615 $child->{c_colspan} ||= 1;
1616 }
1617
1618 $self->SUPER::add (@widgets);
1619}
1620
1621sub add_at {
1525 my ($self) = shift; 1622 my $self = shift;
1623
1624 my @widgets;
1526 1625
1527 while (@_) { 1626 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, (); 1627 my ($col, $row, $child) = splice @_, 0, 3, ();
1529 $child->set_parent ($self);
1530 $self->{children}[$y][$x] = $child;
1531 }
1532 1628
1533 $self->{force_realloc} = 1; 1629 $child->{c_row} = $row;
1534 $self->{force_size_alloc} = 1; 1630 $child->{c_col} = $col;
1535 $self->realloc;
1536}
1537 1631
1538sub remove { 1632 push @widgets, $child;
1633 }
1634
1635 $self->add (@widgets);
1636}
1637
1638sub get_wh {
1539 my ($self, $child) = @_; 1639 my ($self) = @_;
1540 1640
1541 # TODO: not yet implemented 1641 my (@w, @h);
1542}
1543
1544# TODO: move to container class maybe? send children a signal on removal?
1545sub clear {
1546 my ($self) = @_;
1547 1642
1548 my @children = $self->children; 1643 my @children = $self->children;
1549 delete $self->{children}; 1644
1645 # first pass, columns
1646 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1647 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1648
1649 my $sw = sum @w[$c .. $c + $cs - 1];
1650
1651 if ($w > $sw) {
1652 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1653 }
1550 1654 }
1551 for (@children) {
1552 delete $_->{parent};
1553 $_->hide;
1554 }
1555 1655
1556 $self->realloc; 1656 # second pass, rows
1557} 1657 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1558
1559sub get_wh {
1560 my ($self) = @_;
1561
1562 my (@w, @h);
1563
1564 for my $y (0 .. $#{$self->{children}}) {
1565 my $row = $self->{children}[$y]
1566 or next;
1567
1568 for my $x (0 .. $#$row) {
1569 my $widget = $row->[$x]
1570 or next;
1571 my ($w, $h) = @$widget{qw(req_w req_h)}; 1658 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1572 1659
1573 $w[$x] = max $w[$x], $w; 1660 my $sh = sum @h[$r .. $r + $rs - 1];
1574 $h[$y] = max $h[$y], $h; 1661
1662 if ($h > $sh) {
1663 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1575 } 1664 }
1576 } 1665 }
1577 1666
1578 (\@w, \@h) 1667 (\@w, \@h)
1579} 1668}
… …
1595 my ($ws, $hs) = $self->get_wh; 1684 my ($ws, $hs) = $self->get_wh;
1596 1685
1597 my $req_w = (sum @$ws) || 1; 1686 my $req_w = (sum @$ws) || 1;
1598 my $req_h = (sum @$hs) || 1; 1687 my $req_h = (sum @$hs) || 1;
1599 1688
1600 # TODO: nicer code 1689 # now linearly scale the rows/columns to the allocated size
1601 my @col_expand = @{$self->{col_expand}}; 1690 my @col_expand = @{$self->{col_expand}};
1602 @col_expand = (1) x @$ws unless @col_expand; 1691 @col_expand = (1) x @$ws unless @col_expand;
1603 my $col_expand = (sum @col_expand) || 1; 1692 my $col_expand = (sum @col_expand) || 1;
1604 1693
1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1694 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1606 1695
1607 CFPlus::UI::harmonize $ws; 1696 DC::UI::harmonize $ws;
1608 1697
1609 my @row_expand = @{$self->{row_expand}}; 1698 my @row_expand = @{$self->{row_expand}};
1610 @row_expand = (1) x @$ws unless @row_expand; 1699 @row_expand = (1) x @$ws unless @row_expand;
1611 my $row_expand = (sum @row_expand) || 1; 1700 my $row_expand = (sum @row_expand) || 1;
1612 1701
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1702 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614 1703
1615 CFPlus::UI::harmonize $hs; 1704 DC::UI::harmonize $hs;
1616 1705
1617 my $y; 1706 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1707 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1618 1708
1619 for my $r (0 .. $#{$self->{children}}) { 1709 for my $widget ($self->children) {
1620 my $row = $self->{children}[$r] 1710 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1621 or next;
1622 1711
1623 my $x = 0; 1712 $widget->configure (
1624 my $row_h = $hs->[$r]; 1713 $x[$c], $y[$r],
1714 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1625 1715 );
1626 for my $c (0 .. $#$row) { 1716 }
1627 my $col_w = $ws->[$c];
1628 1717
1629 if (my $widget = $row->[$c]) { 1718 1
1630 $widget->configure ($x, $y, $col_w, $row_h); 1719}
1631 }
1632 1720
1633 $x += $col_w; 1721#############################################################################
1722
1723package DC::UI::Fixed;
1724
1725use List::Util qw(min max);
1726
1727our @ISA = DC::UI::Container::;
1728
1729sub _scale($$$) {
1730 my ($rel, $val, $max) = @_;
1731
1732 $rel ? $val * $max : $val
1733}
1734
1735sub size_request {
1736 my ($self) = @_;
1737
1738 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1739
1740 # determine overall size by querying abs widgets
1741 for my $child ($self->visible_children) {
1742 unless ($child->{c_rel}) {
1743 my $x = $child->{c_x};
1744 my $y = $child->{c_y};
1745
1746 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1747 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1634 } 1748 }
1749 }
1635 1750
1636 $y += $row_h; 1751 my $W = $x2 - $x1;
1752 my $H = $y2 - $y1;
1753
1754 # now layout remaining widgets
1755 for my $child ($self->visible_children) {
1756 if ($child->{c_rel}) {
1757 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1758 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1759
1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1762 }
1763 }
1764
1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1;
1767
1768 ($W, $H)
1769}
1770
1771sub invoke_size_allocate {
1772 my ($self, $W, $H) = @_;
1773
1774 for my $child ($self->visible_children) {
1775 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1776 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1777
1778 $x += $child->{c_halign} * $child->{req_w};
1779 $y += $child->{c_valign} * $child->{req_h};
1780
1781 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1637 } 1782 }
1638 1783
1639 1 1784 1
1640} 1785}
1641 1786
1642sub find_widget {
1643 my ($self, $x, $y) = @_;
1644
1645 $x -= $self->{x};
1646 $y -= $self->{y};
1647
1648 my $res;
1649
1650 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1651 $res = $_->find_widget ($x, $y)
1652 and return $res;
1653 }
1654
1655 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1656}
1657
1658sub _draw {
1659 my ($self) = @_;
1660
1661 for (grep $_, @{$self->{children}}) {
1662 $_->draw for grep $_, @$_;
1663 }
1664}
1665
1666############################################################################# 1787#############################################################################
1667 1788
1668package CFPlus::UI::Box; 1789package DC::UI::Box;
1669 1790
1670our @ISA = CFPlus::UI::Container::; 1791our @ISA = DC::UI::Container::;
1671 1792
1672sub size_request { 1793sub size_request {
1673 my ($self) = @_; 1794 my ($self) = @_;
1795
1796 my @children = $self->visible_children;
1674 1797
1675 $self->{vertical} 1798 $self->{vertical}
1676 ? ( 1799 ? (
1677 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1800 (List::Util::max map $_->{req_w}, @children),
1678 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1801 (List::Util::sum map $_->{req_h}, @children),
1679 ) 1802 )
1680 : ( 1803 : (
1681 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_w}, @children),
1682 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1805 (List::Util::max map $_->{req_h}, @children),
1683 ) 1806 )
1684} 1807}
1685 1808
1686sub invoke_size_allocate { 1809sub invoke_size_allocate {
1687 my ($self, $w, $h) = @_; 1810 my ($self, $w, $h) = @_;
… …
1708 $req[$_] += $space * $children[$_]{expand} 1831 $req[$_] += $space * $children[$_]{expand}
1709 for 0 .. $#children; 1832 for 0 .. $#children;
1710 } 1833 }
1711 } 1834 }
1712 1835
1713 CFPlus::UI::harmonize \@req; 1836 DC::UI::harmonize \@req;
1714 1837
1715 my $pos = 0; 1838 my $pos = 0;
1716 for (0 .. $#children) { 1839 for (0 .. $#children) {
1717 my $alloc = $req[$_]; 1840 my $alloc = $req[$_];
1718 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1841 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1723 1 1846 1
1724} 1847}
1725 1848
1726############################################################################# 1849#############################################################################
1727 1850
1728package CFPlus::UI::HBox; 1851package DC::UI::HBox;
1729 1852
1730our @ISA = CFPlus::UI::Box::; 1853our @ISA = DC::UI::Box::;
1731 1854
1732sub new { 1855sub new {
1733 my $class = shift; 1856 my $class = shift;
1734 1857
1735 $class->SUPER::new ( 1858 $class->SUPER::new (
… …
1738 ) 1861 )
1739} 1862}
1740 1863
1741############################################################################# 1864#############################################################################
1742 1865
1743package CFPlus::UI::VBox; 1866package DC::UI::VBox;
1744 1867
1745our @ISA = CFPlus::UI::Box::; 1868our @ISA = DC::UI::Box::;
1746 1869
1747sub new { 1870sub new {
1748 my $class = shift; 1871 my $class = shift;
1749 1872
1750 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1753 ) 1876 )
1754} 1877}
1755 1878
1756############################################################################# 1879#############################################################################
1757 1880
1758package CFPlus::UI::Label; 1881package DC::UI::Label;
1759 1882
1760our @ISA = CFPlus::UI::DrawBG::; 1883our @ISA = DC::UI::DrawBG::;
1761 1884
1762use CFPlus::OpenGL; 1885use DC::OpenGL;
1763 1886
1764sub new { 1887sub new {
1765 my ($class, %arg) = @_; 1888 my ($class, %arg) = @_;
1766 1889
1767 my $self = $class->SUPER::new ( 1890 my $self = $class->SUPER::new (
… …
1772 #text => initial text 1895 #text => initial text
1773 #markup => initial narkup 1896 #markup => initial narkup
1774 #max_w => maximum pixel width 1897 #max_w => maximum pixel width
1775 #style => 0, # render flags 1898 #style => 0, # render flags
1776 ellipsise => 3, # end 1899 ellipsise => 3, # end
1777 layout => (new CFPlus::Layout), 1900 layout => (new DC::Layout),
1778 fontsize => 1, 1901 fontsize => 1,
1779 align => -1, 1902 align => 0.5,
1780 valign => -1, 1903 valign => 0.5,
1781 padding_x => 2, 1904 padding_x => 4,
1782 padding_y => 2, 1905 padding_y => 2,
1783 can_events => 0, 1906 can_events => 0,
1784 %arg 1907 %arg
1785 ); 1908 );
1786 1909
1787 if (exists $self->{template}) { 1910 if (exists $self->{template}) {
1788 my $layout = new CFPlus::Layout; 1911 my $layout = new DC::Layout;
1789 $layout->set_text (delete $self->{template}); 1912 $layout->set_text (delete $self->{template});
1790 $self->{template} = $layout; 1913 $self->{template} = $layout;
1791 } 1914 }
1792 1915
1793 if (exists $self->{markup}) { 1916 if (exists $self->{markup}) {
… …
1811 1934
1812 delete $self->{ox}; 1935 delete $self->{ox};
1813 $self->SUPER::realloc; 1936 $self->SUPER::realloc;
1814} 1937}
1815 1938
1939sub clear {
1940 my ($self) = @_;
1941
1942 $self->set_text ("");
1943}
1944
1816sub set_text { 1945sub set_text {
1817 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1818 1947
1819 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1820 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
… …
1843 1972
1844sub size_request { 1973sub size_request {
1845 my ($self) = @_; 1974 my ($self) = @_;
1846 1975
1847 $self->{size_req} ||= do { 1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
1848 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
1849 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
1850 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
1851 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1852 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1853 1984
1854 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
1855 1986
1856 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
1857 $self->{template}->set_font ($self->{font}) if $self->{font}; 1988 $self->{template}->set_font ($self->{font}) if $self->{font};
1858 $self->{template}->set_width ($self->{max_w} || -1); 1989 $self->{template}->set_width ($max_w);
1859 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1860 1991
1861 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
1862 1993
1863 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
… …
1919 2050
1920 [$self->{layout}->size] 2051 [$self->{layout}->size]
1921 }; 2052 };
1922 2053
1923 unless (exists $self->{ox}) { 2054 unless (exists $self->{ox}) {
1924 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2055 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
1925 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2056 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1926 : ($self->{w} - $size->[0]) * 0.5);
1927 2057
1928 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2058 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1929 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1930 : ($self->{h} - $size->[1]) * 0.5);
1931 }; 2059 };
1932 2060
1933 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2061# unless ($self->{list}) {
1934 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2062# $self->{list} = DC::OpenGL::glGenList;
1935 2063# DC::OpenGL::glNewList $self->{list};
1936 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2064# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2065# DC::OpenGL::glEndList;
2066# }
2067#
2068# DC::OpenGL::glCallList $self->{list};
2069
2070 $self->{layout}->draw;
1937} 2071}
2072
2073#sub destroy {
2074# my ($self) = @_;
2075#
2076# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2077#
2078# $self->SUPER::destroy;
2079#}
1938 2080
1939############################################################################# 2081#############################################################################
1940 2082
1941package CFPlus::UI::EntryBase; 2083package DC::UI::EntryBase;
1942 2084
1943our @ISA = CFPlus::UI::Label::; 2085our @ISA = DC::UI::Label::;
1944 2086
1945use CFPlus::OpenGL; 2087use DC::OpenGL;
1946 2088
1947sub new { 2089sub new {
1948 my $class = shift; 2090 my $class = shift;
1949 2091
1950 $class->SUPER::new ( 2092 $class->SUPER::new (
1951 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
1952 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1],
1953 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
1954 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
1955 can_hover => 1, 2099 can_hover => 1,
1956 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
1957 valign => 0, 2102 valign => 0.5,
1958 can_events => 1, 2103 can_events => 1,
1959 ellipsise => 0, 2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
1960 #text => ... 2107 #text => ...
1961 #hidden => "*", 2108 #hidden => "*",
1962 @_ 2109 @_
1963 ) 2110 )
1964} 2111}
… …
2011 2158
2012 my $text = $self->get_text; 2159 my $text = $self->get_text;
2013 2160
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2161 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2015 2162
2016 if ($uni == 8) { 2163 if ($sym == DC::SDLK_BACKSPACE) {
2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2018 } elsif ($uni == 127) { 2165 } elsif ($sym == DC::SDLK_DELETE) {
2019 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
2020 } elsif ($sym == CFPlus::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
2021 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
2022 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
2023 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2024 } elsif ($sym == CFPlus::SDLK_HOME) { 2171 } elsif ($sym == DC::SDLK_HOME) {
2025 # what a hack 2172 # what a hack
2026 $self->{cursor} = 2173 $self->{cursor} =
2027 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2174 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2028 ? length $1 2175 ? length $1
2029 : 0; 2176 : 0;
2030 } elsif ($sym == CFPlus::SDLK_END) { 2177 } elsif ($sym == DC::SDLK_END) {
2031 # uh, again 2178 # uh, again
2032 $self->{cursor} = 2179 $self->{cursor} =
2033 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2180 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2034 ? $self->{cursor} + length $1 2181 ? $self->{cursor} + length $1
2035 : length $self->{text}; 2182 : length $self->{text};
… …
2099 glColor_premultiply @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
2100 } 2247 }
2101 2248
2102 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
2103 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2250 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2104 glBegin GL_QUADS;
2105 glVertex 0 , 0;
2106 glVertex 0 , $self->{h};
2107 glVertex $self->{w}, $self->{h}; 2251 glRect 0, 0, $self->{w}, $self->{h};
2108 glVertex $self->{w}, 0;
2109 glEnd;
2110 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
2111 2253
2112 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
2113 2255
2114 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
… …
2116 2258
2117 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
2118 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
2119 utf8::encode $text; 2261 utf8::encode $text;
2120 2262
2121 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2263 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2122 } 2264 }
2123 2265
2266 glColor_premultiply @{$self->{active_fg}};
2124 glBegin GL_LINES; 2267 glBegin GL_LINES;
2125 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2269 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2127 glEnd; 2270 glEnd;
2271
2272 glLineWidth 3;
2273 glColor @{$self->{active_outline}};
2274 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2275 glLineWidth 1;
2276
2277 } else {
2278 glColor @{$self->{outline}};
2279 glBegin GL_LINE_STRIP;
2280 glVertex .5, $self->{h} * .5;
2281 glVertex .5, $self->{h} - 2.5;
2282 glVertex $self->{w} - .5, $self->{h} - 2.5;
2283 glVertex $self->{w} - .5, $self->{h} * .5;
2284 glEnd;
2128 } 2285 }
2129} 2286}
2130 2287
2131############################################################################# 2288#############################################################################
2132 2289
2133package CFPlus::UI::Entry; 2290package DC::UI::Entry;
2134 2291
2135our @ISA = CFPlus::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
2136 2293
2137use CFPlus::OpenGL; 2294use DC::OpenGL;
2295
2296sub new {
2297 my $class = shift;
2298
2299 $class->SUPER::new (
2300 history_pointer => -1,
2301 @_
2302 )
2303}
2304
2138 2305
2139sub invoke_key_down { 2306sub invoke_key_down {
2140 my ($self, $ev) = @_; 2307 my ($self, $ev) = @_;
2141 2308
2142 my $sym = $ev->{sym}; 2309 my $sym = $ev->{sym};
… …
2148 $self->{history_pointer} = -1; 2315 $self->{history_pointer} = -1;
2149 $self->{history_saveback} = ''; 2316 $self->{history_saveback} = '';
2150 $self->emit (activate => $txt); 2317 $self->emit (activate => $txt);
2151 $self->update; 2318 $self->update;
2152 2319
2153 } elsif ($sym == CFPlus::SDLK_UP) { 2320 } elsif ($sym == DC::SDLK_UP) {
2154 if ($self->{history_pointer} < 0) { 2321 if ($self->{history_pointer} < 0) {
2155 $self->{history_saveback} = $self->get_text; 2322 $self->{history_saveback} = $self->get_text;
2156 } 2323 }
2157 if (@{$self->{history} || []} > 0) { 2324 if (@{$self->{history} || []} > 0) {
2158 $self->{history_pointer}++; 2325 $self->{history_pointer}++;
… …
2160 $self->{history_pointer} = @{$self->{history} || []} - 1; 2327 $self->{history_pointer} = @{$self->{history} || []} - 1;
2161 } 2328 }
2162 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2329 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2163 } 2330 }
2164 2331
2165 } elsif ($sym == CFPlus::SDLK_DOWN) { 2332 } elsif ($sym == DC::SDLK_DOWN) {
2166 $self->{history_pointer}--; 2333 $self->{history_pointer}--;
2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2334 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2168 2335
2169 if ($self->{history_pointer} >= 0) { 2336 if ($self->{history_pointer} >= 0) {
2170 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2337 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2171 } else { 2338 } else {
2339 if (defined $self->{history_saveback}) {
2172 $self->set_text ($self->{history_saveback}); 2340 $self->set_text ($self->{history_saveback});
2341 $self->{history_saveback} = undef;
2342 }
2173 } 2343 }
2174 2344
2175 } else { 2345 } else {
2176 return $self->SUPER::invoke_key_down ($ev) 2346 return $self->SUPER::invoke_key_down ($ev)
2177 } 2347 }
… …
2179 1 2349 1
2180} 2350}
2181 2351
2182############################################################################# 2352#############################################################################
2183 2353
2184package CFPlus::UI::TextEdit; 2354package DC::UI::TextEdit;
2185 2355
2186our @ISA = CFPlus::UI::EntryBase::; 2356our @ISA = DC::UI::EntryBase::;
2187 2357
2188use CFPlus::OpenGL; 2358use DC::OpenGL;
2359
2360sub new {
2361 my $class = shift;
2362
2363 $class->SUPER::new (
2364 padding_y => 4,
2365
2366 @_
2367 )
2368}
2189 2369
2190sub move_cursor_ver { 2370sub move_cursor_ver {
2191 my ($self, $dy) = @_; 2371 my ($self, $dy) = @_;
2192 2372
2193 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2373 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2194 2374
2195 $y += $dy; 2375 $line += $dy;
2196 2376
2197 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2377 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2198 $self->{cursor} = $index; 2378 $self->{cursor} = $index;
2199 delete $self->{cur_h}; 2379 delete $self->{cur_h};
2200 $self->update; 2380 $self->update;
2201 return; 2381 return;
2202 } 2382 }
… …
2205sub invoke_key_down { 2385sub invoke_key_down {
2206 my ($self, $ev) = @_; 2386 my ($self, $ev) = @_;
2207 2387
2208 my $sym = $ev->{sym}; 2388 my $sym = $ev->{sym};
2209 2389
2210 if ($sym == CFPlus::SDLK_UP) { 2390 if ($sym == DC::SDLK_UP) {
2211 $self->move_cursor_ver (-1); 2391 $self->move_cursor_ver (-1);
2212 } elsif ($sym == CFPlus::SDLK_DOWN) { 2392 } elsif ($sym == DC::SDLK_DOWN) {
2213 $self->move_cursor_ver (+1); 2393 $self->move_cursor_ver (+1);
2214 } else { 2394 } else {
2215 return $self->SUPER::invoke_key_down ($ev) 2395 return $self->SUPER::invoke_key_down ($ev)
2216 } 2396 }
2217 2397
2218 1 2398 1
2219} 2399}
2220 2400
2221############################################################################# 2401#############################################################################
2222 2402
2223package CFPlus::UI::Button; 2403package DC::UI::ButtonBin;
2224 2404
2225our @ISA = CFPlus::UI::Label::; 2405our @ISA = DC::UI::Bin::;
2226 2406
2227use CFPlus::OpenGL; 2407use DC::OpenGL;
2228 2408
2229my @tex = 2409my @tex =
2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2410 map { new_from_resource DC::Texture $_, mipmap => 1 }
2231 qw(b1_button_active.png); 2411 qw(b1_button_inactive.png b1_button_active.png);
2232 2412
2233sub new { 2413sub new {
2234 my $class = shift; 2414 my $class = shift;
2235 2415
2236 $class->SUPER::new ( 2416 $class->SUPER::new (
2237 padding_x => 4,
2238 padding_y => 4,
2239 fg => [1, 1, 1],
2240 active_fg => [0, 0, 1],
2241 can_hover => 1, 2417 can_hover => 1,
2242 align => 0, 2418 align => 0.5,
2243 valign => 0, 2419 valign => 0.5,
2244 can_events => 1, 2420 can_events => 1,
2245 @_ 2421 @_
2246 ) 2422 )
2247} 2423}
2248 2424
… …
2257} 2433}
2258 2434
2259sub _draw { 2435sub _draw {
2260 my ($self) = @_; 2436 my ($self) = @_;
2261 2437
2262 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2263
2264 glEnable GL_TEXTURE_2D; 2438 glEnable GL_TEXTURE_2D;
2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2266 glColor 0, 0, 0, 1; 2440 glColor 0, 0, 0, 1;
2267 2441
2442 my $tex = $tex[$GRAB == $self];
2268 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2443 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2269 2444
2270 glDisable GL_TEXTURE_2D; 2445 glDisable GL_TEXTURE_2D;
2271 2446
2272 $self->SUPER::_draw; 2447 $self->SUPER::_draw;
2273} 2448}
2274 2449
2275############################################################################# 2450#############################################################################
2276 2451
2277package CFPlus::UI::CheckBox; 2452package DC::UI::Button;
2278 2453
2279our @ISA = CFPlus::UI::DrawBG::; 2454our @ISA = DC::UI::Label::;
2455
2456use DC::OpenGL;
2280 2457
2281my @tex = 2458my @tex =
2282 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2459 map { new_from_resource DC::Texture $_, mipmap => 1 }
2460 qw(b1_button_inactive.png b1_button_active.png);
2461
2462sub new {
2463 my $class = shift;
2464
2465 $class->SUPER::new (
2466 padding_x => 8,
2467 padding_y => 4,
2468 fg => [1.0, 1.0, 1.0],
2469 active_fg => [0.8, 0.8, 0.8],
2470 can_hover => 1,
2471 align => 0.5,
2472 valign => 0.5,
2473 can_events => 1,
2474 @_
2475 )
2476}
2477
2478sub invoke_button_up {
2479 my ($self, $ev, $x, $y) = @_;
2480
2481 $self->emit ("activate")
2482 if $x >= 0 && $x < $self->{w}
2483 && $y >= 0 && $y < $self->{h};
2484
2485 1
2486}
2487
2488sub _draw {
2489 my ($self) = @_;
2490
2491 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2492
2493 glEnable GL_TEXTURE_2D;
2494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2495 glColor 0, 0, 0, 1;
2496
2497 my $tex = $tex[$GRAB == $self];
2498 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499
2500 glDisable GL_TEXTURE_2D;
2501
2502 $self->SUPER::_draw;
2503}
2504
2505#############################################################################
2506
2507package DC::UI::CheckBox;
2508
2509our @ISA = DC::UI::DrawBG::;
2510
2511my @tex =
2512 map { new_from_resource DC::Texture $_, mipmap => 1 }
2283 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2513 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2284 2514
2285use CFPlus::OpenGL; 2515use DC::OpenGL;
2286 2516
2287sub new { 2517sub new {
2288 my $class = shift; 2518 my $class = shift;
2289 2519
2290 $class->SUPER::new ( 2520 $class->SUPER::new (
… …
2330sub _draw { 2560sub _draw {
2331 my ($self) = @_; 2561 my ($self) = @_;
2332 2562
2333 $self->SUPER::_draw; 2563 $self->SUPER::_draw;
2334 2564
2335 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2565 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2336 2566
2337 my ($w, $h) = @$self{qw(w h)}; 2567 my ($w, $h) = @$self{qw(w h)};
2338 2568
2339 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2569 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2340 2570
… …
2347 glDisable GL_TEXTURE_2D; 2577 glDisable GL_TEXTURE_2D;
2348} 2578}
2349 2579
2350############################################################################# 2580#############################################################################
2351 2581
2352package CFPlus::UI::Image; 2582package DC::UI::Image;
2353 2583
2354our @ISA = CFPlus::UI::Base::; 2584our @ISA = DC::UI::Base::;
2355 2585
2356use CFPlus::OpenGL; 2586use DC::OpenGL;
2357 2587
2358our %texture_cache; 2588our %texture_cache;
2359 2589
2360sub new { 2590sub new {
2361 my $class = shift; 2591 my $class = shift;
2362 2592
2363 my $self = $class->SUPER::new ( 2593 my $self = $class->SUPER::new (
2364 can_events => 0, 2594 can_events => 0,
2595 scale => 1,
2365 @_, 2596 @_,
2366 ); 2597 );
2367 2598
2368 $self->{path} || $self->{tex} 2599 $self->{path} || $self->{tex}
2369 or Carp::croak "'path' or 'tex' attributes required"; 2600 or Carp::croak "'path' or 'tex' attributes required";
2370 2601
2371 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2602 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2372 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2603 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2373 2604
2374 CFPlus::weaken $texture_cache{$self->{path}}; 2605 DC::weaken $texture_cache{$self->{path}};
2375 2606
2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2607 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2377 2608
2378 $self 2609 $self
2379} 2610}
2380 2611
2381sub STORABLE_freeze { 2612sub STORABLE_freeze {
2382 my ($self, $cloning) = @_; 2613 my ($self, $cloning) = @_;
2383 2614
2384 $self->{path} 2615 $self->{path}
2385 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2616 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2386 2617
2387 $self->{path} 2618 $self->{path}
2388} 2619}
2389 2620
2390sub STORABLE_attach { 2621sub STORABLE_attach {
… …
2394} 2625}
2395 2626
2396sub size_request { 2627sub size_request {
2397 my ($self) = @_; 2628 my ($self) = @_;
2398 2629
2399 ($self->{tex}{w}, $self->{tex}{h}) 2630 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2400} 2631}
2401 2632
2402sub _draw { 2633sub _draw {
2403 my ($self) = @_; 2634 my ($self) = @_;
2404 2635
… …
2414 } 2645 }
2415 2646
2416 glEnable GL_TEXTURE_2D; 2647 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2648 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 2649
2419 $tex->draw_quad (0, 0, $w, $h); 2650 $tex->draw_quad_alpha (0, 0, $w, $h);
2420 2651
2421 glDisable GL_TEXTURE_2D; 2652 glDisable GL_TEXTURE_2D;
2422} 2653}
2423 2654
2424############################################################################# 2655#############################################################################
2425 2656
2426package CFPlus::UI::ImageButton; 2657package DC::UI::ImageButton;
2427 2658
2428our @ISA = CFPlus::UI::Image::; 2659our @ISA = DC::UI::Image::;
2429 2660
2430use CFPlus::OpenGL; 2661use DC::OpenGL;
2431 2662
2432my %textures; 2663my %textures;
2433 2664
2434sub new { 2665sub new {
2435 my $class = shift; 2666 my $class = shift;
… …
2438 padding_x => 4, 2669 padding_x => 4,
2439 padding_y => 4, 2670 padding_y => 4,
2440 fg => [1, 1, 1], 2671 fg => [1, 1, 1],
2441 active_fg => [0, 0, 1], 2672 active_fg => [0, 0, 1],
2442 can_hover => 1, 2673 can_hover => 1,
2443 align => 0, 2674 align => 0.5,
2444 valign => 0, 2675 valign => 0.5,
2445 can_events => 1, 2676 can_events => 1,
2446 @_ 2677 @_
2447 ); 2678 );
2448} 2679}
2449 2680
2681sub invoke_button_down {
2682 my ($self, $ev, $x, $y) = @_;
2683
2684 1
2685}
2686
2450sub invoke_button_up { 2687sub invoke_button_up {
2451 my ($self, $ev, $x, $y) = @_; 2688 my ($self, $ev, $x, $y) = @_;
2452 2689
2453 $self->emit ("activate") 2690 $self->emit ("activate")
2454 if $x >= 0 && $x < $self->{w} 2691 if $x >= 0 && $x < $self->{w}
… …
2457 1 2694 1
2458} 2695}
2459 2696
2460############################################################################# 2697#############################################################################
2461 2698
2462package CFPlus::UI::VGauge; 2699package DC::UI::VGauge;
2463 2700
2464our @ISA = CFPlus::UI::Base::; 2701our @ISA = DC::UI::Base::;
2465 2702
2466use List::Util qw(min max); 2703use List::Util qw(min max);
2467 2704
2468use CFPlus::OpenGL; 2705use DC::OpenGL;
2469 2706
2470my %tex = ( 2707my %tex = (
2471 food => [ 2708 food => [
2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2709 map { new_from_resource DC::Texture $_, mipmap => 1 }
2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2710 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2474 ], 2711 ],
2475 grace => [ 2712 grace => [
2476 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2713 map { new_from_resource DC::Texture $_, mipmap => 1 }
2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2714 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2478 ], 2715 ],
2479 hp => [ 2716 hp => [
2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2718 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2482 ], 2719 ],
2483 mana => [ 2720 mana => [
2484 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2722 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2486 ], 2723 ],
2487); 2724);
2488 2725
2489# eg. VGauge->new (gauge => 'food'), default gauge: food 2726# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2592 glDisable GL_TEXTURE_2D; 2829 glDisable GL_TEXTURE_2D;
2593} 2830}
2594 2831
2595############################################################################# 2832#############################################################################
2596 2833
2834package DC::UI::Progress;
2835
2836our @ISA = DC::UI::Label::;
2837
2838use DC::OpenGL;
2839
2840sub new {
2841 my ($class, %arg) = @_;
2842
2843 my $self = $class->SUPER::new (
2844 fg => [1, 1, 1],
2845 bg => [0, 0, 1, 0.2],
2846 bar => [0.7, 0.5, 0.1, 0.8],
2847 outline => [0.4, 0.3, 0],
2848 fontsize => 0.9,
2849 valign => 0.5,
2850 align => 0.5,
2851 can_events => 1,
2852 ellipsise => 1,
2853 label => "%d%%",
2854 %arg,
2855 );
2856
2857 $self->set_value ($arg{value} || -1);
2858
2859 $self
2860}
2861
2862sub set_label {
2863 my ($self, $label) = @_;
2864
2865 return if $self->{label} eq $label;
2866 $self->{label} = $label;
2867
2868 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2869}
2870
2871sub set_value {
2872 my ($self, $value) = @_;
2873
2874 if ($self->{value} ne $value) {
2875 $self->{value} = $value;
2876
2877 if ($value < 0) {
2878 $self->set_text ("-");
2879 } else {
2880 $self->set_text (sprintf $self->{label}, $value * 100);
2881 }
2882
2883 $self->update;
2884 }
2885}
2886
2887sub _draw {
2888 my ($self) = @_;
2889
2890 glEnable GL_BLEND;
2891 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2892
2893 if ($self->{value} >= 0) {
2894 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2895
2896 glColor_premultiply @{$self->{bar}};
2897 glRect 2, 2, $s, $self->{h} - 2;
2898 glColor_premultiply @{$self->{bg}};
2899 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2900 }
2901
2902 glColor_premultiply @{$self->{outline}};
2903 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2904
2905 glDisable GL_BLEND;
2906
2907 {
2908 local $self->{bg}; # do not draw background
2909 $self->SUPER::_draw;
2910 }
2911}
2912
2913#############################################################################
2914
2915package DC::UI::ExperienceProgress;
2916
2917our @ISA = DC::UI::Progress::;
2918
2919sub new {
2920 my ($class, %arg) = @_;
2921
2922 my $self = $class->SUPER::new (
2923 tooltip => sub {
2924 my ($self) = @_;
2925
2926 sprintf "level %d\n%s points\n%s next level\n%s to go",
2927 $self->{lvl},
2928 ::formsep ($self->{exp}),
2929 ::formsep ($self->{nxt}),
2930 ::formsep ($self->{nxt} - $self->{exp}),
2931 },
2932 %arg
2933 );
2934
2935 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2936 if $::CONN;
2937
2938 $self
2939}
2940
2941sub DESTROY {
2942 my ($self) = @_;
2943
2944 delete $::CONN->{on_exp_update}{$self+0}
2945 if $::CONN;
2946
2947 $self->SUPER::DESTROY;
2948}
2949
2950sub set_value {
2951 my ($self, $lvl, $exp) = @_;
2952
2953 $self->{lvl} = $lvl;
2954 $self->{exp} = $exp;
2955
2956 my $v = -1;
2957
2958 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2959 my $l0 = $table->[$lvl - 1];
2960 my $l1 = $table->[$lvl];
2961
2962 $self->{nxt} = $l1;
2963
2964 $v = ($exp - $l0) / ($l1 - $l0);
2965 }
2966
2967 $self->SUPER::set_value ($v);
2968}
2969
2970#############################################################################
2971
2597package CFPlus::UI::Gauge; 2972package DC::UI::Gauge;
2598 2973
2599our @ISA = CFPlus::UI::VBox::; 2974our @ISA = DC::UI::VBox::;
2600 2975
2601sub new { 2976sub new {
2602 my ($class, %arg) = @_; 2977 my ($class, %arg) = @_;
2603 2978
2604 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
… …
2606 can_hover => 1, 2981 can_hover => 1,
2607 can_events => 1, 2982 can_events => 1,
2608 %arg, 2983 %arg,
2609 ); 2984 );
2610 2985
2611 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2986 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2612 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2987 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2613 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 2988 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2614 2989
2615 $self 2990 $self
2616} 2991}
2617 2992
2618sub set_fontsize { 2993sub set_fontsize {
… …
2639 $self->{value}->set_text ($val); 3014 $self->{value}->set_text ($val);
2640} 3015}
2641 3016
2642############################################################################# 3017#############################################################################
2643 3018
2644package CFPlus::UI::Slider; 3019package DC::UI::Slider;
2645 3020
2646use strict; 3021use strict;
2647 3022
2648use CFPlus::OpenGL; 3023use DC::OpenGL;
2649 3024
2650our @ISA = CFPlus::UI::DrawBG::; 3025our @ISA = DC::UI::DrawBG::;
2651 3026
2652my @tex = 3027my @tex =
2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3028 map { new_from_resource DC::Texture $_ }
2654 qw(s1_slider.png s1_slider_bg.png); 3029 qw(s1_slider.png s1_slider_bg.png);
2655 3030
2656sub new { 3031sub new {
2657 my $class = shift; 3032 my $class = shift;
2658 3033
… …
2695sub set_value { 3070sub set_value {
2696 my ($self, $value) = @_; 3071 my ($self, $value) = @_;
2697 3072
2698 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3073 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2699 3074
2700 $hi = $lo + 1 if $hi <= $lo; 3075 $hi = $lo if $hi < $lo;
2701 3076
2702 $page = $hi - $lo if $page > $hi - $lo; 3077 $value = $hi - $page if $value > $hi - $page;
2703
2704 $value = $lo if $value < $lo; 3078 $value = $lo if $value < $lo;
2705 $value = $hi - $page if $value > $hi - $page;
2706 3079
2707 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3080 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2708 if $unit; 3081 if $unit;
2709 3082
2710 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3083 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2726 3099
2727 $self->SUPER::invoke_button_down ($ev, $x, $y); 3100 $self->SUPER::invoke_button_down ($ev, $x, $y);
2728 3101
2729 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3102 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2730 3103
2731 $self->invoke_mouse_motion ($ev, $x, $y) 3104 $self->invoke_mouse_motion ($ev, $x, $y);
3105
3106 1
2732} 3107}
2733 3108
2734sub invoke_mouse_motion { 3109sub invoke_mouse_motion {
2735 my ($self, $ev, $x, $y) = @_; 3110 my ($self, $ev, $x, $y) = @_;
2736 3111
… …
2752sub invoke_mouse_wheel { 3127sub invoke_mouse_wheel {
2753 my ($self, $ev) = @_; 3128 my ($self, $ev) = @_;
2754 3129
2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3130 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2756 3131
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3132 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2758 3133
2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3134 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2760 3135
2761 ! ! $delta 3136 1
2762} 3137}
2763 3138
2764sub update { 3139sub update {
2765 my ($self) = @_; 3140 my ($self) = @_;
2766 3141
… …
2772 my ($self) = @_; 3147 my ($self) = @_;
2773 3148
2774 unless ($self->{knob_w}) { 3149 unless ($self->{knob_w}) {
2775 $self->set_value ($self->{range}[0]); 3150 $self->set_value ($self->{range}[0]);
2776 3151
2777 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3152 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2778 my $range = ($hi - $page - $lo) || 1e-100; 3153 my $range = ($hi - $page - $lo) || 1e-10;
2779 3154
2780 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3155 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2781 3156
2782 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3157 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2783 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3158 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2784 3159
2785 $value = ($value - $lo) / $range; 3160 $value = ($value - $lo) / $range;
… …
2815 glDisable GL_TEXTURE_2D; 3190 glDisable GL_TEXTURE_2D;
2816} 3191}
2817 3192
2818############################################################################# 3193#############################################################################
2819 3194
2820package CFPlus::UI::ValSlider; 3195package DC::UI::ValSlider;
2821 3196
2822our @ISA = CFPlus::UI::HBox::; 3197our @ISA = DC::UI::HBox::;
2823 3198
2824sub new { 3199sub new {
2825 my ($class, %arg) = @_; 3200 my ($class, %arg) = @_;
2826 3201
2827 my $range = delete $arg{range}; 3202 my $range = delete $arg{range};
2828 3203
2829 my $self = $class->SUPER::new ( 3204 my $self = $class->SUPER::new (
2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3205 slider => (new DC::UI::Slider expand => 1, range => $range),
2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3206 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2832 to_value => sub { shift }, 3207 to_value => sub { shift },
2833 from_value => sub { shift }, 3208 from_value => sub { shift },
2834 %arg, 3209 %arg,
2835 ); 3210 );
2836 3211
… …
2856sub set_range { shift->{slider}->set_range (@_) } 3231sub set_range { shift->{slider}->set_range (@_) }
2857sub set_value { shift->{slider}->set_value (@_) } 3232sub set_value { shift->{slider}->set_value (@_) }
2858 3233
2859############################################################################# 3234#############################################################################
2860 3235
2861package CFPlus::UI::TextScroller; 3236package DC::UI::TextScroller;
2862 3237
2863our @ISA = CFPlus::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
2864 3239
2865use CFPlus::OpenGL; 3240use DC::OpenGL;
2866 3241
2867sub new { 3242sub new {
2868 my $class = shift; 3243 my $class = shift;
2869 3244
2870 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
… …
2872 can_events => 1, 3247 can_events => 1,
2873 indent => 0, 3248 indent => 0,
2874 #font => default_font 3249 #font => default_font
2875 @_, 3250 @_,
2876 3251
2877 layout => (new CFPlus::Layout), 3252 layout => (new DC::Layout),
2878 par => [], 3253 par => [],
2879 max_par => 0, 3254 max_par => 0,
2880 height => 0, 3255 height => 0,
2881 children => [ 3256 children => [
2882 (new CFPlus::UI::Empty expand => 1), 3257 (new DC::UI::Empty expand => 1),
2883 (new CFPlus::UI::Slider vertical => 1), 3258 (new DC::UI::Slider vertical => 1),
2884 ], 3259 ],
2885 ); 3260 );
2886 3261
2887 $self->{children}[1]->connect (changed => sub { $self->update }); 3262 $self->{children}[1]->connect (changed => sub { $self->update });
2888 3263
… …
2897} 3272}
2898 3273
2899sub size_request { 3274sub size_request {
2900 my ($self) = @_; 3275 my ($self) = @_;
2901 3276
2902 my ($empty, $slider) = @{ $self->{children} }; 3277 my ($empty, $slider) = $self->visible_children;
2903 3278
2904 local $self->{children} = [$empty, $slider]; 3279 local $self->{children} = [$empty, $slider];
2905 $self->SUPER::size_request 3280 $self->SUPER::size_request
2906} 3281}
2907 3282
… …
2944 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3319 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2945 $layout->set_markup ($para->{markup}); 3320 $layout->set_markup ($para->{markup});
2946 3321
2947 $layout->set_shapes ( 3322 $layout->set_shapes (
2948 map 3323 map
2949 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3324 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2950 @{$para->{widget}} 3325 @{$para->{widget}}
2951 ); 3326 );
2952 3327
2953 $layout 3328 $layout
2954} 3329}
… …
3071 $ROOT->on_post_alloc ($self => sub { 3446 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate; 3447 $self->force_uptodate;
3073 3448
3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3449 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3075 3450
3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3451 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3077 glClearColor 0, 0, 0, 0; 3452 glClearColor 0, 0, 0, 0;
3078 glClear GL_COLOR_BUFFER_BIT; 3453 glClear GL_COLOR_BUFFER_BIT;
3079 3454
3080 package CFPlus::UI::Base; 3455 package DC::UI::Base;
3081 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3456 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3082 (0, 0, $self->{w}, $self->{h}); 3457 (0, 0, $self->{w}, $self->{h});
3083 3458
3084 my $top = int $self->{children}[1]{range}[0]; 3459 my $top = int $self->{children}[1]{range}[0];
3085 3460
… …
3096 3471
3097 if ($y0 < $y + $h && $y < $y1) { 3472 if ($y0 < $y + $h && $y < $y1) {
3098 my $layout = $self->get_layout ($para); 3473 my $layout = $self->get_layout ($para);
3099 3474
3100 $layout->render ($para->{indent}, $y - $y0); 3475 $layout->render ($para->{indent}, $y - $y0);
3476 $layout->draw;
3101 3477
3102 if (my @w = @{ $para->{widget} }) { 3478 if (my @w = @{ $para->{widget} }) {
3103 my @s = $layout->get_shapes; 3479 my @s = $layout->get_shapes;
3104 3480
3105 for (@w) { 3481 for (@w) {
… …
3143 $self->{children}[1]->draw; 3519 $self->{children}[1]->draw;
3144} 3520}
3145 3521
3146############################################################################# 3522#############################################################################
3147 3523
3148package CFPlus::UI::Animator; 3524package DC::UI::Animator;
3149 3525
3150use CFPlus::OpenGL; 3526use DC::OpenGL;
3151 3527
3152our @ISA = CFPlus::UI::Bin::; 3528our @ISA = DC::UI::Bin::;
3153 3529
3154sub moveto { 3530sub moveto {
3155 my ($self, $x, $y) = @_; 3531 my ($self, $x, $y) = @_;
3156 3532
3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3533 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3185 glPopMatrix; 3561 glPopMatrix;
3186} 3562}
3187 3563
3188############################################################################# 3564#############################################################################
3189 3565
3190package CFPlus::UI::Flopper; 3566package DC::UI::Flopper;
3191 3567
3192our @ISA = CFPlus::UI::Button::; 3568our @ISA = DC::UI::Button::;
3193 3569
3194sub new { 3570sub new {
3195 my $class = shift; 3571 my $class = shift;
3196 3572
3197 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
… …
3209 $self->{other}->toggle_visibility; 3585 $self->{other}->toggle_visibility;
3210} 3586}
3211 3587
3212############################################################################# 3588#############################################################################
3213 3589
3214package CFPlus::UI::Tooltip; 3590package DC::UI::Tooltip;
3215 3591
3216our @ISA = CFPlus::UI::Bin::; 3592our @ISA = DC::UI::Bin::;
3217 3593
3218use CFPlus::OpenGL; 3594use DC::OpenGL;
3219 3595
3220sub new { 3596sub new {
3221 my $class = shift; 3597 my $class = shift;
3222 3598
3223 $class->SUPER::new ( 3599 $class->SUPER::new (
… …
3227} 3603}
3228 3604
3229sub set_tooltip_from { 3605sub set_tooltip_from {
3230 my ($self, $widget) = @_; 3606 my ($self, $widget) = @_;
3231 3607
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
3234
3235 my $tooltip = $widget->{tooltip}; 3608 my $tip = $widget->{tooltip};
3609 $tip = $tip->($widget) if "CODE" eq ref $tip;
3610
3611 $tip = DC::Pod::section_label tooltip => $1
3612 if $tip =~ /^#(.*)$/;
3236 3613
3237 if ($ENV{CFPLUS_DEBUG} & 2) { 3614 if ($ENV{CFPLUS_DEBUG} & 2) {
3238 $tooltip .= "\n\n" . (ref $widget) . "\n" 3615 $tip .= "\n\n" . (ref $widget) . "\n"
3239 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3616 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3240 . "req $widget->{req_w} $widget->{req_h}\n" 3617 . "req $widget->{req_w} $widget->{req_h}\n"
3241 . "visible $widget->{visible}"; 3618 . "visible $widget->{visible}";
3242 } 3619 }
3243 3620
3244 $tooltip =~ s/^\n+//; 3621 $tip =~ s/^\n+//;
3245 $tooltip =~ s/\n+$//; 3622 $tip =~ s/\n+$//;
3246 3623
3247 $self->add (new CFPlus::UI::Label 3624 $self->add (new DC::UI::Label
3248 markup => $tooltip, 3625 markup => $tip,
3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3627 align => 0,
3250 fontsize => 0.8, 3628 fontsize => 0.8,
3251 style => 1, # FLAG_INVERSE 3629 style => 1, # FLAG_INVERSE
3252 ellipsise => 0, 3630 ellipsise => 0,
3253 font => ($widget->{tooltip_font} || $::FONT_PROP), 3631 font => ($widget->{tooltip_font} || $::FONT_PROP),
3254 ); 3632 );
… …
3291} 3669}
3292 3670
3293sub _draw { 3671sub _draw {
3294 my ($self) = @_; 3672 my ($self) = @_;
3295 3673
3296 glTranslate 0.375, 0.375;
3297
3298 my ($w, $h) = @$self{qw(w h)}; 3674 my ($w, $h) = @$self{qw(w h)};
3299 3675
3300 glColor 1, 0.8, 0.4; 3676 glColor 1, 0.8, 0.4;
3301 glBegin GL_QUADS; 3677 glRect 0, 0, $w, $h;
3302 glVertex 0 , 0;
3303 glVertex 0 , $h;
3304 glVertex $w, $h;
3305 glVertex $w, 0;
3306 glEnd;
3307 3678
3308 glColor 0, 0, 0; 3679 glColor 0, 0, 0;
3309 glBegin GL_LINE_LOOP; 3680 glRect_lineloop .5, .5, $w + .5, $h + .5;
3310 glVertex 0 , 0;
3311 glVertex 0 , $h;
3312 glVertex $w, $h;
3313 glVertex $w, 0;
3314 glEnd;
3315 3681
3316 glTranslate 2 - 0.375, 2 - 0.375; 3682 glTranslate 2, 2;
3317 3683
3318 $self->SUPER::_draw; 3684 $self->SUPER::_draw;
3319} 3685}
3320 3686
3321############################################################################# 3687#############################################################################
3322 3688
3323package CFPlus::UI::Face; 3689package DC::UI::Face;
3324 3690
3325our @ISA = CFPlus::UI::DrawBG::; 3691our @ISA = DC::UI::DrawBG::;
3326 3692
3327use CFPlus::OpenGL; 3693use DC::OpenGL;
3328 3694
3329sub new { 3695sub new {
3330 my $class = shift; 3696 my $class = shift;
3331 3697
3332 my $self = $class->SUPER::new ( 3698 my $self = $class->SUPER::new (
3699 size_w => 32,
3700 size_h => 8,
3333 aspect => 1, 3701 aspect => 1,
3334 can_events => 0, 3702 can_events => 0,
3335 @_, 3703 @_,
3336 ); 3704 );
3337 3705
3338 if ($self->{anim} && $self->{animspeed}) { 3706 if ($self->{anim} && $self->{animspeed}) {
3339 CFPlus::weaken (my $widget = $self); 3707 DC::weaken (my $widget = $self);
3340 3708
3341 $self->{timer} = Event->timer ( 3709 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3342 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3710 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3343 hard => 1, 3711 return unless $::CONN;
3344 interval => $self->{animspeed}, 3712
3345 cb => sub { 3713 my $w = $widget
3346 delete $self->{wait_face}; 3714 or return;
3715
3347 ++$widget->{frame}; 3716 ++$w->{frame};
3717 $w->update_face;
3718
3719 # somehow, $widget can go away
3348 $widget->update; 3720 $w->update;
3349 }, 3721 $w->update_timer;
3350 ); 3722 };
3723
3724 $self->update_face;
3725 $self->update_timer;
3351 } 3726 }
3352 3727
3353 $self 3728 $self
3354} 3729}
3355 3730
3731sub update_timer {
3732 my ($self) = @_;
3733
3734 return unless $self->{timer};
3735
3736 if ($self->{visible}) {
3737 $self->{timer}->start;
3738 } else {
3739 $self->{timer}->stop;
3740 }
3741}
3742
3743sub update_face {
3744 my ($self) = @_;
3745
3746 if ($::CONN) {
3747 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3748 if ($anim && @$anim) {
3749 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3750 delete $self->{face_change_cb};
3751
3752 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3753 unless ($tex->{name} || $tex->{loading}) {
3754 $tex->upload (sub { $self->reconfigure });
3755 }
3756 }
3757 }
3758 }
3759 }
3760}
3761
3356sub size_request { 3762sub size_request {
3357 (32, 8) 3763 my ($self) = @_;
3764
3765 if ($::CONN) {
3766 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3767 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3768 if ($tex->{name}) {
3769 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3770 } elsif (!$tex->{loading}) {
3771 $tex->upload (sub { $self->reconfigure });
3772 }
3773 }
3774
3775 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3776 }
3777 }
3778
3779 ($self->{size_w} || 8, $self->{size_h} || 8)
3358} 3780}
3359 3781
3360sub update { 3782sub update {
3361 my ($self) = @_; 3783 my ($self) = @_;
3362 3784
3363 return unless $self->{visible}; 3785 return unless $self->{visible};
3364 3786
3365 $self->SUPER::update; 3787 $self->SUPER::update;
3366} 3788}
3367 3789
3790sub invoke_visibility_change {
3791 my ($self) = @_;
3792
3793 $self->update_timer;
3794
3795 0
3796}
3797
3368sub _draw { 3798sub _draw {
3369 my ($self) = @_; 3799 my ($self) = @_;
3370 3800
3371 return unless $::CONN;
3372
3373 $self->SUPER::_draw; 3801 $self->SUPER::_draw;
3374 3802
3375 my $face; 3803 if (my $tex = $self->{tex}) {
3376
3377 if ($self->{frame}) {
3378 my $anim = $::CONN->{anim}[$self->{anim}];
3379
3380 $face = $anim->[ $self->{frame} % @$anim ]
3381 if $anim && @$anim;
3382 }
3383
3384 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3385 or return;
3386
3387 my $tex = $::CONN->{texture}[$faceid];
3388
3389 if ($tex) {
3390 glEnable GL_TEXTURE_2D; 3804 glEnable GL_TEXTURE_2D;
3391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3805 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3392 glColor 0, 0, 0, 1; 3806 glColor 0, 0, 0, 1;
3393 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3807 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3394 glDisable GL_TEXTURE_2D; 3808 glDisable GL_TEXTURE_2D;
3395 } else {
3396 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3397 $self->update;
3398 });
3399 } 3809 }
3400} 3810}
3401 3811
3402sub destroy { 3812sub destroy {
3403 my ($self) = @_; 3813 my ($self) = @_;
3404 3814
3405 $self->{timer}->cancel 3815 (delete $self->{timer})->cancel
3406 if $self->{timer}; 3816 if $self->{timer};
3407 3817
3408 $self->SUPER::destroy; 3818 $self->SUPER::destroy;
3409} 3819}
3410 3820
3411############################################################################# 3821#############################################################################
3412 3822
3413package CFPlus::UI::Buttonbar; 3823package DC::UI::Buttonbar;
3414 3824
3415our @ISA = CFPlus::UI::HBox::; 3825our @ISA = DC::UI::HBox::;
3416 3826
3417# TODO: should actually wrap buttons and other goodies. 3827# TODO: should actually wrap buttons and other goodies.
3418 3828
3419############################################################################# 3829#############################################################################
3420 3830
3421package CFPlus::UI::Menu; 3831package DC::UI::Menu;
3422 3832
3423our @ISA = CFPlus::UI::Toplevel::; 3833our @ISA = DC::UI::Toplevel::;
3424 3834
3425use CFPlus::OpenGL; 3835use DC::OpenGL;
3426 3836
3427sub new { 3837sub new {
3428 my $class = shift; 3838 my $class = shift;
3429 3839
3430 my $self = $class->SUPER::new ( 3840 my $self = $class->SUPER::new (
3431 items => [], 3841 items => [],
3432 z => 100, 3842 z => 100,
3433 @_, 3843 @_,
3434 ); 3844 );
3435 3845
3436 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3846 $self->add ($self->{vbox} = new DC::UI::VBox);
3437 3847
3438 for my $item (@{ $self->{items} }) { 3848 for my $item (@{ $self->{items} }) {
3439 my ($widget, $cb, $tooltip) = @$item; 3849 my ($widget, $cb, $tooltip) = @$item;
3440 3850
3441 # handle various types of items, only text for now 3851 # handle various types of items, only text for now
3442 if (!ref $widget) { 3852 if (!ref $widget) {
3443 if ($widget =~ /\t/) { 3853 if ($widget =~ /\t/) {
3444 my ($left, $right) = split /\t/, $widget, 2; 3854 my ($left, $right) = split /\t/, $widget, 2;
3445 3855
3446 $widget = new CFPlus::UI::HBox 3856 $widget = new DC::UI::HBox
3447 can_hover => 1, 3857 can_hover => 1,
3448 can_events => 1, 3858 can_events => 1,
3449 tooltip => $tooltip, 3859 tooltip => $tooltip,
3450 children => [ 3860 children => [
3451 (new CFPlus::UI::Label markup => $left, expand => 1), 3861 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3452 (new CFPlus::UI::Label markup => $right, align => +1), 3862 (new DC::UI::Label markup => $right, align => 1),
3453 ], 3863 ],
3454 ; 3864 ;
3455 3865
3456 } else { 3866 } else {
3457 $widget = new CFPlus::UI::Label 3867 $widget = new DC::UI::Label
3458 can_hover => 1, 3868 can_hover => 1,
3459 can_events => 1, 3869 can_events => 1,
3870 align => 0,
3460 markup => $widget, 3871 markup => $widget,
3461 tooltip => $tooltip; 3872 tooltip => $tooltip;
3462 } 3873 }
3463 } 3874 }
3464 3875
… …
3510 1 3921 1
3511} 3922}
3512 3923
3513############################################################################# 3924#############################################################################
3514 3925
3515package CFPlus::UI::Multiplexer; 3926package DC::UI::Multiplexer;
3516 3927
3517our @ISA = CFPlus::UI::Container::; 3928our @ISA = DC::UI::Container::;
3518 3929
3519sub new { 3930sub new {
3520 my $class = shift; 3931 my $class = shift;
3521 3932
3522 my $self = $class->SUPER::new ( 3933 my $self = $class->SUPER::new (
… …
3583 $self->{current}->draw; 3994 $self->{current}->draw;
3584} 3995}
3585 3996
3586############################################################################# 3997#############################################################################
3587 3998
3588package CFPlus::UI::Notebook; 3999package DC::UI::Notebook;
3589 4000
4001use DC::OpenGL;
4002
3590our @ISA = CFPlus::UI::VBox::; 4003our @ISA = DC::UI::VBox::;
3591 4004
3592sub new { 4005sub new {
3593 my $class = shift; 4006 my $class = shift;
3594 4007
3595 my $self = $class->SUPER::new ( 4008 my $self = $class->SUPER::new (
3596 buttonbar => (new CFPlus::UI::Buttonbar), 4009 buttonbar => (new DC::UI::Buttonbar),
3597 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4010 multiplexer => (new DC::UI::Multiplexer expand => 1),
4011 active_outline => [.7, .7, 0.2],
3598 # filter => # will be put between multiplexer and $self 4012 # filter => # will be put between multiplexer and $self
3599 @_, 4013 @_,
3600 ); 4014 );
3601 4015
3602 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4016 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3603 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4017 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3604 4018
4019 {
4020 Scalar::Util::weaken (my $wself = $self);
4021
4022 $self->{multiplexer}->connect (c_add => sub {
4023 my ($mplex, $widgets) = @_;
4024
4025 for my $child (@$widgets) {
4026 Scalar::Util::weaken $child;
4027 $child->{c_tab_} ||= do {
4028 my $tab =
4029 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4030 ? $child->{c_tab}
4031 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4032
4033 $tab->connect (activate => sub {
4034 $wself->set_current_page ($child);
4035 });
4036
4037 $tab
4038 };
4039
4040 $self->{buttonbar}->add ($child->{c_tab_});
4041 }
4042 });
4043
4044 $self->{multiplexer}->connect (c_remove => sub {
4045 my ($mplex, $widgets) = @_;
4046
4047 for my $child (@$widgets) {
4048 $wself->{buttonbar}->remove ($child->{c_tab_});
4049 }
4050 });
4051 }
4052
3605 $self 4053 $self
3606} 4054}
3607 4055
3608sub add { 4056sub add {
4057 my ($self, @widgets) = @_;
4058
4059 $self->{multiplexer}->add (@widgets)
4060}
4061
4062sub remove {
4063 my ($self, @widgets) = @_;
4064
4065 $self->{multiplexer}->remove (@widgets)
4066}
4067
4068sub pages {
4069 my ($self) = @_;
4070 $self->{multiplexer}->children
4071}
4072
4073sub page_index {
4074 my ($self, $widget) = @_;
4075
4076 my $i = 0;
4077 for ($self->pages) {
4078 if ($_ eq $widget) { return $i };
4079 $i++;
4080 }
4081
4082 undef
4083}
4084
4085sub add_tab {
3609 my ($self, $title, $widget, $tooltip) = @_; 4086 my ($self, $title, $widget, $tooltip) = @_;
3610 4087
3611 CFPlus::weaken $self; 4088 $title = [$title, $tooltip] unless ref $title;
4089 $widget->{c_tab} = $title;
3612 4090
3613 $self->{buttonbar}->add (new CFPlus::UI::Button
3614 markup => $title,
3615 tooltip => $tooltip,
3616 on_activate => sub { $self->set_current_page ($widget) },
3617 );
3618
3619 $self->{multiplexer}->add ($widget); 4091 $self->add ($widget);
3620} 4092}
3621 4093
3622sub get_current_page { 4094sub get_current_page {
3623 my ($self) = @_; 4095 my ($self) = @_;
3624 4096
… …
3630 4102
3631 $self->{multiplexer}->set_current_page ($page); 4103 $self->{multiplexer}->set_current_page ($page);
3632 $self->emit (page_changed => $self->{multiplexer}{current}); 4104 $self->emit (page_changed => $self->{multiplexer}{current});
3633} 4105}
3634 4106
4107sub _draw {
4108 my ($self) = @_;
4109
4110 $self->SUPER::_draw ();
4111
4112 if (my $cur = $self->{multiplexer}{current}) {
4113 if ($cur = $cur->{c_tab_}) {
4114 glTranslate $self->{buttonbar}{x} + $cur->{x},
4115 $self->{buttonbar}{y} + $cur->{y};
4116 glLineWidth 3;
4117 #glEnable GL_BLEND;
4118 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4119 glColor @{$self->{active_outline}};
4120 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4121 glLineWidth 1;
4122 #glDisable GL_BLEND;
4123 }
4124 }
4125}
4126
3635############################################################################# 4127#############################################################################
3636 4128
3637package CFPlus::UI::Selector; 4129package DC::UI::Selector;
3638 4130
3639use utf8; 4131use utf8;
3640 4132
3641our @ISA = CFPlus::UI::Button::; 4133our @ISA = DC::UI::Button::;
3642 4134
3643sub new { 4135sub new {
3644 my $class = shift; 4136 my $class = shift;
3645 4137
3646 my $self = $class->SUPER::new ( 4138 my $self = $class->SUPER::new (
… …
3663 my ($value, $title, $tooltip) = @$_; 4155 my ($value, $title, $tooltip) = @$_;
3664 4156
3665 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4157 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3666 } 4158 }
3667 4159
3668 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4160 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3669} 4161}
3670 4162
3671sub _set_value { 4163sub _set_value {
3672 my ($self, $value) = @_; 4164 my ($self, $value) = @_;
3673 4165
3674 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4166 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4167 $item ||= $self->{options}[0]
3675 or return; 4168 or return;
3676 4169
3677 $self->{value} = $item->[0]; 4170 $self->{value} = $item->[0];
3678 $self->set_markup ("$item->[1] ⇓"); 4171 $self->set_markup ("$item->[1] ⇓");
3679 $self->set_tooltip ($item->[2]); 4172# $self->set_tooltip ($item->[2]);
3680} 4173}
3681 4174
3682sub set_value { 4175sub set_value {
3683 my ($self, $value) = @_; 4176 my ($self, $value) = @_;
3684 4177
… …
3686 4179
3687 $self->_set_value ($value); 4180 $self->_set_value ($value);
3688 $self->emit (changed => $value); 4181 $self->emit (changed => $value);
3689} 4182}
3690 4183
4184sub set_options {
4185 my ($self, $options) = @_;
4186
4187 $self->{options} = $options;
4188 $self->_set_value ($self->{value});
4189}
4190
3691############################################################################# 4191#############################################################################
3692 4192
3693package CFPlus::UI::Statusbox; 4193package DC::UI::Statusbox;
3694 4194
3695our @ISA = CFPlus::UI::VBox::; 4195our @ISA = DC::UI::VBox::;
3696 4196
3697sub new { 4197sub new {
3698 my $class = shift; 4198 my $class = shift;
3699 4199
3700 my $self = $class->SUPER::new ( 4200 my $self = $class->SUPER::new (
3701 fontsize => 0.8, 4201 fontsize => 0.8,
3702 @_, 4202 @_,
3703 ); 4203 );
3704 4204
3705 CFPlus::weaken (my $this = $self); 4205 DC::weaken (my $this = $self);
3706 4206
3707 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4207 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3708 4208
3709 $self 4209 $self
3710} 4210}
3711 4211
3712sub reorder { 4212sub reorder {
3713 my ($self) = @_; 4213 my ($self) = @_;
3714 my $NOW = Time::HiRes::time; 4214 my $NOW = Time::HiRes::time;
3715 4215
3716 # freeze display when hovering over any label 4216 # freeze display when hovering over any label
3717 return if $CFPlus::UI::TOOLTIP->{owner} 4217 return if $DC::UI::TOOLTIP->{owner}
3718 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4218 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3719 values %{ $self->{item} }; 4219 values %{ $self->{item} };
3720 4220
3721 while (my ($k, $v) = each %{ $self->{item} }) { 4221 while (my ($k, $v) = each %{ $self->{item} }) {
3722 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4222 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3723 } 4223 }
4224
4225 $self->{timer}->set (1, 1);
3724 4226
3725 my @widgets; 4227 my @widgets;
3726 4228
3727 my @items = sort { 4229 my @items = sort {
3728 $a->{pri} <=> $b->{pri} 4230 $a->{pri} <=> $b->{pri}
3729 or $b->{id} <=> $a->{id} 4231 or $b->{id} <=> $a->{id}
3730 } values %{ $self->{item} }; 4232 } values %{ $self->{item} };
3731
3732 $self->{timer}->interval (1);
3733 4233
3734 my $count = 10 + 1; 4234 my $count = 10 + 1;
3735 for my $item (@items) { 4235 for my $item (@items) {
3736 last unless --$count; 4236 last unless --$count;
3737 4237
… …
3744 for ($short) { 4244 for ($short) {
3745 s/^\s+//; 4245 s/^\s+//;
3746 s/\s+/ /g; 4246 s/\s+/ /g;
3747 } 4247 }
3748 4248
3749 new CFPlus::UI::Label 4249 new DC::UI::Label
3750 markup => $short, 4250 markup => $short,
3751 tooltip => $item->{tooltip}, 4251 tooltip => $item->{tooltip},
3752 tooltip_font => $::FONT_PROP, 4252 tooltip_font => $::FONT_PROP,
3753 tooltip_width => 0.67, 4253 tooltip_width => 0.67,
3754 fontsize => $item->{fontsize} || $self->{fontsize}, 4254 fontsize => $item->{fontsize} || $self->{fontsize},
3755 max_w => $::WIDTH * 0.44, 4255 max_w => $::WIDTH * 0.44,
4256 align => 0,
3756 fg => [@{ $item->{fg} }], 4257 fg => [@{ $item->{fg} }],
3757 can_events => 1, 4258 can_events => 1,
3758 can_hover => 1 4259 can_hover => 1
3759 }; 4260 };
3760 4261
3761 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4262 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3762 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4263 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3763 $label->update; 4264 $label->update;
3764 $label->set_max_size (undef, $label->{req_h} * $diff) 4265 $label->set_max_size (undef, $label->{req_h} * $diff)
3765 if $diff < 1; 4266 if $diff < 1;
3766 $self->{timer}->interval (1/30); 4267 $self->{timer}->set (1/30, 1/30);
3767 } else { 4268 } else {
3768 $label->{fg}[3] = $item->{fg}[3] || 1; 4269 $label->{fg}[3] = $item->{fg}[3] || 1;
3769 } 4270 }
3770 4271
3771 push @widgets, $label; 4272 push @widgets, $label;
… …
3833 $self->SUPER::destroy; 4334 $self->SUPER::destroy;
3834} 4335}
3835 4336
3836############################################################################# 4337#############################################################################
3837 4338
3838package CFPlus::UI::Root; 4339package DC::UI::Root;
3839 4340
3840our @ISA = CFPlus::UI::Container::; 4341our @ISA = DC::UI::Container::;
3841 4342
3842use List::Util qw(min max); 4343use List::Util qw(min max);
3843 4344
3844use CFPlus::OpenGL; 4345use DC::OpenGL;
3845 4346
3846sub new { 4347sub new {
3847 my $class = shift; 4348 my $class = shift;
3848 4349
3849 my $self = $class->SUPER::new ( 4350 my $self = $class->SUPER::new (
3850 visible => 1, 4351 visible => 1,
3851 @_, 4352 @_,
3852 ); 4353 );
3853 4354
3854 CFPlus::weaken ($self->{root} = $self); 4355 DC::weaken ($self->{root} = $self);
3855 4356
3856 $self 4357 $self
3857} 4358}
3858 4359
3859sub size_request { 4360sub size_request {
… …
3907} 4408}
3908 4409
3909sub update { 4410sub update {
3910 my ($self) = @_; 4411 my ($self) = @_;
3911 4412
3912 $::WANT_REFRESH++; 4413 $::WANT_REFRESH = 1;
3913} 4414}
3914 4415
3915sub add { 4416sub add {
3916 my ($self, @children) = @_; 4417 my ($self, @children) = @_;
3917 4418
… …
3954 while ($self->{refresh_hook}) { 4455 while ($self->{refresh_hook}) {
3955 $_->() 4456 $_->()
3956 for values %{delete $self->{refresh_hook}}; 4457 for values %{delete $self->{refresh_hook}};
3957 } 4458 }
3958 4459
3959 if ($self->{realloc}) { 4460 while ($self->{realloc}) {
3960 my %queue; 4461 my %queue;
3961 my @queue; 4462 my @queue;
3962 my $widget; 4463 my $widget;
3963 4464
3964 outer: 4465 outer:
… …
3984 4485
3985 delete $queue{$widget+0}; 4486 delete $queue{$widget+0};
3986 4487
3987 my ($w, $h) = $widget->size_request; 4488 my ($w, $h) = $widget->size_request;
3988 4489
3989 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4490 $w += $widget->{padding_x} * 2;
3990 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4491 $h += $widget->{padding_y} * 2;
4492
4493 $w = max $widget->{min_w}, $w;
4494 $h = max $widget->{min_h}, $h;
3991 4495
3992 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4496 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3993 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4497 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3994 4498
3995 $w = $widget->{force_w} if exists $widget->{force_w}; 4499 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4011 } 4515 }
4012 } 4516 }
4013 4517
4014 delete $self->{realloc}{$widget+0}; 4518 delete $self->{realloc}{$widget+0};
4015 } 4519 }
4016 }
4017 4520
4018 while (my $size_alloc = delete $self->{size_alloc}) { 4521 while (my $size_alloc = delete $self->{size_alloc}) {
4019 my @queue = sort { $b->{visible} <=> $a->{visible} } 4522 my @queue = sort { $a->{visible} <=> $b->{visible} }
4020 values %$size_alloc; 4523 values %$size_alloc;
4021 4524
4022 while () { 4525 while () {
4023 my $widget = pop @queue || last; 4526 my $widget = pop @queue || last;
4024 4527
4025 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4528 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4026 4529
4027 $w = 0 if $w < 0;
4028 $h = 0 if $h < 0;
4029
4030 $w = max $widget->{min_w}, $w; 4530 $w = max $widget->{min_w}, $w;
4031 $h = max $widget->{min_h}, $h; 4531 $h = max $widget->{min_h}, $h;
4032 4532
4033# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4533# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4034# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4534# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4035 4535
4036 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4536 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4037 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4537 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4038 4538
4039 $w = int $w + 0.5; 4539 $w = int $w + 0.5;
4040 $h = int $h + 0.5; 4540 $h = int $h + 0.5;
4041 4541
4042 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4542 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4043 $widget->{old_w} = $widget->{w}; 4543 $widget->{old_w} = $widget->{w};
4044 $widget->{old_h} = $widget->{h}; 4544 $widget->{old_h} = $widget->{h};
4045 4545
4046 $widget->{w} = $w; 4546 $widget->{w} = $w;
4047 $widget->{h} = $h; 4547 $widget->{h} = $h;
4048 4548
4049 $widget->emit (size_allocate => $w, $h); 4549 $widget->emit (size_allocate => $w, $h);
4550 }
4050 } 4551 }
4051 } 4552 }
4052 } 4553 }
4053 4554
4054 while ($self->{post_alloc_hook}) { 4555 while ($self->{post_alloc_hook}) {
4055 $_->() 4556 $_->()
4056 for values %{delete $self->{post_alloc_hook}}; 4557 for values %{delete $self->{post_alloc_hook}};
4057 } 4558 }
4058
4059 4559
4060 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4560 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4061 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4561 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4062 glClear GL_COLOR_BUFFER_BIT; 4562 glClear GL_COLOR_BUFFER_BIT;
4063 4563
… …
4066 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4566 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4067 glMatrixMode GL_MODELVIEW; 4567 glMatrixMode GL_MODELVIEW;
4068 glLoadIdentity; 4568 glLoadIdentity;
4069 4569
4070 { 4570 {
4071 package CFPlus::UI::Base; 4571 package DC::UI::Base;
4072 4572
4073 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4573 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4074 (0, 0, $self->{w}, $self->{h}); 4574 (0, 0, $self->{w}, $self->{h});
4075 4575
4076 $self->_draw; 4576 $self->_draw;
4077 } 4577 }
4078} 4578}
4079 4579
4080############################################################################# 4580#############################################################################
4081 4581
4082package CFPlus::UI; 4582package DC::UI;
4083 4583
4084$ROOT = new CFPlus::UI::Root; 4584$ROOT = new DC::UI::Root;
4085$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4585$TOOLTIP = new DC::UI::Tooltip z => 900;
4086 4586
40871 45871
4088 4588

Diff Legend

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