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.414 by root, Mon Jul 23 17:54:14 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#############################################################################
… …
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::;
… …
1027 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
1028 1025
1029 my $self; 1026 my $self;
1030 1027
1031 my $hslider = new CFPlus::UI::Slider 1028 my $hslider = new CFPlus::UI::Slider
1032 col => 0, 1029 c_col => 0,
1033 row => 1, 1030 c_row => 1,
1034 vertical => 0, 1031 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix 1032 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub { 1033 on_changed => sub {
1037 $self->{hpos} = $_[1]; 1034 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1035 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 }, 1036 },
1040 ; 1037 ;
1041 1038
1042 my $vslider = new CFPlus::UI::Slider 1039 my $vslider = new CFPlus::UI::Slider
1043 col => 1, 1040 c_col => 1,
1044 row => 0, 1041 c_row => 0,
1045 vertical => 1, 1042 vertical => 1,
1046 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
1047 on_changed => sub { 1044 on_changed => sub {
1048 $self->{vpos} = $_[1]; 1045 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1046 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1060 row_expand => [1, 0], 1057 row_expand => [1, 0],
1061 %arg, 1058 %arg,
1062 ); 1059 );
1063 1060
1064 $self->{vp} = new CFPlus::UI::ViewPort 1061 $self->{vp} = new CFPlus::UI::ViewPort
1065 col => 0, 1062 c_col => 0,
1066 row => 0, 1063 c_row => 0,
1067 expand => 1, 1064 expand => 1,
1068 scroll_x => $self->{scroll_x}, 1065 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y}, 1066 scroll_y => $self->{scroll_y},
1070 on_changed => sub { 1067 on_changed => sub {
1071 my ($vp, $x, $y) = @_; 1068 my ($vp, $x, $y) = @_;
… …
1219 my ($w, $h) = @$self{qw(w h)}; 1216 my ($w, $h) = @$self{qw(w h)};
1220 1217
1221 glEnable GL_BLEND; 1218 glEnable GL_BLEND;
1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1223 glColor_premultiply @{ $self->{bg} }; 1220 glColor_premultiply @{ $self->{bg} };
1224
1225 glBegin GL_QUADS;
1226 glVertex 0 , 0;
1227 glVertex 0 , $h;
1228 glVertex $w, $h; 1221 glRect 0, 0, $w, $h;
1229 glVertex $w, 0;
1230 glEnd;
1231
1232 glDisable GL_BLEND; 1222 glDisable GL_BLEND;
1233 } 1223 }
1234 1224
1235 $self->SUPER::_draw; 1225 $self->SUPER::_draw;
1236} 1226}
… …
1397 1387
1398sub border { 1388sub border {
1399 int $_[0]{border} * $::FONTSIZE 1389 int $_[0]{border} * $::FONTSIZE
1400} 1390}
1401 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
1402sub size_request { 1401sub size_request {
1403 my ($self) = @_; 1402 my ($self) = @_;
1404 1403
1405 $self->{title_widget}->size_request 1404 $self->{title_widget}->size_request
1406 if $self->{title_widget}; 1405 if $self->{title_widget};
… …
1598 1597
1599sub add { 1598sub add {
1600 my ($self, @widgets) = @_; 1599 my ($self, @widgets) = @_;
1601 1600
1602 for my $child (@widgets) { 1601 for my $child (@widgets) {
1603 $child->{rowspan} ||= 1; 1602 $child->{c_rowspan} ||= 1;
1604 $child->{colspan} ||= 1; 1603 $child->{c_colspan} ||= 1;
1605 } 1604 }
1606 1605
1607 $self->SUPER::add (@widgets); 1606 $self->SUPER::add (@widgets);
1608} 1607}
1609 1608
… …
1613 my @widgets; 1612 my @widgets;
1614 1613
1615 while (@_) { 1614 while (@_) {
1616 my ($col, $row, $child) = splice @_, 0, 3, (); 1615 my ($col, $row, $child) = splice @_, 0, 3, ();
1617 1616
1618 $child->{row} = $row; 1617 $child->{c_row} = $row;
1619 $child->{col} = $col; 1618 $child->{c_col} = $col;
1620 1619
1621 push @widgets, $child; 1620 push @widgets, $child;
1622 } 1621 }
1623 1622
1624 $self->add (@widgets); 1623 $self->add (@widgets);
… …
1630 my (@w, @h); 1629 my (@w, @h);
1631 1630
1632 my @children = $self->children; 1631 my @children = $self->children;
1633 1632
1634 # first pass, columns 1633 # first pass, columns
1635 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1634 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1635 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637 1636
1638 my $sw = sum @w[$c .. $c + $cs - 1]; 1637 my $sw = sum @w[$c .. $c + $cs - 1];
1639 1638
1640 if ($w > $sw) { 1639 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1640 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 } 1641 }
1643 } 1642 }
1644 1643
1645 # second pass, rows 1644 # second pass, rows
1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1645 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1646 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1648 1647
1649 my $sh = sum @h[$r .. $r + $rs - 1]; 1648 my $sh = sum @h[$r .. $r + $rs - 1];
1650 1649
1651 if ($h > $sh) { 1650 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1651 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1694 1693
1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1694 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1695 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1697 1696
1698 for my $widget ($self->children) { 1697 for my $widget ($self->children) {
1699 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)};
1700 1699
1701 $widget->configure ( 1700 $widget->configure (
1702 $x[$c], $y[$r], 1701 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1702 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1704 ); 1703 );
… …
1923 1922
1924 delete $self->{ox}; 1923 delete $self->{ox};
1925 $self->SUPER::realloc; 1924 $self->SUPER::realloc;
1926} 1925}
1927 1926
1927sub clear {
1928 my ($self) = @_;
1929
1930 $self->set_text ("");
1931}
1932
1928sub set_text { 1933sub set_text {
1929 my ($self, $text) = @_; 1934 my ($self, $text) = @_;
1930 1935
1931 return if $self->{text} eq "T$text"; 1936 return if $self->{text} eq "T$text";
1932 $self->{text} = "T$text"; 1937 $self->{text} = "T$text";
… …
1955 1960
1956sub size_request { 1961sub size_request {
1957 my ($self) = @_; 1962 my ($self) = @_;
1958 1963
1959 $self->{size_req} ||= do { 1964 $self->{size_req} ||= do {
1965 my ($max_w, $max_h) = $self->get_max_wh;
1966
1960 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1967 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_width ($self->{max_w} || -1); 1968 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1962 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1969 $self->{layout}->set_ellipsise ($self->{ellipsise});
1963 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1970 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1964 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1965 1972
1966 my ($w, $h) = $self->{layout}->size; 1973 my ($w, $h) = $self->{layout}->size;
… …
2038 : ($self->{w} - $size->[0]) * 0.5); 2045 : ($self->{w} - $size->[0]) * 0.5);
2039 2046
2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2047 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2048 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2042 : ($self->{h} - $size->[1]) * 0.5); 2049 : ($self->{h} - $size->[1]) * 0.5);
2050
2051 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2043 }; 2052 };
2044 2053
2045# unless ($self->{list}) { 2054# unless ($self->{list}) {
2046# $self->{list} = CFPlus::OpenGL::glGenList; 2055# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list}; 2056# CFPlus::OpenGL::glNewList $self->{list};
… …
2049# CFPlus::OpenGL::glEndList; 2058# CFPlus::OpenGL::glEndList;
2050# } 2059# }
2051# 2060#
2052# CFPlus::OpenGL::glCallList $self->{list}; 2061# CFPlus::OpenGL::glCallList $self->{list};
2053 2062
2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2063 $self->{layout}->draw;
2055} 2064}
2056 2065
2057#sub destroy { 2066#sub destroy {
2058# my ($self) = @_; 2067# my ($self) = @_;
2059# 2068#
… …
2074 my $class = shift; 2083 my $class = shift;
2075 2084
2076 $class->SUPER::new ( 2085 $class->SUPER::new (
2077 fg => [1, 1, 1], 2086 fg => [1, 1, 1],
2078 bg => [0, 0, 0, 0.2], 2087 bg => [0, 0, 0, 0.2],
2088 outline => [0.6, 0.3, 0.1],
2079 active_bg => [1, 1, 1, 0.5], 2089 active_bg => [0, 0, 1, .2],
2080 active_fg => [0, 0, 0], 2090 active_fg => [1, 1, 1],
2091 active_outline => [1, 1, 0],
2081 can_hover => 1, 2092 can_hover => 1,
2082 can_focus => 1, 2093 can_focus => 1,
2083 valign => 0, 2094 valign => 0,
2084 can_events => 1, 2095 can_events => 1,
2085 ellipsise => 0, 2096 ellipsise => 0,
… …
2225 glColor_premultiply @{$self->{bg}}; 2236 glColor_premultiply @{$self->{bg}};
2226 } 2237 }
2227 2238
2228 glEnable GL_BLEND; 2239 glEnable GL_BLEND;
2229 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2240 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2230 glBegin GL_QUADS;
2231 glVertex 0 , 0;
2232 glVertex 0 , $self->{h};
2233 glVertex $self->{w}, $self->{h}; 2241 glRect 0, 0, $self->{w}, $self->{h};
2234 glVertex $self->{w}, 0;
2235 glEnd;
2236 glDisable GL_BLEND; 2242 glDisable GL_BLEND;
2237 2243
2238 $self->SUPER::_draw; 2244 $self->SUPER::_draw;
2239 2245
2240 #TODO: force update every cursor change :( 2246 #TODO: force update every cursor change :(
… …
2242 2248
2243 unless (exists $self->{cur_h}) { 2249 unless (exists $self->{cur_h}) {
2244 my $text = substr $self->{text}, 0, $self->{cursor}; 2250 my $text = substr $self->{text}, 0, $self->{cursor};
2245 utf8::encode $text; 2251 utf8::encode $text;
2246 2252
2247 @$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);
2248 } 2254 }
2249 2255
2256 glColor_premultiply @{$self->{active_fg}};
2250 glBegin GL_LINES; 2257 glBegin GL_LINES;
2251 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};
2252 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;
2253 glEnd; 2274 glEnd;
2254 } 2275 }
2255} 2276}
2256 2277
2257############################################################################# 2278#############################################################################
… …
2344 1 2365 1
2345} 2366}
2346 2367
2347############################################################################# 2368#############################################################################
2348 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
2349package CFPlus::UI::Button; 2419package CFPlus::UI::Button;
2350 2420
2351our @ISA = CFPlus::UI::Label::; 2421our @ISA = CFPlus::UI::Label::;
2352 2422
2353use CFPlus::OpenGL; 2423use CFPlus::OpenGL;
… …
2457sub _draw { 2527sub _draw {
2458 my ($self) = @_; 2528 my ($self) = @_;
2459 2529
2460 $self->SUPER::_draw; 2530 $self->SUPER::_draw;
2461 2531
2462 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2532 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2463 2533
2464 my ($w, $h) = @$self{qw(w h)}; 2534 my ($w, $h) = @$self{qw(w h)};
2465 2535
2466 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;
2467 2537
… …
2487sub new { 2557sub new {
2488 my $class = shift; 2558 my $class = shift;
2489 2559
2490 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
2491 can_events => 0, 2561 can_events => 0,
2562 scale => 1,
2492 @_, 2563 @_,
2493 ); 2564 );
2494 2565
2495 $self->{path} || $self->{tex} 2566 $self->{path} || $self->{tex}
2496 or Carp::croak "'path' or 'tex' attributes required"; 2567 or Carp::croak "'path' or 'tex' attributes required";
… …
2521} 2592}
2522 2593
2523sub size_request { 2594sub size_request {
2524 my ($self) = @_; 2595 my ($self) = @_;
2525 2596
2526 ($self->{tex}{w}, $self->{tex}{h}) 2597 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2527} 2598}
2528 2599
2529sub _draw { 2600sub _draw {
2530 my ($self) = @_; 2601 my ($self) = @_;
2531 2602
… …
2541 } 2612 }
2542 2613
2543 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2545 2616
2546 $tex->draw_quad (0, 0, $w, $h); 2617 $tex->draw_quad_alpha (0, 0, $w, $h);
2547 2618
2548 glDisable GL_TEXTURE_2D; 2619 glDisable GL_TEXTURE_2D;
2549} 2620}
2550 2621
2551############################################################################# 2622#############################################################################
… …
2570 align => 0, 2641 align => 0,
2571 valign => 0, 2642 valign => 0,
2572 can_events => 1, 2643 can_events => 1,
2573 @_ 2644 @_
2574 ); 2645 );
2646}
2647
2648sub invoke_button_down {
2649 my ($self, $ev, $x, $y) = @_;
2650
2651 1
2575} 2652}
2576 2653
2577sub invoke_button_up { 2654sub invoke_button_up {
2578 my ($self, $ev, $x, $y) = @_; 2655 my ($self, $ev, $x, $y) = @_;
2579 2656
… …
2719 glDisable GL_TEXTURE_2D; 2796 glDisable GL_TEXTURE_2D;
2720} 2797}
2721 2798
2722############################################################################# 2799#############################################################################
2723 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
2724package CFPlus::UI::Gauge; 2939package CFPlus::UI::Gauge;
2725 2940
2726our @ISA = CFPlus::UI::VBox::; 2941our @ISA = CFPlus::UI::VBox::;
2727 2942
2728sub new { 2943sub new {
… …
3225 3440
3226 if ($y0 < $y + $h && $y < $y1) { 3441 if ($y0 < $y + $h && $y < $y1) {
3227 my $layout = $self->get_layout ($para); 3442 my $layout = $self->get_layout ($para);
3228 3443
3229 $layout->render ($para->{indent}, $y - $y0); 3444 $layout->render ($para->{indent}, $y - $y0);
3445 $layout->draw;
3230 3446
3231 if (my @w = @{ $para->{widget} }) { 3447 if (my @w = @{ $para->{widget} }) {
3232 my @s = $layout->get_shapes; 3448 my @s = $layout->get_shapes;
3233 3449
3234 for (@w) { 3450 for (@w) {
… …
3356} 3572}
3357 3573
3358sub set_tooltip_from { 3574sub set_tooltip_from {
3359 my ($self, $widget) = @_; 3575 my ($self, $widget) = @_;
3360 3576
3361 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3362 if $widget->{tooltip} =~ /^#(.*)$/;
3363
3364 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 =~ /^#(.*)$/;
3365 3582
3366 if ($ENV{CFPLUS_DEBUG} & 2) { 3583 if ($ENV{CFPLUS_DEBUG} & 2) {
3367 $tooltip .= "\n\n" . (ref $widget) . "\n" 3584 $tip .= "\n\n" . (ref $widget) . "\n"
3368 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3585 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3369 . "req $widget->{req_w} $widget->{req_h}\n" 3586 . "req $widget->{req_w} $widget->{req_h}\n"
3370 . "visible $widget->{visible}"; 3587 . "visible $widget->{visible}";
3371 } 3588 }
3372 3589
3373 $tooltip =~ s/^\n+//; 3590 $tip =~ s/^\n+//;
3374 $tooltip =~ s/\n+$//; 3591 $tip =~ s/\n+$//;
3375 3592
3376 $self->add (new CFPlus::UI::Label 3593 $self->add (new CFPlus::UI::Label
3377 markup => $tooltip, 3594 markup => $tip,
3378 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3595 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3379 fontsize => 0.8, 3596 fontsize => 0.8,
3380 style => 1, # FLAG_INVERSE 3597 style => 1, # FLAG_INVERSE
3381 ellipsise => 0, 3598 ellipsise => 0,
3382 font => ($widget->{tooltip_font} || $::FONT_PROP), 3599 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3420} 3637}
3421 3638
3422sub _draw { 3639sub _draw {
3423 my ($self) = @_; 3640 my ($self) = @_;
3424 3641
3425 glTranslate 0.375, 0.375;
3426
3427 my ($w, $h) = @$self{qw(w h)}; 3642 my ($w, $h) = @$self{qw(w h)};
3428 3643
3429 glColor 1, 0.8, 0.4; 3644 glColor 1, 0.8, 0.4;
3430 glBegin GL_QUADS; 3645 glRect 0, 0, $w, $h;
3431 glVertex 0 , 0;
3432 glVertex 0 , $h;
3433 glVertex $w, $h;
3434 glVertex $w, 0;
3435 glEnd;
3436 3646
3437 glColor 0, 0, 0; 3647 glColor 0, 0, 0;
3438 glBegin GL_LINE_LOOP; 3648 glRect_lineloop .5, .5, $w + .5, $h + .5;
3439 glVertex 0 , 0;
3440 glVertex 0 , $h;
3441 glVertex $w, $h;
3442 glVertex $w, 0;
3443 glEnd;
3444 3649
3445 glTranslate 2 - 0.375, 2 - 0.375; 3650 glTranslate 2, 2;
3446 3651
3447 $self->SUPER::_draw; 3652 $self->SUPER::_draw;
3448} 3653}
3449 3654
3450############################################################################# 3655#############################################################################
… …
3472 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3677 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3473 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3678 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3474 $self->{timer} = Event->timer ( 3679 $self->{timer} = Event->timer (
3475 parked => 1, 3680 parked => 1,
3476 cb => sub { 3681 cb => sub {
3477 return unless $::CONN && $widget; 3682 return unless $::CONN;
3478 3683
3684 my $w = $widget
3685 or return;
3686
3479 ++$widget->{frame}; 3687 ++$w->{frame};
3480 $widget->update_face; 3688 $w->update_face;
3689
3690 # somehow, $widget can go away
3481 $widget->update; 3691 $w->update;
3482
3483 $widget->update_timer; 3692 $w->update_timer;
3484 }, 3693 },
3485 ); 3694 );
3486 3695
3487 $self->update_face; 3696 $self->update_face;
3488 $self->update_timer; 3697 $self->update_timer;
… …
3509} 3718}
3510 3719
3511sub update_face { 3720sub update_face {
3512 my ($self) = @_; 3721 my ($self) = @_;
3513 3722
3514 return unless $::CONN; 3723 if ($::CONN) {
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3724 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) { 3725 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3726 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3727 delete $self->{face_change_cb};
3728
3520 $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 }
3521 } 3735 }
3522 } 3736 }
3523} 3737}
3524 3738
3525sub size_request { 3739sub size_request {
3526 my ($self) = @_; 3740 my ($self) = @_;
3527 3741
3528 if ($::CONN) { 3742 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3743 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) { 3744 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3531 $self->{tex} = $tex; 3745 if ($tex->{name}) {
3532 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3746 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3533 } else { 3747 } elsif (!$tex->{loading}) {
3534 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3748 $tex->upload (sub { $self->reconfigure });
3535 $self->realloc;
3536 }); 3749 }
3537 } 3750 }
3751
3752 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3538 } 3753 }
3539 } 3754 }
3540 3755
3541 ($self->{size_w} || 8, $self->{size_h} || 8) 3756 ($self->{size_w} || 8, $self->{size_h} || 8)
3542} 3757}
… …
3622 children => [ 3837 children => [
3623 (new CFPlus::UI::Label markup => $left, expand => 1), 3838 (new CFPlus::UI::Label markup => $left, expand => 1),
3624 (new CFPlus::UI::Label markup => $right, align => +1), 3839 (new CFPlus::UI::Label markup => $right, align => +1),
3625 ], 3840 ],
3626 ; 3841 ;
3627 3842
3628 } else { 3843 } else {
3629 $widget = new CFPlus::UI::Label 3844 $widget = new CFPlus::UI::Label
3630 can_hover => 1, 3845 can_hover => 1,
3631 can_events => 1, 3846 can_events => 1,
3632 markup => $widget, 3847 markup => $widget,
… …
3757 3972
3758############################################################################# 3973#############################################################################
3759 3974
3760package CFPlus::UI::Notebook; 3975package CFPlus::UI::Notebook;
3761 3976
3977use CFPlus::OpenGL;
3978
3762our @ISA = CFPlus::UI::VBox::; 3979our @ISA = CFPlus::UI::VBox::;
3763 3980
3764sub new { 3981sub new {
3765 my $class = shift; 3982 my $class = shift;
3766 3983
3767 my $self = $class->SUPER::new ( 3984 my $self = $class->SUPER::new (
3768 buttonbar => (new CFPlus::UI::Buttonbar), 3985 buttonbar => (new CFPlus::UI::Buttonbar),
3769 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3986 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3987 active_outline => [.7, .7, 0.2],
3770 # filter => # will be put between multiplexer and $self 3988 # filter => # will be put between multiplexer and $self
3771 @_, 3989 @_,
3772 ); 3990 );
3773 3991
3774 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3992 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3775 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3993 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3776 3994
3777 { 3995 {
3778 Scalar::Util::weaken (my $wself = $self); 3996 Scalar::Util::weaken (my $wself = $self);
… …
3821 my ($self, @widgets) = @_; 4039 my ($self, @widgets) = @_;
3822 4040
3823 $self->{multiplexer}->remove (@widgets) 4041 $self->{multiplexer}->remove (@widgets)
3824} 4042}
3825 4043
4044sub pages {
4045 my ($self) = @_;
4046 $self->{multiplexer}->children
4047}
4048
3826sub add_tab { 4049sub add_tab {
3827 my ($self, $title, $widget, $tooltip) = @_; 4050 my ($self, $title, $widget, $tooltip) = @_;
3828 4051
3829 $title = [$title, $tooltip] unless ref $title; 4052 $title = [$title, $tooltip] unless ref $title;
3830 $widget->{c_tab} = $title; 4053 $widget->{c_tab} = $title;
… …
3841sub set_current_page { 4064sub set_current_page {
3842 my ($self, $page) = @_; 4065 my ($self, $page) = @_;
3843 4066
3844 $self->{multiplexer}->set_current_page ($page); 4067 $self->{multiplexer}->set_current_page ($page);
3845 $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 }
3846} 4089}
3847 4090
3848############################################################################# 4091#############################################################################
3849 4092
3850package CFPlus::UI::Selector; 4093package CFPlus::UI::Selector;
… …
3882} 4125}
3883 4126
3884sub _set_value { 4127sub _set_value {
3885 my ($self, $value) = @_; 4128 my ($self, $value) = @_;
3886 4129
3887 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4130 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4131 $item ||= $self->{options}[0]
3888 or return; 4132 or return;
3889 4133
3890 $self->{value} = $item->[0]; 4134 $self->{value} = $item->[0];
3891 $self->set_markup ("$item->[1] ⇓"); 4135 $self->set_markup ("$item->[1] ⇓");
3892 $self->set_tooltip ($item->[2]); 4136 $self->set_tooltip ($item->[2]);
… …
3897 4141
3898 return unless $self->{value} ne $value; 4142 return unless $self->{value} ne $value;
3899 4143
3900 $self->_set_value ($value); 4144 $self->_set_value ($value);
3901 $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});
3902} 4153}
3903 4154
3904############################################################################# 4155#############################################################################
3905 4156
3906package CFPlus::UI::Statusbox; 4157package CFPlus::UI::Statusbox;
… …
4120} 4371}
4121 4372
4122sub update { 4373sub update {
4123 my ($self) = @_; 4374 my ($self) = @_;
4124 4375
4125 $::WANT_REFRESH++; 4376 $::WANT_REFRESH->start;
4126} 4377}
4127 4378
4128sub add { 4379sub add {
4129 my ($self, @children) = @_; 4380 my ($self, @children) = @_;
4130 4381

Diff Legend

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