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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.293 by root, Tue Jun 6 03:05:16 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);
… …
381} 382}
382 383
383sub set_max_size { 384sub set_max_size {
384 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
385 386
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
388} 391}
389 392
390sub set_tooltip { 393sub set_tooltip {
391 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
392 395
… …
397 400
398 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
399 402
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 406 }
404} 407}
405 408
406# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
407sub coord2local { 410sub coord2local {
… …
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 553
551 glPushMatrix; 554 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 556
556 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 559 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 561 glBegin GL_QUADS;
563 glVertex $x , $y; 562 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
567 glEnd; 566 glEnd;
568 glDisable GL_BLEND; 567 glDisable GL_BLEND;
569 } 568 }
570 569
571 if ($ENV{CFPLUS_DEBUG} & 1) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 571 glPushMatrix;
573 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 575 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
580 glEnd; 579 glEnd;
581 glPopMatrix; 580 glPopMatrix;
582 #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;
583 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
584} 586}
585 587
586sub _draw { 588sub _draw {
587 my ($self) = @_; 589 my ($self) = @_;
588 590
… …
626 628
627 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
629 631
630 glEnable GL_BLEND; 632 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 634 glColor_premultiply @$color;
633 635
634 glBegin GL_QUADS; 636 glBegin GL_QUADS;
635 glVertex 0 , 0; 637 glVertex 0 , 0;
636 glVertex 0 , $h; 638 glVertex 0 , $h;
637 glVertex $w, $h; 639 glVertex $w, $h;
… …
794 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
795} 797}
796 798
797############################################################################# 799#############################################################################
798 800
801# back-buffered drawing area
802
799package CFClient::UI::Window; 803package CFClient::UI::Window;
800 804
801our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
802 806
803use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
854 my $tex = $self->{texture} 858 my $tex = $self->{texture}
855 or return; 859 or return;
856 860
857 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
860 864
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 866
863 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
864} 868}
… …
955package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
956 960
957our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
958 962
959sub new { 963sub new {
960 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
961 967
962 my $self; 968 my $self;
963 969
964 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
965 vertical => 1, 971 vertical => 1,
… …
970 ; 976 ;
971 977
972 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
974 slider => $slider, 980 slider => $slider,
975 @_, 981 %arg,
976 ); 982 );
977 983
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
981 986
982 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
983} 994}
984 995
985sub update { 996sub update {
986 my ($self) = @_; 997 my ($self) = @_;
987 998
… …
1026 1037
1027 if ($self->{bg}) { 1038 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
1029 1040
1030 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
1033 1044
1034 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1046 glVertex 0 , 0;
1036 glVertex 0 , $h; 1047 glVertex 0 , $h;
1037 glVertex $w, $h; 1048 glVertex $w, $h;
… …
1151 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1152 1163
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1168 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1169 };
1159 1170
1160 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1166 1177
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1179
1169 $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});
1170 }; 1183 };
1171 } else { 1184 } else {
1172 return 0; 1185 return 0;
1173 } 1186 }
1174 1187
… …
1526 1539
1527 delete $self->{texture}; 1540 delete $self->{texture};
1528 $self->SUPER::update; 1541 $self->SUPER::update;
1529} 1542}
1530 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1531sub set_text { 1551sub set_text {
1532 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1533 1553
1534 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1536 1556
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1539 1559
1560 delete $self->{size_req};
1540 $self->realloc; 1561 $self->realloc;
1541 $self->update; 1562 $self->update;
1542} 1563}
1543 1564
1544sub set_markup { 1565sub set_markup {
… …
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1572
1552 $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;
1553 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1554 1575
1576 delete $self->{size_req};
1555 $self->realloc; 1577 $self->realloc;
1556 $self->update; 1578 $self->update;
1557} 1579}
1558 1580
1559sub size_request { 1581sub size_request {
1560 my ($self) = @_; 1582 my ($self) = @_;
1561 1583
1584 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1590
1568 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1569 1592
1570 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1596
1574 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1575 1598
1576 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1578 } 1604 };
1579 1605
1580 ($w, $h) 1606 @{ $self->{size_req} }
1581} 1607}
1582 1608
1583sub size_allocate { 1609sub size_allocate {
1584 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1585 1611
… …
1594 1620
1595 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1596 delete $self->{texture}; 1622 delete $self->{texture};
1597 1623
1598 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1599} 1633}
1600 1634
1601sub _draw { 1635sub _draw {
1602 my ($self) = @_; 1636 my ($self) = @_;
1603 1637
… …
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1625 }; 1659 };
1626 1660
1627 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1629 1662
1630 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1631 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1633 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1635 } 1670 }
1636 1671
1637 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1638} 1673}
… …
1656 can_hover => 1, 1691 can_hover => 1,
1657 can_focus => 1, 1692 can_focus => 1,
1658 valign => 0, 1693 valign => 0,
1659 can_events => 1, 1694 can_events => 1,
1660 #text => ... 1695 #text => ...
1696 #hidden => "*",
1661 @_ 1697 @_
1662 ) 1698 )
1663} 1699}
1664 1700
1665sub _set_text { 1701sub _set_text {
… …
1667 1703
1668 delete $self->{cur_h}; 1704 delete $self->{cur_h};
1669 1705
1670 return if $self->{text} eq $text; 1706 return if $self->{text} eq $text;
1671 1707
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1708 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1709 $self->{text} = $text;
1676 1710
1677 $text =~ s/./*/g if $self->{hidden}; 1711 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1712 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req};
1679 1714
1680 $self->_emit (changed => $self->{text}); 1715 $self->_emit (changed => $self->{text});
1716
1717 $self->realloc;
1718 $self->update;
1681} 1719}
1682 1720
1683sub set_text { 1721sub set_text {
1684 my ($self, $text) = @_; 1722 my ($self, $text) = @_;
1685 1723
1686 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1725 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1726}
1691 1727
1692sub get_text { 1728sub get_text {
1693 $_[0]{text} 1729 $_[0]{text}
1694} 1730}
… …
1774 my ($self) = @_; 1810 my ($self) = @_;
1775 1811
1776 local $self->{fg} = $self->{fg}; 1812 local $self->{fg} = $self->{fg};
1777 1813
1778 if ($FOCUS == $self) { 1814 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 1815 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 1816 $self->{fg} = $self->{active_fg};
1781 } else { 1817 } else {
1782 glColor @{$self->{bg}}; 1818 glColor_premultiply @{$self->{bg}};
1783 } 1819 }
1784 1820
1785 glEnable GL_BLEND; 1821 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1822 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 1823 glBegin GL_QUADS;
1788 glVertex 0 , 0; 1824 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 1825 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 1826 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 1827 glVertex $self->{w}, 0;
… …
1901} 1937}
1902 1938
1903sub _draw { 1939sub _draw {
1904 my ($self) = @_; 1940 my ($self) = @_;
1905 1941
1906 local $self->{fg} = $self->{fg}; 1942 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 1943
1912 glEnable GL_TEXTURE_2D; 1944 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 1946 glColor 0, 0, 0, 1;
1915 1947
… …
2140 2172
2141 my $h1 = $self->{h} * (1 - $ycut1); 2173 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2174 my $h2 = $self->{h} * (1 - $ycut2);
2143 2175
2144 glEnable GL_BLEND; 2176 glEnable GL_BLEND;
2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2177 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146 glEnable GL_TEXTURE_2D; 2179 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2180 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2181
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2182 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2183 glBegin GL_QUADS;
… …
2335} 2368}
2336 2369
2337sub update { 2370sub update {
2338 my ($self) = @_; 2371 my ($self) = @_;
2339 2372
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2373 delete $self->{knob_w};
2374 $self->SUPER::update;
2375}
2376
2377sub _draw {
2378 my ($self) = @_;
2379
2380 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2381 $self->set_value ($self->{range}[0]);
2342 2382
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2383 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2384 my $range = ($hi - $page - $lo) || 1e-100;
2345 2385
… …
2351 $value = ($value - $lo) / $range; 2391 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2392 $value = $value * $self->{scale} + $self->{offset};
2353 2393
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2394 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2395 $self->{knob_w} = $knob_w;
2356 }); 2396 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2397
2364 $self->SUPER::_draw (); 2398 $self->SUPER::_draw ();
2365 2399
2366 glScale $self->{w}, $self->{h}; 2400 glScale $self->{w}, $self->{h};
2367 2401
… …
2440 my $class = shift; 2474 my $class = shift;
2441 2475
2442 my $self = $class->SUPER::new ( 2476 my $self = $class->SUPER::new (
2443 fontsize => 1, 2477 fontsize => 1,
2444 can_events => 0, 2478 can_events => 0,
2479 indent => 0,
2445 #font => default_font 2480 #font => default_font
2446 @_, 2481 @_,
2447 2482
2448 layout => (new CFClient::Layout 1), 2483 layout => (new CFClient::Layout 1),
2449 par => [], 2484 par => [],
… …
2472 $self->SUPER::size_allocate ($w, $h); 2507 $self->SUPER::size_allocate ($w, $h);
2473 2508
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2509 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $self->{layout}->set_width ($self->{children}[0]{w}); 2511 $self->{layout}->set_width ($self->{children}[0]{w});
2512 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2477 2513
2478 $self->reflow; 2514 $self->reflow;
2479} 2515}
2480 2516
2481sub text_size { 2517sub text_size {
… …
2483 2519
2484 my $layout = $self->{layout}; 2520 my $layout = $self->{layout};
2485 2521
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2522 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $layout->set_width ($self->{children}[0]{w} - $indent); 2523 $layout->set_width ($self->{children}[0]{w} - $indent);
2524 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 $layout->set_markup ($text); 2525 $layout->set_markup ($text);
2489 2526
2490 $layout->size 2527 $layout->size
2491} 2528}
2492 2529
… …
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2581 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545 2582
2546 for (@{$self->{par}}) { 2583 for (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2584 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2548 $layout->set_width ($W - $_->[3]); 2585 $layout->set_width ($W - $_->[3]);
2586 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2549 $layout->set_markup ($_->[4]); 2587 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size; 2588 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3]; 2589 $_->[0] = $w + $_->[3];
2552 $_->[1] = $h; 2590 $_->[1] = $h;
2553 } 2591 }
… …
2561 2599
2562 delete $self->{texture}; 2600 delete $self->{texture};
2563 } 2601 }
2564 2602
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2603 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2604 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2605 glClear GL_COLOR_BUFFER_BIT;
2568 2606
2569 my $top = int $self->{children}[1]{range}[0]; 2607 my $top = int $self->{children}[1]{range}[0];
2570 2608
2571 my $y0 = $top; 2609 my $y0 = $top;
… …
2585 my $h = $par->[1]; 2623 my $h = $par->[1];
2586 2624
2587 if ($y0 < $y + $h && $y < $y1) { 2625 if ($y0 < $y + $h && $y < $y1) {
2588 $layout->set_foreground (@{ $par->[2] }); 2626 $layout->set_foreground (@{ $par->[2] });
2589 $layout->set_width ($W - $par->[3]); 2627 $layout->set_width ($W - $par->[3]);
2628 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590 $layout->set_markup ($par->[4]); 2629 $layout->set_markup ($par->[4]);
2591 2630
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2631 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2593 2632
2594 glRasterPos $par->[3], $y - $y0; 2633 glRasterPos $par->[3], $y - $y0;
… …
2606sub _draw { 2645sub _draw {
2607 my ($self) = @_; 2646 my ($self) = @_;
2608 2647
2609 glEnable GL_TEXTURE_2D; 2648 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2649 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 2650 glColor 0, 0, 0, 1;
2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2651 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613 glDisable GL_TEXTURE_2D; 2652 glDisable GL_TEXTURE_2D;
2614 2653
2615 $self->{children}[1]->draw; 2654 $self->{children}[1]->draw;
2616 2655
2617} 2656}
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2883 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 2884
2846 if ($tex) { 2885 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 2886 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 2888 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2889 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 2890 glDisable GL_TEXTURE_2D;
2852 } 2891 }
2853} 2892}
2854 2893
… …
2887 ); 2926 );
2888 2927
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2928 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2890 2929
2891 for my $item (@{ $self->{items} }) { 2930 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 2931 my ($widget, $cb, $tooltip) = @$item;
2893 2932
2894 # handle various types of items, only text for now 2933 # handle various types of items, only text for now
2895 if (!ref $widget) { 2934 if (!ref $widget) {
2896 $widget = new CFClient::UI::Label 2935 $widget = new CFClient::UI::Label
2897 can_hover => 1, 2936 can_hover => 1,
2898 can_events => 1, 2937 can_events => 1,
2899 text => $widget; 2938 text => $widget,
2939 tooltip => $tooltip
2900 } 2940 }
2901 2941
2902 $self->{item}{$widget} = $item; 2942 $self->{item}{$widget} = $item;
2903 2943
2904 $self->{vbox}->add ($widget); 2944 $self->{vbox}->add ($widget);
… …
3022 my $class = shift; 3062 my $class = shift;
3023 3063
3024 my $self = $class->SUPER::new ( 3064 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3065 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3066 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3067 # filter => # will be put between multiplexer and $self
3027 @_, 3068 @_,
3028 ); 3069 );
3029 3070
3071 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3072 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3073
3032 $self 3074 $self
3033} 3075}
3034 3076
3035sub add { 3077sub add {
… …
3053 $self->_emit (page_changed => $self->{multiplexer}{current}); 3095 $self->_emit (page_changed => $self->{multiplexer}{current});
3054} 3096}
3055 3097
3056############################################################################# 3098#############################################################################
3057 3099
3058package CFClient::UI::Statusbox; 3100package CFClient::UI::Combobox;
3059 3101
3102use utf8;
3103
3060our @ISA = CFClient::UI::VBox::; 3104our @ISA = CFClient::UI::Button::;
3061 3105
3062sub new { 3106sub new {
3063 my $class = shift; 3107 my $class = shift;
3064 3108
3065 $class->SUPER::new ( 3109 my $self = $class->SUPER::new (
3110 options => [], # [title, value, tooltip], ...
3111 value => undef,
3112 @_,
3113 );
3114
3115 $self->_set_value ($self->{value});
3116
3117 $self
3118}
3119
3120sub button_down {
3121 my ($self, $ev) = @_;
3122
3123 my @menu_items;
3124
3125 for (@{ $self->{options} }) {
3126 my ($title, $value, $tooltip) = @$_;
3127
3128 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3129 }
3130
3131 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3132}
3133
3134sub _set_value {
3135 my ($self, $value) = @_;
3136
3137 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3138 or return;
3139
3140 $self->{value} = $item->[1];
3141 $self->set_markup ("$item->[0] ⇓");
3142 $self->set_tooltip ($item->[2]);
3143}
3144
3145sub set_value {
3146 my ($self, $value) = @_;
3147
3148 return unless $self->{value} ne $value;
3149
3150 $self->_set_value ($value);
3151 $self->_emit (changed => $value);
3152}
3153
3154#############################################################################
3155
3156package CFClient::UI::Statusbox;
3157
3158our @ISA = CFClient::UI::VBox::;
3159
3160sub new {
3161 my $class = shift;
3162
3163 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3164 fontsize => 0.8,
3067 @_, 3165 @_,
3068 ) 3166 );
3167
3168 Scalar::Util::weaken (my $this = $self);
3169
3170 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3171
3172 $self
3069} 3173}
3070 3174
3071sub reorder { 3175sub reorder {
3072 my ($self) = @_; 3176 my ($self) = @_;
3073 my $NOW = time; 3177 my $NOW = Time::HiRes::time;
3178
3179 # freeze display when hovering over any label
3180 return if $CFClient::UI::TOOLTIP->{owner}
3181 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3182 values %{ $self->{item} };
3074 3183
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3184 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3185 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3186 }
3078 3187
… …
3081 my @items = sort { 3190 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3191 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3192 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3193 } values %{ $self->{item} };
3085 3194
3195 $self->{timer}->interval (1);
3196
3086 my $count = 10 + 1; 3197 my $count = 10 + 1;
3087 for my $item (@items) { 3198 for my $item (@items) {
3088 last unless --$count; 3199 last unless --$count;
3089 3200
3090 push @widgets, $item->{label} ||= do { 3201 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3202 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3203 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3204 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3205 : $item->{text};
3095 3206
… …
3103 tooltip => $item->{tooltip}, 3214 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3215 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3216 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3217 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3218 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3219 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3220 can_events => 1,
3110 can_hover => 1 3221 can_hover => 1
3111 }; 3222 };
3223
3224 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3225 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3226 $label->update;
3227 $label->set_max_size (undef, $label->{req_h} * $diff)
3228 if $diff < 1;
3229 $self->{timer}->interval (1/30);
3230 } else {
3231 $label->{fg}[3] = $item->{fg}[3] || 1;
3232 }
3233
3234 push @widgets, $label;
3112 } 3235 }
3113 3236
3114 $self->clear; 3237 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3238 $self->SUPER::add (reverse @widgets);
3116} 3239}
… …
3121 $text =~ s/^\s+//; 3244 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3245 $text =~ s/\s+$//;
3123 3246
3124 return unless $text; 3247 return unless $text;
3125 3248
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3249 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3250
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3251 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3252
3130 if (my $item = $self->{item}{$group}) { 3253 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3254 if ($item->{text} eq $text) {
… …
3161 3284
3162 $self->reorder; 3285 $self->reorder;
3163 $self->SUPER::reconfigure; 3286 $self->SUPER::reconfigure;
3164} 3287}
3165 3288
3289sub DESTROY {
3290 my ($self) = @_;
3291
3292 $self->{timer}->cancel;
3293
3294 $self->SUPER::DESTROY;
3295}
3296
3166############################################################################# 3297#############################################################################
3167 3298
3168package CFClient::UI::Inventory; 3299package CFClient::UI::Inventory;
3169 3300
3170our @ISA = CFClient::UI::ScrolledWindow::; 3301our @ISA = CFClient::UI::ScrolledWindow::;
3171 3302
3172sub new { 3303sub new {
3173 my $class = shift; 3304 my $class = shift;
3174 3305
3175 my $self = $class->SUPER::new ( 3306 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3307 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_, 3308 @_,
3178 ); 3309 );
3179 3310
3180 $self 3311 $self
3181} 3312}
3182 3313
3183sub set_items { 3314sub set_items {
3184 my ($self, $items) = @_; 3315 my ($self, $items) = @_;
3185 3316
3186 $self->{scrolled}->clear; 3317 $self->{child}->clear;
3187 return unless $items; 3318 return unless $items;
3188 3319
3189 my @items = sort { 3320 my @items = sort {
3190 ($a->{type} <=> $b->{type}) 3321 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name}) 3322 or ($a->{name} cmp $b->{name})
… …
3195 3326
3196 my $row = 0; 3327 my $row = 0;
3197 for my $item (@items) { 3328 for my $item (@items) {
3198 CFClient::Item::update_widgets $item; 3329 CFClient::Item::update_widgets $item;
3199 3330
3200 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3331 $self->{child}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3332 $self->{child}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3333 $self->{child}->add (2, $row, $item->{weight_widget});
3203 3334
3204 $row++; 3335 $row++;
3205 } 3336 }
3206} 3337}
3207 3338
… …
3404 3535
3405############################################################################# 3536#############################################################################
3406 3537
3407package CFClient::UI::SpellList; 3538package CFClient::UI::SpellList;
3408 3539
3409our @ISA = CFClient::UI::ScrolledWindow::; 3540our @ISA = CFClient::UI::Table::;
3410 3541
3411sub new { 3542sub new {
3412 my $class = shift; 3543 my $class = shift;
3413 3544
3414 my $self = $class->SUPER::new ( 3545 my $self = $class->SUPER::new (
3415 binding => [], 3546 binding => [],
3416 commands => [], 3547 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3548 @_,
3419 ) 3549 )
3420} 3550}
3421 3551
3422# XXX: Do sorting? Argl... 3552my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3553 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3554my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3555 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3556my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3557 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3558
3559sub rebuild_spell_list {
3560 my ($self) = @_;
3561
3562 $CFClient::UI::ROOT->on_refresh ($self => sub {
3563 $self->clear;
3564
3565 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3566 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3567 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3568 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3569
3570 my $row = 0;
3571
3572 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3573 my $spell = $self->{spell}{$_};
3574
3575 $row++;
3576
3577 $self->add (0, $row, new CFClient::UI::Face
3578 face => $spell->{face},
3579 can_hover => 1,
3580 can_events => 1,
3581 tooltip => $spell->{message},
3582 );
3583
3584 $self->add (1, $row, new CFClient::UI::Label
3585 expand => 1,
3586 text => $spell->{name},
3587 can_hover => 1,
3588 can_events => 1,
3589 tooltip => $spell->{message},
3590 );
3591
3592 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3593 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3594 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3595
3596 # TODO: should be done via popup
3597 $self->add (5, $row, new CFClient::UI::Button
3598 text => "bind",
3599 tooltip => "bind spell readying (cast command) to key",
3600 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3601 );
3602 }
3603 });
3604}
3605
3423sub add_spell { 3606sub add_spell {
3424 my ($self, $spell) = @_; 3607 my ($self, $spell) = @_;
3608
3425 $self->{spells}->{$spell->{name}} = $spell; 3609 $self->{spell}->{$spell->{name}} = $spell;
3426 3610 $self->rebuild_spell_list;
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454} 3611}
3455 3612
3456sub remove_spell { 3613sub remove_spell {
3457 my ($self, $spell) = @_; 3614 my ($self, $spell) = @_;
3615
3458 delete $self->{spells}->{$spell->{name}}; 3616 delete $self->{spell}->{$spell->{name}};
3459 $self->rebuild_spell_list; 3617 $self->rebuild_spell_list;
3460} 3618}
3461 3619
3462############################################################################# 3620#############################################################################
3463 3621
3464package CFClient::UI::Root; 3622package CFClient::UI::Root;
3465 3623
3466our @ISA = CFClient::UI::Container::; 3624our @ISA = CFClient::UI::Container::;
3625
3626use List::Util qw(min max);
3467 3627
3468use CFClient::OpenGL; 3628use CFClient::OpenGL;
3469 3629
3470sub new { 3630sub new {
3471 my $class = shift; 3631 my $class = shift;
… …
3606 3766
3607 delete $queue{$widget+0}; 3767 delete $queue{$widget+0};
3608 3768
3609 my ($w, $h) = $widget->size_request; 3769 my ($w, $h) = $widget->size_request;
3610 3770
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3771 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3772 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3773
3774 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3775 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3776
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3777 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3778 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3779
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3780 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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