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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.411 by root, Sun Jul 22 19:34:59 2007 UTC vs.
Revision 1.471 by elmex, Sun Dec 7 21:26:16 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 my $delta = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT; 116 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
120 117
121 $ev->{dx} = $shift ? $delta : 0; 118 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta; 119 $ev->{dy} = $shift ? 0 : $delta;
123 120
124 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
142 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
143 $grab->update if $grab; 140 $grab->update if $grab;
144 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
145 142
146 check_hover $widget; 143 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
148 } 145 }
149} 146}
150 147
151sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
152 my ($ev) = @_; 149 my ($ev) = @_;
214 reconfigure_widgets; 211 reconfigure_widgets;
215} 212}
216 213
217############################################################################# 214#############################################################################
218 215
219package CFPlus::UI::Event; 216package DC::UI::Event;
220 217
221sub xy { 218sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223} 220}
224 221
225############################################################################# 222#############################################################################
226 223
227package CFPlus::UI::Base; 224package DC::UI::Base;
228 225
229use strict; 226use strict;
230 227
231use CFPlus::OpenGL; 228use DC::OpenGL;
232 229
233sub new { 230sub new {
234 my $class = shift; 231 my $class = shift;
235 232
236 my $self = bless { 233 my $self = bless {
241 h => undef, 238 h => undef,
242 can_events => 1, 239 can_events => 1,
243 @_ 240 @_
244 }, $class; 241 }, $class;
245 242
246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 243 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
247 244
248 for (keys %$self) { 245 for (keys %$self) {
249 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
250 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
251 } 248 }
252 } 249 }
253 250
254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
255 $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};
256 $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};
257 $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};
258 $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};
259 256
260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262 259
263 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
273 $self->emit ("destroy"); 270 $self->emit ("destroy");
274 %$self = (); 271 %$self = ();
275} 272}
276 273
277sub TO_JSON { 274sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 275 { "\fw" => $_[0]{s_id} }
279} 276}
280 277
281sub show { 278sub show {
282 my ($self) = @_; 279 my ($self) = @_;
283 280
284 return if $self->{parent}; 281 return if $self->{parent};
285 282
286 $CFPlus::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
287} 284}
288 285
289sub set_visible { 286sub set_visible {
290 my ($self) = @_; 287 my ($self) = @_;
291 288
296 293
297 $self->emit (visibility_change => 1); 294 $self->emit (visibility_change => 1);
298 295
299 $self->realloc if !exists $self->{req_w}; 296 $self->realloc if !exists $self->{req_w};
300 297
301 $_->set_visible for $self->children; 298 $_->set_visible for $self->visible_children;
302} 299}
303 300
304sub set_invisible { 301sub set_invisible {
305 my ($self) = @_; 302 my ($self) = @_;
306 303
312 delete $self->{root}; 309 delete $self->{root};
313 310
314 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
315 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
316 313
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $DC::UI::TOOLTIP_WATCHER->invoke
318 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
319 316
320 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
322} 319}
341sub hide { 338sub hide {
342 my ($self) = @_; 339 my ($self) = @_;
343 340
344 $self->set_invisible; 341 $self->set_invisible;
345 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
346 $self->{parent}->remove ($self) 346 $parent->remove ($self);
347 if $self->{parent}; 347 }
348} 348}
349 349
350sub move_abs { 350sub move_abs {
351 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
352 352
364 $self->{force_h} = $h; 364 $self->{force_h} = $h;
365 365
366 $self->realloc; 366 $self->realloc;
367} 367}
368 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
369sub size_request { 387sub size_request {
370 require Carp; 388 require Carp;
371 Carp::confess "size_request is abstract"; 389 Carp::confess "size_request is abstract";
372} 390}
373 391
379 my ($self, $x, $y, $w, $h) = @_; 397 my ($self, $x, $y, $w, $h) = @_;
380 398
381 if ($self->{aspect}) { 399 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h); 400 my ($ow, $oh) = ($w, $h);
383 401
384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 402 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 403 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386 404
387 # use alignment to adjust x, y 405 # use alignment to adjust x, y
388 406
389 $x += int 0.5 * ($ow - $w); 407 $x += int 0.5 * ($ow - $w);
390 $y += int 0.5 * ($oh - $h); 408 $y += int 0.5 * ($oh - $h);
431 449
432 return if $self->{tooltip} eq $tooltip; 450 return if $self->{tooltip} eq $tooltip;
433 451
434 $self->{tooltip} = $tooltip; 452 $self->{tooltip} = $tooltip;
435 453
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 454 if ($DC::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 455 delete $DC::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 456 $DC::UI::TOOLTIP_WATCHER->invoke;
439 } 457 }
440} 458}
441 459
442# translate global coordinates to local coordinate system 460# translate global coordinates to local coordinate system
443sub coord2local { 461sub coord2local {
444 my ($self, $x, $y) = @_; 462 my ($self, $x, $y) = @_;
445 463
446 Carp::confess unless $self->{parent};#d# 464 return (undef, undef) unless $self->{parent};
447 465
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 466 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 467}
450 468
451# translate local coordinates to global coordinate system 469# translate local coordinates to global coordinate system
452sub coord2global { 470sub coord2global {
453 my ($self, $x, $y) = @_; 471 my ($self, $x, $y) = @_;
454 472
455 Carp::confess unless $self->{parent};#d# 473 return (undef, undef) unless $self->{parent};
456 474
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 475 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 476}
459 477
460sub invoke_focus_in { 478sub invoke_focus_in {
509sub connect { 527sub connect {
510 my ($self, $signal, $cb) = @_; 528 my ($self, $signal, $cb) = @_;
511 529
512 push @{ $self->{signal_cb}{$signal} }, $cb; 530 push @{ $self->{signal_cb}{$signal} }, $cb;
513 531
514 defined wantarray and CFPlus::guard { 532 defined wantarray and DC::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 533 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} }; 534 @{ $self->{signal_cb}{$signal} };
517 } 535 }
518} 536}
519 537
557# in .xs 575# in .xs
558 576
559sub set_parent { 577sub set_parent {
560 my ($self, $parent) = @_; 578 my ($self, $parent) = @_;
561 579
562 CFPlus::weaken ($self->{parent} = $parent); 580 DC::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 581 $self->set_visible if $parent->{visible};
564} 582}
565 583
566sub realloc { 584sub realloc {
567 my ($self) = @_; 585 my ($self) = @_;
605} 623}
606 624
607sub DESTROY { 625sub DESTROY {
608 my ($self) = @_; 626 my ($self) = @_;
609 627
610 return if CFPlus::in_destruct; 628 return if DC::in_destruct;
611 629
630 local $@;
612 eval { $self->destroy }; 631 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 632 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 633
615 delete $WIDGET{$self+0}; 634 delete $WIDGET{$self+0};
616} 635}
617 636
618############################################################################# 637#############################################################################
619 638
620package CFPlus::UI::DrawBG; 639package DC::UI::DrawBG;
621 640
622our @ISA = CFPlus::UI::Base::; 641our @ISA = DC::UI::Base::;
623 642
624use strict; 643use strict;
625use CFPlus::OpenGL; 644use DC::OpenGL;
626 645
627sub new { 646sub new {
628 my $class = shift; 647 my $class = shift;
629
630 # range [value, low, high, page]
631 648
632 $class->SUPER::new ( 649 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 650 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 651 #active_bg => [1, 1, 1, 0.5],
635 @_ 652 @_
647 my ($w, $h) = @$self{qw(w h)}; 664 my ($w, $h) = @$self{qw(w h)};
648 665
649 glEnable GL_BLEND; 666 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 667 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 668 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 669 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 670 glDisable GL_BLEND;
661 } 671 }
662} 672}
663 673
664############################################################################# 674#############################################################################
665 675
666package CFPlus::UI::Empty; 676package DC::UI::Empty;
667 677
668our @ISA = CFPlus::UI::Base::; 678our @ISA = DC::UI::Base::;
669 679
670sub new { 680sub new {
671 my ($class, %arg) = @_; 681 my ($class, %arg) = @_;
672 $class->SUPER::new (can_events => 0, %arg); 682 $class->SUPER::new (can_events => 0, %arg);
673} 683}
680 690
681sub draw { } 691sub draw { }
682 692
683############################################################################# 693#############################################################################
684 694
685package CFPlus::UI::Container; 695package DC::UI::Container;
686 696
687our @ISA = CFPlus::UI::Base::; 697our @ISA = DC::UI::Base::;
688 698
689sub new { 699sub new {
690 my ($class, %arg) = @_; 700 my ($class, %arg) = @_;
691 701
692 my $children = delete $arg{children}; 702 my $children = delete $arg{children};
725 @{$self->{children}}, @widgets 735 @{$self->{children}}, @widgets
726 ]; 736 ];
727 737
728 $self->realloc; 738 $self->realloc;
729 739
740 $self->emit (c_add => \@widgets);
741
730 map $_+0, @widgets 742 map $_+0, @widgets
731} 743}
732 744
733sub children { 745sub children {
734 @{ $_[0]{children} } 746 @{ $_[0]{children} }
735} 747}
736 748
737sub remove { 749sub remove {
738 my ($self, $child) = @_; 750 my ($self, @widgets) = @_;
739 751
752 $self->emit (c_remove => \@widgets);
753
754 for my $child (@widgets) {
740 delete $child->{parent}; 755 delete $child->{parent};
741 $child->hide; 756 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 757 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
758 }
744 759
745 $self->realloc; 760 $self->realloc;
746} 761}
747 762
748sub clear { 763sub clear {
776} 791}
777 792
778sub _draw { 793sub _draw {
779 my ($self) = @_; 794 my ($self) = @_;
780 795
781 $_->draw for @{$self->{children}}; 796 $_->draw for $self->visible_children;
782} 797}
783 798
784############################################################################# 799#############################################################################
785 800
786package CFPlus::UI::Bin; 801package DC::UI::Bin;
787 802
788our @ISA = CFPlus::UI::Container::; 803our @ISA = DC::UI::Container::;
789 804
790sub new { 805sub new {
791 my ($class, %arg) = @_; 806 my ($class, %arg) = @_;
792 807
793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 808 my $child = (delete $arg{child}) || new DC::UI::Empty::;
794 809
795 $class->SUPER::new (children => [$child], %arg) 810 $class->SUPER::new (children => [$child], %arg)
796} 811}
797 812
798sub add { 813sub add {
799 my ($self, $child) = @_; 814 my ($self, $child) = @_;
800 815
801 $self->SUPER::remove ($_) for @{ $self->{children} }; 816 $self->clear;
802 $self->SUPER::add ($child); 817 $self->SUPER::add ($child);
803} 818}
804 819
805sub remove { 820sub remove {
806 my ($self, $widget) = @_; 821 my ($self, $widget) = @_;
807 822
808 $self->SUPER::remove ($widget); 823 $self->SUPER::remove ($widget);
809 824
810 $self->{children} = [new CFPlus::UI::Empty] 825 $self->{children} = [new DC::UI::Empty]
811 unless @{$self->{children}}; 826 unless @{$self->{children}};
812} 827}
813 828
814sub child { $_[0]->{children}[0] } 829sub child { $_[0]->{children}[0] }
815 830
824 839
825 1 840 1
826} 841}
827 842
828############################################################################# 843#############################################################################
829
830# back-buffered drawing area 844# back-buffered drawing area
831 845
832package CFPlus::UI::Window; 846package DC::UI::Window;
833 847
834our @ISA = CFPlus::UI::Bin::; 848our @ISA = DC::UI::Bin::;
835 849
836use CFPlus::OpenGL; 850use DC::OpenGL;
837 851
838sub new { 852sub new {
839 my ($class, %arg) = @_; 853 my ($class, %arg) = @_;
840 854
841 my $self = $class->SUPER::new (%arg); 855 my $self = $class->SUPER::new (%arg);
863} 877}
864 878
865sub render_child { 879sub render_child {
866 my ($self) = @_; 880 my ($self) = @_;
867 881
868 $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 {
869 glClearColor 0, 0, 0, 0; 883 glClearColor 0, 0, 0, 0;
870 glClear GL_COLOR_BUFFER_BIT; 884 glClear GL_COLOR_BUFFER_BIT;
871 885
872 { 886 {
873 package CFPlus::UI::Base; 887 package DC::UI::Base;
874 888
875 local ($draw_x, $draw_y, $draw_w, $draw_h) = 889 local ($draw_x, $draw_y, $draw_w, $draw_h) =
876 (0, 0, $self->{w}, $self->{h}); 890 (0, 0, $self->{w}, $self->{h});
877 891
878 $self->_render; 892 $self->_render;
895 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
896} 910}
897 911
898############################################################################# 912#############################################################################
899 913
900package CFPlus::UI::ViewPort; 914package DC::UI::ViewPort;
901 915
902use List::Util qw(min max); 916use List::Util qw(min max);
903 917
904our @ISA = CFPlus::UI::Window::; 918our @ISA = DC::UI::Window::;
905 919
906sub new { 920sub new {
907 my $class = shift; 921 my $class = shift;
908 922
909 $class->SUPER::new ( 923 $class->SUPER::new (
951 $self->emit (changed => $x, $y); 965 $self->emit (changed => $x, $y);
952 $self->update; 966 $self->update;
953 } 967 }
954} 968}
955 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 }
986}
987
956# 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
957sub coord2local { 989sub coord2local {
958 my ($self, $x, $y) = @_; 990 my ($self, $x, $y) = @_;
959 991
960 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 992 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
976 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
977 ) { 1009 ) {
978 $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})
979 } else { 1011 } else {
980 $self->CFPlus::UI::Base::find_widget ($x, $y) 1012 $self->DC::UI::Base::find_widget ($x, $y)
981 } 1013 }
982} 1014}
983 1015
984sub _render { 1016sub _render {
985 my ($self) = @_; 1017 my ($self) = @_;
986 1018
987 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};
988 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};
989 1021
990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
991 1023
992 $self->SUPER::_render; 1024 $self->SUPER::_render;
993} 1025}
994 1026
995############################################################################# 1027#############################################################################
996 1028
997package CFPlus::UI::ScrolledWindow; 1029package DC::UI::ScrolledWindow;
998 1030
999our @ISA = CFPlus::UI::Table::; 1031our @ISA = DC::UI::Table::;
1000 1032
1001sub new { 1033sub new {
1002 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
1003 1035
1004 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
1005 1037
1006 my $self; 1038 my $self;
1007 1039
1008 my $hslider = new CFPlus::UI::Slider 1040 my $hslider = new DC::UI::Slider
1009 col => 0, 1041 c_col => 0,
1010 row => 1, 1042 c_row => 1,
1011 vertical => 0, 1043 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix 1044 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub { 1045 on_changed => sub {
1014 $self->{hpos} = $_[1]; 1046 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 }, 1048 },
1017 ; 1049 ;
1018 1050
1019 my $vslider = new CFPlus::UI::Slider 1051 my $vslider = new DC::UI::Slider
1020 col => 1, 1052 c_col => 1,
1021 row => 0, 1053 c_row => 0,
1022 vertical => 1, 1054 vertical => 1,
1023 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub { 1056 on_changed => sub {
1025 $self->{vpos} = $_[1]; 1057 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1036 col_expand => [1, 0], 1068 col_expand => [1, 0],
1037 row_expand => [1, 0], 1069 row_expand => [1, 0],
1038 %arg, 1070 %arg,
1039 ); 1071 );
1040 1072
1041 $self->{vp} = new CFPlus::UI::ViewPort 1073 $self->{vp} = new DC::UI::ViewPort
1042 col => 0, 1074 c_col => 0,
1043 row => 0, 1075 c_row => 0,
1044 expand => 1, 1076 expand => 1,
1045 scroll_x => $self->{scroll_x}, 1077 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y}, 1078 scroll_y => $self->{scroll_y},
1047 on_changed => sub { 1079 on_changed => sub {
1048 my ($vp, $x, $y) = @_; 1080 my ($vp, $x, $y) = @_;
1070 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
1071 1103
1072 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
1073} 1105}
1074 1106
1107sub set_offset { shift->{vp}->set_offset (@_) }
1108sub set_center { shift->{vp}->set_center (@_) }
1109sub make_visible { shift->{vp}->make_visible (@_) }
1110
1075sub update_slider { 1111sub update_slider {
1076 my ($self) = @_; 1112 my ($self) = @_;
1077 1113
1078 my $child = ($self->{vp} or return)->child; 1114 my $child = ($self->{vp} or return)->child;
1079 1115
1168 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1169} 1205}
1170 1206
1171############################################################################# 1207#############################################################################
1172 1208
1173package CFPlus::UI::Frame; 1209package DC::UI::Frame;
1174 1210
1175our @ISA = CFPlus::UI::Bin::; 1211our @ISA = DC::UI::Bin::;
1176 1212
1177use CFPlus::OpenGL; 1213use DC::OpenGL;
1178 1214
1179sub new { 1215sub new {
1180 my $class = shift; 1216 my $class = shift;
1181 1217
1182 $class->SUPER::new ( 1218 $class->SUPER::new (
1192 my ($w, $h) = @$self{qw(w h)}; 1228 my ($w, $h) = @$self{qw(w h)};
1193 1229
1194 glEnable GL_BLEND; 1230 glEnable GL_BLEND;
1195 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196 glColor_premultiply @{ $self->{bg} }; 1232 glColor_premultiply @{ $self->{bg} };
1197
1198 glBegin GL_QUADS;
1199 glVertex 0 , 0;
1200 glVertex 0 , $h;
1201 glVertex $w, $h; 1233 glRect 0, 0, $w, $h;
1202 glVertex $w, 0;
1203 glEnd;
1204
1205 glDisable GL_BLEND; 1234 glDisable GL_BLEND;
1206 } 1235 }
1207 1236
1208 $self->SUPER::_draw; 1237 $self->SUPER::_draw;
1209} 1238}
1210 1239
1211############################################################################# 1240#############################################################################
1212 1241
1213package CFPlus::UI::FancyFrame; 1242package DC::UI::FancyFrame;
1214 1243
1215our @ISA = CFPlus::UI::Bin::; 1244our @ISA = DC::UI::Bin::;
1216 1245
1217use CFPlus::OpenGL; 1246use DC::OpenGL;
1218 1247
1219sub new { 1248sub new {
1220 my ($class, %arg) = @_; 1249 my ($class, %arg) = @_;
1221 1250
1222 if ((exists $arg{label}) && !ref $arg{label}) { 1251 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label 1252 $arg{label} = new DC::UI::Label
1224 align => 1, 1253 align => 1,
1225 valign => 0, 1254 valign => 0.5,
1226 text => $arg{label}, 1255 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75; 1256 fontsize => ($arg{border} || 0.8) * 0.75;
1228 } 1257 }
1229 1258
1230 my $self = $class->SUPER::new ( 1259 my $self = $class->SUPER::new (
1231 # label => "", 1260 # label => "",
1232 fg => [0.6, 0.3, 0.1], 1261 fg => undef,
1233 border => 0.8, 1262 border => 0.8,
1234 style => 'single', 1263 style => 'single',
1235 %arg, 1264 %arg,
1236 ); 1265 );
1237 1266
1240 1269
1241sub add { 1270sub add {
1242 my ($self, @widgets) = @_; 1271 my ($self, @widgets) = @_;
1243 1272
1244 $self->SUPER::add (@widgets); 1273 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1274 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1246} 1275}
1247 1276
1248sub border { 1277sub border {
1249 int $_[0]{border} * $::FONTSIZE 1278 int $_[0]{border} * $::FONTSIZE
1250} 1279}
1290 my $border = $self->border; 1319 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h}); 1320 my ($w, $h) = ($self->{w}, $self->{h});
1292 1321
1293 $child->draw; 1322 $child->draw;
1294 1323
1295 glColor @{$self->{fg}}; 1324 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1296 glBegin GL_LINE_STRIP; 1325 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1326 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1327 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1328 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1329 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1308 } 1337 }
1309} 1338}
1310 1339
1311############################################################################# 1340#############################################################################
1312 1341
1313package CFPlus::UI::Toplevel; 1342package DC::UI::Toplevel;
1314 1343
1315our @ISA = CFPlus::UI::Bin::; 1344our @ISA = DC::UI::Bin::;
1316 1345
1317use CFPlus::OpenGL; 1346use DC::OpenGL;
1318 1347
1319my $bg = 1348my $bg =
1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1349 new_from_resource DC::Texture "d1_bg.png",
1321 mipmap => 1, wrap => 1; 1350 mipmap => 1, wrap => 1;
1322 1351
1323my @border = 1352my @border =
1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1353 map { new_from_resource DC::Texture $_, mipmap => 1 }
1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1354 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326 1355
1327my @icon = 1356my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1357 map { new_from_resource DC::Texture $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png); 1358 qw(x1_move.png x1_resize.png);
1330 1359
1331sub new { 1360sub new {
1332 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1333 1362
1334 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
1335 bg => [1, 1, 1, 1], 1364 bg => [1, 1, 1, 1],
1336 border_bg => [1, 1, 1, 1], 1365 border_bg => [1, 1, 1, 1],
1337 border => 0.6, 1366 border => 0.8,
1338 can_events => 1, 1367 can_events => 1,
1339 min_w => 64, 1368 min_w => 64,
1340 min_h => 32, 1369 min_h => 32,
1341 %arg, 1370 %arg,
1342 ); 1371 );
1343 1372
1344 $self->{title_widget} = new CFPlus::UI::Label 1373 $self->{title_widget} = new DC::UI::Label
1345 align => 0, 1374 align => 0.5,
1346 valign => 1, 1375 valign => 1,
1347 text => $self->{title}, 1376 text => $self->{title},
1348 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1349 if exists $self->{title}; 1378 if exists $self->{title};
1350 1379
1351 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1352 $self->{close_button} = 1381 $self->{close_button} =
1353 new CFPlus::UI::ImageButton 1382 new DC::UI::ImageButton
1354 path => 'x1_close.png', 1383 path => 'x1_close.png',
1355 on_activate => sub { $self->emit ("delete") }; 1384 on_activate => sub { $self->emit ("delete") };
1356 1385
1357 $self->CFPlus::UI::Container::add ($self->{close_button}); 1386 $self->DC::UI::Container::add ($self->{close_button});
1358 } 1387 }
1359 1388
1360 $self 1389 $self
1361} 1390}
1362 1391
1363sub add { 1392sub add {
1364 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1365 1394
1366 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1367 $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};
1368 $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};
1369} 1398}
1370 1399
1371sub border { 1400sub border {
1372 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
1373} 1411}
1374 1412
1375sub size_request { 1413sub size_request {
1376 my ($self) = @_; 1414 my ($self) = @_;
1377 1415
1549 if $self->{close_button}; 1587 if $self->{close_button};
1550} 1588}
1551 1589
1552############################################################################# 1590#############################################################################
1553 1591
1554package CFPlus::UI::Table; 1592package DC::UI::Table;
1555 1593
1556our @ISA = CFPlus::UI::Container::; 1594our @ISA = DC::UI::Container::;
1557 1595
1558use List::Util qw(max sum); 1596use List::Util qw(max sum);
1559 1597
1560use CFPlus::OpenGL; 1598use DC::OpenGL;
1561 1599
1562sub new { 1600sub new {
1563 my $class = shift; 1601 my $class = shift;
1564 1602
1565 $class->SUPER::new ( 1603 $class->SUPER::new (
1571 1609
1572sub add { 1610sub add {
1573 my ($self, @widgets) = @_; 1611 my ($self, @widgets) = @_;
1574 1612
1575 for my $child (@widgets) { 1613 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1; 1614 $child->{c_rowspan} ||= 1;
1577 $child->{colspan} ||= 1; 1615 $child->{c_colspan} ||= 1;
1578 } 1616 }
1579 1617
1580 $self->SUPER::add (@widgets); 1618 $self->SUPER::add (@widgets);
1581} 1619}
1582 1620
1586 my @widgets; 1624 my @widgets;
1587 1625
1588 while (@_) { 1626 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, (); 1627 my ($col, $row, $child) = splice @_, 0, 3, ();
1590 1628
1591 $child->{row} = $row; 1629 $child->{c_row} = $row;
1592 $child->{col} = $col; 1630 $child->{c_col} = $col;
1593 1631
1594 push @widgets, $child; 1632 push @widgets, $child;
1595 } 1633 }
1596 1634
1597 $self->add (@widgets); 1635 $self->add (@widgets);
1603 my (@w, @h); 1641 my (@w, @h);
1604 1642
1605 my @children = $self->children; 1643 my @children = $self->children;
1606 1644
1607 # first pass, columns 1645 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1646 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1647 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610 1648
1611 my $sw = sum @w[$c .. $c + $cs - 1]; 1649 my $sw = sum @w[$c .. $c + $cs - 1];
1612 1650
1613 if ($w > $sw) { 1651 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1652 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 } 1653 }
1616 } 1654 }
1617 1655
1618 # second pass, rows 1656 # second pass, rows
1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1657 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1658 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621 1659
1622 my $sh = sum @h[$r .. $r + $rs - 1]; 1660 my $sh = sum @h[$r .. $r + $rs - 1];
1623 1661
1624 if ($h > $sh) { 1662 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1663 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1626 } 1664 }
1627 } 1665 }
1628 1666
1629 (\@w, \@h) 1667 (\@w, \@h)
1630} 1668}
1653 @col_expand = (1) x @$ws unless @col_expand; 1691 @col_expand = (1) x @$ws unless @col_expand;
1654 my $col_expand = (sum @col_expand) || 1; 1692 my $col_expand = (sum @col_expand) || 1;
1655 1693
1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1694 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1657 1695
1658 CFPlus::UI::harmonize $ws; 1696 DC::UI::harmonize $ws;
1659 1697
1660 my @row_expand = @{$self->{row_expand}}; 1698 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand; 1699 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1; 1700 my $row_expand = (sum @row_expand) || 1;
1663 1701
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1702 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665 1703
1666 CFPlus::UI::harmonize $hs; 1704 DC::UI::harmonize $hs;
1667 1705
1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1706 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1707 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670 1708
1671 for my $widget ($self->children) { 1709 for my $widget ($self->children) {
1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1710 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673 1711
1674 $widget->configure ( 1712 $widget->configure (
1675 $x[$c], $y[$r], 1713 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1714 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677 ); 1715 );
1680 1 1718 1
1681} 1719}
1682 1720
1683############################################################################# 1721#############################################################################
1684 1722
1685package CFPlus::UI::Fixed; 1723package DC::UI::Fixed;
1686 1724
1687use List::Util qw(min max); 1725use List::Util qw(min max);
1688 1726
1689our @ISA = CFPlus::UI::Container::; 1727our @ISA = DC::UI::Container::;
1690 1728
1691sub _scale($$$) { 1729sub _scale($$$) {
1692 my ($rel, $val, $max) = @_; 1730 my ($rel, $val, $max) = @_;
1693 1731
1694 $rel ? $val * $max : $val 1732 $rel ? $val * $max : $val
1738 my $y = _scale $child->{c_rel}, $child->{c_y}, $H; 1776 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1739 1777
1740 $x += $child->{c_halign} * $child->{req_w}; 1778 $x += $child->{c_halign} * $child->{req_w};
1741 $y += $child->{c_valign} * $child->{req_h}; 1779 $y += $child->{c_valign} * $child->{req_h};
1742 1780
1743 $child->configure ($x, $y, $child->{req_w}, $child->{req_h}); 1781 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1744 } 1782 }
1745 1783
1746 1 1784 1
1747} 1785}
1748 1786
1749############################################################################# 1787#############################################################################
1750 1788
1751package CFPlus::UI::Box; 1789package DC::UI::Box;
1752 1790
1753our @ISA = CFPlus::UI::Container::; 1791our @ISA = DC::UI::Container::;
1754 1792
1755sub size_request { 1793sub size_request {
1756 my ($self) = @_; 1794 my ($self) = @_;
1795
1796 my @children = $self->visible_children;
1757 1797
1758 $self->{vertical} 1798 $self->{vertical}
1759 ? ( 1799 ? (
1760 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1800 (List::Util::max map $_->{req_w}, @children),
1761 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1801 (List::Util::sum map $_->{req_h}, @children),
1762 ) 1802 )
1763 : ( 1803 : (
1764 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_w}, @children),
1765 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1805 (List::Util::max map $_->{req_h}, @children),
1766 ) 1806 )
1767} 1807}
1768 1808
1769sub invoke_size_allocate { 1809sub invoke_size_allocate {
1770 my ($self, $w, $h) = @_; 1810 my ($self, $w, $h) = @_;
1791 $req[$_] += $space * $children[$_]{expand} 1831 $req[$_] += $space * $children[$_]{expand}
1792 for 0 .. $#children; 1832 for 0 .. $#children;
1793 } 1833 }
1794 } 1834 }
1795 1835
1796 CFPlus::UI::harmonize \@req; 1836 DC::UI::harmonize \@req;
1797 1837
1798 my $pos = 0; 1838 my $pos = 0;
1799 for (0 .. $#children) { 1839 for (0 .. $#children) {
1800 my $alloc = $req[$_]; 1840 my $alloc = $req[$_];
1801 $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));
1806 1 1846 1
1807} 1847}
1808 1848
1809############################################################################# 1849#############################################################################
1810 1850
1811package CFPlus::UI::HBox; 1851package DC::UI::HBox;
1812 1852
1813our @ISA = CFPlus::UI::Box::; 1853our @ISA = DC::UI::Box::;
1814 1854
1815sub new { 1855sub new {
1816 my $class = shift; 1856 my $class = shift;
1817 1857
1818 $class->SUPER::new ( 1858 $class->SUPER::new (
1821 ) 1861 )
1822} 1862}
1823 1863
1824############################################################################# 1864#############################################################################
1825 1865
1826package CFPlus::UI::VBox; 1866package DC::UI::VBox;
1827 1867
1828our @ISA = CFPlus::UI::Box::; 1868our @ISA = DC::UI::Box::;
1829 1869
1830sub new { 1870sub new {
1831 my $class = shift; 1871 my $class = shift;
1832 1872
1833 $class->SUPER::new ( 1873 $class->SUPER::new (
1836 ) 1876 )
1837} 1877}
1838 1878
1839############################################################################# 1879#############################################################################
1840 1880
1841package CFPlus::UI::Label; 1881package DC::UI::Label;
1842 1882
1843our @ISA = CFPlus::UI::DrawBG::; 1883our @ISA = DC::UI::DrawBG::;
1844 1884
1845use CFPlus::OpenGL; 1885use DC::OpenGL;
1846 1886
1847sub new { 1887sub new {
1848 my ($class, %arg) = @_; 1888 my ($class, %arg) = @_;
1849 1889
1850 my $self = $class->SUPER::new ( 1890 my $self = $class->SUPER::new (
1855 #text => initial text 1895 #text => initial text
1856 #markup => initial narkup 1896 #markup => initial narkup
1857 #max_w => maximum pixel width 1897 #max_w => maximum pixel width
1858 #style => 0, # render flags 1898 #style => 0, # render flags
1859 ellipsise => 3, # end 1899 ellipsise => 3, # end
1860 layout => (new CFPlus::Layout), 1900 layout => (new DC::Layout),
1861 fontsize => 1, 1901 fontsize => 1,
1862 align => -1, 1902 align => 0.5,
1863 valign => -1, 1903 valign => 0.5,
1864 padding_x => 2, 1904 padding_x => 4,
1865 padding_y => 2, 1905 padding_y => 2,
1866 can_events => 0, 1906 can_events => 0,
1867 %arg 1907 %arg
1868 ); 1908 );
1869 1909
1870 if (exists $self->{template}) { 1910 if (exists $self->{template}) {
1871 my $layout = new CFPlus::Layout; 1911 my $layout = new DC::Layout;
1872 $layout->set_text (delete $self->{template}); 1912 $layout->set_text (delete $self->{template});
1873 $self->{template} = $layout; 1913 $self->{template} = $layout;
1874 } 1914 }
1875 1915
1876 if (exists $self->{markup}) { 1916 if (exists $self->{markup}) {
1894 1934
1895 delete $self->{ox}; 1935 delete $self->{ox};
1896 $self->SUPER::realloc; 1936 $self->SUPER::realloc;
1897} 1937}
1898 1938
1939sub clear {
1940 my ($self) = @_;
1941
1942 $self->set_text ("");
1943}
1944
1899sub set_text { 1945sub set_text {
1900 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1901 1947
1902 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1903 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
1926 1972
1927sub size_request { 1973sub size_request {
1928 my ($self) = @_; 1974 my ($self) = @_;
1929 1975
1930 $self->{size_req} ||= do { 1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
1931 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
1932 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
1933 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
1934 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1935 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1936 1984
1937 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
1938 1986
1939 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
1940 $self->{template}->set_font ($self->{font}) if $self->{font}; 1988 $self->{template}->set_font ($self->{font}) if $self->{font};
1941 $self->{template}->set_width ($self->{max_w} || -1); 1989 $self->{template}->set_width ($max_w);
1942 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1943 1991
1944 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
1945 1993
1946 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
2002 2050
2003 [$self->{layout}->size] 2051 [$self->{layout}->size]
2004 }; 2052 };
2005 2053
2006 unless (exists $self->{ox}) { 2054 unless (exists $self->{ox}) {
2007 $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);
2008 : $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);
2009 : ($self->{w} - $size->[0]) * 0.5);
2010 2057
2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2058 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2013 : ($self->{h} - $size->[1]) * 0.5);
2014 }; 2059 };
2015 2060
2016# unless ($self->{list}) { 2061# unless ($self->{list}) {
2017# $self->{list} = CFPlus::OpenGL::glGenList; 2062# $self->{list} = DC::OpenGL::glGenList;
2018# CFPlus::OpenGL::glNewList $self->{list}; 2063# DC::OpenGL::glNewList $self->{list};
2019# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2064# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2020# CFPlus::OpenGL::glEndList; 2065# DC::OpenGL::glEndList;
2021# } 2066# }
2022# 2067#
2023# CFPlus::OpenGL::glCallList $self->{list}; 2068# DC::OpenGL::glCallList $self->{list};
2024 2069
2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2070 $self->{layout}->draw;
2026} 2071}
2027 2072
2028#sub destroy { 2073#sub destroy {
2029# my ($self) = @_; 2074# my ($self) = @_;
2030# 2075#
2031# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; 2076# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2032# 2077#
2033# $self->SUPER::destroy; 2078# $self->SUPER::destroy;
2034#} 2079#}
2035 2080
2036############################################################################# 2081#############################################################################
2037 2082
2038package CFPlus::UI::EntryBase; 2083package DC::UI::EntryBase;
2039 2084
2040our @ISA = CFPlus::UI::Label::; 2085our @ISA = DC::UI::Label::;
2041 2086
2042use CFPlus::OpenGL; 2087use DC::OpenGL;
2043 2088
2044sub new { 2089sub new {
2045 my $class = shift; 2090 my $class = shift;
2046 2091
2047 $class->SUPER::new ( 2092 $class->SUPER::new (
2048 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
2049 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => undef,
2050 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
2051 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
2052 can_hover => 1, 2099 can_hover => 1,
2053 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
2054 valign => 0, 2102 valign => 0.5,
2055 can_events => 1, 2103 can_events => 1,
2056 ellipsise => 0, 2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
2057 #text => ... 2107 #text => ...
2058 #hidden => "*", 2108 #hidden => "*",
2059 @_ 2109 @_
2060 ) 2110 )
2061} 2111}
2108 2158
2109 my $text = $self->get_text; 2159 my $text = $self->get_text;
2110 2160
2111 $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;
2112 2162
2113 if ($uni == 8) { 2163 if ($sym == DC::SDLK_BACKSPACE) {
2114 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2115 } elsif ($uni == 127) { 2165 } elsif ($sym == DC::SDLK_DELETE) {
2116 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
2117 } elsif ($sym == CFPlus::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
2118 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
2119 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
2120 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2121 } elsif ($sym == CFPlus::SDLK_HOME) { 2171 } elsif ($sym == DC::SDLK_HOME) {
2122 # what a hack 2172 # what a hack
2123 $self->{cursor} = 2173 $self->{cursor} =
2124 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2174 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2125 ? length $1 2175 ? length $1
2126 : 0; 2176 : 0;
2127 } elsif ($sym == CFPlus::SDLK_END) { 2177 } elsif ($sym == DC::SDLK_END) {
2128 # uh, again 2178 # uh, again
2129 $self->{cursor} = 2179 $self->{cursor} =
2130 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2180 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2131 ? $self->{cursor} + length $1 2181 ? $self->{cursor} + length $1
2132 : length $self->{text}; 2182 : length $self->{text};
2196 glColor_premultiply @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
2197 } 2247 }
2198 2248
2199 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
2200 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2250 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2201 glBegin GL_QUADS;
2202 glVertex 0 , 0;
2203 glVertex 0 , $self->{h};
2204 glVertex $self->{w}, $self->{h}; 2251 glRect 0, 0, $self->{w}, $self->{h};
2205 glVertex $self->{w}, 0;
2206 glEnd;
2207 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
2208 2253
2209 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
2210 2255
2211 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
2213 2258
2214 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
2215 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
2216 utf8::encode $text; 2261 utf8::encode $text;
2217 2262
2218 @$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);
2219 } 2264 }
2220 2265
2266 glColor_premultiply @{$self->{active_fg}};
2221 glBegin GL_LINES; 2267 glBegin GL_LINES;
2222 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};
2223 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};
2224 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} || $DC::THEME{entry_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;
2225 } 2285 }
2226} 2286}
2227 2287
2228############################################################################# 2288#############################################################################
2229 2289
2230package CFPlus::UI::Entry; 2290package DC::UI::Entry;
2231 2291
2232our @ISA = CFPlus::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
2233 2293
2234use 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
2235 2305
2236sub invoke_key_down { 2306sub invoke_key_down {
2237 my ($self, $ev) = @_; 2307 my ($self, $ev) = @_;
2238 2308
2239 my $sym = $ev->{sym}; 2309 my $sym = $ev->{sym};
2245 $self->{history_pointer} = -1; 2315 $self->{history_pointer} = -1;
2246 $self->{history_saveback} = ''; 2316 $self->{history_saveback} = '';
2247 $self->emit (activate => $txt); 2317 $self->emit (activate => $txt);
2248 $self->update; 2318 $self->update;
2249 2319
2250 } elsif ($sym == CFPlus::SDLK_UP) { 2320 } elsif ($sym == DC::SDLK_UP) {
2251 if ($self->{history_pointer} < 0) { 2321 if ($self->{history_pointer} < 0) {
2252 $self->{history_saveback} = $self->get_text; 2322 $self->{history_saveback} = $self->get_text;
2253 } 2323 }
2254 if (@{$self->{history} || []} > 0) { 2324 if (@{$self->{history} || []} > 0) {
2255 $self->{history_pointer}++; 2325 $self->{history_pointer}++;
2257 $self->{history_pointer} = @{$self->{history} || []} - 1; 2327 $self->{history_pointer} = @{$self->{history} || []} - 1;
2258 } 2328 }
2259 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2329 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2260 } 2330 }
2261 2331
2262 } elsif ($sym == CFPlus::SDLK_DOWN) { 2332 } elsif ($sym == DC::SDLK_DOWN) {
2263 $self->{history_pointer}--; 2333 $self->{history_pointer}--;
2264 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2334 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2265 2335
2266 if ($self->{history_pointer} >= 0) { 2336 if ($self->{history_pointer} >= 0) {
2267 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2337 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2268 } else { 2338 } else {
2339 if (defined $self->{history_saveback}) {
2269 $self->set_text ($self->{history_saveback}); 2340 $self->set_text ($self->{history_saveback});
2341 $self->{history_saveback} = undef;
2342 }
2270 } 2343 }
2271 2344
2272 } else { 2345 } else {
2273 return $self->SUPER::invoke_key_down ($ev) 2346 return $self->SUPER::invoke_key_down ($ev)
2274 } 2347 }
2276 1 2349 1
2277} 2350}
2278 2351
2279############################################################################# 2352#############################################################################
2280 2353
2281package CFPlus::UI::TextEdit; 2354package DC::UI::TextEdit;
2282 2355
2283our @ISA = CFPlus::UI::EntryBase::; 2356our @ISA = DC::UI::EntryBase::;
2284 2357
2285use 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}
2286 2369
2287sub move_cursor_ver { 2370sub move_cursor_ver {
2288 my ($self, $dy) = @_; 2371 my ($self, $dy) = @_;
2289 2372
2290 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2373 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2291 2374
2292 $y += $dy; 2375 $line += $dy;
2293 2376
2294 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))) {
2295 $self->{cursor} = $index; 2378 $self->{cursor} = $index;
2296 delete $self->{cur_h}; 2379 delete $self->{cur_h};
2297 $self->update; 2380 $self->update;
2298 return; 2381 return;
2299 } 2382 }
2302sub invoke_key_down { 2385sub invoke_key_down {
2303 my ($self, $ev) = @_; 2386 my ($self, $ev) = @_;
2304 2387
2305 my $sym = $ev->{sym}; 2388 my $sym = $ev->{sym};
2306 2389
2307 if ($sym == CFPlus::SDLK_UP) { 2390 if ($sym == DC::SDLK_UP) {
2308 $self->move_cursor_ver (-1); 2391 $self->move_cursor_ver (-1);
2309 } elsif ($sym == CFPlus::SDLK_DOWN) { 2392 } elsif ($sym == DC::SDLK_DOWN) {
2310 $self->move_cursor_ver (+1); 2393 $self->move_cursor_ver (+1);
2311 } else { 2394 } else {
2312 return $self->SUPER::invoke_key_down ($ev) 2395 return $self->SUPER::invoke_key_down ($ev)
2313 } 2396 }
2314 2397
2315 1 2398 1
2316} 2399}
2317 2400
2318############################################################################# 2401#############################################################################
2319 2402
2320package CFPlus::UI::Button; 2403package DC::UI::ButtonBin;
2321 2404
2322our @ISA = CFPlus::UI::Label::; 2405our @ISA = DC::UI::Bin::;
2323 2406
2324use CFPlus::OpenGL; 2407use DC::OpenGL;
2325 2408
2326my @tex = 2409my @tex =
2327 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2410 map { new_from_resource DC::Texture $_, mipmap => 1 }
2328 qw(b1_button_inactive.png b1_button_active.png); 2411 qw(b1_button_inactive.png b1_button_active.png);
2329 2412
2330sub new { 2413sub new {
2331 my $class = shift; 2414 my $class = shift;
2332 2415
2333 $class->SUPER::new ( 2416 $class->SUPER::new (
2417 can_hover => 1,
2418 align => 0.5,
2419 valign => 0.5,
2420 can_events => 1,
2421 @_
2422 )
2423}
2424
2425sub invoke_button_up {
2426 my ($self, $ev, $x, $y) = @_;
2427
2428 $self->emit ("activate")
2429 if $x >= 0 && $x < $self->{w}
2430 && $y >= 0 && $y < $self->{h};
2431
2432 1
2433}
2434
2435sub _draw {
2436 my ($self) = @_;
2437
2438 glEnable GL_TEXTURE_2D;
2439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2440 glColor 0, 0, 0, 1;
2441
2442 my $tex = $tex[$GRAB == $self];
2443 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2444
2445 glDisable GL_TEXTURE_2D;
2446
2447 $self->SUPER::_draw;
2448}
2449
2450#############################################################################
2451
2452package DC::UI::Button;
2453
2454our @ISA = DC::UI::Label::;
2455
2456use DC::OpenGL;
2457
2458my @tex =
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 (
2334 padding_x => 4, 2466 padding_x => 8,
2335 padding_y => 4, 2467 padding_y => 4,
2336 fg => [1.0, 1.0, 1.0], 2468 fg => [1.0, 1.0, 1.0],
2337 active_fg => [0.8, 0.8, 0.8], 2469 active_fg => [0.8, 0.8, 0.8],
2338 can_hover => 1, 2470 can_hover => 1,
2339 align => 0, 2471 align => 0.5,
2340 valign => 0, 2472 valign => 0.5,
2341 can_events => 1, 2473 can_events => 1,
2342 @_ 2474 @_
2343 ) 2475 )
2344} 2476}
2345 2477
2370 $self->SUPER::_draw; 2502 $self->SUPER::_draw;
2371} 2503}
2372 2504
2373############################################################################# 2505#############################################################################
2374 2506
2375package CFPlus::UI::CheckBox; 2507package DC::UI::CheckBox;
2376 2508
2377our @ISA = CFPlus::UI::DrawBG::; 2509our @ISA = DC::UI::DrawBG::;
2378 2510
2379my @tex = 2511my @tex =
2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2512 map { new_from_resource DC::Texture $_, mipmap => 1 }
2381 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2513 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2382 2514
2383use CFPlus::OpenGL; 2515use DC::OpenGL;
2384 2516
2385sub new { 2517sub new {
2386 my $class = shift; 2518 my $class = shift;
2387 2519
2388 $class->SUPER::new ( 2520 $class->SUPER::new (
2428sub _draw { 2560sub _draw {
2429 my ($self) = @_; 2561 my ($self) = @_;
2430 2562
2431 $self->SUPER::_draw; 2563 $self->SUPER::_draw;
2432 2564
2433 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2565 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2434 2566
2435 my ($w, $h) = @$self{qw(w h)}; 2567 my ($w, $h) = @$self{qw(w h)};
2436 2568
2437 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;
2438 2570
2445 glDisable GL_TEXTURE_2D; 2577 glDisable GL_TEXTURE_2D;
2446} 2578}
2447 2579
2448############################################################################# 2580#############################################################################
2449 2581
2450package CFPlus::UI::Image; 2582package DC::UI::Image;
2451 2583
2452our @ISA = CFPlus::UI::Base::; 2584our @ISA = DC::UI::Base::;
2453 2585
2454use CFPlus::OpenGL; 2586use DC::OpenGL;
2455 2587
2456our %texture_cache; 2588our %texture_cache;
2457 2589
2458sub new { 2590sub new {
2459 my $class = shift; 2591 my $class = shift;
2460 2592
2461 my $self = $class->SUPER::new ( 2593 my $self = $class->SUPER::new (
2462 can_events => 0, 2594 can_events => 0,
2595 scale => 1,
2463 @_, 2596 @_,
2464 ); 2597 );
2465 2598
2466 $self->{path} || $self->{tex} 2599 $self->{path} || $self->{tex}
2467 or Carp::croak "'path' or 'tex' attributes required"; 2600 or Carp::croak "'path' or 'tex' attributes required";
2468 2601
2469 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2602 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2470 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2603 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2471 2604
2472 CFPlus::weaken $texture_cache{$self->{path}}; 2605 DC::weaken $texture_cache{$self->{path}};
2473 2606
2474 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2607 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2475 2608
2476 $self 2609 $self
2477} 2610}
2478 2611
2479sub STORABLE_freeze { 2612sub STORABLE_freeze {
2480 my ($self, $cloning) = @_; 2613 my ($self, $cloning) = @_;
2481 2614
2482 $self->{path} 2615 $self->{path}
2483 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";
2484 2617
2485 $self->{path} 2618 $self->{path}
2486} 2619}
2487 2620
2488sub STORABLE_attach { 2621sub STORABLE_attach {
2492} 2625}
2493 2626
2494sub size_request { 2627sub size_request {
2495 my ($self) = @_; 2628 my ($self) = @_;
2496 2629
2497 ($self->{tex}{w}, $self->{tex}{h}) 2630 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2498} 2631}
2499 2632
2500sub _draw { 2633sub _draw {
2501 my ($self) = @_; 2634 my ($self) = @_;
2502 2635
2512 } 2645 }
2513 2646
2514 glEnable GL_TEXTURE_2D; 2647 glEnable GL_TEXTURE_2D;
2515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2648 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2516 2649
2517 $tex->draw_quad (0, 0, $w, $h); 2650 $tex->draw_quad_alpha (0, 0, $w, $h);
2518 2651
2519 glDisable GL_TEXTURE_2D; 2652 glDisable GL_TEXTURE_2D;
2520} 2653}
2521 2654
2522############################################################################# 2655#############################################################################
2523 2656
2524package CFPlus::UI::ImageButton; 2657package DC::UI::ImageButton;
2525 2658
2526our @ISA = CFPlus::UI::Image::; 2659our @ISA = DC::UI::Image::;
2527 2660
2528use CFPlus::OpenGL; 2661use DC::OpenGL;
2529 2662
2530my %textures; 2663my %textures;
2531 2664
2532sub new { 2665sub new {
2533 my $class = shift; 2666 my $class = shift;
2536 padding_x => 4, 2669 padding_x => 4,
2537 padding_y => 4, 2670 padding_y => 4,
2538 fg => [1, 1, 1], 2671 fg => [1, 1, 1],
2539 active_fg => [0, 0, 1], 2672 active_fg => [0, 0, 1],
2540 can_hover => 1, 2673 can_hover => 1,
2541 align => 0, 2674 align => 0.5,
2542 valign => 0, 2675 valign => 0.5,
2543 can_events => 1, 2676 can_events => 1,
2544 @_ 2677 @_
2545 ); 2678 );
2546} 2679}
2547 2680
2681sub invoke_button_down {
2682 my ($self, $ev, $x, $y) = @_;
2683
2684 1
2685}
2686
2548sub invoke_button_up { 2687sub invoke_button_up {
2549 my ($self, $ev, $x, $y) = @_; 2688 my ($self, $ev, $x, $y) = @_;
2550 2689
2551 $self->emit ("activate") 2690 $self->emit ("activate")
2552 if $x >= 0 && $x < $self->{w} 2691 if $x >= 0 && $x < $self->{w}
2555 1 2694 1
2556} 2695}
2557 2696
2558############################################################################# 2697#############################################################################
2559 2698
2560package CFPlus::UI::VGauge; 2699package DC::UI::VGauge;
2561 2700
2562our @ISA = CFPlus::UI::Base::; 2701our @ISA = DC::UI::Base::;
2563 2702
2564use List::Util qw(min max); 2703use List::Util qw(min max);
2565 2704
2566use CFPlus::OpenGL; 2705use DC::OpenGL;
2567 2706
2568my %tex = ( 2707my %tex = (
2569 food => [ 2708 food => [
2570 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2709 map { new_from_resource DC::Texture $_, mipmap => 1 }
2571 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2710 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2572 ], 2711 ],
2573 grace => [ 2712 grace => [
2574 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2713 map { new_from_resource DC::Texture $_, mipmap => 1 }
2575 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2714 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2576 ], 2715 ],
2577 hp => [ 2716 hp => [
2578 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2579 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2718 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2580 ], 2719 ],
2581 mana => [ 2720 mana => [
2582 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
2583 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2722 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2584 ], 2723 ],
2585); 2724);
2586 2725
2587# eg. VGauge->new (gauge => 'food'), default gauge: food 2726# eg. VGauge->new (gauge => 'food'), default gauge: food
2690 glDisable GL_TEXTURE_2D; 2829 glDisable GL_TEXTURE_2D;
2691} 2830}
2692 2831
2693############################################################################# 2832#############################################################################
2694 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
2695package CFPlus::UI::Gauge; 2972package DC::UI::Gauge;
2696 2973
2697our @ISA = CFPlus::UI::VBox::; 2974our @ISA = DC::UI::VBox::;
2698 2975
2699sub new { 2976sub new {
2700 my ($class, %arg) = @_; 2977 my ($class, %arg) = @_;
2701 2978
2702 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
2704 can_hover => 1, 2981 can_hover => 1,
2705 can_events => 1, 2982 can_events => 1,
2706 %arg, 2983 %arg,
2707 ); 2984 );
2708 2985
2709 $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");
2710 $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);
2711 $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");
2712 2989
2713 $self 2990 $self
2714} 2991}
2715 2992
2716sub set_fontsize { 2993sub set_fontsize {
2737 $self->{value}->set_text ($val); 3014 $self->{value}->set_text ($val);
2738} 3015}
2739 3016
2740############################################################################# 3017#############################################################################
2741 3018
2742package CFPlus::UI::Slider; 3019package DC::UI::Slider;
2743 3020
2744use strict; 3021use strict;
2745 3022
2746use CFPlus::OpenGL; 3023use DC::OpenGL;
2747 3024
2748our @ISA = CFPlus::UI::DrawBG::; 3025our @ISA = DC::UI::DrawBG::;
2749 3026
2750my @tex = 3027my @tex =
2751 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3028 map { new_from_resource DC::Texture $_ }
2752 qw(s1_slider.png s1_slider_bg.png); 3029 qw(s1_slider.png s1_slider_bg.png);
2753 3030
2754sub new { 3031sub new {
2755 my $class = shift; 3032 my $class = shift;
2756 3033
2793sub set_value { 3070sub set_value {
2794 my ($self, $value) = @_; 3071 my ($self, $value) = @_;
2795 3072
2796 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3073 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2797 3074
2798 $hi = $lo + 1 if $hi <= $lo; 3075 $hi = $lo if $hi < $lo;
2799 3076
2800 $page = $hi - $lo if $page > $hi - $lo; 3077 $value = $hi - $page if $value > $hi - $page;
2801
2802 $value = $lo if $value < $lo; 3078 $value = $lo if $value < $lo;
2803 $value = $hi - $page if $value > $hi - $page;
2804 3079
2805 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3080 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2806 if $unit; 3081 if $unit;
2807 3082
2808 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3083 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2852sub invoke_mouse_wheel { 3127sub invoke_mouse_wheel {
2853 my ($self, $ev) = @_; 3128 my ($self, $ev) = @_;
2854 3129
2855 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3130 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2856 3131
2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3132 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2858 3133
2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3134 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2860 3135
2861 1 3136 1
2862} 3137}
2872 my ($self) = @_; 3147 my ($self) = @_;
2873 3148
2874 unless ($self->{knob_w}) { 3149 unless ($self->{knob_w}) {
2875 $self->set_value ($self->{range}[0]); 3150 $self->set_value ($self->{range}[0]);
2876 3151
2877 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3152 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2878 my $range = ($hi - $page - $lo) || 1e-100; 3153 my $range = ($hi - $page - $lo) || 1e-10;
2879 3154
2880 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};
2881 3156
2882 $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;
2883 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3158 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2884 3159
2885 $value = ($value - $lo) / $range; 3160 $value = ($value - $lo) / $range;
2915 glDisable GL_TEXTURE_2D; 3190 glDisable GL_TEXTURE_2D;
2916} 3191}
2917 3192
2918############################################################################# 3193#############################################################################
2919 3194
2920package CFPlus::UI::ValSlider; 3195package DC::UI::ValSlider;
2921 3196
2922our @ISA = CFPlus::UI::HBox::; 3197our @ISA = DC::UI::HBox::;
2923 3198
2924sub new { 3199sub new {
2925 my ($class, %arg) = @_; 3200 my ($class, %arg) = @_;
2926 3201
2927 my $range = delete $arg{range}; 3202 my $range = delete $arg{range};
2928 3203
2929 my $self = $class->SUPER::new ( 3204 my $self = $class->SUPER::new (
2930 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3205 slider => (new DC::UI::Slider expand => 1, range => $range),
2931 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3206 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2932 to_value => sub { shift }, 3207 to_value => sub { shift },
2933 from_value => sub { shift }, 3208 from_value => sub { shift },
2934 %arg, 3209 %arg,
2935 ); 3210 );
2936 3211
2956sub set_range { shift->{slider}->set_range (@_) } 3231sub set_range { shift->{slider}->set_range (@_) }
2957sub set_value { shift->{slider}->set_value (@_) } 3232sub set_value { shift->{slider}->set_value (@_) }
2958 3233
2959############################################################################# 3234#############################################################################
2960 3235
2961package CFPlus::UI::TextScroller; 3236package DC::UI::TextScroller;
2962 3237
2963our @ISA = CFPlus::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
2964 3239
2965use CFPlus::OpenGL; 3240use DC::OpenGL;
2966 3241
2967sub new { 3242sub new {
2968 my $class = shift; 3243 my $class = shift;
2969 3244
2970 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
2972 can_events => 1, 3247 can_events => 1,
2973 indent => 0, 3248 indent => 0,
2974 #font => default_font 3249 #font => default_font
2975 @_, 3250 @_,
2976 3251
2977 layout => (new CFPlus::Layout), 3252 layout => (new DC::Layout),
2978 par => [], 3253 par => [],
2979 max_par => 0, 3254 max_par => 0,
2980 height => 0, 3255 height => 0,
2981 children => [ 3256 children => [
2982 (new CFPlus::UI::Empty expand => 1), 3257 (new DC::UI::Empty expand => 1),
2983 (new CFPlus::UI::Slider vertical => 1), 3258 (new DC::UI::Slider vertical => 1),
2984 ], 3259 ],
2985 ); 3260 );
2986 3261
2987 $self->{children}[1]->connect (changed => sub { $self->update }); 3262 $self->{children}[1]->connect (changed => sub { $self->update });
2988 3263
2997} 3272}
2998 3273
2999sub size_request { 3274sub size_request {
3000 my ($self) = @_; 3275 my ($self) = @_;
3001 3276
3002 my ($empty, $slider) = @{ $self->{children} }; 3277 my ($empty, $slider) = $self->visible_children;
3003 3278
3004 local $self->{children} = [$empty, $slider]; 3279 local $self->{children} = [$empty, $slider];
3005 $self->SUPER::size_request 3280 $self->SUPER::size_request
3006} 3281}
3007 3282
3044 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3319 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3045 $layout->set_markup ($para->{markup}); 3320 $layout->set_markup ($para->{markup});
3046 3321
3047 $layout->set_shapes ( 3322 $layout->set_shapes (
3048 map 3323 map
3049 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3324 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3050 @{$para->{widget}} 3325 @{$para->{widget}}
3051 ); 3326 );
3052 3327
3053 $layout 3328 $layout
3054} 3329}
3171 $ROOT->on_post_alloc ($self => sub { 3446 $ROOT->on_post_alloc ($self => sub {
3172 $self->force_uptodate; 3447 $self->force_uptodate;
3173 3448
3174 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3449 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3175 3450
3176 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3451 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3177 glClearColor 0, 0, 0, 0; 3452 glClearColor 0, 0, 0, 0;
3178 glClear GL_COLOR_BUFFER_BIT; 3453 glClear GL_COLOR_BUFFER_BIT;
3179 3454
3180 package CFPlus::UI::Base; 3455 package DC::UI::Base;
3181 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3456 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3182 (0, 0, $self->{w}, $self->{h}); 3457 (0, 0, $self->{w}, $self->{h});
3183 3458
3184 my $top = int $self->{children}[1]{range}[0]; 3459 my $top = int $self->{children}[1]{range}[0];
3185 3460
3196 3471
3197 if ($y0 < $y + $h && $y < $y1) { 3472 if ($y0 < $y + $h && $y < $y1) {
3198 my $layout = $self->get_layout ($para); 3473 my $layout = $self->get_layout ($para);
3199 3474
3200 $layout->render ($para->{indent}, $y - $y0); 3475 $layout->render ($para->{indent}, $y - $y0);
3476 $layout->draw;
3201 3477
3202 if (my @w = @{ $para->{widget} }) { 3478 if (my @w = @{ $para->{widget} }) {
3203 my @s = $layout->get_shapes; 3479 my @s = $layout->get_shapes;
3204 3480
3205 for (@w) { 3481 for (@w) {
3243 $self->{children}[1]->draw; 3519 $self->{children}[1]->draw;
3244} 3520}
3245 3521
3246############################################################################# 3522#############################################################################
3247 3523
3248package CFPlus::UI::Animator; 3524package DC::UI::Animator;
3249 3525
3250use CFPlus::OpenGL; 3526use DC::OpenGL;
3251 3527
3252our @ISA = CFPlus::UI::Bin::; 3528our @ISA = DC::UI::Bin::;
3253 3529
3254sub moveto { 3530sub moveto {
3255 my ($self, $x, $y) = @_; 3531 my ($self, $x, $y) = @_;
3256 3532
3257 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3533 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
3285 glPopMatrix; 3561 glPopMatrix;
3286} 3562}
3287 3563
3288############################################################################# 3564#############################################################################
3289 3565
3290package CFPlus::UI::Flopper; 3566package DC::UI::Flopper;
3291 3567
3292our @ISA = CFPlus::UI::Button::; 3568our @ISA = DC::UI::Button::;
3293 3569
3294sub new { 3570sub new {
3295 my $class = shift; 3571 my $class = shift;
3296 3572
3297 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
3309 $self->{other}->toggle_visibility; 3585 $self->{other}->toggle_visibility;
3310} 3586}
3311 3587
3312############################################################################# 3588#############################################################################
3313 3589
3314package CFPlus::UI::Tooltip; 3590package DC::UI::Tooltip;
3315 3591
3316our @ISA = CFPlus::UI::Bin::; 3592our @ISA = DC::UI::Bin::;
3317 3593
3318use CFPlus::OpenGL; 3594use DC::OpenGL;
3319 3595
3320sub new { 3596sub new {
3321 my $class = shift; 3597 my $class = shift;
3322 3598
3323 $class->SUPER::new ( 3599 $class->SUPER::new (
3327} 3603}
3328 3604
3329sub set_tooltip_from { 3605sub set_tooltip_from {
3330 my ($self, $widget) = @_; 3606 my ($self, $widget) = @_;
3331 3607
3332 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3333 if $widget->{tooltip} =~ /^#(.*)$/;
3334
3335 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 =~ /^#(.*)$/;
3336 3613
3337 if ($ENV{CFPLUS_DEBUG} & 2) { 3614 if ($ENV{CFPLUS_DEBUG} & 2) {
3338 $tooltip .= "\n\n" . (ref $widget) . "\n" 3615 $tip .= "\n\n" . (ref $widget) . "\n"
3339 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3616 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3340 . "req $widget->{req_w} $widget->{req_h}\n" 3617 . "req $widget->{req_w} $widget->{req_h}\n"
3341 . "visible $widget->{visible}"; 3618 . "visible $widget->{visible}";
3342 } 3619 }
3343 3620
3344 $tooltip =~ s/^\n+//; 3621 $tip =~ s/^\n+//;
3345 $tooltip =~ s/\n+$//; 3622 $tip =~ s/\n+$//;
3346 3623
3347 $self->add (new CFPlus::UI::Label 3624 $self->add (new DC::UI::Label
3625 fg => $DC::THEME{tooltip_fg},
3348 markup => $tooltip, 3626 markup => $tip,
3349 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3627 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3628 align => 0,
3350 fontsize => 0.8, 3629 fontsize => 0.8,
3351 style => 1, # FLAG_INVERSE 3630 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3352 ellipsise => 0, 3631 ellipsise => 0,
3353 font => ($widget->{tooltip_font} || $::FONT_PROP), 3632 font => ($widget->{tooltip_font} || $::FONT_PROP),
3354 ); 3633 );
3355} 3634}
3356 3635
3391} 3670}
3392 3671
3393sub _draw { 3672sub _draw {
3394 my ($self) = @_; 3673 my ($self) = @_;
3395 3674
3396 glTranslate 0.375, 0.375;
3397
3398 my ($w, $h) = @$self{qw(w h)}; 3675 my ($w, $h) = @$self{qw(w h)};
3399 3676
3400 glColor 1, 0.8, 0.4; 3677 glColor @{ $DC::THEME{tooltip_bg} };
3401 glBegin GL_QUADS; 3678 glRect 0, 0, $w, $h;
3402 glVertex 0 , 0;
3403 glVertex 0 , $h;
3404 glVertex $w, $h;
3405 glVertex $w, 0;
3406 glEnd;
3407 3679
3408 glColor 0, 0, 0; 3680 glColor @{ $DC::THEME{tooltip_border} };
3409 glBegin GL_LINE_LOOP; 3681 glRect_lineloop .5, .5, $w + .5, $h + .5;
3410 glVertex 0 , 0;
3411 glVertex 0 , $h;
3412 glVertex $w, $h;
3413 glVertex $w, 0;
3414 glEnd;
3415 3682
3416 glTranslate 2 - 0.375, 2 - 0.375; 3683 glTranslate 2, 2;
3417 3684
3418 $self->SUPER::_draw; 3685 $self->SUPER::_draw;
3419} 3686}
3420 3687
3421############################################################################# 3688#############################################################################
3422 3689
3423package CFPlus::UI::Face; 3690package DC::UI::Face;
3424 3691
3425our @ISA = CFPlus::UI::DrawBG::; 3692our @ISA = DC::UI::DrawBG::;
3426 3693
3427use CFPlus::OpenGL; 3694use DC::OpenGL;
3428 3695
3429sub new { 3696sub new {
3430 my $class = shift; 3697 my $class = shift;
3431 3698
3432 my $self = $class->SUPER::new ( 3699 my $self = $class->SUPER::new (
3436 can_events => 0, 3703 can_events => 0,
3437 @_, 3704 @_,
3438 ); 3705 );
3439 3706
3440 if ($self->{anim} && $self->{animspeed}) { 3707 if ($self->{anim} && $self->{animspeed}) {
3441 CFPlus::weaken (my $widget = $self); 3708 DC::weaken (my $widget = $self);
3442 3709
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3710 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3711 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3445 $self->{timer} = Event->timer (
3446 parked => 1,
3447 cb => sub {
3448 return unless $::CONN && $widget; 3712 return unless $::CONN;
3449 3713
3714 my $w = $widget
3715 or return;
3716
3450 ++$widget->{frame}; 3717 ++$w->{frame};
3451 $widget->update_face; 3718 $w->update_face;
3719
3720 # somehow, $widget can go away
3452 $widget->update; 3721 $w->update;
3453
3454 $widget->update_timer; 3722 $w->update_timer;
3455 },
3456 ); 3723 };
3457 3724
3458 $self->update_face; 3725 $self->update_face;
3459 $self->update_timer; 3726 $self->update_timer;
3460 } 3727 }
3461 3728
3466 my ($self) = @_; 3733 my ($self) = @_;
3467 3734
3468 return unless $self->{timer}; 3735 return unless $self->{timer};
3469 3736
3470 if ($self->{visible}) { 3737 if ($self->{visible}) {
3471 $self->{timer}->at (
3472 $self->{anim_start}
3473 + $self->{animspeed}
3474 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3475 );
3476 $self->{timer}->start; 3738 $self->{timer}->start;
3477 } else { 3739 } else {
3478 $self->{timer}->stop; 3740 $self->{timer}->stop;
3479 } 3741 }
3480} 3742}
3481 3743
3482sub update_face { 3744sub update_face {
3483 my ($self) = @_; 3745 my ($self) = @_;
3484 3746
3485 return unless $::CONN; 3747 if ($::CONN) {
3486
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3748 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) { 3749 if ($anim && @$anim) {
3489 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3750 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3751 delete $self->{face_change_cb};
3752
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3753 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3754 unless ($tex->{name} || $tex->{loading}) {
3755 $tex->upload (sub { $self->reconfigure });
3756 }
3757 }
3758 }
3492 } 3759 }
3493 } 3760 }
3494} 3761}
3495 3762
3496sub size_request { 3763sub size_request {
3497 my ($self) = @_; 3764 my ($self) = @_;
3498 3765
3499 if ($::CONN) { 3766 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3767 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) { 3768 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex; 3769 if ($tex->{name}) {
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3770 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3504 } else { 3771 } elsif (!$tex->{loading}) {
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3772 $tex->upload (sub { $self->reconfigure });
3506 $self->realloc;
3507 }); 3773 }
3508 } 3774 }
3775
3776 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3509 } 3777 }
3510 } 3778 }
3511 3779
3512 ($self->{size_w} || 8, $self->{size_h} || 8) 3780 ($self->{size_w} || 8, $self->{size_h} || 8)
3513} 3781}
3551 $self->SUPER::destroy; 3819 $self->SUPER::destroy;
3552} 3820}
3553 3821
3554############################################################################# 3822#############################################################################
3555 3823
3556package CFPlus::UI::Buttonbar; 3824package DC::UI::Buttonbar;
3557 3825
3558our @ISA = CFPlus::UI::HBox::; 3826our @ISA = DC::UI::HBox::;
3559 3827
3560# TODO: should actually wrap buttons and other goodies. 3828# TODO: should actually wrap buttons and other goodies.
3561 3829
3562############################################################################# 3830#############################################################################
3563 3831
3564package CFPlus::UI::Menu; 3832package DC::UI::Menu;
3565 3833
3566our @ISA = CFPlus::UI::Toplevel::; 3834our @ISA = DC::UI::Toplevel::;
3567 3835
3568use CFPlus::OpenGL; 3836use DC::OpenGL;
3569 3837
3570sub new { 3838sub new {
3571 my $class = shift; 3839 my $class = shift;
3572 3840
3573 my $self = $class->SUPER::new ( 3841 my $self = $class->SUPER::new (
3574 items => [], 3842 items => [],
3575 z => 100, 3843 z => 100,
3576 @_, 3844 @_,
3577 ); 3845 );
3578 3846
3579 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3847 $self->add ($self->{vbox} = new DC::UI::VBox);
3580 3848
3581 for my $item (@{ $self->{items} }) { 3849 for my $item (@{ $self->{items} }) {
3582 my ($widget, $cb, $tooltip) = @$item; 3850 my ($widget, $cb, $tooltip) = @$item;
3583 3851
3584 # handle various types of items, only text for now 3852 # handle various types of items, only text for now
3585 if (!ref $widget) { 3853 if (!ref $widget) {
3586 if ($widget =~ /\t/) { 3854 if ($widget =~ /\t/) {
3587 my ($left, $right) = split /\t/, $widget, 2; 3855 my ($left, $right) = split /\t/, $widget, 2;
3588 3856
3589 $widget = new CFPlus::UI::HBox 3857 $widget = new DC::UI::HBox
3590 can_hover => 1, 3858 can_hover => 1,
3591 can_events => 1, 3859 can_events => 1,
3592 tooltip => $tooltip, 3860 tooltip => $tooltip,
3593 children => [ 3861 children => [
3594 (new CFPlus::UI::Label markup => $left, expand => 1), 3862 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3595 (new CFPlus::UI::Label markup => $right, align => +1), 3863 (new DC::UI::Label markup => $right, align => 1),
3596 ], 3864 ],
3597 ; 3865 ;
3598 3866
3599 } else { 3867 } else {
3600 $widget = new CFPlus::UI::Label 3868 $widget = new DC::UI::Label
3601 can_hover => 1, 3869 can_hover => 1,
3602 can_events => 1, 3870 can_events => 1,
3871 align => 0,
3603 markup => $widget, 3872 markup => $widget,
3604 tooltip => $tooltip; 3873 tooltip => $tooltip;
3605 } 3874 }
3606 } 3875 }
3607 3876
3653 1 3922 1
3654} 3923}
3655 3924
3656############################################################################# 3925#############################################################################
3657 3926
3658package CFPlus::UI::Multiplexer; 3927package DC::UI::Multiplexer;
3659 3928
3660our @ISA = CFPlus::UI::Container::; 3929our @ISA = DC::UI::Container::;
3661 3930
3662sub new { 3931sub new {
3663 my $class = shift; 3932 my $class = shift;
3664 3933
3665 my $self = $class->SUPER::new ( 3934 my $self = $class->SUPER::new (
3666 @_, 3935 @_,
3667 ); 3936 );
3668 3937
3669 $self->{current} = $self->{children}[0] 3938 $self->set_current_page (0);
3670 if @{ $self->{children} };
3671 3939
3672 $self 3940 $self
3673} 3941}
3674 3942
3675sub add { 3943sub add {
3676 my ($self, @widgets) = @_; 3944 my ($self, @widgets) = @_;
3677 3945
3678 $self->SUPER::add (@widgets); 3946 $self->SUPER::add (@widgets);
3679 3947
3680 $self->{current} = $self->{children}[0] 3948 $self->set_current_page (0)
3681 if @{ $self->{children} }; 3949 if @widgets == @{ $self->{children} };
3682} 3950}
3683 3951
3684sub get_current_page { 3952sub get_current_page {
3685 my ($self) = @_; 3953 my ($self) = @_;
3686 3954
3692 3960
3693 my $widget = ref $page_or_widget 3961 my $widget = ref $page_or_widget
3694 ? $page_or_widget 3962 ? $page_or_widget
3695 : $self->{children}[$page_or_widget]; 3963 : $self->{children}[$page_or_widget];
3696 3964
3965 $self->{current}->set_invisible if $self->{current} && $self->{visible};
3966
3697 $self->{current} = $widget; 3967 if (($self->{current} = $widget)) {
3968 $self->{current}->set_visible if $self->{current} && $self->{visible};
3698 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3969 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3699 3970
3700 $self->emit (page_changed => $self->{current}); 3971 $self->emit (page_changed => $self->{current});
3972 }
3701 3973
3702 $self->realloc; 3974 $self->realloc;
3703} 3975}
3704 3976
3705sub visible_children { 3977sub visible_children {
3706 $_[0]{current} 3978 $_[0]{current} || ()
3707} 3979}
3708 3980
3709sub size_request { 3981sub size_request {
3710 my ($self) = @_; 3982 my ($self) = @_;
3711 3983
3984 $self->{current}
3712 $self->{current}->size_request 3985 ? $self->{current}->size_request
3986 : (0, 0)
3713} 3987}
3714 3988
3715sub invoke_size_allocate { 3989sub invoke_size_allocate {
3716 my ($self, $w, $h) = @_; 3990 my ($self, $w, $h) = @_;
3717 3991
3718 $self->{current}->configure (0, 0, $w, $h); 3992 $self->{current}->configure (0, 0, $w, $h)
3993 if $self->{current};
3719 3994
3720 1 3995 1
3721} 3996}
3722 3997
3723sub _draw { 3998sub _draw {
3724 my ($self) = @_; 3999 my ($self) = @_;
3725 4000
3726 $self->{current}->draw; 4001 $self->{current}->draw
4002 if $self->{current};
3727} 4003}
3728 4004
3729############################################################################# 4005#############################################################################
3730 4006
3731package CFPlus::UI::Notebook; 4007package DC::UI::Notebook;
3732 4008
4009use DC::OpenGL;
4010
3733our @ISA = CFPlus::UI::VBox::; 4011our @ISA = DC::UI::VBox::;
3734 4012
3735sub new { 4013sub new {
3736 my $class = shift; 4014 my $class = shift;
3737 4015
3738 my $self = $class->SUPER::new ( 4016 my $self = $class->SUPER::new (
3739 buttonbar => (new CFPlus::UI::Buttonbar), 4017 buttonbar => (new DC::UI::Buttonbar),
3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4018 multiplexer => (new DC::UI::Multiplexer expand => 1),
4019 active_outline => [.7, .7, 0.2],
3741 # filter => # will be put between multiplexer and $self 4020 # filter => # will be put between multiplexer and $self
3742 @_, 4021 @_,
3743 ); 4022 );
3744 4023
3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4024 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3746 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4025 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3747 4026
4027 {
4028 Scalar::Util::weaken (my $wself = $self);
4029
4030 $self->{multiplexer}->connect (c_add => sub {
4031 my ($mplex, $widgets) = @_;
4032
4033 for my $child (@$widgets) {
4034 Scalar::Util::weaken $child;
4035 $child->{c_tab_} ||= do {
4036 my $tab =
4037 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4038 ? $child->{c_tab}
4039 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4040
4041 $tab->connect (activate => sub {
4042 $wself->set_current_page ($child);
4043 });
4044
4045 $tab
4046 };
4047
4048 $self->{buttonbar}->add ($child->{c_tab_});
4049 }
4050 });
4051
4052 $self->{multiplexer}->connect (c_remove => sub {
4053 my ($mplex, $widgets) = @_;
4054
4055 for my $child (@$widgets) {
4056 $wself->{buttonbar}->remove ($child->{c_tab_});
4057 }
4058 });
4059 }
4060
3748 $self 4061 $self
3749} 4062}
3750 4063
3751sub add { 4064sub add {
4065 my ($self, @widgets) = @_;
4066
4067 $self->{multiplexer}->add (@widgets)
4068}
4069
4070sub remove {
4071 my ($self, @widgets) = @_;
4072
4073 $self->{multiplexer}->remove (@widgets)
4074}
4075
4076sub pages {
4077 my ($self) = @_;
4078 $self->{multiplexer}->children
4079}
4080
4081sub page_index {
4082 my ($self, $widget) = @_;
4083
4084 my $i = 0;
4085 for ($self->pages) {
4086 if ($_ eq $widget) { return $i };
4087 $i++;
4088 }
4089
4090 undef
4091}
4092
4093sub add_tab {
3752 my ($self, $title, $widget, $tooltip) = @_; 4094 my ($self, $title, $widget, $tooltip) = @_;
3753 4095
3754 CFPlus::weaken $self; 4096 $title = [$title, $tooltip] unless ref $title;
4097 $widget->{c_tab} = $title;
3755 4098
3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3758 markup => $title,
3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3764 $self->{buttonbar}->add ($title);
3765
3766 $self->{multiplexer}->add ($widget); 4099 $self->add ($widget);
3767} 4100}
3768 4101
3769sub get_current_page { 4102sub get_current_page {
3770 my ($self) = @_; 4103 my ($self) = @_;
3771 4104
3777 4110
3778 $self->{multiplexer}->set_current_page ($page); 4111 $self->{multiplexer}->set_current_page ($page);
3779 $self->emit (page_changed => $self->{multiplexer}{current}); 4112 $self->emit (page_changed => $self->{multiplexer}{current});
3780} 4113}
3781 4114
4115sub _draw {
4116 my ($self) = @_;
4117
4118 $self->SUPER::_draw ();
4119
4120 if (my $cur = $self->{multiplexer}{current}) {
4121 if ($cur = $cur->{c_tab_}) {
4122 glTranslate $self->{buttonbar}{x} + $cur->{x},
4123 $self->{buttonbar}{y} + $cur->{y};
4124 glLineWidth 3;
4125 #glEnable GL_BLEND;
4126 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4127 glColor @{$self->{active_outline}};
4128 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4129 glLineWidth 1;
4130 #glDisable GL_BLEND;
4131 }
4132 }
4133}
4134
3782############################################################################# 4135#############################################################################
3783 4136
3784package CFPlus::UI::Selector; 4137package DC::UI::Selector;
3785 4138
3786use utf8; 4139use utf8;
3787 4140
3788our @ISA = CFPlus::UI::Button::; 4141our @ISA = DC::UI::Button::;
3789 4142
3790sub new { 4143sub new {
3791 my $class = shift; 4144 my $class = shift;
3792 4145
3793 my $self = $class->SUPER::new ( 4146 my $self = $class->SUPER::new (
3810 my ($value, $title, $tooltip) = @$_; 4163 my ($value, $title, $tooltip) = @$_;
3811 4164
3812 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4165 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3813 } 4166 }
3814 4167
3815 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4168 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3816} 4169}
3817 4170
3818sub _set_value { 4171sub _set_value {
3819 my ($self, $value) = @_; 4172 my ($self, $value) = @_;
3820 4173
3821 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4174 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4175 $item ||= $self->{options}[0]
3822 or return; 4176 or return;
3823 4177
3824 $self->{value} = $item->[0]; 4178 $self->{value} = $item->[0];
3825 $self->set_markup ("$item->[1] ⇓"); 4179 $self->set_markup ("$item->[1] ⇓");
3826 $self->set_tooltip ($item->[2]); 4180# $self->set_tooltip ($item->[2]);
3827} 4181}
3828 4182
3829sub set_value { 4183sub set_value {
3830 my ($self, $value) = @_; 4184 my ($self, $value) = @_;
3831 4185
3833 4187
3834 $self->_set_value ($value); 4188 $self->_set_value ($value);
3835 $self->emit (changed => $value); 4189 $self->emit (changed => $value);
3836} 4190}
3837 4191
4192sub set_options {
4193 my ($self, $options) = @_;
4194
4195 $self->{options} = $options;
4196 $self->_set_value ($self->{value});
4197}
4198
3838############################################################################# 4199#############################################################################
3839 4200
3840package CFPlus::UI::Statusbox; 4201package DC::UI::Statusbox;
3841 4202
3842our @ISA = CFPlus::UI::VBox::; 4203our @ISA = DC::UI::VBox::;
3843 4204
3844sub new { 4205sub new {
3845 my $class = shift; 4206 my $class = shift;
3846 4207
3847 my $self = $class->SUPER::new ( 4208 my $self = $class->SUPER::new (
3848 fontsize => 0.8, 4209 fontsize => 0.8,
3849 @_, 4210 @_,
3850 ); 4211 );
3851 4212
3852 CFPlus::weaken (my $this = $self); 4213 DC::weaken (my $this = $self);
3853 4214
3854 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4215 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3855 4216
3856 $self 4217 $self
3857} 4218}
3858 4219
3859sub reorder { 4220sub reorder {
3860 my ($self) = @_; 4221 my ($self) = @_;
3861 my $NOW = Time::HiRes::time; 4222 my $NOW = EV::time;
3862 4223
3863 # freeze display when hovering over any label 4224 # freeze display when hovering over any label
3864 return if $CFPlus::UI::TOOLTIP->{owner} 4225 return if $DC::UI::TOOLTIP->{owner}
3865 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4226 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3866 values %{ $self->{item} }; 4227 values %{ $self->{item} };
3867 4228
3868 while (my ($k, $v) = each %{ $self->{item} }) { 4229 while (my ($k, $v) = each %{ $self->{item} }) {
3869 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4230 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3870 } 4231 }
4232
4233 $self->{timer}->set (1, 1);
3871 4234
3872 my @widgets; 4235 my @widgets;
3873 4236
3874 my @items = sort { 4237 my @items = sort {
3875 $a->{pri} <=> $b->{pri} 4238 $a->{pri} <=> $b->{pri}
3876 or $b->{id} <=> $a->{id} 4239 or $b->{id} <=> $a->{id}
3877 } values %{ $self->{item} }; 4240 } values %{ $self->{item} };
3878
3879 $self->{timer}->interval (1);
3880 4241
3881 my $count = 10 + 1; 4242 my $count = 10 + 1;
3882 for my $item (@items) { 4243 for my $item (@items) {
3883 last unless --$count; 4244 last unless --$count;
3884 4245
3891 for ($short) { 4252 for ($short) {
3892 s/^\s+//; 4253 s/^\s+//;
3893 s/\s+/ /g; 4254 s/\s+/ /g;
3894 } 4255 }
3895 4256
3896 new CFPlus::UI::Label 4257 new DC::UI::Label
3897 markup => $short, 4258 markup => $short,
3898 tooltip => $item->{tooltip}, 4259 tooltip => $item->{tooltip},
3899 tooltip_font => $::FONT_PROP, 4260 tooltip_font => $::FONT_PROP,
3900 tooltip_width => 0.67, 4261 tooltip_width => 0.67,
3901 fontsize => $item->{fontsize} || $self->{fontsize}, 4262 fontsize => $item->{fontsize} || $self->{fontsize},
3902 max_w => $::WIDTH * 0.44, 4263 max_w => $::WIDTH * 0.44,
4264 align => 0,
3903 fg => [@{ $item->{fg} }], 4265 fg => [@{ $item->{fg} }],
3904 can_events => 1, 4266 can_events => 1,
3905 can_hover => 1 4267 can_hover => 1
3906 }; 4268 };
3907 4269
3908 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4270 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3909 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4271 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3910 $label->update; 4272 $label->update;
3911 $label->set_max_size (undef, $label->{req_h} * $diff) 4273 $label->set_max_size (undef, $label->{req_h} * $diff)
3912 if $diff < 1; 4274 if $diff < 1;
3913 $self->{timer}->interval (1/30); 4275 $self->{timer}->set (1/30, 1/30);
3914 } else { 4276 } else {
3915 $label->{fg}[3] = $item->{fg}[3] || 1; 4277 $label->{fg}[3] = $item->{fg}[3] || 1;
3916 } 4278 }
3917 4279
3918 push @widgets, $label; 4280 push @widgets, $label;
3919 } 4281 }
4282
4283 my $hash = join ",", @widgets;
4284 return if $hash eq $self->{last_widget_hash};
4285 $self->{last_widget_hash} = $hash;
3920 4286
3921 $self->clear; 4287 $self->clear;
3922 $self->SUPER::add (reverse @widgets); 4288 $self->SUPER::add (reverse @widgets);
3923} 4289}
3924 4290
3980 $self->SUPER::destroy; 4346 $self->SUPER::destroy;
3981} 4347}
3982 4348
3983############################################################################# 4349#############################################################################
3984 4350
3985package CFPlus::UI::Root; 4351package DC::UI::Root;
3986 4352
3987our @ISA = CFPlus::UI::Container::; 4353our @ISA = DC::UI::Container::;
3988 4354
3989use List::Util qw(min max); 4355use List::Util qw(min max);
3990 4356
3991use CFPlus::OpenGL; 4357use DC::OpenGL;
3992 4358
3993sub new { 4359sub new {
3994 my $class = shift; 4360 my $class = shift;
3995 4361
3996 my $self = $class->SUPER::new ( 4362 my $self = $class->SUPER::new (
3997 visible => 1, 4363 visible => 1,
3998 @_, 4364 @_,
3999 ); 4365 );
4000 4366
4001 CFPlus::weaken ($self->{root} = $self); 4367 DC::weaken ($self->{root} = $self);
4002 4368
4003 $self 4369 $self
4004} 4370}
4005 4371
4006sub size_request { 4372sub size_request {
4054} 4420}
4055 4421
4056sub update { 4422sub update {
4057 my ($self) = @_; 4423 my ($self) = @_;
4058 4424
4059 $::WANT_REFRESH++; 4425 $::WANT_REFRESH = 1;
4060} 4426}
4061 4427
4062sub add { 4428sub add {
4063 my ($self, @children) = @_; 4429 my ($self, @children) = @_;
4064 4430
4131 4497
4132 delete $queue{$widget+0}; 4498 delete $queue{$widget+0};
4133 4499
4134 my ($w, $h) = $widget->size_request; 4500 my ($w, $h) = $widget->size_request;
4135 4501
4136 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4502 $w += $widget->{padding_x} * 2;
4137 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4503 $h += $widget->{padding_y} * 2;
4504
4505 $w = max $widget->{min_w}, $w;
4506 $h = max $widget->{min_h}, $h;
4138 4507
4139 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4508 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4140 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4509 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4141 4510
4142 $w = $widget->{force_w} if exists $widget->{force_w}; 4511 $w = $widget->{force_w} if exists $widget->{force_w};
4209 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4578 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4210 glMatrixMode GL_MODELVIEW; 4579 glMatrixMode GL_MODELVIEW;
4211 glLoadIdentity; 4580 glLoadIdentity;
4212 4581
4213 { 4582 {
4214 package CFPlus::UI::Base; 4583 package DC::UI::Base;
4215 4584
4216 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4585 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4217 (0, 0, $self->{w}, $self->{h}); 4586 (0, 0, $self->{w}, $self->{h});
4218 4587
4219 $self->_draw; 4588 $self->_draw;
4220 } 4589 }
4221} 4590}
4222 4591
4223############################################################################# 4592#############################################################################
4224 4593
4225package CFPlus::UI; 4594package DC::UI;
4226 4595
4227$ROOT = new CFPlus::UI::Root; 4596$ROOT = new DC::UI::Root;
4228$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4597$TOOLTIP = new DC::UI::Tooltip z => 900;
4229 4598
42301 45991
4231 4600

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines