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.340 by root, Sun Jul 30 13:16:44 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;
10use CFPlus::Pod;
11use CFPlus::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
… …
234 h => undef, 234 h => undef,
235 can_events => 1, 235 can_events => 1,
236 @_ 236 @_
237 }, $class; 237 }, $class;
238 238
239 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 239 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240 240
241 for (keys %$self) { 241 for (keys %$self) {
242 if (/^on_(.*)$/) { 242 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
244 } 244 }
… …
261 261
262sub destroy { 262sub destroy {
263 my ($self) = @_; 263 my ($self) = @_;
264 264
265 $self->hide; 265 $self->hide;
266 $self->emit ("destroy");
266 %$self = (); 267 %$self = ();
267} 268}
268 269
269sub show { 270sub show {
270 my ($self) = @_; 271 my ($self) = @_;
… …
501 502
502 defined wantarray and CFPlus::guard { 503 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} }; 505 @{ $self->{signal_cb}{$signal} };
505 } 506 }
507}
508
509sub disconnect_all {
510 my ($self, $signal) = @_;
511
512 delete $self->{signal_cb}{$signal};
506} 513}
507 514
508my %has_coords = ( 515my %has_coords = (
509 button_down => 1, 516 button_down => 1,
510 button_up => 1, 517 button_up => 1,
… …
513); 520);
514 521
515sub emit { 522sub emit {
516 my ($self, $signal, @args) = @_; 523 my ($self, $signal, @args) = @_;
517 524
518 # 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
519 # and needlessly verbose code, too. 526 # and needlessly verbose code, either.
520 my @append 527 my @append
521 = $has_coords{$signal} 528 = $has_coords{$signal}
522 ? $args[0]->xy ($self) 529 ? $args[0]->xy ($self)
523 : (); 530 : ();
524 531
525 #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#
526 533
527 #d##TODO# stop propagating at first true, do not use sum 534 for my $cb (
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 535 @{$self->{signal_cb}{$signal} || []}, # before
529 || ($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
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 542 $self->{parent} && $self->{parent}->emit ($signal, @args)
531} 543}
532 544
533sub find_widget { 545sub find_widget {
534 my ($self, $x, $y) = @_; 546 my ($self, $x, $y) = @_;
535 547
… …
543} 555}
544 556
545sub set_parent { 557sub set_parent {
546 my ($self, $parent) = @_; 558 my ($self, $parent) = @_;
547 559
548 Scalar::Util::weaken ($self->{parent} = $parent); 560 CFPlus::weaken ($self->{parent} = $parent);
549 $self->set_visible if $parent->{visible}; 561 $self->set_visible if $parent->{visible};
550} 562}
551 563
552sub realloc { 564sub realloc {
553 my ($self) = @_; 565 my ($self) = @_;
… …
632 my ($self) = @_; 644 my ($self) = @_;
633 645
634 warn "no draw defined for $self\n"; 646 warn "no draw defined for $self\n";
635} 647}
636 648
649my $cntx;#d#
637sub DESTROY { 650sub DESTROY {
638 my ($self) = @_; 651 my ($self) = @_;
639 652
640 return if CFPlus::in_destruct; 653 return if CFPlus::in_destruct;
641
642 delete $WIDGET{$self+0};
643 654
644 eval { $self->destroy }; 655 eval { $self->destroy };
645 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};
646} 659}
647 660
648############################################################################# 661#############################################################################
649 662
650package CFPlus::UI::DrawBG; 663package CFPlus::UI::DrawBG;
… …
897 glClear GL_COLOR_BUFFER_BIT; 910 glClear GL_COLOR_BUFFER_BIT;
898 911
899 { 912 {
900 package CFPlus::UI::Base; 913 package CFPlus::UI::Base;
901 914
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 915 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 916 (0, 0, $self->{w}, $self->{h});
917
918 $self->_render;
904 } 919 }
905
906 $self->_render;
907 }; 920 };
908} 921}
909 922
910sub _draw { 923sub _draw {
911 my ($self) = @_; 924 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 925
915 my $tex = $self->{texture} 926 my $tex = $self->{texture}
916 or return; 927 or return;
917 928
918 glEnable GL_TEXTURE_2D; 929 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 931 glColor 0, 0, 0, 1;
921 932
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 933 $tex->draw_quad_alpha_premultiplied (0, 0);
923 934
924 glDisable GL_TEXTURE_2D; 935 glDisable GL_TEXTURE_2D;
925} 936}
926 937
927############################################################################# 938#############################################################################
… …
1128} 1139}
1129 1140
1130############################################################################# 1141#############################################################################
1131 1142
1132package 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;
1133 1244
1134our @ISA = CFPlus::UI::Bin::; 1245our @ISA = CFPlus::UI::Bin::;
1135 1246
1136use CFPlus::OpenGL; 1247use CFPlus::OpenGL;
1137 1248
… …
1617 #active_bg => none 1728 #active_bg => none
1618 #font => default_font 1729 #font => default_font
1619 #text => initial text 1730 #text => initial text
1620 #markup => initial narkup 1731 #markup => initial narkup
1621 #max_w => maximum pixel width 1732 #max_w => maximum pixel width
1733 #style => 0, # render flags
1622 ellipsise => 3, # end 1734 ellipsise => 3, # end
1623 layout => (new CFPlus::Layout), 1735 layout => (new CFPlus::Layout),
1624 fontsize => 1, 1736 fontsize => 1,
1625 align => -1, 1737 align => -1,
1626 valign => -1, 1738 valign => -1,
… …
1777 }; 1889 };
1778 1890
1779 my $w = List::Util::min $self->{w} + 4, $size->[0]; 1891 my $w = List::Util::min $self->{w} + 4, $size->[0];
1780 my $h = List::Util::min $self->{h} + 2, $size->[1]; 1892 my $h = List::Util::min $self->{h} + 2, $size->[1];
1781 1893
1782 $self->{layout}->render ($self->{ox}, $self->{oy}); 1894 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783} 1895}
1784 1896
1785############################################################################# 1897#############################################################################
1786 1898
1787package CFPlus::UI::EntryBase; 1899package CFPlus::UI::EntryBase;
… …
1800 active_fg => [0, 0, 0], 1912 active_fg => [0, 0, 0],
1801 can_hover => 1, 1913 can_hover => 1,
1802 can_focus => 1, 1914 can_focus => 1,
1803 valign => 0, 1915 valign => 0,
1804 can_events => 1, 1916 can_events => 1,
1917 ellipsise => 0,
1805 #text => ... 1918 #text => ...
1806 #hidden => "*", 1919 #hidden => "*",
1807 @_ 1920 @_
1808 ) 1921 )
1809} 1922}
… …
1863 } elsif ($sym == CFPlus::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFPlus::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } 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 = "";
1868 $self->{cursor} = 0; 1994 $self->{cursor} = 0;
1869 } elsif ($sym == CFPlus::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 1995 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 1996 $self->emit ('escape');
1873 } elsif ($uni) { 1997 } elsif ($uni == 0x0d) {
1998 substr $text, $self->{cursor}++, 0, "\012";
1999 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2000 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2001 } else {
1876 return 0; 2002 return 0;
1877 } 2003 }
1878 2004
1879 $self->_set_text ($text); 2005 $self->_set_text ($text);
1880 2006
1881 $self->realloc; 2007 $self->realloc;
2008 $self->update;
1882 2009
1883 1 2010 1
1884} 2011}
1885 2012
1886sub invoke_focus_in { 2013sub invoke_focus_in {
… …
1948 utf8::encode $text; 2075 utf8::encode $text;
1949 2076
1950 @$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)
1951 } 2078 }
1952 2079
1953 glColor @{$self->{fg}};
1954 glBegin GL_LINES; 2080 glBegin GL_LINES;
1955 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};
1956 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};
1957 glEnd; 2083 glEnd;
1958 } 2084 }
1959} 2085}
2086
2087#############################################################################
1960 2088
1961package CFPlus::UI::Entry; 2089package CFPlus::UI::Entry;
1962 2090
1963our @ISA = CFPlus::UI::EntryBase::; 2091our @ISA = CFPlus::UI::EntryBase::;
1964 2092
… …
1967sub invoke_key_down { 2095sub invoke_key_down {
1968 my ($self, $ev) = @_; 2096 my ($self, $ev) = @_;
1969 2097
1970 my $sym = $ev->{sym}; 2098 my $sym = $ev->{sym};
1971 2099
1972 if ($sym == 13) { 2100 if ($ev->{uni} == 0x0d || $sym == 13) {
1973 unshift @{$self->{history}}, 2101 unshift @{$self->{history}},
1974 my $txt = $self->get_text; 2102 my $txt = $self->get_text;
1975 2103
1976 $self->{history_pointer} = -1; 2104 $self->{history_pointer} = -1;
1977 $self->{history_saveback} = ''; 2105 $self->{history_saveback} = '';
… …
2007 1 2135 1
2008} 2136}
2009 2137
2010############################################################################# 2138#############################################################################
2011 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
2012package CFPlus::UI::Button; 2179package CFPlus::UI::Button;
2013 2180
2014our @ISA = CFPlus::UI::Label::; 2181our @ISA = CFPlus::UI::Label::;
2015 2182
2016use CFPlus::OpenGL; 2183use CFPlus::OpenGL;
… …
2158 or Carp::croak "'path' or 'tex' attributes required"; 2325 or Carp::croak "'path' or 'tex' attributes required";
2159 2326
2160 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2327 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2161 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;
2162 2329
2163 Scalar::Util::weaken $texture_cache{$self->{path}}; 2330 CFPlus::weaken $texture_cache{$self->{path}};
2164 2331
2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2332 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166 2333
2167 $self 2334 $self
2168} 2335}
… …
2541sub invoke_mouse_wheel { 2708sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_; 2709 my ($self, $ev) = @_;
2543 2710
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2711 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545 2712
2713 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2714
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2715 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547 2716
2548 ! ! $delta 2717 ! ! $delta
2549} 2718}
2550 2719
2551sub update { 2720sub update {
… …
2661 #font => default_font 2830 #font => default_font
2662 @_, 2831 @_,
2663 2832
2664 layout => (new CFPlus::Layout), 2833 layout => (new CFPlus::Layout),
2665 par => [], 2834 par => [],
2835 max_par => 0,
2666 height => 0, 2836 height => 0,
2667 children => [ 2837 children => [
2668 (new CFPlus::UI::Empty expand => 1), 2838 (new CFPlus::UI::Empty expand => 1),
2669 (new CFPlus::UI::Slider vertical => 1), 2839 (new CFPlus::UI::Slider vertical => 1),
2670 ], 2840 ],
… …
2749sub set_offset { 2919sub set_offset {
2750 my ($self, $offset) = @_; 2920 my ($self, $offset) = @_;
2751 2921
2752 # todo: base offset on lines or so, not on pixels 2922 # todo: base offset on lines or so, not on pixels
2753 $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;
2754} 2939}
2755 2940
2756sub clear { 2941sub clear {
2757 my ($self) = @_; 2942 my ($self) = @_;
2758 2943
… …
2780 2965
2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 2966 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para; 2967 push @{$self->{par}}, $para;
2783 } 2968 }
2784 2969
2970 if (my $max = $self->{max_par}) {
2971 shift @{$self->{par}} while @{$self->{par}} > $max;
2972 }
2973
2785 $self->{need_reflow}++; 2974 $self->{need_reflow}++;
2786 $self->update; 2975 $self->update;
2787} 2976}
2788 2977
2789sub scroll_to_bottom { 2978sub scroll_to_bottom {
2790 my ($self) = @_; 2979 my ($self) = @_;
2791 2980
2792 $self->{scroll_to_bottom} = 1; 2981 $self->{scroll_to} = $#{$self->{par}};
2793 $self->update; 2982 $self->update;
2794} 2983}
2795 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
2796sub update { 3018sub update {
2797 my ($self) = @_; 3019 my ($self) = @_;
2798 3020
2799 $self->SUPER::update; 3021 $self->SUPER::update;
2800 3022
2801 return unless $self->{h} > 0; 3023 return unless $self->{h} > 0;
2802 3024
2803 delete $self->{texture}; 3025 delete $self->{texture};
2804 3026
2805 $ROOT->on_post_alloc ($self => sub { 3027 $ROOT->on_post_alloc ($self => sub {
3028 $self->force_uptodate;
3029
2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3030 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807
2808 if (delete $self->{need_reflow}) {
2809 my $height = 0;
2810
2811 for my $para (@{$self->{par}}) {
2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2813 my $layout = $self->get_layout ($para);
2814 my ($w, $h) = $layout->size;
2815
2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2819 }
2820
2821 $height += $para->{h};
2822 }
2823
2824 $self->{height} = $height;
2825
2826 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2827
2828 delete $self->{texture};
2829 }
2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834 3031
2835 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3032 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836 glClearColor 0, 0, 0, 0; 3033 glClearColor 0, 0, 0, 0;
2837 glClear GL_COLOR_BUFFER_BIT; 3034 glClear GL_COLOR_BUFFER_BIT;
2838 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;
2839 my $top = int $self->{children}[1]{range}[0]; 3044 my $top = int $self->{children}[1]{range}[0];
2840 3045
2841 my $y0 = $top; 3046 my $y0 = $top;
2842 my $y1 = $top + $H; 3047 my $y1 = $top + $H;
2843 3048
2844 my $y = 0;
2845
2846 for my $para (@{$self->{par}}) { 3049 for my $para (@{$self->{par}}) {
2847 my $h = $para->{h}; 3050 my $h = $para->{h};
3051 my $y = $para->{y};
2848 3052
2849 if ($y0 < $y + $h && $y < $y1) { 3053 if ($y0 < $y + $h && $y < $y1) {
2850
2851 my $layout = $self->get_layout ($para); 3054 my $layout = $self->get_layout ($para);
2852 3055
2853 $layout->render ($para->{indent}, $y - $y0); 3056 $layout->render ($para->{indent}, $y - $y0);
2854 3057
2855 if (my @w = @{ $para->{widget} }) { 3058 if (my @w = @{ $para->{widget} }) {
… …
2864 $_->draw; 3067 $_->draw;
2865 } 3068 }
2866 } 3069 }
2867 } 3070 }
2868 3071
2869 $y += $h; 3072 $paridx++;
3073 $top_paragraph ||= $paridx if $y >= $top;
2870 } 3074 }
3075
3076 $self->{top_paragraph} = $top_paragraph;
2871 }; 3077 };
2872 }); 3078 });
2873} 3079}
2874 3080
2875sub reconfigure { 3081sub reconfigure {
… …
2977} 3183}
2978 3184
2979sub set_tooltip_from { 3185sub set_tooltip_from {
2980 my ($self, $widget) = @_; 3186 my ($self, $widget) = @_;
2981 3187
3188 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3189 if $widget->{tooltip} =~ /^#(.*)$/;
3190
2982 my $tooltip = $widget->{tooltip}; 3191 my $tooltip = $widget->{tooltip};
2983 3192
2984 if ($ENV{CFPLUS_DEBUG} & 2) { 3193 if ($ENV{CFPLUS_DEBUG} & 2) {
2985 $tooltip .= "\n\n" . (ref $widget) . "\n" 3194 $tooltip .= "\n\n" . (ref $widget) . "\n"
2986 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3195 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
… …
2993 3202
2994 $self->add (new CFPlus::UI::Label 3203 $self->add (new CFPlus::UI::Label
2995 markup => $tooltip, 3204 markup => $tooltip,
2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3205 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997 fontsize => 0.8, 3206 fontsize => 0.8,
2998 fg => [0, 0, 0, 1], 3207 style => 1, # FLAG_INVERSE
2999 ellipsise => 0, 3208 ellipsise => 0,
3000 font => ($widget->{tooltip_font} || $::FONT_PROP), 3209 font => ($widget->{tooltip_font} || $::FONT_PROP),
3001 ); 3210 );
3002} 3211}
3003 3212
… …
3081 can_events => 0, 3290 can_events => 0,
3082 @_, 3291 @_,
3083 ); 3292 );
3084 3293
3085 if ($self->{anim} && $self->{animspeed}) { 3294 if ($self->{anim} && $self->{animspeed}) {
3086 Scalar::Util::weaken (my $widget = $self); 3295 CFPlus::weaken (my $widget = $self);
3087 3296
3088 $self->{timer} = Event->timer ( 3297 $self->{timer} = Event->timer (
3089 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3298 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090 hard => 1, 3299 hard => 1,
3091 interval => $self->{animspeed}, 3300 interval => $self->{animspeed},
… …
3151 3360
3152package CFPlus::UI::Buttonbar; 3361package CFPlus::UI::Buttonbar;
3153 3362
3154our @ISA = CFPlus::UI::HBox::; 3363our @ISA = CFPlus::UI::HBox::;
3155 3364
3156# TODO: should actualyl wrap buttons and other goodies. 3365# TODO: should actually wrap buttons and other goodies.
3157 3366
3158############################################################################# 3367#############################################################################
3159 3368
3160package CFPlus::UI::Menu; 3369package CFPlus::UI::Menu;
3161 3370
3162our @ISA = CFPlus::UI::FancyFrame::; 3371our @ISA = CFPlus::UI::Toplevel::;
3163 3372
3164use CFPlus::OpenGL; 3373use CFPlus::OpenGL;
3165 3374
3166sub new { 3375sub new {
3167 my $class = shift; 3376 my $class = shift;
… …
3345} 3554}
3346 3555
3347sub add { 3556sub add {
3348 my ($self, $title, $widget, $tooltip) = @_; 3557 my ($self, $title, $widget, $tooltip) = @_;
3349 3558
3350 Scalar::Util::weaken $self; 3559 CFPlus::weaken $self;
3351 3560
3352 $self->{buttonbar}->add (new CFPlus::UI::Button 3561 $self->{buttonbar}->add (new CFPlus::UI::Button
3353 markup => $title, 3562 markup => $title,
3354 tooltip => $tooltip, 3563 tooltip => $tooltip,
3355 on_activate => sub { $self->set_current_page ($widget) }, 3564 on_activate => sub { $self->set_current_page ($widget) },
… …
3439 my $self = $class->SUPER::new ( 3648 my $self = $class->SUPER::new (
3440 fontsize => 0.8, 3649 fontsize => 0.8,
3441 @_, 3650 @_,
3442 ); 3651 );
3443 3652
3444 Scalar::Util::weaken (my $this = $self); 3653 CFPlus::weaken (my $this = $self);
3445 3654
3446 $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 });
3447 3656
3448 $self 3657 $self
3449} 3658}
… …
3572 $self->SUPER::destroy; 3781 $self->SUPER::destroy;
3573} 3782}
3574 3783
3575############################################################################# 3784#############################################################################
3576 3785
3577package CFPlus::UI::Inventory;
3578
3579our @ISA = CFPlus::UI::Table::;
3580
3581sub new {
3582 my $class = shift;
3583
3584 my $self = $class->SUPER::new (
3585 col_expand => [0, 1, 0],
3586 items => [],
3587 @_,
3588 );
3589
3590 $self->set_sort_order (undef);
3591
3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFPlus::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3628}
3629
3630sub set_items {
3631 my ($self, $items) = @_;
3632
3633 $self->{items} = [$items ? values %$items : ()];
3634 $self->update_items;
3635}
3636
3637#############################################################################
3638
3639package CFPlus::UI::SpellList;
3640
3641our @ISA = CFPlus::UI::Table::;
3642
3643sub new {
3644 my $class = shift;
3645
3646 my $self = $class->SUPER::new (
3647 binding => [],
3648 commands => [],
3649 @_,
3650 )
3651}
3652
3653my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666sub rebuild_spell_list {
3667 my ($self) = @_;
3668
3669 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3670 $self->clear;
3671
3672 return unless $::CONN;
3673
3674 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680 my $row = 0;
3681
3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683 my $spell = $self->{spell}{$_};
3684
3685 $row++;
3686
3687 my $spell_cb = sub {
3688 my ($widget, $ev) = @_;
3689
3690 if ($ev->{button} == 1) {
3691 $::CONN->user_send ("cast $spell->{name}");
3692 } elsif ($ev->{button} == 2) {
3693 $::CONN->user_send ("invoke $spell->{name}");
3694 } elsif ($ev->{button} == 3) {
3695 (new CFPlus::UI::Menu
3696 items => [
3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699 ],
3700 )->popup ($ev);
3701 } else {
3702 return 0;
3703 }
3704
3705 1
3706 };
3707
3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710 #TODO: add path info to tooltip
3711 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3712
3713 $self->add (0, $row, new CFPlus::UI::Face
3714 face => $spell->{face},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (1, $row, new CFPlus::UI::Label
3722 expand => 1,
3723 text => $spell->{name},
3724 can_hover => 1,
3725 can_events => 1,
3726 tooltip => $tooltip,
3727 on_button_down => $spell_cb,
3728 );
3729
3730 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734 }
3735 });
3736}
3737
3738sub add_spell {
3739 my ($self, $spell) = @_;
3740
3741 $self->{spell}->{$spell->{name}} = $spell;
3742 $self->rebuild_spell_list;
3743}
3744
3745sub remove_spell {
3746 my ($self, $spell) = @_;
3747
3748 delete $self->{spell}->{$spell->{name}};
3749 $self->rebuild_spell_list;
3750}
3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3759#############################################################################
3760
3761package CFPlus::UI::Root; 3786package CFPlus::UI::Root;
3762 3787
3763our @ISA = CFPlus::UI::Container::; 3788our @ISA = CFPlus::UI::Container::;
3764 3789
3765use List::Util qw(min max); 3790use List::Util qw(min max);
… …
3772 my $self = $class->SUPER::new ( 3797 my $self = $class->SUPER::new (
3773 visible => 1, 3798 visible => 1,
3774 @_, 3799 @_,
3775 ); 3800 );
3776 3801
3777 Scalar::Util::weaken ($self->{root} = $self); 3802 CFPlus::weaken ($self->{root} = $self);
3778 3803
3779 $self 3804 $self
3780} 3805}
3781 3806
3782sub size_request { 3807sub size_request {
… …
3991 glLoadIdentity; 4016 glLoadIdentity;
3992 4017
3993 { 4018 {
3994 package CFPlus::UI::Base; 4019 package CFPlus::UI::Base;
3995 4020
3996 ($draw_x, $draw_y, $draw_w, $draw_h) = 4021 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997 (0, 0, $self->{w}, $self->{h}); 4022 (0, 0, $self->{w}, $self->{h});
3998 }
3999 4023
4000 $self->_draw; 4024 $self->_draw;
4025 }
4001} 4026}
4002 4027
4003############################################################################# 4028#############################################################################
4004 4029
4005package CFPlus::UI; 4030package CFPlus::UI;

Diff Legend

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