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.420 by root, Wed Jul 25 15:50:17 2007 UTC vs.
Revision 1.452 by root, Wed Dec 26 20:09:38 2007 UTC

… …
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use CFPlus;
10use CFPlus::Pod; 9use CFPlus::Pod;
11use CFPlus::Texture; 10use CFPlus::Texture;
12 11
… …
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 33
33 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
34 35
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 37 $TOOLTIP->show;
41 } 38 }
42 39
43 return; 40 return;
… …
46 } 43 }
47 44
48 $TOOLTIP->hide; 45 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
51}); 48};
52 49
53sub get_layout { 50sub get_layout {
54 my $layout; 51 my $layout;
55 52
56 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
92 89
93 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 92
96 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
97 } 94 }
98} 95}
99 96
100sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
101 my ($ev) = @_; 98 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
108 105
109 $GRAB = $widget; 106 $GRAB = $widget;
110 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
111 108
112 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
113 } 110 }
114 111
115 if ($GRAB) { 112 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 114 # mousewheel
… …
142 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
143 $grab->update if $grab; 140 $grab->update if $grab;
144 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
145 142
146 check_hover $widget; 143 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
148 } 145 }
149} 146}
150 147
151sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
152 my ($ev) = @_; 149 my ($ev) = @_;
… …
273 $self->emit ("destroy"); 270 $self->emit ("destroy");
274 %$self = (); 271 %$self = ();
275} 272}
276 273
277sub TO_JSON { 274sub TO_JSON {
278 { __w_ => $_[0]{s_id} } 275 { "\fw" => $_[0]{s_id} }
279} 276}
280 277
281sub show { 278sub show {
282 my ($self) = @_; 279 my ($self) = @_;
283 280
… …
312 delete $self->{root}; 309 delete $self->{root};
313 310
314 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
315 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
316 313
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $CFPlus::UI::TOOLTIP_WATCHER->invoke
318 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
319 316
320 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
322} 319}
… …
341sub hide { 338sub hide {
342 my ($self) = @_; 339 my ($self) = @_;
343 340
344 $self->set_invisible; 341 $self->set_invisible;
345 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
346 $self->{parent}->remove ($self) 346 $parent->remove ($self);
347 if $self->{parent}; 347 }
348} 348}
349 349
350sub move_abs { 350sub move_abs {
351 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
352 352
… …
362 362
363 $self->{force_w} = $w; 363 $self->{force_w} = $w;
364 $self->{force_h} = $h; 364 $self->{force_h} = $h;
365 365
366 $self->realloc; 366 $self->realloc;
367}
368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 return $self->{parent}->get_max_wh
374 if $self->{parent};
375
376 ($::WIDTH, $::HEIGHT)
367} 377}
368 378
369sub size_request { 379sub size_request {
370 require Carp; 380 require Carp;
371 Carp::confess "size_request is abstract"; 381 Carp::confess "size_request is abstract";
… …
433 443
434 $self->{tooltip} = $tooltip; 444 $self->{tooltip} = $tooltip;
435 445
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 446 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 447 delete $CFPlus::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 448 $CFPlus::UI::TOOLTIP_WATCHER->invoke;
439 } 449 }
440} 450}
441 451
442# translate global coordinates to local coordinate system 452# translate global coordinates to local coordinate system
443sub coord2local { 453sub coord2local {
444 my ($self, $x, $y) = @_; 454 my ($self, $x, $y) = @_;
445 455
446 Carp::confess unless $self->{parent};#d# 456 return (undef, undef) unless $self->{parent};
447 457
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 458 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 459}
450 460
451# translate local coordinates to global coordinate system 461# translate local coordinates to global coordinate system
452sub coord2global { 462sub coord2global {
453 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
454 464
455 Carp::confess unless $self->{parent};#d# 465 return (undef, undef) unless $self->{parent};
456 466
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 467 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 468}
459 469
460sub invoke_focus_in { 470sub invoke_focus_in {
… …
607sub DESTROY { 617sub DESTROY {
608 my ($self) = @_; 618 my ($self) = @_;
609 619
610 return if CFPlus::in_destruct; 620 return if CFPlus::in_destruct;
611 621
622 local $@;
612 eval { $self->destroy }; 623 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 624 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 625
615 delete $WIDGET{$self+0}; 626 delete $WIDGET{$self+0};
616} 627}
… …
624use strict; 635use strict;
625use CFPlus::OpenGL; 636use CFPlus::OpenGL;
626 637
627sub new { 638sub new {
628 my $class = shift; 639 my $class = shift;
629
630 # range [value, low, high, page]
631 640
632 $class->SUPER::new ( 641 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 642 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 643 #active_bg => [1, 1, 1, 0.5],
635 @_ 644 @_
… …
647 my ($w, $h) = @$self{qw(w h)}; 656 my ($w, $h) = @$self{qw(w h)};
648 657
649 glEnable GL_BLEND; 658 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 659 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 660 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 661 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 662 glDisable GL_BLEND;
661 } 663 }
662} 664}
663 665
664############################################################################# 666#############################################################################
… …
829 831
830 1 832 1
831} 833}
832 834
833############################################################################# 835#############################################################################
834
835# back-buffered drawing area 836# back-buffered drawing area
836 837
837package CFPlus::UI::Window; 838package CFPlus::UI::Window;
838 839
839our @ISA = CFPlus::UI::Bin::; 840our @ISA = CFPlus::UI::Bin::;
… …
1027 my $child = delete $arg{child}; 1028 my $child = delete $arg{child};
1028 1029
1029 my $self; 1030 my $self;
1030 1031
1031 my $hslider = new CFPlus::UI::Slider 1032 my $hslider = new CFPlus::UI::Slider
1032 col => 0, 1033 c_col => 0,
1033 row => 1, 1034 c_row => 1,
1034 vertical => 0, 1035 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix 1036 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub { 1037 on_changed => sub {
1037 $self->{hpos} = $_[1]; 1038 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1039 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 }, 1040 },
1040 ; 1041 ;
1041 1042
1042 my $vslider = new CFPlus::UI::Slider 1043 my $vslider = new CFPlus::UI::Slider
1043 col => 1, 1044 c_col => 1,
1044 row => 0, 1045 c_row => 0,
1045 vertical => 1, 1046 vertical => 1,
1046 range => [0, 0, 1, 0.01], # HACK fix 1047 range => [0, 0, 1, 0.01], # HACK fix
1047 on_changed => sub { 1048 on_changed => sub {
1048 $self->{vpos} = $_[1]; 1049 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1050 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1060 row_expand => [1, 0], 1061 row_expand => [1, 0],
1061 %arg, 1062 %arg,
1062 ); 1063 );
1063 1064
1064 $self->{vp} = new CFPlus::UI::ViewPort 1065 $self->{vp} = new CFPlus::UI::ViewPort
1065 col => 0, 1066 c_col => 0,
1066 row => 0, 1067 c_row => 0,
1067 expand => 1, 1068 expand => 1,
1068 scroll_x => $self->{scroll_x}, 1069 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y}, 1070 scroll_y => $self->{scroll_y},
1070 on_changed => sub { 1071 on_changed => sub {
1071 my ($vp, $x, $y) = @_; 1072 my ($vp, $x, $y) = @_;
… …
1219 my ($w, $h) = @$self{qw(w h)}; 1220 my ($w, $h) = @$self{qw(w h)};
1220 1221
1221 glEnable GL_BLEND; 1222 glEnable GL_BLEND;
1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1223 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1223 glColor_premultiply @{ $self->{bg} }; 1224 glColor_premultiply @{ $self->{bg} };
1224
1225 glBegin GL_QUADS;
1226 glVertex 0 , 0;
1227 glVertex 0 , $h;
1228 glVertex $w, $h; 1225 glRect 0, 0, $w, $h;
1229 glVertex $w, 0;
1230 glEnd;
1231
1232 glDisable GL_BLEND; 1226 glDisable GL_BLEND;
1233 } 1227 }
1234 1228
1235 $self->SUPER::_draw; 1229 $self->SUPER::_draw;
1236} 1230}
… …
1397 1391
1398sub border { 1392sub border {
1399 int $_[0]{border} * $::FONTSIZE 1393 int $_[0]{border} * $::FONTSIZE
1400} 1394}
1401 1395
1396sub get_max_wh {
1397 my ($self) = @_;
1398
1399 return ($self->{w}, $self->{h})
1400 if $self->{visible} && $self->{w};
1401
1402 $self->SUPER::get_max_wh
1403}
1404
1402sub size_request { 1405sub size_request {
1403 my ($self) = @_; 1406 my ($self) = @_;
1404 1407
1405 $self->{title_widget}->size_request 1408 $self->{title_widget}->size_request
1406 if $self->{title_widget}; 1409 if $self->{title_widget};
… …
1598 1601
1599sub add { 1602sub add {
1600 my ($self, @widgets) = @_; 1603 my ($self, @widgets) = @_;
1601 1604
1602 for my $child (@widgets) { 1605 for my $child (@widgets) {
1603 $child->{rowspan} ||= 1; 1606 $child->{c_rowspan} ||= 1;
1604 $child->{colspan} ||= 1; 1607 $child->{c_colspan} ||= 1;
1605 } 1608 }
1606 1609
1607 $self->SUPER::add (@widgets); 1610 $self->SUPER::add (@widgets);
1608} 1611}
1609 1612
… …
1613 my @widgets; 1616 my @widgets;
1614 1617
1615 while (@_) { 1618 while (@_) {
1616 my ($col, $row, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1617 1620
1618 $child->{row} = $row; 1621 $child->{c_row} = $row;
1619 $child->{col} = $col; 1622 $child->{c_col} = $col;
1620 1623
1621 push @widgets, $child; 1624 push @widgets, $child;
1622 } 1625 }
1623 1626
1624 $self->add (@widgets); 1627 $self->add (@widgets);
… …
1630 my (@w, @h); 1633 my (@w, @h);
1631 1634
1632 my @children = $self->children; 1635 my @children = $self->children;
1633 1636
1634 # first pass, columns 1637 # first pass, columns
1635 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1638 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1639 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637 1640
1638 my $sw = sum @w[$c .. $c + $cs - 1]; 1641 my $sw = sum @w[$c .. $c + $cs - 1];
1639 1642
1640 if ($w > $sw) { 1643 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 } 1645 }
1643 } 1646 }
1644 1647
1645 # second pass, rows 1648 # second pass, rows
1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1649 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1650 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1648 1651
1649 my $sh = sum @h[$r .. $r + $rs - 1]; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1650 1653
1651 if ($h > $sh) { 1654 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1694 1697
1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1697 1700
1698 for my $widget ($self->children) { 1701 for my $widget ($self->children) {
1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1700 1703
1701 $widget->configure ( 1704 $widget->configure (
1702 $x[$c], $y[$r], 1705 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1704 ); 1707 );
… …
1923 1926
1924 delete $self->{ox}; 1927 delete $self->{ox};
1925 $self->SUPER::realloc; 1928 $self->SUPER::realloc;
1926} 1929}
1927 1930
1931sub clear {
1932 my ($self) = @_;
1933
1934 $self->set_text ("");
1935}
1936
1928sub set_text { 1937sub set_text {
1929 my ($self, $text) = @_; 1938 my ($self, $text) = @_;
1930 1939
1931 return if $self->{text} eq "T$text"; 1940 return if $self->{text} eq "T$text";
1932 $self->{text} = "T$text"; 1941 $self->{text} = "T$text";
… …
1955 1964
1956sub size_request { 1965sub size_request {
1957 my ($self) = @_; 1966 my ($self) = @_;
1958 1967
1959 $self->{size_req} ||= do { 1968 $self->{size_req} ||= do {
1969 my ($max_w, $max_h) = $self->get_max_wh;
1970
1960 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1971 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_width ($self->{max_w} || -1); 1972 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1962 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1973 $self->{layout}->set_ellipsise ($self->{ellipsise});
1963 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1974 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1964 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1975 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1965 1976
1966 my ($w, $h) = $self->{layout}->size; 1977 my ($w, $h) = $self->{layout}->size;
… …
2038 : ($self->{w} - $size->[0]) * 0.5); 2049 : ($self->{w} - $size->[0]) * 0.5);
2039 2050
2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2051 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2052 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2042 : ($self->{h} - $size->[1]) * 0.5); 2053 : ($self->{h} - $size->[1]) * 0.5);
2054
2055 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2043 }; 2056 };
2044 2057
2045# unless ($self->{list}) { 2058# unless ($self->{list}) {
2046# $self->{list} = CFPlus::OpenGL::glGenList; 2059# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list}; 2060# CFPlus::OpenGL::glNewList $self->{list};
… …
2049# CFPlus::OpenGL::glEndList; 2062# CFPlus::OpenGL::glEndList;
2050# } 2063# }
2051# 2064#
2052# CFPlus::OpenGL::glCallList $self->{list}; 2065# CFPlus::OpenGL::glCallList $self->{list};
2053 2066
2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2067 $self->{layout}->draw;
2055} 2068}
2056 2069
2057#sub destroy { 2070#sub destroy {
2058# my ($self) = @_; 2071# my ($self) = @_;
2059# 2072#
… …
2227 glColor_premultiply @{$self->{bg}}; 2240 glColor_premultiply @{$self->{bg}};
2228 } 2241 }
2229 2242
2230 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
2231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2232 glBegin GL_QUADS;
2233 glVertex 0 , 0;
2234 glVertex 0 , $self->{h};
2235 glVertex $self->{w}, $self->{h}; 2245 glRect 0, 0, $self->{w}, $self->{h};
2236 glVertex $self->{w}, 0;
2237 glEnd;
2238 glDisable GL_BLEND; 2246 glDisable GL_BLEND;
2239 2247
2240 $self->SUPER::_draw; 2248 $self->SUPER::_draw;
2241 2249
2242 #TODO: force update every cursor change :( 2250 #TODO: force update every cursor change :(
… …
2249 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2250 } 2258 }
2251 2259
2252 glColor_premultiply @{$self->{active_fg}}; 2260 glColor_premultiply @{$self->{active_fg}};
2253 glBegin GL_LINES; 2261 glBegin GL_LINES;
2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2262 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2255 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2263 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2256 glEnd; 2264 glEnd;
2257 2265
2258 glLineWidth 3; 2266 glLineWidth 3;
2259 glColor @{$self->{active_outline}}; 2267 glColor @{$self->{active_outline}};
2260 glBegin GL_LINE_LOOP;
2261 glVertex 0, 0;
2262 glVertex $self->{w} - 1, 0;
2263 glVertex $self->{w} - 1, $self->{h} - 1; 2268 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2264 glVertex 0, $self->{h} - 1;
2265 glEnd;
2266 glLineWidth 1; 2269 glLineWidth 1;
2267 2270
2268 } else { 2271 } else {
2269 glColor @{$self->{outline}}; 2272 glColor @{$self->{outline}};
2270 glTranslate .375, .375;
2271 glBegin GL_LINE_STRIP; 2273 glBegin GL_LINE_STRIP;
2272 glVertex 0, $self->{h} * .5; 2274 glVertex .5, $self->{h} * .5;
2273 glVertex 0, $self->{h} - 3; 2275 glVertex .5, $self->{h} - 2.5;
2274 glVertex $self->{w} - 1, $self->{h} - 3; 2276 glVertex $self->{w} - .5, $self->{h} - 2.5;
2275 glVertex $self->{w} - 1, $self->{h} * .5; 2277 glVertex $self->{w} - .5, $self->{h} * .5;
2276 glEnd; 2278 glEnd;
2277 } 2279 }
2278} 2280}
2279 2281
2280############################################################################# 2282#############################################################################
… …
2529sub _draw { 2531sub _draw {
2530 my ($self) = @_; 2532 my ($self) = @_;
2531 2533
2532 $self->SUPER::_draw; 2534 $self->SUPER::_draw;
2533 2535
2534 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2536 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2535 2537
2536 my ($w, $h) = @$self{qw(w h)}; 2538 my ($w, $h) = @$self{qw(w h)};
2537 2539
2538 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2540 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2539 2541
… …
2643 align => 0, 2645 align => 0,
2644 valign => 0, 2646 valign => 0,
2645 can_events => 1, 2647 can_events => 1,
2646 @_ 2648 @_
2647 ); 2649 );
2650}
2651
2652sub invoke_button_down {
2653 my ($self, $ev, $x, $y) = @_;
2654
2655 1
2648} 2656}
2649 2657
2650sub invoke_button_up { 2658sub invoke_button_up {
2651 my ($self, $ev, $x, $y) = @_; 2659 my ($self, $ev, $x, $y) = @_;
2652 2660
… …
2792 glDisable GL_TEXTURE_2D; 2800 glDisable GL_TEXTURE_2D;
2793} 2801}
2794 2802
2795############################################################################# 2803#############################################################################
2796 2804
2805package CFPlus::UI::Progress;
2806
2807our @ISA = CFPlus::UI::Label::;
2808
2809use CFPlus::OpenGL;
2810
2811sub new {
2812 my ($class, %arg) = @_;
2813
2814 my $self = $class->SUPER::new (
2815 fg => [1, 1, 1],
2816 bg => [0, 0, 1, 0.2],
2817 bar => [0.7, 0.5, 0.1, 0.8],
2818 outline => [0.4, 0.3, 0],
2819 fontsize => 0.9,
2820 valign => 0,
2821 align => 0,
2822 can_events => 1,
2823 ellipsise => 1,
2824 label => "%d%%",
2825 %arg,
2826 );
2827
2828 $self->set_value ($arg{value} || -1);
2829
2830 $self
2831}
2832
2833sub set_label {
2834 my ($self, $label) = @_;
2835
2836 return if $self->{label} eq $label;
2837 $self->{label} = $label;
2838
2839 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2840}
2841
2842sub set_value {
2843 my ($self, $value) = @_;
2844
2845 if ($self->{value} ne $value) {
2846 $self->{value} = $value;
2847
2848 if ($value < 0) {
2849 $self->set_text ("-");
2850 } else {
2851 $self->set_text (sprintf $self->{label}, $value * 100);
2852 }
2853
2854 $self->update;
2855 }
2856}
2857
2858sub _draw {
2859 my ($self) = @_;
2860
2861 glEnable GL_BLEND;
2862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2863
2864 if ($self->{value} >= 0) {
2865 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2866
2867 glColor_premultiply @{$self->{bar}};
2868 glRect 2, 2, $s, $self->{h} - 2;
2869 glColor_premultiply @{$self->{bg}};
2870 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2871 }
2872
2873 glColor_premultiply @{$self->{outline}};
2874 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2875
2876 glDisable GL_BLEND;
2877
2878 {
2879 local $self->{bg}; # do not draw background
2880 $self->SUPER::_draw;
2881 }
2882}
2883
2884#############################################################################
2885
2886package CFPlus::UI::ExperienceProgress;
2887
2888our @ISA = CFPlus::UI::Progress::;
2889
2890sub new {
2891 my ($class, %arg) = @_;
2892
2893 my $self = $class->SUPER::new (
2894 tooltip => sub {
2895 my ($self) = @_;
2896
2897 sprintf "level %d\n%s points\n%s next level\n%s to go",
2898 $self->{lvl},
2899 ::formsep ($self->{exp}),
2900 ::formsep ($self->{nxt}),
2901 ::formsep ($self->{nxt} - $self->{exp}),
2902 },
2903 %arg
2904 );
2905
2906 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2907 if $::CONN;
2908
2909 $self
2910}
2911
2912sub DESTROY {
2913 my ($self) = @_;
2914
2915 delete $::CONN->{on_exp_update}{$self+0}
2916 if $::CONN;
2917
2918 $self->SUPER::DESTROY;
2919}
2920
2921sub set_value {
2922 my ($self, $lvl, $exp) = @_;
2923
2924 $self->{lvl} = $lvl;
2925 $self->{exp} = $exp;
2926
2927 my $v = -1;
2928
2929 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2930 my $l0 = $table->[$lvl - 1];
2931 my $l1 = $table->[$lvl];
2932
2933 $self->{nxt} = $l1;
2934
2935 $v = ($exp - $l0) / ($l1 - $l0);
2936 }
2937
2938 $self->SUPER::set_value ($v);
2939}
2940
2941#############################################################################
2942
2797package CFPlus::UI::Gauge; 2943package CFPlus::UI::Gauge;
2798 2944
2799our @ISA = CFPlus::UI::VBox::; 2945our @ISA = CFPlus::UI::VBox::;
2800 2946
2801sub new { 2947sub new {
… …
3298 3444
3299 if ($y0 < $y + $h && $y < $y1) { 3445 if ($y0 < $y + $h && $y < $y1) {
3300 my $layout = $self->get_layout ($para); 3446 my $layout = $self->get_layout ($para);
3301 3447
3302 $layout->render ($para->{indent}, $y - $y0); 3448 $layout->render ($para->{indent}, $y - $y0);
3449 $layout->draw;
3303 3450
3304 if (my @w = @{ $para->{widget} }) { 3451 if (my @w = @{ $para->{widget} }) {
3305 my @s = $layout->get_shapes; 3452 my @s = $layout->get_shapes;
3306 3453
3307 for (@w) { 3454 for (@w) {
… …
3429} 3576}
3430 3577
3431sub set_tooltip_from { 3578sub set_tooltip_from {
3432 my ($self, $widget) = @_; 3579 my ($self, $widget) = @_;
3433 3580
3434 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3435 if $widget->{tooltip} =~ /^#(.*)$/;
3436
3437 my $tooltip = $widget->{tooltip}; 3581 my $tip = $widget->{tooltip};
3582 $tip = $tip->($widget) if "CODE" eq ref $tip;
3583
3584 $tip = CFPlus::Pod::section_label tooltip => $1
3585 if $tip =~ /^#(.*)$/;
3438 3586
3439 if ($ENV{CFPLUS_DEBUG} & 2) { 3587 if ($ENV{CFPLUS_DEBUG} & 2) {
3440 $tooltip .= "\n\n" . (ref $widget) . "\n" 3588 $tip .= "\n\n" . (ref $widget) . "\n"
3441 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3589 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3442 . "req $widget->{req_w} $widget->{req_h}\n" 3590 . "req $widget->{req_w} $widget->{req_h}\n"
3443 . "visible $widget->{visible}"; 3591 . "visible $widget->{visible}";
3444 } 3592 }
3445 3593
3446 $tooltip =~ s/^\n+//; 3594 $tip =~ s/^\n+//;
3447 $tooltip =~ s/\n+$//; 3595 $tip =~ s/\n+$//;
3448 3596
3449 $self->add (new CFPlus::UI::Label 3597 $self->add (new CFPlus::UI::Label
3450 markup => $tooltip, 3598 markup => $tip,
3451 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3452 fontsize => 0.8, 3600 fontsize => 0.8,
3453 style => 1, # FLAG_INVERSE 3601 style => 1, # FLAG_INVERSE
3454 ellipsise => 0, 3602 ellipsise => 0,
3455 font => ($widget->{tooltip_font} || $::FONT_PROP), 3603 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3493} 3641}
3494 3642
3495sub _draw { 3643sub _draw {
3496 my ($self) = @_; 3644 my ($self) = @_;
3497 3645
3498 glTranslate 0.375, 0.375;
3499
3500 my ($w, $h) = @$self{qw(w h)}; 3646 my ($w, $h) = @$self{qw(w h)};
3501 3647
3502 glColor 1, 0.8, 0.4; 3648 glColor 1, 0.8, 0.4;
3503 glRect 0, 0, $w, $h; 3649 glRect 0, 0, $w, $h;
3504 3650
3505 glColor 0, 0, 0; 3651 glColor 0, 0, 0;
3506 glBegin GL_LINE_LOOP; 3652 glRect_lineloop .5, .5, $w + .5, $h + .5;
3507 glVertex 0 , 0;
3508 glVertex 0 , $h;
3509 glVertex $w, $h;
3510 glVertex $w, 0;
3511 glEnd;
3512 3653
3513 glTranslate 2 - 0.375, 2 - 0.375; 3654 glTranslate 2, 2;
3514 3655
3515 $self->SUPER::_draw; 3656 $self->SUPER::_draw;
3516} 3657}
3517 3658
3518############################################################################# 3659#############################################################################
… …
3535 ); 3676 );
3536 3677
3537 if ($self->{anim} && $self->{animspeed}) { 3678 if ($self->{anim} && $self->{animspeed}) {
3538 CFPlus::weaken (my $widget = $self); 3679 CFPlus::weaken (my $widget = $self);
3539 3680
3540 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3681 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3541 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3682 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3542 $self->{timer} = Event->timer (
3543 parked => 1,
3544 cb => sub {
3545 return unless $::CONN && $widget; 3683 return unless $::CONN;
3546 3684
3685 my $w = $widget
3686 or return;
3687
3547 ++$widget->{frame}; 3688 ++$w->{frame};
3548 $widget->update_face; 3689 $w->update_face;
3690
3691 # somehow, $widget can go away
3549 $widget->update; 3692 $w->update;
3550
3551 $widget->update_timer; 3693 $w->update_timer;
3552 },
3553 ); 3694 };
3554 3695
3555 $self->update_face; 3696 $self->update_face;
3556 $self->update_timer; 3697 $self->update_timer;
3557 } 3698 }
3558 3699
… …
3563 my ($self) = @_; 3704 my ($self) = @_;
3564 3705
3565 return unless $self->{timer}; 3706 return unless $self->{timer};
3566 3707
3567 if ($self->{visible}) { 3708 if ($self->{visible}) {
3568 $self->{timer}->at (
3569 $self->{anim_start}
3570 + $self->{animspeed}
3571 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3572 );
3573 $self->{timer}->start; 3709 $self->{timer}->start;
3574 } else { 3710 } else {
3575 $self->{timer}->stop; 3711 $self->{timer}->stop;
3576 } 3712 }
3577} 3713}
3578 3714
3579sub update_face { 3715sub update_face {
3580 my ($self) = @_; 3716 my ($self) = @_;
3581 3717
3582 return unless $::CONN; 3718 if ($::CONN) {
3583
3584 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3719 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3585 if ($anim && @$anim) { 3720 if ($anim && @$anim) {
3586 delete $self->{wait_face};
3587 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3721 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3722 delete $self->{face_change_cb};
3723
3588 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3724 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3725 unless ($tex->{name} || $tex->{loading}) {
3726 $tex->upload (sub { $self->reconfigure });
3727 }
3728 }
3729 }
3589 } 3730 }
3590 } 3731 }
3591} 3732}
3592 3733
3593sub size_request { 3734sub size_request {
3594 my ($self) = @_; 3735 my ($self) = @_;
3595 3736
3596 if ($::CONN) { 3737 if ($::CONN) {
3597 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3738 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3598 if (my $tex = $::CONN->{texture}[$faceid]) { 3739 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3599 $self->{tex} = $tex; 3740 if ($tex->{name}) {
3600 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3741 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3601 } else { 3742 } elsif (!$tex->{loading}) {
3602 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3743 $tex->upload (sub { $self->reconfigure });
3603 $self->realloc;
3604 }); 3744 }
3605 } 3745 }
3746
3747 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3606 } 3748 }
3607 } 3749 }
3608 3750
3609 ($self->{size_w} || 8, $self->{size_h} || 8) 3751 ($self->{size_w} || 8, $self->{size_h} || 8)
3610} 3752}
… …
3825 3967
3826############################################################################# 3968#############################################################################
3827 3969
3828package CFPlus::UI::Notebook; 3970package CFPlus::UI::Notebook;
3829 3971
3972use CFPlus::OpenGL;
3973
3830our @ISA = CFPlus::UI::VBox::; 3974our @ISA = CFPlus::UI::VBox::;
3831 3975
3832sub new { 3976sub new {
3833 my $class = shift; 3977 my $class = shift;
3834 3978
3835 my $self = $class->SUPER::new ( 3979 my $self = $class->SUPER::new (
3836 buttonbar => (new CFPlus::UI::Buttonbar), 3980 buttonbar => (new CFPlus::UI::Buttonbar),
3837 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3981 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3982 active_outline => [.7, .7, 0.2],
3838 # filter => # will be put between multiplexer and $self 3983 # filter => # will be put between multiplexer and $self
3839 @_, 3984 @_,
3840 ); 3985 );
3841 3986
3842 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3987 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3916 4061
3917 $self->{multiplexer}->set_current_page ($page); 4062 $self->{multiplexer}->set_current_page ($page);
3918 $self->emit (page_changed => $self->{multiplexer}{current}); 4063 $self->emit (page_changed => $self->{multiplexer}{current});
3919} 4064}
3920 4065
4066sub _draw {
4067 my ($self) = @_;
4068
4069 $self->SUPER::_draw ();
4070
4071 if (my $cur = $self->{multiplexer}{current}) {
4072 if ($cur = $cur->{c_tab_}) {
4073 glTranslate $self->{buttonbar}{x} + $cur->{x},
4074 $self->{buttonbar}{y} + $cur->{y};
4075 glLineWidth 3;
4076 #glEnable GL_BLEND;
4077 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4078 glColor @{$self->{active_outline}};
4079 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4080 glLineWidth 1;
4081 #glDisable GL_BLEND;
4082 }
4083 }
4084}
4085
3921############################################################################# 4086#############################################################################
3922 4087
3923package CFPlus::UI::Selector; 4088package CFPlus::UI::Selector;
3924 4089
3925use utf8; 4090use utf8;
… …
3955} 4120}
3956 4121
3957sub _set_value { 4122sub _set_value {
3958 my ($self, $value) = @_; 4123 my ($self, $value) = @_;
3959 4124
3960 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4125 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4126 $item ||= $self->{options}[0]
3961 or return; 4127 or return;
3962 4128
3963 $self->{value} = $item->[0]; 4129 $self->{value} = $item->[0];
3964 $self->set_markup ("$item->[1] ⇓"); 4130 $self->set_markup ("$item->[1] ⇓");
3965 $self->set_tooltip ($item->[2]); 4131# $self->set_tooltip ($item->[2]);
3966} 4132}
3967 4133
3968sub set_value { 4134sub set_value {
3969 my ($self, $value) = @_; 4135 my ($self, $value) = @_;
3970 4136
3971 return unless $self->{value} ne $value; 4137 return unless $self->{value} ne $value;
3972 4138
3973 $self->_set_value ($value); 4139 $self->_set_value ($value);
3974 $self->emit (changed => $value); 4140 $self->emit (changed => $value);
4141}
4142
4143sub set_options {
4144 my ($self, $options) = @_;
4145
4146 $self->{options} = $options;
4147 $self->_set_value ($self->{value});
3975} 4148}
3976 4149
3977############################################################################# 4150#############################################################################
3978 4151
3979package CFPlus::UI::Statusbox; 4152package CFPlus::UI::Statusbox;
… …
3988 @_, 4161 @_,
3989 ); 4162 );
3990 4163
3991 CFPlus::weaken (my $this = $self); 4164 CFPlus::weaken (my $this = $self);
3992 4165
3993 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4166 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3994 4167
3995 $self 4168 $self
3996} 4169}
3997 4170
3998sub reorder { 4171sub reorder {
… …
4006 4179
4007 while (my ($k, $v) = each %{ $self->{item} }) { 4180 while (my ($k, $v) = each %{ $self->{item} }) {
4008 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4181 delete $self->{item}{$k} if $v->{timeout} < $NOW;
4009 } 4182 }
4010 4183
4184 $self->{timer}->set (1, 1);
4185
4011 my @widgets; 4186 my @widgets;
4012 4187
4013 my @items = sort { 4188 my @items = sort {
4014 $a->{pri} <=> $b->{pri} 4189 $a->{pri} <=> $b->{pri}
4015 or $b->{id} <=> $a->{id} 4190 or $b->{id} <=> $a->{id}
4016 } values %{ $self->{item} }; 4191 } values %{ $self->{item} };
4017
4018 $self->{timer}->interval (1);
4019 4192
4020 my $count = 10 + 1; 4193 my $count = 10 + 1;
4021 for my $item (@items) { 4194 for my $item (@items) {
4022 last unless --$count; 4195 last unless --$count;
4023 4196
… …
4047 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4220 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4048 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4221 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4049 $label->update; 4222 $label->update;
4050 $label->set_max_size (undef, $label->{req_h} * $diff) 4223 $label->set_max_size (undef, $label->{req_h} * $diff)
4051 if $diff < 1; 4224 if $diff < 1;
4052 $self->{timer}->interval (1/30); 4225 $self->{timer}->set (1/30, 1/30);
4053 } else { 4226 } else {
4054 $label->{fg}[3] = $item->{fg}[3] || 1; 4227 $label->{fg}[3] = $item->{fg}[3] || 1;
4055 } 4228 }
4056 4229
4057 push @widgets, $label; 4230 push @widgets, $label;
… …
4193} 4366}
4194 4367
4195sub update { 4368sub update {
4196 my ($self) = @_; 4369 my ($self) = @_;
4197 4370
4198 $::WANT_REFRESH++; 4371 $::WANT_REFRESH = 1;
4199} 4372}
4200 4373
4201sub add { 4374sub add {
4202 my ($self, @children) = @_; 4375 my ($self, @children) = @_;
4203 4376

Diff Legend

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