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.447 by root, Sat Dec 22 06:50:45 2007 UTC vs.
Revision 1.478 by root, Tue Dec 22 00:35:44 2009 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 ();
7 7
8use CFPlus; 8use Guard ();
9
10use DC;
9use CFPlus::Pod; 11use DC::Pod;
10use CFPlus::Texture; 12use DC::Texture;
11 13
12our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
13 15
14our $LAYOUT; 16our $LAYOUT;
15our $ROOT; 17our $ROOT;
16our $TOOLTIP; 18our $TOOLTIP;
17our $BUTTON_STATE; 19our $BUTTON_STATE;
18 20
19our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
20 22
21our $TOOLTIP_WATCHER = EV::timer_ns 0, 1/60, sub { 23our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop; 24 $_[0]->stop;
23 25
24 if (!$GRAB) { 26 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 27 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 28 if (length $widget->{tooltip}) {
… …
111 113
112 if ($GRAB) { 114 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 115 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 116 # mousewheel
115 my $delta = $ev->{button} * 2 - 9; 117 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT; 118 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
117 119
118 $ev->{dx} = $shift ? $delta : 0; 120 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta; 121 $ev->{dy} = $shift ? 0 : $delta;
120 122
121 $GRAB->emit (mouse_wheel => $ev); 123 $GRAB->emit (mouse_wheel => $ev);
… …
189# call when resolution changes etc. 191# call when resolution changes etc.
190sub rescale_widgets { 192sub rescale_widgets {
191 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
192 194
193 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
194 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
195 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 197 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
196 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 198 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
197 199
198 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 200 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 201 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
211 reconfigure_widgets; 213 reconfigure_widgets;
212} 214}
213 215
214############################################################################# 216#############################################################################
215 217
216package CFPlus::UI::Event; 218package DC::UI::Event;
217 219
218sub xy { 220sub xy {
219 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 221 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
220} 222}
221 223
222############################################################################# 224#############################################################################
223 225
224package CFPlus::UI::Base; 226package DC::UI::Base;
225 227
226use strict; 228use strict;
227 229
228use CFPlus::OpenGL; 230use DC::OpenGL;
229 231
230sub new { 232sub new {
231 my $class = shift; 233 my $class = shift;
232 234
233 my $self = bless { 235 my $self = bless {
… …
238 h => undef, 240 h => undef,
239 can_events => 1, 241 can_events => 1,
240 @_ 242 @_
241 }, $class; 243 }, $class;
242 244
243 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 245 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
244 246
245 for (keys %$self) { 247 for (keys %$self) {
246 if (/^on_(.*)$/) { 248 if (/^on_(.*)$/) {
247 $self->connect ($1 => delete $self->{$_}); 249 $self->connect ($1 => delete $self->{$_});
248 } 250 }
249 } 251 }
250 252
251 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 253 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
252 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 254 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
253 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 255 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
254 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 256 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
255 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 257 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
256 258
257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 259 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 260 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
259 261
260 $self->show if $layout->{show}; 262 $self->show if $layout->{show};
… …
278sub show { 280sub show {
279 my ($self) = @_; 281 my ($self) = @_;
280 282
281 return if $self->{parent}; 283 return if $self->{parent};
282 284
283 $CFPlus::UI::ROOT->add ($self); 285 $DC::UI::ROOT->add ($self);
284} 286}
285 287
286sub set_visible { 288sub set_visible {
287 my ($self) = @_; 289 my ($self) = @_;
288 290
289 return if $self->{visible}; 291 return if $self->{visible};
292
293 $self->{parent} && $self->{parent}{root}#d#
294 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
290 295
291 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
292 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
293 298
294 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
295 300
296 $self->realloc if !exists $self->{req_w}; 301 $self->realloc if !exists $self->{req_w};
297 302
298 $_->set_visible for $self->children; 303 $_->set_visible for $self->visible_children;
299} 304}
300 305
301sub set_invisible { 306sub set_invisible {
302 my ($self) = @_; 307 my ($self) = @_;
303 308
… …
309 delete $self->{root}; 314 delete $self->{root};
310 315
311 undef $GRAB if $GRAB == $self; 316 undef $GRAB if $GRAB == $self;
312 undef $HOVER if $HOVER == $self; 317 undef $HOVER if $HOVER == $self;
313 318
314 $CFPlus::UI::TOOLTIP_WATCHER->invoke 319 $DC::UI::TOOLTIP_WATCHER->invoke
315 if $TOOLTIP->{owner} == $self; 320 if $TOOLTIP->{owner} == $self;
316 321
317 $self->emit ("focus_out"); 322 $self->emit ("focus_out");
318 $self->emit (visibility_change => 0); 323 $self->emit (visibility_change => 0);
319} 324}
… …
338sub hide { 343sub hide {
339 my ($self) = @_; 344 my ($self) = @_;
340 345
341 $self->set_invisible; 346 $self->set_invisible;
342 347
348 # extra $parent copy for 5.8.8+ bug workaround
349 # (otherwise $_[0] in remove gets freed
350 if (my $parent = $self->{parent}) {
343 $self->{parent}->remove ($self) 351 $parent->remove ($self);
344 if $self->{parent}; 352 }
345} 353}
346 354
347sub move_abs { 355sub move_abs {
348 my ($self, $x, $y, $z) = @_; 356 my ($self, $x, $y, $z) = @_;
349 357
… …
365 373
366# traverse the widget chain up to find the maximum "physical" size constraints 374# traverse the widget chain up to find the maximum "physical" size constraints
367sub get_max_wh { 375sub get_max_wh {
368 my ($self) = @_; 376 my ($self) = @_;
369 377
378 my ($w, $h) = @$self{qw(max_w max_h)};
379
380 if ($w <= 0 || $h <= 0) {
381 my ($mw, $mh) = $self->{parent}
370 return $self->{parent}->get_max_wh 382 ? $self->{parent}->get_max_wh
371 if $self->{parent};
372
373 ($::WIDTH, $::HEIGHT) 383 : ($::WIDTH, $::HEIGHT);
384
385 $w = $mw if $w <= 0;
386 $h = $mh if $h <= 0;
387 }
388
389 ($w, $h)
374} 390}
375 391
376sub size_request { 392sub size_request {
377 require Carp; 393 require Carp;
378 Carp::confess "size_request is abstract"; 394 Carp::confess "size_request is abstract";
… …
386 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
387 403
388 if ($self->{aspect}) { 404 if ($self->{aspect}) {
389 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
390 406
391 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
392 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
393 409
394 # use alignment to adjust x, y 410 # use alignment to adjust x, y
395 411
396 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
397 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
… …
438 454
439 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
440 456
441 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
442 458
443 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
444 delete $CFPlus::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
445 $CFPlus::UI::TOOLTIP_WATCHER->invoke; 461 $DC::UI::TOOLTIP_WATCHER->invoke;
446 } 462 }
447} 463}
448 464
449# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
450sub coord2local { 466sub coord2local {
… …
516sub connect { 532sub connect {
517 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
518 534
519 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
520 536
521 defined wantarray and CFPlus::guard { 537 defined wantarray and Guard::guard {
522 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
523 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
524 } 540 }
525} 541}
526 542
… …
564# in .xs 580# in .xs
565 581
566sub set_parent { 582sub set_parent {
567 my ($self, $parent) = @_; 583 my ($self, $parent) = @_;
568 584
569 CFPlus::weaken ($self->{parent} = $parent); 585 DC::weaken ($self->{parent} = $parent);
570 $self->set_visible if $parent->{visible}; 586 $self->set_visible if $parent->{visible};
571} 587}
572 588
573sub realloc { 589sub realloc {
574 my ($self) = @_; 590 my ($self) = @_;
… …
612} 628}
613 629
614sub DESTROY { 630sub DESTROY {
615 my ($self) = @_; 631 my ($self) = @_;
616 632
617 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
618 634
619 local $@; 635 local $@;
620 eval { $self->destroy }; 636 eval { $self->destroy };
621 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
622 638
623 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
624} 640}
625 641
626############################################################################# 642#############################################################################
627 643
628package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
629 645
630our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
631 647
632use strict; 648use strict;
633use CFPlus::OpenGL; 649use DC::OpenGL;
634 650
635sub new { 651sub new {
636 my $class = shift; 652 my $class = shift;
637 653
638 $class->SUPER::new ( 654 $class->SUPER::new (
… …
640 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
641 @_ 657 @_
642 ) 658 )
643} 659}
644 660
661sub set_bg {
662 my ($self, $bg) = @_;
663
664 $self->{bg} = $bg;
665 $self->update;
666}
667
645sub _draw { 668sub _draw {
646 my ($self) = @_; 669 my ($self) = @_;
647 670
648 my $color = $FOCUS == $self && $self->{active_bg} 671 my $color = $FOCUS == $self
649 ? $self->{active_bg} 672 ? $self->{active_bg} || $self->{bg}
650 : $self->{bg}; 673 : $self->{bg};
651 674
652 if ($color && (@$color < 4 || $color->[3])) { 675 if ($color && (@$color < 4 || $color->[3])) {
653 my ($w, $h) = @$self{qw(w h)}; 676 my ($w, $h) = @$self{qw(w h)};
654 677
… …
660 } 683 }
661} 684}
662 685
663############################################################################# 686#############################################################################
664 687
665package CFPlus::UI::Empty; 688package DC::UI::Empty;
666 689
667our @ISA = CFPlus::UI::Base::; 690our @ISA = DC::UI::Base::;
668 691
669sub new { 692sub new {
670 my ($class, %arg) = @_; 693 my ($class, %arg) = @_;
671 $class->SUPER::new (can_events => 0, %arg); 694 $class->SUPER::new (can_events => 0, %arg);
672} 695}
… …
679 702
680sub draw { } 703sub draw { }
681 704
682############################################################################# 705#############################################################################
683 706
684package CFPlus::UI::Container; 707package DC::UI::Container;
685 708
686our @ISA = CFPlus::UI::Base::; 709our @ISA = DC::UI::Base::;
687 710
688sub new { 711sub new {
689 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
690 713
691 my $children = delete $arg{children}; 714 my $children = delete $arg{children};
… …
785 $_->draw for $self->visible_children; 808 $_->draw for $self->visible_children;
786} 809}
787 810
788############################################################################# 811#############################################################################
789 812
790package CFPlus::UI::Bin; 813package DC::UI::Bin;
791 814
792our @ISA = CFPlus::UI::Container::; 815our @ISA = DC::UI::Container::;
793 816
794sub new { 817sub new {
795 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
796 819
797 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 820 my $child = (delete $arg{child}) || new DC::UI::Empty::;
798 821
799 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
800} 823}
801 824
802sub add { 825sub add {
… …
809sub remove { 832sub remove {
810 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
811 834
812 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
813 836
814 $self->{children} = [new CFPlus::UI::Empty] 837 $self->{children} = [new DC::UI::Empty]
815 unless @{$self->{children}}; 838 unless @{$self->{children}};
816} 839}
817 840
818sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
819 842
… …
830} 853}
831 854
832############################################################################# 855#############################################################################
833# back-buffered drawing area 856# back-buffered drawing area
834 857
835package CFPlus::UI::Window; 858package DC::UI::Window;
836 859
837our @ISA = CFPlus::UI::Bin::; 860our @ISA = DC::UI::Bin::;
838 861
839use CFPlus::OpenGL; 862use DC::OpenGL;
840 863
841sub new { 864sub new {
842 my ($class, %arg) = @_; 865 my ($class, %arg) = @_;
843 866
844 my $self = $class->SUPER::new (%arg); 867 my $self = $class->SUPER::new (%arg);
… …
866} 889}
867 890
868sub render_child { 891sub render_child {
869 my ($self) = @_; 892 my ($self) = @_;
870 893
871 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 894 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
872 glClearColor 0, 0, 0, 0; 895 glClearColor 0, 0, 0, 0;
873 glClear GL_COLOR_BUFFER_BIT; 896 glClear GL_COLOR_BUFFER_BIT;
874 897
875 { 898 {
876 package CFPlus::UI::Base; 899 package DC::UI::Base;
877 900
878 local ($draw_x, $draw_y, $draw_w, $draw_h) = 901 local ($draw_x, $draw_y, $draw_w, $draw_h) =
879 (0, 0, $self->{w}, $self->{h}); 902 (0, 0, $self->{w}, $self->{h});
880 903
881 $self->_render; 904 $self->_render;
… …
898 glDisable GL_TEXTURE_2D; 921 glDisable GL_TEXTURE_2D;
899} 922}
900 923
901############################################################################# 924#############################################################################
902 925
903package CFPlus::UI::ViewPort; 926package DC::UI::ViewPort;
904 927
905use List::Util qw(min max); 928use List::Util qw(min max);
906 929
907our @ISA = CFPlus::UI::Window::; 930our @ISA = DC::UI::Window::;
908 931
909sub new { 932sub new {
910 my $class = shift; 933 my $class = shift;
911 934
912 $class->SUPER::new ( 935 $class->SUPER::new (
… …
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 1021 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 1023 } else {
1001 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->DC::UI::Base::find_widget ($x, $y)
1002 } 1025 }
1003} 1026}
1004 1027
1005sub _render { 1028sub _render {
1006 my ($self) = @_; 1029 my ($self) = @_;
1007 1030
1008 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1031 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1009 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1032 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1010 1033
1011 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 1035
1013 $self->SUPER::_render; 1036 $self->SUPER::_render;
1014} 1037}
1015 1038
1016############################################################################# 1039#############################################################################
1017 1040
1018package CFPlus::UI::ScrolledWindow; 1041package DC::UI::ScrolledWindow;
1019 1042
1020our @ISA = CFPlus::UI::Table::; 1043our @ISA = DC::UI::Table::;
1021 1044
1022sub new { 1045sub new {
1023 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
1024 1047
1025 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1026 1049
1027 my $self; 1050 my $self;
1028 1051
1029 my $hslider = new CFPlus::UI::Slider 1052 my $hslider = new DC::UI::Slider
1030 c_col => 0, 1053 c_col => 0,
1031 c_row => 1, 1054 c_row => 1,
1032 vertical => 0, 1055 vertical => 0,
1033 range => [0, 0, 1, 0.01], # HACK fix 1056 range => [0, 0, 1, 0.01], # HACK fix
1034 on_changed => sub { 1057 on_changed => sub {
1035 $self->{hpos} = $_[1]; 1058 $self->{hpos} = $_[1];
1036 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1037 }, 1060 },
1038 ; 1061 ;
1039 1062
1040 my $vslider = new CFPlus::UI::Slider 1063 my $vslider = new DC::UI::Slider
1041 c_col => 1, 1064 c_col => 1,
1042 c_row => 0, 1065 c_row => 0,
1043 vertical => 1, 1066 vertical => 1,
1044 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1045 on_changed => sub { 1068 on_changed => sub {
… …
1057 col_expand => [1, 0], 1080 col_expand => [1, 0],
1058 row_expand => [1, 0], 1081 row_expand => [1, 0],
1059 %arg, 1082 %arg,
1060 ); 1083 );
1061 1084
1062 $self->{vp} = new CFPlus::UI::ViewPort 1085 $self->{vp} = new DC::UI::ViewPort
1063 c_col => 0, 1086 c_col => 0,
1064 c_row => 0, 1087 c_row => 0,
1065 expand => 1, 1088 expand => 1,
1066 scroll_x => $self->{scroll_x}, 1089 scroll_x => $self->{scroll_x},
1067 scroll_y => $self->{scroll_y}, 1090 scroll_y => $self->{scroll_y},
… …
1193 $self->SUPER::invoke_size_allocate ($w, $h) 1216 $self->SUPER::invoke_size_allocate ($w, $h)
1194} 1217}
1195 1218
1196############################################################################# 1219#############################################################################
1197 1220
1198package CFPlus::UI::Frame; 1221package DC::UI::Frame;
1199 1222
1200our @ISA = CFPlus::UI::Bin::; 1223our @ISA = DC::UI::Bin::;
1201 1224
1202use CFPlus::OpenGL; 1225use DC::OpenGL;
1203 1226
1204sub new { 1227sub new {
1205 my $class = shift; 1228 my $class = shift;
1206 1229
1207 $class->SUPER::new ( 1230 $class->SUPER::new (
… …
1226 $self->SUPER::_draw; 1249 $self->SUPER::_draw;
1227} 1250}
1228 1251
1229############################################################################# 1252#############################################################################
1230 1253
1231package CFPlus::UI::FancyFrame; 1254package DC::UI::FancyFrame;
1232 1255
1233our @ISA = CFPlus::UI::Bin::; 1256our @ISA = DC::UI::Bin::;
1234 1257
1235use CFPlus::OpenGL; 1258use DC::OpenGL;
1236 1259
1237sub new { 1260sub new {
1238 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1239 1262
1240 if ((exists $arg{label}) && !ref $arg{label}) { 1263 if ((exists $arg{label}) && !ref $arg{label}) {
1241 $arg{label} = new CFPlus::UI::Label 1264 $arg{label} = new DC::UI::Label
1242 align => 1, 1265 align => 1,
1243 valign => 0, 1266 valign => 0.5,
1244 text => $arg{label}, 1267 text => $arg{label},
1245 fontsize => ($arg{border} || 0.8) * 0.75; 1268 fontsize => ($arg{border} || 0.8) * 0.75;
1246 } 1269 }
1247 1270
1248 my $self = $class->SUPER::new ( 1271 my $self = $class->SUPER::new (
1249 # label => "", 1272 # label => "",
1250 fg => [0.6, 0.3, 0.1], 1273 fg => undef,
1251 border => 0.8, 1274 border => 0.8,
1252 style => 'single', 1275 style => 'single',
1253 %arg, 1276 %arg,
1254 ); 1277 );
1255 1278
… …
1258 1281
1259sub add { 1282sub add {
1260 my ($self, @widgets) = @_; 1283 my ($self, @widgets) = @_;
1261 1284
1262 $self->SUPER::add (@widgets); 1285 $self->SUPER::add (@widgets);
1263 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1286 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1264} 1287}
1265 1288
1266sub border { 1289sub border {
1267 int $_[0]{border} * $::FONTSIZE 1290 int $_[0]{border} * $::FONTSIZE
1268} 1291}
… …
1308 my $border = $self->border; 1331 my $border = $self->border;
1309 my ($w, $h) = ($self->{w}, $self->{h}); 1332 my ($w, $h) = ($self->{w}, $self->{h});
1310 1333
1311 $child->draw; 1334 $child->draw;
1312 1335
1313 glColor @{$self->{fg}}; 1336 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1314 glBegin GL_LINE_STRIP; 1337 glBegin GL_LINE_STRIP;
1315 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1338 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1316 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1339 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1317 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1318 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1326 } 1349 }
1327} 1350}
1328 1351
1329############################################################################# 1352#############################################################################
1330 1353
1331package CFPlus::UI::Toplevel; 1354package DC::UI::Toplevel;
1332 1355
1333our @ISA = CFPlus::UI::Bin::; 1356our @ISA = DC::UI::Bin::;
1334 1357
1335use CFPlus::OpenGL; 1358use DC::OpenGL;
1336 1359
1337my $bg = 1360my $bg =
1338 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1361 new_from_resource DC::Texture "d1_bg.png",
1339 mipmap => 1, wrap => 1; 1362 mipmap => 1, wrap => 1;
1340 1363
1341my @border = 1364my @border =
1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1365 map { new_from_resource DC::Texture $_, mipmap => 1 }
1343 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1366 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1344 1367
1345my @icon = 1368my @icon =
1346 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1369 map { new_from_resource DC::Texture $_, mipmap => 1 }
1347 qw(x1_move.png x1_resize.png); 1370 qw(x1_move.png x1_resize.png);
1348 1371
1349sub new { 1372sub new {
1350 my ($class, %arg) = @_; 1373 my ($class, %arg) = @_;
1351 1374
1352 my $self = $class->SUPER::new ( 1375 my $self = $class->SUPER::new (
1353 bg => [1, 1, 1, 1], 1376 bg => [1, 1, 1, 1],
1354 border_bg => [1, 1, 1, 1], 1377 border_bg => [1, 1, 1, 1],
1355 border => 0.6, 1378 border => 0.8,
1356 can_events => 1, 1379 can_events => 1,
1357 min_w => 64, 1380 min_w => 64,
1358 min_h => 32, 1381 min_h => 32,
1359 %arg, 1382 %arg,
1360 ); 1383 );
1361 1384
1362 $self->{title_widget} = new CFPlus::UI::Label 1385 $self->{title_widget} = new DC::UI::Label
1363 align => 0, 1386 align => 0.5,
1364 valign => 1, 1387 valign => 1,
1365 text => $self->{title}, 1388 text => $self->{title},
1366 fontsize => $self->{border}, 1389 fontsize => $self->{border},
1367 if exists $self->{title}; 1390 if exists $self->{title};
1368 1391
1369 if ($self->{has_close_button}) { 1392 if ($self->{has_close_button}) {
1370 $self->{close_button} = 1393 $self->{close_button} =
1371 new CFPlus::UI::ImageButton 1394 new DC::UI::ImageButton
1372 path => 'x1_close.png', 1395 path => 'x1_close.png',
1373 on_activate => sub { $self->emit ("delete") }; 1396 on_activate => sub { $self->emit ("delete") };
1374 1397
1375 $self->CFPlus::UI::Container::add ($self->{close_button}); 1398 $self->DC::UI::Container::add ($self->{close_button});
1376 } 1399 }
1377 1400
1378 $self 1401 $self
1379} 1402}
1380 1403
1381sub add { 1404sub add {
1382 my ($self, @widgets) = @_; 1405 my ($self, @widgets) = @_;
1383 1406
1384 $self->SUPER::add (@widgets); 1407 $self->SUPER::add (@widgets);
1385 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1408 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1386 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1409 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1387} 1410}
1388 1411
1389sub border { 1412sub border {
1390 int $_[0]{border} * $::FONTSIZE 1413 int $_[0]{border} * $::FONTSIZE
1391} 1414}
… …
1529 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1531 1554
1532 my $border = $self->border; 1555 my $border = $self->border;
1533 1556
1557 if ($border) {
1534 glColor @{ $self->{border_bg} }; 1558 glColor @{ $self->{border_bg} };
1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1559 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1560 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1561 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1562 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539 1563
1540 # move 1564 # move
1541 my $w2 = ($w - $border) * .5; 1565 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5; 1566 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1567 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1568 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1569 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546 1570
1547 # resize 1571 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1572 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1573 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button}; 1574 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1575 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1576 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1577 }
1553 1578
1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1579 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1555 glColor @{ $self->{bg} }; 1580 glColor @{ $self->{bg} };
1556 1581
1557 # TODO: repeat texture not scale 1582 # TODO: repeat texture not scale
… …
1576 if $self->{close_button}; 1601 if $self->{close_button};
1577} 1602}
1578 1603
1579############################################################################# 1604#############################################################################
1580 1605
1581package CFPlus::UI::Table; 1606package DC::UI::Table;
1582 1607
1583our @ISA = CFPlus::UI::Container::; 1608our @ISA = DC::UI::Container::;
1584 1609
1585use List::Util qw(max sum); 1610use List::Util qw(max sum);
1586 1611
1587use CFPlus::OpenGL; 1612use DC::OpenGL;
1588 1613
1589sub new { 1614sub new {
1590 my $class = shift; 1615 my $class = shift;
1591 1616
1592 $class->SUPER::new ( 1617 $class->SUPER::new (
… …
1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)}; 1661 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637 1662
1638 my $sw = sum @w[$c .. $c + $cs - 1]; 1663 my $sw = sum @w[$c .. $c + $cs - 1];
1639 1664
1640 if ($w > $sw) { 1665 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1666 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 } 1667 }
1643 } 1668 }
1644 1669
1645 # second pass, rows 1670 # second pass, rows
1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) { 1671 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)}; 1672 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1648 1673
1649 my $sh = sum @h[$r .. $r + $rs - 1]; 1674 my $sh = sum @h[$r .. $r + $rs - 1];
1650 1675
1651 if ($h > $sh) { 1676 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1677 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1653 } 1678 }
1654 } 1679 }
1655 1680
1656 (\@w, \@h) 1681 (\@w, \@h)
1657} 1682}
… …
1680 @col_expand = (1) x @$ws unless @col_expand; 1705 @col_expand = (1) x @$ws unless @col_expand;
1681 my $col_expand = (sum @col_expand) || 1; 1706 my $col_expand = (sum @col_expand) || 1;
1682 1707
1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1708 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1684 1709
1685 CFPlus::UI::harmonize $ws; 1710 DC::UI::harmonize $ws;
1686 1711
1687 my @row_expand = @{$self->{row_expand}}; 1712 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand; 1713 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1; 1714 my $row_expand = (sum @row_expand) || 1;
1690 1715
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1716 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692 1717
1693 CFPlus::UI::harmonize $hs; 1718 DC::UI::harmonize $hs;
1694 1719
1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1720 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1721 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1697 1722
1698 for my $widget ($self->children) { 1723 for my $widget ($self->children) {
… …
1707 1 1732 1
1708} 1733}
1709 1734
1710############################################################################# 1735#############################################################################
1711 1736
1712package CFPlus::UI::Fixed; 1737package DC::UI::Fixed;
1713 1738
1714use List::Util qw(min max); 1739use List::Util qw(min max);
1715 1740
1716our @ISA = CFPlus::UI::Container::; 1741our @ISA = DC::UI::Container::;
1717 1742
1718sub _scale($$$) { 1743sub _scale($$$) {
1719 my ($rel, $val, $max) = @_; 1744 my ($rel, $val, $max) = @_;
1720 1745
1721 $rel ? $val * $max : $val 1746 $rel ? $val * $max : $val
… …
1773 1 1798 1
1774} 1799}
1775 1800
1776############################################################################# 1801#############################################################################
1777 1802
1778package CFPlus::UI::Box; 1803package DC::UI::Box;
1779 1804
1780our @ISA = CFPlus::UI::Container::; 1805our @ISA = DC::UI::Container::;
1781 1806
1782sub size_request { 1807sub size_request {
1783 my ($self) = @_; 1808 my ($self) = @_;
1784 1809
1785 my @children = $self->visible_children; 1810 my @children = $self->visible_children;
… …
1820 $req[$_] += $space * $children[$_]{expand} 1845 $req[$_] += $space * $children[$_]{expand}
1821 for 0 .. $#children; 1846 for 0 .. $#children;
1822 } 1847 }
1823 } 1848 }
1824 1849
1825 CFPlus::UI::harmonize \@req; 1850 DC::UI::harmonize \@req;
1826 1851
1827 my $pos = 0; 1852 my $pos = 0;
1828 for (0 .. $#children) { 1853 for (0 .. $#children) {
1829 my $alloc = $req[$_]; 1854 my $alloc = $req[$_];
1830 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1855 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1835 1 1860 1
1836} 1861}
1837 1862
1838############################################################################# 1863#############################################################################
1839 1864
1840package CFPlus::UI::HBox; 1865package DC::UI::HBox;
1841 1866
1842our @ISA = CFPlus::UI::Box::; 1867our @ISA = DC::UI::Box::;
1843 1868
1844sub new { 1869sub new {
1845 my $class = shift; 1870 my $class = shift;
1846 1871
1847 $class->SUPER::new ( 1872 $class->SUPER::new (
… …
1850 ) 1875 )
1851} 1876}
1852 1877
1853############################################################################# 1878#############################################################################
1854 1879
1855package CFPlus::UI::VBox; 1880package DC::UI::VBox;
1856 1881
1857our @ISA = CFPlus::UI::Box::; 1882our @ISA = DC::UI::Box::;
1858 1883
1859sub new { 1884sub new {
1860 my $class = shift; 1885 my $class = shift;
1861 1886
1862 $class->SUPER::new ( 1887 $class->SUPER::new (
… …
1865 ) 1890 )
1866} 1891}
1867 1892
1868############################################################################# 1893#############################################################################
1869 1894
1870package CFPlus::UI::Label; 1895package DC::UI::Label;
1871 1896
1872our @ISA = CFPlus::UI::DrawBG::; 1897our @ISA = DC::UI::DrawBG::;
1873 1898
1874use CFPlus::OpenGL; 1899use DC::OpenGL;
1875 1900
1876sub new { 1901sub new {
1877 my ($class, %arg) = @_; 1902 my ($class, %arg) = @_;
1878 1903
1879 my $self = $class->SUPER::new ( 1904 my $self = $class->SUPER::new (
… …
1884 #text => initial text 1909 #text => initial text
1885 #markup => initial narkup 1910 #markup => initial narkup
1886 #max_w => maximum pixel width 1911 #max_w => maximum pixel width
1887 #style => 0, # render flags 1912 #style => 0, # render flags
1888 ellipsise => 3, # end 1913 ellipsise => 3, # end
1889 layout => (new CFPlus::Layout), 1914 layout => (new DC::Layout),
1890 fontsize => 1, 1915 fontsize => 1,
1891 align => -1, 1916 align => 0.5,
1892 valign => -1, 1917 valign => 0.5,
1893 padding_x => 2, 1918 padding_x => 4,
1894 padding_y => 2, 1919 padding_y => 2,
1895 can_events => 0, 1920 can_events => 0,
1896 %arg 1921 %arg
1897 ); 1922 );
1898 1923
1899 if (exists $self->{template}) { 1924 if (exists $self->{template}) {
1900 my $layout = new CFPlus::Layout; 1925 my $layout = new DC::Layout;
1901 $layout->set_text (delete $self->{template}); 1926 $layout->set_text (delete $self->{template});
1902 $self->{template} = $layout; 1927 $self->{template} = $layout;
1903 } 1928 }
1904 1929
1905 if (exists $self->{markup}) { 1930 if (exists $self->{markup}) {
… …
1964 1989
1965 $self->{size_req} ||= do { 1990 $self->{size_req} ||= do {
1966 my ($max_w, $max_h) = $self->get_max_wh; 1991 my ($max_w, $max_h) = $self->get_max_wh;
1967 1992
1968 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1993 $self->{layout}->set_font ($self->{font}) if $self->{font};
1969 $self->{layout}->set_width ($self->{max_w} || $max_w || -1); 1994 $self->{layout}->set_width ($max_w);
1970 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1995 $self->{layout}->set_ellipsise ($self->{ellipsise});
1971 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1996 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1972 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1973 1998
1974 my ($w, $h) = $self->{layout}->size; 1999 my ($w, $h) = $self->{layout}->size;
1975 2000
1976 if (exists $self->{template}) { 2001 if (exists $self->{template}) {
1977 $self->{template}->set_font ($self->{font}) if $self->{font}; 2002 $self->{template}->set_font ($self->{font}) if $self->{font};
1978 $self->{template}->set_width ($self->{max_w} || -1); 2003 $self->{template}->set_width ($max_w);
1979 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2004 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1980 2005
1981 my ($w2, $h2) = $self->{template}->size; 2006 my ($w2, $h2) = $self->{template}->size;
1982 2007
1983 $w = List::Util::max $w, $w2; 2008 $w = List::Util::max $w, $w2;
… …
2039 2064
2040 [$self->{layout}->size] 2065 [$self->{layout}->size]
2041 }; 2066 };
2042 2067
2043 unless (exists $self->{ox}) { 2068 unless (exists $self->{ox}) {
2044 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2069 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2045 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2070 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2046 : ($self->{w} - $size->[0]) * 0.5);
2047
2048 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2049 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2050 : ($self->{h} - $size->[1]) * 0.5);
2051 2071
2052 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2053 }; 2073 };
2054 2074
2055# unless ($self->{list}) { 2075# unless ($self->{list}) {
2056# $self->{list} = CFPlus::OpenGL::glGenList; 2076# $self->{list} = DC::OpenGL::glGenList;
2057# CFPlus::OpenGL::glNewList $self->{list}; 2077# DC::OpenGL::glNewList $self->{list};
2058# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2078# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2059# CFPlus::OpenGL::glEndList; 2079# DC::OpenGL::glEndList;
2060# } 2080# }
2061# 2081#
2062# CFPlus::OpenGL::glCallList $self->{list}; 2082# DC::OpenGL::glCallList $self->{list};
2063 2083
2064 $self->{layout}->draw; 2084 $self->{layout}->draw;
2065} 2085}
2066 2086
2067#sub destroy { 2087#sub destroy {
2068# my ($self) = @_; 2088# my ($self) = @_;
2069# 2089#
2070# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; 2090# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2071# 2091#
2072# $self->SUPER::destroy; 2092# $self->SUPER::destroy;
2073#} 2093#}
2074 2094
2075############################################################################# 2095#############################################################################
2076 2096
2077package CFPlus::UI::EntryBase; 2097package DC::UI::EntryBase;
2078 2098
2079our @ISA = CFPlus::UI::Label::; 2099our @ISA = DC::UI::Label::;
2080 2100
2081use CFPlus::OpenGL; 2101use DC::OpenGL;
2082 2102
2083sub new { 2103sub new {
2084 my $class = shift; 2104 my $class = shift;
2085 2105
2086 $class->SUPER::new ( 2106 $class->SUPER::new (
2087 fg => [1, 1, 1], 2107 fg => [1, 1, 1],
2088 bg => [0, 0, 0, 0.2], 2108 bg => [0, 0, 0, 0.2],
2089 outline => [0.6, 0.3, 0.1], 2109 outline => undef,
2090 active_bg => [0, 0, 1, .2], 2110 active_bg => [0, 0, 1, .2],
2091 active_fg => [1, 1, 1], 2111 active_fg => [1, 1, 1],
2092 active_outline => [1, 1, 0], 2112 active_outline => [1, 1, 0],
2093 can_hover => 1, 2113 can_hover => 1,
2094 can_focus => 1, 2114 can_focus => 1,
2115 align => 0,
2095 valign => 0, 2116 valign => 0.5,
2096 can_events => 1, 2117 can_events => 1,
2097 ellipsise => 0, 2118 ellipsise => 0,
2119 padding_x => 4,
2120 padding_y => 2,
2098 #text => ... 2121 #text => ...
2099 #hidden => "*", 2122 #hidden => "*",
2100 @_ 2123 @_
2101 ) 2124 )
2102} 2125}
… …
2149 2172
2150 my $text = $self->get_text; 2173 my $text = $self->get_text;
2151 2174
2152 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2175 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2153 2176
2154 if ($uni == 8) { 2177 if ($sym == DC::SDLK_BACKSPACE) {
2155 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2178 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2156 } elsif ($uni == 127) { 2179 } elsif ($sym == DC::SDLK_DELETE) {
2157 substr $text, $self->{cursor}, 1, ""; 2180 substr $text, $self->{cursor}, 1, "";
2158 } elsif ($sym == CFPlus::SDLK_LEFT) { 2181 } elsif ($sym == DC::SDLK_LEFT) {
2159 --$self->{cursor} if $self->{cursor}; 2182 --$self->{cursor} if $self->{cursor};
2160 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2183 } elsif ($sym == DC::SDLK_RIGHT) {
2161 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2184 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2162 } elsif ($sym == CFPlus::SDLK_HOME) { 2185 } elsif ($sym == DC::SDLK_HOME) {
2163 # what a hack 2186 # what a hack
2164 $self->{cursor} = 2187 $self->{cursor} =
2165 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2188 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2166 ? length $1 2189 ? length $1
2167 : 0; 2190 : 0;
2168 } elsif ($sym == CFPlus::SDLK_END) { 2191 } elsif ($sym == DC::SDLK_END) {
2169 # uh, again 2192 # uh, again
2170 $self->{cursor} = 2193 $self->{cursor} =
2171 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2194 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2172 ? $self->{cursor} + length $1 2195 ? $self->{cursor} + length $1
2173 : length $self->{text}; 2196 : length $self->{text};
… …
2264 glColor @{$self->{active_outline}}; 2287 glColor @{$self->{active_outline}};
2265 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5; 2288 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2266 glLineWidth 1; 2289 glLineWidth 1;
2267 2290
2268 } else { 2291 } else {
2269 glColor @{$self->{outline}}; 2292 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2270 glBegin GL_LINE_STRIP; 2293 glBegin GL_LINE_STRIP;
2271 glVertex .5, $self->{h} * .5; 2294 glVertex .5, $self->{h} * .5;
2272 glVertex .5, $self->{h} - 2.5; 2295 glVertex .5, $self->{h} - 2.5;
2273 glVertex $self->{w} - .5, $self->{h} - 2.5; 2296 glVertex $self->{w} - .5, $self->{h} - 2.5;
2274 glVertex $self->{w} - .5, $self->{h} * .5; 2297 glVertex $self->{w} - .5, $self->{h} * .5;
… …
2276 } 2299 }
2277} 2300}
2278 2301
2279############################################################################# 2302#############################################################################
2280 2303
2281package CFPlus::UI::Entry; 2304package DC::UI::Entry;
2282 2305
2283our @ISA = CFPlus::UI::EntryBase::; 2306our @ISA = DC::UI::EntryBase::;
2284 2307
2285use CFPlus::OpenGL; 2308use DC::OpenGL;
2309
2310sub new {
2311 my $class = shift;
2312
2313 $class->SUPER::new (
2314 history_pointer => -1,
2315 @_
2316 )
2317}
2318
2286 2319
2287sub invoke_key_down { 2320sub invoke_key_down {
2288 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
2289 2322
2290 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
… …
2296 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
2297 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
2298 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
2299 $self->update; 2332 $self->update;
2300 2333
2301 } elsif ($sym == CFPlus::SDLK_UP) { 2334 } elsif ($sym == DC::SDLK_UP) {
2302 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
2303 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
2304 } 2337 }
2305 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
2306 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
2308 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
2309 } 2342 }
2310 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2311 } 2344 }
2312 2345
2313 } elsif ($sym == CFPlus::SDLK_DOWN) { 2346 } elsif ($sym == DC::SDLK_DOWN) {
2314 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
2315 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2316 2349
2317 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
2318 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2319 } else { 2352 } else {
2353 if (defined $self->{history_saveback}) {
2320 $self->set_text ($self->{history_saveback}); 2354 $self->set_text ($self->{history_saveback});
2355 $self->{history_saveback} = undef;
2356 }
2321 } 2357 }
2322 2358
2323 } else { 2359 } else {
2324 return $self->SUPER::invoke_key_down ($ev) 2360 return $self->SUPER::invoke_key_down ($ev)
2325 } 2361 }
… …
2327 1 2363 1
2328} 2364}
2329 2365
2330############################################################################# 2366#############################################################################
2331 2367
2332package CFPlus::UI::TextEdit; 2368package DC::UI::TextEdit;
2333 2369
2334our @ISA = CFPlus::UI::EntryBase::; 2370our @ISA = DC::UI::EntryBase::;
2335 2371
2336use CFPlus::OpenGL; 2372use DC::OpenGL;
2373
2374sub new {
2375 my $class = shift;
2376
2377 $class->SUPER::new (
2378 padding_y => 4,
2379
2380 @_
2381 )
2382}
2337 2383
2338sub move_cursor_ver { 2384sub move_cursor_ver {
2339 my ($self, $dy) = @_; 2385 my ($self, $dy) = @_;
2340 2386
2341 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2387 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2342 2388
2343 $y += $dy; 2389 $line += $dy;
2344 2390
2345 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2391 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2346 $self->{cursor} = $index; 2392 $self->{cursor} = $index;
2347 delete $self->{cur_h}; 2393 delete $self->{cur_h};
2348 $self->update; 2394 $self->update;
2349 return; 2395 return;
2350 } 2396 }
… …
2353sub invoke_key_down { 2399sub invoke_key_down {
2354 my ($self, $ev) = @_; 2400 my ($self, $ev) = @_;
2355 2401
2356 my $sym = $ev->{sym}; 2402 my $sym = $ev->{sym};
2357 2403
2358 if ($sym == CFPlus::SDLK_UP) { 2404 if ($sym == DC::SDLK_UP) {
2359 $self->move_cursor_ver (-1); 2405 $self->move_cursor_ver (-1);
2360 } elsif ($sym == CFPlus::SDLK_DOWN) { 2406 } elsif ($sym == DC::SDLK_DOWN) {
2361 $self->move_cursor_ver (+1); 2407 $self->move_cursor_ver (+1);
2362 } else { 2408 } else {
2363 return $self->SUPER::invoke_key_down ($ev) 2409 return $self->SUPER::invoke_key_down ($ev)
2364 } 2410 }
2365 2411
2366 1 2412 1
2367} 2413}
2368 2414
2369############################################################################# 2415#############################################################################
2370 2416
2371package CFPlus::UI::ButtonBin; 2417package DC::UI::ButtonBin;
2372 2418
2373our @ISA = CFPlus::UI::Bin::; 2419our @ISA = DC::UI::Bin::;
2374 2420
2375use CFPlus::OpenGL; 2421use DC::OpenGL;
2376 2422
2377my @tex = 2423my @tex =
2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2424 map { new_from_resource DC::Texture $_, mipmap => 1 }
2379 qw(b1_button_inactive.png b1_button_active.png); 2425 qw(b1_button_inactive.png b1_button_active.png);
2380 2426
2381sub new { 2427sub new {
2382 my $class = shift; 2428 my $class = shift;
2383 2429
2384 $class->SUPER::new ( 2430 $class->SUPER::new (
2385 can_hover => 1, 2431 can_hover => 1,
2386 align => 0, 2432 align => 0.5,
2387 valign => 0, 2433 valign => 0.5,
2388 can_events => 1, 2434 can_events => 1,
2389 @_ 2435 @_
2390 ) 2436 )
2391} 2437}
2392 2438
… …
2415 $self->SUPER::_draw; 2461 $self->SUPER::_draw;
2416} 2462}
2417 2463
2418############################################################################# 2464#############################################################################
2419 2465
2420package CFPlus::UI::Button; 2466package DC::UI::Button;
2421 2467
2422our @ISA = CFPlus::UI::Label::; 2468our @ISA = DC::UI::Label::;
2423 2469
2424use CFPlus::OpenGL; 2470use DC::OpenGL;
2425 2471
2426my @tex = 2472my @tex =
2427 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2473 map { new_from_resource DC::Texture $_, mipmap => 1 }
2428 qw(b1_button_inactive.png b1_button_active.png); 2474 qw(b1_button_inactive.png b1_button_active.png);
2429 2475
2430sub new { 2476sub new {
2431 my $class = shift; 2477 my $class = shift;
2432 2478
2433 $class->SUPER::new ( 2479 $class->SUPER::new (
2434 padding_x => 4, 2480 padding_x => 8,
2435 padding_y => 4, 2481 padding_y => 4,
2436 fg => [1.0, 1.0, 1.0], 2482 fg => [1.0, 1.0, 1.0],
2437 active_fg => [0.8, 0.8, 0.8], 2483 active_fg => [0.8, 0.8, 0.8],
2438 can_hover => 1, 2484 can_hover => 1,
2439 align => 0, 2485 align => 0.5,
2440 valign => 0, 2486 valign => 0.5,
2441 can_events => 1, 2487 can_events => 1,
2442 @_ 2488 @_
2443 ) 2489 )
2444} 2490}
2445 2491
… …
2470 $self->SUPER::_draw; 2516 $self->SUPER::_draw;
2471} 2517}
2472 2518
2473############################################################################# 2519#############################################################################
2474 2520
2475package CFPlus::UI::CheckBox; 2521package DC::UI::CheckBox;
2476 2522
2477our @ISA = CFPlus::UI::DrawBG::; 2523our @ISA = DC::UI::DrawBG::;
2478 2524
2479my @tex = 2525my @tex =
2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2526 map { new_from_resource DC::Texture $_, mipmap => 1 }
2481 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2527 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2482 2528
2483use CFPlus::OpenGL; 2529use DC::OpenGL;
2484 2530
2485sub new { 2531sub new {
2486 my $class = shift; 2532 my $class = shift;
2487 2533
2488 $class->SUPER::new ( 2534 $class->SUPER::new (
2535 fontsize => 1,
2489 padding_x => 2, 2536 padding_x => 2,
2490 padding_y => 2, 2537 padding_y => 2,
2491 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
2492 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
2493 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
… …
2499} 2546}
2500 2547
2501sub size_request { 2548sub size_request {
2502 my ($self) = @_; 2549 my ($self) = @_;
2503 2550
2504 (6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
2505} 2552}
2506 2553
2507sub toggle { 2554sub toggle {
2508 my ($self) = @_; 2555 my ($self) = @_;
2509 2556
… …
2545 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2546} 2593}
2547 2594
2548############################################################################# 2595#############################################################################
2549 2596
2550package CFPlus::UI::Image; 2597package DC::UI::Image;
2551 2598
2552our @ISA = CFPlus::UI::Base::; 2599our @ISA = DC::UI::DrawBG::;
2553 2600
2554use CFPlus::OpenGL; 2601use DC::OpenGL;
2555 2602
2556our %texture_cache; 2603our %texture_cache;
2557 2604
2558sub new { 2605sub new {
2559 my $class = shift; 2606 my $class = shift;
… …
2566 2613
2567 $self->{path} || $self->{tex} 2614 $self->{path} || $self->{tex}
2568 or Carp::croak "'path' or 'tex' attributes required"; 2615 or Carp::croak "'path' or 'tex' attributes required";
2569 2616
2570 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2617 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2571 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2618 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2572 2619
2573 CFPlus::weaken $texture_cache{$self->{path}}; 2620 DC::weaken $texture_cache{$self->{path}};
2574 2621
2575 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2622 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2576 2623
2577 $self 2624 $self
2578} 2625}
2579 2626
2580sub STORABLE_freeze { 2627sub STORABLE_freeze {
2581 my ($self, $cloning) = @_; 2628 my ($self, $cloning) = @_;
2582 2629
2583 $self->{path} 2630 $self->{path}
2584 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2631 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2585 2632
2586 $self->{path} 2633 $self->{path}
2587} 2634}
2588 2635
2589sub STORABLE_attach { 2636sub STORABLE_attach {
2590 my ($self, $cloning, $path) = @_; 2637 my ($self, $cloning, $path) = @_;
2591 2638
2592 $self->new (path => $path) 2639 $self->new (path => $path)
2593} 2640}
2594 2641
2642sub set_texture {
2643 my ($self, $tex) = @_;
2644
2645 $self->{tex} = $tex;
2646 $self->update;
2647}
2648
2595sub size_request { 2649sub size_request {
2596 my ($self) = @_; 2650 my ($self) = @_;
2597 2651
2598 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale}) 2652 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2599} 2653}
2600 2654
2601sub _draw { 2655sub _draw {
2602 my ($self) = @_; 2656 my ($self) = @_;
2657
2658 $self->SUPER::_draw;
2603 2659
2604 my $tex = $self->{tex}; 2660 my $tex = $self->{tex};
2605 2661
2606 my ($w, $h) = ($self->{w}, $self->{h}); 2662 my ($w, $h) = ($self->{w}, $self->{h});
2607 2663
… …
2620 glDisable GL_TEXTURE_2D; 2676 glDisable GL_TEXTURE_2D;
2621} 2677}
2622 2678
2623############################################################################# 2679#############################################################################
2624 2680
2625package CFPlus::UI::ImageButton; 2681package DC::UI::ImageButton;
2626 2682
2627our @ISA = CFPlus::UI::Image::; 2683our @ISA = DC::UI::Image::;
2628 2684
2629use CFPlus::OpenGL; 2685use DC::OpenGL;
2630
2631my %textures;
2632 2686
2633sub new { 2687sub new {
2634 my $class = shift; 2688 my $class = shift;
2635 2689
2636 my $self = $class->SUPER::new ( 2690 my $self = $class->SUPER::new (
2637 padding_x => 4, 2691 padding_x => 4,
2638 padding_y => 4, 2692 padding_y => 4,
2639 fg => [1, 1, 1], 2693 fg => [1, 1, 1],
2640 active_fg => [0, 0, 1], 2694 active_fg => [0, 0, 1],
2641 can_hover => 1, 2695 can_hover => 1,
2642 align => 0, 2696 align => 0.5,
2643 valign => 0, 2697 valign => 0.5,
2644 can_events => 1, 2698 can_events => 1,
2645 @_ 2699 @_
2646 ); 2700 );
2647} 2701}
2648 2702
… …
2662 1 2716 1
2663} 2717}
2664 2718
2665############################################################################# 2719#############################################################################
2666 2720
2667package CFPlus::UI::VGauge; 2721package DC::UI::VGauge;
2668 2722
2669our @ISA = CFPlus::UI::Base::; 2723our @ISA = DC::UI::Base::;
2670 2724
2671use List::Util qw(min max); 2725use List::Util qw(min max);
2672 2726
2673use CFPlus::OpenGL; 2727use DC::OpenGL;
2674 2728
2675my %tex = ( 2729my %tex = (
2676 food => [ 2730 food => [
2677 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2731 map { new_from_resource DC::Texture $_, mipmap => 1 }
2678 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2732 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2679 ], 2733 ],
2680 grace => [ 2734 grace => [
2681 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2735 map { new_from_resource DC::Texture $_, mipmap => 1 }
2682 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2736 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2683 ], 2737 ],
2684 hp => [ 2738 hp => [
2685 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2739 map { new_from_resource DC::Texture $_, mipmap => 1 }
2686 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2740 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2687 ], 2741 ],
2688 mana => [ 2742 mana => [
2689 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2743 map { new_from_resource DC::Texture $_, mipmap => 1 }
2690 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2744 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2691 ], 2745 ],
2692); 2746);
2693 2747
2694# eg. VGauge->new (gauge => 'food'), default gauge: food 2748# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2797 glDisable GL_TEXTURE_2D; 2851 glDisable GL_TEXTURE_2D;
2798} 2852}
2799 2853
2800############################################################################# 2854#############################################################################
2801 2855
2802package CFPlus::UI::Progress; 2856package DC::UI::Progress;
2803 2857
2804our @ISA = CFPlus::UI::Label::; 2858our @ISA = DC::UI::Label::;
2805 2859
2806use CFPlus::OpenGL; 2860use DC::OpenGL;
2807 2861
2808sub new { 2862sub new {
2809 my ($class, %arg) = @_; 2863 my ($class, %arg) = @_;
2810 2864
2811 my $self = $class->SUPER::new ( 2865 my $self = $class->SUPER::new (
2866 padding_x => 2,
2867 padding_y => 2,
2812 fg => [1, 1, 1], 2868 fg => [1, 1, 1],
2813 bg => [0, 0, 1, 0.2], 2869 bg => [0, 0, 1, 0.2],
2814 bar => [0.7, 0.5, 0.1, 0.8], 2870 bar => [0.7, 0.5, 0.1, 0.8],
2815 outline => [0.4, 0.3, 0], 2871 outline => [0.4, 0.3, 0],
2816 fontsize => 0.9, 2872 fontsize => 0.9,
2817 valign => 0, 2873 valign => 0.5,
2818 align => 0, 2874 align => 0.5,
2819 can_events => 1, 2875 can_events => 1,
2820 ellipsise => 1, 2876 ellipsise => 1,
2821 label => "%d%%", 2877 label => "%d%%",
2822 %arg, 2878 %arg,
2823 ); 2879 );
… …
2831 my ($self, $label) = @_; 2887 my ($self, $label) = @_;
2832 2888
2833 return if $self->{label} eq $label; 2889 return if $self->{label} eq $label;
2834 $self->{label} = $label; 2890 $self->{label} = $label;
2835 2891
2836 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value}); 2892 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2837} 2893}
2838 2894
2839sub set_value { 2895sub set_value {
2840 my ($self, $value) = @_; 2896 my ($self, $value) = @_;
2841 2897
… …
2856 my ($self) = @_; 2912 my ($self) = @_;
2857 2913
2858 glEnable GL_BLEND; 2914 glEnable GL_BLEND;
2859 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2915 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2860 2916
2917 my $px = $self->{padding_x};
2918 my $py = $self->{padding_y};
2919
2861 if ($self->{value} >= 0) { 2920 if ($self->{value} >= 0) {
2862 my $s = int 2 + ($self->{w} - 4) * $self->{value}; 2921 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2863 2922
2864 glColor_premultiply @{$self->{bar}}; 2923 glColor_premultiply @{$self->{bar}};
2865 glRect 2, 2, $s, $self->{h} - 2; 2924 glRect $px, $py, $s, $self->{h} - $py;
2866 glColor_premultiply @{$self->{bg}}; 2925 glColor_premultiply @{$self->{bg}};
2867 glRect $s, 2, $self->{w} - 2, $self->{h} - 2; 2926 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2868 } 2927 }
2869 2928
2870 glColor_premultiply @{$self->{outline}}; 2929 glColor_premultiply @{$self->{outline}};
2930
2931 $px -= .5;
2932 $py -= .5;
2933
2871 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5; 2934 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2872 2935
2873 glDisable GL_BLEND; 2936 glDisable GL_BLEND;
2874 2937
2875 { 2938 {
2876 local $self->{bg}; # do not draw background 2939 local $self->{bg}; # do not draw background
… …
2878 } 2941 }
2879} 2942}
2880 2943
2881############################################################################# 2944#############################################################################
2882 2945
2883package CFPlus::UI::ExperienceProgress; 2946package DC::UI::ExperienceProgress;
2884 2947
2885our @ISA = CFPlus::UI::Progress::; 2948our @ISA = DC::UI::Progress::;
2886 2949
2887sub new { 2950sub new {
2888 my ($class, %arg) = @_; 2951 my ($class, %arg) = @_;
2889 2952
2953 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2954
2890 my $self = $class->SUPER::new ( 2955 my $self = $class->SUPER::new (
2956 %arg,
2891 tooltip => sub { 2957 tooltip => sub {
2892 my ($self) = @_; 2958 my ($self) = @_;
2893 2959
2894 sprintf "level %d\n%s points\n%s next level\n%s to go", 2960 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2961 $tt,
2895 $self->{lvl}, 2962 $self->{lvl},
2896 ::formsep ($self->{exp}), 2963 ::formsep ($self->{exp}),
2897 ::formsep ($self->{nxt}), 2964 ::formsep ($self->{nxt}),
2898 ::formsep ($self->{nxt} - $self->{exp}), 2965 ::formsep ($self->{nxt} - $self->{exp}),
2966 $self->_percent * 100,
2899 }, 2967 },
2900 %arg
2901 ); 2968 );
2902 2969
2903 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) } 2970 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2904 if $::CONN; 2971 if $::CONN;
2905 2972
… …
2913 if $::CONN; 2980 if $::CONN;
2914 2981
2915 $self->SUPER::DESTROY; 2982 $self->SUPER::DESTROY;
2916} 2983}
2917 2984
2985sub _percent {
2986 my ($self) = @_;
2987
2988 my $table = $::CONN && $::CONN->{exp_table}
2989 or return -1;
2990
2991 my $l0 = $table->[$self->{lvl} - 1];
2992 my $l1 = $table->[$self->{lvl}];
2993
2994 $self->{nxt} = $l1;
2995
2996 ($self->{exp} - $l0) / ($l1 - $l0)
2997}
2998
2918sub set_value { 2999sub set_value {
2919 my ($self, $lvl, $exp) = @_; 3000 my ($self, $lvl, $exp) = @_;
2920 3001
2921 $self->{lvl} = $lvl; 3002 $self->{lvl} = $lvl;
2922 $self->{exp} = $exp; 3003 $self->{exp} = $exp;
2923 3004
2924 my $v = -1;
2925
2926 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2927 my $l0 = $table->[$lvl - 1];
2928 my $l1 = $table->[$lvl];
2929
2930 $self->{nxt} = $l1;
2931
2932 $v = ($exp - $l0) / ($l1 - $l0);
2933 }
2934
2935 $self->SUPER::set_value ($v); 3005 $self->SUPER::set_value ($self->_percent);
2936} 3006}
2937 3007
2938############################################################################# 3008#############################################################################
2939 3009
2940package CFPlus::UI::Gauge; 3010package DC::UI::Gauge;
2941 3011
2942our @ISA = CFPlus::UI::VBox::; 3012our @ISA = DC::UI::VBox::;
2943 3013
2944sub new { 3014sub new {
2945 my ($class, %arg) = @_; 3015 my ($class, %arg) = @_;
2946 3016
2947 my $self = $class->SUPER::new ( 3017 my $self = $class->SUPER::new (
… …
2949 can_hover => 1, 3019 can_hover => 1,
2950 can_events => 1, 3020 can_events => 1,
2951 %arg, 3021 %arg,
2952 ); 3022 );
2953 3023
2954 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3024 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2955 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3025 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2956 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3026 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2957 3027
2958 $self 3028 $self
2959} 3029}
2960 3030
2961sub set_fontsize { 3031sub set_fontsize {
… …
2982 $self->{value}->set_text ($val); 3052 $self->{value}->set_text ($val);
2983} 3053}
2984 3054
2985############################################################################# 3055#############################################################################
2986 3056
2987package CFPlus::UI::Slider; 3057package DC::UI::Slider;
2988 3058
2989use strict; 3059use strict;
2990 3060
2991use CFPlus::OpenGL; 3061use DC::OpenGL;
2992 3062
2993our @ISA = CFPlus::UI::DrawBG::; 3063our @ISA = DC::UI::DrawBG::;
2994 3064
2995my @tex = 3065my @tex =
2996 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3066 map { new_from_resource DC::Texture $_ }
2997 qw(s1_slider.png s1_slider_bg.png); 3067 qw(s1_slider.png s1_slider_bg.png);
2998 3068
2999sub new { 3069sub new {
3000 my $class = shift; 3070 my $class = shift;
3001 3071
… …
3038sub set_value { 3108sub set_value {
3039 my ($self, $value) = @_; 3109 my ($self, $value) = @_;
3040 3110
3041 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3111 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
3042 3112
3043 $hi = $lo + 1 if $hi <= $lo; 3113 $hi = $lo if $hi < $lo;
3044 3114
3045 $page = $hi - $lo if $page > $hi - $lo; 3115 $value = $hi - $page if $value > $hi - $page;
3046
3047 $value = $lo if $value < $lo; 3116 $value = $lo if $value < $lo;
3048 $value = $hi - $page if $value > $hi - $page;
3049 3117
3050 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3118 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
3051 if $unit; 3119 if $unit;
3052 3120
3053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3121 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
3097sub invoke_mouse_wheel { 3165sub invoke_mouse_wheel {
3098 my ($self, $ev) = @_; 3166 my ($self, $ev) = @_;
3099 3167
3100 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3168 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3101 3169
3102 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3170 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3103 3171
3104 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3172 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
3105 3173
3106 1 3174 1
3107} 3175}
… …
3117 my ($self) = @_; 3185 my ($self) = @_;
3118 3186
3119 unless ($self->{knob_w}) { 3187 unless ($self->{knob_w}) {
3120 $self->set_value ($self->{range}[0]); 3188 $self->set_value ($self->{range}[0]);
3121 3189
3122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3190 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
3123 my $range = ($hi - $page - $lo) || 1e-100; 3191 my $range = ($hi - $page - $lo) || 1e-10;
3124 3192
3125 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3193 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
3126 3194
3127 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3195 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
3128 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3196 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
3129 3197
3130 $value = ($value - $lo) / $range; 3198 $value = ($value - $lo) / $range;
… …
3160 glDisable GL_TEXTURE_2D; 3228 glDisable GL_TEXTURE_2D;
3161} 3229}
3162 3230
3163############################################################################# 3231#############################################################################
3164 3232
3165package CFPlus::UI::ValSlider; 3233package DC::UI::ValSlider;
3166 3234
3167our @ISA = CFPlus::UI::HBox::; 3235our @ISA = DC::UI::HBox::;
3168 3236
3169sub new { 3237sub new {
3170 my ($class, %arg) = @_; 3238 my ($class, %arg) = @_;
3171 3239
3172 my $range = delete $arg{range}; 3240 my $range = delete $arg{range};
3173 3241
3174 my $self = $class->SUPER::new ( 3242 my $self = $class->SUPER::new (
3175 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3243 slider => (new DC::UI::Slider expand => 1, range => $range),
3176 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3244 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
3177 to_value => sub { shift }, 3245 to_value => sub { shift },
3178 from_value => sub { shift }, 3246 from_value => sub { shift },
3179 %arg, 3247 %arg,
3180 ); 3248 );
3181 3249
… …
3201sub set_range { shift->{slider}->set_range (@_) } 3269sub set_range { shift->{slider}->set_range (@_) }
3202sub set_value { shift->{slider}->set_value (@_) } 3270sub set_value { shift->{slider}->set_value (@_) }
3203 3271
3204############################################################################# 3272#############################################################################
3205 3273
3206package CFPlus::UI::TextScroller; 3274package DC::UI::TextScroller;
3207 3275
3208our @ISA = CFPlus::UI::HBox::; 3276our @ISA = DC::UI::HBox::;
3209 3277
3210use CFPlus::OpenGL; 3278use DC::OpenGL;
3211 3279
3212sub new { 3280sub new {
3213 my $class = shift; 3281 my $class = shift;
3214 3282
3215 my $self = $class->SUPER::new ( 3283 my $self = $class->SUPER::new (
… …
3217 can_events => 1, 3285 can_events => 1,
3218 indent => 0, 3286 indent => 0,
3219 #font => default_font 3287 #font => default_font
3220 @_, 3288 @_,
3221 3289
3222 layout => (new CFPlus::Layout), 3290 layout => (new DC::Layout),
3223 par => [], 3291 par => [],
3224 max_par => 0, 3292 max_par => 0,
3225 height => 0, 3293 height => 0,
3226 children => [ 3294 children => [
3227 (new CFPlus::UI::Empty expand => 1), 3295 (new DC::UI::Empty expand => 1),
3228 (new CFPlus::UI::Slider vertical => 1), 3296 (new DC::UI::Slider vertical => 1),
3229 ], 3297 ],
3230 ); 3298 );
3231 3299
3232 $self->{children}[1]->connect (changed => sub { $self->update }); 3300 $self->{children}[1]->connect (changed => sub { $self->update });
3233 3301
… …
3289 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3357 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3290 $layout->set_markup ($para->{markup}); 3358 $layout->set_markup ($para->{markup});
3291 3359
3292 $layout->set_shapes ( 3360 $layout->set_shapes (
3293 map 3361 map
3294 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3362 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3295 @{$para->{widget}} 3363 @{$para->{widget}}
3296 ); 3364 );
3297 3365
3298 $layout 3366 $layout
3299} 3367}
… …
3416 $ROOT->on_post_alloc ($self => sub { 3484 $ROOT->on_post_alloc ($self => sub {
3417 $self->force_uptodate; 3485 $self->force_uptodate;
3418 3486
3419 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3487 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3420 3488
3421 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3489 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3422 glClearColor 0, 0, 0, 0; 3490 glClearColor 0, 0, 0, 0;
3423 glClear GL_COLOR_BUFFER_BIT; 3491 glClear GL_COLOR_BUFFER_BIT;
3424 3492
3425 package CFPlus::UI::Base; 3493 package DC::UI::Base;
3426 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3494 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3427 (0, 0, $self->{w}, $self->{h}); 3495 (0, 0, $self->{w}, $self->{h});
3428 3496
3429 my $top = int $self->{children}[1]{range}[0]; 3497 my $top = int $self->{children}[1]{range}[0];
3430 3498
… …
3489 $self->{children}[1]->draw; 3557 $self->{children}[1]->draw;
3490} 3558}
3491 3559
3492############################################################################# 3560#############################################################################
3493 3561
3494package CFPlus::UI::Animator; 3562package DC::UI::Animator;
3495 3563
3496use CFPlus::OpenGL; 3564use DC::OpenGL;
3497 3565
3498our @ISA = CFPlus::UI::Bin::; 3566our @ISA = DC::UI::Bin::;
3499 3567
3500sub moveto { 3568sub moveto {
3501 my ($self, $x, $y) = @_; 3569 my ($self, $x, $y) = @_;
3502 3570
3503 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3571 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3531 glPopMatrix; 3599 glPopMatrix;
3532} 3600}
3533 3601
3534############################################################################# 3602#############################################################################
3535 3603
3536package CFPlus::UI::Flopper; 3604package DC::UI::Flopper;
3537 3605
3538our @ISA = CFPlus::UI::Button::; 3606our @ISA = DC::UI::Button::;
3539 3607
3540sub new { 3608sub new {
3541 my $class = shift; 3609 my $class = shift;
3542 3610
3543 my $self = $class->SUPER::new ( 3611 my $self = $class->SUPER::new (
… …
3555 $self->{other}->toggle_visibility; 3623 $self->{other}->toggle_visibility;
3556} 3624}
3557 3625
3558############################################################################# 3626#############################################################################
3559 3627
3560package CFPlus::UI::Tooltip; 3628package DC::UI::Tooltip;
3561 3629
3562our @ISA = CFPlus::UI::Bin::; 3630our @ISA = DC::UI::Bin::;
3563 3631
3564use CFPlus::OpenGL; 3632use DC::OpenGL;
3565 3633
3566sub new { 3634sub new {
3567 my $class = shift; 3635 my $class = shift;
3568 3636
3569 $class->SUPER::new ( 3637 $class->SUPER::new (
… …
3576 my ($self, $widget) = @_; 3644 my ($self, $widget) = @_;
3577 3645
3578 my $tip = $widget->{tooltip}; 3646 my $tip = $widget->{tooltip};
3579 $tip = $tip->($widget) if "CODE" eq ref $tip; 3647 $tip = $tip->($widget) if "CODE" eq ref $tip;
3580 3648
3581 $tip = CFPlus::Pod::section_label tooltip => $1 3649 $tip = DC::Pod::section_label tooltip => $1
3582 if $tip =~ /^#(.*)$/; 3650 if $tip =~ /^#(.*)$/;
3583 3651
3584 if ($ENV{CFPLUS_DEBUG} & 2) { 3652 if ($ENV{CFPLUS_DEBUG} & 2) {
3585 $tip .= "\n\n" . (ref $widget) . "\n" 3653 $tip .= "\n\n" . (ref $widget) . "\n"
3586 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3654 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
… …
3589 } 3657 }
3590 3658
3591 $tip =~ s/^\n+//; 3659 $tip =~ s/^\n+//;
3592 $tip =~ s/\n+$//; 3660 $tip =~ s/\n+$//;
3593 3661
3594 $self->add (new CFPlus::UI::Label 3662 $self->add (new DC::UI::Label
3663 fg => $DC::THEME{tooltip_fg},
3595 markup => $tip, 3664 markup => $tip,
3596 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3665 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3666 align => 0,
3597 fontsize => 0.8, 3667 fontsize => 0.8,
3598 style => 1, # FLAG_INVERSE 3668 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3599 ellipsise => 0, 3669 ellipsise => 0,
3600 font => ($widget->{tooltip_font} || $::FONT_PROP), 3670 font => ($widget->{tooltip_font} || $::FONT_PROP),
3601 ); 3671 );
3602} 3672}
3603 3673
… …
3640sub _draw { 3710sub _draw {
3641 my ($self) = @_; 3711 my ($self) = @_;
3642 3712
3643 my ($w, $h) = @$self{qw(w h)}; 3713 my ($w, $h) = @$self{qw(w h)};
3644 3714
3645 glColor 1, 0.8, 0.4; 3715 glColor @{ $DC::THEME{tooltip_bg} };
3646 glRect 0, 0, $w, $h; 3716 glRect 0, 0, $w, $h;
3647 3717
3648 glColor 0, 0, 0; 3718 glColor @{ $DC::THEME{tooltip_border} };
3649 glRect_lineloop .5, .5, $w + .5, $h + .5; 3719 glRect_lineloop .5, .5, $w + .5, $h + .5;
3650 3720
3651 glTranslate 2, 2; 3721 glTranslate 2, 2;
3652 3722
3653 $self->SUPER::_draw; 3723 $self->SUPER::_draw;
3654} 3724}
3655 3725
3656############################################################################# 3726#############################################################################
3657 3727
3658package CFPlus::UI::Face; 3728package DC::UI::Face;
3659 3729
3660our @ISA = CFPlus::UI::DrawBG::; 3730our @ISA = DC::UI::DrawBG::;
3661 3731
3662use CFPlus::OpenGL; 3732use DC::OpenGL;
3663 3733
3664sub new { 3734sub new {
3665 my $class = shift; 3735 my $class = shift;
3666 3736
3667 my $self = $class->SUPER::new ( 3737 my $self = $class->SUPER::new (
… …
3670 aspect => 1, 3740 aspect => 1,
3671 can_events => 0, 3741 can_events => 0,
3672 @_, 3742 @_,
3673 ); 3743 );
3674 3744
3675 if ($self->{anim} && $self->{animspeed}) {
3676 CFPlus::weaken (my $widget = $self);
3677
3678 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3679 $widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
3680 $self->{timer} = EV::timer_ns 0, 0, sub {
3681 return unless $::CONN;
3682
3683 my $w = $widget
3684 or return;
3685
3686 ++$w->{frame};
3687 $w->update_face;
3688
3689 # somehow, $widget can go away
3690 $w->update;
3691 $w->update_timer;
3692 };
3693
3694 $self->update_face;
3695 $self->update_timer; 3745 $self->update_anim;
3696 }
3697 3746
3698 $self 3747 $self
3699} 3748}
3700 3749
3701sub update_timer { 3750sub update_timer {
3702 my ($self) = @_; 3751 my ($self) = @_;
3703 3752
3704 return unless $self->{timer}; 3753 return unless $self->{timer};
3705 3754
3706 $self->{timer}->stop;
3707 if ($self->{visible}) { 3755 if ($self->{visible}) {
3708 $self->{timer}->set (
3709 $self->{anim_start}
3710 + $self->{animspeed}
3711 * int 1.5 + (EV::now - $self->{anim_start}) / $self->{animspeed}
3712 );
3713 $self->{timer}->start; 3756 $self->{timer}->start;
3757 } else {
3758 $self->{timer}->stop;
3714 } 3759 }
3715} 3760}
3716 3761
3717sub update_face { 3762sub update_face {
3718 my ($self) = @_; 3763 my ($self) = @_;
… …
3728 $tex->upload (sub { $self->reconfigure }); 3773 $tex->upload (sub { $self->reconfigure });
3729 } 3774 }
3730 } 3775 }
3731 } 3776 }
3732 } 3777 }
3778 }
3779}
3780
3781sub update_anim {
3782 my ($self) = @_;
3783
3784 if ($self->{anim} && $self->{animspeed}) {
3785 DC::weaken (my $widget = $self);
3786
3787 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3788 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3789 return unless $::CONN;
3790
3791 my $w = $widget
3792 or return;
3793
3794 ++$w->{frame};
3795 $w->update_face;
3796
3797 # somehow, $widget can go away
3798 $w->update;
3799 $w->update_timer;
3800 };
3801
3802 $self->update_face;
3803 $self->update_timer;
3804 } else {
3805 delete $self->{timer};
3733 } 3806 }
3734} 3807}
3735 3808
3736sub size_request { 3809sub size_request {
3737 my ($self) = @_; 3810 my ($self) = @_;
… …
3759 return unless $self->{visible}; 3832 return unless $self->{visible};
3760 3833
3761 $self->SUPER::update; 3834 $self->SUPER::update;
3762} 3835}
3763 3836
3837sub set_face {
3838 my ($self, $face) = @_;
3839
3840 $self->{face} = $face;
3841 $self->reconfigure;
3842}
3843
3844sub set_anim {
3845 my ($self, $anim) = @_;
3846
3847 $self->{anim} = $anim;
3848 $self->update_anim;
3849}
3850
3851sub set_animspeed {
3852 my ($self, $animspeed) = @_;
3853
3854 $self->{animspeed} = $animspeed;
3855 $self->update_anim;
3856}
3857
3764sub invoke_visibility_change { 3858sub invoke_visibility_change {
3765 my ($self) = @_; 3859 my ($self) = @_;
3766 3860
3767 $self->update_timer; 3861 $self->update_timer;
3768 3862
… …
3792 $self->SUPER::destroy; 3886 $self->SUPER::destroy;
3793} 3887}
3794 3888
3795############################################################################# 3889#############################################################################
3796 3890
3797package CFPlus::UI::Buttonbar; 3891package DC::UI::Buttonbar;
3798 3892
3799our @ISA = CFPlus::UI::HBox::; 3893our @ISA = DC::UI::HBox::;
3800 3894
3801# TODO: should actually wrap buttons and other goodies. 3895# TODO: should actually wrap buttons and other goodies.
3802 3896
3803############################################################################# 3897#############################################################################
3804 3898
3805package CFPlus::UI::Menu; 3899package DC::UI::Menu;
3806 3900
3807our @ISA = CFPlus::UI::Toplevel::; 3901our @ISA = DC::UI::Toplevel::;
3808 3902
3809use CFPlus::OpenGL; 3903use DC::OpenGL;
3810 3904
3811sub new { 3905sub new {
3812 my $class = shift; 3906 my $class = shift;
3813 3907
3814 my $self = $class->SUPER::new ( 3908 my $self = $class->SUPER::new (
3815 items => [], 3909 items => [],
3816 z => 100, 3910 z => 100,
3817 @_, 3911 @_,
3818 ); 3912 );
3819 3913
3820 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3914 $self->add ($self->{vbox} = new DC::UI::VBox);
3821 3915
3822 for my $item (@{ $self->{items} }) { 3916 for my $item (@{ $self->{items} }) {
3823 my ($widget, $cb, $tooltip) = @$item; 3917 my ($widget, $cb, $tooltip) = @$item;
3824 3918
3825 # handle various types of items, only text for now 3919 # handle various types of items, only text for now
3826 if (!ref $widget) { 3920 if (!ref $widget) {
3827 if ($widget =~ /\t/) { 3921 if ($widget =~ /\t/) {
3828 my ($left, $right) = split /\t/, $widget, 2; 3922 my ($left, $right) = split /\t/, $widget, 2;
3829 3923
3830 $widget = new CFPlus::UI::HBox 3924 $widget = new DC::UI::HBox
3831 can_hover => 1, 3925 can_hover => 1,
3832 can_events => 1, 3926 can_events => 1,
3833 tooltip => $tooltip, 3927 tooltip => $tooltip,
3834 children => [ 3928 children => [
3835 (new CFPlus::UI::Label markup => $left, expand => 1), 3929 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3836 (new CFPlus::UI::Label markup => $right, align => +1), 3930 (new DC::UI::Label markup => $right, align => 1),
3837 ], 3931 ],
3838 ; 3932 ;
3839 3933
3840 } else { 3934 } else {
3841 $widget = new CFPlus::UI::Label 3935 $widget = new DC::UI::Label
3842 can_hover => 1, 3936 can_hover => 1,
3843 can_events => 1, 3937 can_events => 1,
3938 align => 0,
3844 markup => $widget, 3939 markup => $widget,
3845 tooltip => $tooltip; 3940 tooltip => $tooltip;
3846 } 3941 }
3847 } 3942 }
3848 3943
… …
3863 # maybe save $GRAB? must be careful about events... 3958 # maybe save $GRAB? must be careful about events...
3864 $GRAB = $self; 3959 $GRAB = $self;
3865 $self->{button} = $ev->{button}; 3960 $self->{button} = $ev->{button};
3866 3961
3867 $self->show; 3962 $self->show;
3868 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3963
3964 my $x = $ev->{x};
3965 my $y = $ev->{y};
3966
3967 $self->{root}->on_post_alloc ($self => sub {
3968 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3969 });
3970
3971 1 # so it can be used inside event handlers
3869} 3972}
3870 3973
3871sub invoke_mouse_motion { 3974sub invoke_mouse_motion {
3872 my ($self, $ev, $x, $y) = @_; 3975 my ($self, $ev, $x, $y) = @_;
3873 3976
… …
3894 1 3997 1
3895} 3998}
3896 3999
3897############################################################################# 4000#############################################################################
3898 4001
3899package CFPlus::UI::Multiplexer; 4002package DC::UI::Multiplexer;
3900 4003
3901our @ISA = CFPlus::UI::Container::; 4004our @ISA = DC::UI::Container::;
3902 4005
3903sub new { 4006sub new {
3904 my $class = shift; 4007 my $class = shift;
3905 4008
3906 my $self = $class->SUPER::new ( 4009 my $self = $class->SUPER::new (
3907 @_, 4010 @_,
3908 ); 4011 );
3909 4012
3910 $self->{current} = $self->{children}[0] 4013 $self->set_current_page (0);
3911 if @{ $self->{children} };
3912 4014
3913 $self 4015 $self
3914} 4016}
3915 4017
3916sub add { 4018sub add {
3917 my ($self, @widgets) = @_; 4019 my ($self, @widgets) = @_;
3918 4020
3919 $self->SUPER::add (@widgets); 4021 $self->SUPER::add (@widgets);
3920 4022
3921 $self->{current} = $self->{children}[0] 4023 $self->set_current_page (0)
3922 if @{ $self->{children} }; 4024 if @widgets == @{ $self->{children} };
3923} 4025}
3924 4026
3925sub get_current_page { 4027sub get_current_page {
3926 my ($self) = @_; 4028 my ($self) = @_;
3927 4029
… …
3933 4035
3934 my $widget = ref $page_or_widget 4036 my $widget = ref $page_or_widget
3935 ? $page_or_widget 4037 ? $page_or_widget
3936 : $self->{children}[$page_or_widget]; 4038 : $self->{children}[$page_or_widget];
3937 4039
4040 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4041
3938 $self->{current} = $widget; 4042 if (($self->{current} = $widget)) {
4043 $self->{current}->set_visible if $self->{current} && $self->{visible};
3939 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4044 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3940 4045
3941 $self->emit (page_changed => $self->{current}); 4046 $self->emit (page_changed => $self->{current});
4047 }
3942 4048
3943 $self->realloc; 4049 $self->realloc;
3944} 4050}
3945 4051
3946sub visible_children { 4052sub visible_children {
3947 $_[0]{current} 4053 $_[0]{current} || ()
3948} 4054}
3949 4055
3950sub size_request { 4056sub size_request {
3951 my ($self) = @_; 4057 my ($self) = @_;
3952 4058
4059 $self->{current}
3953 $self->{current}->size_request 4060 ? $self->{current}->size_request
4061 : (0, 0)
3954} 4062}
3955 4063
3956sub invoke_size_allocate { 4064sub invoke_size_allocate {
3957 my ($self, $w, $h) = @_; 4065 my ($self, $w, $h) = @_;
3958 4066
3959 $self->{current}->configure (0, 0, $w, $h); 4067 $self->{current}->configure (0, 0, $w, $h)
4068 if $self->{current};
3960 4069
3961 1 4070 1
3962} 4071}
3963 4072
3964sub _draw { 4073sub _draw {
3965 my ($self) = @_; 4074 my ($self) = @_;
3966 4075
3967 $self->{current}->draw; 4076 $self->{current}->draw
4077 if $self->{current};
3968} 4078}
3969 4079
3970############################################################################# 4080#############################################################################
3971 4081
3972package CFPlus::UI::Notebook; 4082package DC::UI::Notebook;
3973 4083
3974use CFPlus::OpenGL; 4084use DC::OpenGL;
3975 4085
3976our @ISA = CFPlus::UI::VBox::; 4086our @ISA = DC::UI::VBox::;
3977 4087
3978sub new { 4088sub new {
3979 my $class = shift; 4089 my $class = shift;
3980 4090
3981 my $self = $class->SUPER::new ( 4091 my $self = $class->SUPER::new (
3982 buttonbar => (new CFPlus::UI::Buttonbar), 4092 buttonbar => (new DC::UI::Buttonbar),
3983 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4093 multiplexer => (new DC::UI::Multiplexer expand => 1),
3984 active_outline => [.7, .7, 0.2], 4094 active_outline => [.7, .7, 0.2],
3985 # filter => # will be put between multiplexer and $self 4095 # filter => # will be put between multiplexer and $self
3986 @_, 4096 @_,
3987 ); 4097 );
3988 4098
… …
3997 4107
3998 for my $child (@$widgets) { 4108 for my $child (@$widgets) {
3999 Scalar::Util::weaken $child; 4109 Scalar::Util::weaken $child;
4000 $child->{c_tab_} ||= do { 4110 $child->{c_tab_} ||= do {
4001 my $tab = 4111 my $tab =
4002 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base") 4112 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4003 ? $child->{c_tab} 4113 ? $child->{c_tab}
4004 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1]; 4114 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4005 4115
4006 $tab->connect (activate => sub { 4116 $tab->connect (activate => sub {
4007 $wself->set_current_page ($child); 4117 $wself->set_current_page ($child);
4008 }); 4118 });
4009 4119
… …
4039} 4149}
4040 4150
4041sub pages { 4151sub pages {
4042 my ($self) = @_; 4152 my ($self) = @_;
4043 $self->{multiplexer}->children 4153 $self->{multiplexer}->children
4154}
4155
4156sub page_index {
4157 my ($self, $widget) = @_;
4158
4159 my $i = 0;
4160 for ($self->pages) {
4161 if ($_ eq $widget) { return $i };
4162 $i++;
4163 }
4164
4165 undef
4044} 4166}
4045 4167
4046sub add_tab { 4168sub add_tab {
4047 my ($self, $title, $widget, $tooltip) = @_; 4169 my ($self, $title, $widget, $tooltip) = @_;
4048 4170
… …
4085 } 4207 }
4086} 4208}
4087 4209
4088############################################################################# 4210#############################################################################
4089 4211
4090package CFPlus::UI::Selector; 4212package DC::UI::Selector;
4091 4213
4092use utf8; 4214use utf8;
4093 4215
4094our @ISA = CFPlus::UI::Button::; 4216our @ISA = DC::UI::Button::;
4095 4217
4096sub new { 4218sub new {
4097 my $class = shift; 4219 my $class = shift;
4098 4220
4099 my $self = $class->SUPER::new ( 4221 my $self = $class->SUPER::new (
… …
4116 my ($value, $title, $tooltip) = @$_; 4238 my ($value, $title, $tooltip) = @$_;
4117 4239
4118 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4240 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4119 } 4241 }
4120 4242
4121 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4243 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
4122} 4244}
4123 4245
4124sub _set_value { 4246sub _set_value {
4125 my ($self, $value) = @_; 4247 my ($self, $value) = @_;
4126 4248
… …
4149 $self->_set_value ($self->{value}); 4271 $self->_set_value ($self->{value});
4150} 4272}
4151 4273
4152############################################################################# 4274#############################################################################
4153 4275
4154package CFPlus::UI::Statusbox; 4276package DC::UI::Statusbox;
4155 4277
4156our @ISA = CFPlus::UI::VBox::; 4278our @ISA = DC::UI::VBox::;
4157 4279
4158sub new { 4280sub new {
4159 my $class = shift; 4281 my $class = shift;
4160 4282
4161 my $self = $class->SUPER::new ( 4283 my $self = $class->SUPER::new (
4162 fontsize => 0.8, 4284 fontsize => 0.8,
4163 @_, 4285 @_,
4164 ); 4286 );
4165 4287
4166 CFPlus::weaken (my $this = $self); 4288 DC::weaken (my $this = $self);
4167 4289
4168 $self->{timer} = EV::timer 1, 1, sub { $this->reorder }; 4290 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4169 4291
4170 $self 4292 $self
4171} 4293}
4172 4294
4173sub reorder { 4295sub reorder {
4174 my ($self) = @_; 4296 my ($self) = @_;
4175 my $NOW = Time::HiRes::time; 4297 my $NOW = EV::time;
4176 4298
4177 # freeze display when hovering over any label 4299 # freeze display when hovering over any label
4178 return if $CFPlus::UI::TOOLTIP->{owner} 4300 return if $DC::UI::TOOLTIP->{owner}
4179 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4301 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
4180 values %{ $self->{item} }; 4302 values %{ $self->{item} };
4181 4303
4182 while (my ($k, $v) = each %{ $self->{item} }) { 4304 while (my ($k, $v) = each %{ $self->{item} }) {
4183 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4305 delete $self->{item}{$k} if $v->{timeout} < $NOW;
4184 } 4306 }
4307
4308 $self->{timer}->set (1, 1);
4185 4309
4186 my @widgets; 4310 my @widgets;
4187 4311
4188 my @items = sort { 4312 my @items = sort {
4189 $a->{pri} <=> $b->{pri} 4313 $a->{pri} <=> $b->{pri}
… …
4203 for ($short) { 4327 for ($short) {
4204 s/^\s+//; 4328 s/^\s+//;
4205 s/\s+/ /g; 4329 s/\s+/ /g;
4206 } 4330 }
4207 4331
4208 new CFPlus::UI::Label 4332 new DC::UI::Label
4209 markup => $short, 4333 markup => $short,
4210 tooltip => $item->{tooltip}, 4334 tooltip => $item->{tooltip},
4211 tooltip_font => $::FONT_PROP, 4335 tooltip_font => $::FONT_PROP,
4212 tooltip_width => 0.67, 4336 tooltip_width => 0.67,
4213 fontsize => $item->{fontsize} || $self->{fontsize}, 4337 fontsize => $item->{fontsize} || $self->{fontsize},
4214 max_w => $::WIDTH * 0.44, 4338 max_w => $::WIDTH * 0.44,
4339 align => 0,
4215 fg => [@{ $item->{fg} }], 4340 fg => [@{ $item->{fg} }],
4216 can_events => 1, 4341 can_events => 1,
4217 can_hover => 1 4342 can_hover => 1
4218 }; 4343 };
4219 4344
… …
4227 $label->{fg}[3] = $item->{fg}[3] || 1; 4352 $label->{fg}[3] = $item->{fg}[3] || 1;
4228 } 4353 }
4229 4354
4230 push @widgets, $label; 4355 push @widgets, $label;
4231 } 4356 }
4357
4358 my $hash = join ",", @widgets;
4359 return if $hash eq $self->{last_widget_hash};
4360 $self->{last_widget_hash} = $hash;
4232 4361
4233 $self->clear; 4362 $self->clear;
4234 $self->SUPER::add (reverse @widgets); 4363 $self->SUPER::add (reverse @widgets);
4235} 4364}
4236 4365
… …
4292 $self->SUPER::destroy; 4421 $self->SUPER::destroy;
4293} 4422}
4294 4423
4295############################################################################# 4424#############################################################################
4296 4425
4297package CFPlus::UI::Root; 4426package DC::UI::Root;
4298 4427
4299our @ISA = CFPlus::UI::Container::; 4428our @ISA = DC::UI::Container::;
4300 4429
4301use List::Util qw(min max); 4430use List::Util qw(min max);
4302 4431
4303use CFPlus::OpenGL; 4432use DC::OpenGL;
4304 4433
4305sub new { 4434sub new {
4306 my $class = shift; 4435 my $class = shift;
4307 4436
4308 my $self = $class->SUPER::new ( 4437 my $self = $class->SUPER::new (
4309 visible => 1, 4438 visible => 1,
4310 @_, 4439 @_,
4311 ); 4440 );
4312 4441
4313 CFPlus::weaken ($self->{root} = $self); 4442 DC::weaken ($self->{root} = $self);
4314 4443
4315 $self 4444 $self
4316} 4445}
4317 4446
4318sub size_request { 4447sub size_request {
… …
4366} 4495}
4367 4496
4368sub update { 4497sub update {
4369 my ($self) = @_; 4498 my ($self) = @_;
4370 4499
4371 $::WANT_REFRESH->start; 4500 $::WANT_REFRESH = 1;
4372} 4501}
4373 4502
4374sub add { 4503sub add {
4375 my ($self, @children) = @_; 4504 my ($self, @children) = @_;
4376 4505
… …
4443 4572
4444 delete $queue{$widget+0}; 4573 delete $queue{$widget+0};
4445 4574
4446 my ($w, $h) = $widget->size_request; 4575 my ($w, $h) = $widget->size_request;
4447 4576
4448 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4577 $w += $widget->{padding_x} * 2;
4449 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4578 $h += $widget->{padding_y} * 2;
4579
4580 $w = max $widget->{min_w}, $w;
4581 $h = max $widget->{min_h}, $h;
4450 4582
4451 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4583 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4452 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4584 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4453 4585
4454 $w = $widget->{force_w} if exists $widget->{force_w}; 4586 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4521 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4653 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4522 glMatrixMode GL_MODELVIEW; 4654 glMatrixMode GL_MODELVIEW;
4523 glLoadIdentity; 4655 glLoadIdentity;
4524 4656
4525 { 4657 {
4526 package CFPlus::UI::Base; 4658 package DC::UI::Base;
4527 4659
4528 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4660 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4529 (0, 0, $self->{w}, $self->{h}); 4661 (0, 0, $self->{w}, $self->{h});
4530 4662
4531 $self->_draw; 4663 $self->_draw;
4532 } 4664 }
4533} 4665}
4534 4666
4535############################################################################# 4667#############################################################################
4536 4668
4537package CFPlus::UI; 4669package DC::UI;
4538 4670
4539$ROOT = new CFPlus::UI::Root; 4671$ROOT = new DC::UI::Root;
4540$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4672$TOOLTIP = new DC::UI::Tooltip z => 900;
4541 4673
45421 46741
4543

Diff Legend

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