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.280 by root, Mon Jun 5 01:22:08 2006 UTC vs.
Revision 1.303 by elmex, Tue Jun 13 10:28:38 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;
388 389
389 $self->realloc; 390 $self->realloc;
390} 391}
391 392
392sub set_tooltip { 393sub set_tooltip {
… …
399 400
400 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
401 402
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
404 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
405 } 406 }
406} 407}
407 408
408# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
409sub coord2local { 410sub coord2local {
… …
592 593
593sub DESTROY { 594sub DESTROY {
594 my ($self) = @_; 595 my ($self) = @_;
595 596
596 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
597 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 601}
599 602
600############################################################################# 603#############################################################################
601 604
602package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
767} 770}
768 771
769sub add { 772sub add {
770 my ($self, $child) = @_; 773 my ($self, $child) = @_;
771 774
772 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
775} 777}
776 778
777sub remove { 779sub remove {
778 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1071 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);
1072 1074
1073sub new { 1075sub new {
1074 my ($class, %arg) = @_; 1076 my ($class, %arg) = @_;
1075
1076 my $title = delete $arg{title};
1077 1077
1078 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1081 border => 0.6,
… …
1083 min_w => 16, 1083 min_w => 16,
1084 min_h => 16, 1084 min_h => 16,
1085 %arg, 1085 %arg,
1086 ); 1086 );
1087 1087
1088 $self->{title} = new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1089 align => 0,
1090 valign => 1, 1090 valign => 1,
1091 text => $title, 1091 text => $self->{title},
1092 fontsize => $self->{border} 1092 fontsize => $self->{border},
1093 if defined $title; 1093 if exists $self->{title};
1094
1095 unless ($self->{no_close_button}) {
1096 $self->{close_btn} =
1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn});
1102 }
1094 1103
1095 $self 1104 $self
1096} 1105}
1097 1106
1098sub add { 1107sub add {
1099 my ($self, @widgets) = @_; 1108 my ($self, @widgets) = @_;
1100 1109
1101 $self->SUPER::add (@widgets); 1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1113}
1104 1114
1105sub border { 1115sub border {
1106 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1107} 1117}
1108 1118
1109sub size_request { 1119sub size_request {
1110 my ($self) = @_; 1120 my ($self) = @_;
1111 1121
1112 $self->{title}->size_request 1122 $self->{title_widget}->size_request
1113 if $self->{title}; 1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
1114 1127
1115 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1116 1129
1117 ( 1130 (
1118 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
1121} 1134}
1122 1135
1123sub size_allocate { 1136sub size_allocate {
1124 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1125 1138
1126 if ($self->{title}) { 1139 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1140 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1141 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1142 $self->{title_widget}->size_allocate ($w, $h);
1130 } 1143 }
1131 1144
1132 my $border = $self->border; 1145 my $border = $self->border;
1133 1146
1134 $h -= List::Util::max 0, $border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1136 1149
1137 $self->child->configure ($border, $border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
1153 if $self->{close_btn};
1138} 1154}
1139 1155
1140sub button_down { 1156sub button_down {
1141 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1142 1158
… …
1188} 1204}
1189 1205
1190sub button_up { 1206sub button_up {
1191 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1192 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1193 !!delete $self->{motion} 1212 !!delete $self->{motion}
1194} 1213}
1195 1214
1196sub mouse_motion { 1215sub mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
… …
1232 1251
1233 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1234 1253
1235 $child->draw; 1254 $child->draw;
1236 1255
1237 if ($self->{title}) { 1256 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1257 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1240 } 1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1241} 1265}
1242 1266
1243############################################################################# 1267#############################################################################
1244 1268
1245package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1268 1292
1269 $child->set_parent ($self); 1293 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1271 1295
1272 $self->realloc; 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1273} 1303}
1274 1304
1275# TODO: move to container class maybe? send children a signal on removal? 1305# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1306sub clear {
1277 my ($self) = @_; 1307 my ($self) = @_;
… …
1538 1568
1539 delete $self->{texture}; 1569 delete $self->{texture};
1540 $self->SUPER::update; 1570 $self->SUPER::update;
1541} 1571}
1542 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1543sub set_text { 1580sub set_text {
1544 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1545 1582
1546 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1547 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1548 1585
1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1550 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1551 1588
1589 delete $self->{size_req};
1552 $self->realloc; 1590 $self->realloc;
1553 $self->update; 1591 $self->update;
1554} 1592}
1555 1593
1556sub set_markup { 1594sub set_markup {
… …
1562 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1563 1601
1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1565 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1566 1604
1605 delete $self->{size_req};
1567 $self->realloc; 1606 $self->realloc;
1568 $self->update; 1607 $self->update;
1569} 1608}
1570 1609
1571sub size_request { 1610sub size_request {
1572 my ($self) = @_; 1611 my ($self) = @_;
1573 1612
1613 $self->{size_req} ||= do {
1574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1575 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1576 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1577 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1578 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579 1619
1580 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1581 1621
1582 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1583 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1584 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1585 1625
1586 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1587 1627
1588 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1589 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1590 } 1633 };
1591 1634
1592 ($w, $h) 1635 @{ $self->{size_req} }
1593} 1636}
1594 1637
1595sub size_allocate { 1638sub size_allocate {
1596 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1597 1640
… …
1606 1649
1607 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1608 delete $self->{texture}; 1651 delete $self->{texture};
1609 1652
1610 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1611} 1662}
1612 1663
1613sub _draw { 1664sub _draw {
1614 my ($self) = @_; 1665 my ($self) = @_;
1615 1666
… …
1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1636 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1637 }; 1688 };
1638 1689
1639 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1694
1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1641
1642 glColor_premultiply @{$self->{fg}}
1643 if $tex->{format} == GL_ALPHA;
1644
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1646 1703
1647 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1648} 1705}
1649 1706
1650############################################################################# 1707#############################################################################
… …
1666 can_hover => 1, 1723 can_hover => 1,
1667 can_focus => 1, 1724 can_focus => 1,
1668 valign => 0, 1725 valign => 0,
1669 can_events => 1, 1726 can_events => 1,
1670 #text => ... 1727 #text => ...
1728 #hidden => "*",
1671 @_ 1729 @_
1672 ) 1730 )
1673} 1731}
1674 1732
1675sub _set_text { 1733sub _set_text {
… …
1682 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1683 $self->{text} = $text; 1741 $self->{text} = $text;
1684 1742
1685 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1686 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1687 1746
1688 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1689 $self->update; 1750 $self->update;
1690} 1751}
1691 1752
1692sub set_text { 1753sub set_text {
1693 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1694 1755
1695 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1696 $self->_set_text ($text); 1757 $self->_set_text ($text);
1697
1698 $self->realloc;
1699} 1758}
1700 1759
1701sub get_text { 1760sub get_text {
1702 $_[0]{text} 1761 $_[0]{text}
1703} 1762}
… …
1925 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1926} 1985}
1927 1986
1928############################################################################# 1987#############################################################################
1929 1988
1989package CFClient::UI::ImageButton;
1990
1991our @ISA = CFClient::UI::Image::;
1992
1993use CFClient::OpenGL;
1994
1995my %textures;
1996
1997sub new {
1998 my $class = shift;
1999
2000 my $self = $class->SUPER::new (
2001 padding_x => 4,
2002 padding_y => 4,
2003 fg => [1, 1, 1],
2004 active_fg => [0, 0, 1],
2005 can_hover => 1,
2006 align => 0,
2007 valign => 0,
2008 can_events => 1,
2009 @_
2010 );
2011}
2012
2013sub activate { }
2014
2015sub button_up {
2016 my ($self, $ev, $x, $y) = @_;
2017
2018 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h};
2021
2022 1
2023}
2024
2025#############################################################################
2026
1930package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1931 2028
1932our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1933 2030
1934my @tex = 2031my @tex =
… …
2277sub set_range { 2374sub set_range {
2278 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2279 2376
2280 ($range, $self->{range}) = ($self->{range}, $range); 2377 ($range, $self->{range}) = ($self->{range}, $range);
2281 2378
2282 $self->update
2283 if "@$range" ne "@{$self->{range}}"; 2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2284} 2383}
2285 2384
2286sub set_value { 2385sub set_value {
2287 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2288 2387
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2437 2536
2438############################################################################# 2537#############################################################################
2439 2538
2440package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2441 2540
2442our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2443 2542
2444use CFClient::OpenGL; 2543use CFClient::OpenGL;
2445 2544
… …
2447 my $class = shift; 2546 my $class = shift;
2448 2547
2449 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2450 fontsize => 1, 2549 fontsize => 1,
2451 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2452 #font => default_font 2552 #font => default_font
2453 @_, 2553 @_,
2454 2554
2455 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2456 par => [], 2556 par => [],
… …
2479 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2480 2580
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 2583 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 2585
2485 $self->reflow; 2586 $self->reflow;
2486} 2587}
2487 2588
2488sub text_size { 2589sub text_size {
… …
2490 2591
2491 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2492 2593
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 2595 $layout->set_width ($self->{children}[0]{w} - $indent);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2496 2598
2497 $layout->size 2599 $layout->size
2498} 2600}
2499 2601
… …
2538 2640
2539 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2540 2642
2541 delete $self->{texture}; 2643 delete $self->{texture};
2542 2644
2543 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2647
2546 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2649 my $height = 0;
2548 2650
… …
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552 2654
2553 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2556 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h; 2662 $_->[1] = $h;
2560 } 2663 }
… …
2563 } 2666 }
2564 2667
2565 $self->{height} = $height; 2668 $self->{height} = $height;
2566 2669
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2568 2671
2569 delete $self->{texture}; 2672 delete $self->{texture};
2570 } 2673 }
2571 2674
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0, 0, 0, 0; 2676 glClearColor 0, 0, 0, 0;
… …
2592 my $h = $par->[1]; 2695 my $h = $par->[1];
2593 2696
2594 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2598 2702
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2600 2704
2601 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
… …
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2821 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2822 . "visible $widget->{visible}";
2719 } 2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2720 2827
2721 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2722 markup => $tooltip, 2829 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 2831 fontsize => 0.8,
… …
2752 or return; 2859 or return;
2753 2860
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 2862
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 2864 if $x + $self->{w} > $self->{root}{w};
2758 2865
2759 $self->move_abs ($x, $y); 2866 $self->move_abs ($x, $y);
2760 }); 2867 });
2761} 2868}
2762 2869
… …
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2859 } 2966 }
2860} 2967}
2861 2968
2862sub DESTROY { 2969sub destroy {
2863 my ($self) = @_; 2970 my ($self) = @_;
2864 2971
2865 $self->{timer}->cancel 2972 $self->{timer}->cancel
2866 if $self->{timer}; 2973 if $self->{timer};
2867 2974
2868 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2869} 2976}
2870 2977
2871############################################################################# 2978#############################################################################
2872 2979
2873package CFClient::UI::Buttonbar; 2980package CFClient::UI::Buttonbar;
… …
2894 ); 3001 );
2895 3002
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897 3004
2898 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2900 3007
2901 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2902 if (!ref $widget) { 3009 if (!ref $widget) {
2903 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2904 can_hover => 1, 3011 can_hover => 1,
2905 can_events => 1, 3012 can_events => 1,
2906 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2907 } 3015 }
2908 3016
2909 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2910 3018
2911 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3063} 3171}
3064 3172
3065############################################################################# 3173#############################################################################
3066 3174
3175package CFClient::UI::Combobox;
3176
3177use utf8;
3178
3179our @ISA = CFClient::UI::Button::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 options => [], # [value, title, longdesc], ...
3186 value => undef,
3187 @_,
3188 );
3189
3190 $self->_set_value ($self->{value});
3191
3192 $self
3193}
3194
3195sub button_down {
3196 my ($self, $ev) = @_;
3197
3198 my @menu_items;
3199
3200 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_;
3202
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 }
3205
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207}
3208
3209sub _set_value {
3210 my ($self, $value) = @_;
3211
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3213 or return;
3214
3215 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]);
3218}
3219
3220sub set_value {
3221 my ($self, $value) = @_;
3222
3223 return unless $self->{value} ne $value;
3224
3225 $self->_set_value ($value);
3226 $self->_emit (changed => $value);
3227}
3228
3229#############################################################################
3230
3067package CFClient::UI::Statusbox; 3231package CFClient::UI::Statusbox;
3068 3232
3069our @ISA = CFClient::UI::VBox::; 3233our @ISA = CFClient::UI::VBox::;
3070 3234
3071sub new { 3235sub new {
… …
3076 @_, 3240 @_,
3077 ); 3241 );
3078 3242
3079 Scalar::Util::weaken (my $this = $self); 3243 Scalar::Util::weaken (my $this = $self);
3080 3244
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { 3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082 $this->reorder;
3083 $this->update;
3084 });
3085 3246
3086 $self 3247 $self
3087} 3248}
3088 3249
3089sub reorder { 3250sub reorder {
3090 my ($self) = @_; 3251 my ($self) = @_;
3091 my $NOW = Time::HiRes::time; 3252 my $NOW = Time::HiRes::time;
3253
3254 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} };
3092 3258
3093 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
3094 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3095 } 3261 }
3096 3262
… …
3105 3271
3106 my $count = 10 + 1; 3272 my $count = 10 + 1;
3107 for my $item (@items) { 3273 for my $item (@items) {
3108 last unless --$count; 3274 last unless --$count;
3109 3275
3110 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
3111 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
3112 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
3113 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
3114 : $item->{text}; 3280 : $item->{text};
3115 3281
… …
3123 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
3124 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
3125 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
3126 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
3127 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
3128 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
3129 orig_alpha => $item->{fg}[3] || 1,
3130 can_events => 1, 3295 can_events => 1,
3131 can_hover => 1 3296 can_hover => 1
3132 }; 3297 };
3133 3298
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) { 3299 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2; 3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update; 3301 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1;
3141 $self->{timer}->interval (1/30); 3304 $self->{timer}->interval (1/30);
3305 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1;
3142 } 3307 }
3308
3309 push @widgets, $label;
3143 } 3310 }
3144 3311
3145 $self->clear; 3312 $self->clear;
3146 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
3147} 3314}
… …
3163 $item->{count}++; 3330 $item->{count}++;
3164 } else { 3331 } else {
3165 $item->{count} = 1; 3332 $item->{count} = 1;
3166 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
3167 } 3334 }
3168 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
3169 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
3170 delete $item->{label}; 3337 delete $item->{label};
3171 } else { 3338 } else {
3172 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
3173 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
3192 3359
3193 $self->reorder; 3360 $self->reorder;
3194 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
3195} 3362}
3196 3363
3197sub DESTROY { 3364sub destroy {
3198 my ($self) = @_; 3365 my ($self) = @_;
3199 3366
3200 $self->{timer}->cancel; 3367 $self->{timer}->cancel;
3201 3368
3202 $self->SUPER::DESTROY; 3369 $self->SUPER::destroy;
3203} 3370}
3204 3371
3205############################################################################# 3372#############################################################################
3206 3373
3207package CFClient::UI::Inventory; 3374package CFClient::UI::Inventory;
… …
3455 commands => [], 3622 commands => [],
3456 @_, 3623 @_,
3457 ) 3624 )
3458} 3625}
3459 3626
3460# XXX: Do sorting? Argl... 3627my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3628
3629my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3631my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3635my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3637my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3638 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3639
3640sub rebuild_spell_list {
3641 my ($self) = @_;
3642
3643 $CFClient::UI::ROOT->on_refresh ($self => sub {
3644 $self->clear;
3645
3646 return unless $::CONN;
3647
3648 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3649 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3650 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3651 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3652 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3653
3654 my $row = 0;
3655
3656 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3657 my $spell = $self->{spell}{$_};
3658
3659 $row++;
3660
3661 my $spell_cb = sub {
3662 my ($widget, $ev) = @_;
3663
3664 if ($ev->{button} == 1) {
3665 $::CONN->user_send ("cast $spell->{name}");
3666 } elsif ($ev->{button} == 2) {
3667 $::CONN->user_send ("invoke $spell->{name}");
3668 } elsif ($ev->{button} == 3) {
3669 (new CFClient::UI::Menu
3670 items => [
3671 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3672 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3673 ],
3674 )->popup ($ev);
3675 } else {
3676 return 0;
3677 }
3678
3679 1
3680 };
3681
3682 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3683
3684 #TODO: add path info to tooltip
3685 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3686
3687 $self->add (0, $row, new CFClient::UI::Face
3688 face => $spell->{face},
3689 can_hover => 1,
3690 can_events => 1,
3691 tooltip => $tooltip,
3692 on_button_down => $spell_cb,
3693 );
3694
3695 $self->add (1, $row, new CFClient::UI::Label
3696 expand => 1,
3697 text => $spell->{name},
3698 can_hover => 1,
3699 can_events => 1,
3700 tooltip => $tooltip,
3701 on_button_down => $spell_cb,
3702 );
3703
3704 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3705 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3706 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3707 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3708 }
3709 });
3710}
3711
3461sub add_spell { 3712sub add_spell {
3462 my ($self, $spell) = @_; 3713 my ($self, $spell) = @_;
3714
3463 $self->{spells}->{$spell->{name}} = $spell; 3715 $self->{spell}->{$spell->{name}} = $spell;
3464 3716 $self->rebuild_spell_list;
3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3466 face => $spell->{face},
3467 can_hover => 1,
3468 can_events => 1,
3469 tooltip => $spell->{message});
3470
3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472 text => $spell->{name},
3473 can_hover => 1,
3474 can_events => 1,
3475 tooltip => $spell->{message},
3476 expand => 1);
3477
3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481 expand => 1);
3482
3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484 text => "bind to key",
3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486}
3487
3488sub rebuild_spell_list {
3489 my ($self) = @_;
3490 $self->{tbl_idx} = 0;
3491 $self->add_spell ($_) for values %{$self->{spells}};
3492} 3717}
3493 3718
3494sub remove_spell { 3719sub remove_spell {
3495 my ($self, $spell) = @_; 3720 my ($self, $spell) = @_;
3721
3496 delete $self->{spells}->{$spell->{name}}; 3722 delete $self->{spell}->{$spell->{name}};
3723 $self->rebuild_spell_list;
3724}
3725
3726sub clear_spells {
3727 my ($self) = @_;
3728
3729 $self->{spell} = {};
3497 $self->rebuild_spell_list; 3730 $self->rebuild_spell_list;
3498} 3731}
3499 3732
3500############################################################################# 3733#############################################################################
3501 3734

Diff Legend

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