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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC

… …
383sub set_max_size { 383sub set_max_size {
384 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
385 385
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
388
389 $self->realloc;
388} 390}
389 391
390sub set_tooltip { 392sub set_tooltip {
391 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
392 394
… …
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 552
551 glPushMatrix; 553 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 555
556 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 558 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 560 glBegin GL_QUADS;
563 glVertex $x , $y; 561 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
567 glEnd; 565 glEnd;
568 glDisable GL_BLEND; 566 glDisable GL_BLEND;
569 } 567 }
570 568
571 if ($ENV{CFPLUS_DEBUG} & 1) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 570 glPushMatrix;
573 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 574 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
580 glEnd; 578 glEnd;
581 glPopMatrix; 579 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
584} 585}
585 586
586sub _draw { 587sub _draw {
587 my ($self) = @_; 588 my ($self) = @_;
588 589
… …
626 627
627 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
629 630
630 glEnable GL_BLEND; 631 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 633 glColor_premultiply @$color;
633 634
634 glBegin GL_QUADS; 635 glBegin GL_QUADS;
635 glVertex 0 , 0; 636 glVertex 0 , 0;
636 glVertex 0 , $h; 637 glVertex 0 , $h;
637 glVertex $w, $h; 638 glVertex $w, $h;
… …
794 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
795} 796}
796 797
797############################################################################# 798#############################################################################
798 799
800# back-buffered drawing area
801
799package CFClient::UI::Window; 802package CFClient::UI::Window;
800 803
801our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
802 805
803use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
854 my $tex = $self->{texture} 857 my $tex = $self->{texture}
855 or return; 858 or return;
856 859
857 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
860 863
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 865
863 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
864} 867}
… …
955package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
956 959
957our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
958 961
959sub new { 962sub new {
960 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
961 966
962 my $self; 967 my $self;
963 968
964 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
965 vertical => 1, 970 vertical => 1,
… …
970 ; 975 ;
971 976
972 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
974 slider => $slider, 979 slider => $slider,
975 @_, 980 %arg,
976 ); 981 );
977 982
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
981 985
982 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
983} 993}
984 994
985sub update { 995sub update {
986 my ($self) = @_; 996 my ($self) = @_;
987 997
… …
1026 1036
1027 if ($self->{bg}) { 1037 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
1029 1039
1030 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
1033 1043
1034 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1045 glVertex 0 , 0;
1036 glVertex 0 , $h; 1046 glVertex 0 , $h;
1037 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1151 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1152 1162
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1167 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1168 };
1159 1169
1160 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1166 1176
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1178
1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1170 }; 1182 };
1171 } else { 1183 } else {
1172 return 0; 1184 return 0;
1173 } 1185 }
1174 1186
… …
1625 }; 1637 };
1626 1638
1627 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1629 1641
1642 glColor_premultiply @{$self->{fg}}
1630 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1631 glColor @{$self->{fg}}; 1644
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1633 } else {
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1635 }
1636 1646
1637 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1638} 1648}
1639 1649
1640############################################################################# 1650#############################################################################
… …
1667 1677
1668 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1669 1679
1670 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1671 1681
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1683 $self->{text} = $text;
1676 1684
1677 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1679 1687
1680 $self->_emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1681} 1690}
1682 1691
1683sub set_text { 1692sub set_text {
1684 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1685 1694
… …
1774 my ($self) = @_; 1783 my ($self) = @_;
1775 1784
1776 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1777 1786
1778 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1781 } else { 1790 } else {
1782 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1783 } 1792 }
1784 1793
1785 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1788 glVertex 0 , 0; 1797 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1901} 1910}
1902 1911
1903sub _draw { 1912sub _draw {
1904 my ($self) = @_; 1913 my ($self) = @_;
1905 1914
1906 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 1916
1912 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1915 1920
… …
2140 2145
2141 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
2143 2148
2144 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2154
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2335} 2341}
2336 2342
2337sub update { 2343sub update {
2338 my ($self) = @_; 2344 my ($self) = @_;
2339 2345
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2346 delete $self->{knob_w};
2347 $self->SUPER::update;
2348}
2349
2350sub _draw {
2351 my ($self) = @_;
2352
2353 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2342 2355
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2357 my $range = ($hi - $page - $lo) || 1e-100;
2345 2358
… …
2351 $value = ($value - $lo) / $range; 2364 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2365 $value = $value * $self->{scale} + $self->{offset};
2353 2366
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2368 $self->{knob_w} = $knob_w;
2356 }); 2369 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2370
2364 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2365 2372
2366 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2367 2374
… …
2561 2568
2562 delete $self->{texture}; 2569 delete $self->{texture};
2563 } 2570 }
2564 2571
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2568 2575
2569 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2570 2577
2571 my $y0 = $top; 2578 my $y0 = $top;
… …
2606sub _draw { 2613sub _draw {
2607 my ($self) = @_; 2614 my ($self) = @_;
2608 2615
2609 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2614 2621
2615 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2616 2623
2617} 2624}
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 2852
2846 if ($tex) { 2853 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2852 } 2859 }
2853} 2860}
2854 2861
… …
3022 my $class = shift; 3029 my $class = shift;
3023 3030
3024 my $self = $class->SUPER::new ( 3031 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3032 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3027 @_, 3035 @_,
3028 ); 3036 );
3029 3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3040
3032 $self 3041 $self
3033} 3042}
3034 3043
3035sub add { 3044sub add {
… …
3060our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::VBox::;
3061 3070
3062sub new { 3071sub new {
3063 my $class = shift; 3072 my $class = shift;
3064 3073
3065 $class->SUPER::new ( 3074 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3075 fontsize => 0.8,
3067 @_, 3076 @_,
3068 ) 3077 );
3078
3079 Scalar::Util::weaken (my $this = $self);
3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
3082 $this->reorder;
3083 $this->update;
3084 });
3085
3086 $self
3069} 3087}
3070 3088
3071sub reorder { 3089sub reorder {
3072 my ($self) = @_; 3090 my ($self) = @_;
3073 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
3074 3092
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3095 }
3078 3096
… …
3080 3098
3081 my @items = sort { 3099 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
3085 3105
3086 my $count = 10 + 1; 3106 my $count = 10 + 1;
3087 for my $item (@items) { 3107 for my $item (@items) {
3088 last unless --$count; 3108 last unless --$count;
3089 3109
… …
3104 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3127 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
3109 can_events => 1, 3130 can_events => 1,
3110 can_hover => 1 3131 can_hover => 1
3111 }; 3132 };
3133
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update;
3141 $self->{timer}->interval (1/30);
3142 }
3112 } 3143 }
3113 3144
3114 $self->clear; 3145 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
3116} 3147}
… …
3121 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
3123 3154
3124 return unless $text; 3155 return unless $text;
3125 3156
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3158
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3160
3130 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
… …
3161 3192
3162 $self->reorder; 3193 $self->reorder;
3163 $self->SUPER::reconfigure; 3194 $self->SUPER::reconfigure;
3164} 3195}
3165 3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
3166############################################################################# 3205#############################################################################
3167 3206
3168package CFClient::UI::Inventory; 3207package CFClient::UI::Inventory;
3169 3208
3170our @ISA = CFClient::UI::ScrolledWindow::; 3209our @ISA = CFClient::UI::ScrolledWindow::;
3171 3210
3172sub new { 3211sub new {
3173 my $class = shift; 3212 my $class = shift;
3174 3213
3175 my $self = $class->SUPER::new ( 3214 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_, 3216 @_,
3178 ); 3217 );
3179 3218
3180 $self 3219 $self
3181} 3220}
3182 3221
3183sub set_items { 3222sub set_items {
3184 my ($self, $items) = @_; 3223 my ($self, $items) = @_;
3185 3224
3186 $self->{scrolled}->clear; 3225 $self->{child}->clear;
3187 return unless $items; 3226 return unless $items;
3188 3227
3189 my @items = sort { 3228 my @items = sort {
3190 ($a->{type} <=> $b->{type}) 3229 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name}) 3230 or ($a->{name} cmp $b->{name})
… …
3195 3234
3196 my $row = 0; 3235 my $row = 0;
3197 for my $item (@items) { 3236 for my $item (@items) {
3198 CFClient::Item::update_widgets $item; 3237 CFClient::Item::update_widgets $item;
3199 3238
3200 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3239 $self->{child}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3240 $self->{child}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3241 $self->{child}->add (2, $row, $item->{weight_widget});
3203 3242
3204 $row++; 3243 $row++;
3205 } 3244 }
3206} 3245}
3207 3246
… …
3404 3443
3405############################################################################# 3444#############################################################################
3406 3445
3407package CFClient::UI::SpellList; 3446package CFClient::UI::SpellList;
3408 3447
3409our @ISA = CFClient::UI::ScrolledWindow::; 3448our @ISA = CFClient::UI::Table::;
3410 3449
3411sub new { 3450sub new {
3412 my $class = shift; 3451 my $class = shift;
3413 3452
3414 my $self = $class->SUPER::new ( 3453 my $self = $class->SUPER::new (
3415 binding => [], 3454 binding => [],
3416 commands => [], 3455 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3456 @_,
3419 ) 3457 )
3420} 3458}
3421 3459
3422# XXX: Do sorting? Argl... 3460# XXX: Do sorting? Argl...
3423sub add_spell { 3461sub add_spell {
3424 my ($self, $spell) = @_; 3462 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell; 3463 $self->{spells}->{$spell->{name}} = $spell;
3426 3464
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face}, 3466 face => $spell->{face},
3429 can_hover => 1, 3467 can_hover => 1,
3430 can_events => 1, 3468 can_events => 1,
3431 tooltip => $spell->{message}); 3469 tooltip => $spell->{message});
3432 3470
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name}, 3472 text => $spell->{name},
3435 can_hover => 1, 3473 can_hover => 1,
3436 can_events => 1, 3474 can_events => 1,
3437 tooltip => $spell->{message}, 3475 tooltip => $spell->{message},
3438 expand => 1); 3476 expand => 1);
3439 3477
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1); 3481 expand => 1);
3444 3482
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key", 3484 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448} 3486}
3449 3487
3450sub rebuild_spell_list { 3488sub rebuild_spell_list {
… …
3462############################################################################# 3500#############################################################################
3463 3501
3464package CFClient::UI::Root; 3502package CFClient::UI::Root;
3465 3503
3466our @ISA = CFClient::UI::Container::; 3504our @ISA = CFClient::UI::Container::;
3505
3506use List::Util qw(min max);
3467 3507
3468use CFClient::OpenGL; 3508use CFClient::OpenGL;
3469 3509
3470sub new { 3510sub new {
3471 my $class = shift; 3511 my $class = shift;
… …
3606 3646
3607 delete $queue{$widget+0}; 3647 delete $queue{$widget+0};
3608 3648
3609 my ($w, $h) = $widget->size_request; 3649 my ($w, $h) = $widget->size_request;
3610 3650
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3651 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3652 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3653
3654 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3655 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3656
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3657 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3658 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3659
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3660 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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