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.337 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.343 by root, Sun Aug 13 15:14:17 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event; 8use Event;
9 9
10use CFClient; 10use CFPlus;
11use CFPlus::Pod;
11use CFClient::Texture; 12use CFPlus::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
… …
96 97
97sub feed_sdl_button_down_event { 98sub feed_sdl_button_down_event {
98 my ($ev) = @_; 99 my ($ev) = @_;
99 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
100 101
101 unless ($BUTTON_STATE) { 102 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
103
104 unless ($GRAB) {
102 my $widget = $ROOT->find_widget ($x, $y); 105 my $widget = $ROOT->find_widget ($x, $y);
103 106
104 $GRAB = $widget; 107 $GRAB = $widget;
105 $GRAB->update if $GRAB; 108 $GRAB->update if $GRAB;
106 109
107 $TOOLTIP_WATCHER->cb->(); 110 $TOOLTIP_WATCHER->cb->();
108 } 111 }
109
110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
111 112
112 if ($GRAB) { 113 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 114 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 115 # mousewheel
115 $ev->{dx} = 0; 116 $ev->{dx} = 0;
… …
207 reconfigure_widgets; 208 reconfigure_widgets;
208} 209}
209 210
210############################################################################# 211#############################################################################
211 212
212package CFClient::UI::Event; 213package CFPlus::UI::Event;
213 214
214sub xy { 215sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 216 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216} 217}
217 218
218############################################################################# 219#############################################################################
219 220
220package CFClient::UI::Base; 221package CFPlus::UI::Base;
221 222
222use strict; 223use strict;
223 224
224use CFClient::OpenGL; 225use CFPlus::OpenGL;
225 226
226sub new { 227sub new {
227 my $class = shift; 228 my $class = shift;
228 229
229 my $self = bless { 230 my $self = bless {
… …
234 h => undef, 235 h => undef,
235 can_events => 1, 236 can_events => 1,
236 @_ 237 @_
237 }, $class; 238 }, $class;
238 239
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240 241
241 for (keys %$self) { 242 for (keys %$self) {
242 if (/^on_(.*)$/) { 243 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 244 $self->connect ($1 => delete $self->{$_});
244 } 245 }
245 } 246 }
246 247
247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 248 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 249 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 250 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 251 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 252 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252 253
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 254 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 255 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255 256
256 $self->show if $layout->{show}; 257 $self->show if $layout->{show};
… …
269sub show { 270sub show {
270 my ($self) = @_; 271 my ($self) = @_;
271 272
272 return if $self->{parent}; 273 return if $self->{parent};
273 274
274 $CFClient::UI::ROOT->add ($self); 275 $CFPlus::UI::ROOT->add ($self);
275} 276}
276 277
277sub set_visible { 278sub set_visible {
278 my ($self) = @_; 279 my ($self) = @_;
279 280
… …
300 delete $self->{root}; 301 delete $self->{root};
301 302
302 undef $GRAB if $GRAB == $self; 303 undef $GRAB if $GRAB == $self;
303 undef $HOVER if $HOVER == $self; 304 undef $HOVER if $HOVER == $self;
304 305
305 $CFClient::UI::TOOLTIP_WATCHER->cb->() 306 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
306 if $TOOLTIP->{owner} == $self; 307 if $TOOLTIP->{owner} == $self;
307 308
308 $self->emit ("focus_out"); 309 $self->emit ("focus_out");
309 $self->emit (visibility_change => 0); 310 $self->emit (visibility_change => 0);
310} 311}
… …
367 my ($self, $x, $y, $w, $h) = @_; 368 my ($self, $x, $y, $w, $h) = @_;
368 369
369 if ($self->{aspect}) { 370 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h); 371 my ($ow, $oh) = ($w, $h);
371 372
372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect}; 373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect}; 374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374 375
375 # use alignment to adjust x, y 376 # use alignment to adjust x, y
376 377
377 $x += int 0.5 * ($ow - $w); 378 $x += int 0.5 * ($ow - $w);
378 $y += int 0.5 * ($oh - $h); 379 $y += int 0.5 * ($oh - $h);
… …
419 420
420 return if $self->{tooltip} eq $tooltip; 421 return if $self->{tooltip} eq $tooltip;
421 422
422 $self->{tooltip} = $tooltip; 423 $self->{tooltip} = $tooltip;
423 424
424 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425 delete $CFClient::UI::TOOLTIP->{owner}; 426 delete $CFPlus::UI::TOOLTIP->{owner};
426 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 427 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
427 } 428 }
428} 429}
429 430
430# translate global coordinates to local coordinate system 431# translate global coordinates to local coordinate system
431sub coord2local { 432sub coord2local {
… …
497sub connect { 498sub connect {
498 my ($self, $signal, $cb) = @_; 499 my ($self, $signal, $cb) = @_;
499 500
500 push @{ $self->{signal_cb}{$signal} }, $cb; 501 push @{ $self->{signal_cb}{$signal} }, $cb;
501 502
502 defined wantarray and CFClient::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 }
506} 507}
507 508
… …
619 glVertex $self->{w} - 1, 0; 620 glVertex $self->{w} - 1, 0;
620 glVertex $self->{w} - 1, $self->{h} - 1; 621 glVertex $self->{w} - 1, $self->{h} - 1;
621 glVertex 0 , $self->{h} - 1; 622 glVertex 0 , $self->{h} - 1;
622 glEnd; 623 glEnd;
623 glPopMatrix; 624 glPopMatrix;
624 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 625 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625 } 626 }
626 627
627 $self->_draw; 628 $self->_draw;
628 glPopMatrix; 629 glPopMatrix;
629} 630}
… …
635} 636}
636 637
637sub DESTROY { 638sub DESTROY {
638 my ($self) = @_; 639 my ($self) = @_;
639 640
640 return if CFClient::in_destruct; 641 return if CFPlus::in_destruct;
641 642
642 delete $WIDGET{$self+0}; 643 delete $WIDGET{$self+0};
643 644
644 eval { $self->destroy }; 645 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
646} 647}
647 648
648############################################################################# 649#############################################################################
649 650
650package CFClient::UI::DrawBG; 651package CFPlus::UI::DrawBG;
651 652
652our @ISA = CFClient::UI::Base::; 653our @ISA = CFPlus::UI::Base::;
653 654
654use strict; 655use strict;
655use CFClient::OpenGL; 656use CFPlus::OpenGL;
656 657
657sub new { 658sub new {
658 my $class = shift; 659 my $class = shift;
659 660
660 # range [value, low, high, page] 661 # range [value, low, high, page]
… …
691 } 692 }
692} 693}
693 694
694############################################################################# 695#############################################################################
695 696
696package CFClient::UI::Empty; 697package CFPlus::UI::Empty;
697 698
698our @ISA = CFClient::UI::Base::; 699our @ISA = CFPlus::UI::Base::;
699 700
700sub new { 701sub new {
701 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
702 $class->SUPER::new (can_events => 0, %arg); 703 $class->SUPER::new (can_events => 0, %arg);
703} 704}
… …
710 711
711sub draw { } 712sub draw { }
712 713
713############################################################################# 714#############################################################################
714 715
715package CFClient::UI::Container; 716package CFPlus::UI::Container;
716 717
717our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
718 719
719sub new { 720sub new {
720 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
721 722
722 my $children = delete $arg{children}; 723 my $children = delete $arg{children};
… …
808 $_->draw for @{$self->{children}}; 809 $_->draw for @{$self->{children}};
809} 810}
810 811
811############################################################################# 812#############################################################################
812 813
813package CFClient::UI::Bin; 814package CFPlus::UI::Bin;
814 815
815our @ISA = CFClient::UI::Container::; 816our @ISA = CFPlus::UI::Container::;
816 817
817sub new { 818sub new {
818 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
819 820
820 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 821 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821 822
822 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
823} 824}
824 825
825sub add { 826sub add {
… …
832sub remove { 833sub remove {
833 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
834 835
835 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
836 837
837 $self->{children} = [new CFClient::UI::Empty] 838 $self->{children} = [new CFPlus::UI::Empty]
838 unless @{$self->{children}}; 839 unless @{$self->{children}};
839} 840}
840 841
841sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
842 843
… …
854 855
855############################################################################# 856#############################################################################
856 857
857# back-buffered drawing area 858# back-buffered drawing area
858 859
859package CFClient::UI::Window; 860package CFPlus::UI::Window;
860 861
861our @ISA = CFClient::UI::Bin::; 862our @ISA = CFPlus::UI::Bin::;
862 863
863use CFClient::OpenGL; 864use CFPlus::OpenGL;
864 865
865sub new { 866sub new {
866 my ($class, %arg) = @_; 867 my ($class, %arg) = @_;
867 868
868 my $self = $class->SUPER::new (%arg); 869 my $self = $class->SUPER::new (%arg);
… …
890} 891}
891 892
892sub render_child { 893sub render_child {
893 my ($self) = @_; 894 my ($self) = @_;
894 895
895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 896 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896 glClearColor 0, 0, 0, 0; 897 glClearColor 0, 0, 0, 0;
897 glClear GL_COLOR_BUFFER_BIT; 898 glClear GL_COLOR_BUFFER_BIT;
898 899
899 { 900 {
900 package CFClient::UI::Base; 901 package CFPlus::UI::Base;
901 902
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 903 ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 904 (0, 0, $self->{w}, $self->{h});
904 } 905 }
905 906
… …
924 glDisable GL_TEXTURE_2D; 925 glDisable GL_TEXTURE_2D;
925} 926}
926 927
927############################################################################# 928#############################################################################
928 929
929package CFClient::UI::ViewPort; 930package CFPlus::UI::ViewPort;
930 931
931our @ISA = CFClient::UI::Window::; 932our @ISA = CFPlus::UI::Window::;
932 933
933sub new { 934sub new {
934 my $class = shift; 935 my $class = shift;
935 936
936 $class->SUPER::new ( 937 $class->SUPER::new (
… …
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 997 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 998 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 999 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1000 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 1001 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 1002 $self->CFPlus::UI::Base::find_widget ($x, $y)
1002 } 1003 }
1003} 1004}
1004 1005
1005sub _render { 1006sub _render {
1006 my ($self) = @_; 1007 my ($self) = @_;
1007 1008
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1009 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1010 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010 1011
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1012 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 1013
1013 $self->SUPER::_render; 1014 $self->SUPER::_render;
1014} 1015}
1015 1016
1016############################################################################# 1017#############################################################################
1017 1018
1018package CFClient::UI::ScrolledWindow; 1019package CFPlus::UI::ScrolledWindow;
1019 1020
1020our @ISA = CFClient::UI::HBox::; 1021our @ISA = CFPlus::UI::HBox::;
1021 1022
1022sub new { 1023sub new {
1023 my ($class, %arg) = @_; 1024 my ($class, %arg) = @_;
1024 1025
1025 my $child = delete $arg{child}; 1026 my $child = delete $arg{child};
1026 1027
1027 my $self; 1028 my $self;
1028 1029
1029 my $slider = new CFClient::UI::Slider 1030 my $slider = new CFPlus::UI::Slider
1030 vertical => 1, 1031 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1032 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1033 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1034 $self->{vp}->set_offset (0, $_[1]);
1034 }, 1035 },
1035 ; 1036 ;
1036 1037
1037 $self = $class->SUPER::new ( 1038 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1039 vp => (new CFPlus::UI::ViewPort expand => 1),
1039 can_events => 1, 1040 can_events => 1,
1040 slider => $slider, 1041 slider => $slider,
1041 %arg, 1042 %arg,
1042 ); 1043 );
1043 1044
… …
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1088 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1089}
1089 1090
1090############################################################################# 1091#############################################################################
1091 1092
1092package CFClient::UI::Frame; 1093package CFPlus::UI::Frame;
1093 1094
1094our @ISA = CFClient::UI::Bin::; 1095our @ISA = CFPlus::UI::Bin::;
1095 1096
1096use CFClient::OpenGL; 1097use CFPlus::OpenGL;
1097 1098
1098sub new { 1099sub new {
1099 my $class = shift; 1100 my $class = shift;
1100 1101
1101 $class->SUPER::new ( 1102 $class->SUPER::new (
… …
1127 $self->SUPER::_draw; 1128 $self->SUPER::_draw;
1128} 1129}
1129 1130
1130############################################################################# 1131#############################################################################
1131 1132
1132package CFClient::UI::FancyFrame; 1133package CFPlus::UI::FancyFrame;
1133 1134
1134our @ISA = CFClient::UI::Bin::; 1135our @ISA = CFPlus::UI::Bin::;
1135 1136
1136use CFClient::OpenGL; 1137use CFPlus::OpenGL;
1137 1138
1138my $bg = 1139my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1140 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1141 mipmap => 1, wrap => 1;
1141 1142
1142my @border = 1143my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1144 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1145 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145 1146
1146sub new { 1147sub new {
1147 my ($class, %arg) = @_; 1148 my ($class, %arg) = @_;
1148 1149
… …
1154 min_w => 64, 1155 min_w => 64,
1155 min_h => 32, 1156 min_h => 32,
1156 %arg, 1157 %arg,
1157 ); 1158 );
1158 1159
1159 $self->{title_widget} = new CFClient::UI::Label 1160 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1161 align => 0,
1161 valign => 1, 1162 valign => 1,
1162 text => $self->{title}, 1163 text => $self->{title},
1163 fontsize => $self->{border}, 1164 fontsize => $self->{border},
1164 if exists $self->{title}; 1165 if exists $self->{title};
1165 1166
1166 if ($self->{has_close_button}) { 1167 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1168 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1169 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1170 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1171 on_activate => sub { $self->emit ("delete") };
1171 1172
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1173 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1174 }
1174 1175
1175 $self 1176 $self
1176} 1177}
1177 1178
1178sub add { 1179sub add {
1179 my ($self, @widgets) = @_; 1180 my ($self, @widgets) = @_;
1180 1181
1181 $self->SUPER::add (@widgets); 1182 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1183 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1184 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1185}
1185 1186
1186sub border { 1187sub border {
1187 int $_[0]{border} * $::FONTSIZE 1188 int $_[0]{border} * $::FONTSIZE
1188} 1189}
… …
1296 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1297 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297 1298
1298 ! ! $self->{motion} 1299 ! ! $self->{motion}
1299} 1300}
1300 1301
1302sub invoke_visibility_change {
1303 my ($self, $visible) = @_;
1304
1305 delete $self->{motion} unless $visible;
1306
1307 0
1308}
1309
1301sub _draw { 1310sub _draw {
1302 my ($self) = @_; 1311 my ($self) = @_;
1303 1312
1304 my $child = $self->{children}[0]; 1313 my $child = $self->{children}[0];
1305 1314
… …
1342 if $self->{close_button}; 1351 if $self->{close_button};
1343} 1352}
1344 1353
1345############################################################################# 1354#############################################################################
1346 1355
1347package CFClient::UI::Table; 1356package CFPlus::UI::Table;
1348 1357
1349our @ISA = CFClient::UI::Base::; 1358our @ISA = CFPlus::UI::Base::;
1350 1359
1351use List::Util qw(max sum); 1360use List::Util qw(max sum);
1352 1361
1353use CFClient::OpenGL; 1362use CFPlus::OpenGL;
1354 1363
1355sub new { 1364sub new {
1356 my $class = shift; 1365 my $class = shift;
1357 1366
1358 $class->SUPER::new ( 1367 $class->SUPER::new (
… …
1448 1457
1449 # linearly scale sizes 1458 # linearly scale sizes
1450 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1459 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1460 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452 1461
1453 CFClient::UI::harmonize $ws; 1462 CFPlus::UI::harmonize $ws;
1454 CFClient::UI::harmonize $hs; 1463 CFPlus::UI::harmonize $hs;
1455 1464
1456 my $y; 1465 my $y;
1457 1466
1458 for my $r (0 .. $#{$self->{children}}) { 1467 for my $r (0 .. $#{$self->{children}}) {
1459 my $row = $self->{children}[$r] 1468 my $row = $self->{children}[$r]
… …
1502 } 1511 }
1503} 1512}
1504 1513
1505############################################################################# 1514#############################################################################
1506 1515
1507package CFClient::UI::Box; 1516package CFPlus::UI::Box;
1508 1517
1509our @ISA = CFClient::UI::Container::; 1518our @ISA = CFPlus::UI::Container::;
1510 1519
1511sub size_request { 1520sub size_request {
1512 my ($self) = @_; 1521 my ($self) = @_;
1513 1522
1514 $self->{vertical} 1523 $self->{vertical}
… …
1547 $req[$_] += $space * $children[$_]{expand} 1556 $req[$_] += $space * $children[$_]{expand}
1548 for 0 .. $#children; 1557 for 0 .. $#children;
1549 } 1558 }
1550 } 1559 }
1551 1560
1552 CFClient::UI::harmonize \@req; 1561 CFPlus::UI::harmonize \@req;
1553 1562
1554 my $pos = 0; 1563 my $pos = 0;
1555 for (0 .. $#children) { 1564 for (0 .. $#children) {
1556 my $alloc = $req[$_]; 1565 my $alloc = $req[$_];
1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1566 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1562 1 1571 1
1563} 1572}
1564 1573
1565############################################################################# 1574#############################################################################
1566 1575
1567package CFClient::UI::HBox; 1576package CFPlus::UI::HBox;
1568 1577
1569our @ISA = CFClient::UI::Box::; 1578our @ISA = CFPlus::UI::Box::;
1570 1579
1571sub new { 1580sub new {
1572 my $class = shift; 1581 my $class = shift;
1573 1582
1574 $class->SUPER::new ( 1583 $class->SUPER::new (
… …
1577 ) 1586 )
1578} 1587}
1579 1588
1580############################################################################# 1589#############################################################################
1581 1590
1582package CFClient::UI::VBox; 1591package CFPlus::UI::VBox;
1583 1592
1584our @ISA = CFClient::UI::Box::; 1593our @ISA = CFPlus::UI::Box::;
1585 1594
1586sub new { 1595sub new {
1587 my $class = shift; 1596 my $class = shift;
1588 1597
1589 $class->SUPER::new ( 1598 $class->SUPER::new (
… …
1592 ) 1601 )
1593} 1602}
1594 1603
1595############################################################################# 1604#############################################################################
1596 1605
1597package CFClient::UI::Label; 1606package CFPlus::UI::Label;
1598 1607
1599our @ISA = CFClient::UI::DrawBG::; 1608our @ISA = CFPlus::UI::DrawBG::;
1600 1609
1601use CFClient::OpenGL; 1610use CFPlus::OpenGL;
1602 1611
1603sub new { 1612sub new {
1604 my ($class, %arg) = @_; 1613 my ($class, %arg) = @_;
1605 1614
1606 my $self = $class->SUPER::new ( 1615 my $self = $class->SUPER::new (
… …
1609 #active_bg => none 1618 #active_bg => none
1610 #font => default_font 1619 #font => default_font
1611 #text => initial text 1620 #text => initial text
1612 #markup => initial narkup 1621 #markup => initial narkup
1613 #max_w => maximum pixel width 1622 #max_w => maximum pixel width
1623 #style => 0, # render flags
1614 ellipsise => 3, # end 1624 ellipsise => 3, # end
1615 layout => (new CFClient::Layout), 1625 layout => (new CFPlus::Layout),
1616 fontsize => 1, 1626 fontsize => 1,
1617 align => -1, 1627 align => -1,
1618 valign => -1, 1628 valign => -1,
1619 padding_x => 2, 1629 padding_x => 2,
1620 padding_y => 2, 1630 padding_y => 2,
1621 can_events => 0, 1631 can_events => 0,
1622 %arg 1632 %arg
1623 ); 1633 );
1624 1634
1625 if (exists $self->{template}) { 1635 if (exists $self->{template}) {
1626 my $layout = new CFClient::Layout; 1636 my $layout = new CFPlus::Layout;
1627 $layout->set_text (delete $self->{template}); 1637 $layout->set_text (delete $self->{template});
1628 $self->{template} = $layout; 1638 $self->{template} = $layout;
1629 } 1639 }
1630 1640
1631 if (exists $self->{markup}) { 1641 if (exists $self->{markup}) {
… …
1769 }; 1779 };
1770 1780
1771 my $w = List::Util::min $self->{w} + 4, $size->[0]; 1781 my $w = List::Util::min $self->{w} + 4, $size->[0];
1772 my $h = List::Util::min $self->{h} + 2, $size->[1]; 1782 my $h = List::Util::min $self->{h} + 2, $size->[1];
1773 1783
1774 $self->{layout}->render ($self->{ox}, $self->{oy}); 1784 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775} 1785}
1776 1786
1777############################################################################# 1787#############################################################################
1778 1788
1779package CFClient::UI::EntryBase; 1789package CFPlus::UI::EntryBase;
1780 1790
1781our @ISA = CFClient::UI::Label::; 1791our @ISA = CFPlus::UI::Label::;
1782 1792
1783use CFClient::OpenGL; 1793use CFPlus::OpenGL;
1784 1794
1785sub new { 1795sub new {
1786 my $class = shift; 1796 my $class = shift;
1787 1797
1788 $class->SUPER::new ( 1798 $class->SUPER::new (
… …
1850 1860
1851 if ($uni == 8) { 1861 if ($uni == 8) {
1852 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1862 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853 } elsif ($uni == 127) { 1863 } elsif ($uni == 127) {
1854 substr $text, $self->{cursor}, 1, ""; 1864 substr $text, $self->{cursor}, 1, "";
1855 } elsif ($sym == CFClient::SDLK_LEFT) { 1865 } elsif ($sym == CFPlus::SDLK_LEFT) {
1856 --$self->{cursor} if $self->{cursor}; 1866 --$self->{cursor} if $self->{cursor};
1857 } elsif ($sym == CFClient::SDLK_RIGHT) { 1867 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1858 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1868 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1859 } elsif ($sym == CFClient::SDLK_HOME) { 1869 } elsif ($sym == CFPlus::SDLK_HOME) {
1860 $self->{cursor} = 0; 1870 $self->{cursor} = 0;
1861 } elsif ($sym == CFClient::SDLK_END) { 1871 } elsif ($sym == CFPlus::SDLK_END) {
1862 $self->{cursor} = length $text; 1872 $self->{cursor} = length $text;
1863 } elsif ($uni == 27) { 1873 } elsif ($uni == 27) {
1864 $self->emit ('escape'); 1874 $self->emit ('escape');
1865 } elsif ($uni) { 1875 } elsif ($uni) {
1866 substr $text, $self->{cursor}++, 0, chr $uni; 1876 substr $text, $self->{cursor}++, 0, chr $uni;
… …
1948 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1958 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949 glEnd; 1959 glEnd;
1950 } 1960 }
1951} 1961}
1952 1962
1953package CFClient::UI::Entry; 1963package CFPlus::UI::Entry;
1954 1964
1955our @ISA = CFClient::UI::EntryBase::; 1965our @ISA = CFPlus::UI::EntryBase::;
1956 1966
1957use CFClient::OpenGL; 1967use CFPlus::OpenGL;
1958 1968
1959sub invoke_key_down { 1969sub invoke_key_down {
1960 my ($self, $ev) = @_; 1970 my ($self, $ev) = @_;
1961 1971
1962 my $sym = $ev->{sym}; 1972 my $sym = $ev->{sym};
… …
1968 $self->{history_pointer} = -1; 1978 $self->{history_pointer} = -1;
1969 $self->{history_saveback} = ''; 1979 $self->{history_saveback} = '';
1970 $self->emit (activate => $txt); 1980 $self->emit (activate => $txt);
1971 $self->update; 1981 $self->update;
1972 1982
1973 } elsif ($sym == CFClient::SDLK_UP) { 1983 } elsif ($sym == CFPlus::SDLK_UP) {
1974 if ($self->{history_pointer} < 0) { 1984 if ($self->{history_pointer} < 0) {
1975 $self->{history_saveback} = $self->get_text; 1985 $self->{history_saveback} = $self->get_text;
1976 } 1986 }
1977 if (@{$self->{history} || []} > 0) { 1987 if (@{$self->{history} || []} > 0) {
1978 $self->{history_pointer}++; 1988 $self->{history_pointer}++;
… …
1980 $self->{history_pointer} = @{$self->{history} || []} - 1; 1990 $self->{history_pointer} = @{$self->{history} || []} - 1;
1981 } 1991 }
1982 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1992 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1983 } 1993 }
1984 1994
1985 } elsif ($sym == CFClient::SDLK_DOWN) { 1995 } elsif ($sym == CFPlus::SDLK_DOWN) {
1986 $self->{history_pointer}--; 1996 $self->{history_pointer}--;
1987 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1997 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988 1998
1989 if ($self->{history_pointer} >= 0) { 1999 if ($self->{history_pointer} >= 0) {
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2000 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1999 1 2009 1
2000} 2010}
2001 2011
2002############################################################################# 2012#############################################################################
2003 2013
2004package CFClient::UI::Button; 2014package CFPlus::UI::Button;
2005 2015
2006our @ISA = CFClient::UI::Label::; 2016our @ISA = CFPlus::UI::Label::;
2007 2017
2008use CFClient::OpenGL; 2018use CFPlus::OpenGL;
2009 2019
2010my @tex = 2020my @tex =
2011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2021 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012 qw(b1_button_active.png); 2022 qw(b1_button_active.png);
2013 2023
2014sub new { 2024sub new {
2015 my $class = shift; 2025 my $class = shift;
2016 2026
… …
2053 $self->SUPER::_draw; 2063 $self->SUPER::_draw;
2054} 2064}
2055 2065
2056############################################################################# 2066#############################################################################
2057 2067
2058package CFClient::UI::CheckBox; 2068package CFPlus::UI::CheckBox;
2059 2069
2060our @ISA = CFClient::UI::DrawBG::; 2070our @ISA = CFPlus::UI::DrawBG::;
2061 2071
2062my @tex = 2072my @tex =
2063 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2073 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2064 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2074 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2065 2075
2066use CFClient::OpenGL; 2076use CFPlus::OpenGL;
2067 2077
2068sub new { 2078sub new {
2069 my $class = shift; 2079 my $class = shift;
2070 2080
2071 $class->SUPER::new ( 2081 $class->SUPER::new (
… …
2128 glDisable GL_TEXTURE_2D; 2138 glDisable GL_TEXTURE_2D;
2129} 2139}
2130 2140
2131############################################################################# 2141#############################################################################
2132 2142
2133package CFClient::UI::Image; 2143package CFPlus::UI::Image;
2134 2144
2135our @ISA = CFClient::UI::Base::; 2145our @ISA = CFPlus::UI::Base::;
2136 2146
2137use CFClient::OpenGL; 2147use CFPlus::OpenGL;
2138 2148
2139our %texture_cache; 2149our %texture_cache;
2140 2150
2141sub new { 2151sub new {
2142 my $class = shift; 2152 my $class = shift;
… …
2148 2158
2149 $self->{path} || $self->{tex} 2159 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required"; 2160 or Carp::croak "'path' or 'tex' attributes required";
2151 2161
2152 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2162 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2163 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2154 2164
2155 Scalar::Util::weaken $texture_cache{$self->{path}}; 2165 Scalar::Util::weaken $texture_cache{$self->{path}};
2156 2166
2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2167 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158 2168
… …
2161 2171
2162sub STORABLE_freeze { 2172sub STORABLE_freeze {
2163 my ($self, $cloning) = @_; 2173 my ($self, $cloning) = @_;
2164 2174
2165 $self->{path} 2175 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2176 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2167 2177
2168 $self->{path} 2178 $self->{path}
2169} 2179}
2170 2180
2171sub STORABLE_attach { 2181sub STORABLE_attach {
… …
2202 glDisable GL_TEXTURE_2D; 2212 glDisable GL_TEXTURE_2D;
2203} 2213}
2204 2214
2205############################################################################# 2215#############################################################################
2206 2216
2207package CFClient::UI::ImageButton; 2217package CFPlus::UI::ImageButton;
2208 2218
2209our @ISA = CFClient::UI::Image::; 2219our @ISA = CFPlus::UI::Image::;
2210 2220
2211use CFClient::OpenGL; 2221use CFPlus::OpenGL;
2212 2222
2213my %textures; 2223my %textures;
2214 2224
2215sub new { 2225sub new {
2216 my $class = shift; 2226 my $class = shift;
… …
2238 1 2248 1
2239} 2249}
2240 2250
2241############################################################################# 2251#############################################################################
2242 2252
2243package CFClient::UI::VGauge; 2253package CFPlus::UI::VGauge;
2244 2254
2245our @ISA = CFClient::UI::Base::; 2255our @ISA = CFPlus::UI::Base::;
2246 2256
2247use List::Util qw(min max); 2257use List::Util qw(min max);
2248 2258
2249use CFClient::OpenGL; 2259use CFPlus::OpenGL;
2250 2260
2251my %tex = ( 2261my %tex = (
2252 food => [ 2262 food => [
2253 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2263 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2254 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2264 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255 ], 2265 ],
2256 grace => [ 2266 grace => [
2257 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2267 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2258 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2268 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2259 ], 2269 ],
2260 hp => [ 2270 hp => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2271 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2272 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263 ], 2273 ],
2264 mana => [ 2274 mana => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2276 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2267 ], 2277 ],
2268); 2278);
2269 2279
2270# eg. VGauge->new (gauge => 'food'), default gauge: food 2280# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2373 glDisable GL_TEXTURE_2D; 2383 glDisable GL_TEXTURE_2D;
2374} 2384}
2375 2385
2376############################################################################# 2386#############################################################################
2377 2387
2378package CFClient::UI::Gauge; 2388package CFPlus::UI::Gauge;
2379 2389
2380our @ISA = CFClient::UI::VBox::; 2390our @ISA = CFPlus::UI::VBox::;
2381 2391
2382sub new { 2392sub new {
2383 my ($class, %arg) = @_; 2393 my ($class, %arg) = @_;
2384 2394
2385 my $self = $class->SUPER::new ( 2395 my $self = $class->SUPER::new (
… …
2387 can_hover => 1, 2397 can_hover => 1,
2388 can_events => 1, 2398 can_events => 1,
2389 %arg, 2399 %arg,
2390 ); 2400 );
2391 2401
2392 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2402 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2393 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2403 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2394 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2404 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2395 2405
2396 $self 2406 $self
2397} 2407}
2398 2408
2399sub set_fontsize { 2409sub set_fontsize {
… …
2420 $self->{value}->set_text ($val); 2430 $self->{value}->set_text ($val);
2421} 2431}
2422 2432
2423############################################################################# 2433#############################################################################
2424 2434
2425package CFClient::UI::Slider; 2435package CFPlus::UI::Slider;
2426 2436
2427use strict; 2437use strict;
2428 2438
2429use CFClient::OpenGL; 2439use CFPlus::OpenGL;
2430 2440
2431our @ISA = CFClient::UI::DrawBG::; 2441our @ISA = CFPlus::UI::DrawBG::;
2432 2442
2433my @tex = 2443my @tex =
2434 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2444 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2435 qw(s1_slider.png s1_slider_bg.png); 2445 qw(s1_slider.png s1_slider_bg.png);
2436 2446
2437sub new { 2447sub new {
2438 my $class = shift; 2448 my $class = shift;
2439 2449
… …
2594 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2595} 2605}
2596 2606
2597############################################################################# 2607#############################################################################
2598 2608
2599package CFClient::UI::ValSlider; 2609package CFPlus::UI::ValSlider;
2600 2610
2601our @ISA = CFClient::UI::HBox::; 2611our @ISA = CFPlus::UI::HBox::;
2602 2612
2603sub new { 2613sub new {
2604 my ($class, %arg) = @_; 2614 my ($class, %arg) = @_;
2605 2615
2606 my $range = delete $arg{range}; 2616 my $range = delete $arg{range};
2607 2617
2608 my $self = $class->SUPER::new ( 2618 my $self = $class->SUPER::new (
2609 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2619 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2610 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2620 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2611 to_value => sub { shift }, 2621 to_value => sub { shift },
2612 from_value => sub { shift }, 2622 from_value => sub { shift },
2613 %arg, 2623 %arg,
2614 ); 2624 );
2615 2625
… …
2635sub set_range { shift->{slider}->set_range (@_) } 2645sub set_range { shift->{slider}->set_range (@_) }
2636sub set_value { shift->{slider}->set_value (@_) } 2646sub set_value { shift->{slider}->set_value (@_) }
2637 2647
2638############################################################################# 2648#############################################################################
2639 2649
2640package CFClient::UI::TextScroller; 2650package CFPlus::UI::TextScroller;
2641 2651
2642our @ISA = CFClient::UI::HBox::; 2652our @ISA = CFPlus::UI::HBox::;
2643 2653
2644use CFClient::OpenGL; 2654use CFPlus::OpenGL;
2645 2655
2646sub new { 2656sub new {
2647 my $class = shift; 2657 my $class = shift;
2648 2658
2649 my $self = $class->SUPER::new ( 2659 my $self = $class->SUPER::new (
… …
2651 can_events => 1, 2661 can_events => 1,
2652 indent => 0, 2662 indent => 0,
2653 #font => default_font 2663 #font => default_font
2654 @_, 2664 @_,
2655 2665
2656 layout => (new CFClient::Layout), 2666 layout => (new CFPlus::Layout),
2657 par => [], 2667 par => [],
2658 height => 0, 2668 height => 0,
2659 children => [ 2669 children => [
2660 (new CFClient::UI::Empty expand => 1), 2670 (new CFPlus::UI::Empty expand => 1),
2661 (new CFClient::UI::Slider vertical => 1), 2671 (new CFPlus::UI::Slider vertical => 1),
2662 ], 2672 ],
2663 ); 2673 );
2664 2674
2665 $self->{children}[1]->connect (changed => sub { $self->update }); 2675 $self->{children}[1]->connect (changed => sub { $self->update });
2666 2676
… …
2755 $self->{height} = 0; 2765 $self->{height} = 0;
2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2766 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2757} 2767}
2758 2768
2759sub add_paragraph { 2769sub add_paragraph {
2760 my ($self, $color, $para, $indent) = @_; 2770 my $self = shift;
2761 2771
2762 my ($text, @w) = ref $para ? @$para : $para; 2772 for my $para (@_) {
2763
2764 $para = { 2773 $para = {
2774 fg => [1, 1, 1, 1],
2775 indent => 0,
2776 markup => "",
2777 widget => [],
2778 ref $para ? %$para : (markup => $para),
2765 w => 1e10, 2779 w => 1e10,
2766 wrapped => 1, 2780 wrapped => 1,
2767 fg => $color,
2768 indent => $indent,
2769 markup => $text,
2770 widget => \@w,
2771 }; 2781 };
2772 2782
2773 $self->add (@w) if @w; 2783 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774 push @{$self->{par}}, $para; 2784 push @{$self->{par}}, $para;
2785 }
2775 2786
2776 $self->{need_reflow}++; 2787 $self->{need_reflow}++;
2777 $self->update; 2788 $self->update;
2778} 2789}
2779 2790
… …
2821 2832
2822 if (delete $self->{scroll_to_bottom}) { 2833 if (delete $self->{scroll_to_bottom}) {
2823 $self->{children}[1]->set_value (1e10); 2834 $self->{children}[1]->set_value (1e10);
2824 } 2835 }
2825 2836
2826 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2837 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2827 glClearColor 0, 0, 0, 0; 2838 glClearColor 0, 0, 0, 0;
2828 glClear GL_COLOR_BUFFER_BIT; 2839 glClear GL_COLOR_BUFFER_BIT;
2829 2840
2830 my $top = int $self->{children}[1]{range}[0]; 2841 my $top = int $self->{children}[1]{range}[0];
2831 2842
… …
2884 $self->{children}[1]->draw; 2895 $self->{children}[1]->draw;
2885} 2896}
2886 2897
2887############################################################################# 2898#############################################################################
2888 2899
2889package CFClient::UI::Animator; 2900package CFPlus::UI::Animator;
2890 2901
2891use CFClient::OpenGL; 2902use CFPlus::OpenGL;
2892 2903
2893our @ISA = CFClient::UI::Bin::; 2904our @ISA = CFPlus::UI::Bin::;
2894 2905
2895sub moveto { 2906sub moveto {
2896 my ($self, $x, $y) = @_; 2907 my ($self, $x, $y) = @_;
2897 2908
2898 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2909 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2926 glPopMatrix; 2937 glPopMatrix;
2927} 2938}
2928 2939
2929############################################################################# 2940#############################################################################
2930 2941
2931package CFClient::UI::Flopper; 2942package CFPlus::UI::Flopper;
2932 2943
2933our @ISA = CFClient::UI::Button::; 2944our @ISA = CFPlus::UI::Button::;
2934 2945
2935sub new { 2946sub new {
2936 my $class = shift; 2947 my $class = shift;
2937 2948
2938 my $self = $class->SUPER::new ( 2949 my $self = $class->SUPER::new (
… …
2950 $self->{other}->toggle_visibility; 2961 $self->{other}->toggle_visibility;
2951} 2962}
2952 2963
2953############################################################################# 2964#############################################################################
2954 2965
2955package CFClient::UI::Tooltip; 2966package CFPlus::UI::Tooltip;
2956 2967
2957our @ISA = CFClient::UI::Bin::; 2968our @ISA = CFPlus::UI::Bin::;
2958 2969
2959use CFClient::OpenGL; 2970use CFPlus::OpenGL;
2960 2971
2961sub new { 2972sub new {
2962 my $class = shift; 2973 my $class = shift;
2963 2974
2964 $class->SUPER::new ( 2975 $class->SUPER::new (
… …
2967 ) 2978 )
2968} 2979}
2969 2980
2970sub set_tooltip_from { 2981sub set_tooltip_from {
2971 my ($self, $widget) = @_; 2982 my ($self, $widget) = @_;
2983
2984 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2985 if $widget->{tooltip} =~ /^#(.*)$/;
2972 2986
2973 my $tooltip = $widget->{tooltip}; 2987 my $tooltip = $widget->{tooltip};
2974 2988
2975 if ($ENV{CFPLUS_DEBUG} & 2) { 2989 if ($ENV{CFPLUS_DEBUG} & 2) {
2976 $tooltip .= "\n\n" . (ref $widget) . "\n" 2990 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2980 } 2994 }
2981 2995
2982 $tooltip =~ s/^\n+//; 2996 $tooltip =~ s/^\n+//;
2983 $tooltip =~ s/\n+$//; 2997 $tooltip =~ s/\n+$//;
2984 2998
2985 $self->add (new CFClient::UI::Label 2999 $self->add (new CFPlus::UI::Label
2986 markup => $tooltip, 3000 markup => $tooltip,
2987 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3001 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2988 fontsize => 0.8, 3002 fontsize => 0.8,
2989 fg => [0, 0, 0, 1], 3003 style => 1, # FLAG_INVERSE
2990 ellipsise => 0, 3004 ellipsise => 0,
2991 font => ($widget->{tooltip_font} || $::FONT_PROP), 3005 font => ($widget->{tooltip_font} || $::FONT_PROP),
2992 ); 3006 );
2993} 3007}
2994 3008
… …
3056 $self->SUPER::_draw; 3070 $self->SUPER::_draw;
3057} 3071}
3058 3072
3059############################################################################# 3073#############################################################################
3060 3074
3061package CFClient::UI::Face; 3075package CFPlus::UI::Face;
3062 3076
3063our @ISA = CFClient::UI::DrawBG::; 3077our @ISA = CFPlus::UI::DrawBG::;
3064 3078
3065use CFClient::OpenGL; 3079use CFPlus::OpenGL;
3066 3080
3067sub new { 3081sub new {
3068 my $class = shift; 3082 my $class = shift;
3069 3083
3070 my $self = $class->SUPER::new ( 3084 my $self = $class->SUPER::new (
… …
3138 $self->SUPER::destroy; 3152 $self->SUPER::destroy;
3139} 3153}
3140 3154
3141############################################################################# 3155#############################################################################
3142 3156
3143package CFClient::UI::Buttonbar; 3157package CFPlus::UI::Buttonbar;
3144 3158
3145our @ISA = CFClient::UI::HBox::; 3159our @ISA = CFPlus::UI::HBox::;
3146 3160
3147# TODO: should actualyl wrap buttons and other goodies. 3161# TODO: should actualyl wrap buttons and other goodies.
3148 3162
3149############################################################################# 3163#############################################################################
3150 3164
3151package CFClient::UI::Menu; 3165package CFPlus::UI::Menu;
3152 3166
3153our @ISA = CFClient::UI::FancyFrame::; 3167our @ISA = CFPlus::UI::FancyFrame::;
3154 3168
3155use CFClient::OpenGL; 3169use CFPlus::OpenGL;
3156 3170
3157sub new { 3171sub new {
3158 my $class = shift; 3172 my $class = shift;
3159 3173
3160 my $self = $class->SUPER::new ( 3174 my $self = $class->SUPER::new (
3161 items => [], 3175 items => [],
3162 z => 100, 3176 z => 100,
3163 @_, 3177 @_,
3164 ); 3178 );
3165 3179
3166 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3180 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3167 3181
3168 for my $item (@{ $self->{items} }) { 3182 for my $item (@{ $self->{items} }) {
3169 my ($widget, $cb, $tooltip) = @$item; 3183 my ($widget, $cb, $tooltip) = @$item;
3170 3184
3171 # handle various types of items, only text for now 3185 # handle various types of items, only text for now
3172 if (!ref $widget) { 3186 if (!ref $widget) {
3173 if ($widget =~ /\t/) { 3187 if ($widget =~ /\t/) {
3174 my ($left, $right) = split /\t/, $widget, 2; 3188 my ($left, $right) = split /\t/, $widget, 2;
3175 3189
3176 $widget = new CFClient::UI::HBox 3190 $widget = new CFPlus::UI::HBox
3177 can_hover => 1, 3191 can_hover => 1,
3178 can_events => 1, 3192 can_events => 1,
3179 tooltip => $tooltip, 3193 tooltip => $tooltip,
3180 children => [ 3194 children => [
3181 (new CFClient::UI::Label markup => $left, expand => 1), 3195 (new CFPlus::UI::Label markup => $left, expand => 1),
3182 (new CFClient::UI::Label markup => $right, align => +1), 3196 (new CFPlus::UI::Label markup => $right, align => +1),
3183 ], 3197 ],
3184 ; 3198 ;
3185 3199
3186 } else { 3200 } else {
3187 $widget = new CFClient::UI::Label 3201 $widget = new CFPlus::UI::Label
3188 can_hover => 1, 3202 can_hover => 1,
3189 can_events => 1, 3203 can_events => 1,
3190 markup => $widget, 3204 markup => $widget,
3191 tooltip => $tooltip; 3205 tooltip => $tooltip;
3192 } 3206 }
… …
3240 1 3254 1
3241} 3255}
3242 3256
3243############################################################################# 3257#############################################################################
3244 3258
3245package CFClient::UI::Multiplexer; 3259package CFPlus::UI::Multiplexer;
3246 3260
3247our @ISA = CFClient::UI::Container::; 3261our @ISA = CFPlus::UI::Container::;
3248 3262
3249sub new { 3263sub new {
3250 my $class = shift; 3264 my $class = shift;
3251 3265
3252 my $self = $class->SUPER::new ( 3266 my $self = $class->SUPER::new (
… …
3313 $self->{current}->draw; 3327 $self->{current}->draw;
3314} 3328}
3315 3329
3316############################################################################# 3330#############################################################################
3317 3331
3318package CFClient::UI::Notebook; 3332package CFPlus::UI::Notebook;
3319 3333
3320our @ISA = CFClient::UI::VBox::; 3334our @ISA = CFPlus::UI::VBox::;
3321 3335
3322sub new { 3336sub new {
3323 my $class = shift; 3337 my $class = shift;
3324 3338
3325 my $self = $class->SUPER::new ( 3339 my $self = $class->SUPER::new (
3326 buttonbar => (new CFClient::UI::Buttonbar), 3340 buttonbar => (new CFPlus::UI::Buttonbar),
3327 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3341 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3328 # filter => # will be put between multiplexer and $self 3342 # filter => # will be put between multiplexer and $self
3329 @_, 3343 @_,
3330 ); 3344 );
3331 3345
3332 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3346 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3338sub add { 3352sub add {
3339 my ($self, $title, $widget, $tooltip) = @_; 3353 my ($self, $title, $widget, $tooltip) = @_;
3340 3354
3341 Scalar::Util::weaken $self; 3355 Scalar::Util::weaken $self;
3342 3356
3343 $self->{buttonbar}->add (new CFClient::UI::Button 3357 $self->{buttonbar}->add (new CFPlus::UI::Button
3344 markup => $title, 3358 markup => $title,
3345 tooltip => $tooltip, 3359 tooltip => $tooltip,
3346 on_activate => sub { $self->set_current_page ($widget) }, 3360 on_activate => sub { $self->set_current_page ($widget) },
3347 ); 3361 );
3348 3362
… …
3362 $self->emit (page_changed => $self->{multiplexer}{current}); 3376 $self->emit (page_changed => $self->{multiplexer}{current});
3363} 3377}
3364 3378
3365############################################################################# 3379#############################################################################
3366 3380
3367package CFClient::UI::Selector; 3381package CFPlus::UI::Selector;
3368 3382
3369use utf8; 3383use utf8;
3370 3384
3371our @ISA = CFClient::UI::Button::; 3385our @ISA = CFPlus::UI::Button::;
3372 3386
3373sub new { 3387sub new {
3374 my $class = shift; 3388 my $class = shift;
3375 3389
3376 my $self = $class->SUPER::new ( 3390 my $self = $class->SUPER::new (
… …
3393 my ($value, $title, $tooltip) = @$_; 3407 my ($value, $title, $tooltip) = @$_;
3394 3408
3395 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3409 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3396 } 3410 }
3397 3411
3398 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3412 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3399} 3413}
3400 3414
3401sub _set_value { 3415sub _set_value {
3402 my ($self, $value) = @_; 3416 my ($self, $value) = @_;
3403 3417
… …
3418 $self->emit (changed => $value); 3432 $self->emit (changed => $value);
3419} 3433}
3420 3434
3421############################################################################# 3435#############################################################################
3422 3436
3423package CFClient::UI::Statusbox; 3437package CFPlus::UI::Statusbox;
3424 3438
3425our @ISA = CFClient::UI::VBox::; 3439our @ISA = CFPlus::UI::VBox::;
3426 3440
3427sub new { 3441sub new {
3428 my $class = shift; 3442 my $class = shift;
3429 3443
3430 my $self = $class->SUPER::new ( 3444 my $self = $class->SUPER::new (
… …
3442sub reorder { 3456sub reorder {
3443 my ($self) = @_; 3457 my ($self) = @_;
3444 my $NOW = Time::HiRes::time; 3458 my $NOW = Time::HiRes::time;
3445 3459
3446 # freeze display when hovering over any label 3460 # freeze display when hovering over any label
3447 return if $CFClient::UI::TOOLTIP->{owner} 3461 return if $CFPlus::UI::TOOLTIP->{owner}
3448 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3462 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3449 values %{ $self->{item} }; 3463 values %{ $self->{item} };
3450 3464
3451 while (my ($k, $v) = each %{ $self->{item} }) { 3465 while (my ($k, $v) = each %{ $self->{item} }) {
3452 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3466 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3453 } 3467 }
… …
3474 for ($short) { 3488 for ($short) {
3475 s/^\s+//; 3489 s/^\s+//;
3476 s/\s+/ /g; 3490 s/\s+/ /g;
3477 } 3491 }
3478 3492
3479 new CFClient::UI::Label 3493 new CFPlus::UI::Label
3480 markup => $short, 3494 markup => $short,
3481 tooltip => $item->{tooltip}, 3495 tooltip => $item->{tooltip},
3482 tooltip_font => $::FONT_PROP, 3496 tooltip_font => $::FONT_PROP,
3483 tooltip_width => 0.67, 3497 tooltip_width => 0.67,
3484 fontsize => $item->{fontsize} || $self->{fontsize}, 3498 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3563 $self->SUPER::destroy; 3577 $self->SUPER::destroy;
3564} 3578}
3565 3579
3566############################################################################# 3580#############################################################################
3567 3581
3568package CFClient::UI::Inventory; 3582package CFPlus::UI::Inventory;
3569 3583
3570our @ISA = CFClient::UI::Table::; 3584our @ISA = CFPlus::UI::Table::;
3571 3585
3572sub new { 3586sub new {
3573 my $class = shift; 3587 my $class = shift;
3574 3588
3575 my $self = $class->SUPER::new ( 3589 my $self = $class->SUPER::new (
… …
3591 my @item = $self->{sort}->(@{ $self->{items} }); 3605 my @item = $self->{sort}->(@{ $self->{items} });
3592 3606
3593 my @adds; 3607 my @adds;
3594 my $row = 0; 3608 my $row = 0;
3595 for my $item ($self->{sort}->(@{ $self->{items} })) { 3609 for my $item ($self->{sort}->(@{ $self->{items} })) {
3596 CFClient::Item::update_widgets $item; 3610 CFPlus::Item::update_widgets $item;
3597 3611
3598 push @adds, 0, $row, $item->{face_widget}; 3612 push @adds, 0, $row, $item->{face_widget};
3599 push @adds, 1, $row, $item->{desc_widget}; 3613 push @adds, 1, $row, $item->{desc_widget};
3600 push @adds, 2, $row, $item->{weight_widget}; 3614 push @adds, 2, $row, $item->{weight_widget};
3601 3615
… …
3625 $self->update_items; 3639 $self->update_items;
3626} 3640}
3627 3641
3628############################################################################# 3642#############################################################################
3629 3643
3630package CFClient::UI::SpellList; 3644package CFPlus::UI::SpellList;
3631 3645
3632our @ISA = CFClient::UI::Table::; 3646our @ISA = CFPlus::UI::Table::;
3633 3647
3634sub new { 3648sub new {
3635 my $class = shift; 3649 my $class = shift;
3636 3650
3637 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
… …
3655 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); 3669 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3656 3670
3657sub rebuild_spell_list { 3671sub rebuild_spell_list {
3658 my ($self) = @_; 3672 my ($self) = @_;
3659 3673
3660 $CFClient::UI::ROOT->on_refresh ($self => sub { 3674 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3661 $self->clear; 3675 $self->clear;
3662 3676
3663 return unless $::CONN; 3677 return unless $::CONN;
3664 3678
3665 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); 3679 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3666 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); 3680 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3667 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3681 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3668 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3682 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3669 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3683 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3670 3684
3671 my $row = 0; 3685 my $row = 0;
3672 3686
3673 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3687 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3674 my $spell = $self->{spell}{$_}; 3688 my $spell = $self->{spell}{$_};
… …
3681 if ($ev->{button} == 1) { 3695 if ($ev->{button} == 1) {
3682 $::CONN->user_send ("cast $spell->{name}"); 3696 $::CONN->user_send ("cast $spell->{name}");
3683 } elsif ($ev->{button} == 2) { 3697 } elsif ($ev->{button} == 2) {
3684 $::CONN->user_send ("invoke $spell->{name}"); 3698 $::CONN->user_send ("invoke $spell->{name}");
3685 } elsif ($ev->{button} == 3) { 3699 } elsif ($ev->{button} == 3) {
3686 (new CFClient::UI::Menu 3700 (new CFPlus::UI::Menu
3687 items => [ 3701 items => [
3688 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3702 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3689 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3703 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3690 ], 3704 ],
3691 )->popup ($ev); 3705 )->popup ($ev);
… …
3697 }; 3711 };
3698 3712
3699 my $tooltip = "$spell->{message}$TOOLTIP_ALL"; 3713 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3700 3714
3701 #TODO: add path info to tooltip 3715 #TODO: add path info to tooltip
3702 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); 3716 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3703 3717
3704 $self->add (0, $row, new CFClient::UI::Face 3718 $self->add (0, $row, new CFPlus::UI::Face
3705 face => $spell->{face}, 3719 face => $spell->{face},
3706 can_hover => 1, 3720 can_hover => 1,
3707 can_events => 1, 3721 can_events => 1,
3708 tooltip => $tooltip, 3722 tooltip => $tooltip,
3709 on_button_down => $spell_cb, 3723 on_button_down => $spell_cb,
3710 ); 3724 );
3711 3725
3712 $self->add (1, $row, new CFClient::UI::Label 3726 $self->add (1, $row, new CFPlus::UI::Label
3713 expand => 1, 3727 expand => 1,
3714 text => $spell->{name}, 3728 text => $spell->{name},
3715 can_hover => 1, 3729 can_hover => 1,
3716 can_events => 1, 3730 can_events => 1,
3717 tooltip => $tooltip, 3731 tooltip => $tooltip,
3718 on_button_down => $spell_cb, 3732 on_button_down => $spell_cb,
3719 ); 3733 );
3720 3734
3721 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); 3735 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3722 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3736 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3723 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3737 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3724 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3738 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3725 } 3739 }
3726 }); 3740 });
3727} 3741}
3728 3742
3729sub add_spell { 3743sub add_spell {
… …
3747 $self->rebuild_spell_list; 3761 $self->rebuild_spell_list;
3748} 3762}
3749 3763
3750############################################################################# 3764#############################################################################
3751 3765
3752package CFClient::UI::Root; 3766package CFPlus::UI::Root;
3753 3767
3754our @ISA = CFClient::UI::Container::; 3768our @ISA = CFPlus::UI::Container::;
3755 3769
3756use List::Util qw(min max); 3770use List::Util qw(min max);
3757 3771
3758use CFClient::OpenGL; 3772use CFPlus::OpenGL;
3759 3773
3760sub new { 3774sub new {
3761 my $class = shift; 3775 my $class = shift;
3762 3776
3763 my $self = $class->SUPER::new ( 3777 my $self = $class->SUPER::new (
… …
3980 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3994 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3981 glMatrixMode GL_MODELVIEW; 3995 glMatrixMode GL_MODELVIEW;
3982 glLoadIdentity; 3996 glLoadIdentity;
3983 3997
3984 { 3998 {
3985 package CFClient::UI::Base; 3999 package CFPlus::UI::Base;
3986 4000
3987 ($draw_x, $draw_y, $draw_w, $draw_h) = 4001 ($draw_x, $draw_y, $draw_w, $draw_h) =
3988 (0, 0, $self->{w}, $self->{h}); 4002 (0, 0, $self->{w}, $self->{h});
3989 } 4003 }
3990 4004
3991 $self->_draw; 4005 $self->_draw;
3992} 4006}
3993 4007
3994############################################################################# 4008#############################################################################
3995 4009
3996package CFClient::UI; 4010package CFPlus::UI;
3997 4011
3998$ROOT = new CFClient::UI::Root; 4012$ROOT = new CFPlus::UI::Root;
3999$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4013$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4000 4014
40011 40151
4002 4016

Diff Legend

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