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.354 by root, Sat Nov 18 23:31:23 2006 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 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 if ($self->{tooltip} =~ /Apply.*audio/) { 541 for my $cb (
529 warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d# 542 @{$self->{signal_cb}{$signal} || []}, # before
530 warn "3 $self->{parent}\n";#d# 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
531 } 546 }
532 547
533 #d##TODO# stop propagating at first true, do not use sum 548 # parent
534 my $res =
535 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
536 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
537 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
538 ;
539 if ($self->{tooltip} =~ /Apply.*audio/) {
540 warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
541 warn "5 $self->{parent}\n";#d#
542 }
543
544 $res
545} 550}
546 551
547sub find_widget { 552sub find_widget {
548 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
549 554
… …
557} 562}
558 563
559sub set_parent { 564sub set_parent {
560 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
561 566
562 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
564} 569}
565 570
566sub realloc { 571sub realloc {
567 my ($self) = @_; 572 my ($self) = @_;
… …
646 my ($self) = @_; 651 my ($self) = @_;
647 652
648 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
649} 654}
650 655
656my $cntx;#d#
651sub DESTROY { 657sub DESTROY {
652 my ($self) = @_; 658 my ($self) = @_;
653 659
654 return if CFPlus::in_destruct; 660 return if CFPlus::in_destruct;
655
656 delete $WIDGET{$self+0};
657 661
658 eval { $self->destroy }; 662 eval { $self->destroy };
659 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};
660} 666}
661 667
662############################################################################# 668#############################################################################
663 669
664package CFPlus::UI::DrawBG; 670package CFPlus::UI::DrawBG;
… …
938 944
939############################################################################# 945#############################################################################
940 946
941package CFPlus::UI::ViewPort; 947package CFPlus::UI::ViewPort;
942 948
949use List::Util qw(min max);
950
943our @ISA = CFPlus::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
944 952
945sub new { 953sub new {
946 my $class = shift; 954 my $class = shift;
947 955
… …
978} 986}
979 987
980sub set_offset { 988sub set_offset {
981 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
982 990
983 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
984 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
985 993
994 $self->emit (changed => $self->{view_x}, $self->{view_y});
986 $self->update; 995 $self->update;
987} 996}
988 997
989# 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
990sub coord2local { 999sub coord2local {
… …
1027 1036
1028############################################################################# 1037#############################################################################
1029 1038
1030package CFPlus::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
1031 1040
1032our @ISA = CFPlus::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
1033 1042
1034sub new { 1043sub new {
1035 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
1036 1045
1037 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
1038 1047
1039 my $self; 1048 my $self;
1040 1049
1041 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
1042 vertical => 1, 1060 vertical => 1,
1043 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
1044 on_changed => sub { 1062 on_changed => sub {
1045 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1046 }, 1065 },
1047 ; 1066 ;
1048 1067
1049 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
1050 vp => (new CFPlus::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1051 can_events => 1, 1071 can_events => 1,
1052 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
1053 %arg, 1076 %arg,
1054 ); 1077 );
1055 1078
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
1056 $self->SUPER::add ($self->{vp}, $self->{slider}); 1093 $self->SUPER::add (0, 0, $self->{vp});
1094
1057 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
1058 1096
1059 $self 1097 $self
1060} 1098}
1061 1099
… …
1065 my ($self, $widget) = @_; 1103 my ($self, $widget) = @_;
1066 1104
1067 $self->{vp}->add ($self->{child} = $widget); 1105 $self->{vp}->add ($self->{child} = $widget);
1068} 1106}
1069 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 (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 (1, 0, $self->{vslider})
1128 : $self->{vslider}->hide;
1129 }
1130}
1131
1132sub update {
1133 my ($self) = @_;
1134
1135 $self->SUPER::update;
1136 $self->update_slider;
1137}
1138
1070sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1071 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1072 1141
1073 return 0 unless $ev->{dy}; # only vertical movements 1142 return 0 unless $ev->{dy}; # only vertical movements for now
1074 1143
1075 $self->{slider}->emit (mouse_wheel => $ev); 1144 $self->{vslider}->emit (mouse_wheel => $ev);
1076 1145
1077 1 1146 1
1078} 1147}
1079 1148
1080sub update_slider { 1149sub invoke_button_down {
1081 my ($self) = @_; 1150 my ($self, $ev, $x, $y) = @_;
1082 1151
1083 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1152 if ($ev->{button} == 2) {
1084} 1153 $self->grab_focus;
1085 1154
1086sub update { 1155 my $ox = $self->{vp}{view_x} + $ev->{x};
1087 my ($self) = @_; 1156 my $oy = $self->{vp}{view_y} + $ev->{y};
1157
1158 $self->{motion} = sub {
1159 my ($ev, $x, $y) = @_;
1088 1160
1089 $self->SUPER::update; 1161 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1162 $self->update;
1163 };
1090 1164
1091 $self->update_slider; 1165 return 1;
1166 }
1167
1168 0
1169}
1170
1171sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_;
1173
1174 if (delete $self->{motion}) {
1175 return 1;
1176 }
1177
1178 0
1179}
1180
1181sub invoke_mouse_motion {
1182 my ($self, $ev, $x, $y) = @_;
1183
1184 if ($self->{motion}) {
1185 $self->{motion}->($ev, $x, $y);
1186 return 1;
1187 }
1188
1189 0
1092} 1190}
1093 1191
1094sub invoke_size_allocate { 1192sub invoke_size_allocate {
1095 my ($self, $w, $h) = @_; 1193 my ($self, $w, $h) = @_;
1096 1194
1097 $self->update_slider; 1195 $self->update_slider;
1098
1099 $self->SUPER::invoke_size_allocate ($w, $h) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1100} 1197}
1101 1198
1102############################################################################# 1199#############################################################################
1103 1200
… …
1474 1571
1475sub new { 1572sub new {
1476 my $class = shift; 1573 my $class = shift;
1477 1574
1478 $class->SUPER::new ( 1575 $class->SUPER::new (
1576 children => [],
1479 col_expand => [], 1577 col_expand => [],
1578 row_expand => [],
1480 @_, 1579 @_,
1481 ) 1580 )
1482} 1581}
1483 1582
1484sub children { 1583sub children {
1485 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1584 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1486} 1585}
1487 1586
1587# TODO: store row/col info in child widget and use standard add/del
1488sub add { 1588sub add {
1489 my ($self) = shift; 1589 my ($self) = shift;
1490 1590
1491 while (@_) { 1591 while (@_) {
1492 my ($x, $y, $child) = splice @_, 0, 3, (); 1592 my ($x, $y, $child) = splice @_, 0, 3, ();
1493 $child->set_parent ($self); 1593 $child->set_parent ($self);
1494 $self->{children}[$y][$x] = $child; 1594 $self->{children}[$y][$x] = $child;
1495 } 1595 }
1496 1596
1497 $self->{force_realloc} = 1; 1597 $self->{force_realloc} = 1;
1498 $self->{force_size_alloc} = 1; 1598 $self->{force_size_alloc} = 1;
1499 $self->realloc; 1599 $self->realloc;
1500} 1600}
1501 1601
1502sub remove { 1602sub remove {
1503 my ($self, $child) = @_; 1603 my ($self, $child) = @_;
1504 1604
1505 # TODO: not yet implemented 1605 for (@{ $self->{children} }) {
1606 for (@{ $_ || [] }) {
1607 $_ = undef if $_ == $child;
1608 }
1609 }
1506} 1610}
1507 1611
1508# TODO: move to container class maybe? send children a signal on removal? 1612# TODO: move to container class maybe? send children a signal on removal?
1509sub clear { 1613sub clear {
1510 my ($self) = @_; 1614 my ($self) = @_;
… …
1559 my ($ws, $hs) = $self->get_wh; 1663 my ($ws, $hs) = $self->get_wh;
1560 1664
1561 my $req_w = (sum @$ws) || 1; 1665 my $req_w = (sum @$ws) || 1;
1562 my $req_h = (sum @$hs) || 1; 1666 my $req_h = (sum @$hs) || 1;
1563 1667
1564 # TODO: nicer code && do row_expand 1668 # TODO: nicer code
1565 my @col_expand = @{$self->{col_expand}}; 1669 my @col_expand = @{$self->{col_expand}};
1566 @col_expand = (1) x @$ws unless @col_expand; 1670 @col_expand = (1) x @$ws unless @col_expand;
1567 my $col_expand = (sum @col_expand) || 1; 1671 my $col_expand = (sum @col_expand) || 1;
1568 1672
1569 # linearly scale sizes
1570 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1673 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1571 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1572 1674
1573 CFPlus::UI::harmonize $ws; 1675 CFPlus::UI::harmonize $ws;
1676
1677 my @row_expand = @{$self->{row_expand}};
1678 @row_expand = (1) x @$ws unless @row_expand;
1679 my $row_expand = (sum @row_expand) || 1;
1680
1681 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1682
1574 CFPlus::UI::harmonize $hs; 1683 CFPlus::UI::harmonize $hs;
1575 1684
1576 my $y; 1685 my $y;
1577 1686
1578 for my $r (0 .. $#{$self->{children}}) { 1687 for my $r (0 .. $#{$self->{children}}) {
… …
1618 my ($self) = @_; 1727 my ($self) = @_;
1619 1728
1620 for (grep $_, @{$self->{children}}) { 1729 for (grep $_, @{$self->{children}}) {
1621 $_->draw for grep $_, @$_; 1730 $_->draw for grep $_, @$_;
1622 } 1731 }
1732}
1733
1734#############################################################################
1735
1736package CFPlus::UI::Fixed;
1737
1738use List::Util qw(min max);
1739
1740our @ISA = CFPlus::UI::Container::;
1741
1742sub add {
1743 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1744
1745 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1746 $self->SUPER::add ($child);
1747}
1748
1749sub _scale($$$) {
1750 my ($mode, $val, $max) = @_;
1751
1752 $mode eq "abs" ? $val
1753 : $mode eq "rel" ? $val * $max
1754 : 0
1755}
1756
1757sub size_request {
1758 my ($self) = @_;
1759
1760 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1761
1762 # determine overall size by querying abs widgets
1763 for my $child ($self->visible_children) {
1764 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1765
1766 if ($pos eq "abs") {
1767 $w = _scale $size, $w, $child->{req_w};
1768 $h = _scale $size, $h, $child->{req_h};
1769
1770 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1771 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1772 }
1773 }
1774
1775 my $W = $x2 - $x1;
1776 my $H = $y2 - $y1;
1777
1778 # now layout remaining widgets
1779 for my $child ($self->visible_children) {
1780 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1781
1782 if ($pos ne "abs") {
1783 $x = _scale $pos, $x, $W;
1784 $y = _scale $pos, $x, $H;
1785 $w = _scale $size, $w, $child->{req_w};
1786 $h = _scale $size, $h, $child->{req_h};
1787
1788 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1789 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1790 }
1791 }
1792
1793 my $W = $x2 - $x1;
1794 my $H = $y2 - $y1;
1795
1796 ($W, $H)
1797}
1798
1799sub invoke_size_allocate {
1800 my ($self, $W, $H) = @_;
1801
1802 for my $child ($self->visible_children) {
1803 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1804
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 $child->configure ($x, $y, $w, $h);
1811 }
1812
1813 1
1623} 1814}
1624 1815
1625############################################################################# 1816#############################################################################
1626 1817
1627package CFPlus::UI::Box; 1818package CFPlus::UI::Box;
… …
1913 active_fg => [0, 0, 0], 2104 active_fg => [0, 0, 0],
1914 can_hover => 1, 2105 can_hover => 1,
1915 can_focus => 1, 2106 can_focus => 1,
1916 valign => 0, 2107 valign => 0,
1917 can_events => 1, 2108 can_events => 1,
2109 ellipsise => 0,
1918 #text => ... 2110 #text => ...
1919 #hidden => "*", 2111 #hidden => "*",
1920 @_ 2112 @_
1921 ) 2113 )
1922} 2114}
… …
1966 my $mod = $ev->{mod}; 2158 my $mod = $ev->{mod};
1967 my $sym = $ev->{sym}; 2159 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2160 my $uni = $ev->{unicode};
1969 2161
1970 my $text = $self->get_text; 2162 my $text = $self->get_text;
2163
2164 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1971 2165
1972 if ($uni == 8) { 2166 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2167 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2168 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2169 substr $text, $self->{cursor}, 1, "";
1976 } elsif ($sym == CFPlus::SDLK_LEFT) { 2170 } elsif ($sym == CFPlus::SDLK_LEFT) {
1977 --$self->{cursor} if $self->{cursor}; 2171 --$self->{cursor} if $self->{cursor};
1978 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2172 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1979 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2173 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1980 } elsif ($sym == CFPlus::SDLK_HOME) { 2174 } elsif ($sym == CFPlus::SDLK_HOME) {
2175 # what a hack
1981 $self->{cursor} = 0; 2176 $self->{cursor} =
2177 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2178 ? length $1
2179 : 0;
1982 } elsif ($sym == CFPlus::SDLK_END) { 2180 } elsif ($sym == CFPlus::SDLK_END) {
2181 # uh, again
2182 $self->{cursor} =
2183 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1983 $self->{cursor} = length $text; 2184 ? $self->{cursor} + length $1
2185 : length $self->{text};
1984 } elsif ($uni == 21) { # ctrl-u 2186 } elsif ($uni == 21) { # ctrl-u
1985 $text = ""; 2187 $text = "";
1986 $self->{cursor} = 0; 2188 $self->{cursor} = 0;
1987 } elsif ($uni == 27) { 2189 } elsif ($uni == 27) {
1988 $self->emit ('escape'); 2190 $self->emit ('escape');
1989 } elsif ($uni) { 2191 } elsif ($uni == 0x0d) {
2192 substr $text, $self->{cursor}++, 0, "\012";
2193 } elsif ($uni >= 0x20) {
1990 substr $text, $self->{cursor}++, 0, chr $uni; 2194 substr $text, $self->{cursor}++, 0, chr $uni;
1991 } else { 2195 } else {
1992 return 0; 2196 return 0;
1993 } 2197 }
1994 2198
1995 $self->_set_text ($text); 2199 $self->_set_text ($text);
1996 2200
1997 $self->realloc; 2201 $self->realloc;
2202 $self->update;
1998 2203
1999 1 2204 1
2000} 2205}
2001 2206
2002sub invoke_focus_in { 2207sub invoke_focus_in {
… …
2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2276 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2072 glEnd; 2277 glEnd;
2073 } 2278 }
2074} 2279}
2075 2280
2281#############################################################################
2282
2076package CFPlus::UI::Entry; 2283package CFPlus::UI::Entry;
2077 2284
2078our @ISA = CFPlus::UI::EntryBase::; 2285our @ISA = CFPlus::UI::EntryBase::;
2079 2286
2080use CFPlus::OpenGL; 2287use CFPlus::OpenGL;
… …
2082sub invoke_key_down { 2289sub invoke_key_down {
2083 my ($self, $ev) = @_; 2290 my ($self, $ev) = @_;
2084 2291
2085 my $sym = $ev->{sym}; 2292 my $sym = $ev->{sym};
2086 2293
2087 if ($sym == 13) { 2294 if ($ev->{uni} == 0x0d || $sym == 13) {
2088 unshift @{$self->{history}}, 2295 unshift @{$self->{history}},
2089 my $txt = $self->get_text; 2296 my $txt = $self->get_text;
2090 2297
2091 $self->{history_pointer} = -1; 2298 $self->{history_pointer} = -1;
2092 $self->{history_saveback} = ''; 2299 $self->{history_saveback} = '';
… …
2122 1 2329 1
2123} 2330}
2124 2331
2125############################################################################# 2332#############################################################################
2126 2333
2334package CFPlus::UI::TextEdit;
2335
2336our @ISA = CFPlus::UI::EntryBase::;
2337
2338use CFPlus::OpenGL;
2339
2340sub move_cursor_ver {
2341 my ($self, $dy) = @_;
2342
2343 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2344
2345 $y += $dy;
2346
2347 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2348 $self->{cursor} = $index;
2349 delete $self->{cur_h};
2350 $self->update;
2351 return;
2352 }
2353}
2354
2355sub invoke_key_down {
2356 my ($self, $ev) = @_;
2357
2358 my $sym = $ev->{sym};
2359
2360 if ($sym == CFPlus::SDLK_UP) {
2361 $self->move_cursor_ver (-1);
2362 } elsif ($sym == CFPlus::SDLK_DOWN) {
2363 $self->move_cursor_ver (+1);
2364 } else {
2365 return $self->SUPER::invoke_key_down ($ev)
2366 }
2367
2368 1
2369}
2370
2371#############################################################################
2372
2127package CFPlus::UI::Button; 2373package CFPlus::UI::Button;
2128 2374
2129our @ISA = CFPlus::UI::Label::; 2375our @ISA = CFPlus::UI::Label::;
2130 2376
2131use CFPlus::OpenGL; 2377use CFPlus::OpenGL;
… …
2273 or Carp::croak "'path' or 'tex' attributes required"; 2519 or Carp::croak "'path' or 'tex' attributes required";
2274 2520
2275 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2521 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2276 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2522 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2277 2523
2278 Scalar::Util::weaken $texture_cache{$self->{path}}; 2524 CFPlus::weaken $texture_cache{$self->{path}};
2279 2525
2280 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2526 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2281 2527
2282 $self 2528 $self
2283} 2529}
… …
2656sub invoke_mouse_wheel { 2902sub invoke_mouse_wheel {
2657 my ($self, $ev) = @_; 2903 my ($self, $ev) = @_;
2658 2904
2659 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2905 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660 2906
2907 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2908
2661 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2909 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2662 2910
2663 ! ! $delta 2911 ! ! $delta
2664} 2912}
2665 2913
2666sub update { 2914sub update {
… …
2776 #font => default_font 3024 #font => default_font
2777 @_, 3025 @_,
2778 3026
2779 layout => (new CFPlus::Layout), 3027 layout => (new CFPlus::Layout),
2780 par => [], 3028 par => [],
3029 max_par => 0,
2781 height => 0, 3030 height => 0,
2782 children => [ 3031 children => [
2783 (new CFPlus::UI::Empty expand => 1), 3032 (new CFPlus::UI::Empty expand => 1),
2784 (new CFPlus::UI::Slider vertical => 1), 3033 (new CFPlus::UI::Slider vertical => 1),
2785 ], 3034 ],
… …
2908 wrapped => 1, 3157 wrapped => 1,
2909 }; 3158 };
2910 3159
2911 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3160 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2912 push @{$self->{par}}, $para; 3161 push @{$self->{par}}, $para;
3162 }
3163
3164 if (my $max = $self->{max_par}) {
3165 shift @{$self->{par}} while @{$self->{par}} > $max;
2913 } 3166 }
2914 3167
2915 $self->{need_reflow}++; 3168 $self->{need_reflow}++;
2916 $self->update; 3169 $self->update;
2917} 3170}
… …
3225 3478
3226sub new { 3479sub new {
3227 my $class = shift; 3480 my $class = shift;
3228 3481
3229 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3483 size_w => 32,
3484 size_h => 8,
3230 aspect => 1, 3485 aspect => 1,
3231 can_events => 0, 3486 can_events => 0,
3232 @_, 3487 @_,
3233 ); 3488 );
3234 3489
3235 if ($self->{anim} && $self->{animspeed}) { 3490 if ($self->{anim} && $self->{animspeed}) {
3236 Scalar::Util::weaken (my $widget = $self); 3491 CFPlus::weaken (my $widget = $self);
3237 3492
3238 $self->{timer} = Event->timer ( 3493 $self->{timer} = Event->timer (
3239 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3494 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3240 hard => 1, 3495 hard => 1,
3241 interval => $self->{animspeed}, 3496 interval => $self->{animspeed},
3242 cb => sub { 3497 cb => sub {
3498 return unless $::CONN;
3499
3243 ++$widget->{frame}; 3500 ++$widget->{frame};
3501 $self->update_face;
3244 $widget->update; 3502 $self->update;
3245 }, 3503 },
3246 ); 3504 );
3505
3506 $self->update_face;
3247 } 3507 }
3248 3508
3249 $self 3509 $self
3250} 3510}
3251 3511
3512sub update_face {
3513 my ($self) = @_;
3514
3515 return unless $::CONN;
3516
3517 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3518 if ($anim && @$anim) {
3519 delete $self->{wait_face};
3520 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3521 }
3522 }
3523}
3524
3252sub size_request { 3525sub size_request {
3253 (32, 8) 3526 my ($self) = @_;
3527
3528 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) {
3531 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3532 } else {
3533 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3534 $self->realloc;
3535 });
3536 }
3537 }
3538 }
3539
3540 ($self->{size_w} || 8, $self->{size_h} || 8)
3254} 3541}
3255 3542
3256sub update { 3543sub update {
3257 my ($self) = @_; 3544 my ($self) = @_;
3258 3545
… …
3266 3553
3267 return unless $::CONN; 3554 return unless $::CONN;
3268 3555
3269 $self->SUPER::_draw; 3556 $self->SUPER::_draw;
3270 3557
3271 my $face;
3272
3273 if ($self->{frame}) {
3274 my $anim = $::CONN->{anim}[$self->{anim}]; 3558 my $faceid = $::CONN->{faceid}[$self->{face}]
3275 3559 or return;
3276 $face = $anim->[ $self->{frame} % @$anim ]
3277 if $anim && @$anim;
3278 }
3279 3560
3280 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3561 my $tex = $::CONN->{texture}[$faceid];
3281 3562
3282 if ($tex) { 3563 if ($tex) {
3283 glEnable GL_TEXTURE_2D; 3564 glEnable GL_TEXTURE_2D;
3284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3565 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3285 glColor 0, 0, 0, 1; 3566 glColor 0, 0, 0, 1;
… …
3495} 3776}
3496 3777
3497sub add { 3778sub add {
3498 my ($self, $title, $widget, $tooltip) = @_; 3779 my ($self, $title, $widget, $tooltip) = @_;
3499 3780
3500 Scalar::Util::weaken $self; 3781 CFPlus::weaken $self;
3501 3782
3502 $self->{buttonbar}->add (new CFPlus::UI::Button 3783 $self->{buttonbar}->add (new CFPlus::UI::Button
3503 markup => $title, 3784 markup => $title,
3504 tooltip => $tooltip, 3785 tooltip => $tooltip,
3505 on_activate => sub { $self->set_current_page ($widget) }, 3786 on_activate => sub { $self->set_current_page ($widget) },
… …
3589 my $self = $class->SUPER::new ( 3870 my $self = $class->SUPER::new (
3590 fontsize => 0.8, 3871 fontsize => 0.8,
3591 @_, 3872 @_,
3592 ); 3873 );
3593 3874
3594 Scalar::Util::weaken (my $this = $self); 3875 CFPlus::weaken (my $this = $self);
3595 3876
3596 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3877 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3597 3878
3598 $self 3879 $self
3599} 3880}
… …
3722 $self->SUPER::destroy; 4003 $self->SUPER::destroy;
3723} 4004}
3724 4005
3725############################################################################# 4006#############################################################################
3726 4007
3727package CFPlus::UI::Inventory;
3728
3729our @ISA = CFPlus::UI::Table::;
3730
3731sub new {
3732 my $class = shift;
3733
3734 my $self = $class->SUPER::new (
3735 col_expand => [0, 1, 0],
3736 items => [],
3737 @_,
3738 );
3739
3740 $self->set_sort_order (undef);
3741
3742 $self
3743}
3744
3745sub update_items {
3746 my ($self) = @_;
3747
3748 $self->clear;
3749
3750 my @item = $self->{sort}->(@{ $self->{items} });
3751
3752 my @adds;
3753 my $row = 0;
3754 for my $item ($self->{sort}->(@{ $self->{items} })) {
3755 CFPlus::Item::update_widgets $item;
3756
3757 push @adds, 0, $row, $item->{face_widget};
3758 push @adds, 1, $row, $item->{desc_widget};
3759 push @adds, 2, $row, $item->{weight_widget};
3760
3761 $row++;
3762 }
3763
3764 $self->add (@adds);
3765}
3766
3767sub set_sort_order {
3768 my ($self, $order) = @_;
3769
3770 $self->{sort} = $order ||= sub {
3771 sort {
3772 $a->{type} <=> $b->{type}
3773 or $a->{name} cmp $b->{name}
3774 } @_
3775 };
3776
3777 $self->update_items;
3778}
3779
3780sub set_items {
3781 my ($self, $items) = @_;
3782
3783 $self->{items} = [$items ? values %$items : ()];
3784 $self->update_items;
3785}
3786
3787#############################################################################
3788
3789package CFPlus::UI::SpellList;
3790
3791our @ISA = CFPlus::UI::Table::;
3792
3793sub new {
3794 my $class = shift;
3795
3796 my $self = $class->SUPER::new (
3797 binding => [],
3798 commands => [],
3799 @_,
3800 )
3801}
3802
3803my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3804
3805my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3806 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3807my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3808 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3809my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3810 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3811my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3812 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3813my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3814 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3815
3816sub rebuild_spell_list {
3817 my ($self) = @_;
3818
3819 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3820 $self->clear;
3821
3822 return unless $::CONN;
3823
3824 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3825 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3826 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3827 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3828 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3829
3830 my $row = 0;
3831
3832 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3833 my $spell = $self->{spell}{$_};
3834
3835 $row++;
3836
3837 my $spell_cb = sub {
3838 my ($widget, $ev) = @_;
3839
3840 if ($ev->{button} == 1) {
3841 $::CONN->user_send ("cast $spell->{name}");
3842 } elsif ($ev->{button} == 2) {
3843 $::CONN->user_send ("invoke $spell->{name}");
3844 } elsif ($ev->{button} == 3) {
3845 (new CFPlus::UI::Menu
3846 items => [
3847 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3848 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3849 ],
3850 )->popup ($ev);
3851 } else {
3852 return 0;
3853 }
3854
3855 1
3856 };
3857
3858 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3859
3860 #TODO: add path info to tooltip
3861 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3862
3863 $self->add (0, $row, new CFPlus::UI::Face
3864 face => $spell->{face},
3865 can_hover => 1,
3866 can_events => 1,
3867 tooltip => $tooltip,
3868 on_button_down => $spell_cb,
3869 );
3870
3871 $self->add (1, $row, new CFPlus::UI::Label
3872 expand => 1,
3873 text => $spell->{name},
3874 can_hover => 1,
3875 can_events => 1,
3876 tooltip => $tooltip,
3877 on_button_down => $spell_cb,
3878 );
3879
3880 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3881 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3882 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3883 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3884 }
3885 });
3886}
3887
3888sub add_spell {
3889 my ($self, $spell) = @_;
3890
3891 $self->{spell}->{$spell->{name}} = $spell;
3892 $self->rebuild_spell_list;
3893}
3894
3895sub remove_spell {
3896 my ($self, $spell) = @_;
3897
3898 delete $self->{spell}->{$spell->{name}};
3899 $self->rebuild_spell_list;
3900}
3901
3902sub clear_spells {
3903 my ($self) = @_;
3904
3905 $self->{spell} = {};
3906 $self->rebuild_spell_list;
3907}
3908
3909#############################################################################
3910
3911package CFPlus::UI::Root; 4008package CFPlus::UI::Root;
3912 4009
3913our @ISA = CFPlus::UI::Container::; 4010our @ISA = CFPlus::UI::Container::;
3914 4011
3915use List::Util qw(min max); 4012use List::Util qw(min max);
… …
3922 my $self = $class->SUPER::new ( 4019 my $self = $class->SUPER::new (
3923 visible => 1, 4020 visible => 1,
3924 @_, 4021 @_,
3925 ); 4022 );
3926 4023
3927 Scalar::Util::weaken ($self->{root} = $self); 4024 CFPlus::weaken ($self->{root} = $self);
3928 4025
3929 $self 4026 $self
3930} 4027}
3931 4028
3932sub size_request { 4029sub size_request {

Diff Legend

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