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.351 by root, Sun Oct 1 12:08:58 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 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;
… …
900 { 919 {
901 package CFPlus::UI::Base; 920 package CFPlus::UI::Base;
902 921
903 local ($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 vp => (new CFPlus::UI::ViewPort expand => 1),
1038 can_events => 1, 1067 can_events => 1,
1039 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
1040 %arg, 1072 %arg,
1041 ); 1073 );
1042 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
1044 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
1045 1080
1046 $self 1081 $self
1047} 1082}
1048 1083
… …
1057sub invoke_mouse_wheel { 1092sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1093 my ($self, $ev) = @_;
1059 1094
1060 return 0 unless $ev->{dy}; # only vertical movements 1095 return 0 unless $ev->{dy}; # only vertical movements
1061 1096
1062 $self->{slider}->emit (mouse_wheel => $ev); 1097 $self->{vslider}->emit (mouse_wheel => $ev);
1063 1098
1064 1 1099 1
1065} 1100}
1066 1101
1067sub update_slider { 1102sub update_slider {
1068 my ($self) = @_; 1103 my ($self) = @_;
1069 1104
1105 my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1107 #$self->{hslider}->set_visibility ($w1 != $w2);
1108
1109 my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});
1110 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1111 #$self->{vslider}->set_visibility ($h1 != $h2);
1071} 1112}
1072 1113
1073sub update { 1114sub update {
1074 my ($self) = @_; 1115 my ($self) = @_;
1075 1116
1076 $self->SUPER::update; 1117 $self->SUPER::update;
1077
1078 $self->update_slider; 1118 $self->update_slider;
1079} 1119}
1080 1120
1081sub invoke_size_allocate { 1121sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
1083 1123
1084 $self->update_slider; 1124 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1125 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1126}
1088 1127
1089############################################################################# 1128#############################################################################
1090 1129
… …
1462sub new { 1501sub new {
1463 my $class = shift; 1502 my $class = shift;
1464 1503
1465 $class->SUPER::new ( 1504 $class->SUPER::new (
1466 col_expand => [], 1505 col_expand => [],
1506 row_expand => [],
1467 @_, 1507 @_,
1468 ) 1508 )
1469} 1509}
1470 1510
1471sub children { 1511sub children {
… …
1546 my ($ws, $hs) = $self->get_wh; 1586 my ($ws, $hs) = $self->get_wh;
1547 1587
1548 my $req_w = (sum @$ws) || 1; 1588 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1589 my $req_h = (sum @$hs) || 1;
1550 1590
1551 # TODO: nicer code && do row_expand 1591 # TODO: nicer code
1552 my @col_expand = @{$self->{col_expand}}; 1592 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1593 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1594 my $col_expand = (sum @col_expand) || 1;
1555 1595
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1596 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1597
1560 CFPlus::UI::harmonize $ws; 1598 CFPlus::UI::harmonize $ws;
1599
1600 my @row_expand = @{$self->{row_expand}};
1601 @row_expand = (1) x @$ws unless @row_expand;
1602 my $row_expand = (sum @row_expand) || 1;
1603
1604 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1605
1561 CFPlus::UI::harmonize $hs; 1606 CFPlus::UI::harmonize $hs;
1562 1607
1563 my $y; 1608 my $y;
1564 1609
1565 for my $r (0 .. $#{$self->{children}}) { 1610 for my $r (0 .. $#{$self->{children}}) {
… …
1900 active_fg => [0, 0, 0], 1945 active_fg => [0, 0, 0],
1901 can_hover => 1, 1946 can_hover => 1,
1902 can_focus => 1, 1947 can_focus => 1,
1903 valign => 0, 1948 valign => 0,
1904 can_events => 1, 1949 can_events => 1,
1950 ellipsise => 0,
1905 #text => ... 1951 #text => ...
1906 #hidden => "*", 1952 #hidden => "*",
1907 @_ 1953 @_
1908 ) 1954 )
1909} 1955}
… …
1953 my $mod = $ev->{mod}; 1999 my $mod = $ev->{mod};
1954 my $sym = $ev->{sym}; 2000 my $sym = $ev->{sym};
1955 my $uni = $ev->{unicode}; 2001 my $uni = $ev->{unicode};
1956 2002
1957 my $text = $self->get_text; 2003 my $text = $self->get_text;
2004
2005 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1958 2006
1959 if ($uni == 8) { 2007 if ($uni == 8) {
1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2008 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961 } elsif ($uni == 127) { 2009 } elsif ($uni == 127) {
1962 substr $text, $self->{cursor}, 1, ""; 2010 substr $text, $self->{cursor}, 1, "";
1963 } elsif ($sym == CFPlus::SDLK_LEFT) { 2011 } elsif ($sym == CFPlus::SDLK_LEFT) {
1964 --$self->{cursor} if $self->{cursor}; 2012 --$self->{cursor} if $self->{cursor};
1965 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2013 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1966 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2014 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1967 } elsif ($sym == CFPlus::SDLK_HOME) { 2015 } elsif ($sym == CFPlus::SDLK_HOME) {
2016 # what a hack
1968 $self->{cursor} = 0; 2017 $self->{cursor} =
2018 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2019 ? length $1
2020 : 0;
1969 } elsif ($sym == CFPlus::SDLK_END) { 2021 } elsif ($sym == CFPlus::SDLK_END) {
2022 # uh, again
2023 $self->{cursor} =
2024 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1970 $self->{cursor} = length $text; 2025 ? $self->{cursor} + length $1
2026 : length $self->{text};
1971 } elsif ($uni == 21) { # ctrl-u 2027 } elsif ($uni == 21) { # ctrl-u
1972 $text = ""; 2028 $text = "";
1973 $self->{cursor} = 0; 2029 $self->{cursor} = 0;
1974 } elsif ($uni == 27) { 2030 } elsif ($uni == 27) {
1975 $self->emit ('escape'); 2031 $self->emit ('escape');
1976 } elsif ($uni) { 2032 } elsif ($uni == 0x0d) {
2033 substr $text, $self->{cursor}++, 0, "\012";
2034 } elsif ($uni >= 0x20) {
1977 substr $text, $self->{cursor}++, 0, chr $uni; 2035 substr $text, $self->{cursor}++, 0, chr $uni;
1978 } else { 2036 } else {
1979 return 0; 2037 return 0;
1980 } 2038 }
1981 2039
1982 $self->_set_text ($text); 2040 $self->_set_text ($text);
1983 2041
1984 $self->realloc; 2042 $self->realloc;
2043 $self->update;
1985 2044
1986 1 2045 1
1987} 2046}
1988 2047
1989sub invoke_focus_in { 2048sub invoke_focus_in {
… …
2058 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2117 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2059 glEnd; 2118 glEnd;
2060 } 2119 }
2061} 2120}
2062 2121
2122#############################################################################
2123
2063package CFPlus::UI::Entry; 2124package CFPlus::UI::Entry;
2064 2125
2065our @ISA = CFPlus::UI::EntryBase::; 2126our @ISA = CFPlus::UI::EntryBase::;
2066 2127
2067use CFPlus::OpenGL; 2128use CFPlus::OpenGL;
… …
2069sub invoke_key_down { 2130sub invoke_key_down {
2070 my ($self, $ev) = @_; 2131 my ($self, $ev) = @_;
2071 2132
2072 my $sym = $ev->{sym}; 2133 my $sym = $ev->{sym};
2073 2134
2074 if ($sym == 13) { 2135 if ($ev->{uni} == 0x0d || $sym == 13) {
2075 unshift @{$self->{history}}, 2136 unshift @{$self->{history}},
2076 my $txt = $self->get_text; 2137 my $txt = $self->get_text;
2077 2138
2078 $self->{history_pointer} = -1; 2139 $self->{history_pointer} = -1;
2079 $self->{history_saveback} = ''; 2140 $self->{history_saveback} = '';
… …
2109 1 2170 1
2110} 2171}
2111 2172
2112############################################################################# 2173#############################################################################
2113 2174
2175package CFPlus::UI::TextEdit;
2176
2177our @ISA = CFPlus::UI::EntryBase::;
2178
2179use CFPlus::OpenGL;
2180
2181sub move_cursor_ver {
2182 my ($self, $dy) = @_;
2183
2184 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2185
2186 $y += $dy;
2187
2188 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2189 $self->{cursor} = $index;
2190 delete $self->{cur_h};
2191 $self->update;
2192 return;
2193 }
2194}
2195
2196sub invoke_key_down {
2197 my ($self, $ev) = @_;
2198
2199 my $sym = $ev->{sym};
2200
2201 if ($sym == CFPlus::SDLK_UP) {
2202 $self->move_cursor_ver (-1);
2203 } elsif ($sym == CFPlus::SDLK_DOWN) {
2204 $self->move_cursor_ver (+1);
2205 } else {
2206 return $self->SUPER::invoke_key_down ($ev)
2207 }
2208
2209 1
2210}
2211
2212#############################################################################
2213
2114package CFPlus::UI::Button; 2214package CFPlus::UI::Button;
2115 2215
2116our @ISA = CFPlus::UI::Label::; 2216our @ISA = CFPlus::UI::Label::;
2117 2217
2118use CFPlus::OpenGL; 2218use CFPlus::OpenGL;
… …
2260 or Carp::croak "'path' or 'tex' attributes required"; 2360 or Carp::croak "'path' or 'tex' attributes required";
2261 2361
2262 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2362 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2263 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2363 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2264 2364
2265 Scalar::Util::weaken $texture_cache{$self->{path}}; 2365 CFPlus::weaken $texture_cache{$self->{path}};
2266 2366
2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2367 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2268 2368
2269 $self 2369 $self
2270} 2370}
… …
2643sub invoke_mouse_wheel { 2743sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_; 2744 my ($self, $ev) = @_;
2645 2745
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2746 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647 2747
2748 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2749
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2750 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2649 2751
2650 ! ! $delta 2752 ! ! $delta
2651} 2753}
2652 2754
2653sub update { 2755sub update {
… …
2763 #font => default_font 2865 #font => default_font
2764 @_, 2866 @_,
2765 2867
2766 layout => (new CFPlus::Layout), 2868 layout => (new CFPlus::Layout),
2767 par => [], 2869 par => [],
2870 max_par => 0,
2768 height => 0, 2871 height => 0,
2769 children => [ 2872 children => [
2770 (new CFPlus::UI::Empty expand => 1), 2873 (new CFPlus::UI::Empty expand => 1),
2771 (new CFPlus::UI::Slider vertical => 1), 2874 (new CFPlus::UI::Slider vertical => 1),
2772 ], 2875 ],
… …
2897 3000
2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3001 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899 push @{$self->{par}}, $para; 3002 push @{$self->{par}}, $para;
2900 } 3003 }
2901 3004
3005 if (my $max = $self->{max_par}) {
3006 shift @{$self->{par}} while @{$self->{par}} > $max;
3007 }
3008
2902 $self->{need_reflow}++; 3009 $self->{need_reflow}++;
2903 $self->update; 3010 $self->update;
2904} 3011}
2905 3012
2906sub scroll_to_bottom { 3013sub scroll_to_bottom {
… …
2959 3066
2960 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3067 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2961 glClearColor 0, 0, 0, 0; 3068 glClearColor 0, 0, 0, 0;
2962 glClear GL_COLOR_BUFFER_BIT; 3069 glClear GL_COLOR_BUFFER_BIT;
2963 3070
2964 {
2965 package CFPlus::UI::Base; 3071 package CFPlus::UI::Base;
2966
2967 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3072 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2968 (0, 0, $self->{w}, $self->{h}); 3073 (0, 0, $self->{w}, $self->{h});
2969 }
2970 3074
2971 my $top = int $self->{children}[1]{range}[0]; 3075 my $top = int $self->{children}[1]{range}[0];
2972 3076
2973 my $paridx = 0; 3077 my $paridx = 0;
2974 my $top_paragraph; 3078 my $top_paragraph;
… …
3221 can_events => 0, 3325 can_events => 0,
3222 @_, 3326 @_,
3223 ); 3327 );
3224 3328
3225 if ($self->{anim} && $self->{animspeed}) { 3329 if ($self->{anim} && $self->{animspeed}) {
3226 Scalar::Util::weaken (my $widget = $self); 3330 CFPlus::weaken (my $widget = $self);
3227 3331
3228 $self->{timer} = Event->timer ( 3332 $self->{timer} = Event->timer (
3229 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3333 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3230 hard => 1, 3334 hard => 1,
3231 interval => $self->{animspeed}, 3335 interval => $self->{animspeed},
… …
3291 3395
3292package CFPlus::UI::Buttonbar; 3396package CFPlus::UI::Buttonbar;
3293 3397
3294our @ISA = CFPlus::UI::HBox::; 3398our @ISA = CFPlus::UI::HBox::;
3295 3399
3296# TODO: should actualyl wrap buttons and other goodies. 3400# TODO: should actually wrap buttons and other goodies.
3297 3401
3298############################################################################# 3402#############################################################################
3299 3403
3300package CFPlus::UI::Menu; 3404package CFPlus::UI::Menu;
3301 3405
… …
3485} 3589}
3486 3590
3487sub add { 3591sub add {
3488 my ($self, $title, $widget, $tooltip) = @_; 3592 my ($self, $title, $widget, $tooltip) = @_;
3489 3593
3490 Scalar::Util::weaken $self; 3594 CFPlus::weaken $self;
3491 3595
3492 $self->{buttonbar}->add (new CFPlus::UI::Button 3596 $self->{buttonbar}->add (new CFPlus::UI::Button
3493 markup => $title, 3597 markup => $title,
3494 tooltip => $tooltip, 3598 tooltip => $tooltip,
3495 on_activate => sub { $self->set_current_page ($widget) }, 3599 on_activate => sub { $self->set_current_page ($widget) },
… …
3579 my $self = $class->SUPER::new ( 3683 my $self = $class->SUPER::new (
3580 fontsize => 0.8, 3684 fontsize => 0.8,
3581 @_, 3685 @_,
3582 ); 3686 );
3583 3687
3584 Scalar::Util::weaken (my $this = $self); 3688 CFPlus::weaken (my $this = $self);
3585 3689
3586 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3690 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3587 3691
3588 $self 3692 $self
3589} 3693}
… …
3712 $self->SUPER::destroy; 3816 $self->SUPER::destroy;
3713} 3817}
3714 3818
3715############################################################################# 3819#############################################################################
3716 3820
3717package CFPlus::UI::Inventory;
3718
3719our @ISA = CFPlus::UI::Table::;
3720
3721sub new {
3722 my $class = shift;
3723
3724 my $self = $class->SUPER::new (
3725 col_expand => [0, 1, 0],
3726 items => [],
3727 @_,
3728 );
3729
3730 $self->set_sort_order (undef);
3731
3732 $self
3733}
3734
3735sub update_items {
3736 my ($self) = @_;
3737
3738 $self->clear;
3739
3740 my @item = $self->{sort}->(@{ $self->{items} });
3741
3742 my @adds;
3743 my $row = 0;
3744 for my $item ($self->{sort}->(@{ $self->{items} })) {
3745 CFPlus::Item::update_widgets $item;
3746
3747 push @adds, 0, $row, $item->{face_widget};
3748 push @adds, 1, $row, $item->{desc_widget};
3749 push @adds, 2, $row, $item->{weight_widget};
3750
3751 $row++;
3752 }
3753
3754 $self->add (@adds);
3755}
3756
3757sub set_sort_order {
3758 my ($self, $order) = @_;
3759
3760 $self->{sort} = $order ||= sub {
3761 sort {
3762 $a->{type} <=> $b->{type}
3763 or $a->{name} cmp $b->{name}
3764 } @_
3765 };
3766
3767 $self->update_items;
3768}
3769
3770sub set_items {
3771 my ($self, $items) = @_;
3772
3773 $self->{items} = [$items ? values %$items : ()];
3774 $self->update_items;
3775}
3776
3777#############################################################################
3778
3779package CFPlus::UI::SpellList;
3780
3781our @ISA = CFPlus::UI::Table::;
3782
3783sub new {
3784 my $class = shift;
3785
3786 my $self = $class->SUPER::new (
3787 binding => [],
3788 commands => [],
3789 @_,
3790 )
3791}
3792
3793my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3794
3795my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3796 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3797my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3798 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3799my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3800 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3801my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3802 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3803my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3804 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3805
3806sub rebuild_spell_list {
3807 my ($self) = @_;
3808
3809 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3810 $self->clear;
3811
3812 return unless $::CONN;
3813
3814 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3815 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3816 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3817 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3818 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3819
3820 my $row = 0;
3821
3822 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3823 my $spell = $self->{spell}{$_};
3824
3825 $row++;
3826
3827 my $spell_cb = sub {
3828 my ($widget, $ev) = @_;
3829
3830 if ($ev->{button} == 1) {
3831 $::CONN->user_send ("cast $spell->{name}");
3832 } elsif ($ev->{button} == 2) {
3833 $::CONN->user_send ("invoke $spell->{name}");
3834 } elsif ($ev->{button} == 3) {
3835 (new CFPlus::UI::Menu
3836 items => [
3837 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3838 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3839 ],
3840 )->popup ($ev);
3841 } else {
3842 return 0;
3843 }
3844
3845 1
3846 };
3847
3848 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3849
3850 #TODO: add path info to tooltip
3851 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3852
3853 $self->add (0, $row, new CFPlus::UI::Face
3854 face => $spell->{face},
3855 can_hover => 1,
3856 can_events => 1,
3857 tooltip => $tooltip,
3858 on_button_down => $spell_cb,
3859 );
3860
3861 $self->add (1, $row, new CFPlus::UI::Label
3862 expand => 1,
3863 text => $spell->{name},
3864 can_hover => 1,
3865 can_events => 1,
3866 tooltip => $tooltip,
3867 on_button_down => $spell_cb,
3868 );
3869
3870 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3871 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3872 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3873 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3874 }
3875 });
3876}
3877
3878sub add_spell {
3879 my ($self, $spell) = @_;
3880
3881 $self->{spell}->{$spell->{name}} = $spell;
3882 $self->rebuild_spell_list;
3883}
3884
3885sub remove_spell {
3886 my ($self, $spell) = @_;
3887
3888 delete $self->{spell}->{$spell->{name}};
3889 $self->rebuild_spell_list;
3890}
3891
3892sub clear_spells {
3893 my ($self) = @_;
3894
3895 $self->{spell} = {};
3896 $self->rebuild_spell_list;
3897}
3898
3899#############################################################################
3900
3901package CFPlus::UI::Root; 3821package CFPlus::UI::Root;
3902 3822
3903our @ISA = CFPlus::UI::Container::; 3823our @ISA = CFPlus::UI::Container::;
3904 3824
3905use List::Util qw(min max); 3825use List::Util qw(min max);
… …
3912 my $self = $class->SUPER::new ( 3832 my $self = $class->SUPER::new (
3913 visible => 1, 3833 visible => 1,
3914 @_, 3834 @_,
3915 ); 3835 );
3916 3836
3917 Scalar::Util::weaken ($self->{root} = $self); 3837 CFPlus::weaken ($self->{root} = $self);
3918 3838
3919 $self 3839 $self
3920} 3840}
3921 3841
3922sub size_request { 3842sub size_request {
… …
4133 { 4053 {
4134 package CFPlus::UI::Base; 4054 package CFPlus::UI::Base;
4135 4055
4136 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4056 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4137 (0, 0, $self->{w}, $self->{h}); 4057 (0, 0, $self->{w}, $self->{h});
4138 }
4139 4058
4140 $self->_draw; 4059 $self->_draw;
4060 }
4141} 4061}
4142 4062
4143############################################################################# 4063#############################################################################
4144 4064
4145package CFPlus::UI; 4065package CFPlus::UI;

Diff Legend

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