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.374 by root, Mon Jul 16 12:36:48 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;
… …
1027 1033
1028############################################################################# 1034#############################################################################
1029 1035
1030package CFPlus::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
1031 1037
1032our @ISA = CFPlus::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
1033 1039
1034sub new { 1040sub new {
1035 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
1036 1042
1037 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
1038 1044
1039 my $self; 1045 my $self;
1040 1046
1041 my $slider = new CFPlus::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
1042 vertical => 1, 1057 vertical => 1,
1043 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
1044 on_changed => sub { 1059 on_changed => sub {
1045 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1046 }, 1062 },
1047 ; 1063 ;
1048 1064
1049 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
1050 vp => (new CFPlus::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1051 can_events => 1, 1068 can_events => 1,
1052 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
1053 %arg, 1073 %arg,
1054 ); 1074 );
1055 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1056 $self->SUPER::add ($self->{vp}, $self->{slider}); 1082 $self->SUPER::add (0, 0, $self->{vp});
1083
1057 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
1058 1085
1059 $self 1086 $self
1060} 1087}
1061 1088
… …
1068} 1095}
1069 1096
1070sub invoke_mouse_wheel { 1097sub invoke_mouse_wheel {
1071 my ($self, $ev) = @_; 1098 my ($self, $ev) = @_;
1072 1099
1073 return 0 unless $ev->{dy}; # only vertical movements 1100 return 0 unless $ev->{dy}; # only vertical movements for now
1074 1101
1075 $self->{slider}->emit (mouse_wheel => $ev); 1102 $self->{vslider}->emit (mouse_wheel => $ev);
1076 1103
1077 1 1104 1
1078} 1105}
1079 1106
1080sub update_slider { 1107sub update_slider {
1081 my ($self) = @_; 1108 my ($self) = @_;
1082 1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1083 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 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 }
1084} 1129}
1085 1130
1086sub update { 1131sub update {
1087 my ($self) = @_; 1132 my ($self) = @_;
1088 1133
1089 $self->SUPER::update; 1134 $self->SUPER::update;
1090
1091 $self->update_slider; 1135 $self->update_slider;
1092} 1136}
1093 1137
1094sub invoke_size_allocate { 1138sub invoke_size_allocate {
1095 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1096 1140
1097 $self->update_slider; 1141 $self->update_slider;
1098
1099 $self->SUPER::invoke_size_allocate ($w, $h) 1142 $self->SUPER::invoke_size_allocate ($w, $h)
1100} 1143}
1101 1144
1102############################################################################# 1145#############################################################################
1103 1146
… …
1474 1517
1475sub new { 1518sub new {
1476 my $class = shift; 1519 my $class = shift;
1477 1520
1478 $class->SUPER::new ( 1521 $class->SUPER::new (
1522 children => [],
1479 col_expand => [], 1523 col_expand => [],
1524 row_expand => [],
1480 @_, 1525 @_,
1481 ) 1526 )
1482} 1527}
1483 1528
1484sub children { 1529sub children {
1485 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1486} 1531}
1487 1532
1533# TODO: store row/col info in child widget and use standard add/del
1488sub add { 1534sub add {
1489 my ($self) = shift; 1535 my ($self) = shift;
1490 1536
1491 while (@_) { 1537 while (@_) {
1492 my ($x, $y, $child) = splice @_, 0, 3, (); 1538 my ($x, $y, $child) = splice @_, 0, 3, ();
1493 $child->set_parent ($self); 1539 $child->set_parent ($self);
1494 $self->{children}[$y][$x] = $child; 1540 $self->{children}[$y][$x] = $child;
1495 } 1541 }
1496 1542
1497 $self->{force_realloc} = 1; 1543 $self->{force_realloc} = 1;
1498 $self->{force_size_alloc} = 1; 1544 $self->{force_size_alloc} = 1;
1499 $self->realloc; 1545 $self->realloc;
1500} 1546}
1501 1547
1502sub remove { 1548sub remove {
1503 my ($self, $child) = @_; 1549 my ($self, $child) = @_;
1504 1550
1505 # TODO: not yet implemented 1551 for (@{ $self->{children} }) {
1552 for (@{ $_ || [] }) {
1553 $_ = undef if $_ == $child;
1554 }
1555 }
1506} 1556}
1507 1557
1508# TODO: move to container class maybe? send children a signal on removal? 1558# TODO: move to container class maybe? send children a signal on removal?
1509sub clear { 1559sub clear {
1510 my ($self) = @_; 1560 my ($self) = @_;
… …
1559 my ($ws, $hs) = $self->get_wh; 1609 my ($ws, $hs) = $self->get_wh;
1560 1610
1561 my $req_w = (sum @$ws) || 1; 1611 my $req_w = (sum @$ws) || 1;
1562 my $req_h = (sum @$hs) || 1; 1612 my $req_h = (sum @$hs) || 1;
1563 1613
1564 # TODO: nicer code && do row_expand 1614 # TODO: nicer code
1565 my @col_expand = @{$self->{col_expand}}; 1615 my @col_expand = @{$self->{col_expand}};
1566 @col_expand = (1) x @$ws unless @col_expand; 1616 @col_expand = (1) x @$ws unless @col_expand;
1567 my $col_expand = (sum @col_expand) || 1; 1617 my $col_expand = (sum @col_expand) || 1;
1568 1618
1569 # linearly scale sizes
1570 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1571 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1572 1620
1573 CFPlus::UI::harmonize $ws; 1621 CFPlus::UI::harmonize $ws;
1622
1623 my @row_expand = @{$self->{row_expand}};
1624 @row_expand = (1) x @$ws unless @row_expand;
1625 my $row_expand = (sum @row_expand) || 1;
1626
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628
1574 CFPlus::UI::harmonize $hs; 1629 CFPlus::UI::harmonize $hs;
1575 1630
1576 my $y; 1631 my $y;
1577 1632
1578 for my $r (0 .. $#{$self->{children}}) { 1633 for my $r (0 .. $#{$self->{children}}) {
… …
1618 my ($self) = @_; 1673 my ($self) = @_;
1619 1674
1620 for (grep $_, @{$self->{children}}) { 1675 for (grep $_, @{$self->{children}}) {
1621 $_->draw for grep $_, @$_; 1676 $_->draw for grep $_, @$_;
1622 } 1677 }
1678}
1679
1680#############################################################################
1681
1682package CFPlus::UI::Fixed;
1683
1684use List::Util qw(min max);
1685
1686our @ISA = CFPlus::UI::Container::;
1687
1688sub add {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child);
1693}
1694
1695sub _scale($$$) {
1696 my ($mode, $val, $max) = @_;
1697
1698 $mode eq "abs" ? $val
1699 : $mode eq "rel" ? $val * $max
1700 : 0
1701}
1702
1703sub size_request {
1704 my ($self) = @_;
1705
1706 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1707
1708 # determine overall size by querying abs widgets
1709 for my $child ($self->visible_children) {
1710 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1711
1712 if ($pos eq "abs") {
1713 $w = _scale $size, $w, $child->{req_w};
1714 $h = _scale $size, $h, $child->{req_h};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1718 }
1719 }
1720
1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1723
1724 # now layout remaining widgets
1725 for my $child ($self->visible_children) {
1726 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1727
1728 if ($pos ne "abs") {
1729 $x = _scale $pos, $x, $W;
1730 $y = _scale $pos, $x, $H;
1731 $w = _scale $size, $w, $child->{req_w};
1732 $h = _scale $size, $h, $child->{req_h};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 $x = _scale $pos, $x, $W;
1752 $y = _scale $pos, $x, $H;
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $child->configure ($x, $y, $w, $h);
1757 }
1758
1759 1
1623} 1760}
1624 1761
1625############################################################################# 1762#############################################################################
1626 1763
1627package CFPlus::UI::Box; 1764package CFPlus::UI::Box;
… …
1913 active_fg => [0, 0, 0], 2050 active_fg => [0, 0, 0],
1914 can_hover => 1, 2051 can_hover => 1,
1915 can_focus => 1, 2052 can_focus => 1,
1916 valign => 0, 2053 valign => 0,
1917 can_events => 1, 2054 can_events => 1,
2055 ellipsise => 0,
1918 #text => ... 2056 #text => ...
1919 #hidden => "*", 2057 #hidden => "*",
1920 @_ 2058 @_
1921 ) 2059 )
1922} 2060}
… …
1966 my $mod = $ev->{mod}; 2104 my $mod = $ev->{mod};
1967 my $sym = $ev->{sym}; 2105 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2106 my $uni = $ev->{unicode};
1969 2107
1970 my $text = $self->get_text; 2108 my $text = $self->get_text;
2109
2110 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1971 2111
1972 if ($uni == 8) { 2112 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2114 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2115 substr $text, $self->{cursor}, 1, "";
1976 } elsif ($sym == CFPlus::SDLK_LEFT) { 2116 } elsif ($sym == CFPlus::SDLK_LEFT) {
1977 --$self->{cursor} if $self->{cursor}; 2117 --$self->{cursor} if $self->{cursor};
1978 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2118 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1979 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2119 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1980 } elsif ($sym == CFPlus::SDLK_HOME) { 2120 } elsif ($sym == CFPlus::SDLK_HOME) {
2121 # what a hack
1981 $self->{cursor} = 0; 2122 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1
2125 : 0;
1982 } elsif ($sym == CFPlus::SDLK_END) { 2126 } elsif ($sym == CFPlus::SDLK_END) {
2127 # uh, again
2128 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1983 $self->{cursor} = length $text; 2130 ? $self->{cursor} + length $1
2131 : length $self->{text};
1984 } elsif ($uni == 21) { # ctrl-u 2132 } elsif ($uni == 21) { # ctrl-u
1985 $text = ""; 2133 $text = "";
1986 $self->{cursor} = 0; 2134 $self->{cursor} = 0;
1987 } elsif ($uni == 27) { 2135 } elsif ($uni == 27) {
1988 $self->emit ('escape'); 2136 $self->emit ('escape');
1989 } elsif ($uni) { 2137 } elsif ($uni == 0x0d) {
2138 substr $text, $self->{cursor}++, 0, "\012";
2139 } elsif ($uni >= 0x20) {
1990 substr $text, $self->{cursor}++, 0, chr $uni; 2140 substr $text, $self->{cursor}++, 0, chr $uni;
1991 } else { 2141 } else {
1992 return 0; 2142 return 0;
1993 } 2143 }
1994 2144
1995 $self->_set_text ($text); 2145 $self->_set_text ($text);
1996 2146
1997 $self->realloc; 2147 $self->realloc;
2148 $self->update;
1998 2149
1999 1 2150 1
2000} 2151}
2001 2152
2002sub invoke_focus_in { 2153sub invoke_focus_in {
… …
2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2072 glEnd; 2223 glEnd;
2073 } 2224 }
2074} 2225}
2075 2226
2227#############################################################################
2228
2076package CFPlus::UI::Entry; 2229package CFPlus::UI::Entry;
2077 2230
2078our @ISA = CFPlus::UI::EntryBase::; 2231our @ISA = CFPlus::UI::EntryBase::;
2079 2232
2080use CFPlus::OpenGL; 2233use CFPlus::OpenGL;
… …
2082sub invoke_key_down { 2235sub invoke_key_down {
2083 my ($self, $ev) = @_; 2236 my ($self, $ev) = @_;
2084 2237
2085 my $sym = $ev->{sym}; 2238 my $sym = $ev->{sym};
2086 2239
2087 if ($sym == 13) { 2240 if ($ev->{uni} == 0x0d || $sym == 13) {
2088 unshift @{$self->{history}}, 2241 unshift @{$self->{history}},
2089 my $txt = $self->get_text; 2242 my $txt = $self->get_text;
2090 2243
2091 $self->{history_pointer} = -1; 2244 $self->{history_pointer} = -1;
2092 $self->{history_saveback} = ''; 2245 $self->{history_saveback} = '';
… …
2122 1 2275 1
2123} 2276}
2124 2277
2125############################################################################# 2278#############################################################################
2126 2279
2280package CFPlus::UI::TextEdit;
2281
2282our @ISA = CFPlus::UI::EntryBase::;
2283
2284use CFPlus::OpenGL;
2285
2286sub move_cursor_ver {
2287 my ($self, $dy) = @_;
2288
2289 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290
2291 $y += $dy;
2292
2293 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2294 $self->{cursor} = $index;
2295 delete $self->{cur_h};
2296 $self->update;
2297 return;
2298 }
2299}
2300
2301sub invoke_key_down {
2302 my ($self, $ev) = @_;
2303
2304 my $sym = $ev->{sym};
2305
2306 if ($sym == CFPlus::SDLK_UP) {
2307 $self->move_cursor_ver (-1);
2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
2309 $self->move_cursor_ver (+1);
2310 } else {
2311 return $self->SUPER::invoke_key_down ($ev)
2312 }
2313
2314 1
2315}
2316
2317#############################################################################
2318
2127package CFPlus::UI::Button; 2319package CFPlus::UI::Button;
2128 2320
2129our @ISA = CFPlus::UI::Label::; 2321our @ISA = CFPlus::UI::Label::;
2130 2322
2131use CFPlus::OpenGL; 2323use CFPlus::OpenGL;
… …
2273 or Carp::croak "'path' or 'tex' attributes required"; 2465 or Carp::croak "'path' or 'tex' attributes required";
2274 2466
2275 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2467 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2276 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2468 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2277 2469
2278 Scalar::Util::weaken $texture_cache{$self->{path}}; 2470 CFPlus::weaken $texture_cache{$self->{path}};
2279 2471
2280 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2472 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2281 2473
2282 $self 2474 $self
2283} 2475}
… …
2656sub invoke_mouse_wheel { 2848sub invoke_mouse_wheel {
2657 my ($self, $ev) = @_; 2849 my ($self, $ev) = @_;
2658 2850
2659 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2851 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660 2852
2853 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2854
2661 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2855 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2662 2856
2663 ! ! $delta 2857 ! ! $delta
2664} 2858}
2665 2859
2666sub update { 2860sub update {
… …
2776 #font => default_font 2970 #font => default_font
2777 @_, 2971 @_,
2778 2972
2779 layout => (new CFPlus::Layout), 2973 layout => (new CFPlus::Layout),
2780 par => [], 2974 par => [],
2975 max_par => 0,
2781 height => 0, 2976 height => 0,
2782 children => [ 2977 children => [
2783 (new CFPlus::UI::Empty expand => 1), 2978 (new CFPlus::UI::Empty expand => 1),
2784 (new CFPlus::UI::Slider vertical => 1), 2979 (new CFPlus::UI::Slider vertical => 1),
2785 ], 2980 ],
… …
2908 wrapped => 1, 3103 wrapped => 1,
2909 }; 3104 };
2910 3105
2911 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3106 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2912 push @{$self->{par}}, $para; 3107 push @{$self->{par}}, $para;
3108 }
3109
3110 if (my $max = $self->{max_par}) {
3111 shift @{$self->{par}} while @{$self->{par}} > $max;
2913 } 3112 }
2914 3113
2915 $self->{need_reflow}++; 3114 $self->{need_reflow}++;
2916 $self->update; 3115 $self->update;
2917} 3116}
… …
3225 3424
3226sub new { 3425sub new {
3227 my $class = shift; 3426 my $class = shift;
3228 3427
3229 my $self = $class->SUPER::new ( 3428 my $self = $class->SUPER::new (
3429 size_w => 32,
3430 size_h => 8,
3230 aspect => 1, 3431 aspect => 1,
3231 can_events => 0, 3432 can_events => 0,
3232 @_, 3433 @_,
3233 ); 3434 );
3234 3435
3235 if ($self->{anim} && $self->{animspeed}) { 3436 if ($self->{anim} && $self->{animspeed}) {
3236 Scalar::Util::weaken (my $widget = $self); 3437 CFPlus::weaken (my $widget = $self);
3237 3438
3238 $self->{timer} = Event->timer ( 3439 $self->{timer} = Event->timer (
3239 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3240 hard => 1, 3441 hard => 1,
3241 interval => $self->{animspeed}, 3442 interval => $self->{animspeed},
3242 cb => sub { 3443 cb => sub {
3444 return unless $::CONN;
3445
3243 ++$widget->{frame}; 3446 ++$widget->{frame};
3447 $self->update_face;
3244 $widget->update; 3448 $self->update;
3245 }, 3449 },
3246 ); 3450 );
3451
3452 $self->update_face;
3247 } 3453 }
3248 3454
3249 $self 3455 $self
3250} 3456}
3251 3457
3458sub update_face {
3459 my ($self) = @_;
3460
3461 return unless $::CONN;
3462
3463 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464 if ($anim && @$anim) {
3465 delete $self->{wait_face};
3466 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3467 }
3468 }
3469}
3470
3252sub size_request { 3471sub size_request {
3253 (32, 8) 3472 my ($self) = @_;
3473
3474 if ($::CONN) {
3475 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3476 if (my $tex = $::CONN->{texture}[$faceid]) {
3477 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3478 } else {
3479 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3480 $self->realloc;
3481 });
3482 }
3483 }
3484 }
3485
3486 ($self->{size_w} || 8, $self->{size_h} || 8)
3254} 3487}
3255 3488
3256sub update { 3489sub update {
3257 my ($self) = @_; 3490 my ($self) = @_;
3258 3491
… …
3266 3499
3267 return unless $::CONN; 3500 return unless $::CONN;
3268 3501
3269 $self->SUPER::_draw; 3502 $self->SUPER::_draw;
3270 3503
3271 my $face;
3272
3273 if ($self->{frame}) {
3274 my $anim = $::CONN->{anim}[$self->{anim}]; 3504 my $faceid = $::CONN->{faceid}[$self->{face}]
3275 3505 or return;
3276 $face = $anim->[ $self->{frame} % @$anim ]
3277 if $anim && @$anim;
3278 }
3279 3506
3280 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3507 my $tex = $::CONN->{texture}[$faceid];
3281 3508
3282 if ($tex) { 3509 if ($tex) {
3283 glEnable GL_TEXTURE_2D; 3510 glEnable GL_TEXTURE_2D;
3284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3285 glColor 0, 0, 0, 1; 3512 glColor 0, 0, 0, 1;
… …
3495} 3722}
3496 3723
3497sub add { 3724sub add {
3498 my ($self, $title, $widget, $tooltip) = @_; 3725 my ($self, $title, $widget, $tooltip) = @_;
3499 3726
3500 Scalar::Util::weaken $self; 3727 CFPlus::weaken $self;
3501 3728
3502 $self->{buttonbar}->add (new CFPlus::UI::Button 3729 $self->{buttonbar}->add (new CFPlus::UI::Button
3503 markup => $title, 3730 markup => $title,
3504 tooltip => $tooltip, 3731 tooltip => $tooltip,
3505 on_activate => sub { $self->set_current_page ($widget) }, 3732 on_activate => sub { $self->set_current_page ($widget) },
… …
3589 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3590 fontsize => 0.8, 3817 fontsize => 0.8,
3591 @_, 3818 @_,
3592 ); 3819 );
3593 3820
3594 Scalar::Util::weaken (my $this = $self); 3821 CFPlus::weaken (my $this = $self);
3595 3822
3596 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3823 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3597 3824
3598 $self 3825 $self
3599} 3826}
… …
3722 $self->SUPER::destroy; 3949 $self->SUPER::destroy;
3723} 3950}
3724 3951
3725############################################################################# 3952#############################################################################
3726 3953
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; 3954package CFPlus::UI::Root;
3912 3955
3913our @ISA = CFPlus::UI::Container::; 3956our @ISA = CFPlus::UI::Container::;
3914 3957
3915use List::Util qw(min max); 3958use List::Util qw(min max);
… …
3922 my $self = $class->SUPER::new ( 3965 my $self = $class->SUPER::new (
3923 visible => 1, 3966 visible => 1,
3924 @_, 3967 @_,
3925 ); 3968 );
3926 3969
3927 Scalar::Util::weaken ($self->{root} = $self); 3970 CFPlus::weaken ($self->{root} = $self);
3928 3971
3929 $self 3972 $self
3930} 3973}
3931 3974
3932sub size_request { 3975sub size_request {

Diff Legend

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