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.348 by root, Thu Aug 17 01:27:28 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,
… …
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;
… …
898 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
899 918
900 { 919 {
901 package CFPlus::UI::Base; 920 package CFPlus::UI::Base;
902 921
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
905 } 926 }
906
907 $self->_render;
908 }; 927 };
909} 928}
910 929
911sub _draw { 930sub _draw {
912 my ($self) = @_; 931 my ($self) = @_;
… …
1014 1033
1015############################################################################# 1034#############################################################################
1016 1035
1017package CFPlus::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
1018 1037
1019our @ISA = CFPlus::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
1020 1039
1021sub new { 1040sub new {
1022 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
1023 1042
1024 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
1025 1044
1026 my $self; 1045 my $self;
1027 1046
1028 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
1029 vertical => 1, 1057 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1059 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1062 },
1034 ; 1063 ;
1035 1064
1036 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1038 can_events => 1, 1068 can_events => 1,
1039 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
1040 %arg, 1073 %arg,
1041 ); 1074 );
1042 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
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1082 $self->SUPER::add (0, 0, $self->{vp});
1083
1044 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
1045 1085
1046 $self 1086 $self
1047} 1087}
1048 1088
… …
1055} 1095}
1056 1096
1057sub invoke_mouse_wheel { 1097sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1098 my ($self, $ev) = @_;
1059 1099
1060 return 0 unless $ev->{dy}; # only vertical movements 1100 return 0 unless $ev->{dy}; # only vertical movements for now
1061 1101
1062 $self->{slider}->emit (mouse_wheel => $ev); 1102 $self->{vslider}->emit (mouse_wheel => $ev);
1063 1103
1064 1 1104 1
1065} 1105}
1066 1106
1067sub update_slider { 1107sub update_slider {
1068 my ($self) = @_; 1108 my ($self) = @_;
1069 1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1070 $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 }
1071} 1129}
1072 1130
1073sub update { 1131sub update {
1074 my ($self) = @_; 1132 my ($self) = @_;
1075 1133
1076 $self->SUPER::update; 1134 $self->SUPER::update;
1077
1078 $self->update_slider; 1135 $self->update_slider;
1079} 1136}
1080 1137
1081sub invoke_size_allocate { 1138sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1083 1140
1084 $self->update_slider; 1141 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1142 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1143}
1088 1144
1089############################################################################# 1145#############################################################################
1090 1146
… …
1461 1517
1462sub new { 1518sub new {
1463 my $class = shift; 1519 my $class = shift;
1464 1520
1465 $class->SUPER::new ( 1521 $class->SUPER::new (
1522 children => [],
1466 col_expand => [], 1523 col_expand => [],
1524 row_expand => [],
1467 @_, 1525 @_,
1468 ) 1526 )
1469} 1527}
1470 1528
1471sub children { 1529sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473} 1531}
1474 1532
1533# TODO: store row/col info in child widget and use standard add/del
1475sub add { 1534sub add {
1476 my ($self) = shift; 1535 my ($self) = shift;
1477 1536
1478 while (@_) { 1537 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1538 my ($x, $y, $child) = splice @_, 0, 3, ();
1480 $child->set_parent ($self); 1539 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child; 1540 $self->{children}[$y][$x] = $child;
1482 } 1541 }
1483 1542
1484 $self->{force_realloc} = 1; 1543 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1; 1544 $self->{force_size_alloc} = 1;
1486 $self->realloc; 1545 $self->realloc;
1487} 1546}
1488 1547
1489sub remove { 1548sub remove {
1490 my ($self, $child) = @_; 1549 my ($self, $child) = @_;
1491 1550
1492 # TODO: not yet implemented 1551 for (@{ $self->{children} }) {
1552 for (@{ $_ || [] }) {
1553 $_ = undef if $_ == $child;
1554 }
1555 }
1493} 1556}
1494 1557
1495# 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?
1496sub clear { 1559sub clear {
1497 my ($self) = @_; 1560 my ($self) = @_;
… …
1546 my ($ws, $hs) = $self->get_wh; 1609 my ($ws, $hs) = $self->get_wh;
1547 1610
1548 my $req_w = (sum @$ws) || 1; 1611 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1612 my $req_h = (sum @$hs) || 1;
1550 1613
1551 # TODO: nicer code && do row_expand 1614 # TODO: nicer code
1552 my @col_expand = @{$self->{col_expand}}; 1615 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1616 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1617 my $col_expand = (sum @col_expand) || 1;
1555 1618
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1620
1560 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
1561 CFPlus::UI::harmonize $hs; 1629 CFPlus::UI::harmonize $hs;
1562 1630
1563 my $y; 1631 my $y;
1564 1632
1565 for my $r (0 .. $#{$self->{children}}) { 1633 for my $r (0 .. $#{$self->{children}}) {
… …
1605 my ($self) = @_; 1673 my ($self) = @_;
1606 1674
1607 for (grep $_, @{$self->{children}}) { 1675 for (grep $_, @{$self->{children}}) {
1608 $_->draw for grep $_, @$_; 1676 $_->draw for grep $_, @$_;
1609 } 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
1610} 1760}
1611 1761
1612############################################################################# 1762#############################################################################
1613 1763
1614package CFPlus::UI::Box; 1764package CFPlus::UI::Box;
… …
1900 active_fg => [0, 0, 0], 2050 active_fg => [0, 0, 0],
1901 can_hover => 1, 2051 can_hover => 1,
1902 can_focus => 1, 2052 can_focus => 1,
1903 valign => 0, 2053 valign => 0,
1904 can_events => 1, 2054 can_events => 1,
2055 ellipsise => 0,
1905 #text => ... 2056 #text => ...
1906 #hidden => "*", 2057 #hidden => "*",
1907 @_ 2058 @_
1908 ) 2059 )
1909} 2060}
… …
1953 my $mod = $ev->{mod}; 2104 my $mod = $ev->{mod};
1954 my $sym = $ev->{sym}; 2105 my $sym = $ev->{sym};
1955 my $uni = $ev->{unicode}; 2106 my $uni = $ev->{unicode};
1956 2107
1957 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;
1958 2111
1959 if ($uni == 8) { 2112 if ($uni == 8) {
1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961 } elsif ($uni == 127) { 2114 } elsif ($uni == 127) {
1962 substr $text, $self->{cursor}, 1, ""; 2115 substr $text, $self->{cursor}, 1, "";
1963 } elsif ($sym == CFPlus::SDLK_LEFT) { 2116 } elsif ($sym == CFPlus::SDLK_LEFT) {
1964 --$self->{cursor} if $self->{cursor}; 2117 --$self->{cursor} if $self->{cursor};
1965 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2118 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1966 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2119 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1967 } elsif ($sym == CFPlus::SDLK_HOME) { 2120 } elsif ($sym == CFPlus::SDLK_HOME) {
2121 # what a hack
2122 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1
2125 : 0;
2126 } elsif ($sym == CFPlus::SDLK_END) {
2127 # uh, again
2128 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130 ? $self->{cursor} + length $1
2131 : length $self->{text};
2132 } elsif ($uni == 21) { # ctrl-u
2133 $text = "";
1968 $self->{cursor} = 0; 2134 $self->{cursor} = 0;
1969 } elsif ($sym == CFPlus::SDLK_END) {
1970 $self->{cursor} = length $text;
1971 } elsif ($uni == 21) { # ctrl-u
1972 $text = "";
1973 } elsif ($uni == 27) { 2135 } elsif ($uni == 27) {
1974 $self->emit ('escape'); 2136 $self->emit ('escape');
1975 } elsif ($uni) { 2137 } elsif ($uni == 0x0d) {
2138 substr $text, $self->{cursor}++, 0, "\012";
2139 } elsif ($uni >= 0x20) {
1976 substr $text, $self->{cursor}++, 0, chr $uni; 2140 substr $text, $self->{cursor}++, 0, chr $uni;
1977 } else { 2141 } else {
1978 return 0; 2142 return 0;
1979 } 2143 }
1980 2144
1981 $self->_set_text ($text); 2145 $self->_set_text ($text);
1982 2146
1983 $self->realloc; 2147 $self->realloc;
2148 $self->update;
1984 2149
1985 1 2150 1
1986} 2151}
1987 2152
1988sub invoke_focus_in { 2153sub invoke_focus_in {
… …
2057 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};
2058 glEnd; 2223 glEnd;
2059 } 2224 }
2060} 2225}
2061 2226
2227#############################################################################
2228
2062package CFPlus::UI::Entry; 2229package CFPlus::UI::Entry;
2063 2230
2064our @ISA = CFPlus::UI::EntryBase::; 2231our @ISA = CFPlus::UI::EntryBase::;
2065 2232
2066use CFPlus::OpenGL; 2233use CFPlus::OpenGL;
… …
2068sub invoke_key_down { 2235sub invoke_key_down {
2069 my ($self, $ev) = @_; 2236 my ($self, $ev) = @_;
2070 2237
2071 my $sym = $ev->{sym}; 2238 my $sym = $ev->{sym};
2072 2239
2073 if ($sym == 13) { 2240 if ($ev->{uni} == 0x0d || $sym == 13) {
2074 unshift @{$self->{history}}, 2241 unshift @{$self->{history}},
2075 my $txt = $self->get_text; 2242 my $txt = $self->get_text;
2076 2243
2077 $self->{history_pointer} = -1; 2244 $self->{history_pointer} = -1;
2078 $self->{history_saveback} = ''; 2245 $self->{history_saveback} = '';
… …
2108 1 2275 1
2109} 2276}
2110 2277
2111############################################################################# 2278#############################################################################
2112 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
2113package CFPlus::UI::Button; 2319package CFPlus::UI::Button;
2114 2320
2115our @ISA = CFPlus::UI::Label::; 2321our @ISA = CFPlus::UI::Label::;
2116 2322
2117use CFPlus::OpenGL; 2323use CFPlus::OpenGL;
… …
2259 or Carp::croak "'path' or 'tex' attributes required"; 2465 or Carp::croak "'path' or 'tex' attributes required";
2260 2466
2261 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2467 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2262 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;
2263 2469
2264 Scalar::Util::weaken $texture_cache{$self->{path}}; 2470 CFPlus::weaken $texture_cache{$self->{path}};
2265 2471
2266 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2472 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2267 2473
2268 $self 2474 $self
2269} 2475}
… …
2642sub invoke_mouse_wheel { 2848sub invoke_mouse_wheel {
2643 my ($self, $ev) = @_; 2849 my ($self, $ev) = @_;
2644 2850
2645 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2851 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2646 2852
2853 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2854
2647 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2855 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2648 2856
2649 ! ! $delta 2857 ! ! $delta
2650} 2858}
2651 2859
2652sub update { 2860sub update {
… …
2762 #font => default_font 2970 #font => default_font
2763 @_, 2971 @_,
2764 2972
2765 layout => (new CFPlus::Layout), 2973 layout => (new CFPlus::Layout),
2766 par => [], 2974 par => [],
2975 max_par => 0,
2767 height => 0, 2976 height => 0,
2768 children => [ 2977 children => [
2769 (new CFPlus::UI::Empty expand => 1), 2978 (new CFPlus::UI::Empty expand => 1),
2770 (new CFPlus::UI::Slider vertical => 1), 2979 (new CFPlus::UI::Slider vertical => 1),
2771 ], 2980 ],
… …
2896 3105
2897 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3106 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2898 push @{$self->{par}}, $para; 3107 push @{$self->{par}}, $para;
2899 } 3108 }
2900 3109
3110 if (my $max = $self->{max_par}) {
3111 shift @{$self->{par}} while @{$self->{par}} > $max;
3112 }
3113
2901 $self->{need_reflow}++; 3114 $self->{need_reflow}++;
2902 $self->update; 3115 $self->update;
2903} 3116}
2904 3117
2905sub scroll_to_bottom { 3118sub scroll_to_bottom {
… …
2957 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2958 3171
2959 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3172 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2960 glClearColor 0, 0, 0, 0; 3173 glClearColor 0, 0, 0, 0;
2961 glClear GL_COLOR_BUFFER_BIT; 3174 glClear GL_COLOR_BUFFER_BIT;
3175
3176 package CFPlus::UI::Base;
3177 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3178 (0, 0, $self->{w}, $self->{h});
2962 3179
2963 my $top = int $self->{children}[1]{range}[0]; 3180 my $top = int $self->{children}[1]{range}[0];
2964 3181
2965 my $paridx = 0; 3182 my $paridx = 0;
2966 my $top_paragraph; 3183 my $top_paragraph;
… …
3207 3424
3208sub new { 3425sub new {
3209 my $class = shift; 3426 my $class = shift;
3210 3427
3211 my $self = $class->SUPER::new ( 3428 my $self = $class->SUPER::new (
3429 size_w => 32,
3430 size_h => 8,
3212 aspect => 1, 3431 aspect => 1,
3213 can_events => 0, 3432 can_events => 0,
3214 @_, 3433 @_,
3215 ); 3434 );
3216 3435
3217 if ($self->{anim} && $self->{animspeed}) { 3436 if ($self->{anim} && $self->{animspeed}) {
3218 Scalar::Util::weaken (my $widget = $self); 3437 CFPlus::weaken (my $widget = $self);
3219 3438
3220 $self->{timer} = Event->timer ( 3439 $self->{timer} = Event->timer (
3221 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3222 hard => 1, 3441 hard => 1,
3223 interval => $self->{animspeed}, 3442 interval => $self->{animspeed},
3224 cb => sub { 3443 cb => sub {
3444 return unless $::CONN;
3445
3225 ++$widget->{frame}; 3446 ++$widget->{frame};
3447 $self->update_face;
3226 $widget->update; 3448 $self->update;
3227 }, 3449 },
3228 ); 3450 );
3451
3452 $self->update_face;
3229 } 3453 }
3230 3454
3231 $self 3455 $self
3232} 3456}
3233 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
3234sub size_request { 3471sub size_request {
3235 (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)
3236} 3487}
3237 3488
3238sub update { 3489sub update {
3239 my ($self) = @_; 3490 my ($self) = @_;
3240 3491
… …
3248 3499
3249 return unless $::CONN; 3500 return unless $::CONN;
3250 3501
3251 $self->SUPER::_draw; 3502 $self->SUPER::_draw;
3252 3503
3253 my $face;
3254
3255 if ($self->{frame}) {
3256 my $anim = $::CONN->{anim}[$self->{anim}]; 3504 my $faceid = $::CONN->{faceid}[$self->{face}]
3257 3505 or return;
3258 $face = $anim->[ $self->{frame} % @$anim ]
3259 if $anim && @$anim;
3260 }
3261 3506
3262 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3507 my $tex = $::CONN->{texture}[$faceid];
3263 3508
3264 if ($tex) { 3509 if ($tex) {
3265 glEnable GL_TEXTURE_2D; 3510 glEnable GL_TEXTURE_2D;
3266 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3267 glColor 0, 0, 0, 1; 3512 glColor 0, 0, 0, 1;
… …
3283 3528
3284package CFPlus::UI::Buttonbar; 3529package CFPlus::UI::Buttonbar;
3285 3530
3286our @ISA = CFPlus::UI::HBox::; 3531our @ISA = CFPlus::UI::HBox::;
3287 3532
3288# TODO: should actualyl wrap buttons and other goodies. 3533# TODO: should actually wrap buttons and other goodies.
3289 3534
3290############################################################################# 3535#############################################################################
3291 3536
3292package CFPlus::UI::Menu; 3537package CFPlus::UI::Menu;
3293 3538
… …
3477} 3722}
3478 3723
3479sub add { 3724sub add {
3480 my ($self, $title, $widget, $tooltip) = @_; 3725 my ($self, $title, $widget, $tooltip) = @_;
3481 3726
3482 Scalar::Util::weaken $self; 3727 CFPlus::weaken $self;
3483 3728
3484 $self->{buttonbar}->add (new CFPlus::UI::Button 3729 $self->{buttonbar}->add (new CFPlus::UI::Button
3485 markup => $title, 3730 markup => $title,
3486 tooltip => $tooltip, 3731 tooltip => $tooltip,
3487 on_activate => sub { $self->set_current_page ($widget) }, 3732 on_activate => sub { $self->set_current_page ($widget) },
… …
3571 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3572 fontsize => 0.8, 3817 fontsize => 0.8,
3573 @_, 3818 @_,
3574 ); 3819 );
3575 3820
3576 Scalar::Util::weaken (my $this = $self); 3821 CFPlus::weaken (my $this = $self);
3577 3822
3578 $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 });
3579 3824
3580 $self 3825 $self
3581} 3826}
… …
3704 $self->SUPER::destroy; 3949 $self->SUPER::destroy;
3705} 3950}
3706 3951
3707############################################################################# 3952#############################################################################
3708 3953
3709package CFPlus::UI::Inventory;
3710
3711our @ISA = CFPlus::UI::Table::;
3712
3713sub new {
3714 my $class = shift;
3715
3716 my $self = $class->SUPER::new (
3717 col_expand => [0, 1, 0],
3718 items => [],
3719 @_,
3720 );
3721
3722 $self->set_sort_order (undef);
3723
3724 $self
3725}
3726
3727sub update_items {
3728 my ($self) = @_;
3729
3730 $self->clear;
3731
3732 my @item = $self->{sort}->(@{ $self->{items} });
3733
3734 my @adds;
3735 my $row = 0;
3736 for my $item ($self->{sort}->(@{ $self->{items} })) {
3737 CFPlus::Item::update_widgets $item;
3738
3739 push @adds, 0, $row, $item->{face_widget};
3740 push @adds, 1, $row, $item->{desc_widget};
3741 push @adds, 2, $row, $item->{weight_widget};
3742
3743 $row++;
3744 }
3745
3746 $self->add (@adds);
3747}
3748
3749sub set_sort_order {
3750 my ($self, $order) = @_;
3751
3752 $self->{sort} = $order ||= sub {
3753 sort {
3754 $a->{type} <=> $b->{type}
3755 or $a->{name} cmp $b->{name}
3756 } @_
3757 };
3758
3759 $self->update_items;
3760}
3761
3762sub set_items {
3763 my ($self, $items) = @_;
3764
3765 $self->{items} = [$items ? values %$items : ()];
3766 $self->update_items;
3767}
3768
3769#############################################################################
3770
3771package CFPlus::UI::SpellList;
3772
3773our @ISA = CFPlus::UI::Table::;
3774
3775sub new {
3776 my $class = shift;
3777
3778 my $self = $class->SUPER::new (
3779 binding => [],
3780 commands => [],
3781 @_,
3782 )
3783}
3784
3785my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3786
3787my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3788 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3789my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3790 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3791my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3792 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3793my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3794 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3795my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3796 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3797
3798sub rebuild_spell_list {
3799 my ($self) = @_;
3800
3801 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3802 $self->clear;
3803
3804 return unless $::CONN;
3805
3806 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3807 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3808 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3809 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3810 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3811
3812 my $row = 0;
3813
3814 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3815 my $spell = $self->{spell}{$_};
3816
3817 $row++;
3818
3819 my $spell_cb = sub {
3820 my ($widget, $ev) = @_;
3821
3822 if ($ev->{button} == 1) {
3823 $::CONN->user_send ("cast $spell->{name}");
3824 } elsif ($ev->{button} == 2) {
3825 $::CONN->user_send ("invoke $spell->{name}");
3826 } elsif ($ev->{button} == 3) {
3827 (new CFPlus::UI::Menu
3828 items => [
3829 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3830 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3831 ],
3832 )->popup ($ev);
3833 } else {
3834 return 0;
3835 }
3836
3837 1
3838 };
3839
3840 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3841
3842 #TODO: add path info to tooltip
3843 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3844
3845 $self->add (0, $row, new CFPlus::UI::Face
3846 face => $spell->{face},
3847 can_hover => 1,
3848 can_events => 1,
3849 tooltip => $tooltip,
3850 on_button_down => $spell_cb,
3851 );
3852
3853 $self->add (1, $row, new CFPlus::UI::Label
3854 expand => 1,
3855 text => $spell->{name},
3856 can_hover => 1,
3857 can_events => 1,
3858 tooltip => $tooltip,
3859 on_button_down => $spell_cb,
3860 );
3861
3862 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3863 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3864 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3865 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3866 }
3867 });
3868}
3869
3870sub add_spell {
3871 my ($self, $spell) = @_;
3872
3873 $self->{spell}->{$spell->{name}} = $spell;
3874 $self->rebuild_spell_list;
3875}
3876
3877sub remove_spell {
3878 my ($self, $spell) = @_;
3879
3880 delete $self->{spell}->{$spell->{name}};
3881 $self->rebuild_spell_list;
3882}
3883
3884sub clear_spells {
3885 my ($self) = @_;
3886
3887 $self->{spell} = {};
3888 $self->rebuild_spell_list;
3889}
3890
3891#############################################################################
3892
3893package CFPlus::UI::Root; 3954package CFPlus::UI::Root;
3894 3955
3895our @ISA = CFPlus::UI::Container::; 3956our @ISA = CFPlus::UI::Container::;
3896 3957
3897use List::Util qw(min max); 3958use List::Util qw(min max);
… …
3904 my $self = $class->SUPER::new ( 3965 my $self = $class->SUPER::new (
3905 visible => 1, 3966 visible => 1,
3906 @_, 3967 @_,
3907 ); 3968 );
3908 3969
3909 Scalar::Util::weaken ($self->{root} = $self); 3970 CFPlus::weaken ($self->{root} = $self);
3910 3971
3911 $self 3972 $self
3912} 3973}
3913 3974
3914sub size_request { 3975sub size_request {
… …
4123 glLoadIdentity; 4184 glLoadIdentity;
4124 4185
4125 { 4186 {
4126 package CFPlus::UI::Base; 4187 package CFPlus::UI::Base;
4127 4188
4128 ($draw_x, $draw_y, $draw_w, $draw_h) = 4189 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4129 (0, 0, $self->{w}, $self->{h}); 4190 (0, 0, $self->{w}, $self->{h});
4130 }
4131 4191
4132 $self->_draw; 4192 $self->_draw;
4193 }
4133} 4194}
4134 4195
4135############################################################################# 4196#############################################################################
4136 4197
4137package CFPlus::UI; 4198package CFPlus::UI;

Diff Legend

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