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.440 by root, Sun Sep 16 18:27:48 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#############################################################################
… …
829 827
830 1 828 1
831} 829}
832 830
833############################################################################# 831#############################################################################
834
835# back-buffered drawing area 832# back-buffered drawing area
836 833
837package CFPlus::UI::Window; 834package CFPlus::UI::Window;
838 835
839our @ISA = CFPlus::UI::Bin::; 836our @ISA = CFPlus::UI::Bin::;
… …
953 $self->{view_x} = $x; 950 $self->{view_x} = $x;
954 $self->{view_y} = $y; 951 $self->{view_y} = $y;
955 952
956 $self->emit (changed => $x, $y); 953 $self->emit (changed => $x, $y);
957 $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);
958 } 973 }
959} 974}
960 975
961# 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
962sub coord2local { 977sub coord2local {
… …
1009 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
1010 1025
1011 my $self; 1026 my $self;
1012 1027
1013 my $hslider = new CFPlus::UI::Slider 1028 my $hslider = new CFPlus::UI::Slider
1014 col => 0, 1029 c_col => 0,
1015 row => 1, 1030 c_row => 1,
1016 vertical => 0, 1031 vertical => 0,
1017 range => [0, 0, 1, 0.01], # HACK fix 1032 range => [0, 0, 1, 0.01], # HACK fix
1018 on_changed => sub { 1033 on_changed => sub {
1019 $self->{hpos} = $_[1]; 1034 $self->{hpos} = $_[1];
1020 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1035 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1021 }, 1036 },
1022 ; 1037 ;
1023 1038
1024 my $vslider = new CFPlus::UI::Slider 1039 my $vslider = new CFPlus::UI::Slider
1025 col => 1, 1040 c_col => 1,
1026 row => 0, 1041 c_row => 0,
1027 vertical => 1, 1042 vertical => 1,
1028 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
1029 on_changed => sub { 1044 on_changed => sub {
1030 $self->{vpos} = $_[1]; 1045 $self->{vpos} = $_[1];
1031 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1046 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1042 row_expand => [1, 0], 1057 row_expand => [1, 0],
1043 %arg, 1058 %arg,
1044 ); 1059 );
1045 1060
1046 $self->{vp} = new CFPlus::UI::ViewPort 1061 $self->{vp} = new CFPlus::UI::ViewPort
1047 col => 0, 1062 c_col => 0,
1048 row => 0, 1063 c_row => 0,
1049 expand => 1, 1064 expand => 1,
1050 scroll_x => $self->{scroll_x}, 1065 scroll_x => $self->{scroll_x},
1051 scroll_y => $self->{scroll_y}, 1066 scroll_y => $self->{scroll_y},
1052 on_changed => sub { 1067 on_changed => sub {
1053 my ($vp, $x, $y) = @_; 1068 my ($vp, $x, $y) = @_;
… …
1075 my ($self, $widget) = @_; 1090 my ($self, $widget) = @_;
1076 1091
1077 $self->{vp}->add ($self->{child} = $widget); 1092 $self->{vp}->add ($self->{child} = $widget);
1078} 1093}
1079 1094
1095sub set_offset { shift->{vp}->set_offset (@_) }
1096sub set_center { shift->{vp}->set_center (@_) }
1097sub make_visible { shift->{vp}->make_visible (@_) }
1098
1080sub update_slider { 1099sub update_slider {
1081 my ($self) = @_; 1100 my ($self) = @_;
1082 1101
1083 my $child = ($self->{vp} or return)->child; 1102 my $child = ($self->{vp} or return)->child;
1084 1103
… …
1197 my ($w, $h) = @$self{qw(w h)}; 1216 my ($w, $h) = @$self{qw(w h)};
1198 1217
1199 glEnable GL_BLEND; 1218 glEnable GL_BLEND;
1200 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1201 glColor_premultiply @{ $self->{bg} }; 1220 glColor_premultiply @{ $self->{bg} };
1202
1203 glBegin GL_QUADS;
1204 glVertex 0 , 0;
1205 glVertex 0 , $h;
1206 glVertex $w, $h; 1221 glRect 0, 0, $w, $h;
1207 glVertex $w, 0;
1208 glEnd;
1209
1210 glDisable GL_BLEND; 1222 glDisable GL_BLEND;
1211 } 1223 }
1212 1224
1213 $self->SUPER::_draw; 1225 $self->SUPER::_draw;
1214} 1226}
… …
1375 1387
1376sub border { 1388sub border {
1377 int $_[0]{border} * $::FONTSIZE 1389 int $_[0]{border} * $::FONTSIZE
1378} 1390}
1379 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
1380sub size_request { 1401sub size_request {
1381 my ($self) = @_; 1402 my ($self) = @_;
1382 1403
1383 $self->{title_widget}->size_request 1404 $self->{title_widget}->size_request
1384 if $self->{title_widget}; 1405 if $self->{title_widget};
… …
1576 1597
1577sub add { 1598sub add {
1578 my ($self, @widgets) = @_; 1599 my ($self, @widgets) = @_;
1579 1600
1580 for my $child (@widgets) { 1601 for my $child (@widgets) {
1581 $child->{rowspan} ||= 1; 1602 $child->{c_rowspan} ||= 1;
1582 $child->{colspan} ||= 1; 1603 $child->{c_colspan} ||= 1;
1583 } 1604 }
1584 1605
1585 $self->SUPER::add (@widgets); 1606 $self->SUPER::add (@widgets);
1586} 1607}
1587 1608
… …
1591 my @widgets; 1612 my @widgets;
1592 1613
1593 while (@_) { 1614 while (@_) {
1594 my ($col, $row, $child) = splice @_, 0, 3, (); 1615 my ($col, $row, $child) = splice @_, 0, 3, ();
1595 1616
1596 $child->{row} = $row; 1617 $child->{c_row} = $row;
1597 $child->{col} = $col; 1618 $child->{c_col} = $col;
1598 1619
1599 push @widgets, $child; 1620 push @widgets, $child;
1600 } 1621 }
1601 1622
1602 $self->add (@widgets); 1623 $self->add (@widgets);
… …
1608 my (@w, @h); 1629 my (@w, @h);
1609 1630
1610 my @children = $self->children; 1631 my @children = $self->children;
1611 1632
1612 # first pass, columns 1633 # first pass, columns
1613 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1634 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1614 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1635 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1615 1636
1616 my $sw = sum @w[$c .. $c + $cs - 1]; 1637 my $sw = sum @w[$c .. $c + $cs - 1];
1617 1638
1618 if ($w > $sw) { 1639 if ($w > $sw) {
1619 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1640 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1620 } 1641 }
1621 } 1642 }
1622 1643
1623 # second pass, rows 1644 # second pass, rows
1624 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1645 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1625 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1646 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1626 1647
1627 my $sh = sum @h[$r .. $r + $rs - 1]; 1648 my $sh = sum @h[$r .. $r + $rs - 1];
1628 1649
1629 if ($h > $sh) { 1650 if ($h > $sh) {
1630 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1651 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1672 1693
1673 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1694 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1674 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1695 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1675 1696
1676 for my $widget ($self->children) { 1697 for my $widget ($self->children) {
1677 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)};
1678 1699
1679 $widget->configure ( 1700 $widget->configure (
1680 $x[$c], $y[$r], 1701 $x[$c], $y[$r],
1681 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1702 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1682 ); 1703 );
… …
1901 1922
1902 delete $self->{ox}; 1923 delete $self->{ox};
1903 $self->SUPER::realloc; 1924 $self->SUPER::realloc;
1904} 1925}
1905 1926
1927sub clear {
1928 my ($self) = @_;
1929
1930 $self->set_text ("");
1931}
1932
1906sub set_text { 1933sub set_text {
1907 my ($self, $text) = @_; 1934 my ($self, $text) = @_;
1908 1935
1909 return if $self->{text} eq "T$text"; 1936 return if $self->{text} eq "T$text";
1910 $self->{text} = "T$text"; 1937 $self->{text} = "T$text";
… …
1933 1960
1934sub size_request { 1961sub size_request {
1935 my ($self) = @_; 1962 my ($self) = @_;
1936 1963
1937 $self->{size_req} ||= do { 1964 $self->{size_req} ||= do {
1965 my ($max_w, $max_h) = $self->get_max_wh;
1966
1938 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1967 $self->{layout}->set_font ($self->{font}) if $self->{font};
1939 $self->{layout}->set_width ($self->{max_w} || -1); 1968 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1940 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1969 $self->{layout}->set_ellipsise ($self->{ellipsise});
1941 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1970 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1942 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1943 1972
1944 my ($w, $h) = $self->{layout}->size; 1973 my ($w, $h) = $self->{layout}->size;
… …
2016 : ($self->{w} - $size->[0]) * 0.5); 2045 : ($self->{w} - $size->[0]) * 0.5);
2017 2046
2018 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2047 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2019 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2048 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2020 : ($self->{h} - $size->[1]) * 0.5); 2049 : ($self->{h} - $size->[1]) * 0.5);
2050
2051 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2021 }; 2052 };
2022 2053
2023# unless ($self->{list}) { 2054# unless ($self->{list}) {
2024# $self->{list} = CFPlus::OpenGL::glGenList; 2055# $self->{list} = CFPlus::OpenGL::glGenList;
2025# CFPlus::OpenGL::glNewList $self->{list}; 2056# CFPlus::OpenGL::glNewList $self->{list};
… …
2027# CFPlus::OpenGL::glEndList; 2058# CFPlus::OpenGL::glEndList;
2028# } 2059# }
2029# 2060#
2030# CFPlus::OpenGL::glCallList $self->{list}; 2061# CFPlus::OpenGL::glCallList $self->{list};
2031 2062
2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2063 $self->{layout}->draw;
2033} 2064}
2034 2065
2035#sub destroy { 2066#sub destroy {
2036# my ($self) = @_; 2067# my ($self) = @_;
2037# 2068#
… …
2052 my $class = shift; 2083 my $class = shift;
2053 2084
2054 $class->SUPER::new ( 2085 $class->SUPER::new (
2055 fg => [1, 1, 1], 2086 fg => [1, 1, 1],
2056 bg => [0, 0, 0, 0.2], 2087 bg => [0, 0, 0, 0.2],
2088 outline => [0.6, 0.3, 0.1],
2057 active_bg => [1, 1, 1, 0.5], 2089 active_bg => [0, 0, 1, .2],
2058 active_fg => [0, 0, 0], 2090 active_fg => [1, 1, 1],
2091 active_outline => [1, 1, 0],
2059 can_hover => 1, 2092 can_hover => 1,
2060 can_focus => 1, 2093 can_focus => 1,
2061 valign => 0, 2094 valign => 0,
2062 can_events => 1, 2095 can_events => 1,
2063 ellipsise => 0, 2096 ellipsise => 0,
… …
2203 glColor_premultiply @{$self->{bg}}; 2236 glColor_premultiply @{$self->{bg}};
2204 } 2237 }
2205 2238
2206 glEnable GL_BLEND; 2239 glEnable GL_BLEND;
2207 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2240 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}; 2241 glRect 0, 0, $self->{w}, $self->{h};
2212 glVertex $self->{w}, 0;
2213 glEnd;
2214 glDisable GL_BLEND; 2242 glDisable GL_BLEND;
2215 2243
2216 $self->SUPER::_draw; 2244 $self->SUPER::_draw;
2217 2245
2218 #TODO: force update every cursor change :( 2246 #TODO: force update every cursor change :(
… …
2220 2248
2221 unless (exists $self->{cur_h}) { 2249 unless (exists $self->{cur_h}) {
2222 my $text = substr $self->{text}, 0, $self->{cursor}; 2250 my $text = substr $self->{text}, 0, $self->{cursor};
2223 utf8::encode $text; 2251 utf8::encode $text;
2224 2252
2225 @$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);
2226 } 2254 }
2227 2255
2256 glColor_premultiply @{$self->{active_fg}};
2228 glBegin GL_LINES; 2257 glBegin GL_LINES;
2229 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};
2230 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;
2231 glEnd; 2274 glEnd;
2232 } 2275 }
2233} 2276}
2234 2277
2235############################################################################# 2278#############################################################################
… …
2322 1 2365 1
2323} 2366}
2324 2367
2325############################################################################# 2368#############################################################################
2326 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
2327package CFPlus::UI::Button; 2419package CFPlus::UI::Button;
2328 2420
2329our @ISA = CFPlus::UI::Label::; 2421our @ISA = CFPlus::UI::Label::;
2330 2422
2331use CFPlus::OpenGL; 2423use CFPlus::OpenGL;
… …
2435sub _draw { 2527sub _draw {
2436 my ($self) = @_; 2528 my ($self) = @_;
2437 2529
2438 $self->SUPER::_draw; 2530 $self->SUPER::_draw;
2439 2531
2440 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2532 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2441 2533
2442 my ($w, $h) = @$self{qw(w h)}; 2534 my ($w, $h) = @$self{qw(w h)};
2443 2535
2444 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;
2445 2537
… …
2465sub new { 2557sub new {
2466 my $class = shift; 2558 my $class = shift;
2467 2559
2468 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
2469 can_events => 0, 2561 can_events => 0,
2562 scale => 1,
2470 @_, 2563 @_,
2471 ); 2564 );
2472 2565
2473 $self->{path} || $self->{tex} 2566 $self->{path} || $self->{tex}
2474 or Carp::croak "'path' or 'tex' attributes required"; 2567 or Carp::croak "'path' or 'tex' attributes required";
… …
2499} 2592}
2500 2593
2501sub size_request { 2594sub size_request {
2502 my ($self) = @_; 2595 my ($self) = @_;
2503 2596
2504 ($self->{tex}{w}, $self->{tex}{h}) 2597 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2505} 2598}
2506 2599
2507sub _draw { 2600sub _draw {
2508 my ($self) = @_; 2601 my ($self) = @_;
2509 2602
… …
2519 } 2612 }
2520 2613
2521 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2522 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2523 2616
2524 $tex->draw_quad (0, 0, $w, $h); 2617 $tex->draw_quad_alpha (0, 0, $w, $h);
2525 2618
2526 glDisable GL_TEXTURE_2D; 2619 glDisable GL_TEXTURE_2D;
2527} 2620}
2528 2621
2529############################################################################# 2622#############################################################################
… …
2548 align => 0, 2641 align => 0,
2549 valign => 0, 2642 valign => 0,
2550 can_events => 1, 2643 can_events => 1,
2551 @_ 2644 @_
2552 ); 2645 );
2646}
2647
2648sub invoke_button_down {
2649 my ($self, $ev, $x, $y) = @_;
2650
2651 1
2553} 2652}
2554 2653
2555sub invoke_button_up { 2654sub invoke_button_up {
2556 my ($self, $ev, $x, $y) = @_; 2655 my ($self, $ev, $x, $y) = @_;
2557 2656
… …
2697 glDisable GL_TEXTURE_2D; 2796 glDisable GL_TEXTURE_2D;
2698} 2797}
2699 2798
2700############################################################################# 2799#############################################################################
2701 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
2702package CFPlus::UI::Gauge; 2939package CFPlus::UI::Gauge;
2703 2940
2704our @ISA = CFPlus::UI::VBox::; 2941our @ISA = CFPlus::UI::VBox::;
2705 2942
2706sub new { 2943sub new {
… …
3203 3440
3204 if ($y0 < $y + $h && $y < $y1) { 3441 if ($y0 < $y + $h && $y < $y1) {
3205 my $layout = $self->get_layout ($para); 3442 my $layout = $self->get_layout ($para);
3206 3443
3207 $layout->render ($para->{indent}, $y - $y0); 3444 $layout->render ($para->{indent}, $y - $y0);
3445 $layout->draw;
3208 3446
3209 if (my @w = @{ $para->{widget} }) { 3447 if (my @w = @{ $para->{widget} }) {
3210 my @s = $layout->get_shapes; 3448 my @s = $layout->get_shapes;
3211 3449
3212 for (@w) { 3450 for (@w) {
… …
3334} 3572}
3335 3573
3336sub set_tooltip_from { 3574sub set_tooltip_from {
3337 my ($self, $widget) = @_; 3575 my ($self, $widget) = @_;
3338 3576
3339 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3340 if $widget->{tooltip} =~ /^#(.*)$/;
3341
3342 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 =~ /^#(.*)$/;
3343 3582
3344 if ($ENV{CFPLUS_DEBUG} & 2) { 3583 if ($ENV{CFPLUS_DEBUG} & 2) {
3345 $tooltip .= "\n\n" . (ref $widget) . "\n" 3584 $tip .= "\n\n" . (ref $widget) . "\n"
3346 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3585 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3347 . "req $widget->{req_w} $widget->{req_h}\n" 3586 . "req $widget->{req_w} $widget->{req_h}\n"
3348 . "visible $widget->{visible}"; 3587 . "visible $widget->{visible}";
3349 } 3588 }
3350 3589
3351 $tooltip =~ s/^\n+//; 3590 $tip =~ s/^\n+//;
3352 $tooltip =~ s/\n+$//; 3591 $tip =~ s/\n+$//;
3353 3592
3354 $self->add (new CFPlus::UI::Label 3593 $self->add (new CFPlus::UI::Label
3355 markup => $tooltip, 3594 markup => $tip,
3356 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3595 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3357 fontsize => 0.8, 3596 fontsize => 0.8,
3358 style => 1, # FLAG_INVERSE 3597 style => 1, # FLAG_INVERSE
3359 ellipsise => 0, 3598 ellipsise => 0,
3360 font => ($widget->{tooltip_font} || $::FONT_PROP), 3599 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3398} 3637}
3399 3638
3400sub _draw { 3639sub _draw {
3401 my ($self) = @_; 3640 my ($self) = @_;
3402 3641
3403 glTranslate 0.375, 0.375;
3404
3405 my ($w, $h) = @$self{qw(w h)}; 3642 my ($w, $h) = @$self{qw(w h)};
3406 3643
3407 glColor 1, 0.8, 0.4; 3644 glColor 1, 0.8, 0.4;
3408 glBegin GL_QUADS; 3645 glRect 0, 0, $w, $h;
3409 glVertex 0 , 0;
3410 glVertex 0 , $h;
3411 glVertex $w, $h;
3412 glVertex $w, 0;
3413 glEnd;
3414 3646
3415 glColor 0, 0, 0; 3647 glColor 0, 0, 0;
3416 glBegin GL_LINE_LOOP; 3648 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 3649
3423 glTranslate 2 - 0.375, 2 - 0.375; 3650 glTranslate 2, 2;
3424 3651
3425 $self->SUPER::_draw; 3652 $self->SUPER::_draw;
3426} 3653}
3427 3654
3428############################################################################# 3655#############################################################################
… …
3450 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3677 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3451 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3678 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3452 $self->{timer} = Event->timer ( 3679 $self->{timer} = Event->timer (
3453 parked => 1, 3680 parked => 1,
3454 cb => sub { 3681 cb => sub {
3455 return unless $::CONN && $widget; 3682 return unless $::CONN;
3456 3683
3684 my $w = $widget
3685 or return;
3686
3457 ++$widget->{frame}; 3687 ++$w->{frame};
3458 $widget->update_face; 3688 $w->update_face;
3689
3690 # somehow, $widget can go away
3459 $widget->update; 3691 $w->update;
3460
3461 $widget->update_timer; 3692 $w->update_timer;
3462 }, 3693 },
3463 ); 3694 );
3464 3695
3465 $self->update_face; 3696 $self->update_face;
3466 $self->update_timer; 3697 $self->update_timer;
… …
3487} 3718}
3488 3719
3489sub update_face { 3720sub update_face {
3490 my ($self) = @_; 3721 my ($self) = @_;
3491 3722
3492 return unless $::CONN; 3723 if ($::CONN) {
3493
3494 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3724 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3495 if ($anim && @$anim) { 3725 if ($anim && @$anim) {
3496 delete $self->{wait_face};
3497 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3726 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3727 delete $self->{face_change_cb};
3728
3498 $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 }
3499 } 3735 }
3500 } 3736 }
3501} 3737}
3502 3738
3503sub size_request { 3739sub size_request {
3504 my ($self) = @_; 3740 my ($self) = @_;
3505 3741
3506 if ($::CONN) { 3742 if ($::CONN) {
3507 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3743 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3508 if (my $tex = $::CONN->{texture}[$faceid]) { 3744 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3509 $self->{tex} = $tex; 3745 if ($tex->{name}) {
3510 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3746 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3511 } else { 3747 } elsif (!$tex->{loading}) {
3512 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3748 $tex->upload (sub { $self->reconfigure });
3513 $self->realloc;
3514 }); 3749 }
3515 } 3750 }
3751
3752 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3516 } 3753 }
3517 } 3754 }
3518 3755
3519 ($self->{size_w} || 8, $self->{size_h} || 8) 3756 ($self->{size_w} || 8, $self->{size_h} || 8)
3520} 3757}
… …
3600 children => [ 3837 children => [
3601 (new CFPlus::UI::Label markup => $left, expand => 1), 3838 (new CFPlus::UI::Label markup => $left, expand => 1),
3602 (new CFPlus::UI::Label markup => $right, align => +1), 3839 (new CFPlus::UI::Label markup => $right, align => +1),
3603 ], 3840 ],
3604 ; 3841 ;
3605 3842
3606 } else { 3843 } else {
3607 $widget = new CFPlus::UI::Label 3844 $widget = new CFPlus::UI::Label
3608 can_hover => 1, 3845 can_hover => 1,
3609 can_events => 1, 3846 can_events => 1,
3610 markup => $widget, 3847 markup => $widget,
… …
3735 3972
3736############################################################################# 3973#############################################################################
3737 3974
3738package CFPlus::UI::Notebook; 3975package CFPlus::UI::Notebook;
3739 3976
3977use CFPlus::OpenGL;
3978
3740our @ISA = CFPlus::UI::VBox::; 3979our @ISA = CFPlus::UI::VBox::;
3741 3980
3742sub new { 3981sub new {
3743 my $class = shift; 3982 my $class = shift;
3744 3983
3745 my $self = $class->SUPER::new ( 3984 my $self = $class->SUPER::new (
3746 buttonbar => (new CFPlus::UI::Buttonbar), 3985 buttonbar => (new CFPlus::UI::Buttonbar),
3747 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3986 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3987 active_outline => [.7, .7, 0.2],
3748 # filter => # will be put between multiplexer and $self 3988 # filter => # will be put between multiplexer and $self
3749 @_, 3989 @_,
3750 ); 3990 );
3751 3991
3752 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3992 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3753 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3993 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3754 3994
3755 { 3995 {
3756 Scalar::Util::weaken (my $wself = $self); 3996 Scalar::Util::weaken (my $wself = $self);
… …
3799 my ($self, @widgets) = @_; 4039 my ($self, @widgets) = @_;
3800 4040
3801 $self->{multiplexer}->remove (@widgets) 4041 $self->{multiplexer}->remove (@widgets)
3802} 4042}
3803 4043
4044sub pages {
4045 my ($self) = @_;
4046 $self->{multiplexer}->children
4047}
4048
3804sub add_tab { 4049sub add_tab {
3805 my ($self, $title, $widget, $tooltip) = @_; 4050 my ($self, $title, $widget, $tooltip) = @_;
3806 4051
3807 $title = [$title, $tooltip] unless ref $title; 4052 $title = [$title, $tooltip] unless ref $title;
3808 $widget->{c_tab} = $title; 4053 $widget->{c_tab} = $title;
… …
3819sub set_current_page { 4064sub set_current_page {
3820 my ($self, $page) = @_; 4065 my ($self, $page) = @_;
3821 4066
3822 $self->{multiplexer}->set_current_page ($page); 4067 $self->{multiplexer}->set_current_page ($page);
3823 $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 }
3824} 4089}
3825 4090
3826############################################################################# 4091#############################################################################
3827 4092
3828package CFPlus::UI::Selector; 4093package CFPlus::UI::Selector;
… …
4098} 4363}
4099 4364
4100sub update { 4365sub update {
4101 my ($self) = @_; 4366 my ($self) = @_;
4102 4367
4103 $::WANT_REFRESH++; 4368 $::WANT_REFRESH->start;
4104} 4369}
4105 4370
4106sub add { 4371sub add {
4107 my ($self, @children) = @_; 4372 my ($self, @children) = @_;
4108 4373

Diff Legend

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