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.359 by root, Fri Dec 8 15:07:08 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 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;
… …
111 } 113 }
112 114
113 if ($GRAB) { 115 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 117 # mousewheel
116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
118 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
119 } else { 125 } else {
120 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
121 } 127 }
122 } 128 }
… …
235 h => undef, 241 h => undef,
236 can_events => 1, 242 can_events => 1,
237 @_ 243 @_
238 }, $class; 244 }, $class;
239 245
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 247
242 for (keys %$self) { 248 for (keys %$self) {
243 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
245 } 251 }
… …
262 268
263sub destroy { 269sub destroy {
264 my ($self) = @_; 270 my ($self) = @_;
265 271
266 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
267 %$self = (); 274 %$self = ();
275}
276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
268} 279}
269 280
270sub show { 281sub show {
271 my ($self) = @_; 282 my ($self) = @_;
272 283
… …
313sub set_visibility { 324sub set_visibility {
314 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
315 326
316 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
317 328
318 $visible ? $self->hide 329 $visible ? $self->show
319 : $self->show; 330 : $self->hide;
320} 331}
321 332
322sub toggle_visibility { 333sub toggle_visibility {
323 my ($self) = @_; 334 my ($self) = @_;
324 335
… …
502 513
503 defined wantarray and CFPlus::guard { 514 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 516 @{ $self->{signal_cb}{$signal} };
506 } 517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
507} 524}
508 525
509my %has_coords = ( 526my %has_coords = (
510 button_down => 1, 527 button_down => 1,
511 button_up => 1, 528 button_up => 1,
… …
523 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
524 : (); 541 : ();
525 542
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 544
528 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 554}
533 555
534sub find_widget { 556#sub find_widget {
535 my ($self, $x, $y) = @_; 557# in .xs
536
537 return () unless $self->{can_events};
538
539 return $self
540 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
541 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
542
543 ()
544}
545 558
546sub set_parent { 559sub set_parent {
547 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
548 561
549 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
551} 564}
552 565
553sub realloc { 566sub realloc {
554 my ($self) = @_; 567 my ($self) = @_;
… …
633 my ($self) = @_; 646 my ($self) = @_;
634 647
635 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
636} 649}
637 650
651my $cntx;#d#
638sub DESTROY { 652sub DESTROY {
639 my ($self) = @_; 653 my ($self) = @_;
640 654
641 return if CFPlus::in_destruct; 655 return if CFPlus::in_destruct;
642
643 delete $WIDGET{$self+0};
644 656
645 eval { $self->destroy }; 657 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659
660 delete $WIDGET{$self+0};
647} 661}
648 662
649############################################################################# 663#############################################################################
650 664
651package CFPlus::UI::DrawBG; 665package CFPlus::UI::DrawBG;
… …
925 939
926############################################################################# 940#############################################################################
927 941
928package CFPlus::UI::ViewPort; 942package CFPlus::UI::ViewPort;
929 943
944use List::Util qw(min max);
945
930our @ISA = CFPlus::UI::Window::; 946our @ISA = CFPlus::UI::Window::;
931 947
932sub new { 948sub new {
933 my $class = shift; 949 my $class = shift;
934 950
… …
965} 981}
966 982
967sub set_offset { 983sub set_offset {
968 my ($self, $x, $y) = @_; 984 my ($self, $x, $y) = @_;
969 985
986 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
987 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
988
989 if ($x != $self->{view_x} or $y != $self->{view_y}) {
970 $self->{view_x} = int $x; 990 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 991 $self->{view_y} = $y;
972 992
993 $self->emit (changed => $x, $y);
973 $self->update; 994 $self->update;
995 }
974} 996}
975 997
976# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local { 999sub coord2local {
978 my ($self, $x, $y) = @_; 1000 my ($self, $x, $y) = @_;
… …
993 my ($self, $x, $y) = @_; 1015 my ($self, $x, $y) = @_;
994 1016
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 1019 ) {
998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999 } else { 1021 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
1001 } 1023 }
1002} 1024}
1003 1025
… …
1014 1036
1015############################################################################# 1037#############################################################################
1016 1038
1017package CFPlus::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
1018 1040
1019our @ISA = CFPlus::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
1020 1042
1021sub new { 1043sub new {
1022 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
1023 1045
1024 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
1025 1047
1026 my $self; 1048 my $self;
1027 1049
1028 my $slider = new CFPlus::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
1051 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub {
1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 },
1057 ;
1058
1059 my $vslider = new CFPlus::UI::Slider
1029 vertical => 1, 1060 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1062 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1065 },
1034 ; 1066 ;
1035 1067
1036 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1038 can_events => 1, 1071 can_events => 1,
1039 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
1040 %arg, 1076 %arg,
1041 ); 1077 );
1042 1078
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085
1086 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y);
1088
1089 0
1090 },
1091 ;
1092
1093 $self->SUPER::add_at (0, 0, $self->{vp});
1094
1044 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
1045 1096
1046 $self 1097 $self
1047} 1098}
1048 1099
… …
1052 my ($self, $widget) = @_; 1103 my ($self, $widget) = @_;
1053 1104
1054 $self->{vp}->add ($self->{child} = $widget); 1105 $self->{vp}->add ($self->{child} = $widget);
1055} 1106}
1056 1107
1108sub update_slider {
1109 my ($self) = @_;
1110
1111 my $child = ($self->{vp} or return)->child;
1112
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115
1116 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) {
1118 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1119 : $self->{hslider}->hide;
1120 }
1121
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124
1125 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) {
1127 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1128 : $self->{vslider}->hide;
1129 }
1130}
1131
1132sub update {
1133 my ($self) = @_;
1134
1135 $self->update_slider;
1136 $self->SUPER::update;
1137}
1138
1057sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1059 1141
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev); 1142 $self->{vslider}->emit (mouse_wheel => $ev)
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev)
1146 if $ev->{dx};
1063 1147
1064 1 1148 1
1065} 1149}
1066 1150
1067sub update_slider { 1151sub invoke_button_down {
1068 my ($self) = @_; 1152 my ($self, $ev, $x, $y) = @_;
1069 1153
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1154 if ($ev->{button} == 2) {
1071} 1155 $self->grab_focus;
1072 1156
1073sub update { 1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1074 my ($self) = @_; 1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1075 1162
1076 $self->SUPER::update; 1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1077 1166
1078 $self->update_slider; 1167 return 1;
1168 }
1169
1170 0
1171}
1172
1173sub invoke_button_up {
1174 my ($self, $ev, $x, $y) = @_;
1175
1176 if (delete $self->{motion}) {
1177 return 1;
1178 }
1179
1180 0
1181}
1182
1183sub invoke_mouse_motion {
1184 my ($self, $ev, $x, $y) = @_;
1185
1186 if ($self->{motion}) {
1187 $self->{motion}->($ev, $x, $y);
1188 return 1;
1189 }
1190
1191 0
1079} 1192}
1080 1193
1081sub invoke_size_allocate { 1194sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1195 my ($self, $w, $h) = @_;
1083 1196
1084 $self->update_slider; 1197 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1198 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1199}
1088 1200
1089############################################################################# 1201#############################################################################
1090 1202
… …
1240 1352
1241my @border = 1353my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1354 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); 1355 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244 1356
1357my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png);
1360
1245sub new { 1361sub new {
1246 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
1247 1363
1248 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1249 bg => [1, 1, 1, 1], 1365 bg => [1, 1, 1, 1],
… …
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418 1534
1419 my $border = $self->border; 1535 my $border = $self->border;
1420 1536
1421 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1422 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542
1543 # move
1544 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549
1550 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1426 1556
1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1429 1559
1430 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1461 1591
1462sub new { 1592sub new {
1463 my $class = shift; 1593 my $class = shift;
1464 1594
1465 $class->SUPER::new ( 1595 $class->SUPER::new (
1596 children => [],
1466 col_expand => [], 1597 col_expand => [],
1598 row_expand => [],
1467 @_, 1599 @_,
1468 ) 1600 )
1469} 1601}
1470 1602
1471sub children { 1603sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1604 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473} 1605}
1474 1606
1607# TODO: store row/col info in child widget and use standard add/del
1475sub add { 1608sub add {
1476 my ($self) = shift; 1609 my $self = shift;
1610
1611 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1612 $self->add_at (@_);
1613}
1614
1615sub add_at {
1616 my $self = shift;
1477 1617
1478 while (@_) { 1618 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620
1480 $child->set_parent ($self); 1621 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child; 1622 $self->{children}[$row][$col] = $child;
1482 } 1623 }
1483 1624
1484 $self->{force_realloc} = 1; 1625 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1; 1626 $self->{force_size_alloc} = 1;
1486 $self->realloc; 1627 $self->realloc;
1487} 1628}
1488 1629
1489sub remove { 1630sub remove {
1490 my ($self, $child) = @_; 1631 my ($self, $child) = @_;
1491 1632
1492 # TODO: not yet implemented 1633 for (@{ $self->{children} }) {
1634 for (@{ $_ || [] }) {
1635 $_ = undef if $_ == $child;
1636 }
1637 }
1493} 1638}
1494 1639
1495# TODO: move to container class maybe? send children a signal on removal? 1640# TODO: move to container class maybe? send children a signal on removal?
1496sub clear { 1641sub clear {
1497 my ($self) = @_; 1642 my ($self) = @_;
… …
1546 my ($ws, $hs) = $self->get_wh; 1691 my ($ws, $hs) = $self->get_wh;
1547 1692
1548 my $req_w = (sum @$ws) || 1; 1693 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1694 my $req_h = (sum @$hs) || 1;
1550 1695
1551 # TODO: nicer code && do row_expand 1696 # TODO: nicer code
1552 my @col_expand = @{$self->{col_expand}}; 1697 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1698 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1699 my $col_expand = (sum @col_expand) || 1;
1555 1700
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1701 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1702
1560 CFPlus::UI::harmonize $ws; 1703 CFPlus::UI::harmonize $ws;
1704
1705 my @row_expand = @{$self->{row_expand}};
1706 @row_expand = (1) x @$ws unless @row_expand;
1707 my $row_expand = (sum @row_expand) || 1;
1708
1709 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1710
1561 CFPlus::UI::harmonize $hs; 1711 CFPlus::UI::harmonize $hs;
1562 1712
1563 my $y; 1713 my $y;
1564 1714
1565 for my $r (0 .. $#{$self->{children}}) { 1715 for my $r (0 .. $#{$self->{children}}) {
… …
1605 my ($self) = @_; 1755 my ($self) = @_;
1606 1756
1607 for (grep $_, @{$self->{children}}) { 1757 for (grep $_, @{$self->{children}}) {
1608 $_->draw for grep $_, @$_; 1758 $_->draw for grep $_, @$_;
1609 } 1759 }
1760}
1761
1762#############################################################################
1763
1764package CFPlus::UI::Fixed;
1765
1766use List::Util qw(min max);
1767
1768our @ISA = CFPlus::UI::Container::;
1769
1770sub add {
1771 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1772
1773 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1774 $self->SUPER::add ($child);
1775}
1776
1777sub _scale($$$) {
1778 my ($mode, $val, $max) = @_;
1779
1780 $mode eq "abs" ? $val
1781 : $mode eq "rel" ? $val * $max
1782 : 0
1783}
1784
1785sub size_request {
1786 my ($self) = @_;
1787
1788 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1789
1790 # determine overall size by querying abs widgets
1791 for my $child ($self->visible_children) {
1792 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1793
1794 if ($pos eq "abs") {
1795 $w = _scale $size, $w, $child->{req_w};
1796 $h = _scale $size, $h, $child->{req_h};
1797
1798 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1799 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1800 }
1801 }
1802
1803 my $W = $x2 - $x1;
1804 my $H = $y2 - $y1;
1805
1806 # now layout remaining widgets
1807 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1809
1810 if ($pos ne "abs") {
1811 $x = _scale $pos, $x, $W;
1812 $y = _scale $pos, $x, $H;
1813 $w = _scale $size, $w, $child->{req_w};
1814 $h = _scale $size, $h, $child->{req_h};
1815
1816 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1817 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1818 }
1819 }
1820
1821 my $W = $x2 - $x1;
1822 my $H = $y2 - $y1;
1823
1824 ($W, $H)
1825}
1826
1827sub invoke_size_allocate {
1828 my ($self, $W, $H) = @_;
1829
1830 for my $child ($self->visible_children) {
1831 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1832
1833 $x = _scale $pos, $x, $W;
1834 $y = _scale $pos, $x, $H;
1835 $w = _scale $size, $w, $child->{req_w};
1836 $h = _scale $size, $h, $child->{req_h};
1837
1838 $child->configure ($x, $y, $w, $h);
1839 }
1840
1841 1
1610} 1842}
1611 1843
1612############################################################################# 1844#############################################################################
1613 1845
1614package CFPlus::UI::Box; 1846package CFPlus::UI::Box;
… …
1955 my $sym = $ev->{sym}; 2187 my $sym = $ev->{sym};
1956 my $uni = $ev->{unicode}; 2188 my $uni = $ev->{unicode};
1957 2189
1958 my $text = $self->get_text; 2190 my $text = $self->get_text;
1959 2191
2192 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2193
1960 if ($uni == 8) { 2194 if ($uni == 8) {
1961 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2195 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1962 } elsif ($uni == 127) { 2196 } elsif ($uni == 127) {
1963 substr $text, $self->{cursor}, 1, ""; 2197 substr $text, $self->{cursor}, 1, "";
1964 } elsif ($sym == CFPlus::SDLK_LEFT) { 2198 } elsif ($sym == CFPlus::SDLK_LEFT) {
1965 --$self->{cursor} if $self->{cursor}; 2199 --$self->{cursor} if $self->{cursor};
1966 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2200 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1967 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2201 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1968 } elsif ($sym == CFPlus::SDLK_HOME) { 2202 } elsif ($sym == CFPlus::SDLK_HOME) {
2203 # what a hack
1969 $self->{cursor} = 0; 2204 $self->{cursor} =
2205 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2206 ? length $1
2207 : 0;
1970 } elsif ($sym == CFPlus::SDLK_END) { 2208 } elsif ($sym == CFPlus::SDLK_END) {
2209 # uh, again
2210 $self->{cursor} =
2211 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1971 $self->{cursor} = length $text; 2212 ? $self->{cursor} + length $1
2213 : length $self->{text};
1972 } elsif ($uni == 21) { # ctrl-u 2214 } elsif ($uni == 21) { # ctrl-u
1973 $text = ""; 2215 $text = "";
1974 $self->{cursor} = 0; 2216 $self->{cursor} = 0;
1975 } elsif ($uni == 27) { 2217 } elsif ($uni == 27) {
1976 $self->emit ('escape'); 2218 $self->emit ('escape');
1977 } elsif ($uni) { 2219 } elsif ($uni == 0x0d) {
2220 substr $text, $self->{cursor}++, 0, "\012";
2221 } elsif ($uni >= 0x20) {
1978 substr $text, $self->{cursor}++, 0, chr $uni; 2222 substr $text, $self->{cursor}++, 0, chr $uni;
1979 } else { 2223 } else {
1980 return 0; 2224 return 0;
1981 } 2225 }
1982 2226
… …
2073sub invoke_key_down { 2317sub invoke_key_down {
2074 my ($self, $ev) = @_; 2318 my ($self, $ev) = @_;
2075 2319
2076 my $sym = $ev->{sym}; 2320 my $sym = $ev->{sym};
2077 2321
2078 if ($sym == 13) { 2322 if ($ev->{uni} == 0x0d || $sym == 13) {
2079 unshift @{$self->{history}}, 2323 unshift @{$self->{history}},
2080 my $txt = $self->get_text; 2324 my $txt = $self->get_text;
2081 2325
2082 $self->{history_pointer} = -1; 2326 $self->{history_pointer} = -1;
2083 $self->{history_saveback} = ''; 2327 $self->{history_saveback} = '';
… …
2104 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2348 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2105 } else { 2349 } else {
2106 $self->set_text ($self->{history_saveback}); 2350 $self->set_text ($self->{history_saveback});
2107 } 2351 }
2108 2352
2109 } elsif ($ev->{unicode} >= 0x20) { 2353 } else {
2110 return $self->SUPER::invoke_key_down ($ev) 2354 return $self->SUPER::invoke_key_down ($ev)
2111 } 2355 }
2112 2356
2113 1 2357 1
2114} 2358}
… …
2160 2404
2161use CFPlus::OpenGL; 2405use CFPlus::OpenGL;
2162 2406
2163my @tex = 2407my @tex =
2164 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2408 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165 qw(b1_button_active.png); 2409 qw(b1_button_inactive.png b1_button_active.png);
2166 2410
2167sub new { 2411sub new {
2168 my $class = shift; 2412 my $class = shift;
2169 2413
2170 $class->SUPER::new ( 2414 $class->SUPER::new (
2171 padding_x => 4, 2415 padding_x => 4,
2172 padding_y => 4, 2416 padding_y => 4,
2173 fg => [1, 1, 1], 2417 fg => [1.0, 1.0, 1.0],
2174 active_fg => [0, 0, 1], 2418 active_fg => [0.8, 0.8, 0.8],
2175 can_hover => 1, 2419 can_hover => 1,
2176 align => 0, 2420 align => 0,
2177 valign => 0, 2421 valign => 0,
2178 can_events => 1, 2422 can_events => 1,
2179 @_ 2423 @_
… …
2197 2441
2198 glEnable GL_TEXTURE_2D; 2442 glEnable GL_TEXTURE_2D;
2199 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2200 glColor 0, 0, 0, 1; 2444 glColor 0, 0, 0, 1;
2201 2445
2446 my $tex = $tex[$GRAB == $self];
2202 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2447 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2203 2448
2204 glDisable GL_TEXTURE_2D; 2449 glDisable GL_TEXTURE_2D;
2205 2450
2206 $self->SUPER::_draw; 2451 $self->SUPER::_draw;
2207} 2452}
… …
2303 or Carp::croak "'path' or 'tex' attributes required"; 2548 or Carp::croak "'path' or 'tex' attributes required";
2304 2549
2305 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2550 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2306 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2551 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2307 2552
2308 Scalar::Util::weaken $texture_cache{$self->{path}}; 2553 CFPlus::weaken $texture_cache{$self->{path}};
2309 2554
2310 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2555 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2311 2556
2312 $self 2557 $self
2313} 2558}
… …
2686sub invoke_mouse_wheel { 2931sub invoke_mouse_wheel {
2687 my ($self, $ev) = @_; 2932 my ($self, $ev) = @_;
2688 2933
2689 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2934 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2690 2935
2936 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2937
2691 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2938 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2692 2939
2693 ! ! $delta 2940 ! ! $delta
2694} 2941}
2695 2942
2696sub update { 2943sub update {
… …
2806 #font => default_font 3053 #font => default_font
2807 @_, 3054 @_,
2808 3055
2809 layout => (new CFPlus::Layout), 3056 layout => (new CFPlus::Layout),
2810 par => [], 3057 par => [],
3058 max_par => 0,
2811 height => 0, 3059 height => 0,
2812 children => [ 3060 children => [
2813 (new CFPlus::UI::Empty expand => 1), 3061 (new CFPlus::UI::Empty expand => 1),
2814 (new CFPlus::UI::Slider vertical => 1), 3062 (new CFPlus::UI::Slider vertical => 1),
2815 ], 3063 ],
… …
2938 wrapped => 1, 3186 wrapped => 1,
2939 }; 3187 };
2940 3188
2941 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3189 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2942 push @{$self->{par}}, $para; 3190 push @{$self->{par}}, $para;
3191 }
3192
3193 if (my $max = $self->{max_par}) {
3194 shift @{$self->{par}} while @{$self->{par}} > $max;
2943 } 3195 }
2944 3196
2945 $self->{need_reflow}++; 3197 $self->{need_reflow}++;
2946 $self->update; 3198 $self->update;
2947} 3199}
… …
3255 3507
3256sub new { 3508sub new {
3257 my $class = shift; 3509 my $class = shift;
3258 3510
3259 my $self = $class->SUPER::new ( 3511 my $self = $class->SUPER::new (
3512 size_w => 32,
3513 size_h => 8,
3260 aspect => 1, 3514 aspect => 1,
3261 can_events => 0, 3515 can_events => 0,
3262 @_, 3516 @_,
3263 ); 3517 );
3264 3518
3265 if ($self->{anim} && $self->{animspeed}) { 3519 if ($self->{anim} && $self->{animspeed}) {
3266 Scalar::Util::weaken (my $widget = $self); 3520 CFPlus::weaken (my $widget = $self);
3267 3521
3522 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3523 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3268 $self->{timer} = Event->timer ( 3524 $self->{timer} = Event->timer (
3269 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3270 hard => 1, 3525 parked => 1,
3271 interval => $self->{animspeed},
3272 cb => sub { 3526 cb => sub {
3527 return unless $::CONN && $widget;
3528
3273 ++$widget->{frame}; 3529 ++$widget->{frame};
3530 $widget->update_face;
3274 $widget->update; 3531 $widget->update;
3532
3533 $widget->update_timer;
3275 }, 3534 },
3276 ); 3535 );
3536
3537 $self->update_face;
3538 $self->update_timer;
3277 } 3539 }
3278 3540
3279 $self 3541 $self
3280} 3542}
3281 3543
3544sub update_timer {
3545 my ($self) = @_;
3546
3547 return unless $self->{timer};
3548
3549 if ($self->{visible}) {
3550 $self->{timer}->at (
3551 $self->{anim_start}
3552 + $self->{animspeed}
3553 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3554 );
3555 $self->{timer}->start;
3556 } else {
3557 $self->{timer}->stop;
3558 }
3559}
3560
3561sub update_face {
3562 my ($self) = @_;
3563
3564 return unless $::CONN;
3565
3566 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3567 if ($anim && @$anim) {
3568 delete $self->{wait_face};
3569 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3570 }
3571 }
3572}
3573
3282sub size_request { 3574sub size_request {
3283 (32, 8) 3575 my ($self) = @_;
3576
3577 if ($::CONN) {
3578 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3579 if (my $tex = $::CONN->{texture}[$faceid]) {
3580 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3581 } else {
3582 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3583 $self->realloc;
3584 });
3585 }
3586 }
3587 }
3588
3589 ($self->{size_w} || 8, $self->{size_h} || 8)
3284} 3590}
3285 3591
3286sub update { 3592sub update {
3287 my ($self) = @_; 3593 my ($self) = @_;
3288 3594
3289 return unless $self->{visible}; 3595 return unless $self->{visible};
3290 3596
3291 $self->SUPER::update; 3597 $self->SUPER::update;
3292} 3598}
3293 3599
3600sub invoke_visibility_change {
3601 my ($self) = @_;
3602
3603 $self->update_timer;
3604
3605 0
3606}
3607
3294sub _draw { 3608sub _draw {
3295 my ($self) = @_; 3609 my ($self) = @_;
3296 3610
3297 return unless $::CONN; 3611 return unless $::CONN;
3298 3612
3299 $self->SUPER::_draw; 3613 $self->SUPER::_draw;
3300 3614
3301 my $face;
3302
3303 if ($self->{frame}) {
3304 my $anim = $::CONN->{anim}[$self->{anim}]; 3615 my $faceid = $::CONN->{faceid}[$self->{face}]
3305 3616 or return;
3306 $face = $anim->[ $self->{frame} % @$anim ]
3307 if $anim && @$anim;
3308 }
3309 3617
3310 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3618 my $tex = $::CONN->{texture}[$faceid];
3311 3619
3312 if ($tex) { 3620 if ($tex) {
3313 glEnable GL_TEXTURE_2D; 3621 glEnable GL_TEXTURE_2D;
3314 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3315 glColor 0, 0, 0, 1; 3623 glColor 0, 0, 0, 1;
… …
3319} 3627}
3320 3628
3321sub destroy { 3629sub destroy {
3322 my ($self) = @_; 3630 my ($self) = @_;
3323 3631
3324 $self->{timer}->cancel 3632 (delete $self->{timer})->cancel
3325 if $self->{timer}; 3633 if $self->{timer};
3326 3634
3327 $self->SUPER::destroy; 3635 $self->SUPER::destroy;
3328} 3636}
3329 3637
… …
3525} 3833}
3526 3834
3527sub add { 3835sub add {
3528 my ($self, $title, $widget, $tooltip) = @_; 3836 my ($self, $title, $widget, $tooltip) = @_;
3529 3837
3530 Scalar::Util::weaken $self; 3838 CFPlus::weaken $self;
3531 3839
3532 $self->{buttonbar}->add (new CFPlus::UI::Button 3840 $self->{buttonbar}->add (new CFPlus::UI::Button
3533 markup => $title, 3841 markup => $title,
3534 tooltip => $tooltip, 3842 tooltip => $tooltip,
3535 on_activate => sub { $self->set_current_page ($widget) }, 3843 on_activate => sub { $self->set_current_page ($widget) },
… …
3619 my $self = $class->SUPER::new ( 3927 my $self = $class->SUPER::new (
3620 fontsize => 0.8, 3928 fontsize => 0.8,
3621 @_, 3929 @_,
3622 ); 3930 );
3623 3931
3624 Scalar::Util::weaken (my $this = $self); 3932 CFPlus::weaken (my $this = $self);
3625 3933
3626 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3934 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3627 3935
3628 $self 3936 $self
3629} 3937}
… …
3752 $self->SUPER::destroy; 4060 $self->SUPER::destroy;
3753} 4061}
3754 4062
3755############################################################################# 4063#############################################################################
3756 4064
3757package CFPlus::UI::Inventory;
3758
3759our @ISA = CFPlus::UI::Table::;
3760
3761sub new {
3762 my $class = shift;
3763
3764 my $self = $class->SUPER::new (
3765 col_expand => [0, 1, 0],
3766 items => [],
3767 @_,
3768 );
3769
3770 $self->set_sort_order (undef);
3771
3772 $self
3773}
3774
3775sub update_items {
3776 my ($self) = @_;
3777
3778 $self->clear;
3779
3780 my @item = $self->{sort}->(@{ $self->{items} });
3781
3782 my @adds;
3783 my $row = 0;
3784 for my $item ($self->{sort}->(@{ $self->{items} })) {
3785 CFPlus::Item::update_widgets $item;
3786
3787 push @adds, 0, $row, $item->{face_widget};
3788 push @adds, 1, $row, $item->{desc_widget};
3789 push @adds, 2, $row, $item->{weight_widget};
3790
3791 $row++;
3792 }
3793
3794 $self->add (@adds);
3795}
3796
3797sub set_sort_order {
3798 my ($self, $order) = @_;
3799
3800 $self->{sort} = $order ||= sub {
3801 sort {
3802 $a->{type} <=> $b->{type}
3803 or $a->{name} cmp $b->{name}
3804 } @_
3805 };
3806
3807 $self->update_items;
3808}
3809
3810sub set_items {
3811 my ($self, $items) = @_;
3812
3813 $self->{items} = [$items ? values %$items : ()];
3814 $self->update_items;
3815}
3816
3817#############################################################################
3818
3819package CFPlus::UI::SpellList;
3820
3821our @ISA = CFPlus::UI::Table::;
3822
3823sub new {
3824 my $class = shift;
3825
3826 my $self = $class->SUPER::new (
3827 binding => [],
3828 commands => [],
3829 @_,
3830 )
3831}
3832
3833my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3834
3835my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3836 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3837my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3838 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3839my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3840 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3841my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3842 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3843my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3844 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3845
3846sub rebuild_spell_list {
3847 my ($self) = @_;
3848
3849 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3850 $self->clear;
3851
3852 return unless $::CONN;
3853
3854 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3855 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3856 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3857 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3858 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3859
3860 my $row = 0;
3861
3862 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3863 my $spell = $self->{spell}{$_};
3864
3865 $row++;
3866
3867 my $spell_cb = sub {
3868 my ($widget, $ev) = @_;
3869
3870 if ($ev->{button} == 1) {
3871 $::CONN->user_send ("cast $spell->{name}");
3872 } elsif ($ev->{button} == 2) {
3873 $::CONN->user_send ("invoke $spell->{name}");
3874 } elsif ($ev->{button} == 3) {
3875 my $shortname = CFPlus::shorten $spell->{name}, 14;
3876 (new CFPlus::UI::Menu
3877 items => [
3878 ["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3879 ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3880 ],
3881 )->popup ($ev);
3882 } else {
3883 return 0;
3884 }
3885
3886 1
3887 };
3888
3889 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3890
3891 #TODO: add path info to tooltip
3892 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3893
3894 $self->add (0, $row, new CFPlus::UI::Face
3895 face => $spell->{face},
3896 can_hover => 1,
3897 can_events => 1,
3898 tooltip => $tooltip,
3899 on_button_down => $spell_cb,
3900 );
3901
3902 $self->add (1, $row, new CFPlus::UI::Label
3903 expand => 1,
3904 text => $spell->{name},
3905 can_hover => 1,
3906 can_events => 1,
3907 tooltip => $tooltip,
3908 on_button_down => $spell_cb,
3909 );
3910
3911 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3912 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3913 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3914 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3915 }
3916 });
3917}
3918
3919sub add_spell {
3920 my ($self, $spell) = @_;
3921
3922 $self->{spell}->{$spell->{name}} = $spell;
3923 $self->rebuild_spell_list;
3924}
3925
3926sub remove_spell {
3927 my ($self, $spell) = @_;
3928
3929 delete $self->{spell}->{$spell->{name}};
3930 $self->rebuild_spell_list;
3931}
3932
3933sub clear_spells {
3934 my ($self) = @_;
3935
3936 $self->{spell} = {};
3937 $self->rebuild_spell_list;
3938}
3939
3940#############################################################################
3941
3942package CFPlus::UI::Root; 4065package CFPlus::UI::Root;
3943 4066
3944our @ISA = CFPlus::UI::Container::; 4067our @ISA = CFPlus::UI::Container::;
3945 4068
3946use List::Util qw(min max); 4069use List::Util qw(min max);
… …
3953 my $self = $class->SUPER::new ( 4076 my $self = $class->SUPER::new (
3954 visible => 1, 4077 visible => 1,
3955 @_, 4078 @_,
3956 ); 4079 );
3957 4080
3958 Scalar::Util::weaken ($self->{root} = $self); 4081 CFPlus::weaken ($self->{root} = $self);
3959 4082
3960 $self 4083 $self
3961} 4084}
3962 4085
3963sub size_request { 4086sub size_request {
… …
4158 while ($self->{post_alloc_hook}) { 4281 while ($self->{post_alloc_hook}) {
4159 $_->() 4282 $_->()
4160 for values %{delete $self->{post_alloc_hook}}; 4283 for values %{delete $self->{post_alloc_hook}};
4161 } 4284 }
4162 4285
4163
4164 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4286 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4165 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4287 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4166 glClear GL_COLOR_BUFFER_BIT; 4288 glClear GL_COLOR_BUFFER_BIT;
4167 4289
4168 glMatrixMode GL_PROJECTION; 4290 glMatrixMode GL_PROJECTION;

Diff Legend

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