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

Diff Legend

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