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.453 by root, Wed Dec 26 20:46:39 2007 UTC vs.
Revision 1.483 by root, Wed Jan 4 11:23:23 2012 UTC

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

Diff Legend

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