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.271 by root, Fri Jun 2 22:13:47 2006 UTC vs.
Revision 1.294 by root, Tue Jun 6 03:19:26 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
277 delete $self->{visible}; 278 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->focus_out;
286 287
287 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
371sub size_allocate { 372sub size_allocate {
372 # nothing to be done 373 # nothing to be done
373} 374}
374 375
375sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
376} 382}
377 383
378sub set_max_size { 384sub set_max_size {
379 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
380 386
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
383} 391}
384 392
385sub set_tooltip { 393sub set_tooltip {
386 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
387 395
… …
392 400
393 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
394 402
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 406 }
399} 407}
400 408
401# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
402sub coord2local { 410sub coord2local {
… …
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545 553
546 glPushMatrix; 554 glPushMatrix;
547 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
548 $self->_draw;
549 glPopMatrix;
550 556
551 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
552 my ($x, $y) = @$self{qw(x y)};
553
554 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
555 glEnable GL_BLEND; 559 glEnable GL_BLEND;
556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
557 glBegin GL_QUADS; 561 glBegin GL_QUADS;
558 glVertex $x , $y; 562 glVertex 0 , 0;
559 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
560 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
561 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
562 glEnd; 566 glEnd;
563 glDisable GL_BLEND; 567 glDisable GL_BLEND;
564 } 568 }
565 569
566 if ($ENV{CFPLUS_DEBUG} & 1) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
567 glPushMatrix; 571 glPushMatrix;
568 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
570 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
571 glVertex 0 , 0; 575 glVertex 0 , 0;
572 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
573 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
574 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
575 glEnd; 579 glEnd;
576 glPopMatrix; 580 glPopMatrix;
577 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
578 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
579} 586}
580 587
581sub _draw { 588sub _draw {
582 my ($self) = @_; 589 my ($self) = @_;
583 590
… …
621 628
622 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
623 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
624 631
625 glEnable GL_BLEND; 632 glEnable GL_BLEND;
626 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
627 glColor @$color; 634 glColor_premultiply @$color;
628 635
629 glBegin GL_QUADS; 636 glBegin GL_QUADS;
630 glVertex 0 , 0; 637 glVertex 0 , 0;
631 glVertex 0 , $h; 638 glVertex 0 , $h;
632 glVertex $w, $h; 639 glVertex $w, $h;
… …
663our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
664 671
665sub new { 672sub new {
666 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
667 674
668 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
669 676
670 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
671 children => [], 678 children => [],
672 can_events => 0, 679 can_events => 0,
673 %arg, 680 %arg,
674 ); 681 );
682
675 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
676 685
677 $self 686 $self
678} 687}
679 688
680sub add { 689sub add {
… …
728 $x -= $self->{x}; 737 $x -= $self->{x};
729 $y -= $self->{y}; 738 $y -= $self->{y};
730 739
731 my $res; 740 my $res;
732 741
733 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
734 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
735 and return $res; 744 and return $res;
736 } 745 }
737 746
738 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
787 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
788} 797}
789 798
790############################################################################# 799#############################################################################
791 800
801# back-buffered drawing area
802
792package CFClient::UI::Window; 803package CFClient::UI::Window;
793 804
794our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
795 806
796use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
847 my $tex = $self->{texture} 858 my $tex = $self->{texture}
848 or return; 859 or return;
849 860
850 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
851 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
852 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
853 864
854 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
855 866
856 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
857} 868}
… …
948package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
949 960
950our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
951 962
952sub new { 963sub new {
953 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
954 967
955 my $self; 968 my $self;
956 969
957 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
958 vertical => 1, 971 vertical => 1,
… …
963 ; 976 ;
964 977
965 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
966 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
967 slider => $slider, 980 slider => $slider,
968 @_, 981 %arg,
969 ); 982 );
970 983
971 $self->{vp}->add ($self->{scrolled});
972 $self->add ($self->{vp});
973 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
974 986
975 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
976} 994}
977 995
978sub update { 996sub update {
979 my ($self) = @_; 997 my ($self) = @_;
980 998
… …
1019 1037
1020 if ($self->{bg}) { 1038 if ($self->{bg}) {
1021 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
1022 1040
1023 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
1024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1025 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
1026 1044
1027 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
1028 glVertex 0 , 0; 1046 glVertex 0 , 0;
1029 glVertex 0 , $h; 1047 glVertex 0 , $h;
1030 glVertex $w, $h; 1048 glVertex $w, $h;
… …
1144 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1145 1163
1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 $self->realloc; 1168 $self->realloc;
1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1151 }; 1169 };
1152 1170
1153 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1154 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1155 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1158 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1159 1177
1160 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1161 1179
1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1163 }; 1183 };
1164 } else { 1184 } else {
1165 return 0; 1185 return 0;
1166 } 1186 }
1167 1187
… …
1519 1539
1520 delete $self->{texture}; 1540 delete $self->{texture};
1521 $self->SUPER::update; 1541 $self->SUPER::update;
1522} 1542}
1523 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1524sub set_text { 1551sub set_text {
1525 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1526 1553
1527 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1528 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1529 1556
1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1531 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1532 1559
1560 delete $self->{size_req};
1533 $self->realloc; 1561 $self->realloc;
1534 $self->update; 1562 $self->update;
1535} 1563}
1536 1564
1537sub set_markup { 1565sub set_markup {
… …
1543 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1544 1572
1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1546 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1547 1575
1576 delete $self->{size_req};
1548 $self->realloc; 1577 $self->realloc;
1549 $self->update; 1578 $self->update;
1550} 1579}
1551 1580
1552sub size_request { 1581sub size_request {
1553 my ($self) = @_; 1582 my ($self) = @_;
1554 1583
1584 $self->{size_req} ||= do {
1555 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1556 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1557 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1558 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1559 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1560 1590
1561 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1562 1592
1563 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1564 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1565 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1596
1567 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1568 1598
1569 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1570 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1571 } 1604 };
1572 1605
1573 ($w, $h) 1606 @{ $self->{size_req} }
1574} 1607}
1575 1608
1576sub size_allocate { 1609sub size_allocate {
1577 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1578 1611
… …
1587 1620
1588 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1589 delete $self->{texture}; 1622 delete $self->{texture};
1590 1623
1591 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1592} 1633}
1593 1634
1594sub _draw { 1635sub _draw {
1595 my ($self) = @_; 1636 my ($self) = @_;
1596 1637
… …
1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1617 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1618 }; 1659 };
1619 1660
1620 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1622 1665
1623 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1624 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1625 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1626 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1627 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1628 } 1673 }
1629 1674
1630 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1631} 1676}
1632 1677
… …
1649 can_hover => 1, 1694 can_hover => 1,
1650 can_focus => 1, 1695 can_focus => 1,
1651 valign => 0, 1696 valign => 0,
1652 can_events => 1, 1697 can_events => 1,
1653 #text => ... 1698 #text => ...
1699 #hidden => "*",
1654 @_ 1700 @_
1655 ) 1701 )
1656} 1702}
1657 1703
1658sub _set_text { 1704sub _set_text {
… …
1660 1706
1661 delete $self->{cur_h}; 1707 delete $self->{cur_h};
1662 1708
1663 return if $self->{text} eq $text; 1709 return if $self->{text} eq $text;
1664 1710
1665 delete $self->{texture};
1666
1667 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1668 $self->{text} = $text; 1712 $self->{text} = $text;
1669 1713
1670 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1671 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1672 1717
1673 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1721 $self->update;
1674} 1722}
1675 1723
1676sub set_text { 1724sub set_text {
1677 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1678 1726
1679 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1680 $self->_set_text ($text); 1728 $self->_set_text ($text);
1681
1682 $self->realloc;
1683} 1729}
1684 1730
1685sub get_text { 1731sub get_text {
1686 $_[0]{text} 1732 $_[0]{text}
1687} 1733}
… …
1767 my ($self) = @_; 1813 my ($self) = @_;
1768 1814
1769 local $self->{fg} = $self->{fg}; 1815 local $self->{fg} = $self->{fg};
1770 1816
1771 if ($FOCUS == $self) { 1817 if ($FOCUS == $self) {
1772 glColor @{$self->{active_bg}}; 1818 glColor_premultiply @{$self->{active_bg}};
1773 $self->{fg} = $self->{active_fg}; 1819 $self->{fg} = $self->{active_fg};
1774 } else { 1820 } else {
1775 glColor @{$self->{bg}}; 1821 glColor_premultiply @{$self->{bg}};
1776 } 1822 }
1777 1823
1778 glEnable GL_BLEND; 1824 glEnable GL_BLEND;
1779 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1780 glBegin GL_QUADS; 1826 glBegin GL_QUADS;
1781 glVertex 0 , 0; 1827 glVertex 0 , 0;
1782 glVertex 0 , $self->{h}; 1828 glVertex 0 , $self->{h};
1783 glVertex $self->{w}, $self->{h}; 1829 glVertex $self->{w}, $self->{h};
1784 glVertex $self->{w}, 0; 1830 glVertex $self->{w}, 0;
… …
1894} 1940}
1895 1941
1896sub _draw { 1942sub _draw {
1897 my ($self) = @_; 1943 my ($self) = @_;
1898 1944
1899 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1900
1901 if ($GRAB == $self) {
1902 $self->{fg} = $self->{active_fg};
1903 }
1904 1946
1905 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1908 1950
… …
2133 2175
2134 my $h1 = $self->{h} * (1 - $ycut1); 2176 my $h1 = $self->{h} * (1 - $ycut1);
2135 my $h2 = $self->{h} * (1 - $ycut2); 2177 my $h2 = $self->{h} * (1 - $ycut2);
2136 2178
2137 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
2138 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2139 glEnable GL_TEXTURE_2D; 2182 glEnable GL_TEXTURE_2D;
2140 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2183 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141 2184
2142 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2185 glBindTexture GL_TEXTURE_2D, $t1->{name};
2143 glBegin GL_QUADS; 2186 glBegin GL_QUADS;
… …
2328} 2371}
2329 2372
2330sub update { 2373sub update {
2331 my ($self) = @_; 2374 my ($self) = @_;
2332 2375
2333 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2376 delete $self->{knob_w};
2377 $self->SUPER::update;
2378}
2379
2380sub _draw {
2381 my ($self) = @_;
2382
2383 unless ($self->{knob_w}) {
2334 $self->set_value ($self->{range}[0]); 2384 $self->set_value ($self->{range}[0]);
2335 2385
2336 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2386 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100; 2387 my $range = ($hi - $page - $lo) || 1e-100;
2338 2388
… …
2344 $value = ($value - $lo) / $range; 2394 $value = ($value - $lo) / $range;
2345 $value = $value * $self->{scale} + $self->{offset}; 2395 $value = $value * $self->{scale} + $self->{offset};
2346 2396
2347 $self->{knob_x} = $value - $knob_w * 0.5; 2397 $self->{knob_x} = $value - $knob_w * 0.5;
2348 $self->{knob_w} = $knob_w; 2398 $self->{knob_w} = $knob_w;
2349 }); 2399 }
2350
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356 2400
2357 $self->SUPER::_draw (); 2401 $self->SUPER::_draw ();
2358 2402
2359 glScale $self->{w}, $self->{h}; 2403 glScale $self->{w}, $self->{h};
2360 2404
… …
2433 my $class = shift; 2477 my $class = shift;
2434 2478
2435 my $self = $class->SUPER::new ( 2479 my $self = $class->SUPER::new (
2436 fontsize => 1, 2480 fontsize => 1,
2437 can_events => 0, 2481 can_events => 0,
2482 indent => 0,
2438 #font => default_font 2483 #font => default_font
2439 @_, 2484 @_,
2440 2485
2441 layout => (new CFClient::Layout 1), 2486 layout => (new CFClient::Layout 1),
2442 par => [], 2487 par => [],
… …
2465 $self->SUPER::size_allocate ($w, $h); 2510 $self->SUPER::size_allocate ($w, $h);
2466 2511
2467 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2512 $self->{layout}->set_font ($self->{font}) if $self->{font};
2468 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2513 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2469 $self->{layout}->set_width ($self->{children}[0]{w}); 2514 $self->{layout}->set_width ($self->{children}[0]{w});
2515 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2470 2516
2471 $self->reflow; 2517 $self->reflow;
2472} 2518}
2473 2519
2474sub text_size { 2520sub text_size {
… …
2476 2522
2477 my $layout = $self->{layout}; 2523 my $layout = $self->{layout};
2478 2524
2479 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2525 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2480 $layout->set_width ($self->{children}[0]{w} - $indent); 2526 $layout->set_width ($self->{children}[0]{w} - $indent);
2527 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2481 $layout->set_markup ($text); 2528 $layout->set_markup ($text);
2482 2529
2483 $layout->size 2530 $layout->size
2484} 2531}
2485 2532
… …
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2584 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538 2585
2539 for (@{$self->{par}}) { 2586 for (@{$self->{par}}) {
2540 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2587 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2541 $layout->set_width ($W - $_->[3]); 2588 $layout->set_width ($W - $_->[3]);
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2542 $layout->set_markup ($_->[4]); 2590 $layout->set_markup ($_->[4]);
2543 my ($w, $h) = $layout->size; 2591 my ($w, $h) = $layout->size;
2544 $_->[0] = $w + $_->[3]; 2592 $_->[0] = $w + $_->[3];
2545 $_->[1] = $h; 2593 $_->[1] = $h;
2546 } 2594 }
… …
2554 2602
2555 delete $self->{texture}; 2603 delete $self->{texture};
2556 } 2604 }
2557 2605
2558 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2606 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2559 glClearColor 0.5, 0.5, 0.5, 0; 2607 glClearColor 0, 0, 0, 0;
2560 glClear GL_COLOR_BUFFER_BIT; 2608 glClear GL_COLOR_BUFFER_BIT;
2561 2609
2562 my $top = int $self->{children}[1]{range}[0]; 2610 my $top = int $self->{children}[1]{range}[0];
2563 2611
2564 my $y0 = $top; 2612 my $y0 = $top;
… …
2578 my $h = $par->[1]; 2626 my $h = $par->[1];
2579 2627
2580 if ($y0 < $y + $h && $y < $y1) { 2628 if ($y0 < $y + $h && $y < $y1) {
2581 $layout->set_foreground (@{ $par->[2] }); 2629 $layout->set_foreground (@{ $par->[2] });
2582 $layout->set_width ($W - $par->[3]); 2630 $layout->set_width ($W - $par->[3]);
2631 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2583 $layout->set_markup ($par->[4]); 2632 $layout->set_markup ($par->[4]);
2584 2633
2585 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2634 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2586 2635
2587 glRasterPos $par->[3], $y - $y0; 2636 glRasterPos $par->[3], $y - $y0;
… …
2599sub _draw { 2648sub _draw {
2600 my ($self) = @_; 2649 my ($self) = @_;
2601 2650
2602 glEnable GL_TEXTURE_2D; 2651 glEnable GL_TEXTURE_2D;
2603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2604 glColor 1, 1, 1, 1; 2653 glColor 0, 0, 0, 1;
2605 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2654 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2606 glDisable GL_TEXTURE_2D; 2655 glDisable GL_TEXTURE_2D;
2607 2656
2608 $self->{children}[1]->draw; 2657 $self->{children}[1]->draw;
2609 2658
2610} 2659}
… …
2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2886 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2838 2887
2839 if ($tex) { 2888 if ($tex) {
2840 glEnable GL_TEXTURE_2D; 2889 glEnable GL_TEXTURE_2D;
2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2842 glColor 1, 1, 1, 1; 2891 glColor 0, 0, 0, 1;
2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2892 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2844 glDisable GL_TEXTURE_2D; 2893 glDisable GL_TEXTURE_2D;
2845 } 2894 }
2846} 2895}
2847 2896
… …
2851 $self->{timer}->cancel 2900 $self->{timer}->cancel
2852 if $self->{timer}; 2901 if $self->{timer};
2853 2902
2854 $self->SUPER::DESTROY; 2903 $self->SUPER::DESTROY;
2855} 2904}
2905
2906#############################################################################
2907
2908package CFClient::UI::Buttonbar;
2909
2910our @ISA = CFClient::UI::HBox::;
2911
2912# TODO: should actualyl wrap buttons and other goodies.
2856 2913
2857############################################################################# 2914#############################################################################
2858 2915
2859package CFClient::UI::Menu; 2916package CFClient::UI::Menu;
2860 2917
… …
2872 ); 2929 );
2873 2930
2874 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2931 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2875 2932
2876 for my $item (@{ $self->{items} }) { 2933 for my $item (@{ $self->{items} }) {
2877 my ($widget, $cb) = @$item; 2934 my ($widget, $cb, $tooltip) = @$item;
2878 2935
2879 # handle various types of items, only text for now 2936 # handle various types of items, only text for now
2880 if (!ref $widget) { 2937 if (!ref $widget) {
2881 $widget = new CFClient::UI::Label 2938 $widget = new CFClient::UI::Label
2882 can_hover => 1, 2939 can_hover => 1,
2883 can_events => 1, 2940 can_events => 1,
2884 text => $widget; 2941 text => $widget,
2942 tooltip => $tooltip
2885 } 2943 }
2886 2944
2887 $self->{item}{$widget} = $item; 2945 $self->{item}{$widget} = $item;
2888 2946
2889 $self->{vbox}->add ($widget); 2947 $self->{vbox}->add ($widget);
… …
2932 1 2990 1
2933} 2991}
2934 2992
2935############################################################################# 2993#############################################################################
2936 2994
2937package CFClient::UI::Statusbox; 2995package CFClient::UI::Multiplexer;
2938 2996
2939our @ISA = CFClient::UI::VBox::; 2997our @ISA = CFClient::UI::Container::;
2940 2998
2941sub new { 2999sub new {
2942 my $class = shift; 3000 my $class = shift;
2943 3001
2944 $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
3003 @_,
3004 );
3005
3006 $self->{current} = $self->{children}[0]
3007 if @{ $self->{children} };
3008
3009 $self
3010}
3011
3012sub add {
3013 my ($self, @widgets) = @_;
3014
3015 $self->SUPER::add (@widgets);
3016
3017 $self->{current} = $self->{children}[0]
3018 if @{ $self->{children} };
3019}
3020
3021sub set_current_page {
3022 my ($self, $page_or_widget) = @_;
3023
3024 my $widget = ref $page_or_widget
3025 ? $page_or_widget
3026 : $self->{children}[$page_or_widget];
3027
3028 $self->{current} = $widget;
3029 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3030
3031 $self->_emit (page_changed => $self->{current});
3032
3033 $self->realloc;
3034}
3035
3036sub visible_children {
3037 $_[0]{current}
3038}
3039
3040sub size_request {
3041 my ($self) = @_;
3042
3043 $self->{current}->size_request
3044}
3045
3046sub size_allocate {
3047 my ($self, $w, $h) = @_;
3048
3049 $self->{current}->configure (0, 0, $w, $h);
3050}
3051
3052sub _draw {
3053 my ($self) = @_;
3054
3055 $self->{current}->draw;
3056}
3057
3058#############################################################################
3059
3060package CFClient::UI::Notebook;
3061
3062our @ISA = CFClient::UI::VBox::;
3063
3064sub new {
3065 my $class = shift;
3066
3067 my $self = $class->SUPER::new (
3068 buttonbar => (new CFClient::UI::Buttonbar),
3069 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3070 # filter => # will be put between multiplexer and $self
3071 @_,
3072 );
3073
3074 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3075 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3076
3077 $self
3078}
3079
3080sub add {
3081 my ($self, $title, $widget, $tooltip) = @_;
3082
3083 Scalar::Util::weaken $self;
3084
3085 $self->{buttonbar}->add (new CFClient::UI::Button
3086 markup => $title,
3087 tooltip => $tooltip,
3088 on_activate => sub { $self->set_current_page ($widget) },
3089 );
3090
3091 $self->{multiplexer}->add ($widget);
3092}
3093
3094sub set_current_page {
3095 my ($self, $page) = @_;
3096
3097 $self->{multiplexer}->set_current_page ($page);
3098 $self->_emit (page_changed => $self->{multiplexer}{current});
3099}
3100
3101#############################################################################
3102
3103package CFClient::UI::Combobox;
3104
3105use utf8;
3106
3107our @ISA = CFClient::UI::Button::;
3108
3109sub new {
3110 my $class = shift;
3111
3112 my $self = $class->SUPER::new (
3113 options => [], # [title, value, tooltip], ...
3114 value => undef,
3115 @_,
3116 );
3117
3118 $self->_set_value ($self->{value});
3119
3120 $self
3121}
3122
3123sub button_down {
3124 my ($self, $ev) = @_;
3125
3126 my @menu_items;
3127
3128 for (@{ $self->{options} }) {
3129 my ($title, $value, $tooltip) = @$_;
3130
3131 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3132 }
3133
3134 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3135}
3136
3137sub _set_value {
3138 my ($self, $value) = @_;
3139
3140 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3141 or return;
3142
3143 $self->{value} = $item->[1];
3144 $self->set_markup ("$item->[0] ⇓");
3145 $self->set_tooltip ($item->[2]);
3146}
3147
3148sub set_value {
3149 my ($self, $value) = @_;
3150
3151 return unless $self->{value} ne $value;
3152
3153 $self->_set_value ($value);
3154 $self->_emit (changed => $value);
3155}
3156
3157#############################################################################
3158
3159package CFClient::UI::Statusbox;
3160
3161our @ISA = CFClient::UI::VBox::;
3162
3163sub new {
3164 my $class = shift;
3165
3166 my $self = $class->SUPER::new (
2945 fontsize => 0.8, 3167 fontsize => 0.8,
2946 @_, 3168 @_,
2947 ) 3169 );
3170
3171 Scalar::Util::weaken (my $this = $self);
3172
3173 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3174
3175 $self
2948} 3176}
2949 3177
2950sub reorder { 3178sub reorder {
2951 my ($self) = @_; 3179 my ($self) = @_;
2952 my $NOW = time; 3180 my $NOW = Time::HiRes::time;
3181
3182 # freeze display when hovering over any label
3183 return if $CFClient::UI::TOOLTIP->{owner}
3184 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3185 values %{ $self->{item} };
2953 3186
2954 while (my ($k, $v) = each %{ $self->{item} }) { 3187 while (my ($k, $v) = each %{ $self->{item} }) {
2955 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3188 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2956 } 3189 }
2957 3190
… …
2960 my @items = sort { 3193 my @items = sort {
2961 $a->{pri} <=> $b->{pri} 3194 $a->{pri} <=> $b->{pri}
2962 or $b->{id} <=> $a->{id} 3195 or $b->{id} <=> $a->{id}
2963 } values %{ $self->{item} }; 3196 } values %{ $self->{item} };
2964 3197
3198 $self->{timer}->interval (1);
3199
2965 my $count = 10 + 1; 3200 my $count = 10 + 1;
2966 for my $item (@items) { 3201 for my $item (@items) {
2967 last unless --$count; 3202 last unless --$count;
2968 3203
2969 push @widgets, $item->{label} ||= do { 3204 my $label = $item->{label} ||= do {
2970 # TODO: doesn't handle markup well (read as: at all) 3205 # TODO: doesn't handle markup well (read as: at all)
2971 my $short = $item->{count} > 1 3206 my $short = $item->{count} > 1
2972 ? "<b>$item->{count} ×</b> $item->{text}" 3207 ? "<b>$item->{count} ×</b> $item->{text}"
2973 : $item->{text}; 3208 : $item->{text};
2974 3209
… …
2982 tooltip => $item->{tooltip}, 3217 tooltip => $item->{tooltip},
2983 tooltip_font => $::FONT_PROP, 3218 tooltip_font => $::FONT_PROP,
2984 tooltip_width => 0.67, 3219 tooltip_width => 0.67,
2985 fontsize => $item->{fontsize} || $self->{fontsize}, 3220 fontsize => $item->{fontsize} || $self->{fontsize},
2986 max_w => $::WIDTH * 0.44, 3221 max_w => $::WIDTH * 0.44,
2987 fg => $item->{fg}, 3222 fg => [@{ $item->{fg} }],
2988 can_events => 1, 3223 can_events => 1,
2989 can_hover => 1 3224 can_hover => 1
2990 }; 3225 };
3226
3227 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3228 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3229 $label->update;
3230 $label->set_max_size (undef, $label->{req_h} * $diff)
3231 if $diff < 1;
3232 $self->{timer}->interval (1/30);
3233 } else {
3234 $label->{fg}[3] = $item->{fg}[3] || 1;
3235 }
3236
3237 push @widgets, $label;
2991 } 3238 }
2992 3239
2993 $self->clear; 3240 $self->clear;
2994 $self->SUPER::add (reverse @widgets); 3241 $self->SUPER::add (reverse @widgets);
2995} 3242}
… …
3000 $text =~ s/^\s+//; 3247 $text =~ s/^\s+//;
3001 $text =~ s/\s+$//; 3248 $text =~ s/\s+$//;
3002 3249
3003 return unless $text; 3250 return unless $text;
3004 3251
3005 my $timeout = time + ((delete $arg{timeout}) || 60); 3252 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3006 3253
3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3254 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3008 3255
3009 if (my $item = $self->{item}{$group}) { 3256 if (my $item = $self->{item}{$group}) {
3010 if ($item->{text} eq $text) { 3257 if ($item->{text} eq $text) {
… …
3040 3287
3041 $self->reorder; 3288 $self->reorder;
3042 $self->SUPER::reconfigure; 3289 $self->SUPER::reconfigure;
3043} 3290}
3044 3291
3292sub DESTROY {
3293 my ($self) = @_;
3294
3295 $self->{timer}->cancel;
3296
3297 $self->SUPER::DESTROY;
3298}
3299
3045############################################################################# 3300#############################################################################
3046 3301
3047package CFClient::UI::Inventory; 3302package CFClient::UI::Inventory;
3048 3303
3049our @ISA = CFClient::UI::ScrolledWindow::; 3304our @ISA = CFClient::UI::ScrolledWindow::;
3050 3305
3051sub new { 3306sub new {
3052 my $class = shift; 3307 my $class = shift;
3053 3308
3054 my $self = $class->SUPER::new ( 3309 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3310 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3056 @_, 3311 @_,
3057 ); 3312 );
3058 3313
3059 $self 3314 $self
3060} 3315}
3061 3316
3062sub set_items { 3317sub set_items {
3063 my ($self, $items) = @_; 3318 my ($self, $items) = @_;
3064 3319
3065 $self->{scrolled}->clear; 3320 $self->{child}->clear;
3066 return unless $items; 3321 return unless $items;
3067 3322
3068 my @items = sort { 3323 my @items = sort {
3069 ($a->{type} <=> $b->{type}) 3324 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name}) 3325 or ($a->{name} cmp $b->{name})
… …
3074 3329
3075 my $row = 0; 3330 my $row = 0;
3076 for my $item (@items) { 3331 for my $item (@items) {
3077 CFClient::Item::update_widgets $item; 3332 CFClient::Item::update_widgets $item;
3078 3333
3079 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3334 $self->{child}->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3335 $self->{child}->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3336 $self->{child}->add (2, $row, $item->{weight_widget});
3082 3337
3083 $row++; 3338 $row++;
3084 } 3339 }
3085} 3340}
3086 3341
… …
3283 3538
3284############################################################################# 3539#############################################################################
3285 3540
3286package CFClient::UI::SpellList; 3541package CFClient::UI::SpellList;
3287 3542
3288our @ISA = CFClient::UI::FancyFrame::; 3543our @ISA = CFClient::UI::Table::;
3289 3544
3290sub new { 3545sub new {
3291 my $class = shift; 3546 my $class = shift;
3292 3547
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3548 my $self = $class->SUPER::new (
3294 3549 binding => [],
3295 $self->add (new CFClient::UI::ScrolledWindow 3550 commands => [],
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3551 @_,
3297 3552 )
3298 $self;
3299} 3553}
3300 3554
3301# XXX: Do sorting? Argl... 3555my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3557my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3559my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3561
3562sub rebuild_spell_list {
3563 my ($self) = @_;
3564
3565 $CFClient::UI::ROOT->on_refresh ($self => sub {
3566 $self->clear;
3567
3568 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3569 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3570 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3571 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3572
3573 my $row = 0;
3574
3575 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3576 my $spell = $self->{spell}{$_};
3577
3578 $row++;
3579
3580 $self->add (0, $row, new CFClient::UI::Face
3581 face => $spell->{face},
3582 can_hover => 1,
3583 can_events => 1,
3584 tooltip => $spell->{message},
3585 );
3586
3587 $self->add (1, $row, new CFClient::UI::Label
3588 expand => 1,
3589 text => $spell->{name},
3590 can_hover => 1,
3591 can_events => 1,
3592 tooltip => $spell->{message},
3593 );
3594
3595 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3596 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3597 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3598
3599 # TODO: should be done via popup
3600 $self->add (5, $row, new CFClient::UI::Button
3601 text => "bind",
3602 tooltip => "bind spell readying (cast command) to key",
3603 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3604 );
3605 }
3606 });
3607}
3608
3302sub add_spell { 3609sub add_spell {
3303 my ($self, $spell) = @_; 3610 my ($self, $spell) = @_;
3611
3304 $self->{spells}->{$spell->{name}} = $spell; 3612 $self->{spell}->{$spell->{name}} = $spell;
3305 3613 $self->rebuild_spell_list;
3306 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307 face => $spell->{face},
3308 can_hover => 1,
3309 can_events => 1,
3310 tooltip => $spell->{message});
3311
3312 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313 text => $spell->{name},
3314 can_hover => 1,
3315 can_events => 1,
3316 tooltip => $spell->{message},
3317 expand => 1);
3318
3319 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3322 expand => 1);
3323
3324 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325 text => "bind to key",
3326 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327}
3328
3329sub rebuild_spell_list {
3330 my ($self) = @_;
3331 $self->{tbl_idx} = 0;
3332 $self->add_spell ($_) for values %{$self->{spells}};
3333} 3614}
3334 3615
3335sub remove_spell { 3616sub remove_spell {
3336 my ($self, $spell) = @_; 3617 my ($self, $spell) = @_;
3618
3337 delete $self->{spells}->{$spell->{name}}; 3619 delete $self->{spell}->{$spell->{name}};
3338 $self->rebuild_spell_list; 3620 $self->rebuild_spell_list;
3339} 3621}
3340 3622
3341############################################################################# 3623#############################################################################
3342 3624
3343package CFClient::UI::Root; 3625package CFClient::UI::Root;
3344 3626
3345our @ISA = CFClient::UI::Container::; 3627our @ISA = CFClient::UI::Container::;
3628
3629use List::Util qw(min max);
3346 3630
3347use CFClient::OpenGL; 3631use CFClient::OpenGL;
3348 3632
3349sub new { 3633sub new {
3350 my $class = shift; 3634 my $class = shift;
… …
3485 3769
3486 delete $queue{$widget+0}; 3770 delete $queue{$widget+0};
3487 3771
3488 my ($w, $h) = $widget->size_request; 3772 my ($w, $h) = $widget->size_request;
3489 3773
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3774 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3775 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3776
3777 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3778 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3492 3779
3493 $w = $widget->{force_w} if exists $widget->{force_w}; 3780 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h}; 3781 $h = $widget->{force_h} if exists $widget->{force_h};
3495 3782
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3783 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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