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.291 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.303 by elmex, Tue Jun 13 10:28:38 2006 UTC

… …
272 272
273 return unless $self->{visible}; 273 return unless $self->{visible};
274 274
275 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
276 276
277 delete $self->{visible};
277 delete $self->{root}; 278 delete $self->{root};
278 delete $self->{visible};
279 279
280 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
282 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
… …
315} 315}
316 316
317sub move_abs { 317sub move_abs {
318 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
319 319
320 $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;
321 $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;
322 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
323 323
324 $self->update; 324 $self->update;
325} 325}
326 326
… …
593 593
594sub DESTROY { 594sub DESTROY {
595 my ($self) = @_; 595 my ($self) = @_;
596 596
597 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
598 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 601}
600 602
601############################################################################# 603#############################################################################
602 604
603package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
768} 770}
769 771
770sub add { 772sub add {
771 my ($self, $child) = @_; 773 my ($self, $child) = @_;
772 774
773 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
776} 777}
777 778
778sub remove { 779sub remove {
779 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
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};
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 }
1095 1103
1096 $self 1104 $self
1097} 1105}
1098 1106
1099sub add { 1107sub add {
1100 my ($self, @widgets) = @_; 1108 my ($self, @widgets) = @_;
1101 1109
1102 $self->SUPER::add (@widgets); 1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1113}
1105 1114
1106sub border { 1115sub border {
1107 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1108} 1117}
1109 1118
1110sub size_request { 1119sub size_request {
1111 my ($self) = @_; 1120 my ($self) = @_;
1112 1121
1113 $self->{title}->size_request 1122 $self->{title_widget}->size_request
1114 if $self->{title}; 1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
1115 1127
1116 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1117 1129
1118 ( 1130 (
1119 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
1122} 1134}
1123 1135
1124sub size_allocate { 1136sub size_allocate {
1125 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1126 1138
1127 if ($self->{title}) { 1139 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1140 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1141 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1142 $self->{title_widget}->size_allocate ($w, $h);
1131 } 1143 }
1132 1144
1133 my $border = $self->border; 1145 my $border = $self->border;
1134 1146
1135 $h -= List::Util::max 0, $border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1137 1149
1138 $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};
1139} 1154}
1140 1155
1141sub button_down { 1156sub button_down {
1142 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1143 1158
… …
1189} 1204}
1190 1205
1191sub button_up { 1206sub button_up {
1192 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1193 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1194 !!delete $self->{motion} 1212 !!delete $self->{motion}
1195} 1213}
1196 1214
1197sub mouse_motion { 1215sub mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
… …
1233 1251
1234 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1235 1253
1236 $child->draw; 1254 $child->draw;
1237 1255
1238 if ($self->{title}) { 1256 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1257 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1241 } 1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1242} 1265}
1243 1266
1244############################################################################# 1267#############################################################################
1245 1268
1246package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1269 1292
1270 $child->set_parent ($self); 1293 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1272 1295
1273 $self->realloc; 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1274} 1303}
1275 1304
1276# 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?
1277sub clear { 1306sub clear {
1278 my ($self) = @_; 1307 my ($self) = @_;
… …
1658 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1659 }; 1688 };
1660 1689
1661 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1662 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1694
1663 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1667 } else { 1699 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1670 } 1702 }
1671 1703
1672 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1673} 1705}
1674 1706
… …
1952 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1953} 1985}
1954 1986
1955############################################################################# 1987#############################################################################
1956 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
1957package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1958 2028
1959our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1960 2030
1961my @tex = 2031my @tex =
… …
2304sub set_range { 2374sub set_range {
2305 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2306 2376
2307 ($range, $self->{range}) = ($self->{range}, $range); 2377 ($range, $self->{range}) = ($self->{range}, $range);
2308 2378
2309 $self->update
2310 if "@$range" ne "@{$self->{range}}"; 2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2311} 2383}
2312 2384
2313sub set_value { 2385sub set_value {
2314 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2315 2387
… …
2462sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2463sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2464 2536
2465############################################################################# 2537#############################################################################
2466 2538
2467package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2468 2540
2469our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2470 2542
2471use CFClient::OpenGL; 2543use CFClient::OpenGL;
2472 2544
… …
2474 my $class = shift; 2546 my $class = shift;
2475 2547
2476 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2477 fontsize => 1, 2549 fontsize => 1,
2478 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2479 #font => default_font 2552 #font => default_font
2480 @_, 2553 @_,
2481 2554
2482 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2483 par => [], 2556 par => [],
… …
2506 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2507 2580
2508 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2509 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2510 $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});
2511 2585
2512 $self->reflow; 2586 $self->reflow;
2513} 2587}
2514 2588
2515sub text_size { 2589sub text_size {
… …
2517 2591
2518 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2519 2593
2520 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $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});
2522 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2523 2598
2524 $layout->size 2599 $layout->size
2525} 2600}
2526 2601
… …
2565 2640
2566 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2567 2642
2568 delete $self->{texture}; 2643 delete $self->{texture};
2569 2644
2570 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2571 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2572 2647
2573 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2574 my $height = 0; 2649 my $height = 0;
2575 2650
… …
2578 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2579 2654
2580 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2581 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2582 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2583 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2584 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2585 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2586 $_->[1] = $h; 2662 $_->[1] = $h;
2587 } 2663 }
… …
2590 } 2666 }
2591 2667
2592 $self->{height} = $height; 2668 $self->{height} = $height;
2593 2669
2594 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2595 2671
2596 delete $self->{texture}; 2672 delete $self->{texture};
2597 } 2673 }
2598 2674
2599 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2600 glClearColor 0, 0, 0, 0; 2676 glClearColor 0, 0, 0, 0;
… …
2619 my $h = $par->[1]; 2695 my $h = $par->[1];
2620 2696
2621 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2622 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2623 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2624 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2625 2702
2626 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2627 2704
2628 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
… …
2742 $tooltip .= "\n\n" . (ref $widget) . "\n" 2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2743 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2744 . "req $widget->{req_w} $widget->{req_h}\n" 2821 . "req $widget->{req_w} $widget->{req_h}\n"
2745 . "visible $widget->{visible}"; 2822 . "visible $widget->{visible}";
2746 } 2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2747 2827
2748 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2749 markup => $tooltip, 2829 markup => $tooltip,
2750 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2751 fontsize => 0.8, 2831 fontsize => 0.8,
… …
2779 or return; 2859 or return;
2780 2860
2781 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2782 2862
2783 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2784 if $x + $self->{w} > $::WIDTH; 2864 if $x + $self->{w} > $self->{root}{w};
2785 2865
2786 $self->move_abs ($x, $y); 2866 $self->move_abs ($x, $y);
2787 }); 2867 });
2788} 2868}
2789 2869
… …
2884 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2885 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2886 } 2966 }
2887} 2967}
2888 2968
2889sub DESTROY { 2969sub destroy {
2890 my ($self) = @_; 2970 my ($self) = @_;
2891 2971
2892 $self->{timer}->cancel 2972 $self->{timer}->cancel
2893 if $self->{timer}; 2973 if $self->{timer};
2894 2974
2895 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2896} 2976}
2897 2977
2898############################################################################# 2978#############################################################################
2899 2979
2900package CFClient::UI::Buttonbar; 2980package CFClient::UI::Buttonbar;
… …
2928 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2929 if (!ref $widget) { 3009 if (!ref $widget) {
2930 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2931 can_hover => 1, 3011 can_hover => 1,
2932 can_events => 1, 3012 can_events => 1,
2933 text => $widget, 3013 markup => $widget,
2934 tooltip => $tooltip 3014 tooltip => $tooltip
2935 } 3015 }
2936 3016
2937 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2938 3018
… …
3100 3180
3101sub new { 3181sub new {
3102 my $class = shift; 3182 my $class = shift;
3103 3183
3104 my $self = $class->SUPER::new ( 3184 my $self = $class->SUPER::new (
3105 options => [], # [title, value, tooltip], ... 3185 options => [], # [value, title, longdesc], ...
3106 value => undef, 3186 value => undef,
3107 @_, 3187 @_,
3108 ); 3188 );
3109 3189
3110 $self->_set_value ($self->{value}); 3190 $self->_set_value ($self->{value});
… …
3116 my ($self, $ev) = @_; 3196 my ($self, $ev) = @_;
3117 3197
3118 my @menu_items; 3198 my @menu_items;
3119 3199
3120 for (@{ $self->{options} }) { 3200 for (@{ $self->{options} }) {
3121 my ($title, $value, $tooltip) = @$_; 3201 my ($value, $title, $tooltip) = @$_;
3122 3202
3123 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3124 } 3204 }
3125 3205
3126 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3127} 3207}
3128 3208
3129sub _set_value { 3209sub _set_value {
3130 my ($self, $value) = @_; 3210 my ($self, $value) = @_;
3131 3211
3132 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3133 or return; 3213 or return;
3134 3214
3135 $self->{value} = $item->[1]; 3215 $self->{value} = $item->[0];
3136 $self->set_markup ("$item->[0] ⇓"); 3216 $self->set_markup ("$item->[1] ⇓");
3137 $self->set_tooltip ($item->[2]); 3217 $self->set_tooltip ($item->[2]);
3138} 3218}
3139 3219
3140sub set_value { 3220sub set_value {
3141 my ($self, $value) = @_; 3221 my ($self, $value) = @_;
… …
3250 $item->{count}++; 3330 $item->{count}++;
3251 } else { 3331 } else {
3252 $item->{count} = 1; 3332 $item->{count} = 1;
3253 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
3254 } 3334 }
3255 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
3256 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
3257 delete $item->{label}; 3337 delete $item->{label};
3258 } else { 3338 } else {
3259 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
3260 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
3279 3359
3280 $self->reorder; 3360 $self->reorder;
3281 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
3282} 3362}
3283 3363
3284sub DESTROY { 3364sub destroy {
3285 my ($self) = @_; 3365 my ($self) = @_;
3286 3366
3287 $self->{timer}->cancel; 3367 $self->{timer}->cancel;
3288 3368
3289 $self->SUPER::DESTROY; 3369 $self->SUPER::destroy;
3290} 3370}
3291 3371
3292############################################################################# 3372#############################################################################
3293 3373
3294package CFClient::UI::Inventory; 3374package CFClient::UI::Inventory;
… …
3542 commands => [], 3622 commands => [],
3543 @_, 3623 @_,
3544 ) 3624 )
3545} 3625}
3546 3626
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");
3547my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3633my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3548 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell."); 3634 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3549my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3635my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3550 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation."); 3636 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3551my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3637my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552 "<b>Damage</b>. The amount of damage the spell deals when it hits."); 3638 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3553 3639
3554sub rebuild_spell_list { 3640sub rebuild_spell_list {
3555 my ($self) = @_; 3641 my ($self) = @_;
3556 3642
3557 $CFClient::UI::ROOT->on_refresh ($self => sub { 3643 $CFClient::UI::ROOT->on_refresh ($self => sub {
3558 $self->clear; 3644 $self->clear;
3559 3645
3646 return unless $::CONN;
3647
3560 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name"); 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);
3561 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3650 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3562 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3651 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3563 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3652 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3564 3653
3565 my $row = 0; 3654 my $row = 0;
3566 3655
3567 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3656 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3568 my $spell = $self->{spell}{$_}; 3657 my $spell = $self->{spell}{$_};
3569 3658
3570 $row++; 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});
3571 3686
3572 $self->add (0, $row, new CFClient::UI::Face 3687 $self->add (0, $row, new CFClient::UI::Face
3573 face => $spell->{face}, 3688 face => $spell->{face},
3574 can_hover => 1, 3689 can_hover => 1,
3575 can_events => 1, 3690 can_events => 1,
3576 tooltip => $spell->{message}, 3691 tooltip => $tooltip,
3692 on_button_down => $spell_cb,
3577 ); 3693 );
3578 3694
3579 $self->add (1, $row, new CFClient::UI::Label 3695 $self->add (1, $row, new CFClient::UI::Label
3580 expand => 1, 3696 expand => 1,
3581 text => $spell->{name}, 3697 text => $spell->{name},
3582 can_hover => 1, 3698 can_hover => 1,
3583 can_events => 1, 3699 can_events => 1,
3584 tooltip => $spell->{message}, 3700 tooltip => $tooltip,
3701 on_button_down => $spell_cb,
3585 ); 3702 );
3586 3703
3704 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3587 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3705 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3588 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3706 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3589 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3707 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3590
3591 # TODO: should be done via popup
3592 $self->add (5, $row, new CFClient::UI::Button
3593 text => "bind",
3594 tooltip => "bind spell readying (cast command) to key",
3595 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3596 );
3597 } 3708 }
3598 }); 3709 });
3599} 3710}
3600 3711
3601sub add_spell { 3712sub add_spell {
… …
3607 3718
3608sub remove_spell { 3719sub remove_spell {
3609 my ($self, $spell) = @_; 3720 my ($self, $spell) = @_;
3610 3721
3611 delete $self->{spell}->{$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} = {};
3612 $self->rebuild_spell_list; 3730 $self->rebuild_spell_list;
3613} 3731}
3614 3732
3615############################################################################# 3733#############################################################################
3616 3734

Diff Legend

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