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.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 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}
… …
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 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);
… …
314} 315}
315 316
316sub move_abs { 317sub move_abs {
317 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
318 319
319 $self->{x} = List::Util::max 0, int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
322 323
323 $self->update; 324 $self->update;
324} 325}
325 326
… …
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 {
… …
590 593
591sub DESTROY { 594sub DESTROY {
592 my ($self) = @_; 595 my ($self) = @_;
593 596
594 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
595 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 601}
597 602
598############################################################################# 603#############################################################################
599 604
600package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
765} 770}
766 771
767sub add { 772sub add {
768 my ($self, $child) = @_; 773 my ($self, $child) = @_;
769 774
770 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
771
772 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
773} 777}
774 778
775sub remove { 779sub remove {
776 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
855 my $tex = $self->{texture} 859 my $tex = $self->{texture}
856 or return; 860 or return;
857 861
858 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glEnable GL_BLEND;
861 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
862 glColor 0, 0, 0, 1; 864 glColor 0, 0, 0, 1;
863 865
864 $tex->draw_quad (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
865 867
866 glDisable GL_BLEND;
867 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
868} 869}
869 870
870############################################################################# 871#############################################################################
871 872
… …
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1074
1074sub new { 1075sub new {
1075 my ($class, %arg) = @_; 1076 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1078 1077
1079 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1081 border => 0.6,
… …
1084 min_w => 16, 1083 min_w => 16,
1085 min_h => 16, 1084 min_h => 16,
1086 %arg, 1085 %arg,
1087 ); 1086 );
1088 1087
1089 $self->{title} = new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1089 align => 0,
1091 valign => 1, 1090 valign => 1,
1092 text => $title, 1091 text => $self->{title},
1093 fontsize => $self->{border} 1092 fontsize => $self->{border},
1094 if defined $title; 1093 if exists $self->{title};
1095 1094
1096 $self 1095 $self
1097} 1096}
1098 1097
1099sub add { 1098sub add {
1100 my ($self, @widgets) = @_; 1099 my ($self, @widgets) = @_;
1101 1100
1102 $self->SUPER::add (@widgets); 1101 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1103}
1105 1104
1106sub border { 1105sub border {
1107 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1108} 1107}
1109 1108
1110sub size_request { 1109sub size_request {
1111 my ($self) = @_; 1110 my ($self) = @_;
1112 1111
1113 $self->{title}->size_request 1112 $self->{title_widget}->size_request
1114 if $self->{title}; 1113 if $self->{title_widget};
1115 1114
1116 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1117 1116
1118 ( 1117 (
1119 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1122} 1121}
1123 1122
1124sub size_allocate { 1123sub size_allocate {
1125 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1126 1125
1127 if ($self->{title}) { 1126 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1127 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1128 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1129 $self->{title_widget}->size_allocate ($w, $h);
1131 } 1130 }
1132 1131
1133 my $border = $self->border; 1132 my $border = $self->border;
1134 1133
1135 $h -= List::Util::max 0, $border * 2; 1134 $h -= List::Util::max 0, $border * 2;
… …
1233 1232
1234 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1235 1234
1236 $child->draw; 1235 $child->draw;
1237 1236
1238 if ($self->{title}) { 1237 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1238 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1239 $self->{title_widget}->_draw;
1241 } 1240 }
1242} 1241}
1243 1242
1244############################################################################# 1243#############################################################################
1245 1244
… …
1269 1268
1270 $child->set_parent ($self); 1269 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1272 1271
1273 $self->realloc; 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1274} 1279}
1275 1280
1276# TODO: move to container class maybe? send children a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1282sub clear {
1278 my ($self) = @_; 1283 my ($self) = @_;
… …
1539 1544
1540 delete $self->{texture}; 1545 delete $self->{texture};
1541 $self->SUPER::update; 1546 $self->SUPER::update;
1542} 1547}
1543 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1544sub set_text { 1556sub set_text {
1545 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1546 1558
1547 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1548 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1549 1561
1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1552 1564
1565 delete $self->{size_req};
1553 $self->realloc; 1566 $self->realloc;
1554 $self->update; 1567 $self->update;
1555} 1568}
1556 1569
1557sub set_markup { 1570sub set_markup {
… …
1563 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564 1577
1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1567 1580
1581 delete $self->{size_req};
1568 $self->realloc; 1582 $self->realloc;
1569 $self->update; 1583 $self->update;
1570} 1584}
1571 1585
1572sub size_request { 1586sub size_request {
1573 my ($self) = @_; 1587 my ($self) = @_;
1574 1588
1589 $self->{size_req} ||= do {
1575 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1576 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1577 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1578 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1595
1581 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1582 1597
1583 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1584 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1585 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586 1601
1587 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1588 1603
1589 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1590 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1591 } 1609 };
1592 1610
1593 ($w, $h) 1611 @{ $self->{size_req} }
1594} 1612}
1595 1613
1596sub size_allocate { 1614sub size_allocate {
1597 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1598 1616
… …
1607 1625
1608 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1609 delete $self->{texture}; 1627 delete $self->{texture};
1610 1628
1611 $self->realloc; 1629 $self->realloc;
1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1612} 1638}
1613 1639
1614sub _draw { 1640sub _draw {
1615 my ($self) = @_; 1641 my ($self) = @_;
1616 1642
… …
1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1637 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1638 }; 1664 };
1639 1665
1640 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1642 1670
1643 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1644 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1645 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1646 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1647 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1648 } 1678 }
1649 1679
1650 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1651} 1681}
1652 1682
… …
1669 can_hover => 1, 1699 can_hover => 1,
1670 can_focus => 1, 1700 can_focus => 1,
1671 valign => 0, 1701 valign => 0,
1672 can_events => 1, 1702 can_events => 1,
1673 #text => ... 1703 #text => ...
1704 #hidden => "*",
1674 @_ 1705 @_
1675 ) 1706 )
1676} 1707}
1677 1708
1678sub _set_text { 1709sub _set_text {
… …
1685 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1686 $self->{text} = $text; 1717 $self->{text} = $text;
1687 1718
1688 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1689 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1690 1722
1691 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1692 $self->update; 1726 $self->update;
1693} 1727}
1694 1728
1695sub set_text { 1729sub set_text {
1696 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1697 1731
1698 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1699 $self->_set_text ($text); 1733 $self->_set_text ($text);
1700
1701 $self->realloc;
1702} 1734}
1703 1735
1704sub get_text { 1736sub get_text {
1705 $_[0]{text} 1737 $_[0]{text}
1706} 1738}
… …
1913} 1945}
1914 1946
1915sub _draw { 1947sub _draw {
1916 my ($self) = @_; 1948 my ($self) = @_;
1917 1949
1918 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920 if ($GRAB == $self) {
1921 $self->{fg} = $self->{active_fg};
1922 }
1923 1951
1924 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1927 1955
… …
2284sub set_range { 2312sub set_range {
2285 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2286 2314
2287 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2288 2316
2289 $self->update
2290 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2291} 2321}
2292 2322
2293sub set_value { 2323sub set_value {
2294 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2295 2325
… …
2442sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2443sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2444 2474
2445############################################################################# 2475#############################################################################
2446 2476
2447package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2448 2478
2449our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2450 2480
2451use CFClient::OpenGL; 2481use CFClient::OpenGL;
2452 2482
… …
2454 my $class = shift; 2484 my $class = shift;
2455 2485
2456 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2457 fontsize => 1, 2487 fontsize => 1,
2458 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2459 #font => default_font 2490 #font => default_font
2460 @_, 2491 @_,
2461 2492
2462 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2463 par => [], 2494 par => [],
… …
2486 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2487 2518
2488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2489 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490 $self->{layout}->set_width ($self->{children}[0]{w}); 2521 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491 2523
2492 $self->reflow; 2524 $self->reflow;
2493} 2525}
2494 2526
2495sub text_size { 2527sub text_size {
… …
2497 2529
2498 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2499 2531
2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $layout->set_width ($self->{children}[0]{w} - $indent); 2533 $layout->set_width ($self->{children}[0]{w} - $indent);
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2503 2536
2504 $layout->size 2537 $layout->size
2505} 2538}
2506 2539
… …
2545 2578
2546 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2547 2580
2548 delete $self->{texture}; 2581 delete $self->{texture};
2549 2582
2550 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552 2585
2553 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2554 my $height = 0; 2587 my $height = 0;
2555 2588
… …
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559 2592
2560 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2561 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2562 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2563 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2564 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2565 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2566 $_->[1] = $h; 2600 $_->[1] = $h;
2567 } 2601 }
… …
2570 } 2604 }
2571 2605
2572 $self->{height} = $height; 2606 $self->{height} = $height;
2573 2607
2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2575 2609
2576 delete $self->{texture}; 2610 delete $self->{texture};
2577 } 2611 }
2578 2612
2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2580 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2581 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2582 2616
2583 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2584 2618
2585 my $y0 = $top; 2619 my $y0 = $top;
… …
2599 my $h = $par->[1]; 2633 my $h = $par->[1];
2600 2634
2601 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2602 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2603 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2604 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2605 2640
2606 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2607 2642
2608 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2620sub _draw { 2655sub _draw {
2621 my ($self) = @_; 2656 my ($self) = @_;
2622 2657
2623 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2626 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2628 2663
2629 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2630 2665
2631} 2666}
… …
2722 $tooltip .= "\n\n" . (ref $widget) . "\n" 2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n" 2759 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}"; 2760 . "visible $widget->{visible}";
2726 } 2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2727 2765
2728 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2729 markup => $tooltip, 2767 markup => $tooltip,
2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2731 fontsize => 0.8, 2769 fontsize => 0.8,
… …
2759 or return; 2797 or return;
2760 2798
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762 2800
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH; 2802 if $x + $self->{w} > $self->{root}{w};
2765 2803
2766 $self->move_abs ($x, $y); 2804 $self->move_abs ($x, $y);
2767 }); 2805 });
2768} 2806}
2769 2807
… …
2858 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2859 2897
2860 if ($tex) { 2898 if ($tex) {
2861 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2864 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2866 } 2904 }
2867} 2905}
2868 2906
2869sub DESTROY { 2907sub destroy {
2870 my ($self) = @_; 2908 my ($self) = @_;
2871 2909
2872 $self->{timer}->cancel 2910 $self->{timer}->cancel
2873 if $self->{timer}; 2911 if $self->{timer};
2874 2912
2875 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2876} 2914}
2877 2915
2878############################################################################# 2916#############################################################################
2879 2917
2880package CFClient::UI::Buttonbar; 2918package CFClient::UI::Buttonbar;
… …
2901 ); 2939 );
2902 2940
2903 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2904 2942
2905 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2906 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2907 2945
2908 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2909 if (!ref $widget) { 2947 if (!ref $widget) {
2910 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2911 can_hover => 1, 2949 can_hover => 1,
2912 can_events => 1, 2950 can_events => 1,
2913 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2914 } 2953 }
2915 2954
2916 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2917 2956
2918 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
3069 $self->_emit (page_changed => $self->{multiplexer}{current}); 3108 $self->_emit (page_changed => $self->{multiplexer}{current});
3070} 3109}
3071 3110
3072############################################################################# 3111#############################################################################
3073 3112
3074package CFClient::UI::Statusbox; 3113package CFClient::UI::Combobox;
3075 3114
3115use utf8;
3116
3076our @ISA = CFClient::UI::VBox::; 3117our @ISA = CFClient::UI::Button::;
3077 3118
3078sub new { 3119sub new {
3079 my $class = shift; 3120 my $class = shift;
3080 3121
3081 $class->SUPER::new ( 3122 my $self = $class->SUPER::new (
3123 options => [], # [value, title, longdesc], ...
3124 value => undef,
3125 @_,
3126 );
3127
3128 $self->_set_value ($self->{value});
3129
3130 $self
3131}
3132
3133sub button_down {
3134 my ($self, $ev) = @_;
3135
3136 my @menu_items;
3137
3138 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_;
3140
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 }
3143
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145}
3146
3147sub _set_value {
3148 my ($self, $value) = @_;
3149
3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3151 or return;
3152
3153 $self->{value} = $item->[0];
3154 $self->set_markup ("$item->[1] ⇓");
3155 $self->set_tooltip ($item->[2]);
3156}
3157
3158sub set_value {
3159 my ($self, $value) = @_;
3160
3161 return unless $self->{value} ne $value;
3162
3163 $self->_set_value ($value);
3164 $self->_emit (changed => $value);
3165}
3166
3167#############################################################################
3168
3169package CFClient::UI::Statusbox;
3170
3171our @ISA = CFClient::UI::VBox::;
3172
3173sub new {
3174 my $class = shift;
3175
3176 my $self = $class->SUPER::new (
3082 fontsize => 0.8, 3177 fontsize => 0.8,
3083 @_, 3178 @_,
3084 ) 3179 );
3180
3181 Scalar::Util::weaken (my $this = $self);
3182
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184
3185 $self
3085} 3186}
3086 3187
3087sub reorder { 3188sub reorder {
3088 my ($self) = @_; 3189 my ($self) = @_;
3089 my $NOW = time; 3190 my $NOW = Time::HiRes::time;
3191
3192 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} };
3090 3196
3091 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
3092 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093 } 3199 }
3094 3200
… …
3097 my @items = sort { 3203 my @items = sort {
3098 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
3099 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
3100 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
3101 3207
3208 $self->{timer}->interval (1);
3209
3102 my $count = 10 + 1; 3210 my $count = 10 + 1;
3103 for my $item (@items) { 3211 for my $item (@items) {
3104 last unless --$count; 3212 last unless --$count;
3105 3213
3106 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
3107 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
3108 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
3109 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
3110 : $item->{text}; 3218 : $item->{text};
3111 3219
… …
3119 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
3120 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
3121 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
3122 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
3123 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
3124 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
3125 can_events => 1, 3233 can_events => 1,
3126 can_hover => 1 3234 can_hover => 1
3127 }; 3235 };
3236
3237 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3238 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3239 $label->update;
3240 $label->set_max_size (undef, $label->{req_h} * $diff)
3241 if $diff < 1;
3242 $self->{timer}->interval (1/30);
3243 } else {
3244 $label->{fg}[3] = $item->{fg}[3] || 1;
3245 }
3246
3247 push @widgets, $label;
3128 } 3248 }
3129 3249
3130 $self->clear; 3250 $self->clear;
3131 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
3132} 3252}
… …
3137 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
3138 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
3139 3259
3140 return unless $text; 3260 return unless $text;
3141 3261
3142 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143 3263
3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145 3265
3146 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
3147 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
3148 $item->{count}++; 3268 $item->{count}++;
3149 } else { 3269 } else {
3150 $item->{count} = 1; 3270 $item->{count} = 1;
3151 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
3152 } 3272 }
3153 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
3154 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
3155 delete $item->{label}; 3275 delete $item->{label};
3156 } else { 3276 } else {
3157 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
3158 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
3177 3297
3178 $self->reorder; 3298 $self->reorder;
3179 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
3180} 3300}
3181 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
3182############################################################################# 3310#############################################################################
3183 3311
3184package CFClient::UI::Inventory; 3312package CFClient::UI::Inventory;
3185 3313
3186our @ISA = CFClient::UI::ScrolledWindow::; 3314our @ISA = CFClient::UI::ScrolledWindow::;
… …
3432 commands => [], 3560 commands => [],
3433 @_, 3561 @_,
3434 ) 3562 )
3435} 3563}
3436 3564
3437# XXX: Do sorting? Argl... 3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3438sub add_spell { 3650sub add_spell {
3439 my ($self, $spell) = @_; 3651 my ($self, $spell) = @_;
3652
3440 $self->{spells}->{$spell->{name}} = $spell; 3653 $self->{spell}->{$spell->{name}} = $spell;
3441 3654 $self->rebuild_spell_list;
3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3443 face => $spell->{face},
3444 can_hover => 1,
3445 can_events => 1,
3446 tooltip => $spell->{message});
3447
3448 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => $spell->{name},
3450 can_hover => 1,
3451 can_events => 1,
3452 tooltip => $spell->{message},
3453 expand => 1);
3454
3455 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458 expand => 1);
3459
3460 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461 text => "bind to key",
3462 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463}
3464
3465sub rebuild_spell_list {
3466 my ($self) = @_;
3467 $self->{tbl_idx} = 0;
3468 $self->add_spell ($_) for values %{$self->{spells}};
3469} 3655}
3470 3656
3471sub remove_spell { 3657sub remove_spell {
3472 my ($self, $spell) = @_; 3658 my ($self, $spell) = @_;
3659
3473 delete $self->{spells}->{$spell->{name}}; 3660 delete $self->{spell}->{$spell->{name}};
3474 $self->rebuild_spell_list; 3661 $self->rebuild_spell_list;
3475} 3662}
3476 3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3477############################################################################# 3671#############################################################################
3478 3672
3479package CFClient::UI::Root; 3673package CFClient::UI::Root;
3480 3674
3481our @ISA = CFClient::UI::Container::; 3675our @ISA = CFClient::UI::Container::;
3676
3677use List::Util qw(min max);
3482 3678
3483use CFClient::OpenGL; 3679use CFClient::OpenGL;
3484 3680
3485sub new { 3681sub new {
3486 my $class = shift; 3682 my $class = shift;
… …
3621 3817
3622 delete $queue{$widget+0}; 3818 delete $queue{$widget+0};
3623 3819
3624 my ($w, $h) = $widget->size_request; 3820 my ($w, $h) = $widget->size_request;
3625 3821
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3822 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3823 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3824
3825 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3826 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628 3827
3629 $w = $widget->{force_w} if exists $widget->{force_w}; 3828 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h}; 3829 $h = $widget->{force_h} if exists $widget->{force_h};
3631 3830
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3831 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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