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.283 by root, Mon Jun 5 02:28:30 2006 UTC vs.
Revision 1.304 by elmex, Tue Jun 13 11:01:04 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
… …
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) = @_;
… …
1553 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1554 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1555 1585
1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1557 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1588
1558 delete $self->{req_h}; 1589 delete $self->{size_req};
1559
1560 $self->realloc; 1590 $self->realloc;
1561 $self->update; 1591 $self->update;
1562} 1592}
1563 1593
1564sub set_markup { 1594sub set_markup {
… …
1569 1599
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1601
1572 $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;
1573 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1604
1574 delete $self->{req_h}; 1605 delete $self->{size_req};
1575
1576 $self->realloc; 1606 $self->realloc;
1577 $self->update; 1607 $self->update;
1578} 1608}
1579 1609
1580sub size_request { 1610sub size_request {
1581 my ($self) = @_; 1611 my ($self) = @_;
1582 1612
1583 if (exists $self->{req_h}) { 1613 $self->{size_req} ||= do {
1584 @$self{qw(req_w req_h)}
1585 } else {
1586 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1587 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
… …
1599 1627
1600 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1601 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1602 } 1630 }
1603 1631
1604 ($w, $h) 1632 [$w, $h]
1605 } 1633 };
1634
1635 @{ $self->{size_req} }
1606} 1636}
1607 1637
1608sub size_allocate { 1638sub size_allocate {
1609 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1610 1640
… …
1619 1649
1620 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1621 delete $self->{texture}; 1651 delete $self->{texture};
1622 1652
1623 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1624} 1662}
1625 1663
1626sub _draw { 1664sub _draw {
1627 my ($self) = @_; 1665 my ($self) = @_;
1628 1666
… …
1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1649 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1650 }; 1688 };
1651 1689
1652 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 {
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654
1655 glColor_premultiply @{$self->{fg}}
1656 if $tex->{format} == GL_ALPHA;
1657
1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1659 1703
1660 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1661} 1705}
1662 1706
1663############################################################################# 1707#############################################################################
… …
1679 can_hover => 1, 1723 can_hover => 1,
1680 can_focus => 1, 1724 can_focus => 1,
1681 valign => 0, 1725 valign => 0,
1682 can_events => 1, 1726 can_events => 1,
1683 #text => ... 1727 #text => ...
1728 #hidden => "*",
1684 @_ 1729 @_
1685 ) 1730 )
1686} 1731}
1687 1732
1688sub _set_text { 1733sub _set_text {
… …
1695 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1696 $self->{text} = $text; 1741 $self->{text} = $text;
1697 1742
1698 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1699 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h}; 1745 delete $self->{size_req};
1701 1746
1702 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1703 1748
1704 $self->realloc; 1749 $self->realloc;
1705 $self->update; 1750 $self->update;
… …
1939 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1940} 1985}
1941 1986
1942############################################################################# 1987#############################################################################
1943 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
1944package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1945 2028
1946our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1947 2030
1948my @tex = 2031my @tex =
… …
2291sub set_range { 2374sub set_range {
2292 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2293 2376
2294 ($range, $self->{range}) = ($self->{range}, $range); 2377 ($range, $self->{range}) = ($self->{range}, $range);
2295 2378
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}"; 2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2298} 2383}
2299 2384
2300sub set_value { 2385sub set_value {
2301 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2302 2387
… …
2449sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2451 2536
2452############################################################################# 2537#############################################################################
2453 2538
2454package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2455 2540
2456our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2457 2542
2458use CFClient::OpenGL; 2543use CFClient::OpenGL;
2459 2544
… …
2461 my $class = shift; 2546 my $class = shift;
2462 2547
2463 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2464 fontsize => 1, 2549 fontsize => 1,
2465 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2466 #font => default_font 2552 #font => default_font
2467 @_, 2553 @_,
2468 2554
2469 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2470 par => [], 2556 par => [],
… …
2493 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2494 2580
2495 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $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});
2498 2585
2499 $self->reflow; 2586 $self->reflow;
2500} 2587}
2501 2588
2502sub text_size { 2589sub text_size {
… …
2504 2591
2505 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2506 2593
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $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});
2509 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2510 2598
2511 $layout->size 2599 $layout->size
2512} 2600}
2513 2601
… …
2552 2640
2553 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2554 2642
2555 delete $self->{texture}; 2643 delete $self->{texture};
2556 2644
2557 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559 2647
2560 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2561 my $height = 0; 2649 my $height = 0;
2562 2650
… …
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566 2654
2567 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2569 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2570 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2573 $_->[1] = $h; 2662 $_->[1] = $h;
2574 } 2663 }
… …
2577 } 2666 }
2578 2667
2579 $self->{height} = $height; 2668 $self->{height} = $height;
2580 2669
2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2582 2671
2583 delete $self->{texture}; 2672 delete $self->{texture};
2584 } 2673 }
2585 2674
2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2587 glClearColor 0, 0, 0, 0; 2676 glClearColor 0, 0, 0, 0;
… …
2606 my $h = $par->[1]; 2695 my $h = $par->[1];
2607 2696
2608 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2609 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2610 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2611 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2612 2702
2613 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2614 2704
2615 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
… …
2729 $tooltip .= "\n\n" . (ref $widget) . "\n" 2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n" 2821 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}"; 2822 . "visible $widget->{visible}";
2733 } 2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2734 2827
2735 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2736 markup => $tooltip, 2829 markup => $tooltip,
2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738 fontsize => 0.8, 2831 fontsize => 0.8,
… …
2766 or return; 2859 or return;
2767 2860
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769 2862
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH; 2864 if $x + $self->{w} > $self->{root}{w};
2772 2865
2773 $self->move_abs ($x, $y); 2866 $self->move_abs ($x, $y);
2774 }); 2867 });
2775} 2868}
2776 2869
… …
2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2873 } 2966 }
2874} 2967}
2875 2968
2876sub DESTROY { 2969sub destroy {
2877 my ($self) = @_; 2970 my ($self) = @_;
2878 2971
2879 $self->{timer}->cancel 2972 $self->{timer}->cancel
2880 if $self->{timer}; 2973 if $self->{timer};
2881 2974
2882 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2883} 2976}
2884 2977
2885############################################################################# 2978#############################################################################
2886 2979
2887package CFClient::UI::Buttonbar; 2980package CFClient::UI::Buttonbar;
… …
2908 ); 3001 );
2909 3002
2910 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2911 3004
2912 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2913 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2914 3007
2915 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2916 if (!ref $widget) { 3009 if (!ref $widget) {
2917 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2918 can_hover => 1, 3011 can_hover => 1,
2919 can_events => 1, 3012 can_events => 1,
2920 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2921 } 3015 }
2922 3016
2923 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2924 3018
2925 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
3072sub set_current_page { 3166sub set_current_page {
3073 my ($self, $page) = @_; 3167 my ($self, $page) = @_;
3074 3168
3075 $self->{multiplexer}->set_current_page ($page); 3169 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current}); 3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3171}
3172
3173#############################################################################
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);
3077} 3227}
3078 3228
3079############################################################################# 3229#############################################################################
3080 3230
3081package CFClient::UI::Statusbox; 3231package CFClient::UI::Statusbox;
… …
3180 $item->{count}++; 3330 $item->{count}++;
3181 } else { 3331 } else {
3182 $item->{count} = 1; 3332 $item->{count} = 1;
3183 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
3184 } 3334 }
3185 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
3186 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
3187 delete $item->{label}; 3337 delete $item->{label};
3188 } else { 3338 } else {
3189 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
3190 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
3209 3359
3210 $self->reorder; 3360 $self->reorder;
3211 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
3212} 3362}
3213 3363
3214sub DESTROY { 3364sub destroy {
3215 my ($self) = @_; 3365 my ($self) = @_;
3216 3366
3217 $self->{timer}->cancel; 3367 $self->{timer}->cancel;
3218 3368
3219 $self->SUPER::DESTROY; 3369 $self->SUPER::destroy;
3220} 3370}
3221 3371
3222############################################################################# 3372#############################################################################
3223 3373
3224package CFClient::UI::Inventory; 3374package CFClient::UI::Inventory;
… …
3368 my ($self) = @_; 3518 my ($self) = @_;
3369 $self->ask_for_bind (1); 3519 $self->ask_for_bind (1);
3370} 3520}
3371 3521
3372sub ask_for_bind { 3522sub ask_for_bind {
3373 my ($self, $commit) = @_; 3523 my ($self, $commit, $end_cb) = @_;
3374 3524
3375 CFClient::Binder::open_binding_dialog (sub { 3525 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_; 3526 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets; 3528 $self->update_binding_widgets;
3379 $self->commit if $commit; 3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3380 }); 3531 });
3381} 3532}
3382 3533
3383# $mod and $sym are the modifiers and key symbol 3534# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands) 3535# $cmds is a array ref of strings (the commands)
… …
3402} 3553}
3403 3554
3404# this is a shortcut method that asks for a binding 3555# this is a shortcut method that asks for a binding
3405# and then just binds it. 3556# and then just binds it.
3406sub do_quick_binding { 3557sub do_quick_binding {
3407 my ($self, $cmds) = @_; 3558 my ($self, $cmds, $end_cb) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub { 3559 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2]; 3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 }); 3561 });
3411 $self->ask_for_bind (1); 3562 $self->ask_for_bind (1, $end_cb);
3412} 3563}
3413 3564
3414sub update_binding_widgets { 3565sub update_binding_widgets {
3415 my ($self) = @_; 3566 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding; 3567 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3472 commands => [], 3623 commands => [],
3473 @_, 3624 @_,
3474 ) 3625 )
3475} 3626}
3476 3627
3477# XXX: Do sorting? Argl... 3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3629
3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3640
3641sub rebuild_spell_list {
3642 my ($self) = @_;
3643
3644 $CFClient::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear;
3646
3647 return unless $::CONN;
3648
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655 my $row = 0;
3656
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_};
3659
3660 $row++;
3661
3662 my $spell_cb = sub {
3663 my ($widget, $ev) = @_;
3664
3665 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu
3671 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ],
3675 )->popup ($ev);
3676 } else {
3677 return 0;
3678 }
3679
3680 1
3681 };
3682
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688 $self->add (0, $row, new CFClient::UI::Face
3689 face => $spell->{face},
3690 can_hover => 1,
3691 can_events => 1,
3692 tooltip => $tooltip,
3693 on_button_down => $spell_cb,
3694 );
3695
3696 $self->add (1, $row, new CFClient::UI::Label
3697 expand => 1,
3698 text => $spell->{name},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 }
3710 });
3711}
3712
3478sub add_spell { 3713sub add_spell {
3479 my ($self, $spell) = @_; 3714 my ($self, $spell) = @_;
3715
3480 $self->{spells}->{$spell->{name}} = $spell; 3716 $self->{spell}->{$spell->{name}} = $spell;
3481 3717 $self->rebuild_spell_list;
3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509} 3718}
3510 3719
3511sub remove_spell { 3720sub remove_spell {
3512 my ($self, $spell) = @_; 3721 my ($self, $spell) = @_;
3722
3513 delete $self->{spells}->{$spell->{name}}; 3723 delete $self->{spell}->{$spell->{name}};
3724 $self->rebuild_spell_list;
3725}
3726
3727sub clear_spells {
3728 my ($self) = @_;
3729
3730 $self->{spell} = {};
3514 $self->rebuild_spell_list; 3731 $self->rebuild_spell_list;
3515} 3732}
3516 3733
3517############################################################################# 3734#############################################################################
3518 3735

Diff Legend

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