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.357 by root, Fri Dec 8 13:49:57 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 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 { 552#sub find_widget {
535 my ($self, $x, $y) = @_; 553# 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 554
546sub set_parent { 555sub set_parent {
547 my ($self, $parent) = @_; 556 my ($self, $parent) = @_;
548 557
549 Scalar::Util::weaken ($self->{parent} = $parent); 558 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 559 $self->set_visible if $parent->{visible};
551} 560}
552 561
553sub realloc { 562sub realloc {
554 my ($self) = @_; 563 my ($self) = @_;
… …
633 my ($self) = @_; 642 my ($self) = @_;
634 643
635 warn "no draw defined for $self\n"; 644 warn "no draw defined for $self\n";
636} 645}
637 646
647my $cntx;#d#
638sub DESTROY { 648sub DESTROY {
639 my ($self) = @_; 649 my ($self) = @_;
640 650
641 return if CFPlus::in_destruct; 651 return if CFPlus::in_destruct;
642
643 delete $WIDGET{$self+0};
644 652
645 eval { $self->destroy }; 653 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 654 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
655
656 delete $WIDGET{$self+0};
647} 657}
648 658
649############################################################################# 659#############################################################################
650 660
651package CFPlus::UI::DrawBG; 661package CFPlus::UI::DrawBG;
… …
925 935
926############################################################################# 936#############################################################################
927 937
928package CFPlus::UI::ViewPort; 938package CFPlus::UI::ViewPort;
929 939
940use List::Util qw(min max);
941
930our @ISA = CFPlus::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
931 943
932sub new { 944sub new {
933 my $class = shift; 945 my $class = shift;
934 946
… …
965} 977}
966 978
967sub set_offset { 979sub set_offset {
968 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
969 981
982 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
983 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
984
985 if ($x != $self->{view_x} or $y != $self->{view_y}) {
970 $self->{view_x} = int $x; 986 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 987 $self->{view_y} = $y;
972 988
989 $self->emit (changed => $x, $y);
973 $self->update; 990 $self->update;
991 }
974} 992}
975 993
976# hmm, this does not work for topleft of $self... but we should not ask for that 994# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local { 995sub coord2local {
978 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
… …
993 my ($self, $x, $y) = @_; 1011 my ($self, $x, $y) = @_;
994 1012
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 1015 ) {
998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1016 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999 } else { 1017 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 1018 $self->CFPlus::UI::Base::find_widget ($x, $y)
1001 } 1019 }
1002} 1020}
1003 1021
… …
1014 1032
1015############################################################################# 1033#############################################################################
1016 1034
1017package CFPlus::UI::ScrolledWindow; 1035package CFPlus::UI::ScrolledWindow;
1018 1036
1019our @ISA = CFPlus::UI::HBox::; 1037our @ISA = CFPlus::UI::Table::;
1020 1038
1021sub new { 1039sub new {
1022 my ($class, %arg) = @_; 1040 my ($class, %arg) = @_;
1023 1041
1024 my $child = delete $arg{child}; 1042 my $child = delete $arg{child};
1025 1043
1026 my $self; 1044 my $self;
1027 1045
1028 my $slider = new CFPlus::UI::Slider 1046 my $hslider = new CFPlus::UI::Slider
1047 vertical => 0,
1048 range => [0, 0, 1, 0.01], # HACK fix
1049 on_changed => sub {
1050 $self->{hpos} = $_[1];
1051 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 },
1053 ;
1054
1055 my $vslider = new CFPlus::UI::Slider
1029 vertical => 1, 1056 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1058 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1059 $self->{vpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1061 },
1034 ; 1062 ;
1035 1063
1036 $self = $class->SUPER::new ( 1064 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1065 scroll_x => 0,
1066 scroll_y => 1,
1038 can_events => 1, 1067 can_events => 1,
1039 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
1040 %arg, 1072 %arg,
1041 ); 1073 );
1042 1074
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1075 $self->{vp} = new CFPlus::UI::ViewPort
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 ;
1088
1089 $self->SUPER::add_at (0, 0, $self->{vp});
1090
1044 $self->add ($child) if $child; 1091 $self->add ($child) if $child;
1045 1092
1046 $self 1093 $self
1047} 1094}
1048 1095
… …
1052 my ($self, $widget) = @_; 1099 my ($self, $widget) = @_;
1053 1100
1054 $self->{vp}->add ($self->{child} = $widget); 1101 $self->{vp}->add ($self->{child} = $widget);
1055} 1102}
1056 1103
1104sub update_slider {
1105 my ($self) = @_;
1106
1107 my $child = ($self->{vp} or return)->child;
1108
1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider}{visible}) {
1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1115 : $self->{hslider}->hide;
1116 }
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1124 : $self->{vslider}->hide;
1125 }
1126}
1127
1128sub update {
1129 my ($self) = @_;
1130
1131 $self->update_slider;
1132 $self->SUPER::update;
1133}
1134
1057sub invoke_mouse_wheel { 1135sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1136 my ($self, $ev) = @_;
1059 1137
1060 return 0 unless $ev->{dy}; # only vertical movements 1138 return 0 unless $ev->{dy}; # only vertical movements for now
1061 1139
1062 $self->{slider}->emit (mouse_wheel => $ev); 1140 $self->{vslider}->emit (mouse_wheel => $ev);
1063 1141
1064 1 1142 1
1065} 1143}
1066 1144
1067sub update_slider { 1145sub invoke_button_down {
1068 my ($self) = @_; 1146 my ($self, $ev, $x, $y) = @_;
1069 1147
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1148 if ($ev->{button} == 2) {
1071} 1149 $self->grab_focus;
1072 1150
1073sub update { 1151 my $ox = $self->{vp}{view_x} + $ev->{x};
1074 my ($self) = @_; 1152 my $oy = $self->{vp}{view_y} + $ev->{y};
1153
1154 $self->{motion} = sub {
1155 my ($ev, $x, $y) = @_;
1075 1156
1076 $self->SUPER::update; 1157 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1158 $self->update;
1159 };
1077 1160
1078 $self->update_slider; 1161 return 1;
1162 }
1163
1164 0
1165}
1166
1167sub invoke_button_up {
1168 my ($self, $ev, $x, $y) = @_;
1169
1170 if (delete $self->{motion}) {
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if ($self->{motion}) {
1181 $self->{motion}->($ev, $x, $y);
1182 return 1;
1183 }
1184
1185 0
1079} 1186}
1080 1187
1081sub invoke_size_allocate { 1188sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1189 my ($self, $w, $h) = @_;
1083 1190
1084 $self->update_slider; 1191 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1192 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1193}
1088 1194
1089############################################################################# 1195#############################################################################
1090 1196
… …
1240 1346
1241my @border = 1347my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1348 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); 1349 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244 1350
1351my @icon =
1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1353 qw(x1_move.png x1_resize.png);
1354
1245sub new { 1355sub new {
1246 my ($class, %arg) = @_; 1356 my ($class, %arg) = @_;
1247 1357
1248 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
1249 bg => [1, 1, 1, 1], 1359 bg => [1, 1, 1, 1],
… …
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418 1528
1419 my $border = $self->border; 1529 my $border = $self->border;
1420 1530
1421 glColor @{ $self->{border_bg} }; 1531 glColor @{ $self->{border_bg} };
1422 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1535 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1536
1537 # move
1538 my $w2 = ($w - $border) * .5;
1539 my $h2 = ($h - $border) * .5;
1540 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1541 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1542 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1543
1544 # resize
1545 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1546 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1547 unless $self->{has_close_button};
1548 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1426 1550
1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428 glColor @{ $self->{bg} }; 1552 glColor @{ $self->{bg} };
1429 1553
1430 # TODO: repeat texture not scale 1554 # TODO: repeat texture not scale
… …
1461 1585
1462sub new { 1586sub new {
1463 my $class = shift; 1587 my $class = shift;
1464 1588
1465 $class->SUPER::new ( 1589 $class->SUPER::new (
1590 children => [],
1466 col_expand => [], 1591 col_expand => [],
1592 row_expand => [],
1467 @_, 1593 @_,
1468 ) 1594 )
1469} 1595}
1470 1596
1471sub children { 1597sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473} 1599}
1474 1600
1601# TODO: store row/col info in child widget and use standard add/del
1475sub add { 1602sub add {
1476 my ($self) = shift; 1603 my $self = shift;
1604
1605 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1606 $self->add_at (@_);
1607}
1608
1609sub add_at {
1610 my $self = shift;
1477 1611
1478 while (@_) { 1612 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1613 my ($col, $row, $child) = splice @_, 0, 3, ();
1614
1480 $child->set_parent ($self); 1615 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child; 1616 $self->{children}[$row][$col] = $child;
1482 } 1617 }
1483 1618
1484 $self->{force_realloc} = 1; 1619 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1; 1620 $self->{force_size_alloc} = 1;
1486 $self->realloc; 1621 $self->realloc;
1487} 1622}
1488 1623
1489sub remove { 1624sub remove {
1490 my ($self, $child) = @_; 1625 my ($self, $child) = @_;
1491 1626
1492 # TODO: not yet implemented 1627 for (@{ $self->{children} }) {
1628 for (@{ $_ || [] }) {
1629 $_ = undef if $_ == $child;
1630 }
1631 }
1493} 1632}
1494 1633
1495# TODO: move to container class maybe? send children a signal on removal? 1634# TODO: move to container class maybe? send children a signal on removal?
1496sub clear { 1635sub clear {
1497 my ($self) = @_; 1636 my ($self) = @_;
… …
1546 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1547 1686
1548 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1550 1689
1551 # TODO: nicer code && do row_expand 1690 # TODO: nicer code
1552 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1555 1694
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1696
1560 CFPlus::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1561 CFPlus::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1562 1706
1563 my $y; 1707 my $y;
1564 1708
1565 for my $r (0 .. $#{$self->{children}}) { 1709 for my $r (0 .. $#{$self->{children}}) {
… …
1605 my ($self) = @_; 1749 my ($self) = @_;
1606 1750
1607 for (grep $_, @{$self->{children}}) { 1751 for (grep $_, @{$self->{children}}) {
1608 $_->draw for grep $_, @$_; 1752 $_->draw for grep $_, @$_;
1609 } 1753 }
1754}
1755
1756#############################################################################
1757
1758package CFPlus::UI::Fixed;
1759
1760use List::Util qw(min max);
1761
1762our @ISA = CFPlus::UI::Container::;
1763
1764sub add {
1765 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1766
1767 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1768 $self->SUPER::add ($child);
1769}
1770
1771sub _scale($$$) {
1772 my ($mode, $val, $max) = @_;
1773
1774 $mode eq "abs" ? $val
1775 : $mode eq "rel" ? $val * $max
1776 : 0
1777}
1778
1779sub size_request {
1780 my ($self) = @_;
1781
1782 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1783
1784 # determine overall size by querying abs widgets
1785 for my $child ($self->visible_children) {
1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1787
1788 if ($pos eq "abs") {
1789 $w = _scale $size, $w, $child->{req_w};
1790 $h = _scale $size, $h, $child->{req_h};
1791
1792 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1793 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1794 }
1795 }
1796
1797 my $W = $x2 - $x1;
1798 my $H = $y2 - $y1;
1799
1800 # now layout remaining widgets
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 if ($pos ne "abs") {
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1811 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1812 }
1813 }
1814
1815 my $W = $x2 - $x1;
1816 my $H = $y2 - $y1;
1817
1818 ($W, $H)
1819}
1820
1821sub invoke_size_allocate {
1822 my ($self, $W, $H) = @_;
1823
1824 for my $child ($self->visible_children) {
1825 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1826
1827 $x = _scale $pos, $x, $W;
1828 $y = _scale $pos, $x, $H;
1829 $w = _scale $size, $w, $child->{req_w};
1830 $h = _scale $size, $h, $child->{req_h};
1831
1832 $child->configure ($x, $y, $w, $h);
1833 }
1834
1835 1
1610} 1836}
1611 1837
1612############################################################################# 1838#############################################################################
1613 1839
1614package CFPlus::UI::Box; 1840package CFPlus::UI::Box;
… …
1900 active_fg => [0, 0, 0], 2126 active_fg => [0, 0, 0],
1901 can_hover => 1, 2127 can_hover => 1,
1902 can_focus => 1, 2128 can_focus => 1,
1903 valign => 0, 2129 valign => 0,
1904 can_events => 1, 2130 can_events => 1,
2131 ellipsise => 0,
1905 #text => ... 2132 #text => ...
1906 #hidden => "*", 2133 #hidden => "*",
1907 @_ 2134 @_
1908 ) 2135 )
1909} 2136}
… …
1953 my $mod = $ev->{mod}; 2180 my $mod = $ev->{mod};
1954 my $sym = $ev->{sym}; 2181 my $sym = $ev->{sym};
1955 my $uni = $ev->{unicode}; 2182 my $uni = $ev->{unicode};
1956 2183
1957 my $text = $self->get_text; 2184 my $text = $self->get_text;
2185
2186 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1958 2187
1959 if ($uni == 8) { 2188 if ($uni == 8) {
1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961 } elsif ($uni == 127) { 2190 } elsif ($uni == 127) {
1962 substr $text, $self->{cursor}, 1, ""; 2191 substr $text, $self->{cursor}, 1, "";
1963 } elsif ($sym == CFPlus::SDLK_LEFT) { 2192 } elsif ($sym == CFPlus::SDLK_LEFT) {
1964 --$self->{cursor} if $self->{cursor}; 2193 --$self->{cursor} if $self->{cursor};
1965 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2194 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1966 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2195 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1967 } elsif ($sym == CFPlus::SDLK_HOME) { 2196 } elsif ($sym == CFPlus::SDLK_HOME) {
2197 # what a hack
1968 $self->{cursor} = 0; 2198 $self->{cursor} =
2199 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2200 ? length $1
2201 : 0;
1969 } elsif ($sym == CFPlus::SDLK_END) { 2202 } elsif ($sym == CFPlus::SDLK_END) {
2203 # uh, again
2204 $self->{cursor} =
2205 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1970 $self->{cursor} = length $text; 2206 ? $self->{cursor} + length $1
2207 : length $self->{text};
1971 } elsif ($uni == 21) { # ctrl-u 2208 } elsif ($uni == 21) { # ctrl-u
1972 $text = ""; 2209 $text = "";
1973 $self->{cursor} = 0; 2210 $self->{cursor} = 0;
1974 } elsif ($uni == 27) { 2211 } elsif ($uni == 27) {
1975 $self->emit ('escape'); 2212 $self->emit ('escape');
2213 } elsif ($uni == 0x0d) {
2214 substr $text, $self->{cursor}++, 0, "\012";
1976 } elsif ($uni >= 0x20) { 2215 } elsif ($uni >= 0x20) {
1977 substr $text, $self->{cursor}++, 0, chr $uni; 2216 substr $text, $self->{cursor}++, 0, chr $uni;
1978 } else { 2217 } else {
1979 return 0; 2218 return 0;
1980 } 2219 }
1981 2220
1982 $self->_set_text ($text); 2221 $self->_set_text ($text);
1983 2222
1984 $self->realloc; 2223 $self->realloc;
2224 $self->update;
1985 2225
1986 1 2226 1
1987} 2227}
1988 2228
1989sub invoke_focus_in { 2229sub invoke_focus_in {
… …
2058 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2298 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2059 glEnd; 2299 glEnd;
2060 } 2300 }
2061} 2301}
2062 2302
2303#############################################################################
2304
2063package CFPlus::UI::Entry; 2305package CFPlus::UI::Entry;
2064 2306
2065our @ISA = CFPlus::UI::EntryBase::; 2307our @ISA = CFPlus::UI::EntryBase::;
2066 2308
2067use CFPlus::OpenGL; 2309use CFPlus::OpenGL;
… …
2069sub invoke_key_down { 2311sub invoke_key_down {
2070 my ($self, $ev) = @_; 2312 my ($self, $ev) = @_;
2071 2313
2072 my $sym = $ev->{sym}; 2314 my $sym = $ev->{sym};
2073 2315
2074 if ($sym == 13) { 2316 if ($ev->{uni} == 0x0d || $sym == 13) {
2075 unshift @{$self->{history}}, 2317 unshift @{$self->{history}},
2076 my $txt = $self->get_text; 2318 my $txt = $self->get_text;
2077 2319
2078 $self->{history_pointer} = -1; 2320 $self->{history_pointer} = -1;
2079 $self->{history_saveback} = ''; 2321 $self->{history_saveback} = '';
… …
2109 1 2351 1
2110} 2352}
2111 2353
2112############################################################################# 2354#############################################################################
2113 2355
2356package CFPlus::UI::TextEdit;
2357
2358our @ISA = CFPlus::UI::EntryBase::;
2359
2360use CFPlus::OpenGL;
2361
2362sub move_cursor_ver {
2363 my ($self, $dy) = @_;
2364
2365 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2366
2367 $y += $dy;
2368
2369 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2370 $self->{cursor} = $index;
2371 delete $self->{cur_h};
2372 $self->update;
2373 return;
2374 }
2375}
2376
2377sub invoke_key_down {
2378 my ($self, $ev) = @_;
2379
2380 my $sym = $ev->{sym};
2381
2382 if ($sym == CFPlus::SDLK_UP) {
2383 $self->move_cursor_ver (-1);
2384 } elsif ($sym == CFPlus::SDLK_DOWN) {
2385 $self->move_cursor_ver (+1);
2386 } else {
2387 return $self->SUPER::invoke_key_down ($ev)
2388 }
2389
2390 1
2391}
2392
2393#############################################################################
2394
2114package CFPlus::UI::Button; 2395package CFPlus::UI::Button;
2115 2396
2116our @ISA = CFPlus::UI::Label::; 2397our @ISA = CFPlus::UI::Label::;
2117 2398
2118use CFPlus::OpenGL; 2399use CFPlus::OpenGL;
2119 2400
2120my @tex = 2401my @tex =
2121 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2122 qw(b1_button_active.png); 2403 qw(b1_button_inactive.png b1_button_active.png);
2123 2404
2124sub new { 2405sub new {
2125 my $class = shift; 2406 my $class = shift;
2126 2407
2127 $class->SUPER::new ( 2408 $class->SUPER::new (
2128 padding_x => 4, 2409 padding_x => 4,
2129 padding_y => 4, 2410 padding_y => 4,
2130 fg => [1, 1, 1], 2411 fg => [1.0, 1.0, 1.0],
2131 active_fg => [0, 0, 1], 2412 active_fg => [0.8, 0.8, 0.8],
2132 can_hover => 1, 2413 can_hover => 1,
2133 align => 0, 2414 align => 0,
2134 valign => 0, 2415 valign => 0,
2135 can_events => 1, 2416 can_events => 1,
2136 @_ 2417 @_
… …
2154 2435
2155 glEnable GL_TEXTURE_2D; 2436 glEnable GL_TEXTURE_2D;
2156 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2157 glColor 0, 0, 0, 1; 2438 glColor 0, 0, 0, 1;
2158 2439
2440 my $tex = $tex[$GRAB == $self];
2159 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2441 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2160 2442
2161 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
2162 2444
2163 $self->SUPER::_draw; 2445 $self->SUPER::_draw;
2164} 2446}
… …
2260 or Carp::croak "'path' or 'tex' attributes required"; 2542 or Carp::croak "'path' or 'tex' attributes required";
2261 2543
2262 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2544 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2263 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2545 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2264 2546
2265 Scalar::Util::weaken $texture_cache{$self->{path}}; 2547 CFPlus::weaken $texture_cache{$self->{path}};
2266 2548
2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2549 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2268 2550
2269 $self 2551 $self
2270} 2552}
… …
2643sub invoke_mouse_wheel { 2925sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_; 2926 my ($self, $ev) = @_;
2645 2927
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2928 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647 2929
2930 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2931
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2932 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2649 2933
2650 ! ! $delta 2934 ! ! $delta
2651} 2935}
2652 2936
2653sub update { 2937sub update {
… …
2763 #font => default_font 3047 #font => default_font
2764 @_, 3048 @_,
2765 3049
2766 layout => (new CFPlus::Layout), 3050 layout => (new CFPlus::Layout),
2767 par => [], 3051 par => [],
3052 max_par => 0,
2768 height => 0, 3053 height => 0,
2769 children => [ 3054 children => [
2770 (new CFPlus::UI::Empty expand => 1), 3055 (new CFPlus::UI::Empty expand => 1),
2771 (new CFPlus::UI::Slider vertical => 1), 3056 (new CFPlus::UI::Slider vertical => 1),
2772 ], 3057 ],
… …
2895 wrapped => 1, 3180 wrapped => 1,
2896 }; 3181 };
2897 3182
2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3183 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899 push @{$self->{par}}, $para; 3184 push @{$self->{par}}, $para;
3185 }
3186
3187 if (my $max = $self->{max_par}) {
3188 shift @{$self->{par}} while @{$self->{par}} > $max;
2900 } 3189 }
2901 3190
2902 $self->{need_reflow}++; 3191 $self->{need_reflow}++;
2903 $self->update; 3192 $self->update;
2904} 3193}
… …
3212 3501
3213sub new { 3502sub new {
3214 my $class = shift; 3503 my $class = shift;
3215 3504
3216 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
3506 size_w => 32,
3507 size_h => 8,
3217 aspect => 1, 3508 aspect => 1,
3218 can_events => 0, 3509 can_events => 0,
3219 @_, 3510 @_,
3220 ); 3511 );
3221 3512
3222 if ($self->{anim} && $self->{animspeed}) { 3513 if ($self->{anim} && $self->{animspeed}) {
3223 Scalar::Util::weaken (my $widget = $self); 3514 CFPlus::weaken (my $widget = $self);
3224 3515
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3225 $self->{timer} = Event->timer ( 3518 $self->{timer} = Event->timer (
3226 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3227 hard => 1, 3519 parked => 1,
3228 interval => $self->{animspeed},
3229 cb => sub { 3520 cb => sub {
3521 return unless $::CONN && $widget;
3522
3230 ++$widget->{frame}; 3523 ++$widget->{frame};
3524 $widget->update_face;
3231 $widget->update; 3525 $widget->update;
3526
3527 $widget->update_timer;
3232 }, 3528 },
3233 ); 3529 );
3530
3531 $self->update_face;
3532 $self->update_timer;
3234 } 3533 }
3235 3534
3236 $self 3535 $self
3237} 3536}
3238 3537
3538sub update_timer {
3539 my ($self) = @_;
3540
3541 return unless $self->{timer};
3542
3543 if ($self->{visible}) {
3544 $self->{timer}->at (
3545 $self->{anim_start}
3546 + $self->{animspeed}
3547 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3548 );
3549 $self->{timer}->start;
3550 } else {
3551 $self->{timer}->stop;
3552 }
3553}
3554
3555sub update_face {
3556 my ($self) = @_;
3557
3558 return unless $::CONN;
3559
3560 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3561 if ($anim && @$anim) {
3562 delete $self->{wait_face};
3563 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3564 }
3565 }
3566}
3567
3239sub size_request { 3568sub size_request {
3240 (32, 8) 3569 my ($self) = @_;
3570
3571 if ($::CONN) {
3572 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3573 if (my $tex = $::CONN->{texture}[$faceid]) {
3574 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3575 } else {
3576 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3577 $self->realloc;
3578 });
3579 }
3580 }
3581 }
3582
3583 ($self->{size_w} || 8, $self->{size_h} || 8)
3241} 3584}
3242 3585
3243sub update { 3586sub update {
3244 my ($self) = @_; 3587 my ($self) = @_;
3245 3588
3246 return unless $self->{visible}; 3589 return unless $self->{visible};
3247 3590
3248 $self->SUPER::update; 3591 $self->SUPER::update;
3249} 3592}
3250 3593
3594sub invoke_visibility_change {
3595 my ($self) = @_;
3596
3597 $self->update_timer;
3598
3599 0
3600}
3601
3251sub _draw { 3602sub _draw {
3252 my ($self) = @_; 3603 my ($self) = @_;
3253 3604
3254 return unless $::CONN; 3605 return unless $::CONN;
3255 3606
3256 $self->SUPER::_draw; 3607 $self->SUPER::_draw;
3257 3608
3258 my $face;
3259
3260 if ($self->{frame}) {
3261 my $anim = $::CONN->{anim}[$self->{anim}]; 3609 my $faceid = $::CONN->{faceid}[$self->{face}]
3262 3610 or return;
3263 $face = $anim->[ $self->{frame} % @$anim ]
3264 if $anim && @$anim;
3265 }
3266 3611
3267 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3612 my $tex = $::CONN->{texture}[$faceid];
3268 3613
3269 if ($tex) { 3614 if ($tex) {
3270 glEnable GL_TEXTURE_2D; 3615 glEnable GL_TEXTURE_2D;
3271 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3272 glColor 0, 0, 0, 1; 3617 glColor 0, 0, 0, 1;
… …
3276} 3621}
3277 3622
3278sub destroy { 3623sub destroy {
3279 my ($self) = @_; 3624 my ($self) = @_;
3280 3625
3281 $self->{timer}->cancel 3626 (delete $self->{timer})->cancel
3282 if $self->{timer}; 3627 if $self->{timer};
3283 3628
3284 $self->SUPER::destroy; 3629 $self->SUPER::destroy;
3285} 3630}
3286 3631
… …
3482} 3827}
3483 3828
3484sub add { 3829sub add {
3485 my ($self, $title, $widget, $tooltip) = @_; 3830 my ($self, $title, $widget, $tooltip) = @_;
3486 3831
3487 Scalar::Util::weaken $self; 3832 CFPlus::weaken $self;
3488 3833
3489 $self->{buttonbar}->add (new CFPlus::UI::Button 3834 $self->{buttonbar}->add (new CFPlus::UI::Button
3490 markup => $title, 3835 markup => $title,
3491 tooltip => $tooltip, 3836 tooltip => $tooltip,
3492 on_activate => sub { $self->set_current_page ($widget) }, 3837 on_activate => sub { $self->set_current_page ($widget) },
… …
3576 my $self = $class->SUPER::new ( 3921 my $self = $class->SUPER::new (
3577 fontsize => 0.8, 3922 fontsize => 0.8,
3578 @_, 3923 @_,
3579 ); 3924 );
3580 3925
3581 Scalar::Util::weaken (my $this = $self); 3926 CFPlus::weaken (my $this = $self);
3582 3927
3583 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3928 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3584 3929
3585 $self 3930 $self
3586} 3931}
… …
3709 $self->SUPER::destroy; 4054 $self->SUPER::destroy;
3710} 4055}
3711 4056
3712############################################################################# 4057#############################################################################
3713 4058
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; 4059package CFPlus::UI::Root;
3900 4060
3901our @ISA = CFPlus::UI::Container::; 4061our @ISA = CFPlus::UI::Container::;
3902 4062
3903use List::Util qw(min max); 4063use List::Util qw(min max);
… …
3910 my $self = $class->SUPER::new ( 4070 my $self = $class->SUPER::new (
3911 visible => 1, 4071 visible => 1,
3912 @_, 4072 @_,
3913 ); 4073 );
3914 4074
3915 Scalar::Util::weaken ($self->{root} = $self); 4075 CFPlus::weaken ($self->{root} = $self);
3916 4076
3917 $self 4077 $self
3918} 4078}
3919 4079
3920sub size_request { 4080sub size_request {
… …
4115 while ($self->{post_alloc_hook}) { 4275 while ($self->{post_alloc_hook}) {
4116 $_->() 4276 $_->()
4117 for values %{delete $self->{post_alloc_hook}}; 4277 for values %{delete $self->{post_alloc_hook}};
4118 } 4278 }
4119 4279
4120
4121 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4280 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4122 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4281 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4123 glClear GL_COLOR_BUFFER_BIT; 4282 glClear GL_COLOR_BUFFER_BIT;
4124 4283
4125 glMatrixMode GL_PROJECTION; 4284 glMatrixMode GL_PROJECTION;

Diff Legend

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