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.410 by root, Sun Jul 22 16:37:19 2007 UTC vs.
Revision 1.447 by root, Sat Dec 22 06:50:45 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, 1/60, 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 { __widget_ref__ => $_[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}
… …
362 359
363 $self->{force_w} = $w; 360 $self->{force_w} = $w;
364 $self->{force_h} = $h; 361 $self->{force_h} = $h;
365 362
366 $self->realloc; 363 $self->realloc;
364}
365
366# traverse the widget chain up to find the maximum "physical" size constraints
367sub get_max_wh {
368 my ($self) = @_;
369
370 return $self->{parent}->get_max_wh
371 if $self->{parent};
372
373 ($::WIDTH, $::HEIGHT)
367} 374}
368 375
369sub size_request { 376sub size_request {
370 require Carp; 377 require Carp;
371 Carp::confess "size_request is abstract"; 378 Carp::confess "size_request is abstract";
… …
433 440
434 $self->{tooltip} = $tooltip; 441 $self->{tooltip} = $tooltip;
435 442
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 443 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 444 delete $CFPlus::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 445 $CFPlus::UI::TOOLTIP_WATCHER->invoke;
439 } 446 }
440} 447}
441 448
442# translate global coordinates to local coordinate system 449# translate global coordinates to local coordinate system
443sub coord2local { 450sub coord2local {
444 my ($self, $x, $y) = @_; 451 my ($self, $x, $y) = @_;
445 452
446 Carp::confess unless $self->{parent};#d# 453 return (undef, undef) unless $self->{parent};
447 454
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 455 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 456}
450 457
451# translate local coordinates to global coordinate system 458# translate local coordinates to global coordinate system
452sub coord2global { 459sub coord2global {
453 my ($self, $x, $y) = @_; 460 my ($self, $x, $y) = @_;
454 461
455 Carp::confess unless $self->{parent};#d# 462 return (undef, undef) unless $self->{parent};
456 463
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 464 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 465}
459 466
460sub invoke_focus_in { 467sub invoke_focus_in {
… …
607sub DESTROY { 614sub DESTROY {
608 my ($self) = @_; 615 my ($self) = @_;
609 616
610 return if CFPlus::in_destruct; 617 return if CFPlus::in_destruct;
611 618
619 local $@;
612 eval { $self->destroy }; 620 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 621 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 622
615 delete $WIDGET{$self+0}; 623 delete $WIDGET{$self+0};
616} 624}
… …
624use strict; 632use strict;
625use CFPlus::OpenGL; 633use CFPlus::OpenGL;
626 634
627sub new { 635sub new {
628 my $class = shift; 636 my $class = shift;
629
630 # range [value, low, high, page]
631 637
632 $class->SUPER::new ( 638 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 639 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 640 #active_bg => [1, 1, 1, 0.5],
635 @_ 641 @_
… …
647 my ($w, $h) = @$self{qw(w h)}; 653 my ($w, $h) = @$self{qw(w h)};
648 654
649 glEnable GL_BLEND; 655 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 656 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 657 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 658 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 659 glDisable GL_BLEND;
661 } 660 }
662} 661}
663 662
664############################################################################# 663#############################################################################
… …
725 @{$self->{children}}, @widgets 724 @{$self->{children}}, @widgets
726 ]; 725 ];
727 726
728 $self->realloc; 727 $self->realloc;
729 728
729 $self->emit (c_add => \@widgets);
730
730 map $_+0, @widgets 731 map $_+0, @widgets
731} 732}
732 733
733sub children { 734sub children {
734 @{ $_[0]{children} } 735 @{ $_[0]{children} }
735} 736}
736 737
737sub remove { 738sub remove {
738 my ($self, $child) = @_; 739 my ($self, @widgets) = @_;
739 740
741 $self->emit (c_remove => \@widgets);
742
743 for my $child (@widgets) {
740 delete $child->{parent}; 744 delete $child->{parent};
741 $child->hide; 745 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 746 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
747 }
744 748
745 $self->realloc; 749 $self->realloc;
746} 750}
747 751
748sub clear { 752sub clear {
… …
776} 780}
777 781
778sub _draw { 782sub _draw {
779 my ($self) = @_; 783 my ($self) = @_;
780 784
781 $_->draw for @{$self->{children}}; 785 $_->draw for $self->visible_children;
782} 786}
783 787
784############################################################################# 788#############################################################################
785 789
786package CFPlus::UI::Bin; 790package CFPlus::UI::Bin;
… …
796} 800}
797 801
798sub add { 802sub add {
799 my ($self, $child) = @_; 803 my ($self, $child) = @_;
800 804
801 $self->SUPER::remove ($_) for @{ $self->{children} }; 805 $self->clear;
802 $self->SUPER::add ($child); 806 $self->SUPER::add ($child);
803} 807}
804 808
805sub remove { 809sub remove {
806 my ($self, $widget) = @_; 810 my ($self, $widget) = @_;
… …
824 828
825 1 829 1
826} 830}
827 831
828############################################################################# 832#############################################################################
829
830# back-buffered drawing area 833# back-buffered drawing area
831 834
832package CFPlus::UI::Window; 835package CFPlus::UI::Window;
833 836
834our @ISA = CFPlus::UI::Bin::; 837our @ISA = CFPlus::UI::Bin::;
… …
948 $self->{view_x} = $x; 951 $self->{view_x} = $x;
949 $self->{view_y} = $y; 952 $self->{view_y} = $y;
950 953
951 $self->emit (changed => $x, $y); 954 $self->emit (changed => $x, $y);
952 $self->update; 955 $self->update;
956 }
957}
958
959sub set_center {
960 my ($self, $x, $y) = @_;
961
962 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
963}
964
965sub make_visible {
966 my ($self, $x, $y, $border) = @_;
967
968 if ( $x < $self->{view_x} + $self->{w} * $border
969 || $x > $self->{view_x} + $self->{w} * (1 - $border)
970 || $y < $self->{view_y} + $self->{h} * $border
971 || $y > $self->{view_y} + $self->{h} * (1 - $border)
972 ) {
973 $self->set_center ($x, $y);
953 } 974 }
954} 975}
955 976
956# hmm, this does not work for topleft of $self... but we should not ask for that 977# hmm, this does not work for topleft of $self... but we should not ask for that
957sub coord2local { 978sub coord2local {
… …
1004 my $child = delete $arg{child}; 1025 my $child = delete $arg{child};
1005 1026
1006 my $self; 1027 my $self;
1007 1028
1008 my $hslider = new CFPlus::UI::Slider 1029 my $hslider = new CFPlus::UI::Slider
1009 col => 0, 1030 c_col => 0,
1010 row => 1, 1031 c_row => 1,
1011 vertical => 0, 1032 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix 1033 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub { 1034 on_changed => sub {
1014 $self->{hpos} = $_[1]; 1035 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1036 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 }, 1037 },
1017 ; 1038 ;
1018 1039
1019 my $vslider = new CFPlus::UI::Slider 1040 my $vslider = new CFPlus::UI::Slider
1020 col => 1, 1041 c_col => 1,
1021 row => 0, 1042 c_row => 0,
1022 vertical => 1, 1043 vertical => 1,
1023 range => [0, 0, 1, 0.01], # HACK fix 1044 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub { 1045 on_changed => sub {
1025 $self->{vpos} = $_[1]; 1046 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1037 row_expand => [1, 0], 1058 row_expand => [1, 0],
1038 %arg, 1059 %arg,
1039 ); 1060 );
1040 1061
1041 $self->{vp} = new CFPlus::UI::ViewPort 1062 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0, 1063 c_col => 0,
1043 row => 0, 1064 c_row => 0,
1044 expand => 1, 1065 expand => 1,
1045 scroll_x => $self->{scroll_x}, 1066 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y}, 1067 scroll_y => $self->{scroll_y},
1047 on_changed => sub { 1068 on_changed => sub {
1048 my ($vp, $x, $y) = @_; 1069 my ($vp, $x, $y) = @_;
… …
1070 my ($self, $widget) = @_; 1091 my ($self, $widget) = @_;
1071 1092
1072 $self->{vp}->add ($self->{child} = $widget); 1093 $self->{vp}->add ($self->{child} = $widget);
1073} 1094}
1074 1095
1096sub set_offset { shift->{vp}->set_offset (@_) }
1097sub set_center { shift->{vp}->set_center (@_) }
1098sub make_visible { shift->{vp}->make_visible (@_) }
1099
1075sub update_slider { 1100sub update_slider {
1076 my ($self) = @_; 1101 my ($self) = @_;
1077 1102
1078 my $child = ($self->{vp} or return)->child; 1103 my $child = ($self->{vp} or return)->child;
1079 1104
… …
1192 my ($w, $h) = @$self{qw(w h)}; 1217 my ($w, $h) = @$self{qw(w h)};
1193 1218
1194 glEnable GL_BLEND; 1219 glEnable GL_BLEND;
1195 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196 glColor_premultiply @{ $self->{bg} }; 1221 glColor_premultiply @{ $self->{bg} };
1197
1198 glBegin GL_QUADS;
1199 glVertex 0 , 0;
1200 glVertex 0 , $h;
1201 glVertex $w, $h; 1222 glRect 0, 0, $w, $h;
1202 glVertex $w, 0;
1203 glEnd;
1204
1205 glDisable GL_BLEND; 1223 glDisable GL_BLEND;
1206 } 1224 }
1207 1225
1208 $self->SUPER::_draw; 1226 $self->SUPER::_draw;
1209} 1227}
… …
1370 1388
1371sub border { 1389sub border {
1372 int $_[0]{border} * $::FONTSIZE 1390 int $_[0]{border} * $::FONTSIZE
1373} 1391}
1374 1392
1393sub get_max_wh {
1394 my ($self) = @_;
1395
1396 return ($self->{w}, $self->{h})
1397 if $self->{visible} && $self->{w};
1398
1399 $self->SUPER::get_max_wh
1400}
1401
1375sub size_request { 1402sub size_request {
1376 my ($self) = @_; 1403 my ($self) = @_;
1377 1404
1378 $self->{title_widget}->size_request 1405 $self->{title_widget}->size_request
1379 if $self->{title_widget}; 1406 if $self->{title_widget};
… …
1571 1598
1572sub add { 1599sub add {
1573 my ($self, @widgets) = @_; 1600 my ($self, @widgets) = @_;
1574 1601
1575 for my $child (@widgets) { 1602 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1; 1603 $child->{c_rowspan} ||= 1;
1577 $child->{colspan} ||= 1; 1604 $child->{c_colspan} ||= 1;
1578 } 1605 }
1579 1606
1580 $self->SUPER::add (@widgets); 1607 $self->SUPER::add (@widgets);
1581} 1608}
1582 1609
… …
1586 my @widgets; 1613 my @widgets;
1587 1614
1588 while (@_) { 1615 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1590 1617
1591 $child->{row} = $row; 1618 $child->{c_row} = $row;
1592 $child->{col} = $col; 1619 $child->{c_col} = $col;
1593 1620
1594 push @widgets, $child; 1621 push @widgets, $child;
1595 } 1622 }
1596 1623
1597 $self->add (@widgets); 1624 $self->add (@widgets);
… …
1603 my (@w, @h); 1630 my (@w, @h);
1604 1631
1605 my @children = $self->children; 1632 my @children = $self->children;
1606 1633
1607 # first pass, columns 1634 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610 1637
1611 my $sw = sum @w[$c .. $c + $cs - 1]; 1638 my $sw = sum @w[$c .. $c + $cs - 1];
1612 1639
1613 if ($w > $sw) { 1640 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 } 1642 }
1616 } 1643 }
1617 1644
1618 # second pass, rows 1645 # second pass, rows
1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621 1648
1622 my $sh = sum @h[$r .. $r + $rs - 1]; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1623 1650
1624 if ($h > $sh) { 1651 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1667 1694
1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670 1697
1671 for my $widget ($self->children) { 1698 for my $widget ($self->children) {
1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673 1700
1674 $widget->configure ( 1701 $widget->configure (
1675 $x[$c], $y[$r], 1702 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677 ); 1704 );
… …
1686 1713
1687use List::Util qw(min max); 1714use List::Util qw(min max);
1688 1715
1689our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1690 1717
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697
1698sub _scale($$$) { 1718sub _scale($$$) {
1699 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1700 1720
1701 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704} 1722}
1705 1723
1706sub size_request { 1724sub size_request {
1707 my ($self) = @_; 1725 my ($self) = @_;
1708 1726
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710 1728
1711 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1714 1734
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1721 } 1737 }
1722 } 1738 }
1723 1739
1724 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1726 1742
1727 # now layout remaining widgets 1743 # now layout remaining widgets
1728 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1730 1748
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1739 } 1751 }
1740 } 1752 }
1741 1753
1742 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
… …
1747 1759
1748sub invoke_size_allocate { 1760sub invoke_size_allocate {
1749 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1750 1762
1751 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1753 1766
1754 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1755 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1758 1769
1759 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1760 } 1771 }
1761 1772
1762 1 1773 1
1763} 1774}
1764 1775
… …
1768 1779
1769our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1770 1781
1771sub size_request { 1782sub size_request {
1772 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1773 1786
1774 $self->{vertical} 1787 $self->{vertical}
1775 ? ( 1788 ? (
1776 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1777 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1778 ) 1791 )
1779 : ( 1792 : (
1780 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1781 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1782 ) 1795 )
1783} 1796}
1784 1797
1785sub invoke_size_allocate { 1798sub invoke_size_allocate {
1786 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1910 1923
1911 delete $self->{ox}; 1924 delete $self->{ox};
1912 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1913} 1926}
1914 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1915sub set_text { 1934sub set_text {
1916 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1917 1936
1918 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1919 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
1942 1961
1943sub size_request { 1962sub size_request {
1944 my ($self) = @_; 1963 my ($self) = @_;
1945 1964
1946 $self->{size_req} ||= do { 1965 $self->{size_req} ||= do {
1966 my ($max_w, $max_h) = $self->get_max_wh;
1967
1947 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1968 $self->{layout}->set_font ($self->{font}) if $self->{font};
1948 $self->{layout}->set_width ($self->{max_w} || -1); 1969 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1949 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1970 $self->{layout}->set_ellipsise ($self->{ellipsise});
1950 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1971 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1951 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1972 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1952 1973
1953 my ($w, $h) = $self->{layout}->size; 1974 my ($w, $h) = $self->{layout}->size;
… …
2025 : ($self->{w} - $size->[0]) * 0.5); 2046 : ($self->{w} - $size->[0]) * 0.5);
2026 2047
2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2048 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2049 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2029 : ($self->{h} - $size->[1]) * 0.5); 2050 : ($self->{h} - $size->[1]) * 0.5);
2051
2052 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2030 }; 2053 };
2031 2054
2032# unless ($self->{list}) { 2055# unless ($self->{list}) {
2033# $self->{list} = CFPlus::OpenGL::glGenList; 2056# $self->{list} = CFPlus::OpenGL::glGenList;
2034# CFPlus::OpenGL::glNewList $self->{list}; 2057# CFPlus::OpenGL::glNewList $self->{list};
… …
2036# CFPlus::OpenGL::glEndList; 2059# CFPlus::OpenGL::glEndList;
2037# } 2060# }
2038# 2061#
2039# CFPlus::OpenGL::glCallList $self->{list}; 2062# CFPlus::OpenGL::glCallList $self->{list};
2040 2063
2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2064 $self->{layout}->draw;
2042} 2065}
2043 2066
2044#sub destroy { 2067#sub destroy {
2045# my ($self) = @_; 2068# my ($self) = @_;
2046# 2069#
… …
2061 my $class = shift; 2084 my $class = shift;
2062 2085
2063 $class->SUPER::new ( 2086 $class->SUPER::new (
2064 fg => [1, 1, 1], 2087 fg => [1, 1, 1],
2065 bg => [0, 0, 0, 0.2], 2088 bg => [0, 0, 0, 0.2],
2089 outline => [0.6, 0.3, 0.1],
2066 active_bg => [1, 1, 1, 0.5], 2090 active_bg => [0, 0, 1, .2],
2067 active_fg => [0, 0, 0], 2091 active_fg => [1, 1, 1],
2092 active_outline => [1, 1, 0],
2068 can_hover => 1, 2093 can_hover => 1,
2069 can_focus => 1, 2094 can_focus => 1,
2070 valign => 0, 2095 valign => 0,
2071 can_events => 1, 2096 can_events => 1,
2072 ellipsise => 0, 2097 ellipsise => 0,
… …
2212 glColor_premultiply @{$self->{bg}}; 2237 glColor_premultiply @{$self->{bg}};
2213 } 2238 }
2214 2239
2215 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2217 glBegin GL_QUADS;
2218 glVertex 0 , 0;
2219 glVertex 0 , $self->{h};
2220 glVertex $self->{w}, $self->{h}; 2242 glRect 0, 0, $self->{w}, $self->{h};
2221 glVertex $self->{w}, 0;
2222 glEnd;
2223 glDisable GL_BLEND; 2243 glDisable GL_BLEND;
2224 2244
2225 $self->SUPER::_draw; 2245 $self->SUPER::_draw;
2226 2246
2227 #TODO: force update every cursor change :( 2247 #TODO: force update every cursor change :(
… …
2229 2249
2230 unless (exists $self->{cur_h}) { 2250 unless (exists $self->{cur_h}) {
2231 my $text = substr $self->{text}, 0, $self->{cursor}; 2251 my $text = substr $self->{text}, 0, $self->{cursor};
2232 utf8::encode $text; 2252 utf8::encode $text;
2233 2253
2234 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2254 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2235 } 2255 }
2236 2256
2257 glColor_premultiply @{$self->{active_fg}};
2237 glBegin GL_LINES; 2258 glBegin GL_LINES;
2238 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2260 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2261 glEnd;
2262
2263 glLineWidth 3;
2264 glColor @{$self->{active_outline}};
2265 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2266 glLineWidth 1;
2267
2268 } else {
2269 glColor @{$self->{outline}};
2270 glBegin GL_LINE_STRIP;
2271 glVertex .5, $self->{h} * .5;
2272 glVertex .5, $self->{h} - 2.5;
2273 glVertex $self->{w} - .5, $self->{h} - 2.5;
2274 glVertex $self->{w} - .5, $self->{h} * .5;
2240 glEnd; 2275 glEnd;
2241 } 2276 }
2242} 2277}
2243 2278
2244############################################################################# 2279#############################################################################
… …
2331 1 2366 1
2332} 2367}
2333 2368
2334############################################################################# 2369#############################################################################
2335 2370
2371package CFPlus::UI::ButtonBin;
2372
2373our @ISA = CFPlus::UI::Bin::;
2374
2375use CFPlus::OpenGL;
2376
2377my @tex =
2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2379 qw(b1_button_inactive.png b1_button_active.png);
2380
2381sub new {
2382 my $class = shift;
2383
2384 $class->SUPER::new (
2385 can_hover => 1,
2386 align => 0,
2387 valign => 0,
2388 can_events => 1,
2389 @_
2390 )
2391}
2392
2393sub invoke_button_up {
2394 my ($self, $ev, $x, $y) = @_;
2395
2396 $self->emit ("activate")
2397 if $x >= 0 && $x < $self->{w}
2398 && $y >= 0 && $y < $self->{h};
2399
2400 1
2401}
2402
2403sub _draw {
2404 my ($self) = @_;
2405
2406 glEnable GL_TEXTURE_2D;
2407 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2408 glColor 0, 0, 0, 1;
2409
2410 my $tex = $tex[$GRAB == $self];
2411 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2412
2413 glDisable GL_TEXTURE_2D;
2414
2415 $self->SUPER::_draw;
2416}
2417
2418#############################################################################
2419
2336package CFPlus::UI::Button; 2420package CFPlus::UI::Button;
2337 2421
2338our @ISA = CFPlus::UI::Label::; 2422our @ISA = CFPlus::UI::Label::;
2339 2423
2340use CFPlus::OpenGL; 2424use CFPlus::OpenGL;
… …
2444sub _draw { 2528sub _draw {
2445 my ($self) = @_; 2529 my ($self) = @_;
2446 2530
2447 $self->SUPER::_draw; 2531 $self->SUPER::_draw;
2448 2532
2449 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2533 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2450 2534
2451 my ($w, $h) = @$self{qw(w h)}; 2535 my ($w, $h) = @$self{qw(w h)};
2452 2536
2453 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2537 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2454 2538
… …
2474sub new { 2558sub new {
2475 my $class = shift; 2559 my $class = shift;
2476 2560
2477 my $self = $class->SUPER::new ( 2561 my $self = $class->SUPER::new (
2478 can_events => 0, 2562 can_events => 0,
2563 scale => 1,
2479 @_, 2564 @_,
2480 ); 2565 );
2481 2566
2482 $self->{path} || $self->{tex} 2567 $self->{path} || $self->{tex}
2483 or Carp::croak "'path' or 'tex' attributes required"; 2568 or Carp::croak "'path' or 'tex' attributes required";
… …
2508} 2593}
2509 2594
2510sub size_request { 2595sub size_request {
2511 my ($self) = @_; 2596 my ($self) = @_;
2512 2597
2513 ($self->{tex}{w}, $self->{tex}{h}) 2598 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2514} 2599}
2515 2600
2516sub _draw { 2601sub _draw {
2517 my ($self) = @_; 2602 my ($self) = @_;
2518 2603
… …
2528 } 2613 }
2529 2614
2530 glEnable GL_TEXTURE_2D; 2615 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 2617
2533 $tex->draw_quad (0, 0, $w, $h); 2618 $tex->draw_quad_alpha (0, 0, $w, $h);
2534 2619
2535 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2536} 2621}
2537 2622
2538############################################################################# 2623#############################################################################
… …
2557 align => 0, 2642 align => 0,
2558 valign => 0, 2643 valign => 0,
2559 can_events => 1, 2644 can_events => 1,
2560 @_ 2645 @_
2561 ); 2646 );
2647}
2648
2649sub invoke_button_down {
2650 my ($self, $ev, $x, $y) = @_;
2651
2652 1
2562} 2653}
2563 2654
2564sub invoke_button_up { 2655sub invoke_button_up {
2565 my ($self, $ev, $x, $y) = @_; 2656 my ($self, $ev, $x, $y) = @_;
2566 2657
… …
2706 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2707} 2798}
2708 2799
2709############################################################################# 2800#############################################################################
2710 2801
2802package CFPlus::UI::Progress;
2803
2804our @ISA = CFPlus::UI::Label::;
2805
2806use CFPlus::OpenGL;
2807
2808sub new {
2809 my ($class, %arg) = @_;
2810
2811 my $self = $class->SUPER::new (
2812 fg => [1, 1, 1],
2813 bg => [0, 0, 1, 0.2],
2814 bar => [0.7, 0.5, 0.1, 0.8],
2815 outline => [0.4, 0.3, 0],
2816 fontsize => 0.9,
2817 valign => 0,
2818 align => 0,
2819 can_events => 1,
2820 ellipsise => 1,
2821 label => "%d%%",
2822 %arg,
2823 );
2824
2825 $self->set_value ($arg{value} || -1);
2826
2827 $self
2828}
2829
2830sub set_label {
2831 my ($self, $label) = @_;
2832
2833 return if $self->{label} eq $label;
2834 $self->{label} = $label;
2835
2836 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2837}
2838
2839sub set_value {
2840 my ($self, $value) = @_;
2841
2842 if ($self->{value} ne $value) {
2843 $self->{value} = $value;
2844
2845 if ($value < 0) {
2846 $self->set_text ("-");
2847 } else {
2848 $self->set_text (sprintf $self->{label}, $value * 100);
2849 }
2850
2851 $self->update;
2852 }
2853}
2854
2855sub _draw {
2856 my ($self) = @_;
2857
2858 glEnable GL_BLEND;
2859 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2860
2861 if ($self->{value} >= 0) {
2862 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2863
2864 glColor_premultiply @{$self->{bar}};
2865 glRect 2, 2, $s, $self->{h} - 2;
2866 glColor_premultiply @{$self->{bg}};
2867 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2868 }
2869
2870 glColor_premultiply @{$self->{outline}};
2871 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2872
2873 glDisable GL_BLEND;
2874
2875 {
2876 local $self->{bg}; # do not draw background
2877 $self->SUPER::_draw;
2878 }
2879}
2880
2881#############################################################################
2882
2883package CFPlus::UI::ExperienceProgress;
2884
2885our @ISA = CFPlus::UI::Progress::;
2886
2887sub new {
2888 my ($class, %arg) = @_;
2889
2890 my $self = $class->SUPER::new (
2891 tooltip => sub {
2892 my ($self) = @_;
2893
2894 sprintf "level %d\n%s points\n%s next level\n%s to go",
2895 $self->{lvl},
2896 ::formsep ($self->{exp}),
2897 ::formsep ($self->{nxt}),
2898 ::formsep ($self->{nxt} - $self->{exp}),
2899 },
2900 %arg
2901 );
2902
2903 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2904 if $::CONN;
2905
2906 $self
2907}
2908
2909sub DESTROY {
2910 my ($self) = @_;
2911
2912 delete $::CONN->{on_exp_update}{$self+0}
2913 if $::CONN;
2914
2915 $self->SUPER::DESTROY;
2916}
2917
2918sub set_value {
2919 my ($self, $lvl, $exp) = @_;
2920
2921 $self->{lvl} = $lvl;
2922 $self->{exp} = $exp;
2923
2924 my $v = -1;
2925
2926 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2927 my $l0 = $table->[$lvl - 1];
2928 my $l1 = $table->[$lvl];
2929
2930 $self->{nxt} = $l1;
2931
2932 $v = ($exp - $l0) / ($l1 - $l0);
2933 }
2934
2935 $self->SUPER::set_value ($v);
2936}
2937
2938#############################################################################
2939
2711package CFPlus::UI::Gauge; 2940package CFPlus::UI::Gauge;
2712 2941
2713our @ISA = CFPlus::UI::VBox::; 2942our @ISA = CFPlus::UI::VBox::;
2714 2943
2715sub new { 2944sub new {
… …
3013} 3242}
3014 3243
3015sub size_request { 3244sub size_request {
3016 my ($self) = @_; 3245 my ($self) = @_;
3017 3246
3018 my ($empty, $slider) = @{ $self->{children} }; 3247 my ($empty, $slider) = $self->visible_children;
3019 3248
3020 local $self->{children} = [$empty, $slider]; 3249 local $self->{children} = [$empty, $slider];
3021 $self->SUPER::size_request 3250 $self->SUPER::size_request
3022} 3251}
3023 3252
… …
3212 3441
3213 if ($y0 < $y + $h && $y < $y1) { 3442 if ($y0 < $y + $h && $y < $y1) {
3214 my $layout = $self->get_layout ($para); 3443 my $layout = $self->get_layout ($para);
3215 3444
3216 $layout->render ($para->{indent}, $y - $y0); 3445 $layout->render ($para->{indent}, $y - $y0);
3446 $layout->draw;
3217 3447
3218 if (my @w = @{ $para->{widget} }) { 3448 if (my @w = @{ $para->{widget} }) {
3219 my @s = $layout->get_shapes; 3449 my @s = $layout->get_shapes;
3220 3450
3221 for (@w) { 3451 for (@w) {
… …
3343} 3573}
3344 3574
3345sub set_tooltip_from { 3575sub set_tooltip_from {
3346 my ($self, $widget) = @_; 3576 my ($self, $widget) = @_;
3347 3577
3348 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3349 if $widget->{tooltip} =~ /^#(.*)$/;
3350
3351 my $tooltip = $widget->{tooltip}; 3578 my $tip = $widget->{tooltip};
3579 $tip = $tip->($widget) if "CODE" eq ref $tip;
3580
3581 $tip = CFPlus::Pod::section_label tooltip => $1
3582 if $tip =~ /^#(.*)$/;
3352 3583
3353 if ($ENV{CFPLUS_DEBUG} & 2) { 3584 if ($ENV{CFPLUS_DEBUG} & 2) {
3354 $tooltip .= "\n\n" . (ref $widget) . "\n" 3585 $tip .= "\n\n" . (ref $widget) . "\n"
3355 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3586 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3356 . "req $widget->{req_w} $widget->{req_h}\n" 3587 . "req $widget->{req_w} $widget->{req_h}\n"
3357 . "visible $widget->{visible}"; 3588 . "visible $widget->{visible}";
3358 } 3589 }
3359 3590
3360 $tooltip =~ s/^\n+//; 3591 $tip =~ s/^\n+//;
3361 $tooltip =~ s/\n+$//; 3592 $tip =~ s/\n+$//;
3362 3593
3363 $self->add (new CFPlus::UI::Label 3594 $self->add (new CFPlus::UI::Label
3364 markup => $tooltip, 3595 markup => $tip,
3365 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3596 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3366 fontsize => 0.8, 3597 fontsize => 0.8,
3367 style => 1, # FLAG_INVERSE 3598 style => 1, # FLAG_INVERSE
3368 ellipsise => 0, 3599 ellipsise => 0,
3369 font => ($widget->{tooltip_font} || $::FONT_PROP), 3600 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3407} 3638}
3408 3639
3409sub _draw { 3640sub _draw {
3410 my ($self) = @_; 3641 my ($self) = @_;
3411 3642
3412 glTranslate 0.375, 0.375;
3413
3414 my ($w, $h) = @$self{qw(w h)}; 3643 my ($w, $h) = @$self{qw(w h)};
3415 3644
3416 glColor 1, 0.8, 0.4; 3645 glColor 1, 0.8, 0.4;
3417 glBegin GL_QUADS; 3646 glRect 0, 0, $w, $h;
3418 glVertex 0 , 0;
3419 glVertex 0 , $h;
3420 glVertex $w, $h;
3421 glVertex $w, 0;
3422 glEnd;
3423 3647
3424 glColor 0, 0, 0; 3648 glColor 0, 0, 0;
3425 glBegin GL_LINE_LOOP; 3649 glRect_lineloop .5, .5, $w + .5, $h + .5;
3426 glVertex 0 , 0;
3427 glVertex 0 , $h;
3428 glVertex $w, $h;
3429 glVertex $w, 0;
3430 glEnd;
3431 3650
3432 glTranslate 2 - 0.375, 2 - 0.375; 3651 glTranslate 2, 2;
3433 3652
3434 $self->SUPER::_draw; 3653 $self->SUPER::_draw;
3435} 3654}
3436 3655
3437############################################################################# 3656#############################################################################
… …
3455 3674
3456 if ($self->{anim} && $self->{animspeed}) { 3675 if ($self->{anim} && $self->{animspeed}) {
3457 CFPlus::weaken (my $widget = $self); 3676 CFPlus::weaken (my $widget = $self);
3458 3677
3459 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3678 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3460 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3679 $widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
3461 $self->{timer} = Event->timer ( 3680 $self->{timer} = EV::timer_ns 0, 0, sub {
3462 parked => 1,
3463 cb => sub {
3464 return unless $::CONN && $widget; 3681 return unless $::CONN;
3465 3682
3683 my $w = $widget
3684 or return;
3685
3466 ++$widget->{frame}; 3686 ++$w->{frame};
3467 $widget->update_face; 3687 $w->update_face;
3688
3689 # somehow, $widget can go away
3468 $widget->update; 3690 $w->update;
3469
3470 $widget->update_timer; 3691 $w->update_timer;
3471 },
3472 ); 3692 };
3473 3693
3474 $self->update_face; 3694 $self->update_face;
3475 $self->update_timer; 3695 $self->update_timer;
3476 } 3696 }
3477 3697
… …
3481sub update_timer { 3701sub update_timer {
3482 my ($self) = @_; 3702 my ($self) = @_;
3483 3703
3484 return unless $self->{timer}; 3704 return unless $self->{timer};
3485 3705
3706 $self->{timer}->stop;
3486 if ($self->{visible}) { 3707 if ($self->{visible}) {
3487 $self->{timer}->at ( 3708 $self->{timer}->set (
3488 $self->{anim_start} 3709 $self->{anim_start}
3489 + $self->{animspeed} 3710 + $self->{animspeed}
3490 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed} 3711 * int 1.5 + (EV::now - $self->{anim_start}) / $self->{animspeed}
3491 ); 3712 );
3492 $self->{timer}->start; 3713 $self->{timer}->start;
3493 } else {
3494 $self->{timer}->stop;
3495 } 3714 }
3496} 3715}
3497 3716
3498sub update_face { 3717sub update_face {
3499 my ($self) = @_; 3718 my ($self) = @_;
3500 3719
3501 return unless $::CONN; 3720 if ($::CONN) {
3502
3503 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3721 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3504 if ($anim && @$anim) { 3722 if ($anim && @$anim) {
3505 delete $self->{wait_face};
3506 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3723 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3724 delete $self->{face_change_cb};
3725
3507 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3726 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3727 unless ($tex->{name} || $tex->{loading}) {
3728 $tex->upload (sub { $self->reconfigure });
3729 }
3730 }
3731 }
3508 } 3732 }
3509 } 3733 }
3510} 3734}
3511 3735
3512sub size_request { 3736sub size_request {
3513 my ($self) = @_; 3737 my ($self) = @_;
3514 3738
3515 if ($::CONN) { 3739 if ($::CONN) {
3516 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3740 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3517 if (my $tex = $::CONN->{texture}[$faceid]) { 3741 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3518 $self->{tex} = $tex; 3742 if ($tex->{name}) {
3519 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3743 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3520 } else { 3744 } elsif (!$tex->{loading}) {
3521 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3745 $tex->upload (sub { $self->reconfigure });
3522 $self->realloc;
3523 }); 3746 }
3524 } 3747 }
3748
3749 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3525 } 3750 }
3526 } 3751 }
3527 3752
3528 ($self->{size_w} || 8, $self->{size_h} || 8) 3753 ($self->{size_w} || 8, $self->{size_h} || 8)
3529} 3754}
… …
3609 children => [ 3834 children => [
3610 (new CFPlus::UI::Label markup => $left, expand => 1), 3835 (new CFPlus::UI::Label markup => $left, expand => 1),
3611 (new CFPlus::UI::Label markup => $right, align => +1), 3836 (new CFPlus::UI::Label markup => $right, align => +1),
3612 ], 3837 ],
3613 ; 3838 ;
3614 3839
3615 } else { 3840 } else {
3616 $widget = new CFPlus::UI::Label 3841 $widget = new CFPlus::UI::Label
3617 can_hover => 1, 3842 can_hover => 1,
3618 can_events => 1, 3843 can_events => 1,
3619 markup => $widget, 3844 markup => $widget,
… …
3744 3969
3745############################################################################# 3970#############################################################################
3746 3971
3747package CFPlus::UI::Notebook; 3972package CFPlus::UI::Notebook;
3748 3973
3974use CFPlus::OpenGL;
3975
3749our @ISA = CFPlus::UI::VBox::; 3976our @ISA = CFPlus::UI::VBox::;
3750 3977
3751sub new { 3978sub new {
3752 my $class = shift; 3979 my $class = shift;
3753 3980
3754 my $self = $class->SUPER::new ( 3981 my $self = $class->SUPER::new (
3755 buttonbar => (new CFPlus::UI::Buttonbar), 3982 buttonbar => (new CFPlus::UI::Buttonbar),
3756 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3983 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3984 active_outline => [.7, .7, 0.2],
3757 # filter => # will be put between multiplexer and $self 3985 # filter => # will be put between multiplexer and $self
3758 @_, 3986 @_,
3759 ); 3987 );
3760 3988
3761 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3989 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3762 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3990 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3763 3991
3992 {
3993 Scalar::Util::weaken (my $wself = $self);
3994
3995 $self->{multiplexer}->connect (c_add => sub {
3996 my ($mplex, $widgets) = @_;
3997
3998 for my $child (@$widgets) {
3999 Scalar::Util::weaken $child;
4000 $child->{c_tab_} ||= do {
4001 my $tab =
4002 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4003 ? $child->{c_tab}
4004 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4005
4006 $tab->connect (activate => sub {
4007 $wself->set_current_page ($child);
4008 });
4009
4010 $tab
4011 };
4012
4013 $self->{buttonbar}->add ($child->{c_tab_});
4014 }
4015 });
4016
4017 $self->{multiplexer}->connect (c_remove => sub {
4018 my ($mplex, $widgets) = @_;
4019
4020 for my $child (@$widgets) {
4021 $wself->{buttonbar}->remove ($child->{c_tab_});
4022 }
4023 });
4024 }
4025
3764 $self 4026 $self
3765} 4027}
3766 4028
3767sub add { 4029sub add {
4030 my ($self, @widgets) = @_;
4031
4032 $self->{multiplexer}->add (@widgets)
4033}
4034
4035sub remove {
4036 my ($self, @widgets) = @_;
4037
4038 $self->{multiplexer}->remove (@widgets)
4039}
4040
4041sub pages {
4042 my ($self) = @_;
4043 $self->{multiplexer}->children
4044}
4045
4046sub add_tab {
3768 my ($self, $title, $widget, $tooltip) = @_; 4047 my ($self, $title, $widget, $tooltip) = @_;
3769 4048
3770 CFPlus::weaken $self; 4049 $title = [$title, $tooltip] unless ref $title;
4050 $widget->{c_tab} = $title;
3771 4051
3772 unless (ref $title) {
3773 $title = new CFPlus::UI::Button
3774 markup => $title,
3775 tooltip => $tooltip,
3776 ;
3777 }
3778
3779 $title->connect (activate => sub { $self->set_current_page ($widget) });
3780 $self->{buttonbar}->add ($title);
3781
3782 $self->{multiplexer}->add ($widget); 4052 $self->add ($widget);
3783} 4053}
3784 4054
3785sub get_current_page { 4055sub get_current_page {
3786 my ($self) = @_; 4056 my ($self) = @_;
3787 4057
… …
3791sub set_current_page { 4061sub set_current_page {
3792 my ($self, $page) = @_; 4062 my ($self, $page) = @_;
3793 4063
3794 $self->{multiplexer}->set_current_page ($page); 4064 $self->{multiplexer}->set_current_page ($page);
3795 $self->emit (page_changed => $self->{multiplexer}{current}); 4065 $self->emit (page_changed => $self->{multiplexer}{current});
4066}
4067
4068sub _draw {
4069 my ($self) = @_;
4070
4071 $self->SUPER::_draw ();
4072
4073 if (my $cur = $self->{multiplexer}{current}) {
4074 if ($cur = $cur->{c_tab_}) {
4075 glTranslate $self->{buttonbar}{x} + $cur->{x},
4076 $self->{buttonbar}{y} + $cur->{y};
4077 glLineWidth 3;
4078 #glEnable GL_BLEND;
4079 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4080 glColor @{$self->{active_outline}};
4081 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4082 glLineWidth 1;
4083 #glDisable GL_BLEND;
4084 }
4085 }
3796} 4086}
3797 4087
3798############################################################################# 4088#############################################################################
3799 4089
3800package CFPlus::UI::Selector; 4090package CFPlus::UI::Selector;
… …
3832} 4122}
3833 4123
3834sub _set_value { 4124sub _set_value {
3835 my ($self, $value) = @_; 4125 my ($self, $value) = @_;
3836 4126
3837 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4127 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4128 $item ||= $self->{options}[0]
3838 or return; 4129 or return;
3839 4130
3840 $self->{value} = $item->[0]; 4131 $self->{value} = $item->[0];
3841 $self->set_markup ("$item->[1] ⇓"); 4132 $self->set_markup ("$item->[1] ⇓");
3842 $self->set_tooltip ($item->[2]); 4133# $self->set_tooltip ($item->[2]);
3843} 4134}
3844 4135
3845sub set_value { 4136sub set_value {
3846 my ($self, $value) = @_; 4137 my ($self, $value) = @_;
3847 4138
3848 return unless $self->{value} ne $value; 4139 return unless $self->{value} ne $value;
3849 4140
3850 $self->_set_value ($value); 4141 $self->_set_value ($value);
3851 $self->emit (changed => $value); 4142 $self->emit (changed => $value);
4143}
4144
4145sub set_options {
4146 my ($self, $options) = @_;
4147
4148 $self->{options} = $options;
4149 $self->_set_value ($self->{value});
3852} 4150}
3853 4151
3854############################################################################# 4152#############################################################################
3855 4153
3856package CFPlus::UI::Statusbox; 4154package CFPlus::UI::Statusbox;
… …
3865 @_, 4163 @_,
3866 ); 4164 );
3867 4165
3868 CFPlus::weaken (my $this = $self); 4166 CFPlus::weaken (my $this = $self);
3869 4167
3870 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4168 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3871 4169
3872 $self 4170 $self
3873} 4171}
3874 4172
3875sub reorder { 4173sub reorder {
… …
3889 4187
3890 my @items = sort { 4188 my @items = sort {
3891 $a->{pri} <=> $b->{pri} 4189 $a->{pri} <=> $b->{pri}
3892 or $b->{id} <=> $a->{id} 4190 or $b->{id} <=> $a->{id}
3893 } values %{ $self->{item} }; 4191 } values %{ $self->{item} };
3894
3895 $self->{timer}->interval (1);
3896 4192
3897 my $count = 10 + 1; 4193 my $count = 10 + 1;
3898 for my $item (@items) { 4194 for my $item (@items) {
3899 last unless --$count; 4195 last unless --$count;
3900 4196
… …
3924 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4220 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3925 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4221 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3926 $label->update; 4222 $label->update;
3927 $label->set_max_size (undef, $label->{req_h} * $diff) 4223 $label->set_max_size (undef, $label->{req_h} * $diff)
3928 if $diff < 1; 4224 if $diff < 1;
3929 $self->{timer}->interval (1/30); 4225 $self->{timer}->set (1/30, 1/30);
3930 } else { 4226 } else {
3931 $label->{fg}[3] = $item->{fg}[3] || 1; 4227 $label->{fg}[3] = $item->{fg}[3] || 1;
3932 } 4228 }
3933 4229
3934 push @widgets, $label; 4230 push @widgets, $label;
… …
4070} 4366}
4071 4367
4072sub update { 4368sub update {
4073 my ($self) = @_; 4369 my ($self) = @_;
4074 4370
4075 $::WANT_REFRESH++; 4371 $::WANT_REFRESH->start;
4076} 4372}
4077 4373
4078sub add { 4374sub add {
4079 my ($self, @children) = @_; 4375 my ($self, @children) = @_;
4080 4376

Diff Legend

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