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.408 by root, Sun Jul 22 15:26:01 2007 UTC vs.
Revision 1.472 by root, Wed Dec 24 04:09:27 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
292 return if $self->{visible}; 289 return if $self->{visible};
290
291 $self->{parent} && $self->{parent}{root}#d#
292 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
293 293
294 $self->{root} = $self->{parent}{root}; 294 $self->{root} = $self->{parent}{root};
295 $self->{visible} = $self->{parent}{visible} + 1; 295 $self->{visible} = $self->{parent}{visible} + 1;
296 296
297 $self->emit (visibility_change => 1); 297 $self->emit (visibility_change => 1);
298 298
299 $self->realloc if !exists $self->{req_w}; 299 $self->realloc if !exists $self->{req_w};
300 300
301 $_->set_visible for $self->children; 301 $_->set_visible for $self->visible_children;
302} 302}
303 303
304sub set_invisible { 304sub set_invisible {
305 my ($self) = @_; 305 my ($self) = @_;
306 306
312 delete $self->{root}; 312 delete $self->{root};
313 313
314 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
315 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
316 316
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 317 $DC::UI::TOOLTIP_WATCHER->invoke
318 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
319 319
320 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
322} 322}
341sub hide { 341sub hide {
342 my ($self) = @_; 342 my ($self) = @_;
343 343
344 $self->set_invisible; 344 $self->set_invisible;
345 345
346 # extra $parent copy for 5.8.8+ bug workaround
347 # (otherwise $_[0] in remove gets freed
348 if (my $parent = $self->{parent}) {
346 $self->{parent}->remove ($self) 349 $parent->remove ($self);
347 if $self->{parent}; 350 }
348} 351}
349 352
350sub move_abs { 353sub move_abs {
351 my ($self, $x, $y, $z) = @_; 354 my ($self, $x, $y, $z) = @_;
352 355
364 $self->{force_h} = $h; 367 $self->{force_h} = $h;
365 368
366 $self->realloc; 369 $self->realloc;
367} 370}
368 371
372# traverse the widget chain up to find the maximum "physical" size constraints
373sub get_max_wh {
374 my ($self) = @_;
375
376 my ($w, $h) = @$self{qw(max_w max_h)};
377
378 if ($w <= 0 || $h <= 0) {
379 my ($mw, $mh) = $self->{parent}
380 ? $self->{parent}->get_max_wh
381 : ($::WIDTH, $::HEIGHT);
382
383 $w = $mw if $w <= 0;
384 $h = $mh if $h <= 0;
385 }
386
387 ($w, $h)
388}
389
369sub size_request { 390sub size_request {
370 require Carp; 391 require Carp;
371 Carp::confess "size_request is abstract"; 392 Carp::confess "size_request is abstract";
372} 393}
373 394
379 my ($self, $x, $y, $w, $h) = @_; 400 my ($self, $x, $y, $w, $h) = @_;
380 401
381 if ($self->{aspect}) { 402 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h); 403 my ($ow, $oh) = ($w, $h);
383 404
384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 405 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 406 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386 407
387 # use alignment to adjust x, y 408 # use alignment to adjust x, y
388 409
389 $x += int 0.5 * ($ow - $w); 410 $x += int 0.5 * ($ow - $w);
390 $y += int 0.5 * ($oh - $h); 411 $y += int 0.5 * ($oh - $h);
431 452
432 return if $self->{tooltip} eq $tooltip; 453 return if $self->{tooltip} eq $tooltip;
433 454
434 $self->{tooltip} = $tooltip; 455 $self->{tooltip} = $tooltip;
435 456
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 457 if ($DC::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 458 delete $DC::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 459 $DC::UI::TOOLTIP_WATCHER->invoke;
439 } 460 }
440} 461}
441 462
442# translate global coordinates to local coordinate system 463# translate global coordinates to local coordinate system
443sub coord2local { 464sub coord2local {
444 my ($self, $x, $y) = @_; 465 my ($self, $x, $y) = @_;
445 466
446 Carp::confess unless $self->{parent};#d# 467 return (undef, undef) unless $self->{parent};
447 468
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 469 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 470}
450 471
451# translate local coordinates to global coordinate system 472# translate local coordinates to global coordinate system
452sub coord2global { 473sub coord2global {
453 my ($self, $x, $y) = @_; 474 my ($self, $x, $y) = @_;
454 475
455 Carp::confess unless $self->{parent};#d# 476 return (undef, undef) unless $self->{parent};
456 477
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 478 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 479}
459 480
460sub invoke_focus_in { 481sub invoke_focus_in {
509sub connect { 530sub connect {
510 my ($self, $signal, $cb) = @_; 531 my ($self, $signal, $cb) = @_;
511 532
512 push @{ $self->{signal_cb}{$signal} }, $cb; 533 push @{ $self->{signal_cb}{$signal} }, $cb;
513 534
514 defined wantarray and CFPlus::guard { 535 defined wantarray and DC::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 536 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} }; 537 @{ $self->{signal_cb}{$signal} };
517 } 538 }
518} 539}
519 540
557# in .xs 578# in .xs
558 579
559sub set_parent { 580sub set_parent {
560 my ($self, $parent) = @_; 581 my ($self, $parent) = @_;
561 582
562 CFPlus::weaken ($self->{parent} = $parent); 583 DC::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 584 $self->set_visible if $parent->{visible};
564} 585}
565 586
566sub realloc { 587sub realloc {
567 my ($self) = @_; 588 my ($self) = @_;
605} 626}
606 627
607sub DESTROY { 628sub DESTROY {
608 my ($self) = @_; 629 my ($self) = @_;
609 630
610 return if CFPlus::in_destruct; 631 return if DC::in_destruct;
611 632
633 local $@;
612 eval { $self->destroy }; 634 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 635 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 636
615 delete $WIDGET{$self+0}; 637 delete $WIDGET{$self+0};
616} 638}
617 639
618############################################################################# 640#############################################################################
619 641
620package CFPlus::UI::DrawBG; 642package DC::UI::DrawBG;
621 643
622our @ISA = CFPlus::UI::Base::; 644our @ISA = DC::UI::Base::;
623 645
624use strict; 646use strict;
625use CFPlus::OpenGL; 647use DC::OpenGL;
626 648
627sub new { 649sub new {
628 my $class = shift; 650 my $class = shift;
629
630 # range [value, low, high, page]
631 651
632 $class->SUPER::new ( 652 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 653 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 654 #active_bg => [1, 1, 1, 0.5],
635 @_ 655 @_
647 my ($w, $h) = @$self{qw(w h)}; 667 my ($w, $h) = @$self{qw(w h)};
648 668
649 glEnable GL_BLEND; 669 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 670 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 671 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 672 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 673 glDisable GL_BLEND;
661 } 674 }
662} 675}
663 676
664############################################################################# 677#############################################################################
665 678
666package CFPlus::UI::Empty; 679package DC::UI::Empty;
667 680
668our @ISA = CFPlus::UI::Base::; 681our @ISA = DC::UI::Base::;
669 682
670sub new { 683sub new {
671 my ($class, %arg) = @_; 684 my ($class, %arg) = @_;
672 $class->SUPER::new (can_events => 0, %arg); 685 $class->SUPER::new (can_events => 0, %arg);
673} 686}
680 693
681sub draw { } 694sub draw { }
682 695
683############################################################################# 696#############################################################################
684 697
685package CFPlus::UI::Container; 698package DC::UI::Container;
686 699
687our @ISA = CFPlus::UI::Base::; 700our @ISA = DC::UI::Base::;
688 701
689sub new { 702sub new {
690 my ($class, %arg) = @_; 703 my ($class, %arg) = @_;
691 704
692 my $children = delete $arg{children}; 705 my $children = delete $arg{children};
725 @{$self->{children}}, @widgets 738 @{$self->{children}}, @widgets
726 ]; 739 ];
727 740
728 $self->realloc; 741 $self->realloc;
729 742
743 $self->emit (c_add => \@widgets);
744
730 map $_+0, @widgets 745 map $_+0, @widgets
731} 746}
732 747
733sub children { 748sub children {
734 @{ $_[0]{children} } 749 @{ $_[0]{children} }
735} 750}
736 751
737sub remove { 752sub remove {
738 my ($self, $child) = @_; 753 my ($self, @widgets) = @_;
739 754
755 $self->emit (c_remove => \@widgets);
756
757 for my $child (@widgets) {
740 delete $child->{parent}; 758 delete $child->{parent};
741 $child->hide; 759 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 760 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
761 }
744 762
745 $self->realloc; 763 $self->realloc;
746} 764}
747 765
748sub clear { 766sub clear {
776} 794}
777 795
778sub _draw { 796sub _draw {
779 my ($self) = @_; 797 my ($self) = @_;
780 798
781 $_->draw for @{$self->{children}}; 799 $_->draw for $self->visible_children;
782} 800}
783 801
784############################################################################# 802#############################################################################
785 803
786package CFPlus::UI::Bin; 804package DC::UI::Bin;
787 805
788our @ISA = CFPlus::UI::Container::; 806our @ISA = DC::UI::Container::;
789 807
790sub new { 808sub new {
791 my ($class, %arg) = @_; 809 my ($class, %arg) = @_;
792 810
793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 811 my $child = (delete $arg{child}) || new DC::UI::Empty::;
794 812
795 $class->SUPER::new (children => [$child], %arg) 813 $class->SUPER::new (children => [$child], %arg)
796} 814}
797 815
798sub add { 816sub add {
799 my ($self, $child) = @_; 817 my ($self, $child) = @_;
800 818
801 $self->SUPER::remove ($_) for @{ $self->{children} }; 819 $self->clear;
802 $self->SUPER::add ($child); 820 $self->SUPER::add ($child);
803} 821}
804 822
805sub remove { 823sub remove {
806 my ($self, $widget) = @_; 824 my ($self, $widget) = @_;
807 825
808 $self->SUPER::remove ($widget); 826 $self->SUPER::remove ($widget);
809 827
810 $self->{children} = [new CFPlus::UI::Empty] 828 $self->{children} = [new DC::UI::Empty]
811 unless @{$self->{children}}; 829 unless @{$self->{children}};
812} 830}
813 831
814sub child { $_[0]->{children}[0] } 832sub child { $_[0]->{children}[0] }
815 833
824 842
825 1 843 1
826} 844}
827 845
828############################################################################# 846#############################################################################
829
830# back-buffered drawing area 847# back-buffered drawing area
831 848
832package CFPlus::UI::Window; 849package DC::UI::Window;
833 850
834our @ISA = CFPlus::UI::Bin::; 851our @ISA = DC::UI::Bin::;
835 852
836use CFPlus::OpenGL; 853use DC::OpenGL;
837 854
838sub new { 855sub new {
839 my ($class, %arg) = @_; 856 my ($class, %arg) = @_;
840 857
841 my $self = $class->SUPER::new (%arg); 858 my $self = $class->SUPER::new (%arg);
863} 880}
864 881
865sub render_child { 882sub render_child {
866 my ($self) = @_; 883 my ($self) = @_;
867 884
868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 885 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
869 glClearColor 0, 0, 0, 0; 886 glClearColor 0, 0, 0, 0;
870 glClear GL_COLOR_BUFFER_BIT; 887 glClear GL_COLOR_BUFFER_BIT;
871 888
872 { 889 {
873 package CFPlus::UI::Base; 890 package DC::UI::Base;
874 891
875 local ($draw_x, $draw_y, $draw_w, $draw_h) = 892 local ($draw_x, $draw_y, $draw_w, $draw_h) =
876 (0, 0, $self->{w}, $self->{h}); 893 (0, 0, $self->{w}, $self->{h});
877 894
878 $self->_render; 895 $self->_render;
895 glDisable GL_TEXTURE_2D; 912 glDisable GL_TEXTURE_2D;
896} 913}
897 914
898############################################################################# 915#############################################################################
899 916
900package CFPlus::UI::ViewPort; 917package DC::UI::ViewPort;
901 918
902use List::Util qw(min max); 919use List::Util qw(min max);
903 920
904our @ISA = CFPlus::UI::Window::; 921our @ISA = DC::UI::Window::;
905 922
906sub new { 923sub new {
907 my $class = shift; 924 my $class = shift;
908 925
909 $class->SUPER::new ( 926 $class->SUPER::new (
951 $self->emit (changed => $x, $y); 968 $self->emit (changed => $x, $y);
952 $self->update; 969 $self->update;
953 } 970 }
954} 971}
955 972
973sub set_center {
974 my ($self, $x, $y) = @_;
975
976 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
977}
978
979sub make_visible {
980 my ($self, $x, $y, $border) = @_;
981
982 if ( $x < $self->{view_x} + $self->{w} * $border
983 || $x > $self->{view_x} + $self->{w} * (1 - $border)
984 || $y < $self->{view_y} + $self->{h} * $border
985 || $y > $self->{view_y} + $self->{h} * (1 - $border)
986 ) {
987 $self->set_center ($x, $y);
988 }
989}
990
956# hmm, this does not work for topleft of $self... but we should not ask for that 991# hmm, this does not work for topleft of $self... but we should not ask for that
957sub coord2local { 992sub coord2local {
958 my ($self, $x, $y) = @_; 993 my ($self, $x, $y) = @_;
959 994
960 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 995 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1010 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
976 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1011 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
977 ) { 1012 ) {
978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1013 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
979 } else { 1014 } else {
980 $self->CFPlus::UI::Base::find_widget ($x, $y) 1015 $self->DC::UI::Base::find_widget ($x, $y)
981 } 1016 }
982} 1017}
983 1018
984sub _render { 1019sub _render {
985 my ($self) = @_; 1020 my ($self) = @_;
986 1021
987 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1022 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}; 1023 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
989 1024
990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1025 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
991 1026
992 $self->SUPER::_render; 1027 $self->SUPER::_render;
993} 1028}
994 1029
995############################################################################# 1030#############################################################################
996 1031
997package CFPlus::UI::ScrolledWindow; 1032package DC::UI::ScrolledWindow;
998 1033
999our @ISA = CFPlus::UI::Table::; 1034our @ISA = DC::UI::Table::;
1000 1035
1001sub new { 1036sub new {
1002 my ($class, %arg) = @_; 1037 my ($class, %arg) = @_;
1003 1038
1004 my $child = delete $arg{child}; 1039 my $child = delete $arg{child};
1005 1040
1006 my $self; 1041 my $self;
1007 1042
1008 my $hslider = new CFPlus::UI::Slider 1043 my $hslider = new DC::UI::Slider
1009 col => 0, 1044 c_col => 0,
1010 row => 1, 1045 c_row => 1,
1011 vertical => 0, 1046 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix 1047 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub { 1048 on_changed => sub {
1014 $self->{hpos} = $_[1]; 1049 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1050 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 }, 1051 },
1017 ; 1052 ;
1018 1053
1019 my $vslider = new CFPlus::UI::Slider 1054 my $vslider = new DC::UI::Slider
1020 col => 1, 1055 c_col => 1,
1021 row => 0, 1056 c_row => 0,
1022 vertical => 1, 1057 vertical => 1,
1023 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub { 1059 on_changed => sub {
1025 $self->{vpos} = $_[1]; 1060 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1036 col_expand => [1, 0], 1071 col_expand => [1, 0],
1037 row_expand => [1, 0], 1072 row_expand => [1, 0],
1038 %arg, 1073 %arg,
1039 ); 1074 );
1040 1075
1041 $self->{vp} = new CFPlus::UI::ViewPort 1076 $self->{vp} = new DC::UI::ViewPort
1042 col => 0, 1077 c_col => 0,
1043 row => 0, 1078 c_row => 0,
1044 expand => 1, 1079 expand => 1,
1045 scroll_x => $self->{scroll_x}, 1080 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y}, 1081 scroll_y => $self->{scroll_y},
1047 on_changed => sub { 1082 on_changed => sub {
1048 my ($vp, $x, $y) = @_; 1083 my ($vp, $x, $y) = @_;
1070 my ($self, $widget) = @_; 1105 my ($self, $widget) = @_;
1071 1106
1072 $self->{vp}->add ($self->{child} = $widget); 1107 $self->{vp}->add ($self->{child} = $widget);
1073} 1108}
1074 1109
1110sub set_offset { shift->{vp}->set_offset (@_) }
1111sub set_center { shift->{vp}->set_center (@_) }
1112sub make_visible { shift->{vp}->make_visible (@_) }
1113
1075sub update_slider { 1114sub update_slider {
1076 my ($self) = @_; 1115 my ($self) = @_;
1077 1116
1078 my $child = ($self->{vp} or return)->child; 1117 my $child = ($self->{vp} or return)->child;
1079 1118
1168 $self->SUPER::invoke_size_allocate ($w, $h) 1207 $self->SUPER::invoke_size_allocate ($w, $h)
1169} 1208}
1170 1209
1171############################################################################# 1210#############################################################################
1172 1211
1173package CFPlus::UI::Frame; 1212package DC::UI::Frame;
1174 1213
1175our @ISA = CFPlus::UI::Bin::; 1214our @ISA = DC::UI::Bin::;
1176 1215
1177use CFPlus::OpenGL; 1216use DC::OpenGL;
1178 1217
1179sub new { 1218sub new {
1180 my $class = shift; 1219 my $class = shift;
1181 1220
1182 $class->SUPER::new ( 1221 $class->SUPER::new (
1192 my ($w, $h) = @$self{qw(w h)}; 1231 my ($w, $h) = @$self{qw(w h)};
1193 1232
1194 glEnable GL_BLEND; 1233 glEnable GL_BLEND;
1195 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196 glColor_premultiply @{ $self->{bg} }; 1235 glColor_premultiply @{ $self->{bg} };
1197
1198 glBegin GL_QUADS;
1199 glVertex 0 , 0;
1200 glVertex 0 , $h;
1201 glVertex $w, $h; 1236 glRect 0, 0, $w, $h;
1202 glVertex $w, 0;
1203 glEnd;
1204
1205 glDisable GL_BLEND; 1237 glDisable GL_BLEND;
1206 } 1238 }
1207 1239
1208 $self->SUPER::_draw; 1240 $self->SUPER::_draw;
1209} 1241}
1210 1242
1211############################################################################# 1243#############################################################################
1212 1244
1213package CFPlus::UI::FancyFrame; 1245package DC::UI::FancyFrame;
1214 1246
1215our @ISA = CFPlus::UI::Bin::; 1247our @ISA = DC::UI::Bin::;
1216 1248
1217use CFPlus::OpenGL; 1249use DC::OpenGL;
1218 1250
1219sub new { 1251sub new {
1220 my ($class, %arg) = @_; 1252 my ($class, %arg) = @_;
1221 1253
1222 if ((exists $arg{label}) && !ref $arg{label}) { 1254 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label 1255 $arg{label} = new DC::UI::Label
1224 align => 1, 1256 align => 1,
1225 valign => 0, 1257 valign => 0.5,
1226 text => $arg{label}, 1258 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75; 1259 fontsize => ($arg{border} || 0.8) * 0.75;
1228 } 1260 }
1229 1261
1230 my $self = $class->SUPER::new ( 1262 my $self = $class->SUPER::new (
1231 # label => "", 1263 # label => "",
1232 fg => [0.6, 0.3, 0.1], 1264 fg => undef,
1233 border => 0.8, 1265 border => 0.8,
1234 style => 'single', 1266 style => 'single',
1235 %arg, 1267 %arg,
1236 ); 1268 );
1237 1269
1240 1272
1241sub add { 1273sub add {
1242 my ($self, @widgets) = @_; 1274 my ($self, @widgets) = @_;
1243 1275
1244 $self->SUPER::add (@widgets); 1276 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1277 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1246} 1278}
1247 1279
1248sub border { 1280sub border {
1249 int $_[0]{border} * $::FONTSIZE 1281 int $_[0]{border} * $::FONTSIZE
1250} 1282}
1290 my $border = $self->border; 1322 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h}); 1323 my ($w, $h) = ($self->{w}, $self->{h});
1292 1324
1293 $child->draw; 1325 $child->draw;
1294 1326
1295 glColor @{$self->{fg}}; 1327 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1296 glBegin GL_LINE_STRIP; 1328 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1329 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1330 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1331 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; 1332 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1308 } 1340 }
1309} 1341}
1310 1342
1311############################################################################# 1343#############################################################################
1312 1344
1313package CFPlus::UI::Toplevel; 1345package DC::UI::Toplevel;
1314 1346
1315our @ISA = CFPlus::UI::Bin::; 1347our @ISA = DC::UI::Bin::;
1316 1348
1317use CFPlus::OpenGL; 1349use DC::OpenGL;
1318 1350
1319my $bg = 1351my $bg =
1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1352 new_from_resource DC::Texture "d1_bg.png",
1321 mipmap => 1, wrap => 1; 1353 mipmap => 1, wrap => 1;
1322 1354
1323my @border = 1355my @border =
1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1356 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); 1357 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326 1358
1327my @icon = 1359my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1360 map { new_from_resource DC::Texture $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png); 1361 qw(x1_move.png x1_resize.png);
1330 1362
1331sub new { 1363sub new {
1332 my ($class, %arg) = @_; 1364 my ($class, %arg) = @_;
1333 1365
1334 my $self = $class->SUPER::new ( 1366 my $self = $class->SUPER::new (
1335 bg => [1, 1, 1, 1], 1367 bg => [1, 1, 1, 1],
1336 border_bg => [1, 1, 1, 1], 1368 border_bg => [1, 1, 1, 1],
1337 border => 0.6, 1369 border => 0.8,
1338 can_events => 1, 1370 can_events => 1,
1339 min_w => 64, 1371 min_w => 64,
1340 min_h => 32, 1372 min_h => 32,
1341 %arg, 1373 %arg,
1342 ); 1374 );
1343 1375
1344 $self->{title_widget} = new CFPlus::UI::Label 1376 $self->{title_widget} = new DC::UI::Label
1345 align => 0, 1377 align => 0.5,
1346 valign => 1, 1378 valign => 1,
1347 text => $self->{title}, 1379 text => $self->{title},
1348 fontsize => $self->{border}, 1380 fontsize => $self->{border},
1349 if exists $self->{title}; 1381 if exists $self->{title};
1350 1382
1351 if ($self->{has_close_button}) { 1383 if ($self->{has_close_button}) {
1352 $self->{close_button} = 1384 $self->{close_button} =
1353 new CFPlus::UI::ImageButton 1385 new DC::UI::ImageButton
1354 path => 'x1_close.png', 1386 path => 'x1_close.png',
1355 on_activate => sub { $self->emit ("delete") }; 1387 on_activate => sub { $self->emit ("delete") };
1356 1388
1357 $self->CFPlus::UI::Container::add ($self->{close_button}); 1389 $self->DC::UI::Container::add ($self->{close_button});
1358 } 1390 }
1359 1391
1360 $self 1392 $self
1361} 1393}
1362 1394
1363sub add { 1395sub add {
1364 my ($self, @widgets) = @_; 1396 my ($self, @widgets) = @_;
1365 1397
1366 $self->SUPER::add (@widgets); 1398 $self->SUPER::add (@widgets);
1367 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1399 $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}; 1400 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1369} 1401}
1370 1402
1371sub border { 1403sub border {
1372 int $_[0]{border} * $::FONTSIZE 1404 int $_[0]{border} * $::FONTSIZE
1405}
1406
1407sub get_max_wh {
1408 my ($self) = @_;
1409
1410 return ($self->{w}, $self->{h})
1411 if $self->{visible} && $self->{w};
1412
1413 $self->SUPER::get_max_wh
1373} 1414}
1374 1415
1375sub size_request { 1416sub size_request {
1376 my ($self) = @_; 1417 my ($self) = @_;
1377 1418
1549 if $self->{close_button}; 1590 if $self->{close_button};
1550} 1591}
1551 1592
1552############################################################################# 1593#############################################################################
1553 1594
1554package CFPlus::UI::Table; 1595package DC::UI::Table;
1555 1596
1556our @ISA = CFPlus::UI::Container::; 1597our @ISA = DC::UI::Container::;
1557 1598
1558use List::Util qw(max sum); 1599use List::Util qw(max sum);
1559 1600
1560use CFPlus::OpenGL; 1601use DC::OpenGL;
1561 1602
1562sub new { 1603sub new {
1563 my $class = shift; 1604 my $class = shift;
1564 1605
1565 $class->SUPER::new ( 1606 $class->SUPER::new (
1571 1612
1572sub add { 1613sub add {
1573 my ($self, @widgets) = @_; 1614 my ($self, @widgets) = @_;
1574 1615
1575 for my $child (@widgets) { 1616 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1; 1617 $child->{c_rowspan} ||= 1;
1577 $child->{colspan} ||= 1; 1618 $child->{c_colspan} ||= 1;
1578 } 1619 }
1579 1620
1580 $self->SUPER::add (@widgets); 1621 $self->SUPER::add (@widgets);
1581} 1622}
1582 1623
1586 my @widgets; 1627 my @widgets;
1587 1628
1588 while (@_) { 1629 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, (); 1630 my ($col, $row, $child) = splice @_, 0, 3, ();
1590 1631
1591 $child->{row} = $row; 1632 $child->{c_row} = $row;
1592 $child->{col} = $col; 1633 $child->{c_col} = $col;
1593 1634
1594 push @widgets, $child; 1635 push @widgets, $child;
1595 } 1636 }
1596 1637
1597 $self->add (@widgets); 1638 $self->add (@widgets);
1603 my (@w, @h); 1644 my (@w, @h);
1604 1645
1605 my @children = $self->children; 1646 my @children = $self->children;
1606 1647
1607 # first pass, columns 1648 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1649 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1650 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610 1651
1611 my $sw = sum @w[$c .. $c + $cs - 1]; 1652 my $sw = sum @w[$c .. $c + $cs - 1];
1612 1653
1613 if ($w > $sw) { 1654 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1655 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 } 1656 }
1616 } 1657 }
1617 1658
1618 # second pass, rows 1659 # second pass, rows
1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1660 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1661 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621 1662
1622 my $sh = sum @h[$r .. $r + $rs - 1]; 1663 my $sh = sum @h[$r .. $r + $rs - 1];
1623 1664
1624 if ($h > $sh) { 1665 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1666 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1626 } 1667 }
1627 } 1668 }
1628 1669
1629 (\@w, \@h) 1670 (\@w, \@h)
1630} 1671}
1653 @col_expand = (1) x @$ws unless @col_expand; 1694 @col_expand = (1) x @$ws unless @col_expand;
1654 my $col_expand = (sum @col_expand) || 1; 1695 my $col_expand = (sum @col_expand) || 1;
1655 1696
1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1697 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1657 1698
1658 CFPlus::UI::harmonize $ws; 1699 DC::UI::harmonize $ws;
1659 1700
1660 my @row_expand = @{$self->{row_expand}}; 1701 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand; 1702 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1; 1703 my $row_expand = (sum @row_expand) || 1;
1663 1704
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1705 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665 1706
1666 CFPlus::UI::harmonize $hs; 1707 DC::UI::harmonize $hs;
1667 1708
1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1709 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1710 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670 1711
1671 for my $widget ($self->children) { 1712 for my $widget ($self->children) {
1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1713 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673 1714
1674 $widget->configure ( 1715 $widget->configure (
1675 $x[$c], $y[$r], 1716 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1717 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677 ); 1718 );
1680 1 1721 1
1681} 1722}
1682 1723
1683############################################################################# 1724#############################################################################
1684 1725
1685package CFPlus::UI::Fixed; 1726package DC::UI::Fixed;
1686 1727
1687use List::Util qw(min max); 1728use List::Util qw(min max);
1688 1729
1689our @ISA = CFPlus::UI::Container::; 1730our @ISA = DC::UI::Container::;
1690
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697 1731
1698sub _scale($$$) { 1732sub _scale($$$) {
1699 my ($mode, $val, $max) = @_; 1733 my ($rel, $val, $max) = @_;
1700 1734
1701 $mode eq "abs" ? $val 1735 $rel ? $val * $max : $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704} 1736}
1705 1737
1706sub size_request { 1738sub size_request {
1707 my ($self) = @_; 1739 my ($self) = @_;
1708 1740
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1741 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710 1742
1711 # determine overall size by querying abs widgets 1743 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1745 unless ($child->{c_rel}) {
1746 my $x = $child->{c_x};
1747 my $y = $child->{c_y};
1714 1748
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1721 } 1751 }
1722 } 1752 }
1723 1753
1724 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
1726 1756
1727 # now layout remaining widgets 1757 # now layout remaining widgets
1728 for my $child ($self->visible_children) { 1758 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1759 if ($child->{c_rel}) {
1760 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1761 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1730 1762
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1739 } 1765 }
1740 } 1766 }
1741 1767
1742 my $W = $x2 - $x1; 1768 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1; 1769 my $H = $y2 - $y1;
1747 1773
1748sub invoke_size_allocate { 1774sub invoke_size_allocate {
1749 my ($self, $W, $H) = @_; 1775 my ($self, $W, $H) = @_;
1750 1776
1751 for my $child ($self->visible_children) { 1777 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1778 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1779 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1753 1780
1754 $x = _scale $pos, $x, $W; 1781 $x += $child->{c_halign} * $child->{req_w};
1755 $y = _scale $pos, $x, $H; 1782 $y += $child->{c_valign} * $child->{req_h};
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1758 1783
1759 $child->configure ($x, $y, $w, $h); 1784 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1760 } 1785 }
1761 1786
1762 1 1787 1
1763} 1788}
1764 1789
1765############################################################################# 1790#############################################################################
1766 1791
1767package CFPlus::UI::Box; 1792package DC::UI::Box;
1768 1793
1769our @ISA = CFPlus::UI::Container::; 1794our @ISA = DC::UI::Container::;
1770 1795
1771sub size_request { 1796sub size_request {
1772 my ($self) = @_; 1797 my ($self) = @_;
1798
1799 my @children = $self->visible_children;
1773 1800
1774 $self->{vertical} 1801 $self->{vertical}
1775 ? ( 1802 ? (
1776 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1803 (List::Util::max map $_->{req_w}, @children),
1777 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_h}, @children),
1778 ) 1805 )
1779 : ( 1806 : (
1780 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1807 (List::Util::sum map $_->{req_w}, @children),
1781 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1808 (List::Util::max map $_->{req_h}, @children),
1782 ) 1809 )
1783} 1810}
1784 1811
1785sub invoke_size_allocate { 1812sub invoke_size_allocate {
1786 my ($self, $w, $h) = @_; 1813 my ($self, $w, $h) = @_;
1807 $req[$_] += $space * $children[$_]{expand} 1834 $req[$_] += $space * $children[$_]{expand}
1808 for 0 .. $#children; 1835 for 0 .. $#children;
1809 } 1836 }
1810 } 1837 }
1811 1838
1812 CFPlus::UI::harmonize \@req; 1839 DC::UI::harmonize \@req;
1813 1840
1814 my $pos = 0; 1841 my $pos = 0;
1815 for (0 .. $#children) { 1842 for (0 .. $#children) {
1816 my $alloc = $req[$_]; 1843 my $alloc = $req[$_];
1817 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1844 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1822 1 1849 1
1823} 1850}
1824 1851
1825############################################################################# 1852#############################################################################
1826 1853
1827package CFPlus::UI::HBox; 1854package DC::UI::HBox;
1828 1855
1829our @ISA = CFPlus::UI::Box::; 1856our @ISA = DC::UI::Box::;
1830 1857
1831sub new { 1858sub new {
1832 my $class = shift; 1859 my $class = shift;
1833 1860
1834 $class->SUPER::new ( 1861 $class->SUPER::new (
1837 ) 1864 )
1838} 1865}
1839 1866
1840############################################################################# 1867#############################################################################
1841 1868
1842package CFPlus::UI::VBox; 1869package DC::UI::VBox;
1843 1870
1844our @ISA = CFPlus::UI::Box::; 1871our @ISA = DC::UI::Box::;
1845 1872
1846sub new { 1873sub new {
1847 my $class = shift; 1874 my $class = shift;
1848 1875
1849 $class->SUPER::new ( 1876 $class->SUPER::new (
1852 ) 1879 )
1853} 1880}
1854 1881
1855############################################################################# 1882#############################################################################
1856 1883
1857package CFPlus::UI::Label; 1884package DC::UI::Label;
1858 1885
1859our @ISA = CFPlus::UI::DrawBG::; 1886our @ISA = DC::UI::DrawBG::;
1860 1887
1861use CFPlus::OpenGL; 1888use DC::OpenGL;
1862 1889
1863sub new { 1890sub new {
1864 my ($class, %arg) = @_; 1891 my ($class, %arg) = @_;
1865 1892
1866 my $self = $class->SUPER::new ( 1893 my $self = $class->SUPER::new (
1871 #text => initial text 1898 #text => initial text
1872 #markup => initial narkup 1899 #markup => initial narkup
1873 #max_w => maximum pixel width 1900 #max_w => maximum pixel width
1874 #style => 0, # render flags 1901 #style => 0, # render flags
1875 ellipsise => 3, # end 1902 ellipsise => 3, # end
1876 layout => (new CFPlus::Layout), 1903 layout => (new DC::Layout),
1877 fontsize => 1, 1904 fontsize => 1,
1878 align => -1, 1905 align => 0.5,
1879 valign => -1, 1906 valign => 0.5,
1880 padding_x => 2, 1907 padding_x => 4,
1881 padding_y => 2, 1908 padding_y => 2,
1882 can_events => 0, 1909 can_events => 0,
1883 %arg 1910 %arg
1884 ); 1911 );
1885 1912
1886 if (exists $self->{template}) { 1913 if (exists $self->{template}) {
1887 my $layout = new CFPlus::Layout; 1914 my $layout = new DC::Layout;
1888 $layout->set_text (delete $self->{template}); 1915 $layout->set_text (delete $self->{template});
1889 $self->{template} = $layout; 1916 $self->{template} = $layout;
1890 } 1917 }
1891 1918
1892 if (exists $self->{markup}) { 1919 if (exists $self->{markup}) {
1910 1937
1911 delete $self->{ox}; 1938 delete $self->{ox};
1912 $self->SUPER::realloc; 1939 $self->SUPER::realloc;
1913} 1940}
1914 1941
1942sub clear {
1943 my ($self) = @_;
1944
1945 $self->set_text ("");
1946}
1947
1915sub set_text { 1948sub set_text {
1916 my ($self, $text) = @_; 1949 my ($self, $text) = @_;
1917 1950
1918 return if $self->{text} eq "T$text"; 1951 return if $self->{text} eq "T$text";
1919 $self->{text} = "T$text"; 1952 $self->{text} = "T$text";
1942 1975
1943sub size_request { 1976sub size_request {
1944 my ($self) = @_; 1977 my ($self) = @_;
1945 1978
1946 $self->{size_req} ||= do { 1979 $self->{size_req} ||= do {
1980 my ($max_w, $max_h) = $self->get_max_wh;
1981
1947 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1982 $self->{layout}->set_font ($self->{font}) if $self->{font};
1948 $self->{layout}->set_width ($self->{max_w} || -1); 1983 $self->{layout}->set_width ($max_w);
1949 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1984 $self->{layout}->set_ellipsise ($self->{ellipsise});
1950 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1985 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1951 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1986 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1952 1987
1953 my ($w, $h) = $self->{layout}->size; 1988 my ($w, $h) = $self->{layout}->size;
1954 1989
1955 if (exists $self->{template}) { 1990 if (exists $self->{template}) {
1956 $self->{template}->set_font ($self->{font}) if $self->{font}; 1991 $self->{template}->set_font ($self->{font}) if $self->{font};
1957 $self->{template}->set_width ($self->{max_w} || -1); 1992 $self->{template}->set_width ($max_w);
1958 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1993 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1959 1994
1960 my ($w2, $h2) = $self->{template}->size; 1995 my ($w2, $h2) = $self->{template}->size;
1961 1996
1962 $w = List::Util::max $w, $w2; 1997 $w = List::Util::max $w, $w2;
2018 2053
2019 [$self->{layout}->size] 2054 [$self->{layout}->size]
2020 }; 2055 };
2021 2056
2022 unless (exists $self->{ox}) { 2057 unless (exists $self->{ox}) {
2023 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2058 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2024 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2059 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2025 : ($self->{w} - $size->[0]) * 0.5);
2026 2060
2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2061 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2029 : ($self->{h} - $size->[1]) * 0.5);
2030 }; 2062 };
2031 2063
2032# unless ($self->{list}) { 2064# unless ($self->{list}) {
2033# $self->{list} = CFPlus::OpenGL::glGenList; 2065# $self->{list} = DC::OpenGL::glGenList;
2034# CFPlus::OpenGL::glNewList $self->{list}; 2066# DC::OpenGL::glNewList $self->{list};
2035# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2067# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036# CFPlus::OpenGL::glEndList; 2068# DC::OpenGL::glEndList;
2037# } 2069# }
2038# 2070#
2039# CFPlus::OpenGL::glCallList $self->{list}; 2071# DC::OpenGL::glCallList $self->{list};
2040 2072
2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2073 $self->{layout}->draw;
2042} 2074}
2043 2075
2044#sub destroy { 2076#sub destroy {
2045# my ($self) = @_; 2077# my ($self) = @_;
2046# 2078#
2047# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; 2079# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2048# 2080#
2049# $self->SUPER::destroy; 2081# $self->SUPER::destroy;
2050#} 2082#}
2051 2083
2052############################################################################# 2084#############################################################################
2053 2085
2054package CFPlus::UI::EntryBase; 2086package DC::UI::EntryBase;
2055 2087
2056our @ISA = CFPlus::UI::Label::; 2088our @ISA = DC::UI::Label::;
2057 2089
2058use CFPlus::OpenGL; 2090use DC::OpenGL;
2059 2091
2060sub new { 2092sub new {
2061 my $class = shift; 2093 my $class = shift;
2062 2094
2063 $class->SUPER::new ( 2095 $class->SUPER::new (
2064 fg => [1, 1, 1], 2096 fg => [1, 1, 1],
2065 bg => [0, 0, 0, 0.2], 2097 bg => [0, 0, 0, 0.2],
2098 outline => undef,
2066 active_bg => [1, 1, 1, 0.5], 2099 active_bg => [0, 0, 1, .2],
2067 active_fg => [0, 0, 0], 2100 active_fg => [1, 1, 1],
2101 active_outline => [1, 1, 0],
2068 can_hover => 1, 2102 can_hover => 1,
2069 can_focus => 1, 2103 can_focus => 1,
2104 align => 0,
2070 valign => 0, 2105 valign => 0.5,
2071 can_events => 1, 2106 can_events => 1,
2072 ellipsise => 0, 2107 ellipsise => 0,
2108 padding_x => 4,
2109 padding_y => 2,
2073 #text => ... 2110 #text => ...
2074 #hidden => "*", 2111 #hidden => "*",
2075 @_ 2112 @_
2076 ) 2113 )
2077} 2114}
2124 2161
2125 my $text = $self->get_text; 2162 my $text = $self->get_text;
2126 2163
2127 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2164 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2128 2165
2129 if ($uni == 8) { 2166 if ($sym == DC::SDLK_BACKSPACE) {
2130 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2167 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2131 } elsif ($uni == 127) { 2168 } elsif ($sym == DC::SDLK_DELETE) {
2132 substr $text, $self->{cursor}, 1, ""; 2169 substr $text, $self->{cursor}, 1, "";
2133 } elsif ($sym == CFPlus::SDLK_LEFT) { 2170 } elsif ($sym == DC::SDLK_LEFT) {
2134 --$self->{cursor} if $self->{cursor}; 2171 --$self->{cursor} if $self->{cursor};
2135 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2172 } elsif ($sym == DC::SDLK_RIGHT) {
2136 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2173 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2137 } elsif ($sym == CFPlus::SDLK_HOME) { 2174 } elsif ($sym == DC::SDLK_HOME) {
2138 # what a hack 2175 # what a hack
2139 $self->{cursor} = 2176 $self->{cursor} =
2140 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2177 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2141 ? length $1 2178 ? length $1
2142 : 0; 2179 : 0;
2143 } elsif ($sym == CFPlus::SDLK_END) { 2180 } elsif ($sym == DC::SDLK_END) {
2144 # uh, again 2181 # uh, again
2145 $self->{cursor} = 2182 $self->{cursor} =
2146 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2183 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2147 ? $self->{cursor} + length $1 2184 ? $self->{cursor} + length $1
2148 : length $self->{text}; 2185 : length $self->{text};
2212 glColor_premultiply @{$self->{bg}}; 2249 glColor_premultiply @{$self->{bg}};
2213 } 2250 }
2214 2251
2215 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2253 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2217 glBegin GL_QUADS;
2218 glVertex 0 , 0;
2219 glVertex 0 , $self->{h};
2220 glVertex $self->{w}, $self->{h}; 2254 glRect 0, 0, $self->{w}, $self->{h};
2221 glVertex $self->{w}, 0;
2222 glEnd;
2223 glDisable GL_BLEND; 2255 glDisable GL_BLEND;
2224 2256
2225 $self->SUPER::_draw; 2257 $self->SUPER::_draw;
2226 2258
2227 #TODO: force update every cursor change :( 2259 #TODO: force update every cursor change :(
2229 2261
2230 unless (exists $self->{cur_h}) { 2262 unless (exists $self->{cur_h}) {
2231 my $text = substr $self->{text}, 0, $self->{cursor}; 2263 my $text = substr $self->{text}, 0, $self->{cursor};
2232 utf8::encode $text; 2264 utf8::encode $text;
2233 2265
2234 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2266 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2235 } 2267 }
2236 2268
2269 glColor_premultiply @{$self->{active_fg}};
2237 glBegin GL_LINES; 2270 glBegin GL_LINES;
2238 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2271 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2272 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2240 glEnd; 2273 glEnd;
2274
2275 glLineWidth 3;
2276 glColor @{$self->{active_outline}};
2277 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2278 glLineWidth 1;
2279
2280 } else {
2281 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2282 glBegin GL_LINE_STRIP;
2283 glVertex .5, $self->{h} * .5;
2284 glVertex .5, $self->{h} - 2.5;
2285 glVertex $self->{w} - .5, $self->{h} - 2.5;
2286 glVertex $self->{w} - .5, $self->{h} * .5;
2287 glEnd;
2241 } 2288 }
2242} 2289}
2243 2290
2244############################################################################# 2291#############################################################################
2245 2292
2246package CFPlus::UI::Entry; 2293package DC::UI::Entry;
2247 2294
2248our @ISA = CFPlus::UI::EntryBase::; 2295our @ISA = DC::UI::EntryBase::;
2249 2296
2250use CFPlus::OpenGL; 2297use DC::OpenGL;
2298
2299sub new {
2300 my $class = shift;
2301
2302 $class->SUPER::new (
2303 history_pointer => -1,
2304 @_
2305 )
2306}
2307
2251 2308
2252sub invoke_key_down { 2309sub invoke_key_down {
2253 my ($self, $ev) = @_; 2310 my ($self, $ev) = @_;
2254 2311
2255 my $sym = $ev->{sym}; 2312 my $sym = $ev->{sym};
2261 $self->{history_pointer} = -1; 2318 $self->{history_pointer} = -1;
2262 $self->{history_saveback} = ''; 2319 $self->{history_saveback} = '';
2263 $self->emit (activate => $txt); 2320 $self->emit (activate => $txt);
2264 $self->update; 2321 $self->update;
2265 2322
2266 } elsif ($sym == CFPlus::SDLK_UP) { 2323 } elsif ($sym == DC::SDLK_UP) {
2267 if ($self->{history_pointer} < 0) { 2324 if ($self->{history_pointer} < 0) {
2268 $self->{history_saveback} = $self->get_text; 2325 $self->{history_saveback} = $self->get_text;
2269 } 2326 }
2270 if (@{$self->{history} || []} > 0) { 2327 if (@{$self->{history} || []} > 0) {
2271 $self->{history_pointer}++; 2328 $self->{history_pointer}++;
2273 $self->{history_pointer} = @{$self->{history} || []} - 1; 2330 $self->{history_pointer} = @{$self->{history} || []} - 1;
2274 } 2331 }
2275 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2332 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2276 } 2333 }
2277 2334
2278 } elsif ($sym == CFPlus::SDLK_DOWN) { 2335 } elsif ($sym == DC::SDLK_DOWN) {
2279 $self->{history_pointer}--; 2336 $self->{history_pointer}--;
2280 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2337 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2281 2338
2282 if ($self->{history_pointer} >= 0) { 2339 if ($self->{history_pointer} >= 0) {
2283 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2340 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2284 } else { 2341 } else {
2342 if (defined $self->{history_saveback}) {
2285 $self->set_text ($self->{history_saveback}); 2343 $self->set_text ($self->{history_saveback});
2344 $self->{history_saveback} = undef;
2345 }
2286 } 2346 }
2287 2347
2288 } else { 2348 } else {
2289 return $self->SUPER::invoke_key_down ($ev) 2349 return $self->SUPER::invoke_key_down ($ev)
2290 } 2350 }
2292 1 2352 1
2293} 2353}
2294 2354
2295############################################################################# 2355#############################################################################
2296 2356
2297package CFPlus::UI::TextEdit; 2357package DC::UI::TextEdit;
2298 2358
2299our @ISA = CFPlus::UI::EntryBase::; 2359our @ISA = DC::UI::EntryBase::;
2300 2360
2301use CFPlus::OpenGL; 2361use DC::OpenGL;
2362
2363sub new {
2364 my $class = shift;
2365
2366 $class->SUPER::new (
2367 padding_y => 4,
2368
2369 @_
2370 )
2371}
2302 2372
2303sub move_cursor_ver { 2373sub move_cursor_ver {
2304 my ($self, $dy) = @_; 2374 my ($self, $dy) = @_;
2305 2375
2306 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2376 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2307 2377
2308 $y += $dy; 2378 $line += $dy;
2309 2379
2310 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2380 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2311 $self->{cursor} = $index; 2381 $self->{cursor} = $index;
2312 delete $self->{cur_h}; 2382 delete $self->{cur_h};
2313 $self->update; 2383 $self->update;
2314 return; 2384 return;
2315 } 2385 }
2318sub invoke_key_down { 2388sub invoke_key_down {
2319 my ($self, $ev) = @_; 2389 my ($self, $ev) = @_;
2320 2390
2321 my $sym = $ev->{sym}; 2391 my $sym = $ev->{sym};
2322 2392
2323 if ($sym == CFPlus::SDLK_UP) { 2393 if ($sym == DC::SDLK_UP) {
2324 $self->move_cursor_ver (-1); 2394 $self->move_cursor_ver (-1);
2325 } elsif ($sym == CFPlus::SDLK_DOWN) { 2395 } elsif ($sym == DC::SDLK_DOWN) {
2326 $self->move_cursor_ver (+1); 2396 $self->move_cursor_ver (+1);
2327 } else { 2397 } else {
2328 return $self->SUPER::invoke_key_down ($ev) 2398 return $self->SUPER::invoke_key_down ($ev)
2329 } 2399 }
2330 2400
2331 1 2401 1
2332} 2402}
2333 2403
2334############################################################################# 2404#############################################################################
2335 2405
2336package CFPlus::UI::Button; 2406package DC::UI::ButtonBin;
2337 2407
2338our @ISA = CFPlus::UI::Label::; 2408our @ISA = DC::UI::Bin::;
2339 2409
2340use CFPlus::OpenGL; 2410use DC::OpenGL;
2341 2411
2342my @tex = 2412my @tex =
2343 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2413 map { new_from_resource DC::Texture $_, mipmap => 1 }
2344 qw(b1_button_inactive.png b1_button_active.png); 2414 qw(b1_button_inactive.png b1_button_active.png);
2345 2415
2346sub new { 2416sub new {
2347 my $class = shift; 2417 my $class = shift;
2348 2418
2349 $class->SUPER::new ( 2419 $class->SUPER::new (
2420 can_hover => 1,
2421 align => 0.5,
2422 valign => 0.5,
2423 can_events => 1,
2424 @_
2425 )
2426}
2427
2428sub invoke_button_up {
2429 my ($self, $ev, $x, $y) = @_;
2430
2431 $self->emit ("activate")
2432 if $x >= 0 && $x < $self->{w}
2433 && $y >= 0 && $y < $self->{h};
2434
2435 1
2436}
2437
2438sub _draw {
2439 my ($self) = @_;
2440
2441 glEnable GL_TEXTURE_2D;
2442 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2443 glColor 0, 0, 0, 1;
2444
2445 my $tex = $tex[$GRAB == $self];
2446 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2447
2448 glDisable GL_TEXTURE_2D;
2449
2450 $self->SUPER::_draw;
2451}
2452
2453#############################################################################
2454
2455package DC::UI::Button;
2456
2457our @ISA = DC::UI::Label::;
2458
2459use DC::OpenGL;
2460
2461my @tex =
2462 map { new_from_resource DC::Texture $_, mipmap => 1 }
2463 qw(b1_button_inactive.png b1_button_active.png);
2464
2465sub new {
2466 my $class = shift;
2467
2468 $class->SUPER::new (
2350 padding_x => 4, 2469 padding_x => 8,
2351 padding_y => 4, 2470 padding_y => 4,
2352 fg => [1.0, 1.0, 1.0], 2471 fg => [1.0, 1.0, 1.0],
2353 active_fg => [0.8, 0.8, 0.8], 2472 active_fg => [0.8, 0.8, 0.8],
2354 can_hover => 1, 2473 can_hover => 1,
2355 align => 0, 2474 align => 0.5,
2356 valign => 0, 2475 valign => 0.5,
2357 can_events => 1, 2476 can_events => 1,
2358 @_ 2477 @_
2359 ) 2478 )
2360} 2479}
2361 2480
2386 $self->SUPER::_draw; 2505 $self->SUPER::_draw;
2387} 2506}
2388 2507
2389############################################################################# 2508#############################################################################
2390 2509
2391package CFPlus::UI::CheckBox; 2510package DC::UI::CheckBox;
2392 2511
2393our @ISA = CFPlus::UI::DrawBG::; 2512our @ISA = DC::UI::DrawBG::;
2394 2513
2395my @tex = 2514my @tex =
2396 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2515 map { new_from_resource DC::Texture $_, mipmap => 1 }
2397 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2516 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2398 2517
2399use CFPlus::OpenGL; 2518use DC::OpenGL;
2400 2519
2401sub new { 2520sub new {
2402 my $class = shift; 2521 my $class = shift;
2403 2522
2404 $class->SUPER::new ( 2523 $class->SUPER::new (
2444sub _draw { 2563sub _draw {
2445 my ($self) = @_; 2564 my ($self) = @_;
2446 2565
2447 $self->SUPER::_draw; 2566 $self->SUPER::_draw;
2448 2567
2449 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2568 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2450 2569
2451 my ($w, $h) = @$self{qw(w h)}; 2570 my ($w, $h) = @$self{qw(w h)};
2452 2571
2453 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2572 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2454 2573
2461 glDisable GL_TEXTURE_2D; 2580 glDisable GL_TEXTURE_2D;
2462} 2581}
2463 2582
2464############################################################################# 2583#############################################################################
2465 2584
2466package CFPlus::UI::Image; 2585package DC::UI::Image;
2467 2586
2468our @ISA = CFPlus::UI::Base::; 2587our @ISA = DC::UI::Base::;
2469 2588
2470use CFPlus::OpenGL; 2589use DC::OpenGL;
2471 2590
2472our %texture_cache; 2591our %texture_cache;
2473 2592
2474sub new { 2593sub new {
2475 my $class = shift; 2594 my $class = shift;
2476 2595
2477 my $self = $class->SUPER::new ( 2596 my $self = $class->SUPER::new (
2478 can_events => 0, 2597 can_events => 0,
2598 scale => 1,
2479 @_, 2599 @_,
2480 ); 2600 );
2481 2601
2482 $self->{path} || $self->{tex} 2602 $self->{path} || $self->{tex}
2483 or Carp::croak "'path' or 'tex' attributes required"; 2603 or Carp::croak "'path' or 'tex' attributes required";
2484 2604
2485 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2605 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2486 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2606 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2487 2607
2488 CFPlus::weaken $texture_cache{$self->{path}}; 2608 DC::weaken $texture_cache{$self->{path}};
2489 2609
2490 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2610 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2491 2611
2492 $self 2612 $self
2493} 2613}
2494 2614
2495sub STORABLE_freeze { 2615sub STORABLE_freeze {
2496 my ($self, $cloning) = @_; 2616 my ($self, $cloning) = @_;
2497 2617
2498 $self->{path} 2618 $self->{path}
2499 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2619 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2500 2620
2501 $self->{path} 2621 $self->{path}
2502} 2622}
2503 2623
2504sub STORABLE_attach { 2624sub STORABLE_attach {
2508} 2628}
2509 2629
2510sub size_request { 2630sub size_request {
2511 my ($self) = @_; 2631 my ($self) = @_;
2512 2632
2513 ($self->{tex}{w}, $self->{tex}{h}) 2633 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2514} 2634}
2515 2635
2516sub _draw { 2636sub _draw {
2517 my ($self) = @_; 2637 my ($self) = @_;
2518 2638
2528 } 2648 }
2529 2649
2530 glEnable GL_TEXTURE_2D; 2650 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2651 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 2652
2533 $tex->draw_quad (0, 0, $w, $h); 2653 $tex->draw_quad_alpha (0, 0, $w, $h);
2534 2654
2535 glDisable GL_TEXTURE_2D; 2655 glDisable GL_TEXTURE_2D;
2536} 2656}
2537 2657
2538############################################################################# 2658#############################################################################
2539 2659
2540package CFPlus::UI::ImageButton; 2660package DC::UI::ImageButton;
2541 2661
2542our @ISA = CFPlus::UI::Image::; 2662our @ISA = DC::UI::Image::;
2543 2663
2544use CFPlus::OpenGL; 2664use DC::OpenGL;
2545 2665
2546my %textures; 2666my %textures;
2547 2667
2548sub new { 2668sub new {
2549 my $class = shift; 2669 my $class = shift;
2552 padding_x => 4, 2672 padding_x => 4,
2553 padding_y => 4, 2673 padding_y => 4,
2554 fg => [1, 1, 1], 2674 fg => [1, 1, 1],
2555 active_fg => [0, 0, 1], 2675 active_fg => [0, 0, 1],
2556 can_hover => 1, 2676 can_hover => 1,
2557 align => 0, 2677 align => 0.5,
2558 valign => 0, 2678 valign => 0.5,
2559 can_events => 1, 2679 can_events => 1,
2560 @_ 2680 @_
2561 ); 2681 );
2562} 2682}
2563 2683
2684sub invoke_button_down {
2685 my ($self, $ev, $x, $y) = @_;
2686
2687 1
2688}
2689
2564sub invoke_button_up { 2690sub invoke_button_up {
2565 my ($self, $ev, $x, $y) = @_; 2691 my ($self, $ev, $x, $y) = @_;
2566 2692
2567 $self->emit ("activate") 2693 $self->emit ("activate")
2568 if $x >= 0 && $x < $self->{w} 2694 if $x >= 0 && $x < $self->{w}
2571 1 2697 1
2572} 2698}
2573 2699
2574############################################################################# 2700#############################################################################
2575 2701
2576package CFPlus::UI::VGauge; 2702package DC::UI::VGauge;
2577 2703
2578our @ISA = CFPlus::UI::Base::; 2704our @ISA = DC::UI::Base::;
2579 2705
2580use List::Util qw(min max); 2706use List::Util qw(min max);
2581 2707
2582use CFPlus::OpenGL; 2708use DC::OpenGL;
2583 2709
2584my %tex = ( 2710my %tex = (
2585 food => [ 2711 food => [
2586 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2712 map { new_from_resource DC::Texture $_, mipmap => 1 }
2587 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2713 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2588 ], 2714 ],
2589 grace => [ 2715 grace => [
2590 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2716 map { new_from_resource DC::Texture $_, mipmap => 1 }
2591 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2717 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2592 ], 2718 ],
2593 hp => [ 2719 hp => [
2594 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2720 map { new_from_resource DC::Texture $_, mipmap => 1 }
2595 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2721 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2596 ], 2722 ],
2597 mana => [ 2723 mana => [
2598 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2724 map { new_from_resource DC::Texture $_, mipmap => 1 }
2599 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2725 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2600 ], 2726 ],
2601); 2727);
2602 2728
2603# eg. VGauge->new (gauge => 'food'), default gauge: food 2729# eg. VGauge->new (gauge => 'food'), default gauge: food
2706 glDisable GL_TEXTURE_2D; 2832 glDisable GL_TEXTURE_2D;
2707} 2833}
2708 2834
2709############################################################################# 2835#############################################################################
2710 2836
2837package DC::UI::Progress;
2838
2839our @ISA = DC::UI::Label::;
2840
2841use DC::OpenGL;
2842
2843sub new {
2844 my ($class, %arg) = @_;
2845
2846 my $self = $class->SUPER::new (
2847 fg => [1, 1, 1],
2848 bg => [0, 0, 1, 0.2],
2849 bar => [0.7, 0.5, 0.1, 0.8],
2850 outline => [0.4, 0.3, 0],
2851 fontsize => 0.9,
2852 valign => 0.5,
2853 align => 0.5,
2854 can_events => 1,
2855 ellipsise => 1,
2856 label => "%d%%",
2857 %arg,
2858 );
2859
2860 $self->set_value ($arg{value} || -1);
2861
2862 $self
2863}
2864
2865sub set_label {
2866 my ($self, $label) = @_;
2867
2868 return if $self->{label} eq $label;
2869 $self->{label} = $label;
2870
2871 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2872}
2873
2874sub set_value {
2875 my ($self, $value) = @_;
2876
2877 if ($self->{value} ne $value) {
2878 $self->{value} = $value;
2879
2880 if ($value < 0) {
2881 $self->set_text ("-");
2882 } else {
2883 $self->set_text (sprintf $self->{label}, $value * 100);
2884 }
2885
2886 $self->update;
2887 }
2888}
2889
2890sub _draw {
2891 my ($self) = @_;
2892
2893 glEnable GL_BLEND;
2894 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2895
2896 if ($self->{value} >= 0) {
2897 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2898
2899 glColor_premultiply @{$self->{bar}};
2900 glRect 2, 2, $s, $self->{h} - 2;
2901 glColor_premultiply @{$self->{bg}};
2902 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2903 }
2904
2905 glColor_premultiply @{$self->{outline}};
2906 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2907
2908 glDisable GL_BLEND;
2909
2910 {
2911 local $self->{bg}; # do not draw background
2912 $self->SUPER::_draw;
2913 }
2914}
2915
2916#############################################################################
2917
2918package DC::UI::ExperienceProgress;
2919
2920our @ISA = DC::UI::Progress::;
2921
2922sub new {
2923 my ($class, %arg) = @_;
2924
2925 my $self = $class->SUPER::new (
2926 tooltip => sub {
2927 my ($self) = @_;
2928
2929 sprintf "level %d\n%s points\n%s next level\n%s to go",
2930 $self->{lvl},
2931 ::formsep ($self->{exp}),
2932 ::formsep ($self->{nxt}),
2933 ::formsep ($self->{nxt} - $self->{exp}),
2934 },
2935 %arg
2936 );
2937
2938 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2939 if $::CONN;
2940
2941 $self
2942}
2943
2944sub DESTROY {
2945 my ($self) = @_;
2946
2947 delete $::CONN->{on_exp_update}{$self+0}
2948 if $::CONN;
2949
2950 $self->SUPER::DESTROY;
2951}
2952
2953sub set_value {
2954 my ($self, $lvl, $exp) = @_;
2955
2956 $self->{lvl} = $lvl;
2957 $self->{exp} = $exp;
2958
2959 my $v = -1;
2960
2961 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2962 my $l0 = $table->[$lvl - 1];
2963 my $l1 = $table->[$lvl];
2964
2965 $self->{nxt} = $l1;
2966
2967 $v = ($exp - $l0) / ($l1 - $l0);
2968 }
2969
2970 $self->SUPER::set_value ($v);
2971}
2972
2973#############################################################################
2974
2711package CFPlus::UI::Gauge; 2975package DC::UI::Gauge;
2712 2976
2713our @ISA = CFPlus::UI::VBox::; 2977our @ISA = DC::UI::VBox::;
2714 2978
2715sub new { 2979sub new {
2716 my ($class, %arg) = @_; 2980 my ($class, %arg) = @_;
2717 2981
2718 my $self = $class->SUPER::new ( 2982 my $self = $class->SUPER::new (
2720 can_hover => 1, 2984 can_hover => 1,
2721 can_events => 1, 2985 can_events => 1,
2722 %arg, 2986 %arg,
2723 ); 2987 );
2724 2988
2725 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2989 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2726 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2990 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2727 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 2991 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2728 2992
2729 $self 2993 $self
2730} 2994}
2731 2995
2732sub set_fontsize { 2996sub set_fontsize {
2753 $self->{value}->set_text ($val); 3017 $self->{value}->set_text ($val);
2754} 3018}
2755 3019
2756############################################################################# 3020#############################################################################
2757 3021
2758package CFPlus::UI::Slider; 3022package DC::UI::Slider;
2759 3023
2760use strict; 3024use strict;
2761 3025
2762use CFPlus::OpenGL; 3026use DC::OpenGL;
2763 3027
2764our @ISA = CFPlus::UI::DrawBG::; 3028our @ISA = DC::UI::DrawBG::;
2765 3029
2766my @tex = 3030my @tex =
2767 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3031 map { new_from_resource DC::Texture $_ }
2768 qw(s1_slider.png s1_slider_bg.png); 3032 qw(s1_slider.png s1_slider_bg.png);
2769 3033
2770sub new { 3034sub new {
2771 my $class = shift; 3035 my $class = shift;
2772 3036
2809sub set_value { 3073sub set_value {
2810 my ($self, $value) = @_; 3074 my ($self, $value) = @_;
2811 3075
2812 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2813 3077
2814 $hi = $lo + 1 if $hi <= $lo; 3078 $hi = $lo if $hi < $lo;
2815 3079
2816 $page = $hi - $lo if $page > $hi - $lo; 3080 $value = $hi - $page if $value > $hi - $page;
2817
2818 $value = $lo if $value < $lo; 3081 $value = $lo if $value < $lo;
2819 $value = $hi - $page if $value > $hi - $page;
2820 3082
2821 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2822 if $unit; 3084 if $unit;
2823 3085
2824 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3086 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2840 3102
2841 $self->SUPER::invoke_button_down ($ev, $x, $y); 3103 $self->SUPER::invoke_button_down ($ev, $x, $y);
2842 3104
2843 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3105 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2844 3106
2845 $self->invoke_mouse_motion ($ev, $x, $y) 3107 $self->invoke_mouse_motion ($ev, $x, $y);
3108
3109 1
2846} 3110}
2847 3111
2848sub invoke_mouse_motion { 3112sub invoke_mouse_motion {
2849 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2850 3114
2866sub invoke_mouse_wheel { 3130sub invoke_mouse_wheel {
2867 my ($self, $ev) = @_; 3131 my ($self, $ev) = @_;
2868 3132
2869 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3133 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2870 3134
2871 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3135 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2872 3136
2873 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3137 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2874 3138
2875 ! ! $delta 3139 1
2876} 3140}
2877 3141
2878sub update { 3142sub update {
2879 my ($self) = @_; 3143 my ($self) = @_;
2880 3144
2886 my ($self) = @_; 3150 my ($self) = @_;
2887 3151
2888 unless ($self->{knob_w}) { 3152 unless ($self->{knob_w}) {
2889 $self->set_value ($self->{range}[0]); 3153 $self->set_value ($self->{range}[0]);
2890 3154
2891 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3155 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2892 my $range = ($hi - $page - $lo) || 1e-100; 3156 my $range = ($hi - $page - $lo) || 1e-10;
2893 3157
2894 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3158 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2895 3159
2896 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3160 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2897 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3161 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2898 3162
2899 $value = ($value - $lo) / $range; 3163 $value = ($value - $lo) / $range;
2929 glDisable GL_TEXTURE_2D; 3193 glDisable GL_TEXTURE_2D;
2930} 3194}
2931 3195
2932############################################################################# 3196#############################################################################
2933 3197
2934package CFPlus::UI::ValSlider; 3198package DC::UI::ValSlider;
2935 3199
2936our @ISA = CFPlus::UI::HBox::; 3200our @ISA = DC::UI::HBox::;
2937 3201
2938sub new { 3202sub new {
2939 my ($class, %arg) = @_; 3203 my ($class, %arg) = @_;
2940 3204
2941 my $range = delete $arg{range}; 3205 my $range = delete $arg{range};
2942 3206
2943 my $self = $class->SUPER::new ( 3207 my $self = $class->SUPER::new (
2944 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3208 slider => (new DC::UI::Slider expand => 1, range => $range),
2945 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3209 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2946 to_value => sub { shift }, 3210 to_value => sub { shift },
2947 from_value => sub { shift }, 3211 from_value => sub { shift },
2948 %arg, 3212 %arg,
2949 ); 3213 );
2950 3214
2970sub set_range { shift->{slider}->set_range (@_) } 3234sub set_range { shift->{slider}->set_range (@_) }
2971sub set_value { shift->{slider}->set_value (@_) } 3235sub set_value { shift->{slider}->set_value (@_) }
2972 3236
2973############################################################################# 3237#############################################################################
2974 3238
2975package CFPlus::UI::TextScroller; 3239package DC::UI::TextScroller;
2976 3240
2977our @ISA = CFPlus::UI::HBox::; 3241our @ISA = DC::UI::HBox::;
2978 3242
2979use CFPlus::OpenGL; 3243use DC::OpenGL;
2980 3244
2981sub new { 3245sub new {
2982 my $class = shift; 3246 my $class = shift;
2983 3247
2984 my $self = $class->SUPER::new ( 3248 my $self = $class->SUPER::new (
2986 can_events => 1, 3250 can_events => 1,
2987 indent => 0, 3251 indent => 0,
2988 #font => default_font 3252 #font => default_font
2989 @_, 3253 @_,
2990 3254
2991 layout => (new CFPlus::Layout), 3255 layout => (new DC::Layout),
2992 par => [], 3256 par => [],
2993 max_par => 0, 3257 max_par => 0,
2994 height => 0, 3258 height => 0,
2995 children => [ 3259 children => [
2996 (new CFPlus::UI::Empty expand => 1), 3260 (new DC::UI::Empty expand => 1),
2997 (new CFPlus::UI::Slider vertical => 1), 3261 (new DC::UI::Slider vertical => 1),
2998 ], 3262 ],
2999 ); 3263 );
3000 3264
3001 $self->{children}[1]->connect (changed => sub { $self->update }); 3265 $self->{children}[1]->connect (changed => sub { $self->update });
3002 3266
3011} 3275}
3012 3276
3013sub size_request { 3277sub size_request {
3014 my ($self) = @_; 3278 my ($self) = @_;
3015 3279
3016 my ($empty, $slider) = @{ $self->{children} }; 3280 my ($empty, $slider) = $self->visible_children;
3017 3281
3018 local $self->{children} = [$empty, $slider]; 3282 local $self->{children} = [$empty, $slider];
3019 $self->SUPER::size_request 3283 $self->SUPER::size_request
3020} 3284}
3021 3285
3058 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3322 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3059 $layout->set_markup ($para->{markup}); 3323 $layout->set_markup ($para->{markup});
3060 3324
3061 $layout->set_shapes ( 3325 $layout->set_shapes (
3062 map 3326 map
3063 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3327 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3064 @{$para->{widget}} 3328 @{$para->{widget}}
3065 ); 3329 );
3066 3330
3067 $layout 3331 $layout
3068} 3332}
3185 $ROOT->on_post_alloc ($self => sub { 3449 $ROOT->on_post_alloc ($self => sub {
3186 $self->force_uptodate; 3450 $self->force_uptodate;
3187 3451
3188 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3189 3453
3190 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3454 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3191 glClearColor 0, 0, 0, 0; 3455 glClearColor 0, 0, 0, 0;
3192 glClear GL_COLOR_BUFFER_BIT; 3456 glClear GL_COLOR_BUFFER_BIT;
3193 3457
3194 package CFPlus::UI::Base; 3458 package DC::UI::Base;
3195 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3459 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3196 (0, 0, $self->{w}, $self->{h}); 3460 (0, 0, $self->{w}, $self->{h});
3197 3461
3198 my $top = int $self->{children}[1]{range}[0]; 3462 my $top = int $self->{children}[1]{range}[0];
3199 3463
3210 3474
3211 if ($y0 < $y + $h && $y < $y1) { 3475 if ($y0 < $y + $h && $y < $y1) {
3212 my $layout = $self->get_layout ($para); 3476 my $layout = $self->get_layout ($para);
3213 3477
3214 $layout->render ($para->{indent}, $y - $y0); 3478 $layout->render ($para->{indent}, $y - $y0);
3479 $layout->draw;
3215 3480
3216 if (my @w = @{ $para->{widget} }) { 3481 if (my @w = @{ $para->{widget} }) {
3217 my @s = $layout->get_shapes; 3482 my @s = $layout->get_shapes;
3218 3483
3219 for (@w) { 3484 for (@w) {
3257 $self->{children}[1]->draw; 3522 $self->{children}[1]->draw;
3258} 3523}
3259 3524
3260############################################################################# 3525#############################################################################
3261 3526
3262package CFPlus::UI::Animator; 3527package DC::UI::Animator;
3263 3528
3264use CFPlus::OpenGL; 3529use DC::OpenGL;
3265 3530
3266our @ISA = CFPlus::UI::Bin::; 3531our @ISA = DC::UI::Bin::;
3267 3532
3268sub moveto { 3533sub moveto {
3269 my ($self, $x, $y) = @_; 3534 my ($self, $x, $y) = @_;
3270 3535
3271 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3536 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
3299 glPopMatrix; 3564 glPopMatrix;
3300} 3565}
3301 3566
3302############################################################################# 3567#############################################################################
3303 3568
3304package CFPlus::UI::Flopper; 3569package DC::UI::Flopper;
3305 3570
3306our @ISA = CFPlus::UI::Button::; 3571our @ISA = DC::UI::Button::;
3307 3572
3308sub new { 3573sub new {
3309 my $class = shift; 3574 my $class = shift;
3310 3575
3311 my $self = $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
3323 $self->{other}->toggle_visibility; 3588 $self->{other}->toggle_visibility;
3324} 3589}
3325 3590
3326############################################################################# 3591#############################################################################
3327 3592
3328package CFPlus::UI::Tooltip; 3593package DC::UI::Tooltip;
3329 3594
3330our @ISA = CFPlus::UI::Bin::; 3595our @ISA = DC::UI::Bin::;
3331 3596
3332use CFPlus::OpenGL; 3597use DC::OpenGL;
3333 3598
3334sub new { 3599sub new {
3335 my $class = shift; 3600 my $class = shift;
3336 3601
3337 $class->SUPER::new ( 3602 $class->SUPER::new (
3341} 3606}
3342 3607
3343sub set_tooltip_from { 3608sub set_tooltip_from {
3344 my ($self, $widget) = @_; 3609 my ($self, $widget) = @_;
3345 3610
3346 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3347 if $widget->{tooltip} =~ /^#(.*)$/;
3348
3349 my $tooltip = $widget->{tooltip}; 3611 my $tip = $widget->{tooltip};
3612 $tip = $tip->($widget) if "CODE" eq ref $tip;
3613
3614 $tip = DC::Pod::section_label tooltip => $1
3615 if $tip =~ /^#(.*)$/;
3350 3616
3351 if ($ENV{CFPLUS_DEBUG} & 2) { 3617 if ($ENV{CFPLUS_DEBUG} & 2) {
3352 $tooltip .= "\n\n" . (ref $widget) . "\n" 3618 $tip .= "\n\n" . (ref $widget) . "\n"
3353 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3619 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3354 . "req $widget->{req_w} $widget->{req_h}\n" 3620 . "req $widget->{req_w} $widget->{req_h}\n"
3355 . "visible $widget->{visible}"; 3621 . "visible $widget->{visible}";
3356 } 3622 }
3357 3623
3358 $tooltip =~ s/^\n+//; 3624 $tip =~ s/^\n+//;
3359 $tooltip =~ s/\n+$//; 3625 $tip =~ s/\n+$//;
3360 3626
3361 $self->add (new CFPlus::UI::Label 3627 $self->add (new DC::UI::Label
3628 fg => $DC::THEME{tooltip_fg},
3362 markup => $tooltip, 3629 markup => $tip,
3363 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3630 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3631 align => 0,
3364 fontsize => 0.8, 3632 fontsize => 0.8,
3365 style => 1, # FLAG_INVERSE 3633 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3366 ellipsise => 0, 3634 ellipsise => 0,
3367 font => ($widget->{tooltip_font} || $::FONT_PROP), 3635 font => ($widget->{tooltip_font} || $::FONT_PROP),
3368 ); 3636 );
3369} 3637}
3370 3638
3405} 3673}
3406 3674
3407sub _draw { 3675sub _draw {
3408 my ($self) = @_; 3676 my ($self) = @_;
3409 3677
3410 glTranslate 0.375, 0.375;
3411
3412 my ($w, $h) = @$self{qw(w h)}; 3678 my ($w, $h) = @$self{qw(w h)};
3413 3679
3414 glColor 1, 0.8, 0.4; 3680 glColor @{ $DC::THEME{tooltip_bg} };
3415 glBegin GL_QUADS; 3681 glRect 0, 0, $w, $h;
3416 glVertex 0 , 0;
3417 glVertex 0 , $h;
3418 glVertex $w, $h;
3419 glVertex $w, 0;
3420 glEnd;
3421 3682
3422 glColor 0, 0, 0; 3683 glColor @{ $DC::THEME{tooltip_border} };
3423 glBegin GL_LINE_LOOP; 3684 glRect_lineloop .5, .5, $w + .5, $h + .5;
3424 glVertex 0 , 0;
3425 glVertex 0 , $h;
3426 glVertex $w, $h;
3427 glVertex $w, 0;
3428 glEnd;
3429 3685
3430 glTranslate 2 - 0.375, 2 - 0.375; 3686 glTranslate 2, 2;
3431 3687
3432 $self->SUPER::_draw; 3688 $self->SUPER::_draw;
3433} 3689}
3434 3690
3435############################################################################# 3691#############################################################################
3436 3692
3437package CFPlus::UI::Face; 3693package DC::UI::Face;
3438 3694
3439our @ISA = CFPlus::UI::DrawBG::; 3695our @ISA = DC::UI::DrawBG::;
3440 3696
3441use CFPlus::OpenGL; 3697use DC::OpenGL;
3442 3698
3443sub new { 3699sub new {
3444 my $class = shift; 3700 my $class = shift;
3445 3701
3446 my $self = $class->SUPER::new ( 3702 my $self = $class->SUPER::new (
3450 can_events => 0, 3706 can_events => 0,
3451 @_, 3707 @_,
3452 ); 3708 );
3453 3709
3454 if ($self->{anim} && $self->{animspeed}) { 3710 if ($self->{anim} && $self->{animspeed}) {
3455 CFPlus::weaken (my $widget = $self); 3711 DC::weaken (my $widget = $self);
3456 3712
3457 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3713 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3458 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3714 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3459 $self->{timer} = Event->timer (
3460 parked => 1,
3461 cb => sub {
3462 return unless $::CONN && $widget; 3715 return unless $::CONN;
3463 3716
3717 my $w = $widget
3718 or return;
3719
3464 ++$widget->{frame}; 3720 ++$w->{frame};
3465 $widget->update_face; 3721 $w->update_face;
3722
3723 # somehow, $widget can go away
3466 $widget->update; 3724 $w->update;
3467
3468 $widget->update_timer; 3725 $w->update_timer;
3469 },
3470 ); 3726 };
3471 3727
3472 $self->update_face; 3728 $self->update_face;
3473 $self->update_timer; 3729 $self->update_timer;
3474 } 3730 }
3475 3731
3480 my ($self) = @_; 3736 my ($self) = @_;
3481 3737
3482 return unless $self->{timer}; 3738 return unless $self->{timer};
3483 3739
3484 if ($self->{visible}) { 3740 if ($self->{visible}) {
3485 $self->{timer}->at (
3486 $self->{anim_start}
3487 + $self->{animspeed}
3488 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3489 );
3490 $self->{timer}->start; 3741 $self->{timer}->start;
3491 } else { 3742 } else {
3492 $self->{timer}->stop; 3743 $self->{timer}->stop;
3493 } 3744 }
3494} 3745}
3495 3746
3496sub update_face { 3747sub update_face {
3497 my ($self) = @_; 3748 my ($self) = @_;
3498 3749
3499 return unless $::CONN; 3750 if ($::CONN) {
3500
3501 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3751 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3502 if ($anim && @$anim) { 3752 if ($anim && @$anim) {
3503 delete $self->{wait_face};
3504 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3753 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3754 delete $self->{face_change_cb};
3755
3505 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3756 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3757 unless ($tex->{name} || $tex->{loading}) {
3758 $tex->upload (sub { $self->reconfigure });
3759 }
3760 }
3761 }
3506 } 3762 }
3507 } 3763 }
3508} 3764}
3509 3765
3510sub size_request { 3766sub size_request {
3511 my ($self) = @_; 3767 my ($self) = @_;
3512 3768
3513 if ($::CONN) { 3769 if ($::CONN) {
3514 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3770 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3515 if (my $tex = $::CONN->{texture}[$faceid]) { 3771 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3516 $self->{tex} = $tex; 3772 if ($tex->{name}) {
3517 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3773 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3518 } else { 3774 } elsif (!$tex->{loading}) {
3519 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3775 $tex->upload (sub { $self->reconfigure });
3520 $self->realloc;
3521 }); 3776 }
3522 } 3777 }
3778
3779 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3523 } 3780 }
3524 } 3781 }
3525 3782
3526 ($self->{size_w} || 8, $self->{size_h} || 8) 3783 ($self->{size_w} || 8, $self->{size_h} || 8)
3527} 3784}
3565 $self->SUPER::destroy; 3822 $self->SUPER::destroy;
3566} 3823}
3567 3824
3568############################################################################# 3825#############################################################################
3569 3826
3570package CFPlus::UI::Buttonbar; 3827package DC::UI::Buttonbar;
3571 3828
3572our @ISA = CFPlus::UI::HBox::; 3829our @ISA = DC::UI::HBox::;
3573 3830
3574# TODO: should actually wrap buttons and other goodies. 3831# TODO: should actually wrap buttons and other goodies.
3575 3832
3576############################################################################# 3833#############################################################################
3577 3834
3578package CFPlus::UI::Menu; 3835package DC::UI::Menu;
3579 3836
3580our @ISA = CFPlus::UI::Toplevel::; 3837our @ISA = DC::UI::Toplevel::;
3581 3838
3582use CFPlus::OpenGL; 3839use DC::OpenGL;
3583 3840
3584sub new { 3841sub new {
3585 my $class = shift; 3842 my $class = shift;
3586 3843
3587 my $self = $class->SUPER::new ( 3844 my $self = $class->SUPER::new (
3588 items => [], 3845 items => [],
3589 z => 100, 3846 z => 100,
3590 @_, 3847 @_,
3591 ); 3848 );
3592 3849
3593 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3850 $self->add ($self->{vbox} = new DC::UI::VBox);
3594 3851
3595 for my $item (@{ $self->{items} }) { 3852 for my $item (@{ $self->{items} }) {
3596 my ($widget, $cb, $tooltip) = @$item; 3853 my ($widget, $cb, $tooltip) = @$item;
3597 3854
3598 # handle various types of items, only text for now 3855 # handle various types of items, only text for now
3599 if (!ref $widget) { 3856 if (!ref $widget) {
3600 if ($widget =~ /\t/) { 3857 if ($widget =~ /\t/) {
3601 my ($left, $right) = split /\t/, $widget, 2; 3858 my ($left, $right) = split /\t/, $widget, 2;
3602 3859
3603 $widget = new CFPlus::UI::HBox 3860 $widget = new DC::UI::HBox
3604 can_hover => 1, 3861 can_hover => 1,
3605 can_events => 1, 3862 can_events => 1,
3606 tooltip => $tooltip, 3863 tooltip => $tooltip,
3607 children => [ 3864 children => [
3608 (new CFPlus::UI::Label markup => $left, expand => 1), 3865 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3609 (new CFPlus::UI::Label markup => $right, align => +1), 3866 (new DC::UI::Label markup => $right, align => 1),
3610 ], 3867 ],
3611 ; 3868 ;
3612 3869
3613 } else { 3870 } else {
3614 $widget = new CFPlus::UI::Label 3871 $widget = new DC::UI::Label
3615 can_hover => 1, 3872 can_hover => 1,
3616 can_events => 1, 3873 can_events => 1,
3874 align => 0,
3617 markup => $widget, 3875 markup => $widget,
3618 tooltip => $tooltip; 3876 tooltip => $tooltip;
3619 } 3877 }
3620 } 3878 }
3621 3879
3667 1 3925 1
3668} 3926}
3669 3927
3670############################################################################# 3928#############################################################################
3671 3929
3672package CFPlus::UI::Multiplexer; 3930package DC::UI::Multiplexer;
3673 3931
3674our @ISA = CFPlus::UI::Container::; 3932our @ISA = DC::UI::Container::;
3675 3933
3676sub new { 3934sub new {
3677 my $class = shift; 3935 my $class = shift;
3678 3936
3679 my $self = $class->SUPER::new ( 3937 my $self = $class->SUPER::new (
3680 @_, 3938 @_,
3681 ); 3939 );
3682 3940
3683 $self->{current} = $self->{children}[0] 3941 $self->set_current_page (0);
3684 if @{ $self->{children} };
3685 3942
3686 $self 3943 $self
3687} 3944}
3688 3945
3689sub add { 3946sub add {
3690 my ($self, @widgets) = @_; 3947 my ($self, @widgets) = @_;
3691 3948
3692 $self->SUPER::add (@widgets); 3949 $self->SUPER::add (@widgets);
3693 3950
3694 $self->{current} = $self->{children}[0] 3951 $self->set_current_page (0)
3695 if @{ $self->{children} }; 3952 if @widgets == @{ $self->{children} };
3696} 3953}
3697 3954
3698sub get_current_page { 3955sub get_current_page {
3699 my ($self) = @_; 3956 my ($self) = @_;
3700 3957
3706 3963
3707 my $widget = ref $page_or_widget 3964 my $widget = ref $page_or_widget
3708 ? $page_or_widget 3965 ? $page_or_widget
3709 : $self->{children}[$page_or_widget]; 3966 : $self->{children}[$page_or_widget];
3710 3967
3968 $self->{current}->set_invisible if $self->{current} && $self->{visible};
3969
3711 $self->{current} = $widget; 3970 if (($self->{current} = $widget)) {
3971 $self->{current}->set_visible if $self->{current} && $self->{visible};
3712 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3972 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3713 3973
3714 $self->emit (page_changed => $self->{current}); 3974 $self->emit (page_changed => $self->{current});
3975 }
3715 3976
3716 $self->realloc; 3977 $self->realloc;
3717} 3978}
3718 3979
3719sub visible_children { 3980sub visible_children {
3720 $_[0]{current} 3981 $_[0]{current} || ()
3721} 3982}
3722 3983
3723sub size_request { 3984sub size_request {
3724 my ($self) = @_; 3985 my ($self) = @_;
3725 3986
3987 $self->{current}
3726 $self->{current}->size_request 3988 ? $self->{current}->size_request
3989 : (0, 0)
3727} 3990}
3728 3991
3729sub invoke_size_allocate { 3992sub invoke_size_allocate {
3730 my ($self, $w, $h) = @_; 3993 my ($self, $w, $h) = @_;
3731 3994
3732 $self->{current}->configure (0, 0, $w, $h); 3995 $self->{current}->configure (0, 0, $w, $h)
3996 if $self->{current};
3733 3997
3734 1 3998 1
3735} 3999}
3736 4000
3737sub _draw { 4001sub _draw {
3738 my ($self) = @_; 4002 my ($self) = @_;
3739 4003
3740 $self->{current}->draw; 4004 $self->{current}->draw
4005 if $self->{current};
3741} 4006}
3742 4007
3743############################################################################# 4008#############################################################################
3744 4009
3745package CFPlus::UI::Notebook; 4010package DC::UI::Notebook;
3746 4011
4012use DC::OpenGL;
4013
3747our @ISA = CFPlus::UI::VBox::; 4014our @ISA = DC::UI::VBox::;
3748 4015
3749sub new { 4016sub new {
3750 my $class = shift; 4017 my $class = shift;
3751 4018
3752 my $self = $class->SUPER::new ( 4019 my $self = $class->SUPER::new (
3753 buttonbar => (new CFPlus::UI::Buttonbar), 4020 buttonbar => (new DC::UI::Buttonbar),
3754 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4021 multiplexer => (new DC::UI::Multiplexer expand => 1),
4022 active_outline => [.7, .7, 0.2],
3755 # filter => # will be put between multiplexer and $self 4023 # filter => # will be put between multiplexer and $self
3756 @_, 4024 @_,
3757 ); 4025 );
3758 4026
3759 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4027 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3760 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4028 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3761 4029
4030 {
4031 Scalar::Util::weaken (my $wself = $self);
4032
4033 $self->{multiplexer}->connect (c_add => sub {
4034 my ($mplex, $widgets) = @_;
4035
4036 for my $child (@$widgets) {
4037 Scalar::Util::weaken $child;
4038 $child->{c_tab_} ||= do {
4039 my $tab =
4040 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4041 ? $child->{c_tab}
4042 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4043
4044 $tab->connect (activate => sub {
4045 $wself->set_current_page ($child);
4046 });
4047
4048 $tab
4049 };
4050
4051 $self->{buttonbar}->add ($child->{c_tab_});
4052 }
4053 });
4054
4055 $self->{multiplexer}->connect (c_remove => sub {
4056 my ($mplex, $widgets) = @_;
4057
4058 for my $child (@$widgets) {
4059 $wself->{buttonbar}->remove ($child->{c_tab_});
4060 }
4061 });
4062 }
4063
3762 $self 4064 $self
3763} 4065}
3764 4066
3765sub add { 4067sub add {
4068 my ($self, @widgets) = @_;
4069
4070 $self->{multiplexer}->add (@widgets)
4071}
4072
4073sub remove {
4074 my ($self, @widgets) = @_;
4075
4076 $self->{multiplexer}->remove (@widgets)
4077}
4078
4079sub pages {
4080 my ($self) = @_;
4081 $self->{multiplexer}->children
4082}
4083
4084sub page_index {
4085 my ($self, $widget) = @_;
4086
4087 my $i = 0;
4088 for ($self->pages) {
4089 if ($_ eq $widget) { return $i };
4090 $i++;
4091 }
4092
4093 undef
4094}
4095
4096sub add_tab {
3766 my ($self, $title, $widget, $tooltip) = @_; 4097 my ($self, $title, $widget, $tooltip) = @_;
3767 4098
3768 CFPlus::weaken $self; 4099 $title = [$title, $tooltip] unless ref $title;
4100 $widget->{c_tab} = $title;
3769 4101
3770 unless (ref $title) {
3771 $title = new CFPlus::UI::Button
3772 markup => $title,
3773 tooltip => $tooltip,
3774 );
3775 }
3776
3777 $title->connect (activate => sub { $self->set_current_page ($widget) });
3778 $self->{buttonbar}->add ($title);
3779
3780 $self->{multiplexer}->add ($widget); 4102 $self->add ($widget);
3781} 4103}
3782 4104
3783sub get_current_page { 4105sub get_current_page {
3784 my ($self) = @_; 4106 my ($self) = @_;
3785 4107
3791 4113
3792 $self->{multiplexer}->set_current_page ($page); 4114 $self->{multiplexer}->set_current_page ($page);
3793 $self->emit (page_changed => $self->{multiplexer}{current}); 4115 $self->emit (page_changed => $self->{multiplexer}{current});
3794} 4116}
3795 4117
4118sub _draw {
4119 my ($self) = @_;
4120
4121 $self->SUPER::_draw ();
4122
4123 if (my $cur = $self->{multiplexer}{current}) {
4124 if ($cur = $cur->{c_tab_}) {
4125 glTranslate $self->{buttonbar}{x} + $cur->{x},
4126 $self->{buttonbar}{y} + $cur->{y};
4127 glLineWidth 3;
4128 #glEnable GL_BLEND;
4129 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4130 glColor @{$self->{active_outline}};
4131 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4132 glLineWidth 1;
4133 #glDisable GL_BLEND;
4134 }
4135 }
4136}
4137
3796############################################################################# 4138#############################################################################
3797 4139
3798package CFPlus::UI::Selector; 4140package DC::UI::Selector;
3799 4141
3800use utf8; 4142use utf8;
3801 4143
3802our @ISA = CFPlus::UI::Button::; 4144our @ISA = DC::UI::Button::;
3803 4145
3804sub new { 4146sub new {
3805 my $class = shift; 4147 my $class = shift;
3806 4148
3807 my $self = $class->SUPER::new ( 4149 my $self = $class->SUPER::new (
3824 my ($value, $title, $tooltip) = @$_; 4166 my ($value, $title, $tooltip) = @$_;
3825 4167
3826 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4168 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3827 } 4169 }
3828 4170
3829 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4171 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3830} 4172}
3831 4173
3832sub _set_value { 4174sub _set_value {
3833 my ($self, $value) = @_; 4175 my ($self, $value) = @_;
3834 4176
3835 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4177 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4178 $item ||= $self->{options}[0]
3836 or return; 4179 or return;
3837 4180
3838 $self->{value} = $item->[0]; 4181 $self->{value} = $item->[0];
3839 $self->set_markup ("$item->[1] ⇓"); 4182 $self->set_markup ("$item->[1] ⇓");
3840 $self->set_tooltip ($item->[2]); 4183# $self->set_tooltip ($item->[2]);
3841} 4184}
3842 4185
3843sub set_value { 4186sub set_value {
3844 my ($self, $value) = @_; 4187 my ($self, $value) = @_;
3845 4188
3847 4190
3848 $self->_set_value ($value); 4191 $self->_set_value ($value);
3849 $self->emit (changed => $value); 4192 $self->emit (changed => $value);
3850} 4193}
3851 4194
4195sub set_options {
4196 my ($self, $options) = @_;
4197
4198 $self->{options} = $options;
4199 $self->_set_value ($self->{value});
4200}
4201
3852############################################################################# 4202#############################################################################
3853 4203
3854package CFPlus::UI::Statusbox; 4204package DC::UI::Statusbox;
3855 4205
3856our @ISA = CFPlus::UI::VBox::; 4206our @ISA = DC::UI::VBox::;
3857 4207
3858sub new { 4208sub new {
3859 my $class = shift; 4209 my $class = shift;
3860 4210
3861 my $self = $class->SUPER::new ( 4211 my $self = $class->SUPER::new (
3862 fontsize => 0.8, 4212 fontsize => 0.8,
3863 @_, 4213 @_,
3864 ); 4214 );
3865 4215
3866 CFPlus::weaken (my $this = $self); 4216 DC::weaken (my $this = $self);
3867 4217
3868 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4218 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3869 4219
3870 $self 4220 $self
3871} 4221}
3872 4222
3873sub reorder { 4223sub reorder {
3874 my ($self) = @_; 4224 my ($self) = @_;
3875 my $NOW = Time::HiRes::time; 4225 my $NOW = EV::time;
3876 4226
3877 # freeze display when hovering over any label 4227 # freeze display when hovering over any label
3878 return if $CFPlus::UI::TOOLTIP->{owner} 4228 return if $DC::UI::TOOLTIP->{owner}
3879 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4229 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3880 values %{ $self->{item} }; 4230 values %{ $self->{item} };
3881 4231
3882 while (my ($k, $v) = each %{ $self->{item} }) { 4232 while (my ($k, $v) = each %{ $self->{item} }) {
3883 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4233 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3884 } 4234 }
4235
4236 $self->{timer}->set (1, 1);
3885 4237
3886 my @widgets; 4238 my @widgets;
3887 4239
3888 my @items = sort { 4240 my @items = sort {
3889 $a->{pri} <=> $b->{pri} 4241 $a->{pri} <=> $b->{pri}
3890 or $b->{id} <=> $a->{id} 4242 or $b->{id} <=> $a->{id}
3891 } values %{ $self->{item} }; 4243 } values %{ $self->{item} };
3892
3893 $self->{timer}->interval (1);
3894 4244
3895 my $count = 10 + 1; 4245 my $count = 10 + 1;
3896 for my $item (@items) { 4246 for my $item (@items) {
3897 last unless --$count; 4247 last unless --$count;
3898 4248
3905 for ($short) { 4255 for ($short) {
3906 s/^\s+//; 4256 s/^\s+//;
3907 s/\s+/ /g; 4257 s/\s+/ /g;
3908 } 4258 }
3909 4259
3910 new CFPlus::UI::Label 4260 new DC::UI::Label
3911 markup => $short, 4261 markup => $short,
3912 tooltip => $item->{tooltip}, 4262 tooltip => $item->{tooltip},
3913 tooltip_font => $::FONT_PROP, 4263 tooltip_font => $::FONT_PROP,
3914 tooltip_width => 0.67, 4264 tooltip_width => 0.67,
3915 fontsize => $item->{fontsize} || $self->{fontsize}, 4265 fontsize => $item->{fontsize} || $self->{fontsize},
3916 max_w => $::WIDTH * 0.44, 4266 max_w => $::WIDTH * 0.44,
4267 align => 0,
3917 fg => [@{ $item->{fg} }], 4268 fg => [@{ $item->{fg} }],
3918 can_events => 1, 4269 can_events => 1,
3919 can_hover => 1 4270 can_hover => 1
3920 }; 4271 };
3921 4272
3922 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4273 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3923 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4274 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3924 $label->update; 4275 $label->update;
3925 $label->set_max_size (undef, $label->{req_h} * $diff) 4276 $label->set_max_size (undef, $label->{req_h} * $diff)
3926 if $diff < 1; 4277 if $diff < 1;
3927 $self->{timer}->interval (1/30); 4278 $self->{timer}->set (1/30, 1/30);
3928 } else { 4279 } else {
3929 $label->{fg}[3] = $item->{fg}[3] || 1; 4280 $label->{fg}[3] = $item->{fg}[3] || 1;
3930 } 4281 }
3931 4282
3932 push @widgets, $label; 4283 push @widgets, $label;
3933 } 4284 }
4285
4286 my $hash = join ",", @widgets;
4287 return if $hash eq $self->{last_widget_hash};
4288 $self->{last_widget_hash} = $hash;
3934 4289
3935 $self->clear; 4290 $self->clear;
3936 $self->SUPER::add (reverse @widgets); 4291 $self->SUPER::add (reverse @widgets);
3937} 4292}
3938 4293
3994 $self->SUPER::destroy; 4349 $self->SUPER::destroy;
3995} 4350}
3996 4351
3997############################################################################# 4352#############################################################################
3998 4353
3999package CFPlus::UI::Root; 4354package DC::UI::Root;
4000 4355
4001our @ISA = CFPlus::UI::Container::; 4356our @ISA = DC::UI::Container::;
4002 4357
4003use List::Util qw(min max); 4358use List::Util qw(min max);
4004 4359
4005use CFPlus::OpenGL; 4360use DC::OpenGL;
4006 4361
4007sub new { 4362sub new {
4008 my $class = shift; 4363 my $class = shift;
4009 4364
4010 my $self = $class->SUPER::new ( 4365 my $self = $class->SUPER::new (
4011 visible => 1, 4366 visible => 1,
4012 @_, 4367 @_,
4013 ); 4368 );
4014 4369
4015 CFPlus::weaken ($self->{root} = $self); 4370 DC::weaken ($self->{root} = $self);
4016 4371
4017 $self 4372 $self
4018} 4373}
4019 4374
4020sub size_request { 4375sub size_request {
4068} 4423}
4069 4424
4070sub update { 4425sub update {
4071 my ($self) = @_; 4426 my ($self) = @_;
4072 4427
4073 $::WANT_REFRESH++; 4428 $::WANT_REFRESH = 1;
4074} 4429}
4075 4430
4076sub add { 4431sub add {
4077 my ($self, @children) = @_; 4432 my ($self, @children) = @_;
4078 4433
4145 4500
4146 delete $queue{$widget+0}; 4501 delete $queue{$widget+0};
4147 4502
4148 my ($w, $h) = $widget->size_request; 4503 my ($w, $h) = $widget->size_request;
4149 4504
4150 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4505 $w += $widget->{padding_x} * 2;
4151 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4506 $h += $widget->{padding_y} * 2;
4507
4508 $w = max $widget->{min_w}, $w;
4509 $h = max $widget->{min_h}, $h;
4152 4510
4153 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4511 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4154 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4512 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4155 4513
4156 $w = $widget->{force_w} if exists $widget->{force_w}; 4514 $w = $widget->{force_w} if exists $widget->{force_w};
4223 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4581 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4224 glMatrixMode GL_MODELVIEW; 4582 glMatrixMode GL_MODELVIEW;
4225 glLoadIdentity; 4583 glLoadIdentity;
4226 4584
4227 { 4585 {
4228 package CFPlus::UI::Base; 4586 package DC::UI::Base;
4229 4587
4230 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4588 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4231 (0, 0, $self->{w}, $self->{h}); 4589 (0, 0, $self->{w}, $self->{h});
4232 4590
4233 $self->_draw; 4591 $self->_draw;
4234 } 4592 }
4235} 4593}
4236 4594
4237############################################################################# 4595#############################################################################
4238 4596
4239package CFPlus::UI; 4597package DC::UI;
4240 4598
4241$ROOT = new CFPlus::UI::Root; 4599$ROOT = new DC::UI::Root;
4242$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4600$TOOLTIP = new DC::UI::Tooltip z => 900;
4243 4601
42441 46021
4245 4603

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines