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.412 by root, Sun Jul 22 20:08:17 2007 UTC vs.
Revision 1.441 by root, Mon Oct 8 16:10:14 2007 UTC

… …
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 32
33 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
34 34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 36 $TOOLTIP->show;
41 } 37 }
42 38
43 return; 39 return;
… …
273 $self->emit ("destroy"); 269 $self->emit ("destroy");
274 %$self = (); 270 %$self = ();
275} 271}
276 272
277sub TO_JSON { 273sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 274 { "\fw" => $_[0]{s_id} }
279} 275}
280 276
281sub show { 277sub show {
282 my ($self) = @_; 278 my ($self) = @_;
283 279
… …
362 358
363 $self->{force_w} = $w; 359 $self->{force_w} = $w;
364 $self->{force_h} = $h; 360 $self->{force_h} = $h;
365 361
366 $self->realloc; 362 $self->realloc;
363}
364
365# traverse the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh {
367 my ($self) = @_;
368
369 return $self->{parent}->get_max_wh
370 if $self->{parent};
371
372 ($::WIDTH, $::HEIGHT)
367} 373}
368 374
369sub size_request { 375sub size_request {
370 require Carp; 376 require Carp;
371 Carp::confess "size_request is abstract"; 377 Carp::confess "size_request is abstract";
… …
607sub DESTROY { 613sub DESTROY {
608 my ($self) = @_; 614 my ($self) = @_;
609 615
610 return if CFPlus::in_destruct; 616 return if CFPlus::in_destruct;
611 617
618 local $@;
612 eval { $self->destroy }; 619 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 620 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 621
615 delete $WIDGET{$self+0}; 622 delete $WIDGET{$self+0};
616} 623}
… …
624use strict; 631use strict;
625use CFPlus::OpenGL; 632use CFPlus::OpenGL;
626 633
627sub new { 634sub new {
628 my $class = shift; 635 my $class = shift;
629
630 # range [value, low, high, page]
631 636
632 $class->SUPER::new ( 637 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 638 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 639 #active_bg => [1, 1, 1, 0.5],
635 @_ 640 @_
… …
647 my ($w, $h) = @$self{qw(w h)}; 652 my ($w, $h) = @$self{qw(w h)};
648 653
649 glEnable GL_BLEND; 654 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 655 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 656 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 657 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 658 glDisable GL_BLEND;
661 } 659 }
662} 660}
663 661
664############################################################################# 662#############################################################################
… …
725 @{$self->{children}}, @widgets 723 @{$self->{children}}, @widgets
726 ]; 724 ];
727 725
728 $self->realloc; 726 $self->realloc;
729 727
728 $self->emit (c_add => \@widgets);
729
730 map $_+0, @widgets 730 map $_+0, @widgets
731} 731}
732 732
733sub children { 733sub children {
734 @{ $_[0]{children} } 734 @{ $_[0]{children} }
735} 735}
736 736
737sub remove { 737sub remove {
738 my ($self, $child) = @_; 738 my ($self, @widgets) = @_;
739 739
740 $self->emit (c_remove => \@widgets);
741
742 for my $child (@widgets) {
740 delete $child->{parent}; 743 delete $child->{parent};
741 $child->hide; 744 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 745 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
746 }
744 747
745 $self->realloc; 748 $self->realloc;
746} 749}
747 750
748sub clear { 751sub clear {
… …
776} 779}
777 780
778sub _draw { 781sub _draw {
779 my ($self) = @_; 782 my ($self) = @_;
780 783
781 $_->draw for @{$self->{children}}; 784 $_->draw for $self->visible_children;
782} 785}
783 786
784############################################################################# 787#############################################################################
785 788
786package CFPlus::UI::Bin; 789package CFPlus::UI::Bin;
… …
796} 799}
797 800
798sub add { 801sub add {
799 my ($self, $child) = @_; 802 my ($self, $child) = @_;
800 803
801 $self->SUPER::remove ($_) for @{ $self->{children} }; 804 $self->clear;
802 $self->SUPER::add ($child); 805 $self->SUPER::add ($child);
803} 806}
804 807
805sub remove { 808sub remove {
806 my ($self, $widget) = @_; 809 my ($self, $widget) = @_;
… …
824 827
825 1 828 1
826} 829}
827 830
828############################################################################# 831#############################################################################
829
830# back-buffered drawing area 832# back-buffered drawing area
831 833
832package CFPlus::UI::Window; 834package CFPlus::UI::Window;
833 835
834our @ISA = CFPlus::UI::Bin::; 836our @ISA = CFPlus::UI::Bin::;
… …
948 $self->{view_x} = $x; 950 $self->{view_x} = $x;
949 $self->{view_y} = $y; 951 $self->{view_y} = $y;
950 952
951 $self->emit (changed => $x, $y); 953 $self->emit (changed => $x, $y);
952 $self->update; 954 $self->update;
955 }
956}
957
958sub set_center {
959 my ($self, $x, $y) = @_;
960
961 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
962}
963
964sub make_visible {
965 my ($self, $x, $y, $border) = @_;
966
967 if ( $x < $self->{view_x} + $self->{w} * $border
968 || $x > $self->{view_x} + $self->{w} * (1 - $border)
969 || $y < $self->{view_y} + $self->{h} * $border
970 || $y > $self->{view_y} + $self->{h} * (1 - $border)
971 ) {
972 $self->set_center ($x, $y);
953 } 973 }
954} 974}
955 975
956# hmm, this does not work for topleft of $self... but we should not ask for that 976# hmm, this does not work for topleft of $self... but we should not ask for that
957sub coord2local { 977sub coord2local {
… …
1004 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
1005 1025
1006 my $self; 1026 my $self;
1007 1027
1008 my $hslider = new CFPlus::UI::Slider 1028 my $hslider = new CFPlus::UI::Slider
1009 col => 0, 1029 c_col => 0,
1010 row => 1, 1030 c_row => 1,
1011 vertical => 0, 1031 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix 1032 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub { 1033 on_changed => sub {
1014 $self->{hpos} = $_[1]; 1034 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1035 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 }, 1036 },
1017 ; 1037 ;
1018 1038
1019 my $vslider = new CFPlus::UI::Slider 1039 my $vslider = new CFPlus::UI::Slider
1020 col => 1, 1040 c_col => 1,
1021 row => 0, 1041 c_row => 0,
1022 vertical => 1, 1042 vertical => 1,
1023 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub { 1044 on_changed => sub {
1025 $self->{vpos} = $_[1]; 1045 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1046 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1037 row_expand => [1, 0], 1057 row_expand => [1, 0],
1038 %arg, 1058 %arg,
1039 ); 1059 );
1040 1060
1041 $self->{vp} = new CFPlus::UI::ViewPort 1061 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0, 1062 c_col => 0,
1043 row => 0, 1063 c_row => 0,
1044 expand => 1, 1064 expand => 1,
1045 scroll_x => $self->{scroll_x}, 1065 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y}, 1066 scroll_y => $self->{scroll_y},
1047 on_changed => sub { 1067 on_changed => sub {
1048 my ($vp, $x, $y) = @_; 1068 my ($vp, $x, $y) = @_;
… …
1070 my ($self, $widget) = @_; 1090 my ($self, $widget) = @_;
1071 1091
1072 $self->{vp}->add ($self->{child} = $widget); 1092 $self->{vp}->add ($self->{child} = $widget);
1073} 1093}
1074 1094
1095sub set_offset { shift->{vp}->set_offset (@_) }
1096sub set_center { shift->{vp}->set_center (@_) }
1097sub make_visible { shift->{vp}->make_visible (@_) }
1098
1075sub update_slider { 1099sub update_slider {
1076 my ($self) = @_; 1100 my ($self) = @_;
1077 1101
1078 my $child = ($self->{vp} or return)->child; 1102 my $child = ($self->{vp} or return)->child;
1079 1103
… …
1192 my ($w, $h) = @$self{qw(w h)}; 1216 my ($w, $h) = @$self{qw(w h)};
1193 1217
1194 glEnable GL_BLEND; 1218 glEnable GL_BLEND;
1195 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196 glColor_premultiply @{ $self->{bg} }; 1220 glColor_premultiply @{ $self->{bg} };
1197
1198 glBegin GL_QUADS;
1199 glVertex 0 , 0;
1200 glVertex 0 , $h;
1201 glVertex $w, $h; 1221 glRect 0, 0, $w, $h;
1202 glVertex $w, 0;
1203 glEnd;
1204
1205 glDisable GL_BLEND; 1222 glDisable GL_BLEND;
1206 } 1223 }
1207 1224
1208 $self->SUPER::_draw; 1225 $self->SUPER::_draw;
1209} 1226}
… …
1370 1387
1371sub border { 1388sub border {
1372 int $_[0]{border} * $::FONTSIZE 1389 int $_[0]{border} * $::FONTSIZE
1373} 1390}
1374 1391
1392sub get_max_wh {
1393 my ($self) = @_;
1394
1395 return ($self->{w}, $self->{h})
1396 if $self->{visible} && $self->{w};
1397
1398 $self->SUPER::get_max_wh
1399}
1400
1375sub size_request { 1401sub size_request {
1376 my ($self) = @_; 1402 my ($self) = @_;
1377 1403
1378 $self->{title_widget}->size_request 1404 $self->{title_widget}->size_request
1379 if $self->{title_widget}; 1405 if $self->{title_widget};
… …
1571 1597
1572sub add { 1598sub add {
1573 my ($self, @widgets) = @_; 1599 my ($self, @widgets) = @_;
1574 1600
1575 for my $child (@widgets) { 1601 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1; 1602 $child->{c_rowspan} ||= 1;
1577 $child->{colspan} ||= 1; 1603 $child->{c_colspan} ||= 1;
1578 } 1604 }
1579 1605
1580 $self->SUPER::add (@widgets); 1606 $self->SUPER::add (@widgets);
1581} 1607}
1582 1608
… …
1586 my @widgets; 1612 my @widgets;
1587 1613
1588 while (@_) { 1614 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, (); 1615 my ($col, $row, $child) = splice @_, 0, 3, ();
1590 1616
1591 $child->{row} = $row; 1617 $child->{c_row} = $row;
1592 $child->{col} = $col; 1618 $child->{c_col} = $col;
1593 1619
1594 push @widgets, $child; 1620 push @widgets, $child;
1595 } 1621 }
1596 1622
1597 $self->add (@widgets); 1623 $self->add (@widgets);
… …
1603 my (@w, @h); 1629 my (@w, @h);
1604 1630
1605 my @children = $self->children; 1631 my @children = $self->children;
1606 1632
1607 # first pass, columns 1633 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1634 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1635 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610 1636
1611 my $sw = sum @w[$c .. $c + $cs - 1]; 1637 my $sw = sum @w[$c .. $c + $cs - 1];
1612 1638
1613 if ($w > $sw) { 1639 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1640 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 } 1641 }
1616 } 1642 }
1617 1643
1618 # second pass, rows 1644 # second pass, rows
1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1645 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1646 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621 1647
1622 my $sh = sum @h[$r .. $r + $rs - 1]; 1648 my $sh = sum @h[$r .. $r + $rs - 1];
1623 1649
1624 if ($h > $sh) { 1650 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1651 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1667 1693
1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1694 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1695 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670 1696
1671 for my $widget ($self->children) { 1697 for my $widget ($self->children) {
1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1698 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673 1699
1674 $widget->configure ( 1700 $widget->configure (
1675 $x[$c], $y[$r], 1701 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1702 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677 ); 1703 );
… …
1753our @ISA = CFPlus::UI::Container::; 1779our @ISA = CFPlus::UI::Container::;
1754 1780
1755sub size_request { 1781sub size_request {
1756 my ($self) = @_; 1782 my ($self) = @_;
1757 1783
1784 my @children = $self->visible_children;
1785
1758 $self->{vertical} 1786 $self->{vertical}
1759 ? ( 1787 ? (
1760 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1788 (List::Util::max map $_->{req_w}, @children),
1761 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1789 (List::Util::sum map $_->{req_h}, @children),
1762 ) 1790 )
1763 : ( 1791 : (
1764 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::sum map $_->{req_w}, @children),
1765 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::max map $_->{req_h}, @children),
1766 ) 1794 )
1767} 1795}
1768 1796
1769sub invoke_size_allocate { 1797sub invoke_size_allocate {
1770 my ($self, $w, $h) = @_; 1798 my ($self, $w, $h) = @_;
… …
1894 1922
1895 delete $self->{ox}; 1923 delete $self->{ox};
1896 $self->SUPER::realloc; 1924 $self->SUPER::realloc;
1897} 1925}
1898 1926
1927sub clear {
1928 my ($self) = @_;
1929
1930 $self->set_text ("");
1931}
1932
1899sub set_text { 1933sub set_text {
1900 my ($self, $text) = @_; 1934 my ($self, $text) = @_;
1901 1935
1902 return if $self->{text} eq "T$text"; 1936 return if $self->{text} eq "T$text";
1903 $self->{text} = "T$text"; 1937 $self->{text} = "T$text";
… …
1926 1960
1927sub size_request { 1961sub size_request {
1928 my ($self) = @_; 1962 my ($self) = @_;
1929 1963
1930 $self->{size_req} ||= do { 1964 $self->{size_req} ||= do {
1965 my ($max_w, $max_h) = $self->get_max_wh;
1966
1931 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1967 $self->{layout}->set_font ($self->{font}) if $self->{font};
1932 $self->{layout}->set_width ($self->{max_w} || -1); 1968 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1933 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1969 $self->{layout}->set_ellipsise ($self->{ellipsise});
1934 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1970 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1935 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1936 1972
1937 my ($w, $h) = $self->{layout}->size; 1973 my ($w, $h) = $self->{layout}->size;
… …
2009 : ($self->{w} - $size->[0]) * 0.5); 2045 : ($self->{w} - $size->[0]) * 0.5);
2010 2046
2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2047 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2048 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2013 : ($self->{h} - $size->[1]) * 0.5); 2049 : ($self->{h} - $size->[1]) * 0.5);
2050
2051 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2014 }; 2052 };
2015 2053
2016# unless ($self->{list}) { 2054# unless ($self->{list}) {
2017# $self->{list} = CFPlus::OpenGL::glGenList; 2055# $self->{list} = CFPlus::OpenGL::glGenList;
2018# CFPlus::OpenGL::glNewList $self->{list}; 2056# CFPlus::OpenGL::glNewList $self->{list};
… …
2020# CFPlus::OpenGL::glEndList; 2058# CFPlus::OpenGL::glEndList;
2021# } 2059# }
2022# 2060#
2023# CFPlus::OpenGL::glCallList $self->{list}; 2061# CFPlus::OpenGL::glCallList $self->{list};
2024 2062
2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2063 $self->{layout}->draw;
2026} 2064}
2027 2065
2028#sub destroy { 2066#sub destroy {
2029# my ($self) = @_; 2067# my ($self) = @_;
2030# 2068#
… …
2045 my $class = shift; 2083 my $class = shift;
2046 2084
2047 $class->SUPER::new ( 2085 $class->SUPER::new (
2048 fg => [1, 1, 1], 2086 fg => [1, 1, 1],
2049 bg => [0, 0, 0, 0.2], 2087 bg => [0, 0, 0, 0.2],
2088 outline => [0.6, 0.3, 0.1],
2050 active_bg => [1, 1, 1, 0.5], 2089 active_bg => [0, 0, 1, .2],
2051 active_fg => [0, 0, 0], 2090 active_fg => [1, 1, 1],
2091 active_outline => [1, 1, 0],
2052 can_hover => 1, 2092 can_hover => 1,
2053 can_focus => 1, 2093 can_focus => 1,
2054 valign => 0, 2094 valign => 0,
2055 can_events => 1, 2095 can_events => 1,
2056 ellipsise => 0, 2096 ellipsise => 0,
… …
2196 glColor_premultiply @{$self->{bg}}; 2236 glColor_premultiply @{$self->{bg}};
2197 } 2237 }
2198 2238
2199 glEnable GL_BLEND; 2239 glEnable GL_BLEND;
2200 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2240 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2201 glBegin GL_QUADS;
2202 glVertex 0 , 0;
2203 glVertex 0 , $self->{h};
2204 glVertex $self->{w}, $self->{h}; 2241 glRect 0, 0, $self->{w}, $self->{h};
2205 glVertex $self->{w}, 0;
2206 glEnd;
2207 glDisable GL_BLEND; 2242 glDisable GL_BLEND;
2208 2243
2209 $self->SUPER::_draw; 2244 $self->SUPER::_draw;
2210 2245
2211 #TODO: force update every cursor change :( 2246 #TODO: force update every cursor change :(
… …
2213 2248
2214 unless (exists $self->{cur_h}) { 2249 unless (exists $self->{cur_h}) {
2215 my $text = substr $self->{text}, 0, $self->{cursor}; 2250 my $text = substr $self->{text}, 0, $self->{cursor};
2216 utf8::encode $text; 2251 utf8::encode $text;
2217 2252
2218 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2253 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2219 } 2254 }
2220 2255
2256 glColor_premultiply @{$self->{active_fg}};
2221 glBegin GL_LINES; 2257 glBegin GL_LINES;
2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2258 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2223 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2260 glEnd;
2261
2262 glLineWidth 3;
2263 glColor @{$self->{active_outline}};
2264 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2265 glLineWidth 1;
2266
2267 } else {
2268 glColor @{$self->{outline}};
2269 glBegin GL_LINE_STRIP;
2270 glVertex .5, $self->{h} * .5;
2271 glVertex .5, $self->{h} - 2.5;
2272 glVertex $self->{w} - .5, $self->{h} - 2.5;
2273 glVertex $self->{w} - .5, $self->{h} * .5;
2224 glEnd; 2274 glEnd;
2225 } 2275 }
2226} 2276}
2227 2277
2228############################################################################# 2278#############################################################################
… …
2315 1 2365 1
2316} 2366}
2317 2367
2318############################################################################# 2368#############################################################################
2319 2369
2370package CFPlus::UI::ButtonBin;
2371
2372our @ISA = CFPlus::UI::Bin::;
2373
2374use CFPlus::OpenGL;
2375
2376my @tex =
2377 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2378 qw(b1_button_inactive.png b1_button_active.png);
2379
2380sub new {
2381 my $class = shift;
2382
2383 $class->SUPER::new (
2384 can_hover => 1,
2385 align => 0,
2386 valign => 0,
2387 can_events => 1,
2388 @_
2389 )
2390}
2391
2392sub invoke_button_up {
2393 my ($self, $ev, $x, $y) = @_;
2394
2395 $self->emit ("activate")
2396 if $x >= 0 && $x < $self->{w}
2397 && $y >= 0 && $y < $self->{h};
2398
2399 1
2400}
2401
2402sub _draw {
2403 my ($self) = @_;
2404
2405 glEnable GL_TEXTURE_2D;
2406 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2407 glColor 0, 0, 0, 1;
2408
2409 my $tex = $tex[$GRAB == $self];
2410 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2411
2412 glDisable GL_TEXTURE_2D;
2413
2414 $self->SUPER::_draw;
2415}
2416
2417#############################################################################
2418
2320package CFPlus::UI::Button; 2419package CFPlus::UI::Button;
2321 2420
2322our @ISA = CFPlus::UI::Label::; 2421our @ISA = CFPlus::UI::Label::;
2323 2422
2324use CFPlus::OpenGL; 2423use CFPlus::OpenGL;
… …
2428sub _draw { 2527sub _draw {
2429 my ($self) = @_; 2528 my ($self) = @_;
2430 2529
2431 $self->SUPER::_draw; 2530 $self->SUPER::_draw;
2432 2531
2433 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2532 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2434 2533
2435 my ($w, $h) = @$self{qw(w h)}; 2534 my ($w, $h) = @$self{qw(w h)};
2436 2535
2437 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2536 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2438 2537
… …
2458sub new { 2557sub new {
2459 my $class = shift; 2558 my $class = shift;
2460 2559
2461 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
2462 can_events => 0, 2561 can_events => 0,
2562 scale => 1,
2463 @_, 2563 @_,
2464 ); 2564 );
2465 2565
2466 $self->{path} || $self->{tex} 2566 $self->{path} || $self->{tex}
2467 or Carp::croak "'path' or 'tex' attributes required"; 2567 or Carp::croak "'path' or 'tex' attributes required";
… …
2492} 2592}
2493 2593
2494sub size_request { 2594sub size_request {
2495 my ($self) = @_; 2595 my ($self) = @_;
2496 2596
2497 ($self->{tex}{w}, $self->{tex}{h}) 2597 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2498} 2598}
2499 2599
2500sub _draw { 2600sub _draw {
2501 my ($self) = @_; 2601 my ($self) = @_;
2502 2602
… …
2512 } 2612 }
2513 2613
2514 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2516 2616
2517 $tex->draw_quad (0, 0, $w, $h); 2617 $tex->draw_quad_alpha (0, 0, $w, $h);
2518 2618
2519 glDisable GL_TEXTURE_2D; 2619 glDisable GL_TEXTURE_2D;
2520} 2620}
2521 2621
2522############################################################################# 2622#############################################################################
… …
2541 align => 0, 2641 align => 0,
2542 valign => 0, 2642 valign => 0,
2543 can_events => 1, 2643 can_events => 1,
2544 @_ 2644 @_
2545 ); 2645 );
2646}
2647
2648sub invoke_button_down {
2649 my ($self, $ev, $x, $y) = @_;
2650
2651 1
2546} 2652}
2547 2653
2548sub invoke_button_up { 2654sub invoke_button_up {
2549 my ($self, $ev, $x, $y) = @_; 2655 my ($self, $ev, $x, $y) = @_;
2550 2656
… …
2690 glDisable GL_TEXTURE_2D; 2796 glDisable GL_TEXTURE_2D;
2691} 2797}
2692 2798
2693############################################################################# 2799#############################################################################
2694 2800
2801package CFPlus::UI::Progress;
2802
2803our @ISA = CFPlus::UI::Label::;
2804
2805use CFPlus::OpenGL;
2806
2807sub new {
2808 my ($class, %arg) = @_;
2809
2810 my $self = $class->SUPER::new (
2811 fg => [1, 1, 1],
2812 bg => [0, 0, 1, 0.2],
2813 bar => [0.7, 0.5, 0.1, 0.8],
2814 outline => [0.4, 0.3, 0],
2815 fontsize => 0.9,
2816 valign => 0,
2817 align => 0,
2818 can_events => 1,
2819 ellipsise => 1,
2820 label => "%d%%",
2821 %arg,
2822 );
2823
2824 $self->set_value ($arg{value} || -1);
2825
2826 $self
2827}
2828
2829sub set_label {
2830 my ($self, $label) = @_;
2831
2832 return if $self->{label} eq $label;
2833 $self->{label} = $label;
2834
2835 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2836}
2837
2838sub set_value {
2839 my ($self, $value) = @_;
2840
2841 if ($self->{value} ne $value) {
2842 $self->{value} = $value;
2843
2844 if ($value < 0) {
2845 $self->set_text ("-");
2846 } else {
2847 $self->set_text (sprintf $self->{label}, $value * 100);
2848 }
2849
2850 $self->update;
2851 }
2852}
2853
2854sub _draw {
2855 my ($self) = @_;
2856
2857 glEnable GL_BLEND;
2858 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2859
2860 if ($self->{value} >= 0) {
2861 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2862
2863 glColor_premultiply @{$self->{bar}};
2864 glRect 2, 2, $s, $self->{h} - 2;
2865 glColor_premultiply @{$self->{bg}};
2866 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2867 }
2868
2869 glColor_premultiply @{$self->{outline}};
2870 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2871
2872 glDisable GL_BLEND;
2873
2874 {
2875 local $self->{bg}; # do not draw background
2876 $self->SUPER::_draw;
2877 }
2878}
2879
2880#############################################################################
2881
2882package CFPlus::UI::ExperienceProgress;
2883
2884our @ISA = CFPlus::UI::Progress::;
2885
2886sub new {
2887 my ($class, %arg) = @_;
2888
2889 my $self = $class->SUPER::new (
2890 tooltip => sub {
2891 my ($self) = @_;
2892
2893 sprintf "level %d\n%s points\n%s next level\n%s to go",
2894 $self->{lvl},
2895 ::formsep ($self->{exp}),
2896 ::formsep ($self->{nxt}),
2897 ::formsep ($self->{nxt} - $self->{exp}),
2898 },
2899 %arg
2900 );
2901
2902 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2903 if $::CONN;
2904
2905 $self
2906}
2907
2908sub DESTROY {
2909 my ($self) = @_;
2910
2911 delete $::CONN->{on_exp_update}{$self+0}
2912 if $::CONN;
2913
2914 $self->SUPER::DESTROY;
2915}
2916
2917sub set_value {
2918 my ($self, $lvl, $exp) = @_;
2919
2920 $self->{lvl} = $lvl;
2921 $self->{exp} = $exp;
2922
2923 my $v = -1;
2924
2925 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2926 my $l0 = $table->[$lvl - 1];
2927 my $l1 = $table->[$lvl];
2928
2929 $self->{nxt} = $l1;
2930
2931 $v = ($exp - $l0) / ($l1 - $l0);
2932 }
2933
2934 $self->SUPER::set_value ($v);
2935}
2936
2937#############################################################################
2938
2695package CFPlus::UI::Gauge; 2939package CFPlus::UI::Gauge;
2696 2940
2697our @ISA = CFPlus::UI::VBox::; 2941our @ISA = CFPlus::UI::VBox::;
2698 2942
2699sub new { 2943sub new {
… …
2997} 3241}
2998 3242
2999sub size_request { 3243sub size_request {
3000 my ($self) = @_; 3244 my ($self) = @_;
3001 3245
3002 my ($empty, $slider) = @{ $self->{children} }; 3246 my ($empty, $slider) = $self->visible_children;
3003 3247
3004 local $self->{children} = [$empty, $slider]; 3248 local $self->{children} = [$empty, $slider];
3005 $self->SUPER::size_request 3249 $self->SUPER::size_request
3006} 3250}
3007 3251
… …
3196 3440
3197 if ($y0 < $y + $h && $y < $y1) { 3441 if ($y0 < $y + $h && $y < $y1) {
3198 my $layout = $self->get_layout ($para); 3442 my $layout = $self->get_layout ($para);
3199 3443
3200 $layout->render ($para->{indent}, $y - $y0); 3444 $layout->render ($para->{indent}, $y - $y0);
3445 $layout->draw;
3201 3446
3202 if (my @w = @{ $para->{widget} }) { 3447 if (my @w = @{ $para->{widget} }) {
3203 my @s = $layout->get_shapes; 3448 my @s = $layout->get_shapes;
3204 3449
3205 for (@w) { 3450 for (@w) {
… …
3327} 3572}
3328 3573
3329sub set_tooltip_from { 3574sub set_tooltip_from {
3330 my ($self, $widget) = @_; 3575 my ($self, $widget) = @_;
3331 3576
3332 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3333 if $widget->{tooltip} =~ /^#(.*)$/;
3334
3335 my $tooltip = $widget->{tooltip}; 3577 my $tip = $widget->{tooltip};
3578 $tip = $tip->($widget) if "CODE" eq ref $tip;
3579
3580 $tip = CFPlus::Pod::section_label tooltip => $1
3581 if $tip =~ /^#(.*)$/;
3336 3582
3337 if ($ENV{CFPLUS_DEBUG} & 2) { 3583 if ($ENV{CFPLUS_DEBUG} & 2) {
3338 $tooltip .= "\n\n" . (ref $widget) . "\n" 3584 $tip .= "\n\n" . (ref $widget) . "\n"
3339 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3585 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3340 . "req $widget->{req_w} $widget->{req_h}\n" 3586 . "req $widget->{req_w} $widget->{req_h}\n"
3341 . "visible $widget->{visible}"; 3587 . "visible $widget->{visible}";
3342 } 3588 }
3343 3589
3344 $tooltip =~ s/^\n+//; 3590 $tip =~ s/^\n+//;
3345 $tooltip =~ s/\n+$//; 3591 $tip =~ s/\n+$//;
3346 3592
3347 $self->add (new CFPlus::UI::Label 3593 $self->add (new CFPlus::UI::Label
3348 markup => $tooltip, 3594 markup => $tip,
3349 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3595 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3350 fontsize => 0.8, 3596 fontsize => 0.8,
3351 style => 1, # FLAG_INVERSE 3597 style => 1, # FLAG_INVERSE
3352 ellipsise => 0, 3598 ellipsise => 0,
3353 font => ($widget->{tooltip_font} || $::FONT_PROP), 3599 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3391} 3637}
3392 3638
3393sub _draw { 3639sub _draw {
3394 my ($self) = @_; 3640 my ($self) = @_;
3395 3641
3396 glTranslate 0.375, 0.375;
3397
3398 my ($w, $h) = @$self{qw(w h)}; 3642 my ($w, $h) = @$self{qw(w h)};
3399 3643
3400 glColor 1, 0.8, 0.4; 3644 glColor 1, 0.8, 0.4;
3401 glBegin GL_QUADS; 3645 glRect 0, 0, $w, $h;
3402 glVertex 0 , 0;
3403 glVertex 0 , $h;
3404 glVertex $w, $h;
3405 glVertex $w, 0;
3406 glEnd;
3407 3646
3408 glColor 0, 0, 0; 3647 glColor 0, 0, 0;
3409 glBegin GL_LINE_LOOP; 3648 glRect_lineloop .5, .5, $w + .5, $h + .5;
3410 glVertex 0 , 0;
3411 glVertex 0 , $h;
3412 glVertex $w, $h;
3413 glVertex $w, 0;
3414 glEnd;
3415 3649
3416 glTranslate 2 - 0.375, 2 - 0.375; 3650 glTranslate 2, 2;
3417 3651
3418 $self->SUPER::_draw; 3652 $self->SUPER::_draw;
3419} 3653}
3420 3654
3421############################################################################# 3655#############################################################################
… …
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3677 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3678 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3445 $self->{timer} = Event->timer ( 3679 $self->{timer} = Event->timer (
3446 parked => 1, 3680 parked => 1,
3447 cb => sub { 3681 cb => sub {
3448 return unless $::CONN && $widget; 3682 return unless $::CONN;
3449 3683
3684 my $w = $widget
3685 or return;
3686
3450 ++$widget->{frame}; 3687 ++$w->{frame};
3451 $widget->update_face; 3688 $w->update_face;
3689
3690 # somehow, $widget can go away
3452 $widget->update; 3691 $w->update;
3453
3454 $widget->update_timer; 3692 $w->update_timer;
3455 }, 3693 },
3456 ); 3694 );
3457 3695
3458 $self->update_face; 3696 $self->update_face;
3459 $self->update_timer; 3697 $self->update_timer;
… …
3480} 3718}
3481 3719
3482sub update_face { 3720sub update_face {
3483 my ($self) = @_; 3721 my ($self) = @_;
3484 3722
3485 return unless $::CONN; 3723 if ($::CONN) {
3486
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3724 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) { 3725 if ($anim && @$anim) {
3489 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3726 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3727 delete $self->{face_change_cb};
3728
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3729 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3730 unless ($tex->{name} || $tex->{loading}) {
3731 $tex->upload (sub { $self->reconfigure });
3732 }
3733 }
3734 }
3492 } 3735 }
3493 } 3736 }
3494} 3737}
3495 3738
3496sub size_request { 3739sub size_request {
3497 my ($self) = @_; 3740 my ($self) = @_;
3498 3741
3499 if ($::CONN) { 3742 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3743 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) { 3744 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex; 3745 if ($tex->{name}) {
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3746 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3504 } else { 3747 } elsif (!$tex->{loading}) {
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3748 $tex->upload (sub { $self->reconfigure });
3506 $self->realloc;
3507 }); 3749 }
3508 } 3750 }
3751
3752 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3509 } 3753 }
3510 } 3754 }
3511 3755
3512 ($self->{size_w} || 8, $self->{size_h} || 8) 3756 ($self->{size_w} || 8, $self->{size_h} || 8)
3513} 3757}
… …
3593 children => [ 3837 children => [
3594 (new CFPlus::UI::Label markup => $left, expand => 1), 3838 (new CFPlus::UI::Label markup => $left, expand => 1),
3595 (new CFPlus::UI::Label markup => $right, align => +1), 3839 (new CFPlus::UI::Label markup => $right, align => +1),
3596 ], 3840 ],
3597 ; 3841 ;
3598 3842
3599 } else { 3843 } else {
3600 $widget = new CFPlus::UI::Label 3844 $widget = new CFPlus::UI::Label
3601 can_hover => 1, 3845 can_hover => 1,
3602 can_events => 1, 3846 can_events => 1,
3603 markup => $widget, 3847 markup => $widget,
… …
3728 3972
3729############################################################################# 3973#############################################################################
3730 3974
3731package CFPlus::UI::Notebook; 3975package CFPlus::UI::Notebook;
3732 3976
3977use CFPlus::OpenGL;
3978
3733our @ISA = CFPlus::UI::VBox::; 3979our @ISA = CFPlus::UI::VBox::;
3734 3980
3735sub new { 3981sub new {
3736 my $class = shift; 3982 my $class = shift;
3737 3983
3738 my $self = $class->SUPER::new ( 3984 my $self = $class->SUPER::new (
3739 buttonbar => (new CFPlus::UI::Buttonbar), 3985 buttonbar => (new CFPlus::UI::Buttonbar),
3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3986 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3987 active_outline => [.7, .7, 0.2],
3741 # filter => # will be put between multiplexer and $self 3988 # filter => # will be put between multiplexer and $self
3742 @_, 3989 @_,
3743 ); 3990 );
3744 3991
3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3992 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3746 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3993 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3747 3994
3995 {
3996 Scalar::Util::weaken (my $wself = $self);
3997
3998 $self->{multiplexer}->connect (c_add => sub {
3999 my ($mplex, $widgets) = @_;
4000
4001 for my $child (@$widgets) {
4002 Scalar::Util::weaken $child;
4003 $child->{c_tab_} ||= do {
4004 my $tab =
4005 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4006 ? $child->{c_tab}
4007 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4008
4009 $tab->connect (activate => sub {
4010 $wself->set_current_page ($child);
4011 });
4012
4013 $tab
4014 };
4015
4016 $self->{buttonbar}->add ($child->{c_tab_});
4017 }
4018 });
4019
4020 $self->{multiplexer}->connect (c_remove => sub {
4021 my ($mplex, $widgets) = @_;
4022
4023 for my $child (@$widgets) {
4024 $wself->{buttonbar}->remove ($child->{c_tab_});
4025 }
4026 });
4027 }
4028
3748 $self 4029 $self
3749} 4030}
3750 4031
3751sub add { 4032sub add {
4033 my ($self, @widgets) = @_;
4034
4035 $self->{multiplexer}->add (@widgets)
4036}
4037
4038sub remove {
4039 my ($self, @widgets) = @_;
4040
4041 $self->{multiplexer}->remove (@widgets)
4042}
4043
4044sub pages {
4045 my ($self) = @_;
4046 $self->{multiplexer}->children
4047}
4048
4049sub add_tab {
3752 my ($self, $title, $widget, $tooltip) = @_; 4050 my ($self, $title, $widget, $tooltip) = @_;
3753 4051
3754 CFPlus::weaken $self; 4052 $title = [$title, $tooltip] unless ref $title;
4053 $widget->{c_tab} = $title;
3755 4054
3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3758 markup => $title,
3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3764 $self->{buttonbar}->add ($title);
3765
3766 $self->{multiplexer}->add ($widget); 4055 $self->add ($widget);
3767} 4056}
3768 4057
3769sub get_current_page { 4058sub get_current_page {
3770 my ($self) = @_; 4059 my ($self) = @_;
3771 4060
… …
3775sub set_current_page { 4064sub set_current_page {
3776 my ($self, $page) = @_; 4065 my ($self, $page) = @_;
3777 4066
3778 $self->{multiplexer}->set_current_page ($page); 4067 $self->{multiplexer}->set_current_page ($page);
3779 $self->emit (page_changed => $self->{multiplexer}{current}); 4068 $self->emit (page_changed => $self->{multiplexer}{current});
4069}
4070
4071sub _draw {
4072 my ($self) = @_;
4073
4074 $self->SUPER::_draw ();
4075
4076 if (my $cur = $self->{multiplexer}{current}) {
4077 if ($cur = $cur->{c_tab_}) {
4078 glTranslate $self->{buttonbar}{x} + $cur->{x},
4079 $self->{buttonbar}{y} + $cur->{y};
4080 glLineWidth 3;
4081 #glEnable GL_BLEND;
4082 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4083 glColor @{$self->{active_outline}};
4084 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4085 glLineWidth 1;
4086 #glDisable GL_BLEND;
4087 }
4088 }
3780} 4089}
3781 4090
3782############################################################################# 4091#############################################################################
3783 4092
3784package CFPlus::UI::Selector; 4093package CFPlus::UI::Selector;
… …
3816} 4125}
3817 4126
3818sub _set_value { 4127sub _set_value {
3819 my ($self, $value) = @_; 4128 my ($self, $value) = @_;
3820 4129
3821 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4130 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4131 $item ||= $self->{options}[0]
3822 or return; 4132 or return;
3823 4133
3824 $self->{value} = $item->[0]; 4134 $self->{value} = $item->[0];
3825 $self->set_markup ("$item->[1] ⇓"); 4135 $self->set_markup ("$item->[1] ⇓");
3826 $self->set_tooltip ($item->[2]); 4136 $self->set_tooltip ($item->[2]);
… …
3831 4141
3832 return unless $self->{value} ne $value; 4142 return unless $self->{value} ne $value;
3833 4143
3834 $self->_set_value ($value); 4144 $self->_set_value ($value);
3835 $self->emit (changed => $value); 4145 $self->emit (changed => $value);
4146}
4147
4148sub set_options {
4149 my ($self, $options) = @_;
4150
4151 $self->{options} = $options;
4152 $self->_set_value ($self->{value});
3836} 4153}
3837 4154
3838############################################################################# 4155#############################################################################
3839 4156
3840package CFPlus::UI::Statusbox; 4157package CFPlus::UI::Statusbox;
… …
4054} 4371}
4055 4372
4056sub update { 4373sub update {
4057 my ($self) = @_; 4374 my ($self) = @_;
4058 4375
4059 $::WANT_REFRESH++; 4376 $::WANT_REFRESH->start;
4060} 4377}
4061 4378
4062sub add { 4379sub add {
4063 my ($self, @children) = @_; 4380 my ($self, @children) = @_;
4064 4381

Diff Legend

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