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.343 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.367 by root, Fri Apr 27 00:59:14 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) = @_;
913
914 my ($w, $h) = @$self{qw(w h)};
915 928
916 my $tex = $self->{texture} 929 my $tex = $self->{texture}
917 or return; 930 or return;
918 931
919 glEnable GL_TEXTURE_2D; 932 glEnable GL_TEXTURE_2D;
920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
921 glColor 0, 0, 0, 1; 934 glColor 0, 0, 0, 1;
922 935
923 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 936 $tex->draw_quad_alpha_premultiplied (0, 0);
924 937
925 glDisable GL_TEXTURE_2D; 938 glDisable GL_TEXTURE_2D;
926} 939}
927 940
928############################################################################# 941#############################################################################
… …
1129} 1142}
1130 1143
1131############################################################################# 1144#############################################################################
1132 1145
1133package 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;
1134 1247
1135our @ISA = CFPlus::UI::Bin::; 1248our @ISA = CFPlus::UI::Bin::;
1136 1249
1137use CFPlus::OpenGL; 1250use CFPlus::OpenGL;
1138 1251
… …
1802 active_fg => [0, 0, 0], 1915 active_fg => [0, 0, 0],
1803 can_hover => 1, 1916 can_hover => 1,
1804 can_focus => 1, 1917 can_focus => 1,
1805 valign => 0, 1918 valign => 0,
1806 can_events => 1, 1919 can_events => 1,
1920 ellipsise => 0,
1807 #text => ... 1921 #text => ...
1808 #hidden => "*", 1922 #hidden => "*",
1809 @_ 1923 @_
1810 ) 1924 )
1811} 1925}
… …
1855 my $mod = $ev->{mod}; 1969 my $mod = $ev->{mod};
1856 my $sym = $ev->{sym}; 1970 my $sym = $ev->{sym};
1857 my $uni = $ev->{unicode}; 1971 my $uni = $ev->{unicode};
1858 1972
1859 my $text = $self->get_text; 1973 my $text = $self->get_text;
1974
1975 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1860 1976
1861 if ($uni == 8) { 1977 if ($uni == 8) {
1862 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1978 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1863 } elsif ($uni == 127) { 1979 } elsif ($uni == 127) {
1864 substr $text, $self->{cursor}, 1, ""; 1980 substr $text, $self->{cursor}, 1, "";
1865 } elsif ($sym == CFPlus::SDLK_LEFT) { 1981 } elsif ($sym == CFPlus::SDLK_LEFT) {
1866 --$self->{cursor} if $self->{cursor}; 1982 --$self->{cursor} if $self->{cursor};
1867 } elsif ($sym == CFPlus::SDLK_RIGHT) { 1983 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1868 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1984 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1869 } elsif ($sym == CFPlus::SDLK_HOME) { 1985 } elsif ($sym == CFPlus::SDLK_HOME) {
1986 # what a hack
1987 $self->{cursor} =
1988 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1989 ? length $1
1990 : 0;
1991 } elsif ($sym == CFPlus::SDLK_END) {
1992 # uh, again
1993 $self->{cursor} =
1994 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1995 ? $self->{cursor} + length $1
1996 : length $self->{text};
1997 } elsif ($uni == 21) { # ctrl-u
1998 $text = "";
1870 $self->{cursor} = 0; 1999 $self->{cursor} = 0;
1871 } elsif ($sym == CFPlus::SDLK_END) {
1872 $self->{cursor} = length $text;
1873 } elsif ($uni == 27) { 2000 } elsif ($uni == 27) {
1874 $self->emit ('escape'); 2001 $self->emit ('escape');
1875 } elsif ($uni) { 2002 } elsif ($uni == 0x0d) {
2003 substr $text, $self->{cursor}++, 0, "\012";
2004 } elsif ($uni >= 0x20) {
1876 substr $text, $self->{cursor}++, 0, chr $uni; 2005 substr $text, $self->{cursor}++, 0, chr $uni;
1877 } else { 2006 } else {
1878 return 0; 2007 return 0;
1879 } 2008 }
1880 2009
1881 $self->_set_text ($text); 2010 $self->_set_text ($text);
1882 2011
1883 $self->realloc; 2012 $self->realloc;
2013 $self->update;
1884 2014
1885 1 2015 1
1886} 2016}
1887 2017
1888sub invoke_focus_in { 2018sub invoke_focus_in {
… …
1950 utf8::encode $text; 2080 utf8::encode $text;
1951 2081
1952 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2082 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1953 } 2083 }
1954 2084
1955 glColor @{$self->{fg}};
1956 glBegin GL_LINES; 2085 glBegin GL_LINES;
1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2086 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1958 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2087 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1959 glEnd; 2088 glEnd;
1960 } 2089 }
1961} 2090}
2091
2092#############################################################################
1962 2093
1963package CFPlus::UI::Entry; 2094package CFPlus::UI::Entry;
1964 2095
1965our @ISA = CFPlus::UI::EntryBase::; 2096our @ISA = CFPlus::UI::EntryBase::;
1966 2097
… …
1969sub invoke_key_down { 2100sub invoke_key_down {
1970 my ($self, $ev) = @_; 2101 my ($self, $ev) = @_;
1971 2102
1972 my $sym = $ev->{sym}; 2103 my $sym = $ev->{sym};
1973 2104
1974 if ($sym == 13) { 2105 if ($ev->{uni} == 0x0d || $sym == 13) {
1975 unshift @{$self->{history}}, 2106 unshift @{$self->{history}},
1976 my $txt = $self->get_text; 2107 my $txt = $self->get_text;
1977 2108
1978 $self->{history_pointer} = -1; 2109 $self->{history_pointer} = -1;
1979 $self->{history_saveback} = ''; 2110 $self->{history_saveback} = '';
… …
2009 1 2140 1
2010} 2141}
2011 2142
2012############################################################################# 2143#############################################################################
2013 2144
2145package CFPlus::UI::TextEdit;
2146
2147our @ISA = CFPlus::UI::EntryBase::;
2148
2149use CFPlus::OpenGL;
2150
2151sub move_cursor_ver {
2152 my ($self, $dy) = @_;
2153
2154 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2155
2156 $y += $dy;
2157
2158 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2159 $self->{cursor} = $index;
2160 delete $self->{cur_h};
2161 $self->update;
2162 return;
2163 }
2164}
2165
2166sub invoke_key_down {
2167 my ($self, $ev) = @_;
2168
2169 my $sym = $ev->{sym};
2170
2171 if ($sym == CFPlus::SDLK_UP) {
2172 $self->move_cursor_ver (-1);
2173 } elsif ($sym == CFPlus::SDLK_DOWN) {
2174 $self->move_cursor_ver (+1);
2175 } else {
2176 return $self->SUPER::invoke_key_down ($ev)
2177 }
2178
2179 1
2180}
2181
2182#############################################################################
2183
2014package CFPlus::UI::Button; 2184package CFPlus::UI::Button;
2015 2185
2016our @ISA = CFPlus::UI::Label::; 2186our @ISA = CFPlus::UI::Label::;
2017 2187
2018use CFPlus::OpenGL; 2188use CFPlus::OpenGL;
… …
2160 or Carp::croak "'path' or 'tex' attributes required"; 2330 or Carp::croak "'path' or 'tex' attributes required";
2161 2331
2162 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2332 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2163 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2333 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2164 2334
2165 Scalar::Util::weaken $texture_cache{$self->{path}}; 2335 CFPlus::weaken $texture_cache{$self->{path}};
2166 2336
2167 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2337 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2168 2338
2169 $self 2339 $self
2170} 2340}
… …
2543sub invoke_mouse_wheel { 2713sub invoke_mouse_wheel {
2544 my ($self, $ev) = @_; 2714 my ($self, $ev) = @_;
2545 2715
2546 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2716 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2547 2717
2718 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2719
2548 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2720 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2549 2721
2550 ! ! $delta 2722 ! ! $delta
2551} 2723}
2552 2724
2553sub update { 2725sub update {
… …
2663 #font => default_font 2835 #font => default_font
2664 @_, 2836 @_,
2665 2837
2666 layout => (new CFPlus::Layout), 2838 layout => (new CFPlus::Layout),
2667 par => [], 2839 par => [],
2840 max_par => 0,
2668 height => 0, 2841 height => 0,
2669 children => [ 2842 children => [
2670 (new CFPlus::UI::Empty expand => 1), 2843 (new CFPlus::UI::Empty expand => 1),
2671 (new CFPlus::UI::Slider vertical => 1), 2844 (new CFPlus::UI::Slider vertical => 1),
2672 ], 2845 ],
… …
2751sub set_offset { 2924sub set_offset {
2752 my ($self, $offset) = @_; 2925 my ($self, $offset) = @_;
2753 2926
2754 # todo: base offset on lines or so, not on pixels 2927 # todo: base offset on lines or so, not on pixels
2755 $self->{children}[1]->set_value ($offset); 2928 $self->{children}[1]->set_value ($offset);
2929}
2930
2931sub current_paragraph {
2932 my ($self) = @_;
2933
2934 $self->{top_paragraph} - 1
2935}
2936
2937sub scroll_to {
2938 my ($self, $para) = @_;
2939
2940 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2941
2942 $self->{scroll_to} = $para;
2943 $self->update;
2756} 2944}
2757 2945
2758sub clear { 2946sub clear {
2759 my ($self) = @_; 2947 my ($self) = @_;
2760 2948
… …
2782 2970
2783 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 2971 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2784 push @{$self->{par}}, $para; 2972 push @{$self->{par}}, $para;
2785 } 2973 }
2786 2974
2975 if (my $max = $self->{max_par}) {
2976 shift @{$self->{par}} while @{$self->{par}} > $max;
2977 }
2978
2787 $self->{need_reflow}++; 2979 $self->{need_reflow}++;
2788 $self->update; 2980 $self->update;
2789} 2981}
2790 2982
2791sub scroll_to_bottom { 2983sub scroll_to_bottom {
2792 my ($self) = @_; 2984 my ($self) = @_;
2793 2985
2794 $self->{scroll_to_bottom} = 1; 2986 $self->{scroll_to} = $#{$self->{par}};
2795 $self->update; 2987 $self->update;
2796} 2988}
2797 2989
2990sub force_uptodate {
2991 my ($self) = @_;
2992
2993 if (delete $self->{need_reflow}) {
2994 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2995
2996 my $height = 0;
2997
2998 for my $para (@{$self->{par}}) {
2999 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3000 my $layout = $self->get_layout ($para);
3001 my ($w, $h) = $layout->size;
3002
3003 $para->{w} = $w + $para->{indent};
3004 $para->{h} = $h;
3005 $para->{wrapped} = $layout->has_wrapped;
3006 }
3007
3008 $para->{y} = $height;
3009 $height += $para->{h};
3010 }
3011
3012 $self->{height} = $height;
3013 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3014
3015 delete $self->{texture};
3016 }
3017
3018 if (my $paridx = delete $self->{scroll_to}) {
3019 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3020 }
3021}
3022
2798sub update { 3023sub update {
2799 my ($self) = @_; 3024 my ($self) = @_;
2800 3025
2801 $self->SUPER::update; 3026 $self->SUPER::update;
2802 3027
2803 return unless $self->{h} > 0; 3028 return unless $self->{h} > 0;
2804 3029
2805 delete $self->{texture}; 3030 delete $self->{texture};
2806 3031
2807 $ROOT->on_post_alloc ($self => sub { 3032 $ROOT->on_post_alloc ($self => sub {
3033 $self->force_uptodate;
3034
2808 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3035 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2809
2810 if (delete $self->{need_reflow}) {
2811 my $height = 0;
2812
2813 for my $para (@{$self->{par}}) {
2814 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2815 my $layout = $self->get_layout ($para);
2816 my ($w, $h) = $layout->size;
2817
2818 $para->{w} = $w + $para->{indent};
2819 $para->{h} = $h;
2820 $para->{wrapped} = $layout->has_wrapped;
2821 }
2822
2823 $height += $para->{h};
2824 }
2825
2826 $self->{height} = $height;
2827
2828 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2829
2830 delete $self->{texture};
2831 }
2832
2833 if (delete $self->{scroll_to_bottom}) {
2834 $self->{children}[1]->set_value (1e10);
2835 }
2836 3036
2837 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3037 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2838 glClearColor 0, 0, 0, 0; 3038 glClearColor 0, 0, 0, 0;
2839 glClear GL_COLOR_BUFFER_BIT; 3039 glClear GL_COLOR_BUFFER_BIT;
2840 3040
3041 package CFPlus::UI::Base;
3042 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3043 (0, 0, $self->{w}, $self->{h});
3044
3045 my $top = int $self->{children}[1]{range}[0];
3046
3047 my $paridx = 0;
3048 my $top_paragraph;
2841 my $top = int $self->{children}[1]{range}[0]; 3049 my $top = int $self->{children}[1]{range}[0];
2842 3050
2843 my $y0 = $top; 3051 my $y0 = $top;
2844 my $y1 = $top + $H; 3052 my $y1 = $top + $H;
2845 3053
2846 my $y = 0;
2847
2848 for my $para (@{$self->{par}}) { 3054 for my $para (@{$self->{par}}) {
2849 my $h = $para->{h}; 3055 my $h = $para->{h};
3056 my $y = $para->{y};
2850 3057
2851 if ($y0 < $y + $h && $y < $y1) { 3058 if ($y0 < $y + $h && $y < $y1) {
2852
2853 my $layout = $self->get_layout ($para); 3059 my $layout = $self->get_layout ($para);
2854 3060
2855 $layout->render ($para->{indent}, $y - $y0); 3061 $layout->render ($para->{indent}, $y - $y0);
2856 3062
2857 if (my @w = @{ $para->{widget} }) { 3063 if (my @w = @{ $para->{widget} }) {
… …
2866 $_->draw; 3072 $_->draw;
2867 } 3073 }
2868 } 3074 }
2869 } 3075 }
2870 3076
2871 $y += $h; 3077 $paridx++;
3078 $top_paragraph ||= $paridx if $y >= $top;
2872 } 3079 }
3080
3081 $self->{top_paragraph} = $top_paragraph;
2873 }; 3082 };
2874 }); 3083 });
2875} 3084}
2876 3085
2877sub reconfigure { 3086sub reconfigure {
… …
3086 can_events => 0, 3295 can_events => 0,
3087 @_, 3296 @_,
3088 ); 3297 );
3089 3298
3090 if ($self->{anim} && $self->{animspeed}) { 3299 if ($self->{anim} && $self->{animspeed}) {
3091 Scalar::Util::weaken (my $widget = $self); 3300 CFPlus::weaken (my $widget = $self);
3092 3301
3093 $self->{timer} = Event->timer ( 3302 $self->{timer} = Event->timer (
3094 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3303 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3095 hard => 1, 3304 hard => 1,
3096 interval => $self->{animspeed}, 3305 interval => $self->{animspeed},
… …
3156 3365
3157package CFPlus::UI::Buttonbar; 3366package CFPlus::UI::Buttonbar;
3158 3367
3159our @ISA = CFPlus::UI::HBox::; 3368our @ISA = CFPlus::UI::HBox::;
3160 3369
3161# TODO: should actualyl wrap buttons and other goodies. 3370# TODO: should actually wrap buttons and other goodies.
3162 3371
3163############################################################################# 3372#############################################################################
3164 3373
3165package CFPlus::UI::Menu; 3374package CFPlus::UI::Menu;
3166 3375
3167our @ISA = CFPlus::UI::FancyFrame::; 3376our @ISA = CFPlus::UI::Toplevel::;
3168 3377
3169use CFPlus::OpenGL; 3378use CFPlus::OpenGL;
3170 3379
3171sub new { 3380sub new {
3172 my $class = shift; 3381 my $class = shift;
… …
3350} 3559}
3351 3560
3352sub add { 3561sub add {
3353 my ($self, $title, $widget, $tooltip) = @_; 3562 my ($self, $title, $widget, $tooltip) = @_;
3354 3563
3355 Scalar::Util::weaken $self; 3564 CFPlus::weaken $self;
3356 3565
3357 $self->{buttonbar}->add (new CFPlus::UI::Button 3566 $self->{buttonbar}->add (new CFPlus::UI::Button
3358 markup => $title, 3567 markup => $title,
3359 tooltip => $tooltip, 3568 tooltip => $tooltip,
3360 on_activate => sub { $self->set_current_page ($widget) }, 3569 on_activate => sub { $self->set_current_page ($widget) },
… …
3444 my $self = $class->SUPER::new ( 3653 my $self = $class->SUPER::new (
3445 fontsize => 0.8, 3654 fontsize => 0.8,
3446 @_, 3655 @_,
3447 ); 3656 );
3448 3657
3449 Scalar::Util::weaken (my $this = $self); 3658 CFPlus::weaken (my $this = $self);
3450 3659
3451 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3660 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3452 3661
3453 $self 3662 $self
3454} 3663}
… …
3577 $self->SUPER::destroy; 3786 $self->SUPER::destroy;
3578} 3787}
3579 3788
3580############################################################################# 3789#############################################################################
3581 3790
3582package CFPlus::UI::Inventory;
3583
3584our @ISA = CFPlus::UI::Table::;
3585
3586sub new {
3587 my $class = shift;
3588
3589 my $self = $class->SUPER::new (
3590 col_expand => [0, 1, 0],
3591 items => [],
3592 @_,
3593 );
3594
3595 $self->set_sort_order (undef);
3596
3597 $self
3598}
3599
3600sub update_items {
3601 my ($self) = @_;
3602
3603 $self->clear;
3604
3605 my @item = $self->{sort}->(@{ $self->{items} });
3606
3607 my @adds;
3608 my $row = 0;
3609 for my $item ($self->{sort}->(@{ $self->{items} })) {
3610 CFPlus::Item::update_widgets $item;
3611
3612 push @adds, 0, $row, $item->{face_widget};
3613 push @adds, 1, $row, $item->{desc_widget};
3614 push @adds, 2, $row, $item->{weight_widget};
3615
3616 $row++;
3617 }
3618
3619 $self->add (@adds);
3620}
3621
3622sub set_sort_order {
3623 my ($self, $order) = @_;
3624
3625 $self->{sort} = $order ||= sub {
3626 sort {
3627 $a->{type} <=> $b->{type}
3628 or $a->{name} cmp $b->{name}
3629 } @_
3630 };
3631
3632 $self->update_items;
3633}
3634
3635sub set_items {
3636 my ($self, $items) = @_;
3637
3638 $self->{items} = [$items ? values %$items : ()];
3639 $self->update_items;
3640}
3641
3642#############################################################################
3643
3644package CFPlus::UI::SpellList;
3645
3646our @ISA = CFPlus::UI::Table::;
3647
3648sub new {
3649 my $class = shift;
3650
3651 my $self = $class->SUPER::new (
3652 binding => [],
3653 commands => [],
3654 @_,
3655 )
3656}
3657
3658my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3659
3660my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3661 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3662my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3663 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3664my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3665 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3666my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3667 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3668my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3669 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3670
3671sub rebuild_spell_list {
3672 my ($self) = @_;
3673
3674 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3675 $self->clear;
3676
3677 return unless $::CONN;
3678
3679 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3680 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3681 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3682 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3683 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3684
3685 my $row = 0;
3686
3687 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3688 my $spell = $self->{spell}{$_};
3689
3690 $row++;
3691
3692 my $spell_cb = sub {
3693 my ($widget, $ev) = @_;
3694
3695 if ($ev->{button} == 1) {
3696 $::CONN->user_send ("cast $spell->{name}");
3697 } elsif ($ev->{button} == 2) {
3698 $::CONN->user_send ("invoke $spell->{name}");
3699 } elsif ($ev->{button} == 3) {
3700 (new CFPlus::UI::Menu
3701 items => [
3702 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3703 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3704 ],
3705 )->popup ($ev);
3706 } else {
3707 return 0;
3708 }
3709
3710 1
3711 };
3712
3713 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3714
3715 #TODO: add path info to tooltip
3716 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3717
3718 $self->add (0, $row, new CFPlus::UI::Face
3719 face => $spell->{face},
3720 can_hover => 1,
3721 can_events => 1,
3722 tooltip => $tooltip,
3723 on_button_down => $spell_cb,
3724 );
3725
3726 $self->add (1, $row, new CFPlus::UI::Label
3727 expand => 1,
3728 text => $spell->{name},
3729 can_hover => 1,
3730 can_events => 1,
3731 tooltip => $tooltip,
3732 on_button_down => $spell_cb,
3733 );
3734
3735 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3736 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3737 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3738 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3739 }
3740 });
3741}
3742
3743sub add_spell {
3744 my ($self, $spell) = @_;
3745
3746 $self->{spell}->{$spell->{name}} = $spell;
3747 $self->rebuild_spell_list;
3748}
3749
3750sub remove_spell {
3751 my ($self, $spell) = @_;
3752
3753 delete $self->{spell}->{$spell->{name}};
3754 $self->rebuild_spell_list;
3755}
3756
3757sub clear_spells {
3758 my ($self) = @_;
3759
3760 $self->{spell} = {};
3761 $self->rebuild_spell_list;
3762}
3763
3764#############################################################################
3765
3766package CFPlus::UI::Root; 3791package CFPlus::UI::Root;
3767 3792
3768our @ISA = CFPlus::UI::Container::; 3793our @ISA = CFPlus::UI::Container::;
3769 3794
3770use List::Util qw(min max); 3795use List::Util qw(min max);
… …
3777 my $self = $class->SUPER::new ( 3802 my $self = $class->SUPER::new (
3778 visible => 1, 3803 visible => 1,
3779 @_, 3804 @_,
3780 ); 3805 );
3781 3806
3782 Scalar::Util::weaken ($self->{root} = $self); 3807 CFPlus::weaken ($self->{root} = $self);
3783 3808
3784 $self 3809 $self
3785} 3810}
3786 3811
3787sub size_request { 3812sub size_request {
… …
3996 glLoadIdentity; 4021 glLoadIdentity;
3997 4022
3998 { 4023 {
3999 package CFPlus::UI::Base; 4024 package CFPlus::UI::Base;
4000 4025
4001 ($draw_x, $draw_y, $draw_w, $draw_h) = 4026 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4002 (0, 0, $self->{w}, $self->{h}); 4027 (0, 0, $self->{w}, $self->{h});
4003 }
4004 4028
4005 $self->_draw; 4029 $self->_draw;
4030 }
4006} 4031}
4007 4032
4008############################################################################# 4033#############################################################################
4009 4034
4010package CFPlus::UI; 4035package CFPlus::UI;

Diff Legend

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