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.413 by root, Mon Jul 23 15:30:45 2007 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 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# travsle the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh {
367 my ($self) = @_;
368
369 return ($self->{alloc_w}, $self->{alloc_h})
370 if $self->{alloc_w} && !$self->{root}{realloc}{$self+0};
371
372 return $self->{parent}->get_max_wh
373 if $self->{parent};
374
375 ($::WIDTH, $::HEIGHT)
367} 376}
368 377
369sub size_request { 378sub size_request {
370 require Carp; 379 require Carp;
371 Carp::confess "size_request is abstract"; 380 Carp::confess "size_request is abstract";
… …
607sub DESTROY { 616sub DESTROY {
608 my ($self) = @_; 617 my ($self) = @_;
609 618
610 return if CFPlus::in_destruct; 619 return if CFPlus::in_destruct;
611 620
621 local $@;
612 eval { $self->destroy }; 622 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 623 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 624
615 delete $WIDGET{$self+0}; 625 delete $WIDGET{$self+0};
616} 626}
… …
624use strict; 634use strict;
625use CFPlus::OpenGL; 635use CFPlus::OpenGL;
626 636
627sub new { 637sub new {
628 my $class = shift; 638 my $class = shift;
629
630 # range [value, low, high, page]
631 639
632 $class->SUPER::new ( 640 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 641 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 642 #active_bg => [1, 1, 1, 0.5],
635 @_ 643 @_
… …
647 my ($w, $h) = @$self{qw(w h)}; 655 my ($w, $h) = @$self{qw(w h)};
648 656
649 glEnable GL_BLEND; 657 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 658 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 659 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 660 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 661 glDisable GL_BLEND;
661 } 662 }
662} 663}
663 664
664############################################################################# 665#############################################################################
… …
829 830
830 1 831 1
831} 832}
832 833
833############################################################################# 834#############################################################################
834
835# back-buffered drawing area 835# back-buffered drawing area
836 836
837package CFPlus::UI::Window; 837package CFPlus::UI::Window;
838 838
839our @ISA = CFPlus::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
… …
953 $self->{view_x} = $x; 953 $self->{view_x} = $x;
954 $self->{view_y} = $y; 954 $self->{view_y} = $y;
955 955
956 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
957 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
958 } 976 }
959} 977}
960 978
961# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
962sub coord2local { 980sub coord2local {
… …
1009 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1010 1028
1011 my $self; 1029 my $self;
1012 1030
1013 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1014 col => 0, 1032 c_col => 0,
1015 row => 1, 1033 c_row => 1,
1016 vertical => 0, 1034 vertical => 0,
1017 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1018 on_changed => sub { 1036 on_changed => sub {
1019 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1020 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1021 }, 1039 },
1022 ; 1040 ;
1023 1041
1024 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1025 col => 1, 1043 c_col => 1,
1026 row => 0, 1044 c_row => 0,
1027 vertical => 1, 1045 vertical => 1,
1028 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1029 on_changed => sub { 1047 on_changed => sub {
1030 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1031 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1042 row_expand => [1, 0], 1060 row_expand => [1, 0],
1043 %arg, 1061 %arg,
1044 ); 1062 );
1045 1063
1046 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1047 col => 0, 1065 c_col => 0,
1048 row => 0, 1066 c_row => 0,
1049 expand => 1, 1067 expand => 1,
1050 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1051 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1052 on_changed => sub { 1070 on_changed => sub {
1053 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1075 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1076 1094
1077 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1078} 1096}
1079 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1080sub update_slider { 1102sub update_slider {
1081 my ($self) = @_; 1103 my ($self) = @_;
1082 1104
1083 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
1084 1106
… …
1197 my ($w, $h) = @$self{qw(w h)}; 1219 my ($w, $h) = @$self{qw(w h)};
1198 1220
1199 glEnable GL_BLEND; 1221 glEnable GL_BLEND;
1200 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1201 glColor_premultiply @{ $self->{bg} }; 1223 glColor_premultiply @{ $self->{bg} };
1202
1203 glBegin GL_QUADS;
1204 glVertex 0 , 0;
1205 glVertex 0 , $h;
1206 glVertex $w, $h; 1224 glRect 0, 0, $w, $h;
1207 glVertex $w, 0;
1208 glEnd;
1209
1210 glDisable GL_BLEND; 1225 glDisable GL_BLEND;
1211 } 1226 }
1212 1227
1213 $self->SUPER::_draw; 1228 $self->SUPER::_draw;
1214} 1229}
… …
1576 1591
1577sub add { 1592sub add {
1578 my ($self, @widgets) = @_; 1593 my ($self, @widgets) = @_;
1579 1594
1580 for my $child (@widgets) { 1595 for my $child (@widgets) {
1581 $child->{rowspan} ||= 1; 1596 $child->{c_rowspan} ||= 1;
1582 $child->{colspan} ||= 1; 1597 $child->{c_colspan} ||= 1;
1583 } 1598 }
1584 1599
1585 $self->SUPER::add (@widgets); 1600 $self->SUPER::add (@widgets);
1586} 1601}
1587 1602
… …
1591 my @widgets; 1606 my @widgets;
1592 1607
1593 while (@_) { 1608 while (@_) {
1594 my ($col, $row, $child) = splice @_, 0, 3, (); 1609 my ($col, $row, $child) = splice @_, 0, 3, ();
1595 1610
1596 $child->{row} = $row; 1611 $child->{c_row} = $row;
1597 $child->{col} = $col; 1612 $child->{c_col} = $col;
1598 1613
1599 push @widgets, $child; 1614 push @widgets, $child;
1600 } 1615 }
1601 1616
1602 $self->add (@widgets); 1617 $self->add (@widgets);
… …
1608 my (@w, @h); 1623 my (@w, @h);
1609 1624
1610 my @children = $self->children; 1625 my @children = $self->children;
1611 1626
1612 # first pass, columns 1627 # first pass, columns
1613 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1628 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1614 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1629 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1615 1630
1616 my $sw = sum @w[$c .. $c + $cs - 1]; 1631 my $sw = sum @w[$c .. $c + $cs - 1];
1617 1632
1618 if ($w > $sw) { 1633 if ($w > $sw) {
1619 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1634 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1620 } 1635 }
1621 } 1636 }
1622 1637
1623 # second pass, rows 1638 # second pass, rows
1624 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1639 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1625 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1640 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1626 1641
1627 my $sh = sum @h[$r .. $r + $rs - 1]; 1642 my $sh = sum @h[$r .. $r + $rs - 1];
1628 1643
1629 if ($h > $sh) { 1644 if ($h > $sh) {
1630 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1645 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1672 1687
1673 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1688 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1674 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1689 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1675 1690
1676 for my $widget ($self->children) { 1691 for my $widget ($self->children) {
1677 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1692 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1678 1693
1679 $widget->configure ( 1694 $widget->configure (
1680 $x[$c], $y[$r], 1695 $x[$c], $y[$r],
1681 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1696 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1682 ); 1697 );
… …
1901 1916
1902 delete $self->{ox}; 1917 delete $self->{ox};
1903 $self->SUPER::realloc; 1918 $self->SUPER::realloc;
1904} 1919}
1905 1920
1921sub clear {
1922 my ($self) = @_;
1923
1924 $self->set_text ("");
1925}
1926
1906sub set_text { 1927sub set_text {
1907 my ($self, $text) = @_; 1928 my ($self, $text) = @_;
1908 1929
1909 return if $self->{text} eq "T$text"; 1930 return if $self->{text} eq "T$text";
1910 $self->{text} = "T$text"; 1931 $self->{text} = "T$text";
… …
1933 1954
1934sub size_request { 1955sub size_request {
1935 my ($self) = @_; 1956 my ($self) = @_;
1936 1957
1937 $self->{size_req} ||= do { 1958 $self->{size_req} ||= do {
1959 my ($max_w, $max_h) = $self->get_max_wh;
1960
1938 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1961 $self->{layout}->set_font ($self->{font}) if $self->{font};
1939 $self->{layout}->set_width ($self->{max_w} || -1); 1962 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1940 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1963 $self->{layout}->set_ellipsise ($self->{ellipsise});
1941 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1964 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1942 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1965 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1943 1966
1944 my ($w, $h) = $self->{layout}->size; 1967 my ($w, $h) = $self->{layout}->size;
… …
2016 : ($self->{w} - $size->[0]) * 0.5); 2039 : ($self->{w} - $size->[0]) * 0.5);
2017 2040
2018 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2041 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2019 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2042 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2020 : ($self->{h} - $size->[1]) * 0.5); 2043 : ($self->{h} - $size->[1]) * 0.5);
2044
2045 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2021 }; 2046 };
2022 2047
2023# unless ($self->{list}) { 2048# unless ($self->{list}) {
2024# $self->{list} = CFPlus::OpenGL::glGenList; 2049# $self->{list} = CFPlus::OpenGL::glGenList;
2025# CFPlus::OpenGL::glNewList $self->{list}; 2050# CFPlus::OpenGL::glNewList $self->{list};
… …
2027# CFPlus::OpenGL::glEndList; 2052# CFPlus::OpenGL::glEndList;
2028# } 2053# }
2029# 2054#
2030# CFPlus::OpenGL::glCallList $self->{list}; 2055# CFPlus::OpenGL::glCallList $self->{list};
2031 2056
2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2057 $self->{layout}->draw;
2033} 2058}
2034 2059
2035#sub destroy { 2060#sub destroy {
2036# my ($self) = @_; 2061# my ($self) = @_;
2037# 2062#
… …
2052 my $class = shift; 2077 my $class = shift;
2053 2078
2054 $class->SUPER::new ( 2079 $class->SUPER::new (
2055 fg => [1, 1, 1], 2080 fg => [1, 1, 1],
2056 bg => [0, 0, 0, 0.2], 2081 bg => [0, 0, 0, 0.2],
2082 outline => [0.6, 0.3, 0.1],
2057 active_bg => [1, 1, 1, 0.5], 2083 active_bg => [0, 0, 1, .2],
2058 active_fg => [0, 0, 0], 2084 active_fg => [1, 1, 1],
2085 active_outline => [1, 1, 0],
2059 can_hover => 1, 2086 can_hover => 1,
2060 can_focus => 1, 2087 can_focus => 1,
2061 valign => 0, 2088 valign => 0,
2062 can_events => 1, 2089 can_events => 1,
2063 ellipsise => 0, 2090 ellipsise => 0,
… …
2203 glColor_premultiply @{$self->{bg}}; 2230 glColor_premultiply @{$self->{bg}};
2204 } 2231 }
2205 2232
2206 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
2207 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2208 glBegin GL_QUADS;
2209 glVertex 0 , 0;
2210 glVertex 0 , $self->{h};
2211 glVertex $self->{w}, $self->{h}; 2235 glRect 0, 0, $self->{w}, $self->{h};
2212 glVertex $self->{w}, 0;
2213 glEnd;
2214 glDisable GL_BLEND; 2236 glDisable GL_BLEND;
2215 2237
2216 $self->SUPER::_draw; 2238 $self->SUPER::_draw;
2217 2239
2218 #TODO: force update every cursor change :( 2240 #TODO: force update every cursor change :(
… …
2220 2242
2221 unless (exists $self->{cur_h}) { 2243 unless (exists $self->{cur_h}) {
2222 my $text = substr $self->{text}, 0, $self->{cursor}; 2244 my $text = substr $self->{text}, 0, $self->{cursor};
2223 utf8::encode $text; 2245 utf8::encode $text;
2224 2246
2225 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2247 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2226 } 2248 }
2227 2249
2250 glColor_premultiply @{$self->{active_fg}};
2228 glBegin GL_LINES; 2251 glBegin GL_LINES;
2229 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2252 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2230 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2253 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2254 glEnd;
2255
2256 glLineWidth 3;
2257 glColor @{$self->{active_outline}};
2258 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2259 glLineWidth 1;
2260
2261 } else {
2262 glColor @{$self->{outline}};
2263 glBegin GL_LINE_STRIP;
2264 glVertex .5, $self->{h} * .5;
2265 glVertex .5, $self->{h} - 2.5;
2266 glVertex $self->{w} - .5, $self->{h} - 2.5;
2267 glVertex $self->{w} - .5, $self->{h} * .5;
2231 glEnd; 2268 glEnd;
2232 } 2269 }
2233} 2270}
2234 2271
2235############################################################################# 2272#############################################################################
… …
2322 1 2359 1
2323} 2360}
2324 2361
2325############################################################################# 2362#############################################################################
2326 2363
2364package CFPlus::UI::ButtonBin;
2365
2366our @ISA = CFPlus::UI::Bin::;
2367
2368use CFPlus::OpenGL;
2369
2370my @tex =
2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2372 qw(b1_button_inactive.png b1_button_active.png);
2373
2374sub new {
2375 my $class = shift;
2376
2377 $class->SUPER::new (
2378 can_hover => 1,
2379 align => 0,
2380 valign => 0,
2381 can_events => 1,
2382 @_
2383 )
2384}
2385
2386sub invoke_button_up {
2387 my ($self, $ev, $x, $y) = @_;
2388
2389 $self->emit ("activate")
2390 if $x >= 0 && $x < $self->{w}
2391 && $y >= 0 && $y < $self->{h};
2392
2393 1
2394}
2395
2396sub _draw {
2397 my ($self) = @_;
2398
2399 glEnable GL_TEXTURE_2D;
2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2401 glColor 0, 0, 0, 1;
2402
2403 my $tex = $tex[$GRAB == $self];
2404 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2405
2406 glDisable GL_TEXTURE_2D;
2407
2408 $self->SUPER::_draw;
2409}
2410
2411#############################################################################
2412
2327package CFPlus::UI::Button; 2413package CFPlus::UI::Button;
2328 2414
2329our @ISA = CFPlus::UI::Label::; 2415our @ISA = CFPlus::UI::Label::;
2330 2416
2331use CFPlus::OpenGL; 2417use CFPlus::OpenGL;
… …
2435sub _draw { 2521sub _draw {
2436 my ($self) = @_; 2522 my ($self) = @_;
2437 2523
2438 $self->SUPER::_draw; 2524 $self->SUPER::_draw;
2439 2525
2440 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2526 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2441 2527
2442 my ($w, $h) = @$self{qw(w h)}; 2528 my ($w, $h) = @$self{qw(w h)};
2443 2529
2444 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2530 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2445 2531
… …
2465sub new { 2551sub new {
2466 my $class = shift; 2552 my $class = shift;
2467 2553
2468 my $self = $class->SUPER::new ( 2554 my $self = $class->SUPER::new (
2469 can_events => 0, 2555 can_events => 0,
2556 scale => 1,
2470 @_, 2557 @_,
2471 ); 2558 );
2472 2559
2473 $self->{path} || $self->{tex} 2560 $self->{path} || $self->{tex}
2474 or Carp::croak "'path' or 'tex' attributes required"; 2561 or Carp::croak "'path' or 'tex' attributes required";
… …
2499} 2586}
2500 2587
2501sub size_request { 2588sub size_request {
2502 my ($self) = @_; 2589 my ($self) = @_;
2503 2590
2504 ($self->{tex}{w}, $self->{tex}{h}) 2591 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2505} 2592}
2506 2593
2507sub _draw { 2594sub _draw {
2508 my ($self) = @_; 2595 my ($self) = @_;
2509 2596
… …
2519 } 2606 }
2520 2607
2521 glEnable GL_TEXTURE_2D; 2608 glEnable GL_TEXTURE_2D;
2522 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2523 2610
2524 $tex->draw_quad (0, 0, $w, $h); 2611 $tex->draw_quad_alpha (0, 0, $w, $h);
2525 2612
2526 glDisable GL_TEXTURE_2D; 2613 glDisable GL_TEXTURE_2D;
2527} 2614}
2528 2615
2529############################################################################# 2616#############################################################################
… …
2548 align => 0, 2635 align => 0,
2549 valign => 0, 2636 valign => 0,
2550 can_events => 1, 2637 can_events => 1,
2551 @_ 2638 @_
2552 ); 2639 );
2640}
2641
2642sub invoke_button_down {
2643 my ($self, $ev, $x, $y) = @_;
2644
2645 1
2553} 2646}
2554 2647
2555sub invoke_button_up { 2648sub invoke_button_up {
2556 my ($self, $ev, $x, $y) = @_; 2649 my ($self, $ev, $x, $y) = @_;
2557 2650
… …
2697 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2698} 2791}
2699 2792
2700############################################################################# 2793#############################################################################
2701 2794
2795package CFPlus::UI::Progress;
2796
2797our @ISA = CFPlus::UI::Label::;
2798
2799use CFPlus::OpenGL;
2800
2801sub new {
2802 my ($class, %arg) = @_;
2803
2804 my $self = $class->SUPER::new (
2805 fg => [1, 1, 1],
2806 bg => [0, 0, 1, 0.2],
2807 bar => [0.7, 0.5, 0.1, 0.8],
2808 outline => [0.4, 0.3, 0],
2809 fontsize => 0.9,
2810 valign => 0,
2811 align => 0,
2812 can_events => 1,
2813 ellipsise => 1,
2814 label => "%d%%",
2815 %arg,
2816 );
2817
2818 $self->set_value ($arg{value} || -1);
2819
2820 $self
2821}
2822
2823sub set_label {
2824 my ($self, $label) = @_;
2825
2826 return if $self->{label} eq $label;
2827 $self->{label} = $label;
2828
2829 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2830}
2831
2832sub set_value {
2833 my ($self, $value) = @_;
2834
2835 if ($self->{value} ne $value) {
2836 $self->{value} = $value;
2837
2838 if ($value < 0) {
2839 $self->set_text ("-");
2840 } else {
2841 $self->set_text (sprintf $self->{label}, $value * 100);
2842 }
2843
2844 $self->update;
2845 }
2846}
2847
2848sub _draw {
2849 my ($self) = @_;
2850
2851 glEnable GL_BLEND;
2852 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2853
2854 if ($self->{value} >= 0) {
2855 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2856
2857 glColor_premultiply @{$self->{bar}};
2858 glRect 2, 2, $s, $self->{h} - 2;
2859 glColor_premultiply @{$self->{bg}};
2860 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2861 }
2862
2863 glColor_premultiply @{$self->{outline}};
2864 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2865
2866 glDisable GL_BLEND;
2867
2868 {
2869 local $self->{bg}; # do not draw background
2870 $self->SUPER::_draw;
2871 }
2872}
2873
2874#############################################################################
2875
2876package CFPlus::UI::ExperienceProgress;
2877
2878our @ISA = CFPlus::UI::Progress::;
2879
2880sub new {
2881 my ($class, %arg) = @_;
2882
2883 my $self = $class->SUPER::new (
2884 tooltip => sub {
2885 my ($self) = @_;
2886
2887 sprintf "level %d\n%s points\n%s next level\n%s to go",
2888 $self->{lvl},
2889 ::formsep ($self->{exp}),
2890 ::formsep ($self->{nxt}),
2891 ::formsep ($self->{nxt} - $self->{exp}),
2892 },
2893 %arg
2894 );
2895
2896 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2897 if $::CONN;
2898
2899 $self
2900}
2901
2902sub DESTROY {
2903 my ($self) = @_;
2904
2905 delete $::CONN->{on_exp_update}{$self+0}
2906 if $::CONN;
2907
2908 $self->SUPER::DESTROY;
2909}
2910
2911sub set_value {
2912 my ($self, $lvl, $exp) = @_;
2913
2914 $self->{lvl} = $lvl;
2915 $self->{exp} = $exp;
2916
2917 my $v = -1;
2918
2919 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2920 my $l0 = $table->[$lvl - 1];
2921 my $l1 = $table->[$lvl];
2922
2923 $self->{nxt} = $l1;
2924
2925 $v = ($exp - $l0) / ($l1 - $l0);
2926 }
2927
2928 $self->SUPER::set_value ($v);
2929}
2930
2931#############################################################################
2932
2702package CFPlus::UI::Gauge; 2933package CFPlus::UI::Gauge;
2703 2934
2704our @ISA = CFPlus::UI::VBox::; 2935our @ISA = CFPlus::UI::VBox::;
2705 2936
2706sub new { 2937sub new {
… …
3203 3434
3204 if ($y0 < $y + $h && $y < $y1) { 3435 if ($y0 < $y + $h && $y < $y1) {
3205 my $layout = $self->get_layout ($para); 3436 my $layout = $self->get_layout ($para);
3206 3437
3207 $layout->render ($para->{indent}, $y - $y0); 3438 $layout->render ($para->{indent}, $y - $y0);
3439 $layout->draw;
3208 3440
3209 if (my @w = @{ $para->{widget} }) { 3441 if (my @w = @{ $para->{widget} }) {
3210 my @s = $layout->get_shapes; 3442 my @s = $layout->get_shapes;
3211 3443
3212 for (@w) { 3444 for (@w) {
… …
3334} 3566}
3335 3567
3336sub set_tooltip_from { 3568sub set_tooltip_from {
3337 my ($self, $widget) = @_; 3569 my ($self, $widget) = @_;
3338 3570
3339 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3340 if $widget->{tooltip} =~ /^#(.*)$/;
3341
3342 my $tooltip = $widget->{tooltip}; 3571 my $tip = $widget->{tooltip};
3572 $tip = $tip->($widget) if "CODE" eq ref $tip;
3573
3574 $tip = CFPlus::Pod::section_label tooltip => $1
3575 if $tip =~ /^#(.*)$/;
3343 3576
3344 if ($ENV{CFPLUS_DEBUG} & 2) { 3577 if ($ENV{CFPLUS_DEBUG} & 2) {
3345 $tooltip .= "\n\n" . (ref $widget) . "\n" 3578 $tip .= "\n\n" . (ref $widget) . "\n"
3346 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3579 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3347 . "req $widget->{req_w} $widget->{req_h}\n" 3580 . "req $widget->{req_w} $widget->{req_h}\n"
3348 . "visible $widget->{visible}"; 3581 . "visible $widget->{visible}";
3349 } 3582 }
3350 3583
3351 $tooltip =~ s/^\n+//; 3584 $tip =~ s/^\n+//;
3352 $tooltip =~ s/\n+$//; 3585 $tip =~ s/\n+$//;
3353 3586
3354 $self->add (new CFPlus::UI::Label 3587 $self->add (new CFPlus::UI::Label
3355 markup => $tooltip, 3588 markup => $tip,
3356 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3589 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3357 fontsize => 0.8, 3590 fontsize => 0.8,
3358 style => 1, # FLAG_INVERSE 3591 style => 1, # FLAG_INVERSE
3359 ellipsise => 0, 3592 ellipsise => 0,
3360 font => ($widget->{tooltip_font} || $::FONT_PROP), 3593 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3398} 3631}
3399 3632
3400sub _draw { 3633sub _draw {
3401 my ($self) = @_; 3634 my ($self) = @_;
3402 3635
3403 glTranslate 0.375, 0.375;
3404
3405 my ($w, $h) = @$self{qw(w h)}; 3636 my ($w, $h) = @$self{qw(w h)};
3406 3637
3407 glColor 1, 0.8, 0.4; 3638 glColor 1, 0.8, 0.4;
3408 glBegin GL_QUADS; 3639 glRect 0, 0, $w, $h;
3409 glVertex 0 , 0;
3410 glVertex 0 , $h;
3411 glVertex $w, $h;
3412 glVertex $w, 0;
3413 glEnd;
3414 3640
3415 glColor 0, 0, 0; 3641 glColor 0, 0, 0;
3416 glBegin GL_LINE_LOOP; 3642 glRect_lineloop .5, .5, $w + .5, $h + .5;
3417 glVertex 0 , 0;
3418 glVertex 0 , $h;
3419 glVertex $w, $h;
3420 glVertex $w, 0;
3421 glEnd;
3422 3643
3423 glTranslate 2 - 0.375, 2 - 0.375; 3644 glTranslate 2, 2;
3424 3645
3425 $self->SUPER::_draw; 3646 $self->SUPER::_draw;
3426} 3647}
3427 3648
3428############################################################################# 3649#############################################################################
… …
3450 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3671 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3451 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3672 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3452 $self->{timer} = Event->timer ( 3673 $self->{timer} = Event->timer (
3453 parked => 1, 3674 parked => 1,
3454 cb => sub { 3675 cb => sub {
3455 return unless $::CONN && $widget; 3676 return unless $::CONN;
3456 3677
3678 my $w = $widget
3679 or return;
3680
3457 ++$widget->{frame}; 3681 ++$w->{frame};
3458 $widget->update_face; 3682 $w->update_face;
3683
3684 # somehow, $widget can go away
3459 $widget->update; 3685 $w->update;
3460
3461 $widget->update_timer; 3686 $w->update_timer;
3462 }, 3687 },
3463 ); 3688 );
3464 3689
3465 $self->update_face; 3690 $self->update_face;
3466 $self->update_timer; 3691 $self->update_timer;
… …
3487} 3712}
3488 3713
3489sub update_face { 3714sub update_face {
3490 my ($self) = @_; 3715 my ($self) = @_;
3491 3716
3492 return unless $::CONN; 3717 if ($::CONN) {
3493
3494 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3718 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3495 if ($anim && @$anim) { 3719 if ($anim && @$anim) {
3496 delete $self->{wait_face};
3497 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3720 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3721 delete $self->{face_change_cb};
3722
3498 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3723 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3724 unless ($tex->{name} || $tex->{loading}) {
3725 $tex->upload (sub { $self->reconfigure });
3726 }
3727 }
3728 }
3499 } 3729 }
3500 } 3730 }
3501} 3731}
3502 3732
3503sub size_request { 3733sub size_request {
3504 my ($self) = @_; 3734 my ($self) = @_;
3505 3735
3506 if ($::CONN) { 3736 if ($::CONN) {
3507 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3737 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3508 if (my $tex = $::CONN->{texture}[$faceid]) { 3738 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3509 $self->{tex} = $tex; 3739 if ($tex->{name}) {
3510 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3740 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3511 } else { 3741 } elsif (!$tex->{loading}) {
3512 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3742 $tex->upload (sub { $self->reconfigure });
3513 $self->realloc;
3514 }); 3743 }
3515 } 3744 }
3745
3746 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3516 } 3747 }
3517 } 3748 }
3518 3749
3519 ($self->{size_w} || 8, $self->{size_h} || 8) 3750 ($self->{size_w} || 8, $self->{size_h} || 8)
3520} 3751}
… …
3600 children => [ 3831 children => [
3601 (new CFPlus::UI::Label markup => $left, expand => 1), 3832 (new CFPlus::UI::Label markup => $left, expand => 1),
3602 (new CFPlus::UI::Label markup => $right, align => +1), 3833 (new CFPlus::UI::Label markup => $right, align => +1),
3603 ], 3834 ],
3604 ; 3835 ;
3605 3836
3606 } else { 3837 } else {
3607 $widget = new CFPlus::UI::Label 3838 $widget = new CFPlus::UI::Label
3608 can_hover => 1, 3839 can_hover => 1,
3609 can_events => 1, 3840 can_events => 1,
3610 markup => $widget, 3841 markup => $widget,
… …
3735 3966
3736############################################################################# 3967#############################################################################
3737 3968
3738package CFPlus::UI::Notebook; 3969package CFPlus::UI::Notebook;
3739 3970
3971use CFPlus::OpenGL;
3972
3740our @ISA = CFPlus::UI::VBox::; 3973our @ISA = CFPlus::UI::VBox::;
3741 3974
3742sub new { 3975sub new {
3743 my $class = shift; 3976 my $class = shift;
3744 3977
3745 my $self = $class->SUPER::new ( 3978 my $self = $class->SUPER::new (
3746 buttonbar => (new CFPlus::UI::Buttonbar), 3979 buttonbar => (new CFPlus::UI::Buttonbar),
3747 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3980 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3981 active_outline => [.7, .7, 0.2],
3748 # filter => # will be put between multiplexer and $self 3982 # filter => # will be put between multiplexer and $self
3749 @_, 3983 @_,
3750 ); 3984 );
3751 3985
3752 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3986 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3753 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3987 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3754 3988
3755 { 3989 {
3756 Scalar::Util::weaken (my $wself = $self); 3990 Scalar::Util::weaken (my $wself = $self);
… …
3799 my ($self, @widgets) = @_; 4033 my ($self, @widgets) = @_;
3800 4034
3801 $self->{multiplexer}->remove (@widgets) 4035 $self->{multiplexer}->remove (@widgets)
3802} 4036}
3803 4037
4038sub pages {
4039 my ($self) = @_;
4040 $self->{multiplexer}->children
4041}
4042
3804sub add_tab { 4043sub add_tab {
3805 my ($self, $title, $widget, $tooltip) = @_; 4044 my ($self, $title, $widget, $tooltip) = @_;
3806 4045
3807 $title = [$title, $tooltip] unless ref $title; 4046 $title = [$title, $tooltip] unless ref $title;
3808 $widget->{c_tab} = $title; 4047 $widget->{c_tab} = $title;
… …
3819sub set_current_page { 4058sub set_current_page {
3820 my ($self, $page) = @_; 4059 my ($self, $page) = @_;
3821 4060
3822 $self->{multiplexer}->set_current_page ($page); 4061 $self->{multiplexer}->set_current_page ($page);
3823 $self->emit (page_changed => $self->{multiplexer}{current}); 4062 $self->emit (page_changed => $self->{multiplexer}{current});
4063}
4064
4065sub _draw {
4066 my ($self) = @_;
4067
4068 $self->SUPER::_draw ();
4069
4070 if (my $cur = $self->{multiplexer}{current}) {
4071 if ($cur = $cur->{c_tab_}) {
4072 glTranslate $self->{buttonbar}{x} + $cur->{x},
4073 $self->{buttonbar}{y} + $cur->{y};
4074 glLineWidth 3;
4075 #glEnable GL_BLEND;
4076 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4077 glColor @{$self->{active_outline}};
4078 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4079 glLineWidth 1;
4080 #glDisable GL_BLEND;
4081 }
4082 }
3824} 4083}
3825 4084
3826############################################################################# 4085#############################################################################
3827 4086
3828package CFPlus::UI::Selector; 4087package CFPlus::UI::Selector;
… …
4098} 4357}
4099 4358
4100sub update { 4359sub update {
4101 my ($self) = @_; 4360 my ($self) = @_;
4102 4361
4103 $::WANT_REFRESH++; 4362 $::WANT_REFRESH->start;
4104} 4363}
4105 4364
4106sub add { 4365sub add {
4107 my ($self, @children) = @_; 4366 my ($self, @children) = @_;
4108 4367

Diff Legend

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