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.352 by root, Sun Oct 1 12:10:00 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 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,
… …
514); 527);
515 528
516sub emit { 529sub emit {
517 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
518 531
519 # I do not really like this solution, but I dislike duplication 532 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, too. 533 # and needlessly verbose code, either.
521 my @append 534 my @append
522 = $has_coords{$signal} 535 = $has_coords{$signal}
523 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
524 : (); 537 : ();
525 538
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 540
528 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 550}
533 551
534sub find_widget { 552sub find_widget {
535 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
536 554
… …
544} 562}
545 563
546sub set_parent { 564sub set_parent {
547 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
548 566
549 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
551} 569}
552 570
553sub realloc { 571sub realloc {
554 my ($self) = @_; 572 my ($self) = @_;
… …
633 my ($self) = @_; 651 my ($self) = @_;
634 652
635 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
636} 654}
637 655
656my $cntx;#d#
638sub DESTROY { 657sub DESTROY {
639 my ($self) = @_; 658 my ($self) = @_;
640 659
641 return if CFPlus::in_destruct; 660 return if CFPlus::in_destruct;
642
643 delete $WIDGET{$self+0};
644 661
645 eval { $self->destroy }; 662 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
647} 666}
648 667
649############################################################################# 668#############################################################################
650 669
651package CFPlus::UI::DrawBG; 670package CFPlus::UI::DrawBG;
… …
925 944
926############################################################################# 945#############################################################################
927 946
928package CFPlus::UI::ViewPort; 947package CFPlus::UI::ViewPort;
929 948
949use List::Util qw(min max);
950
930our @ISA = CFPlus::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
931 952
932sub new { 953sub new {
933 my $class = shift; 954 my $class = shift;
934 955
… …
965} 986}
966 987
967sub set_offset { 988sub set_offset {
968 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
969 990
970 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
971 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
972 993
994 $self->emit (changed => $self->{view_x}, $self->{view_y});
973 $self->update; 995 $self->update;
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 {
… …
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
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 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y);
1087
1088 0
1089 },
1090 ;
1091
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1092 $self->SUPER::add (0, 0, $self->{vp});
1093
1044 $self->add ($child) if $child; 1094 $self->add ($child) if $child;
1045 1095
1046 $self 1096 $self
1047} 1097}
1048 1098
… …
1052 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
1053 1103
1054 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
1055} 1105}
1056 1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
1131sub update {
1132 my ($self) = @_;
1133
1134 $self->SUPER::update;
1135 $self->update_slider;
1136}
1137
1057sub invoke_mouse_wheel { 1138sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1139 my ($self, $ev) = @_;
1059 1140
1060 return 0 unless $ev->{dy}; # only vertical movements 1141 return 0 unless $ev->{dy}; # only vertical movements for now
1061 1142
1062 $self->{slider}->emit (mouse_wheel => $ev); 1143 $self->{vslider}->emit (mouse_wheel => $ev);
1063 1144
1064 1 1145 1
1065} 1146}
1066 1147
1067sub update_slider { 1148sub invoke_button_down {
1068 my ($self) = @_; 1149 my ($self, $ev, $x, $y) = @_;
1069 1150
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1151 if ($ev->{button} == 2) {
1071} 1152 $self->grab_focus;
1072 1153
1073sub update { 1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1074 my ($self) = @_; 1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1075 1159
1076 $self->SUPER::update; 1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1077 1163
1078 $self->update_slider; 1164 return 1;
1165 }
1166
1167 0
1168}
1169
1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1172
1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1079} 1189}
1080 1190
1081sub invoke_size_allocate { 1191sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1083 1193
1084 $self->update_slider; 1194 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1196}
1088 1197
1089############################################################################# 1198#############################################################################
1090 1199
… …
1461 1570
1462sub new { 1571sub new {
1463 my $class = shift; 1572 my $class = shift;
1464 1573
1465 $class->SUPER::new ( 1574 $class->SUPER::new (
1575 children => [],
1466 col_expand => [], 1576 col_expand => [],
1577 row_expand => [],
1467 @_, 1578 @_,
1468 ) 1579 )
1469} 1580}
1470 1581
1471sub children { 1582sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473} 1584}
1474 1585
1586# TODO: store row/col info in child widget and use standard add/del
1475sub add { 1587sub add {
1476 my ($self) = shift; 1588 my ($self) = shift;
1477 1589
1478 while (@_) { 1590 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1591 my ($x, $y, $child) = splice @_, 0, 3, ();
1480 $child->set_parent ($self); 1592 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child; 1593 $self->{children}[$y][$x] = $child;
1482 } 1594 }
1483 1595
1484 $self->{force_realloc} = 1; 1596 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1; 1597 $self->{force_size_alloc} = 1;
1486 $self->realloc; 1598 $self->realloc;
1487} 1599}
1488 1600
1489sub remove { 1601sub remove {
1490 my ($self, $child) = @_; 1602 my ($self, $child) = @_;
1491 1603
1492 # TODO: not yet implemented 1604 for (@{ $self->{children} }) {
1605 for (@{ $_ || [] }) {
1606 $_ = undef if $_ == $child;
1607 }
1608 }
1493} 1609}
1494 1610
1495# TODO: move to container class maybe? send children a signal on removal? 1611# TODO: move to container class maybe? send children a signal on removal?
1496sub clear { 1612sub clear {
1497 my ($self) = @_; 1613 my ($self) = @_;
… …
1546 my ($ws, $hs) = $self->get_wh; 1662 my ($ws, $hs) = $self->get_wh;
1547 1663
1548 my $req_w = (sum @$ws) || 1; 1664 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1665 my $req_h = (sum @$hs) || 1;
1550 1666
1551 # TODO: nicer code && do row_expand 1667 # TODO: nicer code
1552 my @col_expand = @{$self->{col_expand}}; 1668 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1669 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1670 my $col_expand = (sum @col_expand) || 1;
1555 1671
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1673
1560 CFPlus::UI::harmonize $ws; 1674 CFPlus::UI::harmonize $ws;
1675
1676 my @row_expand = @{$self->{row_expand}};
1677 @row_expand = (1) x @$ws unless @row_expand;
1678 my $row_expand = (sum @row_expand) || 1;
1679
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681
1561 CFPlus::UI::harmonize $hs; 1682 CFPlus::UI::harmonize $hs;
1562 1683
1563 my $y; 1684 my $y;
1564 1685
1565 for my $r (0 .. $#{$self->{children}}) { 1686 for my $r (0 .. $#{$self->{children}}) {
… …
1605 my ($self) = @_; 1726 my ($self) = @_;
1606 1727
1607 for (grep $_, @{$self->{children}}) { 1728 for (grep $_, @{$self->{children}}) {
1608 $_->draw for grep $_, @$_; 1729 $_->draw for grep $_, @$_;
1609 } 1730 }
1731}
1732
1733#############################################################################
1734
1735package CFPlus::UI::Fixed;
1736
1737use List::Util qw(min max);
1738
1739our @ISA = CFPlus::UI::Container::;
1740
1741sub add {
1742 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1743
1744 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1745 $self->SUPER::add ($child);
1746}
1747
1748sub _scale($$$) {
1749 my ($mode, $val, $max) = @_;
1750
1751 $mode eq "abs" ? $val
1752 : $mode eq "rel" ? $val * $max
1753 : 0
1754}
1755
1756sub size_request {
1757 my ($self) = @_;
1758
1759 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1760
1761 # determine overall size by querying abs widgets
1762 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1764
1765 if ($pos eq "abs") {
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1771 }
1772 }
1773
1774 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1;
1776
1777 # now layout remaining widgets
1778 for my $child ($self->visible_children) {
1779 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1780
1781 if ($pos ne "abs") {
1782 $x = _scale $pos, $x, $W;
1783 $y = _scale $pos, $x, $H;
1784 $w = _scale $size, $w, $child->{req_w};
1785 $h = _scale $size, $h, $child->{req_h};
1786
1787 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1788 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1789 }
1790 }
1791
1792 my $W = $x2 - $x1;
1793 my $H = $y2 - $y1;
1794
1795 ($W, $H)
1796}
1797
1798sub invoke_size_allocate {
1799 my ($self, $W, $H) = @_;
1800
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 $x = _scale $pos, $x, $W;
1805 $y = _scale $pos, $x, $H;
1806 $w = _scale $size, $w, $child->{req_w};
1807 $h = _scale $size, $h, $child->{req_h};
1808
1809 $child->configure ($x, $y, $w, $h);
1810 }
1811
1812 1
1610} 1813}
1611 1814
1612############################################################################# 1815#############################################################################
1613 1816
1614package CFPlus::UI::Box; 1817package CFPlus::UI::Box;
… …
1900 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
1901 can_hover => 1, 2104 can_hover => 1,
1902 can_focus => 1, 2105 can_focus => 1,
1903 valign => 0, 2106 valign => 0,
1904 can_events => 1, 2107 can_events => 1,
2108 ellipsise => 0,
1905 #text => ... 2109 #text => ...
1906 #hidden => "*", 2110 #hidden => "*",
1907 @_ 2111 @_
1908 ) 2112 )
1909} 2113}
… …
1953 my $mod = $ev->{mod}; 2157 my $mod = $ev->{mod};
1954 my $sym = $ev->{sym}; 2158 my $sym = $ev->{sym};
1955 my $uni = $ev->{unicode}; 2159 my $uni = $ev->{unicode};
1956 2160
1957 my $text = $self->get_text; 2161 my $text = $self->get_text;
2162
2163 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1958 2164
1959 if ($uni == 8) { 2165 if ($uni == 8) {
1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2166 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961 } elsif ($uni == 127) { 2167 } elsif ($uni == 127) {
1962 substr $text, $self->{cursor}, 1, ""; 2168 substr $text, $self->{cursor}, 1, "";
1963 } elsif ($sym == CFPlus::SDLK_LEFT) { 2169 } elsif ($sym == CFPlus::SDLK_LEFT) {
1964 --$self->{cursor} if $self->{cursor}; 2170 --$self->{cursor} if $self->{cursor};
1965 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2171 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1966 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2172 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1967 } elsif ($sym == CFPlus::SDLK_HOME) { 2173 } elsif ($sym == CFPlus::SDLK_HOME) {
2174 # what a hack
1968 $self->{cursor} = 0; 2175 $self->{cursor} =
2176 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2177 ? length $1
2178 : 0;
1969 } elsif ($sym == CFPlus::SDLK_END) { 2179 } elsif ($sym == CFPlus::SDLK_END) {
2180 # uh, again
2181 $self->{cursor} =
2182 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1970 $self->{cursor} = length $text; 2183 ? $self->{cursor} + length $1
2184 : length $self->{text};
1971 } elsif ($uni == 21) { # ctrl-u 2185 } elsif ($uni == 21) { # ctrl-u
1972 $text = ""; 2186 $text = "";
1973 $self->{cursor} = 0; 2187 $self->{cursor} = 0;
1974 } elsif ($uni == 27) { 2188 } elsif ($uni == 27) {
1975 $self->emit ('escape'); 2189 $self->emit ('escape');
1976 } elsif ($uni) { 2190 } elsif ($uni == 0x0d) {
2191 substr $text, $self->{cursor}++, 0, "\012";
2192 } elsif ($uni >= 0x20) {
1977 substr $text, $self->{cursor}++, 0, chr $uni; 2193 substr $text, $self->{cursor}++, 0, chr $uni;
1978 } else { 2194 } else {
1979 return 0; 2195 return 0;
1980 } 2196 }
1981 2197
1982 $self->_set_text ($text); 2198 $self->_set_text ($text);
1983 2199
1984 $self->realloc; 2200 $self->realloc;
2201 $self->update;
1985 2202
1986 1 2203 1
1987} 2204}
1988 2205
1989sub invoke_focus_in { 2206sub invoke_focus_in {
… …
2058 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2275 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2059 glEnd; 2276 glEnd;
2060 } 2277 }
2061} 2278}
2062 2279
2280#############################################################################
2281
2063package CFPlus::UI::Entry; 2282package CFPlus::UI::Entry;
2064 2283
2065our @ISA = CFPlus::UI::EntryBase::; 2284our @ISA = CFPlus::UI::EntryBase::;
2066 2285
2067use CFPlus::OpenGL; 2286use CFPlus::OpenGL;
… …
2069sub invoke_key_down { 2288sub invoke_key_down {
2070 my ($self, $ev) = @_; 2289 my ($self, $ev) = @_;
2071 2290
2072 my $sym = $ev->{sym}; 2291 my $sym = $ev->{sym};
2073 2292
2074 if ($sym == 13) { 2293 if ($ev->{uni} == 0x0d || $sym == 13) {
2075 unshift @{$self->{history}}, 2294 unshift @{$self->{history}},
2076 my $txt = $self->get_text; 2295 my $txt = $self->get_text;
2077 2296
2078 $self->{history_pointer} = -1; 2297 $self->{history_pointer} = -1;
2079 $self->{history_saveback} = ''; 2298 $self->{history_saveback} = '';
… …
2109 1 2328 1
2110} 2329}
2111 2330
2112############################################################################# 2331#############################################################################
2113 2332
2333package CFPlus::UI::TextEdit;
2334
2335our @ISA = CFPlus::UI::EntryBase::;
2336
2337use CFPlus::OpenGL;
2338
2339sub move_cursor_ver {
2340 my ($self, $dy) = @_;
2341
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343
2344 $y += $dy;
2345
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2347 $self->{cursor} = $index;
2348 delete $self->{cur_h};
2349 $self->update;
2350 return;
2351 }
2352}
2353
2354sub invoke_key_down {
2355 my ($self, $ev) = @_;
2356
2357 my $sym = $ev->{sym};
2358
2359 if ($sym == CFPlus::SDLK_UP) {
2360 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1);
2363 } else {
2364 return $self->SUPER::invoke_key_down ($ev)
2365 }
2366
2367 1
2368}
2369
2370#############################################################################
2371
2114package CFPlus::UI::Button; 2372package CFPlus::UI::Button;
2115 2373
2116our @ISA = CFPlus::UI::Label::; 2374our @ISA = CFPlus::UI::Label::;
2117 2375
2118use CFPlus::OpenGL; 2376use CFPlus::OpenGL;
… …
2260 or Carp::croak "'path' or 'tex' attributes required"; 2518 or Carp::croak "'path' or 'tex' attributes required";
2261 2519
2262 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2520 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2263 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2521 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2264 2522
2265 Scalar::Util::weaken $texture_cache{$self->{path}}; 2523 CFPlus::weaken $texture_cache{$self->{path}};
2266 2524
2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2525 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2268 2526
2269 $self 2527 $self
2270} 2528}
… …
2643sub invoke_mouse_wheel { 2901sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_; 2902 my ($self, $ev) = @_;
2645 2903
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2904 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647 2905
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2907
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2649 2909
2650 ! ! $delta 2910 ! ! $delta
2651} 2911}
2652 2912
2653sub update { 2913sub update {
… …
2763 #font => default_font 3023 #font => default_font
2764 @_, 3024 @_,
2765 3025
2766 layout => (new CFPlus::Layout), 3026 layout => (new CFPlus::Layout),
2767 par => [], 3027 par => [],
3028 max_par => 0,
2768 height => 0, 3029 height => 0,
2769 children => [ 3030 children => [
2770 (new CFPlus::UI::Empty expand => 1), 3031 (new CFPlus::UI::Empty expand => 1),
2771 (new CFPlus::UI::Slider vertical => 1), 3032 (new CFPlus::UI::Slider vertical => 1),
2772 ], 3033 ],
… …
2895 wrapped => 1, 3156 wrapped => 1,
2896 }; 3157 };
2897 3158
2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3159 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899 push @{$self->{par}}, $para; 3160 push @{$self->{par}}, $para;
3161 }
3162
3163 if (my $max = $self->{max_par}) {
3164 shift @{$self->{par}} while @{$self->{par}} > $max;
2900 } 3165 }
2901 3166
2902 $self->{need_reflow}++; 3167 $self->{need_reflow}++;
2903 $self->update; 3168 $self->update;
2904} 3169}
… …
3212 3477
3213sub new { 3478sub new {
3214 my $class = shift; 3479 my $class = shift;
3215 3480
3216 my $self = $class->SUPER::new ( 3481 my $self = $class->SUPER::new (
3482 size_w => 32,
3483 size_h => 8,
3217 aspect => 1, 3484 aspect => 1,
3218 can_events => 0, 3485 can_events => 0,
3219 @_, 3486 @_,
3220 ); 3487 );
3221 3488
3222 if ($self->{anim} && $self->{animspeed}) { 3489 if ($self->{anim} && $self->{animspeed}) {
3223 Scalar::Util::weaken (my $widget = $self); 3490 CFPlus::weaken (my $widget = $self);
3224 3491
3225 $self->{timer} = Event->timer ( 3492 $self->{timer} = Event->timer (
3226 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3227 hard => 1, 3494 hard => 1,
3228 interval => $self->{animspeed}, 3495 interval => $self->{animspeed},
3229 cb => sub { 3496 cb => sub {
3497 return unless $::CONN;
3498
3230 ++$widget->{frame}; 3499 ++$widget->{frame};
3500 $self->update_face;
3231 $widget->update; 3501 $self->update;
3232 }, 3502 },
3233 ); 3503 );
3504
3505 $self->update_face;
3234 } 3506 }
3235 3507
3236 $self 3508 $self
3237} 3509}
3238 3510
3511sub update_face {
3512 my ($self) = @_;
3513
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 }
3521 }
3522}
3523
3239sub size_request { 3524sub size_request {
3240 (32, 8) 3525 my ($self) = @_;
3526
3527 if ($::CONN) {
3528 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3529 if (my $tex = $::CONN->{texture}[$faceid]) {
3530 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3531 } else {
3532 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3533 $self->realloc;
3534 });
3535 }
3536 }
3537 }
3538
3539 ($self->{size_w} || 8, $self->{size_h} || 8)
3241} 3540}
3242 3541
3243sub update { 3542sub update {
3244 my ($self) = @_; 3543 my ($self) = @_;
3245 3544
… …
3253 3552
3254 return unless $::CONN; 3553 return unless $::CONN;
3255 3554
3256 $self->SUPER::_draw; 3555 $self->SUPER::_draw;
3257 3556
3258 my $face;
3259
3260 if ($self->{frame}) {
3261 my $anim = $::CONN->{anim}[$self->{anim}]; 3557 my $faceid = $::CONN->{faceid}[$self->{face}]
3262 3558 or return;
3263 $face = $anim->[ $self->{frame} % @$anim ]
3264 if $anim && @$anim;
3265 }
3266 3559
3267 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3560 my $tex = $::CONN->{texture}[$faceid];
3268 3561
3269 if ($tex) { 3562 if ($tex) {
3270 glEnable GL_TEXTURE_2D; 3563 glEnable GL_TEXTURE_2D;
3271 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3272 glColor 0, 0, 0, 1; 3565 glColor 0, 0, 0, 1;
… …
3288 3581
3289package CFPlus::UI::Buttonbar; 3582package CFPlus::UI::Buttonbar;
3290 3583
3291our @ISA = CFPlus::UI::HBox::; 3584our @ISA = CFPlus::UI::HBox::;
3292 3585
3293# TODO: should actualyl wrap buttons and other goodies. 3586# TODO: should actually wrap buttons and other goodies.
3294 3587
3295############################################################################# 3588#############################################################################
3296 3589
3297package CFPlus::UI::Menu; 3590package CFPlus::UI::Menu;
3298 3591
… …
3482} 3775}
3483 3776
3484sub add { 3777sub add {
3485 my ($self, $title, $widget, $tooltip) = @_; 3778 my ($self, $title, $widget, $tooltip) = @_;
3486 3779
3487 Scalar::Util::weaken $self; 3780 CFPlus::weaken $self;
3488 3781
3489 $self->{buttonbar}->add (new CFPlus::UI::Button 3782 $self->{buttonbar}->add (new CFPlus::UI::Button
3490 markup => $title, 3783 markup => $title,
3491 tooltip => $tooltip, 3784 tooltip => $tooltip,
3492 on_activate => sub { $self->set_current_page ($widget) }, 3785 on_activate => sub { $self->set_current_page ($widget) },
… …
3576 my $self = $class->SUPER::new ( 3869 my $self = $class->SUPER::new (
3577 fontsize => 0.8, 3870 fontsize => 0.8,
3578 @_, 3871 @_,
3579 ); 3872 );
3580 3873
3581 Scalar::Util::weaken (my $this = $self); 3874 CFPlus::weaken (my $this = $self);
3582 3875
3583 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3876 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3584 3877
3585 $self 3878 $self
3586} 3879}
… …
3709 $self->SUPER::destroy; 4002 $self->SUPER::destroy;
3710} 4003}
3711 4004
3712############################################################################# 4005#############################################################################
3713 4006
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 (new CFPlus::UI::Menu
3833 items => [
3834 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3835 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3836 ],
3837 )->popup ($ev);
3838 } else {
3839 return 0;
3840 }
3841
3842 1
3843 };
3844
3845 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3846
3847 #TODO: add path info to tooltip
3848 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3849
3850 $self->add (0, $row, new CFPlus::UI::Face
3851 face => $spell->{face},
3852 can_hover => 1,
3853 can_events => 1,
3854 tooltip => $tooltip,
3855 on_button_down => $spell_cb,
3856 );
3857
3858 $self->add (1, $row, new CFPlus::UI::Label
3859 expand => 1,
3860 text => $spell->{name},
3861 can_hover => 1,
3862 can_events => 1,
3863 tooltip => $tooltip,
3864 on_button_down => $spell_cb,
3865 );
3866
3867 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3868 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3869 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3870 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3871 }
3872 });
3873}
3874
3875sub add_spell {
3876 my ($self, $spell) = @_;
3877
3878 $self->{spell}->{$spell->{name}} = $spell;
3879 $self->rebuild_spell_list;
3880}
3881
3882sub remove_spell {
3883 my ($self, $spell) = @_;
3884
3885 delete $self->{spell}->{$spell->{name}};
3886 $self->rebuild_spell_list;
3887}
3888
3889sub clear_spells {
3890 my ($self) = @_;
3891
3892 $self->{spell} = {};
3893 $self->rebuild_spell_list;
3894}
3895
3896#############################################################################
3897
3898package CFPlus::UI::Root; 4007package CFPlus::UI::Root;
3899 4008
3900our @ISA = CFPlus::UI::Container::; 4009our @ISA = CFPlus::UI::Container::;
3901 4010
3902use List::Util qw(min max); 4011use List::Util qw(min max);
… …
3909 my $self = $class->SUPER::new ( 4018 my $self = $class->SUPER::new (
3910 visible => 1, 4019 visible => 1,
3911 @_, 4020 @_,
3912 ); 4021 );
3913 4022
3914 Scalar::Util::weaken ($self->{root} = $self); 4023 CFPlus::weaken ($self->{root} = $self);
3915 4024
3916 $self 4025 $self
3917} 4026}
3918 4027
3919sub size_request { 4028sub size_request {

Diff Legend

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