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.356 by root, Wed Dec 6 00:15:12 2006 UTC vs.
Revision 1.385 by root, Fri Jul 20 16:32:17 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
11use CFPlus::Pod; 10use CFPlus::Pod;
… …
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) { 23 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 28 $TOOLTIP->hide;
29 29
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 32
32 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
33 34
34 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
35 36
… …
43 } 44 }
44 } 45 }
45 } 46 }
46 47
47 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
49}); 51});
50 52
51sub get_layout { 53sub get_layout {
52 my $layout; 54 my $layout;
… …
235 h => undef, 237 h => undef,
236 can_events => 1, 238 can_events => 1,
237 @_ 239 @_
238 }, $class; 240 }, $class;
239 241
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 243
242 for (keys %$self) { 244 for (keys %$self) {
243 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
245 } 247 }
… …
262 264
263sub destroy { 265sub destroy {
264 my ($self) = @_; 266 my ($self) = @_;
265 267
266 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
267 %$self = (); 270 %$self = ();
271}
272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
268} 275}
269 276
270sub show { 277sub show {
271 my ($self) = @_; 278 my ($self) = @_;
272 279
… …
313sub set_visibility { 320sub set_visibility {
314 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
315 322
316 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
317 324
318 $visible ? $self->hide 325 $visible ? $self->show
319 : $self->show; 326 : $self->hide;
320} 327}
321 328
322sub toggle_visibility { 329sub toggle_visibility {
323 my ($self) = @_; 330 my ($self) = @_;
324 331
… …
502 509
503 defined wantarray and CFPlus::guard { 510 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 512 @{ $self->{signal_cb}{$signal} };
506 } 513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
507} 520}
508 521
509my %has_coords = ( 522my %has_coords = (
510 button_down => 1, 523 button_down => 1,
511 button_up => 1, 524 button_up => 1,
… …
523 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
524 : (); 537 : ();
525 538
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 540
528 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 550}
533 551
534sub find_widget { 552sub find_widget {
535 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
536 554
… …
544} 562}
545 563
546sub set_parent { 564sub set_parent {
547 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
548 566
549 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
551} 569}
552 570
553sub realloc { 571sub realloc {
554 my ($self) = @_; 572 my ($self) = @_;
… …
633 my ($self) = @_; 651 my ($self) = @_;
634 652
635 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
636} 654}
637 655
656my $cntx;#d#
638sub DESTROY { 657sub DESTROY {
639 my ($self) = @_; 658 my ($self) = @_;
640 659
641 return if CFPlus::in_destruct; 660 return if CFPlus::in_destruct;
642
643 delete $WIDGET{$self+0};
644 661
645 eval { $self->destroy }; 662 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
647} 666}
648 667
649############################################################################# 668#############################################################################
650 669
651package CFPlus::UI::DrawBG; 670package CFPlus::UI::DrawBG;
… …
925 944
926############################################################################# 945#############################################################################
927 946
928package CFPlus::UI::ViewPort; 947package CFPlus::UI::ViewPort;
929 948
949use List::Util qw(min max);
950
930our @ISA = CFPlus::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
931 952
932sub new { 953sub new {
933 my $class = shift; 954 my $class = shift;
934 955
… …
965} 986}
966 987
967sub set_offset { 988sub set_offset {
968 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
969 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
970 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
972 997
998 $self->emit (changed => $x, $y);
973 $self->update; 999 $self->update;
1000 }
974} 1001}
975 1002
976# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local { 1004sub coord2local {
978 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
1014 1041
1015############################################################################# 1042#############################################################################
1016 1043
1017package CFPlus::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
1018 1045
1019our @ISA = CFPlus::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
1020 1047
1021sub new { 1048sub new {
1022 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
1023 1050
1024 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
1025 1052
1026 my $self; 1053 my $self;
1027 1054
1028 my $slider = new CFPlus::UI::Slider 1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
1029 vertical => 1, 1065 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1067 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1070 },
1034 ; 1071 ;
1035 1072
1036 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1038 can_events => 1, 1076 can_events => 1,
1039 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1040 %arg, 1081 %arg,
1041 ); 1082 );
1042 1083
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
1098 $self->SUPER::add_at (0, 0, $self->{vp});
1099
1044 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1045 1101
1046 $self 1102 $self
1047} 1103}
1048 1104
… …
1052 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1053 1109
1054 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1055} 1111}
1056 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142}
1143
1057sub invoke_mouse_wheel { 1144sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1145 my ($self, $ev) = @_;
1059 1146
1060 return 0 unless $ev->{dy}; # only vertical movements 1147 return 0 unless $ev->{dy}; # only vertical movements for now
1061 1148
1062 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev);
1063 1150
1064 1 1151 1
1065} 1152}
1066 1153
1067sub update_slider { 1154sub invoke_button_down {
1068 my ($self) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1069 1156
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1157 if ($ev->{button} == 2) {
1071} 1158 $self->grab_focus;
1072 1159
1073sub update { 1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1074 my ($self) = @_; 1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1075 1165
1076 $self->SUPER::update; 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1077 1169
1078 $self->update_slider; 1170 return 1;
1171 }
1172
1173 0
1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1079} 1195}
1080 1196
1081sub invoke_size_allocate { 1197sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1083 1199
1084 $self->update_slider; 1200 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1202}
1088 1203
1089############################################################################# 1204#############################################################################
1090 1205
… …
1240 1355
1241my @border = 1356my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244 1359
1360my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png);
1363
1245sub new { 1364sub new {
1246 my ($class, %arg) = @_; 1365 my ($class, %arg) = @_;
1247 1366
1248 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
1249 bg => [1, 1, 1, 1], 1368 bg => [1, 1, 1, 1],
… …
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418 1537
1419 my $border = $self->border; 1538 my $border = $self->border;
1420 1539
1421 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1422 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1544 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1545
1546 # move
1547 my $w2 = ($w - $border) * .5;
1548 my $h2 = ($h - $border) * .5;
1549 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1552
1553 # resize
1554 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1556 unless $self->{has_close_button};
1557 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1426 1559
1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1429 1562
1430 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1461 1594
1462sub new { 1595sub new {
1463 my $class = shift; 1596 my $class = shift;
1464 1597
1465 $class->SUPER::new ( 1598 $class->SUPER::new (
1599 children => [],
1466 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1467 @_, 1602 @_,
1468 ) 1603 )
1469} 1604}
1470 1605
1471sub children { 1606sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473} 1608}
1474 1609
1610# TODO: store row/col info in child widget and use standard add/del
1475sub add { 1611sub add {
1476 my ($self) = shift; 1612 my $self = shift;
1613
1614 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1615 $self->add_at (@_);
1616}
1617
1618sub add_at {
1619 my $self = shift;
1477 1620
1478 while (@_) { 1621 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1622 my ($col, $row, $child) = splice @_, 0, 3, ();
1623
1480 $child->set_parent ($self); 1624 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child; 1625 $self->{children}[$row][$col] = $child;
1482 } 1626 }
1483 1627
1484 $self->{force_realloc} = 1; 1628 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1; 1629 $self->{force_size_alloc} = 1;
1486 $self->realloc; 1630 $self->realloc;
1487} 1631}
1488 1632
1489sub remove { 1633sub remove {
1490 my ($self, $child) = @_; 1634 my ($self, $child) = @_;
1491 1635
1492 # TODO: not yet implemented 1636 for (@{ $self->{children} }) {
1637 for (@{ $_ || [] }) {
1638 $_ = undef if $_ == $child;
1639 }
1640 }
1493} 1641}
1494 1642
1495# TODO: move to container class maybe? send children a signal on removal? 1643# TODO: move to container class maybe? send children a signal on removal?
1496sub clear { 1644sub clear {
1497 my ($self) = @_; 1645 my ($self) = @_;
… …
1546 my ($ws, $hs) = $self->get_wh; 1694 my ($ws, $hs) = $self->get_wh;
1547 1695
1548 my $req_w = (sum @$ws) || 1; 1696 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1697 my $req_h = (sum @$hs) || 1;
1550 1698
1551 # TODO: nicer code && do row_expand 1699 # TODO: nicer code
1552 my @col_expand = @{$self->{col_expand}}; 1700 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1701 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1702 my $col_expand = (sum @col_expand) || 1;
1555 1703
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1705
1560 CFPlus::UI::harmonize $ws; 1706 CFPlus::UI::harmonize $ws;
1707
1708 my @row_expand = @{$self->{row_expand}};
1709 @row_expand = (1) x @$ws unless @row_expand;
1710 my $row_expand = (sum @row_expand) || 1;
1711
1712 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1713
1561 CFPlus::UI::harmonize $hs; 1714 CFPlus::UI::harmonize $hs;
1562 1715
1563 my $y; 1716 my $y;
1564 1717
1565 for my $r (0 .. $#{$self->{children}}) { 1718 for my $r (0 .. $#{$self->{children}}) {
… …
1605 my ($self) = @_; 1758 my ($self) = @_;
1606 1759
1607 for (grep $_, @{$self->{children}}) { 1760 for (grep $_, @{$self->{children}}) {
1608 $_->draw for grep $_, @$_; 1761 $_->draw for grep $_, @$_;
1609 } 1762 }
1763}
1764
1765#############################################################################
1766
1767package CFPlus::UI::Fixed;
1768
1769use List::Util qw(min max);
1770
1771our @ISA = CFPlus::UI::Container::;
1772
1773sub add {
1774 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1775
1776 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1777 $self->SUPER::add ($child);
1778}
1779
1780sub _scale($$$) {
1781 my ($mode, $val, $max) = @_;
1782
1783 $mode eq "abs" ? $val
1784 : $mode eq "rel" ? $val * $max
1785 : 0
1786}
1787
1788sub size_request {
1789 my ($self) = @_;
1790
1791 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1792
1793 # determine overall size by querying abs widgets
1794 for my $child ($self->visible_children) {
1795 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1796
1797 if ($pos eq "abs") {
1798 $w = _scale $size, $w, $child->{req_w};
1799 $h = _scale $size, $h, $child->{req_h};
1800
1801 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1802 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1803 }
1804 }
1805
1806 my $W = $x2 - $x1;
1807 my $H = $y2 - $y1;
1808
1809 # now layout remaining widgets
1810 for my $child ($self->visible_children) {
1811 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1812
1813 if ($pos ne "abs") {
1814 $x = _scale $pos, $x, $W;
1815 $y = _scale $pos, $x, $H;
1816 $w = _scale $size, $w, $child->{req_w};
1817 $h = _scale $size, $h, $child->{req_h};
1818
1819 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1820 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1821 }
1822 }
1823
1824 my $W = $x2 - $x1;
1825 my $H = $y2 - $y1;
1826
1827 ($W, $H)
1828}
1829
1830sub invoke_size_allocate {
1831 my ($self, $W, $H) = @_;
1832
1833 for my $child ($self->visible_children) {
1834 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1835
1836 $x = _scale $pos, $x, $W;
1837 $y = _scale $pos, $x, $H;
1838 $w = _scale $size, $w, $child->{req_w};
1839 $h = _scale $size, $h, $child->{req_h};
1840
1841 $child->configure ($x, $y, $w, $h);
1842 }
1843
1844 1
1610} 1845}
1611 1846
1612############################################################################# 1847#############################################################################
1613 1848
1614package CFPlus::UI::Box; 1849package CFPlus::UI::Box;
… …
1900 active_fg => [0, 0, 0], 2135 active_fg => [0, 0, 0],
1901 can_hover => 1, 2136 can_hover => 1,
1902 can_focus => 1, 2137 can_focus => 1,
1903 valign => 0, 2138 valign => 0,
1904 can_events => 1, 2139 can_events => 1,
2140 ellipsise => 0,
1905 #text => ... 2141 #text => ...
1906 #hidden => "*", 2142 #hidden => "*",
1907 @_ 2143 @_
1908 ) 2144 )
1909} 2145}
… …
1953 my $mod = $ev->{mod}; 2189 my $mod = $ev->{mod};
1954 my $sym = $ev->{sym}; 2190 my $sym = $ev->{sym};
1955 my $uni = $ev->{unicode}; 2191 my $uni = $ev->{unicode};
1956 2192
1957 my $text = $self->get_text; 2193 my $text = $self->get_text;
2194
2195 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1958 2196
1959 if ($uni == 8) { 2197 if ($uni == 8) {
1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2198 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961 } elsif ($uni == 127) { 2199 } elsif ($uni == 127) {
1962 substr $text, $self->{cursor}, 1, ""; 2200 substr $text, $self->{cursor}, 1, "";
1963 } elsif ($sym == CFPlus::SDLK_LEFT) { 2201 } elsif ($sym == CFPlus::SDLK_LEFT) {
1964 --$self->{cursor} if $self->{cursor}; 2202 --$self->{cursor} if $self->{cursor};
1965 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2203 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1966 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2204 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1967 } elsif ($sym == CFPlus::SDLK_HOME) { 2205 } elsif ($sym == CFPlus::SDLK_HOME) {
2206 # what a hack
1968 $self->{cursor} = 0; 2207 $self->{cursor} =
2208 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2209 ? length $1
2210 : 0;
1969 } elsif ($sym == CFPlus::SDLK_END) { 2211 } elsif ($sym == CFPlus::SDLK_END) {
2212 # uh, again
2213 $self->{cursor} =
2214 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1970 $self->{cursor} = length $text; 2215 ? $self->{cursor} + length $1
2216 : length $self->{text};
1971 } elsif ($uni == 21) { # ctrl-u 2217 } elsif ($uni == 21) { # ctrl-u
1972 $text = ""; 2218 $text = "";
1973 $self->{cursor} = 0; 2219 $self->{cursor} = 0;
1974 } elsif ($uni == 27) { 2220 } elsif ($uni == 27) {
1975 $self->emit ('escape'); 2221 $self->emit ('escape');
1976 } elsif ($uni) { 2222 } elsif ($uni == 0x0d) {
2223 substr $text, $self->{cursor}++, 0, "\012";
2224 } elsif ($uni >= 0x20) {
1977 substr $text, $self->{cursor}++, 0, chr $uni; 2225 substr $text, $self->{cursor}++, 0, chr $uni;
1978 } else { 2226 } else {
1979 return 0; 2227 return 0;
1980 } 2228 }
1981 2229
1982 $self->_set_text ($text); 2230 $self->_set_text ($text);
1983 2231
1984 $self->realloc; 2232 $self->realloc;
2233 $self->update;
1985 2234
1986 1 2235 1
1987} 2236}
1988 2237
1989sub invoke_focus_in { 2238sub invoke_focus_in {
… …
2058 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2307 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2059 glEnd; 2308 glEnd;
2060 } 2309 }
2061} 2310}
2062 2311
2312#############################################################################
2313
2063package CFPlus::UI::Entry; 2314package CFPlus::UI::Entry;
2064 2315
2065our @ISA = CFPlus::UI::EntryBase::; 2316our @ISA = CFPlus::UI::EntryBase::;
2066 2317
2067use CFPlus::OpenGL; 2318use CFPlus::OpenGL;
… …
2069sub invoke_key_down { 2320sub invoke_key_down {
2070 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
2071 2322
2072 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
2073 2324
2074 if ($sym == 13) { 2325 if ($ev->{uni} == 0x0d || $sym == 13) {
2075 unshift @{$self->{history}}, 2326 unshift @{$self->{history}},
2076 my $txt = $self->get_text; 2327 my $txt = $self->get_text;
2077 2328
2078 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
2079 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
… …
2109 1 2360 1
2110} 2361}
2111 2362
2112############################################################################# 2363#############################################################################
2113 2364
2365package CFPlus::UI::TextEdit;
2366
2367our @ISA = CFPlus::UI::EntryBase::;
2368
2369use CFPlus::OpenGL;
2370
2371sub move_cursor_ver {
2372 my ($self, $dy) = @_;
2373
2374 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2375
2376 $y += $dy;
2377
2378 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2379 $self->{cursor} = $index;
2380 delete $self->{cur_h};
2381 $self->update;
2382 return;
2383 }
2384}
2385
2386sub invoke_key_down {
2387 my ($self, $ev) = @_;
2388
2389 my $sym = $ev->{sym};
2390
2391 if ($sym == CFPlus::SDLK_UP) {
2392 $self->move_cursor_ver (-1);
2393 } elsif ($sym == CFPlus::SDLK_DOWN) {
2394 $self->move_cursor_ver (+1);
2395 } else {
2396 return $self->SUPER::invoke_key_down ($ev)
2397 }
2398
2399 1
2400}
2401
2402#############################################################################
2403
2114package CFPlus::UI::Button; 2404package CFPlus::UI::Button;
2115 2405
2116our @ISA = CFPlus::UI::Label::; 2406our @ISA = CFPlus::UI::Label::;
2117 2407
2118use CFPlus::OpenGL; 2408use CFPlus::OpenGL;
2119 2409
2120my @tex = 2410my @tex =
2121 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2122 qw(b1_button_active.png); 2412 qw(b1_button_inactive.png b1_button_active.png);
2123 2413
2124sub new { 2414sub new {
2125 my $class = shift; 2415 my $class = shift;
2126 2416
2127 $class->SUPER::new ( 2417 $class->SUPER::new (
2128 padding_x => 4, 2418 padding_x => 4,
2129 padding_y => 4, 2419 padding_y => 4,
2130 fg => [1, 1, 1], 2420 fg => [1.0, 1.0, 1.0],
2131 active_fg => [0, 0, 1], 2421 active_fg => [0.8, 0.8, 0.8],
2132 can_hover => 1, 2422 can_hover => 1,
2133 align => 0, 2423 align => 0,
2134 valign => 0, 2424 valign => 0,
2135 can_events => 1, 2425 can_events => 1,
2136 @_ 2426 @_
… …
2154 2444
2155 glEnable GL_TEXTURE_2D; 2445 glEnable GL_TEXTURE_2D;
2156 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2157 glColor 0, 0, 0, 1; 2447 glColor 0, 0, 0, 1;
2158 2448
2449 my $tex = $tex[$GRAB == $self];
2159 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2160 2451
2161 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2162 2453
2163 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2164} 2455}
… …
2260 or Carp::croak "'path' or 'tex' attributes required"; 2551 or Carp::croak "'path' or 'tex' attributes required";
2261 2552
2262 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2553 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2263 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2554 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2264 2555
2265 Scalar::Util::weaken $texture_cache{$self->{path}}; 2556 CFPlus::weaken $texture_cache{$self->{path}};
2266 2557
2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2558 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2268 2559
2269 $self 2560 $self
2270} 2561}
… …
2643sub invoke_mouse_wheel { 2934sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_; 2935 my ($self, $ev) = @_;
2645 2936
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2937 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647 2938
2939 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2940
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2941 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2649 2942
2650 ! ! $delta 2943 ! ! $delta
2651} 2944}
2652 2945
2653sub update { 2946sub update {
… …
2763 #font => default_font 3056 #font => default_font
2764 @_, 3057 @_,
2765 3058
2766 layout => (new CFPlus::Layout), 3059 layout => (new CFPlus::Layout),
2767 par => [], 3060 par => [],
3061 max_par => 0,
2768 height => 0, 3062 height => 0,
2769 children => [ 3063 children => [
2770 (new CFPlus::UI::Empty expand => 1), 3064 (new CFPlus::UI::Empty expand => 1),
2771 (new CFPlus::UI::Slider vertical => 1), 3065 (new CFPlus::UI::Slider vertical => 1),
2772 ], 3066 ],
… …
2895 wrapped => 1, 3189 wrapped => 1,
2896 }; 3190 };
2897 3191
2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3192 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899 push @{$self->{par}}, $para; 3193 push @{$self->{par}}, $para;
3194 }
3195
3196 if (my $max = $self->{max_par}) {
3197 shift @{$self->{par}} while @{$self->{par}} > $max;
2900 } 3198 }
2901 3199
2902 $self->{need_reflow}++; 3200 $self->{need_reflow}++;
2903 $self->update; 3201 $self->update;
2904} 3202}
… …
3212 3510
3213sub new { 3511sub new {
3214 my $class = shift; 3512 my $class = shift;
3215 3513
3216 my $self = $class->SUPER::new ( 3514 my $self = $class->SUPER::new (
3515 size_w => 32,
3516 size_h => 8,
3217 aspect => 1, 3517 aspect => 1,
3218 can_events => 0, 3518 can_events => 0,
3219 @_, 3519 @_,
3220 ); 3520 );
3221 3521
3222 if ($self->{anim} && $self->{animspeed}) { 3522 if ($self->{anim} && $self->{animspeed}) {
3223 Scalar::Util::weaken (my $widget = $self); 3523 CFPlus::weaken (my $widget = $self);
3224 3524
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3225 $self->{timer} = Event->timer ( 3527 $self->{timer} = Event->timer (
3226 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3227 hard => 1, 3528 parked => 1,
3228 interval => $self->{animspeed},
3229 cb => sub { 3529 cb => sub {
3530 return unless $::CONN && $widget;
3531
3230 ++$widget->{frame}; 3532 ++$widget->{frame};
3533 $widget->update_face;
3231 $widget->update; 3534 $widget->update;
3535
3536 $widget->update_timer;
3232 }, 3537 },
3233 ); 3538 );
3539
3540 $self->update_face;
3541 $self->update_timer;
3234 } 3542 }
3235 3543
3236 $self 3544 $self
3237} 3545}
3238 3546
3547sub update_timer {
3548 my ($self) = @_;
3549
3550 return unless $self->{timer};
3551
3552 if ($self->{visible}) {
3553 $self->{timer}->at (
3554 $self->{anim_start}
3555 + $self->{animspeed}
3556 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3557 );
3558 $self->{timer}->start;
3559 } else {
3560 $self->{timer}->stop;
3561 }
3562}
3563
3564sub update_face {
3565 my ($self) = @_;
3566
3567 return unless $::CONN;
3568
3569 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3570 if ($anim && @$anim) {
3571 delete $self->{wait_face};
3572 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3573 }
3574 }
3575}
3576
3239sub size_request { 3577sub size_request {
3240 (32, 8) 3578 my ($self) = @_;
3579
3580 if ($::CONN) {
3581 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3582 if (my $tex = $::CONN->{texture}[$faceid]) {
3583 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3584 } else {
3585 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3586 $self->realloc;
3587 });
3588 }
3589 }
3590 }
3591
3592 ($self->{size_w} || 8, $self->{size_h} || 8)
3241} 3593}
3242 3594
3243sub update { 3595sub update {
3244 my ($self) = @_; 3596 my ($self) = @_;
3245 3597
3246 return unless $self->{visible}; 3598 return unless $self->{visible};
3247 3599
3248 $self->SUPER::update; 3600 $self->SUPER::update;
3249} 3601}
3250 3602
3603sub invoke_visibility_change {
3604 my ($self) = @_;
3605
3606 $self->update_timer;
3607
3608 0
3609}
3610
3251sub _draw { 3611sub _draw {
3252 my ($self) = @_; 3612 my ($self) = @_;
3253 3613
3254 return unless $::CONN; 3614 return unless $::CONN;
3255 3615
3256 $self->SUPER::_draw; 3616 $self->SUPER::_draw;
3257 3617
3258 my $face;
3259
3260 if ($self->{frame}) {
3261 my $anim = $::CONN->{anim}[$self->{anim}]; 3618 my $faceid = $::CONN->{faceid}[$self->{face}]
3262 3619 or return;
3263 $face = $anim->[ $self->{frame} % @$anim ]
3264 if $anim && @$anim;
3265 }
3266 3620
3267 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3621 my $tex = $::CONN->{texture}[$faceid];
3268 3622
3269 if ($tex) { 3623 if ($tex) {
3270 glEnable GL_TEXTURE_2D; 3624 glEnable GL_TEXTURE_2D;
3271 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3272 glColor 0, 0, 0, 1; 3626 glColor 0, 0, 0, 1;
… …
3276} 3630}
3277 3631
3278sub destroy { 3632sub destroy {
3279 my ($self) = @_; 3633 my ($self) = @_;
3280 3634
3281 $self->{timer}->cancel 3635 (delete $self->{timer})->cancel
3282 if $self->{timer}; 3636 if $self->{timer};
3283 3637
3284 $self->SUPER::destroy; 3638 $self->SUPER::destroy;
3285} 3639}
3286 3640
… …
3482} 3836}
3483 3837
3484sub add { 3838sub add {
3485 my ($self, $title, $widget, $tooltip) = @_; 3839 my ($self, $title, $widget, $tooltip) = @_;
3486 3840
3487 Scalar::Util::weaken $self; 3841 CFPlus::weaken $self;
3488 3842
3489 $self->{buttonbar}->add (new CFPlus::UI::Button 3843 $self->{buttonbar}->add (new CFPlus::UI::Button
3490 markup => $title, 3844 markup => $title,
3491 tooltip => $tooltip, 3845 tooltip => $tooltip,
3492 on_activate => sub { $self->set_current_page ($widget) }, 3846 on_activate => sub { $self->set_current_page ($widget) },
… …
3576 my $self = $class->SUPER::new ( 3930 my $self = $class->SUPER::new (
3577 fontsize => 0.8, 3931 fontsize => 0.8,
3578 @_, 3932 @_,
3579 ); 3933 );
3580 3934
3581 Scalar::Util::weaken (my $this = $self); 3935 CFPlus::weaken (my $this = $self);
3582 3936
3583 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3937 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3584 3938
3585 $self 3939 $self
3586} 3940}
… …
3709 $self->SUPER::destroy; 4063 $self->SUPER::destroy;
3710} 4064}
3711 4065
3712############################################################################# 4066#############################################################################
3713 4067
3714package CFPlus::UI::Inventory;
3715
3716our @ISA = CFPlus::UI::Table::;
3717
3718sub new {
3719 my $class = shift;
3720
3721 my $self = $class->SUPER::new (
3722 col_expand => [0, 1, 0],
3723 items => [],
3724 @_,
3725 );
3726
3727 $self->set_sort_order (undef);
3728
3729 $self
3730}
3731
3732sub update_items {
3733 my ($self) = @_;
3734
3735 $self->clear;
3736
3737 my @item = $self->{sort}->(@{ $self->{items} });
3738
3739 my @adds;
3740 my $row = 0;
3741 for my $item ($self->{sort}->(@{ $self->{items} })) {
3742 CFPlus::Item::update_widgets $item;
3743
3744 push @adds, 0, $row, $item->{face_widget};
3745 push @adds, 1, $row, $item->{desc_widget};
3746 push @adds, 2, $row, $item->{weight_widget};
3747
3748 $row++;
3749 }
3750
3751 $self->add (@adds);
3752}
3753
3754sub set_sort_order {
3755 my ($self, $order) = @_;
3756
3757 $self->{sort} = $order ||= sub {
3758 sort {
3759 $a->{type} <=> $b->{type}
3760 or $a->{name} cmp $b->{name}
3761 } @_
3762 };
3763
3764 $self->update_items;
3765}
3766
3767sub set_items {
3768 my ($self, $items) = @_;
3769
3770 $self->{items} = [$items ? values %$items : ()];
3771 $self->update_items;
3772}
3773
3774#############################################################################
3775
3776package CFPlus::UI::SpellList;
3777
3778our @ISA = CFPlus::UI::Table::;
3779
3780sub new {
3781 my $class = shift;
3782
3783 my $self = $class->SUPER::new (
3784 binding => [],
3785 commands => [],
3786 @_,
3787 )
3788}
3789
3790my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3791
3792my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3793 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3794my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3795 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3796my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3797 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3798my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3799 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3800my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3801 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3802
3803sub rebuild_spell_list {
3804 my ($self) = @_;
3805
3806 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3807 $self->clear;
3808
3809 return unless $::CONN;
3810
3811 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3812 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3813 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3814 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3815 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3816
3817 my $row = 0;
3818
3819 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3820 my $spell = $self->{spell}{$_};
3821
3822 $row++;
3823
3824 my $spell_cb = sub {
3825 my ($widget, $ev) = @_;
3826
3827 if ($ev->{button} == 1) {
3828 $::CONN->user_send ("cast $spell->{name}");
3829 } elsif ($ev->{button} == 2) {
3830 $::CONN->user_send ("invoke $spell->{name}");
3831 } elsif ($ev->{button} == 3) {
3832 my $shortname = CFPlus::shorten $spell->{name}, 14;
3833 (new CFPlus::UI::Menu
3834 items => [
3835 ["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3836 ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3837 ],
3838 )->popup ($ev);
3839 } else {
3840 return 0;
3841 }
3842
3843 1
3844 };
3845
3846 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3847
3848 #TODO: add path info to tooltip
3849 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3850
3851 $self->add (0, $row, new CFPlus::UI::Face
3852 face => $spell->{face},
3853 can_hover => 1,
3854 can_events => 1,
3855 tooltip => $tooltip,
3856 on_button_down => $spell_cb,
3857 );
3858
3859 $self->add (1, $row, new CFPlus::UI::Label
3860 expand => 1,
3861 text => $spell->{name},
3862 can_hover => 1,
3863 can_events => 1,
3864 tooltip => $tooltip,
3865 on_button_down => $spell_cb,
3866 );
3867
3868 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3869 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3870 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3871 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3872 }
3873 });
3874}
3875
3876sub add_spell {
3877 my ($self, $spell) = @_;
3878
3879 $self->{spell}->{$spell->{name}} = $spell;
3880 $self->rebuild_spell_list;
3881}
3882
3883sub remove_spell {
3884 my ($self, $spell) = @_;
3885
3886 delete $self->{spell}->{$spell->{name}};
3887 $self->rebuild_spell_list;
3888}
3889
3890sub clear_spells {
3891 my ($self) = @_;
3892
3893 $self->{spell} = {};
3894 $self->rebuild_spell_list;
3895}
3896
3897#############################################################################
3898
3899package CFPlus::UI::Root; 4068package CFPlus::UI::Root;
3900 4069
3901our @ISA = CFPlus::UI::Container::; 4070our @ISA = CFPlus::UI::Container::;
3902 4071
3903use List::Util qw(min max); 4072use List::Util qw(min max);
… …
3910 my $self = $class->SUPER::new ( 4079 my $self = $class->SUPER::new (
3911 visible => 1, 4080 visible => 1,
3912 @_, 4081 @_,
3913 ); 4082 );
3914 4083
3915 Scalar::Util::weaken ($self->{root} = $self); 4084 CFPlus::weaken ($self->{root} = $self);
3916 4085
3917 $self 4086 $self
3918} 4087}
3919 4088
3920sub size_request { 4089sub size_request {
… …
4115 while ($self->{post_alloc_hook}) { 4284 while ($self->{post_alloc_hook}) {
4116 $_->() 4285 $_->()
4117 for values %{delete $self->{post_alloc_hook}}; 4286 for values %{delete $self->{post_alloc_hook}};
4118 } 4287 }
4119 4288
4120
4121 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4289 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4122 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4290 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4123 glClear GL_COLOR_BUFFER_BIT; 4291 glClear GL_COLOR_BUFFER_BIT;
4124 4292
4125 glMatrixMode GL_PROJECTION; 4293 glMatrixMode GL_PROJECTION;

Diff Legend

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