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.342 by root, Sun Aug 13 14:38:35 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 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;
… …
235 h => undef, 234 h => undef,
236 can_events => 1, 235 can_events => 1,
237 @_ 236 @_
238 }, $class; 237 }, $class;
239 238
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 239 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 240
242 for (keys %$self) { 241 for (keys %$self) {
243 if (/^on_(.*)$/) { 242 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
245 } 244 }
… …
262 261
263sub destroy { 262sub destroy {
264 my ($self) = @_; 263 my ($self) = @_;
265 264
266 $self->hide; 265 $self->hide;
266 $self->emit ("destroy");
267 %$self = (); 267 %$self = ();
268} 268}
269 269
270sub show { 270sub show {
271 my ($self) = @_; 271 my ($self) = @_;
… …
502 502
503 defined wantarray and CFPlus::guard { 503 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 505 @{ $self->{signal_cb}{$signal} };
506 } 506 }
507}
508
509sub disconnect_all {
510 my ($self, $signal) = @_;
511
512 delete $self->{signal_cb}{$signal};
507} 513}
508 514
509my %has_coords = ( 515my %has_coords = (
510 button_down => 1, 516 button_down => 1,
511 button_up => 1, 517 button_up => 1,
… …
514); 520);
515 521
516sub emit { 522sub emit {
517 my ($self, $signal, @args) = @_; 523 my ($self, $signal, @args) = @_;
518 524
519 # I do not really like this solution, but I dislike duplication 525 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, too. 526 # and needlessly verbose code, either.
521 my @append 527 my @append
522 = $has_coords{$signal} 528 = $has_coords{$signal}
523 ? $args[0]->xy ($self) 529 ? $args[0]->xy ($self)
524 : (); 530 : ();
525 531
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 532 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 533
528 #d##TODO# stop propagating at first true, do not use sum 534 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 535 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 536 ($self->can ("invoke_$signal") || sub { 1 }), # closure
537 ) {
538 return $cb->($self, @args, @append) || next;
539 }
540
541 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 542 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 543}
533 544
534sub find_widget { 545sub find_widget {
535 my ($self, $x, $y) = @_; 546 my ($self, $x, $y) = @_;
536 547
… …
544} 555}
545 556
546sub set_parent { 557sub set_parent {
547 my ($self, $parent) = @_; 558 my ($self, $parent) = @_;
548 559
549 Scalar::Util::weaken ($self->{parent} = $parent); 560 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 561 $self->set_visible if $parent->{visible};
551} 562}
552 563
553sub realloc { 564sub realloc {
554 my ($self) = @_; 565 my ($self) = @_;
… …
633 my ($self) = @_; 644 my ($self) = @_;
634 645
635 warn "no draw defined for $self\n"; 646 warn "no draw defined for $self\n";
636} 647}
637 648
649my $cntx;#d#
638sub DESTROY { 650sub DESTROY {
639 my ($self) = @_; 651 my ($self) = @_;
640 652
641 return if CFPlus::in_destruct; 653 return if CFPlus::in_destruct;
642
643 delete $WIDGET{$self+0};
644 654
645 eval { $self->destroy }; 655 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 656 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
657
658 delete $WIDGET{$self+0};
647} 659}
648 660
649############################################################################# 661#############################################################################
650 662
651package CFPlus::UI::DrawBG; 663package CFPlus::UI::DrawBG;
… …
898 glClear GL_COLOR_BUFFER_BIT; 910 glClear GL_COLOR_BUFFER_BIT;
899 911
900 { 912 {
901 package CFPlus::UI::Base; 913 package CFPlus::UI::Base;
902 914
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 915 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 916 (0, 0, $self->{w}, $self->{h});
917
918 $self->_render;
905 } 919 }
906
907 $self->_render;
908 }; 920 };
909} 921}
910 922
911sub _draw { 923sub _draw {
912 my ($self) = @_; 924 my ($self) = @_;
913
914 my ($w, $h) = @$self{qw(w h)};
915 925
916 my $tex = $self->{texture} 926 my $tex = $self->{texture}
917 or return; 927 or return;
918 928
919 glEnable GL_TEXTURE_2D; 929 glEnable GL_TEXTURE_2D;
920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
921 glColor 0, 0, 0, 1; 931 glColor 0, 0, 0, 1;
922 932
923 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 933 $tex->draw_quad_alpha_premultiplied (0, 0);
924 934
925 glDisable GL_TEXTURE_2D; 935 glDisable GL_TEXTURE_2D;
926} 936}
927 937
928############################################################################# 938#############################################################################
… …
1129} 1139}
1130 1140
1131############################################################################# 1141#############################################################################
1132 1142
1133package CFPlus::UI::FancyFrame; 1143package CFPlus::UI::FancyFrame;
1144
1145our @ISA = CFPlus::UI::Bin::;
1146
1147use CFPlus::OpenGL;
1148
1149sub new {
1150 my ($class, %arg) = @_;
1151
1152 if ((exists $arg{label}) && !ref $arg{label}) {
1153 $arg{label} = new CFPlus::UI::Label
1154 align => 1,
1155 valign => 0,
1156 text => $arg{label},
1157 fontsize => ($arg{border} || 0.8) * 0.75;
1158 }
1159
1160 my $self = $class->SUPER::new (
1161 # label => "",
1162 fg => [0.6, 0.3, 0.1],
1163 border => 0.8,
1164 style => 'single',
1165 %arg,
1166 );
1167
1168 $self
1169}
1170
1171sub add {
1172 my ($self, @widgets) = @_;
1173
1174 $self->SUPER::add (@widgets);
1175 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1176}
1177
1178sub border {
1179 int $_[0]{border} * $::FONTSIZE
1180}
1181
1182sub size_request {
1183 my ($self) = @_;
1184
1185 ($self->{label_w}, undef) = $self->{label}->size_request
1186 if $self->{label};
1187
1188 my ($w, $h) = $self->SUPER::size_request;
1189
1190 (
1191 $w + $self->border * 2,
1192 $h + $self->border * 2,
1193 )
1194}
1195
1196sub invoke_size_allocate {
1197 my ($self, $w, $h) = @_;
1198
1199 my $border = $self->border;
1200
1201 $w -= List::Util::max 0, $border * 2;
1202 $h -= List::Util::max 0, $border * 2;
1203
1204 if (my $label = $self->{label}) {
1205 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1206 $label->{h} = List::Util::min $h, $border;
1207 $label->invoke_size_allocate ($label->{w}, $label->{h});
1208 }
1209
1210 $self->child->configure ($border, $border, $w, $h);
1211
1212 1
1213}
1214
1215sub _draw {
1216 my ($self) = @_;
1217
1218 my $child = $self->{children}[0];
1219
1220 my $border = $self->border;
1221 my ($w, $h) = ($self->{w}, $self->{h});
1222
1223 $child->draw;
1224
1225 glColor @{$self->{fg}};
1226 glBegin GL_LINE_STRIP;
1227 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1228 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1229 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1230 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1231 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1232 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1233 glEnd;
1234
1235 if ($self->{label}) {
1236 glTranslate $border * 2, 0;
1237 $self->{label}->_draw;
1238 }
1239}
1240
1241#############################################################################
1242
1243package CFPlus::UI::Toplevel;
1134 1244
1135our @ISA = CFPlus::UI::Bin::; 1245our @ISA = CFPlus::UI::Bin::;
1136 1246
1137use CFPlus::OpenGL; 1247use CFPlus::OpenGL;
1138 1248
… …
1618 #active_bg => none 1728 #active_bg => none
1619 #font => default_font 1729 #font => default_font
1620 #text => initial text 1730 #text => initial text
1621 #markup => initial narkup 1731 #markup => initial narkup
1622 #max_w => maximum pixel width 1732 #max_w => maximum pixel width
1733 #style => 0, # render flags
1623 ellipsise => 3, # end 1734 ellipsise => 3, # end
1624 layout => (new CFPlus::Layout), 1735 layout => (new CFPlus::Layout),
1625 fontsize => 1, 1736 fontsize => 1,
1626 align => -1, 1737 align => -1,
1627 valign => -1, 1738 valign => -1,
… …
1778 }; 1889 };
1779 1890
1780 my $w = List::Util::min $self->{w} + 4, $size->[0]; 1891 my $w = List::Util::min $self->{w} + 4, $size->[0];
1781 my $h = List::Util::min $self->{h} + 2, $size->[1]; 1892 my $h = List::Util::min $self->{h} + 2, $size->[1];
1782 1893
1783 $self->{layout}->render ($self->{ox}, $self->{oy}); 1894 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1784} 1895}
1785 1896
1786############################################################################# 1897#############################################################################
1787 1898
1788package CFPlus::UI::EntryBase; 1899package CFPlus::UI::EntryBase;
… …
1801 active_fg => [0, 0, 0], 1912 active_fg => [0, 0, 0],
1802 can_hover => 1, 1913 can_hover => 1,
1803 can_focus => 1, 1914 can_focus => 1,
1804 valign => 0, 1915 valign => 0,
1805 can_events => 1, 1916 can_events => 1,
1917 ellipsise => 0,
1806 #text => ... 1918 #text => ...
1807 #hidden => "*", 1919 #hidden => "*",
1808 @_ 1920 @_
1809 ) 1921 )
1810} 1922}
… …
1864 } elsif ($sym == CFPlus::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1865 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1866 } elsif ($sym == CFPlus::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1867 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1868 } elsif ($sym == CFPlus::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1981 # what a hack
1982 $self->{cursor} =
1983 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1984 ? length $1
1985 : 0;
1986 } elsif ($sym == CFPlus::SDLK_END) {
1987 # uh, again
1988 $self->{cursor} =
1989 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1990 ? $self->{cursor} + length $1
1991 : length $self->{text};
1992 } elsif ($uni == 21) { # ctrl-u
1993 $text = "";
1869 $self->{cursor} = 0; 1994 $self->{cursor} = 0;
1870 } elsif ($sym == CFPlus::SDLK_END) {
1871 $self->{cursor} = length $text;
1872 } elsif ($uni == 27) { 1995 } elsif ($uni == 27) {
1873 $self->emit ('escape'); 1996 $self->emit ('escape');
1874 } elsif ($uni) { 1997 } elsif ($uni == 0x0d) {
1998 substr $text, $self->{cursor}++, 0, "\012";
1999 } elsif ($uni >= 0x20) {
1875 substr $text, $self->{cursor}++, 0, chr $uni; 2000 substr $text, $self->{cursor}++, 0, chr $uni;
1876 } else { 2001 } else {
1877 return 0; 2002 return 0;
1878 } 2003 }
1879 2004
1880 $self->_set_text ($text); 2005 $self->_set_text ($text);
1881 2006
1882 $self->realloc; 2007 $self->realloc;
2008 $self->update;
1883 2009
1884 1 2010 1
1885} 2011}
1886 2012
1887sub invoke_focus_in { 2013sub invoke_focus_in {
… …
1949 utf8::encode $text; 2075 utf8::encode $text;
1950 2076
1951 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2077 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1952 } 2078 }
1953 2079
1954 glColor @{$self->{fg}};
1955 glBegin GL_LINES; 2080 glBegin GL_LINES;
1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2081 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2082 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1958 glEnd; 2083 glEnd;
1959 } 2084 }
1960} 2085}
2086
2087#############################################################################
1961 2088
1962package CFPlus::UI::Entry; 2089package CFPlus::UI::Entry;
1963 2090
1964our @ISA = CFPlus::UI::EntryBase::; 2091our @ISA = CFPlus::UI::EntryBase::;
1965 2092
… …
1968sub invoke_key_down { 2095sub invoke_key_down {
1969 my ($self, $ev) = @_; 2096 my ($self, $ev) = @_;
1970 2097
1971 my $sym = $ev->{sym}; 2098 my $sym = $ev->{sym};
1972 2099
1973 if ($sym == 13) { 2100 if ($ev->{uni} == 0x0d || $sym == 13) {
1974 unshift @{$self->{history}}, 2101 unshift @{$self->{history}},
1975 my $txt = $self->get_text; 2102 my $txt = $self->get_text;
1976 2103
1977 $self->{history_pointer} = -1; 2104 $self->{history_pointer} = -1;
1978 $self->{history_saveback} = ''; 2105 $self->{history_saveback} = '';
… …
2008 1 2135 1
2009} 2136}
2010 2137
2011############################################################################# 2138#############################################################################
2012 2139
2140package CFPlus::UI::TextEdit;
2141
2142our @ISA = CFPlus::UI::EntryBase::;
2143
2144use CFPlus::OpenGL;
2145
2146sub move_cursor_ver {
2147 my ($self, $dy) = @_;
2148
2149 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2150
2151 $y += $dy;
2152
2153 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2154 $self->{cursor} = $index;
2155 delete $self->{cur_h};
2156 $self->update;
2157 return;
2158 }
2159}
2160
2161sub invoke_key_down {
2162 my ($self, $ev) = @_;
2163
2164 my $sym = $ev->{sym};
2165
2166 if ($sym == CFPlus::SDLK_UP) {
2167 $self->move_cursor_ver (-1);
2168 } elsif ($sym == CFPlus::SDLK_DOWN) {
2169 $self->move_cursor_ver (+1);
2170 } else {
2171 return $self->SUPER::invoke_key_down ($ev)
2172 }
2173
2174 1
2175}
2176
2177#############################################################################
2178
2013package CFPlus::UI::Button; 2179package CFPlus::UI::Button;
2014 2180
2015our @ISA = CFPlus::UI::Label::; 2181our @ISA = CFPlus::UI::Label::;
2016 2182
2017use CFPlus::OpenGL; 2183use CFPlus::OpenGL;
… …
2159 or Carp::croak "'path' or 'tex' attributes required"; 2325 or Carp::croak "'path' or 'tex' attributes required";
2160 2326
2161 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2327 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2162 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2328 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2163 2329
2164 Scalar::Util::weaken $texture_cache{$self->{path}}; 2330 CFPlus::weaken $texture_cache{$self->{path}};
2165 2331
2166 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2332 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2167 2333
2168 $self 2334 $self
2169} 2335}
… …
2542sub invoke_mouse_wheel { 2708sub invoke_mouse_wheel {
2543 my ($self, $ev) = @_; 2709 my ($self, $ev) = @_;
2544 2710
2545 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2711 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2546 2712
2713 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2714
2547 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2715 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2548 2716
2549 ! ! $delta 2717 ! ! $delta
2550} 2718}
2551 2719
2552sub update { 2720sub update {
… …
2662 #font => default_font 2830 #font => default_font
2663 @_, 2831 @_,
2664 2832
2665 layout => (new CFPlus::Layout), 2833 layout => (new CFPlus::Layout),
2666 par => [], 2834 par => [],
2835 max_par => 0,
2667 height => 0, 2836 height => 0,
2668 children => [ 2837 children => [
2669 (new CFPlus::UI::Empty expand => 1), 2838 (new CFPlus::UI::Empty expand => 1),
2670 (new CFPlus::UI::Slider vertical => 1), 2839 (new CFPlus::UI::Slider vertical => 1),
2671 ], 2840 ],
… …
2750sub set_offset { 2919sub set_offset {
2751 my ($self, $offset) = @_; 2920 my ($self, $offset) = @_;
2752 2921
2753 # todo: base offset on lines or so, not on pixels 2922 # todo: base offset on lines or so, not on pixels
2754 $self->{children}[1]->set_value ($offset); 2923 $self->{children}[1]->set_value ($offset);
2924}
2925
2926sub current_paragraph {
2927 my ($self) = @_;
2928
2929 $self->{top_paragraph} - 1
2930}
2931
2932sub scroll_to {
2933 my ($self, $para) = @_;
2934
2935 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2936
2937 $self->{scroll_to} = $para;
2938 $self->update;
2755} 2939}
2756 2940
2757sub clear { 2941sub clear {
2758 my ($self) = @_; 2942 my ($self) = @_;
2759 2943
… …
2781 2965
2782 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 2966 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2783 push @{$self->{par}}, $para; 2967 push @{$self->{par}}, $para;
2784 } 2968 }
2785 2969
2970 if (my $max = $self->{max_par}) {
2971 shift @{$self->{par}} while @{$self->{par}} > $max;
2972 }
2973
2786 $self->{need_reflow}++; 2974 $self->{need_reflow}++;
2787 $self->update; 2975 $self->update;
2788} 2976}
2789 2977
2790sub scroll_to_bottom { 2978sub scroll_to_bottom {
2791 my ($self) = @_; 2979 my ($self) = @_;
2792 2980
2793 $self->{scroll_to_bottom} = 1; 2981 $self->{scroll_to} = $#{$self->{par}};
2794 $self->update; 2982 $self->update;
2795} 2983}
2796 2984
2985sub force_uptodate {
2986 my ($self) = @_;
2987
2988 if (delete $self->{need_reflow}) {
2989 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2990
2991 my $height = 0;
2992
2993 for my $para (@{$self->{par}}) {
2994 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2995 my $layout = $self->get_layout ($para);
2996 my ($w, $h) = $layout->size;
2997
2998 $para->{w} = $w + $para->{indent};
2999 $para->{h} = $h;
3000 $para->{wrapped} = $layout->has_wrapped;
3001 }
3002
3003 $para->{y} = $height;
3004 $height += $para->{h};
3005 }
3006
3007 $self->{height} = $height;
3008 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3009
3010 delete $self->{texture};
3011 }
3012
3013 if (my $paridx = delete $self->{scroll_to}) {
3014 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3015 }
3016}
3017
2797sub update { 3018sub update {
2798 my ($self) = @_; 3019 my ($self) = @_;
2799 3020
2800 $self->SUPER::update; 3021 $self->SUPER::update;
2801 3022
2802 return unless $self->{h} > 0; 3023 return unless $self->{h} > 0;
2803 3024
2804 delete $self->{texture}; 3025 delete $self->{texture};
2805 3026
2806 $ROOT->on_post_alloc ($self => sub { 3027 $ROOT->on_post_alloc ($self => sub {
3028 $self->force_uptodate;
3029
2807 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3030 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2808
2809 if (delete $self->{need_reflow}) {
2810 my $height = 0;
2811
2812 for my $para (@{$self->{par}}) {
2813 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2814 my $layout = $self->get_layout ($para);
2815 my ($w, $h) = $layout->size;
2816
2817 $para->{w} = $w + $para->{indent};
2818 $para->{h} = $h;
2819 $para->{wrapped} = $layout->has_wrapped;
2820 }
2821
2822 $height += $para->{h};
2823 }
2824
2825 $self->{height} = $height;
2826
2827 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2828
2829 delete $self->{texture};
2830 }
2831
2832 if (delete $self->{scroll_to_bottom}) {
2833 $self->{children}[1]->set_value (1e10);
2834 }
2835 3031
2836 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3032 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2837 glClearColor 0, 0, 0, 0; 3033 glClearColor 0, 0, 0, 0;
2838 glClear GL_COLOR_BUFFER_BIT; 3034 glClear GL_COLOR_BUFFER_BIT;
2839 3035
3036 package CFPlus::UI::Base;
3037 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3038 (0, 0, $self->{w}, $self->{h});
3039
3040 my $top = int $self->{children}[1]{range}[0];
3041
3042 my $paridx = 0;
3043 my $top_paragraph;
2840 my $top = int $self->{children}[1]{range}[0]; 3044 my $top = int $self->{children}[1]{range}[0];
2841 3045
2842 my $y0 = $top; 3046 my $y0 = $top;
2843 my $y1 = $top + $H; 3047 my $y1 = $top + $H;
2844 3048
2845 my $y = 0;
2846
2847 for my $para (@{$self->{par}}) { 3049 for my $para (@{$self->{par}}) {
2848 my $h = $para->{h}; 3050 my $h = $para->{h};
3051 my $y = $para->{y};
2849 3052
2850 if ($y0 < $y + $h && $y < $y1) { 3053 if ($y0 < $y + $h && $y < $y1) {
2851
2852 my $layout = $self->get_layout ($para); 3054 my $layout = $self->get_layout ($para);
2853 3055
2854 $layout->render ($para->{indent}, $y - $y0); 3056 $layout->render ($para->{indent}, $y - $y0);
2855 3057
2856 if (my @w = @{ $para->{widget} }) { 3058 if (my @w = @{ $para->{widget} }) {
… …
2865 $_->draw; 3067 $_->draw;
2866 } 3068 }
2867 } 3069 }
2868 } 3070 }
2869 3071
2870 $y += $h; 3072 $paridx++;
3073 $top_paragraph ||= $paridx if $y >= $top;
2871 } 3074 }
3075
3076 $self->{top_paragraph} = $top_paragraph;
2872 }; 3077 };
2873 }); 3078 });
2874} 3079}
2875 3080
2876sub reconfigure { 3081sub reconfigure {
… …
2997 3202
2998 $self->add (new CFPlus::UI::Label 3203 $self->add (new CFPlus::UI::Label
2999 markup => $tooltip, 3204 markup => $tooltip,
3000 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3205 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3001 fontsize => 0.8, 3206 fontsize => 0.8,
3002 fg => [0, 0, 0, 1], 3207 style => 1, # FLAG_INVERSE
3003 ellipsise => 0, 3208 ellipsise => 0,
3004 font => ($widget->{tooltip_font} || $::FONT_PROP), 3209 font => ($widget->{tooltip_font} || $::FONT_PROP),
3005 ); 3210 );
3006} 3211}
3007 3212
… …
3085 can_events => 0, 3290 can_events => 0,
3086 @_, 3291 @_,
3087 ); 3292 );
3088 3293
3089 if ($self->{anim} && $self->{animspeed}) { 3294 if ($self->{anim} && $self->{animspeed}) {
3090 Scalar::Util::weaken (my $widget = $self); 3295 CFPlus::weaken (my $widget = $self);
3091 3296
3092 $self->{timer} = Event->timer ( 3297 $self->{timer} = Event->timer (
3093 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3298 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3094 hard => 1, 3299 hard => 1,
3095 interval => $self->{animspeed}, 3300 interval => $self->{animspeed},
… …
3155 3360
3156package CFPlus::UI::Buttonbar; 3361package CFPlus::UI::Buttonbar;
3157 3362
3158our @ISA = CFPlus::UI::HBox::; 3363our @ISA = CFPlus::UI::HBox::;
3159 3364
3160# TODO: should actualyl wrap buttons and other goodies. 3365# TODO: should actually wrap buttons and other goodies.
3161 3366
3162############################################################################# 3367#############################################################################
3163 3368
3164package CFPlus::UI::Menu; 3369package CFPlus::UI::Menu;
3165 3370
3166our @ISA = CFPlus::UI::FancyFrame::; 3371our @ISA = CFPlus::UI::Toplevel::;
3167 3372
3168use CFPlus::OpenGL; 3373use CFPlus::OpenGL;
3169 3374
3170sub new { 3375sub new {
3171 my $class = shift; 3376 my $class = shift;
… …
3349} 3554}
3350 3555
3351sub add { 3556sub add {
3352 my ($self, $title, $widget, $tooltip) = @_; 3557 my ($self, $title, $widget, $tooltip) = @_;
3353 3558
3354 Scalar::Util::weaken $self; 3559 CFPlus::weaken $self;
3355 3560
3356 $self->{buttonbar}->add (new CFPlus::UI::Button 3561 $self->{buttonbar}->add (new CFPlus::UI::Button
3357 markup => $title, 3562 markup => $title,
3358 tooltip => $tooltip, 3563 tooltip => $tooltip,
3359 on_activate => sub { $self->set_current_page ($widget) }, 3564 on_activate => sub { $self->set_current_page ($widget) },
… …
3443 my $self = $class->SUPER::new ( 3648 my $self = $class->SUPER::new (
3444 fontsize => 0.8, 3649 fontsize => 0.8,
3445 @_, 3650 @_,
3446 ); 3651 );
3447 3652
3448 Scalar::Util::weaken (my $this = $self); 3653 CFPlus::weaken (my $this = $self);
3449 3654
3450 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3655 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3451 3656
3452 $self 3657 $self
3453} 3658}
… …
3576 $self->SUPER::destroy; 3781 $self->SUPER::destroy;
3577} 3782}
3578 3783
3579############################################################################# 3784#############################################################################
3580 3785
3581package CFPlus::UI::Inventory;
3582
3583our @ISA = CFPlus::UI::Table::;
3584
3585sub new {
3586 my $class = shift;
3587
3588 my $self = $class->SUPER::new (
3589 col_expand => [0, 1, 0],
3590 items => [],
3591 @_,
3592 );
3593
3594 $self->set_sort_order (undef);
3595
3596 $self
3597}
3598
3599sub update_items {
3600 my ($self) = @_;
3601
3602 $self->clear;
3603
3604 my @item = $self->{sort}->(@{ $self->{items} });
3605
3606 my @adds;
3607 my $row = 0;
3608 for my $item ($self->{sort}->(@{ $self->{items} })) {
3609 CFPlus::Item::update_widgets $item;
3610
3611 push @adds, 0, $row, $item->{face_widget};
3612 push @adds, 1, $row, $item->{desc_widget};
3613 push @adds, 2, $row, $item->{weight_widget};
3614
3615 $row++;
3616 }
3617
3618 $self->add (@adds);
3619}
3620
3621sub set_sort_order {
3622 my ($self, $order) = @_;
3623
3624 $self->{sort} = $order ||= sub {
3625 sort {
3626 $a->{type} <=> $b->{type}
3627 or $a->{name} cmp $b->{name}
3628 } @_
3629 };
3630
3631 $self->update_items;
3632}
3633
3634sub set_items {
3635 my ($self, $items) = @_;
3636
3637 $self->{items} = [$items ? values %$items : ()];
3638 $self->update_items;
3639}
3640
3641#############################################################################
3642
3643package CFPlus::UI::SpellList;
3644
3645our @ISA = CFPlus::UI::Table::;
3646
3647sub new {
3648 my $class = shift;
3649
3650 my $self = $class->SUPER::new (
3651 binding => [],
3652 commands => [],
3653 @_,
3654 )
3655}
3656
3657my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3658
3659my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3665my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3667my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3668 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3669
3670sub rebuild_spell_list {
3671 my ($self) = @_;
3672
3673 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3674 $self->clear;
3675
3676 return unless $::CONN;
3677
3678 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3679 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3680 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3681 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3682 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3683
3684 my $row = 0;
3685
3686 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3687 my $spell = $self->{spell}{$_};
3688
3689 $row++;
3690
3691 my $spell_cb = sub {
3692 my ($widget, $ev) = @_;
3693
3694 if ($ev->{button} == 1) {
3695 $::CONN->user_send ("cast $spell->{name}");
3696 } elsif ($ev->{button} == 2) {
3697 $::CONN->user_send ("invoke $spell->{name}");
3698 } elsif ($ev->{button} == 3) {
3699 (new CFPlus::UI::Menu
3700 items => [
3701 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3702 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3703 ],
3704 )->popup ($ev);
3705 } else {
3706 return 0;
3707 }
3708
3709 1
3710 };
3711
3712 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3713
3714 #TODO: add path info to tooltip
3715 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3716
3717 $self->add (0, $row, new CFPlus::UI::Face
3718 face => $spell->{face},
3719 can_hover => 1,
3720 can_events => 1,
3721 tooltip => $tooltip,
3722 on_button_down => $spell_cb,
3723 );
3724
3725 $self->add (1, $row, new CFPlus::UI::Label
3726 expand => 1,
3727 text => $spell->{name},
3728 can_hover => 1,
3729 can_events => 1,
3730 tooltip => $tooltip,
3731 on_button_down => $spell_cb,
3732 );
3733
3734 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3735 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3736 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3737 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3738 }
3739 });
3740}
3741
3742sub add_spell {
3743 my ($self, $spell) = @_;
3744
3745 $self->{spell}->{$spell->{name}} = $spell;
3746 $self->rebuild_spell_list;
3747}
3748
3749sub remove_spell {
3750 my ($self, $spell) = @_;
3751
3752 delete $self->{spell}->{$spell->{name}};
3753 $self->rebuild_spell_list;
3754}
3755
3756sub clear_spells {
3757 my ($self) = @_;
3758
3759 $self->{spell} = {};
3760 $self->rebuild_spell_list;
3761}
3762
3763#############################################################################
3764
3765package CFPlus::UI::Root; 3786package CFPlus::UI::Root;
3766 3787
3767our @ISA = CFPlus::UI::Container::; 3788our @ISA = CFPlus::UI::Container::;
3768 3789
3769use List::Util qw(min max); 3790use List::Util qw(min max);
… …
3776 my $self = $class->SUPER::new ( 3797 my $self = $class->SUPER::new (
3777 visible => 1, 3798 visible => 1,
3778 @_, 3799 @_,
3779 ); 3800 );
3780 3801
3781 Scalar::Util::weaken ($self->{root} = $self); 3802 CFPlus::weaken ($self->{root} = $self);
3782 3803
3783 $self 3804 $self
3784} 3805}
3785 3806
3786sub size_request { 3807sub size_request {
… …
3995 glLoadIdentity; 4016 glLoadIdentity;
3996 4017
3997 { 4018 {
3998 package CFPlus::UI::Base; 4019 package CFPlus::UI::Base;
3999 4020
4000 ($draw_x, $draw_y, $draw_w, $draw_h) = 4021 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4001 (0, 0, $self->{w}, $self->{h}); 4022 (0, 0, $self->{w}, $self->{h});
4002 }
4003 4023
4004 $self->_draw; 4024 $self->_draw;
4025 }
4005} 4026}
4006 4027
4007############################################################################# 4028#############################################################################
4008 4029
4009package CFPlus::UI; 4030package CFPlus::UI;

Diff Legend

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