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.346 by root, Mon Aug 14 01:21:02 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 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
1082 $self->SUPER::add (0, 0, $self->{vp});
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085
1044 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
1045 1087
1046 $self 1088 $self
1047} 1089}
1048 1090
… …
1057sub invoke_mouse_wheel { 1099sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1100 my ($self, $ev) = @_;
1059 1101
1060 return 0 unless $ev->{dy}; # only vertical movements 1102 return 0 unless $ev->{dy}; # only vertical movements
1061 1103
1062 $self->{slider}->emit (mouse_wheel => $ev); 1104 $self->{vslider}->emit (mouse_wheel => $ev);
1063 1105
1064 1 1106 1
1065} 1107}
1066 1108
1067sub update_slider { 1109sub update_slider {
1068 my ($self) = @_; 1110 my ($self) = @_;
1069 1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 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]); 1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1071} 1121}
1072 1122
1073sub update { 1123sub update {
1074 my ($self) = @_; 1124 my ($self) = @_;
1075 1125
1076 $self->SUPER::update; 1126 $self->SUPER::update;
1077
1078 $self->update_slider; 1127 $self->update_slider;
1079} 1128}
1080 1129
1081sub invoke_size_allocate { 1130sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
1083 1132
1084 $self->update_slider; 1133 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1134 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1135}
1088 1136
1089############################################################################# 1137#############################################################################
1090 1138
… …
1138 my ($class, %arg) = @_; 1186 my ($class, %arg) = @_;
1139 1187
1140 if ((exists $arg{label}) && !ref $arg{label}) { 1188 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label 1189 $arg{label} = new CFPlus::UI::Label
1142 align => 1, 1190 align => 1,
1143 valign => 1, 1191 valign => 0,
1144 text => $arg{label}, 1192 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75; 1193 fontsize => ($arg{border} || 0.8) * 0.75;
1146 } 1194 }
1147 1195
1148 my $self = $class->SUPER::new ( 1196 my $self = $class->SUPER::new (
… …
1462sub new { 1510sub new {
1463 my $class = shift; 1511 my $class = shift;
1464 1512
1465 $class->SUPER::new ( 1513 $class->SUPER::new (
1466 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1467 @_, 1516 @_,
1468 ) 1517 )
1469} 1518}
1470 1519
1471sub children { 1520sub children {
… …
1546 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1547 1596
1548 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1550 1599
1551 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1552 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1555 1604
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1606
1560 CFPlus::UI::harmonize $ws; 1607 CFPlus::UI::harmonize $ws;
1608
1609 my @row_expand = @{$self->{row_expand}};
1610 @row_expand = (1) x @$ws unless @row_expand;
1611 my $row_expand = (sum @row_expand) || 1;
1612
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614
1561 CFPlus::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1562 1616
1563 my $y; 1617 my $y;
1564 1618
1565 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
… …
1900 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1901 can_hover => 1, 1955 can_hover => 1,
1902 can_focus => 1, 1956 can_focus => 1,
1903 valign => 0, 1957 valign => 0,
1904 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1905 #text => ... 1960 #text => ...
1906 #hidden => "*", 1961 #hidden => "*",
1907 @_ 1962 @_
1908 ) 1963 )
1909} 1964}
… …
1953 my $mod = $ev->{mod}; 2008 my $mod = $ev->{mod};
1954 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1955 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1956 2011
1957 my $text = $self->get_text; 2012 my $text = $self->get_text;
2013
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1958 2015
1959 if ($uni == 8) { 2016 if ($uni == 8) {
1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1962 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1963 } elsif ($sym == CFPlus::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1964 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1965 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1966 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1967 } elsif ($sym == CFPlus::SDLK_HOME) { 2024 } elsif ($sym == CFPlus::SDLK_HOME) {
2025 # what a hack
2026 $self->{cursor} =
2027 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2028 ? length $1
2029 : 0;
2030 } elsif ($sym == CFPlus::SDLK_END) {
2031 # uh, again
2032 $self->{cursor} =
2033 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2034 ? $self->{cursor} + length $1
2035 : length $self->{text};
2036 } elsif ($uni == 21) { # ctrl-u
2037 $text = "";
1968 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1969 } elsif ($sym == CFPlus::SDLK_END) {
1970 $self->{cursor} = length $text;
1971 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1972 $self->emit ('escape'); 2040 $self->emit ('escape');
1973 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1974 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
1975 } else { 2045 } else {
1976 return 0; 2046 return 0;
1977 } 2047 }
1978 2048
1979 $self->_set_text ($text); 2049 $self->_set_text ($text);
1980 2050
1981 $self->realloc; 2051 $self->realloc;
2052 $self->update;
1982 2053
1983 1 2054 1
1984} 2055}
1985 2056
1986sub invoke_focus_in { 2057sub invoke_focus_in {
… …
2055 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2056 glEnd; 2127 glEnd;
2057 } 2128 }
2058} 2129}
2059 2130
2131#############################################################################
2132
2060package CFPlus::UI::Entry; 2133package CFPlus::UI::Entry;
2061 2134
2062our @ISA = CFPlus::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
2063 2136
2064use CFPlus::OpenGL; 2137use CFPlus::OpenGL;
… …
2066sub invoke_key_down { 2139sub invoke_key_down {
2067 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
2068 2141
2069 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
2070 2143
2071 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
2072 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
2073 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
2074 2147
2075 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
2076 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
… …
2106 1 2179 1
2107} 2180}
2108 2181
2109############################################################################# 2182#############################################################################
2110 2183
2184package CFPlus::UI::TextEdit;
2185
2186our @ISA = CFPlus::UI::EntryBase::;
2187
2188use CFPlus::OpenGL;
2189
2190sub move_cursor_ver {
2191 my ($self, $dy) = @_;
2192
2193 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2194
2195 $y += $dy;
2196
2197 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2198 $self->{cursor} = $index;
2199 delete $self->{cur_h};
2200 $self->update;
2201 return;
2202 }
2203}
2204
2205sub invoke_key_down {
2206 my ($self, $ev) = @_;
2207
2208 my $sym = $ev->{sym};
2209
2210 if ($sym == CFPlus::SDLK_UP) {
2211 $self->move_cursor_ver (-1);
2212 } elsif ($sym == CFPlus::SDLK_DOWN) {
2213 $self->move_cursor_ver (+1);
2214 } else {
2215 return $self->SUPER::invoke_key_down ($ev)
2216 }
2217
2218 1
2219}
2220
2221#############################################################################
2222
2111package CFPlus::UI::Button; 2223package CFPlus::UI::Button;
2112 2224
2113our @ISA = CFPlus::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
2114 2226
2115use CFPlus::OpenGL; 2227use CFPlus::OpenGL;
… …
2257 or Carp::croak "'path' or 'tex' attributes required"; 2369 or Carp::croak "'path' or 'tex' attributes required";
2258 2370
2259 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2260 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2372 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2261 2373
2262 Scalar::Util::weaken $texture_cache{$self->{path}}; 2374 CFPlus::weaken $texture_cache{$self->{path}};
2263 2375
2264 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2265 2377
2266 $self 2378 $self
2267} 2379}
… …
2640sub invoke_mouse_wheel { 2752sub invoke_mouse_wheel {
2641 my ($self, $ev) = @_; 2753 my ($self, $ev) = @_;
2642 2754
2643 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2644 2756
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758
2645 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2646 2760
2647 ! ! $delta 2761 ! ! $delta
2648} 2762}
2649 2763
2650sub update { 2764sub update {
… …
2760 #font => default_font 2874 #font => default_font
2761 @_, 2875 @_,
2762 2876
2763 layout => (new CFPlus::Layout), 2877 layout => (new CFPlus::Layout),
2764 par => [], 2878 par => [],
2879 max_par => 0,
2765 height => 0, 2880 height => 0,
2766 children => [ 2881 children => [
2767 (new CFPlus::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2768 (new CFPlus::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2769 ], 2884 ],
… …
2853} 2968}
2854 2969
2855sub current_paragraph { 2970sub current_paragraph {
2856 my ($self) = @_; 2971 my ($self) = @_;
2857 2972
2858 $self->force_uptodate;
2859 $self->{top_paragraph} - 1 2973 $self->{top_paragraph} - 1
2860} 2974}
2861 2975
2862sub scroll_to { 2976sub scroll_to {
2863 my ($self, $para) = @_; 2977 my ($self, $para) = @_;
2864 2978
2865 $self->force_uptodate;
2866
2867 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para; 2979 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2868 2980
2869 $self->{children}[1]->set_value ($self->{par}[$para]{y}); 2981 $self->{scroll_to} = $para;
2982 $self->update;
2870} 2983}
2871 2984
2872sub clear { 2985sub clear {
2873 my ($self) = @_; 2986 my ($self) = @_;
2874 2987
… …
2896 3009
2897 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3010 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2898 push @{$self->{par}}, $para; 3011 push @{$self->{par}}, $para;
2899 } 3012 }
2900 3013
3014 if (my $max = $self->{max_par}) {
3015 shift @{$self->{par}} while @{$self->{par}} > $max;
3016 }
3017
2901 $self->{need_reflow}++; 3018 $self->{need_reflow}++;
2902 $self->update; 3019 $self->update;
2903} 3020}
2904 3021
2905sub scroll_to_bottom { 3022sub scroll_to_bottom {
2906 my ($self) = @_; 3023 my ($self) = @_;
2907 3024
2908 $self->{scroll_to_bottom} = 1; 3025 $self->{scroll_to} = $#{$self->{par}};
2909 $self->update; 3026 $self->update;
2910} 3027}
2911 3028
2912sub force_uptodate { 3029sub force_uptodate {
2913 my ($self) = @_; 3030 my ($self) = @_;
2914 3031
2915 if (delete $self->{need_reflow}) { 3032 if (delete $self->{need_reflow}) {
2916 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2917 3034
2918 my $height = 0; 3035 my $height = 0;
2919 my $paridx;
2920 my $top_paragraph;
2921 my $top = int $self->{children}[1]{range}[0];
2922 3036
2923 for my $para (@{$self->{par}}) { 3037 for my $para (@{$self->{par}}) {
2924 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { 3038 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2925 my $layout = $self->get_layout ($para); 3039 my $layout = $self->get_layout ($para);
2926 my ($w, $h) = $layout->size; 3040 my ($w, $h) = $layout->size;
… …
2929 $para->{h} = $h; 3043 $para->{h} = $h;
2930 $para->{wrapped} = $layout->has_wrapped; 3044 $para->{wrapped} = $layout->has_wrapped;
2931 } 3045 }
2932 3046
2933 $para->{y} = $height; 3047 $para->{y} = $height;
2934
2935 $paridx++;
2936 $top_paragraph ||= $paridx if $height >= $top;
2937
2938 $height += $para->{h}; 3048 $height += $para->{h};
2939 } 3049 }
2940 3050
2941 $self->{top_paragraph} = $top_paragraph;
2942 $self->{height} = $height; 3051 $self->{height} = $height;
2943
2944 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]); 3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2945 3053
2946 delete $self->{texture}; 3054 delete $self->{texture};
2947 } 3055 }
2948 3056
2949 if (delete $self->{scroll_to_bottom}) { 3057 if (my $paridx = delete $self->{scroll_to}) {
2950 $self->{children}[1]->set_value (1e10); 3058 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2951 } 3059 }
2952} 3060}
2953 3061
2954sub update { 3062sub update {
2955 my ($self) = @_; 3063 my ($self) = @_;
… …
2967 3075
2968 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2969 glClearColor 0, 0, 0, 0; 3077 glClearColor 0, 0, 0, 0;
2970 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2971 3079
3080 package CFPlus::UI::Base;
3081 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3082 (0, 0, $self->{w}, $self->{h});
3083
3084 my $top = int $self->{children}[1]{range}[0];
3085
3086 my $paridx = 0;
3087 my $top_paragraph;
2972 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2973 3089
2974 my $y0 = $top; 3090 my $y0 = $top;
2975 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2976 3092
… …
2994 3110
2995 $_->draw; 3111 $_->draw;
2996 } 3112 }
2997 } 3113 }
2998 } 3114 }
3115
3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2999 } 3118 }
3119
3120 $self->{top_paragraph} = $top_paragraph;
3000 }; 3121 };
3001 }); 3122 });
3002} 3123}
3003 3124
3004sub reconfigure { 3125sub reconfigure {
… …
3213 can_events => 0, 3334 can_events => 0,
3214 @_, 3335 @_,
3215 ); 3336 );
3216 3337
3217 if ($self->{anim} && $self->{animspeed}) { 3338 if ($self->{anim} && $self->{animspeed}) {
3218 Scalar::Util::weaken (my $widget = $self); 3339 CFPlus::weaken (my $widget = $self);
3219 3340
3220 $self->{timer} = Event->timer ( 3341 $self->{timer} = Event->timer (
3221 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3342 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3222 hard => 1, 3343 hard => 1,
3223 interval => $self->{animspeed}, 3344 interval => $self->{animspeed},
3224 cb => sub { 3345 cb => sub {
3346 delete $self->{wait_face};
3225 ++$widget->{frame}; 3347 ++$widget->{frame};
3226 $widget->update; 3348 $widget->update;
3227 }, 3349 },
3228 ); 3350 );
3229 } 3351 }
… …
3256 my $anim = $::CONN->{anim}[$self->{anim}]; 3378 my $anim = $::CONN->{anim}[$self->{anim}];
3257 3379
3258 $face = $anim->[ $self->{frame} % @$anim ] 3380 $face = $anim->[ $self->{frame} % @$anim ]
3259 if $anim && @$anim; 3381 if $anim && @$anim;
3260 } 3382 }
3383
3384 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3385 or return;
3261 3386
3262 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3387 my $tex = $::CONN->{texture}[$faceid];
3263 3388
3264 if ($tex) { 3389 if ($tex) {
3265 glEnable GL_TEXTURE_2D; 3390 glEnable GL_TEXTURE_2D;
3266 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3267 glColor 0, 0, 0, 1; 3392 glColor 0, 0, 0, 1;
3268 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3393 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3269 glDisable GL_TEXTURE_2D; 3394 glDisable GL_TEXTURE_2D;
3395 } else {
3396 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3397 $self->update;
3398 });
3270 } 3399 }
3271} 3400}
3272 3401
3273sub destroy { 3402sub destroy {
3274 my ($self) = @_; 3403 my ($self) = @_;
… …
3283 3412
3284package CFPlus::UI::Buttonbar; 3413package CFPlus::UI::Buttonbar;
3285 3414
3286our @ISA = CFPlus::UI::HBox::; 3415our @ISA = CFPlus::UI::HBox::;
3287 3416
3288# TODO: should actualyl wrap buttons and other goodies. 3417# TODO: should actually wrap buttons and other goodies.
3289 3418
3290############################################################################# 3419#############################################################################
3291 3420
3292package CFPlus::UI::Menu; 3421package CFPlus::UI::Menu;
3293 3422
… …
3477} 3606}
3478 3607
3479sub add { 3608sub add {
3480 my ($self, $title, $widget, $tooltip) = @_; 3609 my ($self, $title, $widget, $tooltip) = @_;
3481 3610
3482 Scalar::Util::weaken $self; 3611 CFPlus::weaken $self;
3483 3612
3484 $self->{buttonbar}->add (new CFPlus::UI::Button 3613 $self->{buttonbar}->add (new CFPlus::UI::Button
3485 markup => $title, 3614 markup => $title,
3486 tooltip => $tooltip, 3615 tooltip => $tooltip,
3487 on_activate => sub { $self->set_current_page ($widget) }, 3616 on_activate => sub { $self->set_current_page ($widget) },
… …
3571 my $self = $class->SUPER::new ( 3700 my $self = $class->SUPER::new (
3572 fontsize => 0.8, 3701 fontsize => 0.8,
3573 @_, 3702 @_,
3574 ); 3703 );
3575 3704
3576 Scalar::Util::weaken (my $this = $self); 3705 CFPlus::weaken (my $this = $self);
3577 3706
3578 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3707 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3579 3708
3580 $self 3709 $self
3581} 3710}
… …
3704 $self->SUPER::destroy; 3833 $self->SUPER::destroy;
3705} 3834}
3706 3835
3707############################################################################# 3836#############################################################################
3708 3837
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; 3838package CFPlus::UI::Root;
3894 3839
3895our @ISA = CFPlus::UI::Container::; 3840our @ISA = CFPlus::UI::Container::;
3896 3841
3897use List::Util qw(min max); 3842use List::Util qw(min max);
… …
3904 my $self = $class->SUPER::new ( 3849 my $self = $class->SUPER::new (
3905 visible => 1, 3850 visible => 1,
3906 @_, 3851 @_,
3907 ); 3852 );
3908 3853
3909 Scalar::Util::weaken ($self->{root} = $self); 3854 CFPlus::weaken ($self->{root} = $self);
3910 3855
3911 $self 3856 $self
3912} 3857}
3913 3858
3914sub size_request { 3859sub size_request {
… …
4123 glLoadIdentity; 4068 glLoadIdentity;
4124 4069
4125 { 4070 {
4126 package CFPlus::UI::Base; 4071 package CFPlus::UI::Base;
4127 4072
4128 ($draw_x, $draw_y, $draw_w, $draw_h) = 4073 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4129 (0, 0, $self->{w}, $self->{h}); 4074 (0, 0, $self->{w}, $self->{h});
4130 }
4131 4075
4132 $self->_draw; 4076 $self->_draw;
4077 }
4133} 4078}
4134 4079
4135############################################################################# 4080#############################################################################
4136 4081
4137package CFPlus::UI; 4082package CFPlus::UI;

Diff Legend

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