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.339 by root, Sun Jul 30 12:15:19 2006 UTC vs.
Revision 1.344 by root, Sun Aug 13 16:29:36 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;
… …
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
… …
908} 909}
909 910
910sub _draw { 911sub _draw {
911 my ($self) = @_; 912 my ($self) = @_;
912 913
913 my ($w, $h) = @$self{qw(w h)};
914
915 my $tex = $self->{texture} 914 my $tex = $self->{texture}
916 or return; 915 or return;
917 916
918 glEnable GL_TEXTURE_2D; 917 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 919 glColor 0, 0, 0, 1;
921 920
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 921 $tex->draw_quad_alpha_premultiplied (0, 0);
923 922
924 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
925} 924}
926 925
927############################################################################# 926#############################################################################
928 927
929package CFClient::UI::ViewPort; 928package CFPlus::UI::ViewPort;
930 929
931our @ISA = CFClient::UI::Window::; 930our @ISA = CFPlus::UI::Window::;
932 931
933sub new { 932sub new {
934 my $class = shift; 933 my $class = shift;
935 934
936 $class->SUPER::new ( 935 $class->SUPER::new (
… …
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 997 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 999 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
1002 } 1001 }
1003} 1002}
1004 1003
1005sub _render { 1004sub _render {
1006 my ($self) = @_; 1005 my ($self) = @_;
1007 1006
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1007 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}; 1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010 1009
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 1011
1013 $self->SUPER::_render; 1012 $self->SUPER::_render;
1014} 1013}
1015 1014
1016############################################################################# 1015#############################################################################
1017 1016
1018package CFClient::UI::ScrolledWindow; 1017package CFPlus::UI::ScrolledWindow;
1019 1018
1020our @ISA = CFClient::UI::HBox::; 1019our @ISA = CFPlus::UI::HBox::;
1021 1020
1022sub new { 1021sub new {
1023 my ($class, %arg) = @_; 1022 my ($class, %arg) = @_;
1024 1023
1025 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
1026 1025
1027 my $self; 1026 my $self;
1028 1027
1029 my $slider = new CFClient::UI::Slider 1028 my $slider = new CFPlus::UI::Slider
1030 vertical => 1, 1029 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1030 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1031 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1032 $self->{vp}->set_offset (0, $_[1]);
1034 }, 1033 },
1035 ; 1034 ;
1036 1035
1037 $self = $class->SUPER::new ( 1036 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1037 vp => (new CFPlus::UI::ViewPort expand => 1),
1039 can_events => 1, 1038 can_events => 1,
1040 slider => $slider, 1039 slider => $slider,
1041 %arg, 1040 %arg,
1042 ); 1041 );
1043 1042
… …
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1086 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1087}
1089 1088
1090############################################################################# 1089#############################################################################
1091 1090
1092package CFClient::UI::Frame; 1091package CFPlus::UI::Frame;
1093 1092
1094our @ISA = CFClient::UI::Bin::; 1093our @ISA = CFPlus::UI::Bin::;
1095 1094
1096use CFClient::OpenGL; 1095use CFPlus::OpenGL;
1097 1096
1098sub new { 1097sub new {
1099 my $class = shift; 1098 my $class = shift;
1100 1099
1101 $class->SUPER::new ( 1100 $class->SUPER::new (
… …
1127 $self->SUPER::_draw; 1126 $self->SUPER::_draw;
1128} 1127}
1129 1128
1130############################################################################# 1129#############################################################################
1131 1130
1132package CFClient::UI::FancyFrame; 1131package CFPlus::UI::FancyFrame;
1133 1132
1134our @ISA = CFClient::UI::Bin::; 1133our @ISA = CFPlus::UI::Bin::;
1135 1134
1136use CFClient::OpenGL; 1135use CFPlus::OpenGL;
1137 1136
1138my $bg = 1137my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1138 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1139 mipmap => 1, wrap => 1;
1141 1140
1142my @border = 1141my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1142 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); 1143 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145 1144
1146sub new { 1145sub new {
1147 my ($class, %arg) = @_; 1146 my ($class, %arg) = @_;
1148 1147
… …
1154 min_w => 64, 1153 min_w => 64,
1155 min_h => 32, 1154 min_h => 32,
1156 %arg, 1155 %arg,
1157 ); 1156 );
1158 1157
1159 $self->{title_widget} = new CFClient::UI::Label 1158 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1159 align => 0,
1161 valign => 1, 1160 valign => 1,
1162 text => $self->{title}, 1161 text => $self->{title},
1163 fontsize => $self->{border}, 1162 fontsize => $self->{border},
1164 if exists $self->{title}; 1163 if exists $self->{title};
1165 1164
1166 if ($self->{has_close_button}) { 1165 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1166 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1167 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1168 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1169 on_activate => sub { $self->emit ("delete") };
1171 1170
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1171 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1172 }
1174 1173
1175 $self 1174 $self
1176} 1175}
1177 1176
1178sub add { 1177sub add {
1179 my ($self, @widgets) = @_; 1178 my ($self, @widgets) = @_;
1180 1179
1181 $self->SUPER::add (@widgets); 1180 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1181 $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}; 1182 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1183}
1185 1184
1186sub border { 1185sub border {
1187 int $_[0]{border} * $::FONTSIZE 1186 int $_[0]{border} * $::FONTSIZE
1188} 1187}
… …
1350 if $self->{close_button}; 1349 if $self->{close_button};
1351} 1350}
1352 1351
1353############################################################################# 1352#############################################################################
1354 1353
1355package CFClient::UI::Table; 1354package CFPlus::UI::Table;
1356 1355
1357our @ISA = CFClient::UI::Base::; 1356our @ISA = CFPlus::UI::Base::;
1358 1357
1359use List::Util qw(max sum); 1358use List::Util qw(max sum);
1360 1359
1361use CFClient::OpenGL; 1360use CFPlus::OpenGL;
1362 1361
1363sub new { 1362sub new {
1364 my $class = shift; 1363 my $class = shift;
1365 1364
1366 $class->SUPER::new ( 1365 $class->SUPER::new (
… …
1456 1455
1457 # linearly scale sizes 1456 # linearly scale sizes
1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1457 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1458 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460 1459
1461 CFClient::UI::harmonize $ws; 1460 CFPlus::UI::harmonize $ws;
1462 CFClient::UI::harmonize $hs; 1461 CFPlus::UI::harmonize $hs;
1463 1462
1464 my $y; 1463 my $y;
1465 1464
1466 for my $r (0 .. $#{$self->{children}}) { 1465 for my $r (0 .. $#{$self->{children}}) {
1467 my $row = $self->{children}[$r] 1466 my $row = $self->{children}[$r]
… …
1510 } 1509 }
1511} 1510}
1512 1511
1513############################################################################# 1512#############################################################################
1514 1513
1515package CFClient::UI::Box; 1514package CFPlus::UI::Box;
1516 1515
1517our @ISA = CFClient::UI::Container::; 1516our @ISA = CFPlus::UI::Container::;
1518 1517
1519sub size_request { 1518sub size_request {
1520 my ($self) = @_; 1519 my ($self) = @_;
1521 1520
1522 $self->{vertical} 1521 $self->{vertical}
… …
1555 $req[$_] += $space * $children[$_]{expand} 1554 $req[$_] += $space * $children[$_]{expand}
1556 for 0 .. $#children; 1555 for 0 .. $#children;
1557 } 1556 }
1558 } 1557 }
1559 1558
1560 CFClient::UI::harmonize \@req; 1559 CFPlus::UI::harmonize \@req;
1561 1560
1562 my $pos = 0; 1561 my $pos = 0;
1563 for (0 .. $#children) { 1562 for (0 .. $#children) {
1564 my $alloc = $req[$_]; 1563 my $alloc = $req[$_];
1565 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1564 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1570 1 1569 1
1571} 1570}
1572 1571
1573############################################################################# 1572#############################################################################
1574 1573
1575package CFClient::UI::HBox; 1574package CFPlus::UI::HBox;
1576 1575
1577our @ISA = CFClient::UI::Box::; 1576our @ISA = CFPlus::UI::Box::;
1578 1577
1579sub new { 1578sub new {
1580 my $class = shift; 1579 my $class = shift;
1581 1580
1582 $class->SUPER::new ( 1581 $class->SUPER::new (
… …
1585 ) 1584 )
1586} 1585}
1587 1586
1588############################################################################# 1587#############################################################################
1589 1588
1590package CFClient::UI::VBox; 1589package CFPlus::UI::VBox;
1591 1590
1592our @ISA = CFClient::UI::Box::; 1591our @ISA = CFPlus::UI::Box::;
1593 1592
1594sub new { 1593sub new {
1595 my $class = shift; 1594 my $class = shift;
1596 1595
1597 $class->SUPER::new ( 1596 $class->SUPER::new (
… …
1600 ) 1599 )
1601} 1600}
1602 1601
1603############################################################################# 1602#############################################################################
1604 1603
1605package CFClient::UI::Label; 1604package CFPlus::UI::Label;
1606 1605
1607our @ISA = CFClient::UI::DrawBG::; 1606our @ISA = CFPlus::UI::DrawBG::;
1608 1607
1609use CFClient::OpenGL; 1608use CFPlus::OpenGL;
1610 1609
1611sub new { 1610sub new {
1612 my ($class, %arg) = @_; 1611 my ($class, %arg) = @_;
1613 1612
1614 my $self = $class->SUPER::new ( 1613 my $self = $class->SUPER::new (
… …
1617 #active_bg => none 1616 #active_bg => none
1618 #font => default_font 1617 #font => default_font
1619 #text => initial text 1618 #text => initial text
1620 #markup => initial narkup 1619 #markup => initial narkup
1621 #max_w => maximum pixel width 1620 #max_w => maximum pixel width
1621 #style => 0, # render flags
1622 ellipsise => 3, # end 1622 ellipsise => 3, # end
1623 layout => (new CFClient::Layout), 1623 layout => (new CFPlus::Layout),
1624 fontsize => 1, 1624 fontsize => 1,
1625 align => -1, 1625 align => -1,
1626 valign => -1, 1626 valign => -1,
1627 padding_x => 2, 1627 padding_x => 2,
1628 padding_y => 2, 1628 padding_y => 2,
1629 can_events => 0, 1629 can_events => 0,
1630 %arg 1630 %arg
1631 ); 1631 );
1632 1632
1633 if (exists $self->{template}) { 1633 if (exists $self->{template}) {
1634 my $layout = new CFClient::Layout; 1634 my $layout = new CFPlus::Layout;
1635 $layout->set_text (delete $self->{template}); 1635 $layout->set_text (delete $self->{template});
1636 $self->{template} = $layout; 1636 $self->{template} = $layout;
1637 } 1637 }
1638 1638
1639 if (exists $self->{markup}) { 1639 if (exists $self->{markup}) {
… …
1777 }; 1777 };
1778 1778
1779 my $w = List::Util::min $self->{w} + 4, $size->[0]; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1780 my $h = List::Util::min $self->{h} + 2, $size->[1]; 1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1781 1781
1782 $self->{layout}->render ($self->{ox}, $self->{oy}); 1782 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783} 1783}
1784 1784
1785############################################################################# 1785#############################################################################
1786 1786
1787package CFClient::UI::EntryBase; 1787package CFPlus::UI::EntryBase;
1788 1788
1789our @ISA = CFClient::UI::Label::; 1789our @ISA = CFPlus::UI::Label::;
1790 1790
1791use CFClient::OpenGL; 1791use CFPlus::OpenGL;
1792 1792
1793sub new { 1793sub new {
1794 my $class = shift; 1794 my $class = shift;
1795 1795
1796 $class->SUPER::new ( 1796 $class->SUPER::new (
… …
1858 1858
1859 if ($uni == 8) { 1859 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 1861 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 1862 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFClient::SDLK_LEFT) { 1863 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 1864 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFClient::SDLK_RIGHT) { 1865 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1866 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFPlus::SDLK_HOME) {
1868 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1869 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFPlus::SDLK_END) {
1870 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 1871 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 1872 $self->emit ('escape');
1873 } elsif ($uni) { 1873 } elsif ($uni) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
… …
1948 utf8::encode $text; 1948 utf8::encode $text;
1949 1949
1950 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 1950 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1951 } 1951 }
1952 1952
1953 glColor @{$self->{fg}};
1954 glBegin GL_LINES; 1953 glBegin GL_LINES;
1955 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 1954 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1955 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957 glEnd; 1956 glEnd;
1958 } 1957 }
1959} 1958}
1960 1959
1961package CFClient::UI::Entry; 1960package CFPlus::UI::Entry;
1962 1961
1963our @ISA = CFClient::UI::EntryBase::; 1962our @ISA = CFPlus::UI::EntryBase::;
1964 1963
1965use CFClient::OpenGL; 1964use CFPlus::OpenGL;
1966 1965
1967sub invoke_key_down { 1966sub invoke_key_down {
1968 my ($self, $ev) = @_; 1967 my ($self, $ev) = @_;
1969 1968
1970 my $sym = $ev->{sym}; 1969 my $sym = $ev->{sym};
… …
1976 $self->{history_pointer} = -1; 1975 $self->{history_pointer} = -1;
1977 $self->{history_saveback} = ''; 1976 $self->{history_saveback} = '';
1978 $self->emit (activate => $txt); 1977 $self->emit (activate => $txt);
1979 $self->update; 1978 $self->update;
1980 1979
1981 } elsif ($sym == CFClient::SDLK_UP) { 1980 } elsif ($sym == CFPlus::SDLK_UP) {
1982 if ($self->{history_pointer} < 0) { 1981 if ($self->{history_pointer} < 0) {
1983 $self->{history_saveback} = $self->get_text; 1982 $self->{history_saveback} = $self->get_text;
1984 } 1983 }
1985 if (@{$self->{history} || []} > 0) { 1984 if (@{$self->{history} || []} > 0) {
1986 $self->{history_pointer}++; 1985 $self->{history_pointer}++;
… …
1988 $self->{history_pointer} = @{$self->{history} || []} - 1; 1987 $self->{history_pointer} = @{$self->{history} || []} - 1;
1989 } 1988 }
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1989 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1991 } 1990 }
1992 1991
1993 } elsif ($sym == CFClient::SDLK_DOWN) { 1992 } elsif ($sym == CFPlus::SDLK_DOWN) {
1994 $self->{history_pointer}--; 1993 $self->{history_pointer}--;
1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1994 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1996 1995
1997 if ($self->{history_pointer} >= 0) { 1996 if ($self->{history_pointer} >= 0) {
1998 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1997 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
2007 1 2006 1
2008} 2007}
2009 2008
2010############################################################################# 2009#############################################################################
2011 2010
2012package CFClient::UI::Button; 2011package CFPlus::UI::Button;
2013 2012
2014our @ISA = CFClient::UI::Label::; 2013our @ISA = CFPlus::UI::Label::;
2015 2014
2016use CFClient::OpenGL; 2015use CFPlus::OpenGL;
2017 2016
2018my @tex = 2017my @tex =
2019 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2018 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020 qw(b1_button_active.png); 2019 qw(b1_button_active.png);
2021 2020
2022sub new { 2021sub new {
2023 my $class = shift; 2022 my $class = shift;
2024 2023
… …
2061 $self->SUPER::_draw; 2060 $self->SUPER::_draw;
2062} 2061}
2063 2062
2064############################################################################# 2063#############################################################################
2065 2064
2066package CFClient::UI::CheckBox; 2065package CFPlus::UI::CheckBox;
2067 2066
2068our @ISA = CFClient::UI::DrawBG::; 2067our @ISA = CFPlus::UI::DrawBG::;
2069 2068
2070my @tex = 2069my @tex =
2071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2070 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2071 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073 2072
2074use CFClient::OpenGL; 2073use CFPlus::OpenGL;
2075 2074
2076sub new { 2075sub new {
2077 my $class = shift; 2076 my $class = shift;
2078 2077
2079 $class->SUPER::new ( 2078 $class->SUPER::new (
… …
2136 glDisable GL_TEXTURE_2D; 2135 glDisable GL_TEXTURE_2D;
2137} 2136}
2138 2137
2139############################################################################# 2138#############################################################################
2140 2139
2141package CFClient::UI::Image; 2140package CFPlus::UI::Image;
2142 2141
2143our @ISA = CFClient::UI::Base::; 2142our @ISA = CFPlus::UI::Base::;
2144 2143
2145use CFClient::OpenGL; 2144use CFPlus::OpenGL;
2146 2145
2147our %texture_cache; 2146our %texture_cache;
2148 2147
2149sub new { 2148sub new {
2150 my $class = shift; 2149 my $class = shift;
… …
2156 2155
2157 $self->{path} || $self->{tex} 2156 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required"; 2157 or Carp::croak "'path' or 'tex' attributes required";
2159 2158
2160 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2159 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2161 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2160 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162 2161
2163 Scalar::Util::weaken $texture_cache{$self->{path}}; 2162 Scalar::Util::weaken $texture_cache{$self->{path}};
2164 2163
2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2164 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166 2165
… …
2169 2168
2170sub STORABLE_freeze { 2169sub STORABLE_freeze {
2171 my ($self, $cloning) = @_; 2170 my ($self, $cloning) = @_;
2172 2171
2173 $self->{path} 2172 $self->{path}
2174 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2173 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175 2174
2176 $self->{path} 2175 $self->{path}
2177} 2176}
2178 2177
2179sub STORABLE_attach { 2178sub STORABLE_attach {
… …
2210 glDisable GL_TEXTURE_2D; 2209 glDisable GL_TEXTURE_2D;
2211} 2210}
2212 2211
2213############################################################################# 2212#############################################################################
2214 2213
2215package CFClient::UI::ImageButton; 2214package CFPlus::UI::ImageButton;
2216 2215
2217our @ISA = CFClient::UI::Image::; 2216our @ISA = CFPlus::UI::Image::;
2218 2217
2219use CFClient::OpenGL; 2218use CFPlus::OpenGL;
2220 2219
2221my %textures; 2220my %textures;
2222 2221
2223sub new { 2222sub new {
2224 my $class = shift; 2223 my $class = shift;
… …
2246 1 2245 1
2247} 2246}
2248 2247
2249############################################################################# 2248#############################################################################
2250 2249
2251package CFClient::UI::VGauge; 2250package CFPlus::UI::VGauge;
2252 2251
2253our @ISA = CFClient::UI::Base::; 2252our @ISA = CFPlus::UI::Base::;
2254 2253
2255use List::Util qw(min max); 2254use List::Util qw(min max);
2256 2255
2257use CFClient::OpenGL; 2256use CFPlus::OpenGL;
2258 2257
2259my %tex = ( 2258my %tex = (
2260 food => [ 2259 food => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2260 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2261 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2263 ], 2262 ],
2264 grace => [ 2263 grace => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2264 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2265 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2267 ], 2266 ],
2268 hp => [ 2267 hp => [
2269 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2268 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2269 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2271 ], 2270 ],
2272 mana => [ 2271 mana => [
2273 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2272 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2274 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2273 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2275 ], 2274 ],
2276); 2275);
2277 2276
2278# eg. VGauge->new (gauge => 'food'), default gauge: food 2277# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2381 glDisable GL_TEXTURE_2D; 2380 glDisable GL_TEXTURE_2D;
2382} 2381}
2383 2382
2384############################################################################# 2383#############################################################################
2385 2384
2386package CFClient::UI::Gauge; 2385package CFPlus::UI::Gauge;
2387 2386
2388our @ISA = CFClient::UI::VBox::; 2387our @ISA = CFPlus::UI::VBox::;
2389 2388
2390sub new { 2389sub new {
2391 my ($class, %arg) = @_; 2390 my ($class, %arg) = @_;
2392 2391
2393 my $self = $class->SUPER::new ( 2392 my $self = $class->SUPER::new (
… …
2395 can_hover => 1, 2394 can_hover => 1,
2396 can_events => 1, 2395 can_events => 1,
2397 %arg, 2396 %arg,
2398 ); 2397 );
2399 2398
2400 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2399 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2401 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2400 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2402 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2401 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2403 2402
2404 $self 2403 $self
2405} 2404}
2406 2405
2407sub set_fontsize { 2406sub set_fontsize {
… …
2428 $self->{value}->set_text ($val); 2427 $self->{value}->set_text ($val);
2429} 2428}
2430 2429
2431############################################################################# 2430#############################################################################
2432 2431
2433package CFClient::UI::Slider; 2432package CFPlus::UI::Slider;
2434 2433
2435use strict; 2434use strict;
2436 2435
2437use CFClient::OpenGL; 2436use CFPlus::OpenGL;
2438 2437
2439our @ISA = CFClient::UI::DrawBG::; 2438our @ISA = CFPlus::UI::DrawBG::;
2440 2439
2441my @tex = 2440my @tex =
2442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2441 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2443 qw(s1_slider.png s1_slider_bg.png); 2442 qw(s1_slider.png s1_slider_bg.png);
2444 2443
2445sub new { 2444sub new {
2446 my $class = shift; 2445 my $class = shift;
2447 2446
… …
2602 glDisable GL_TEXTURE_2D; 2601 glDisable GL_TEXTURE_2D;
2603} 2602}
2604 2603
2605############################################################################# 2604#############################################################################
2606 2605
2607package CFClient::UI::ValSlider; 2606package CFPlus::UI::ValSlider;
2608 2607
2609our @ISA = CFClient::UI::HBox::; 2608our @ISA = CFPlus::UI::HBox::;
2610 2609
2611sub new { 2610sub new {
2612 my ($class, %arg) = @_; 2611 my ($class, %arg) = @_;
2613 2612
2614 my $range = delete $arg{range}; 2613 my $range = delete $arg{range};
2615 2614
2616 my $self = $class->SUPER::new ( 2615 my $self = $class->SUPER::new (
2617 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2616 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2618 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2617 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2619 to_value => sub { shift }, 2618 to_value => sub { shift },
2620 from_value => sub { shift }, 2619 from_value => sub { shift },
2621 %arg, 2620 %arg,
2622 ); 2621 );
2623 2622
… …
2643sub set_range { shift->{slider}->set_range (@_) } 2642sub set_range { shift->{slider}->set_range (@_) }
2644sub set_value { shift->{slider}->set_value (@_) } 2643sub set_value { shift->{slider}->set_value (@_) }
2645 2644
2646############################################################################# 2645#############################################################################
2647 2646
2648package CFClient::UI::TextScroller; 2647package CFPlus::UI::TextScroller;
2649 2648
2650our @ISA = CFClient::UI::HBox::; 2649our @ISA = CFPlus::UI::HBox::;
2651 2650
2652use CFClient::OpenGL; 2651use CFPlus::OpenGL;
2653 2652
2654sub new { 2653sub new {
2655 my $class = shift; 2654 my $class = shift;
2656 2655
2657 my $self = $class->SUPER::new ( 2656 my $self = $class->SUPER::new (
… …
2659 can_events => 1, 2658 can_events => 1,
2660 indent => 0, 2659 indent => 0,
2661 #font => default_font 2660 #font => default_font
2662 @_, 2661 @_,
2663 2662
2664 layout => (new CFClient::Layout), 2663 layout => (new CFPlus::Layout),
2665 par => [], 2664 par => [],
2666 height => 0, 2665 height => 0,
2667 children => [ 2666 children => [
2668 (new CFClient::UI::Empty expand => 1), 2667 (new CFPlus::UI::Empty expand => 1),
2669 (new CFClient::UI::Slider vertical => 1), 2668 (new CFPlus::UI::Slider vertical => 1),
2670 ], 2669 ],
2671 ); 2670 );
2672 2671
2673 $self->{children}[1]->connect (changed => sub { $self->update }); 2672 $self->{children}[1]->connect (changed => sub { $self->update });
2674 2673
… …
2830 2829
2831 if (delete $self->{scroll_to_bottom}) { 2830 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10); 2831 $self->{children}[1]->set_value (1e10);
2833 } 2832 }
2834 2833
2835 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2834 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836 glClearColor 0, 0, 0, 0; 2835 glClearColor 0, 0, 0, 0;
2837 glClear GL_COLOR_BUFFER_BIT; 2836 glClear GL_COLOR_BUFFER_BIT;
2838 2837
2839 my $top = int $self->{children}[1]{range}[0]; 2838 my $top = int $self->{children}[1]{range}[0];
2840 2839
… …
2893 $self->{children}[1]->draw; 2892 $self->{children}[1]->draw;
2894} 2893}
2895 2894
2896############################################################################# 2895#############################################################################
2897 2896
2898package CFClient::UI::Animator; 2897package CFPlus::UI::Animator;
2899 2898
2900use CFClient::OpenGL; 2899use CFPlus::OpenGL;
2901 2900
2902our @ISA = CFClient::UI::Bin::; 2901our @ISA = CFPlus::UI::Bin::;
2903 2902
2904sub moveto { 2903sub moveto {
2905 my ($self, $x, $y) = @_; 2904 my ($self, $x, $y) = @_;
2906 2905
2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2906 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2935 glPopMatrix; 2934 glPopMatrix;
2936} 2935}
2937 2936
2938############################################################################# 2937#############################################################################
2939 2938
2940package CFClient::UI::Flopper; 2939package CFPlus::UI::Flopper;
2941 2940
2942our @ISA = CFClient::UI::Button::; 2941our @ISA = CFPlus::UI::Button::;
2943 2942
2944sub new { 2943sub new {
2945 my $class = shift; 2944 my $class = shift;
2946 2945
2947 my $self = $class->SUPER::new ( 2946 my $self = $class->SUPER::new (
… …
2959 $self->{other}->toggle_visibility; 2958 $self->{other}->toggle_visibility;
2960} 2959}
2961 2960
2962############################################################################# 2961#############################################################################
2963 2962
2964package CFClient::UI::Tooltip; 2963package CFPlus::UI::Tooltip;
2965 2964
2966our @ISA = CFClient::UI::Bin::; 2965our @ISA = CFPlus::UI::Bin::;
2967 2966
2968use CFClient::OpenGL; 2967use CFPlus::OpenGL;
2969 2968
2970sub new { 2969sub new {
2971 my $class = shift; 2970 my $class = shift;
2972 2971
2973 $class->SUPER::new ( 2972 $class->SUPER::new (
… …
2976 ) 2975 )
2977} 2976}
2978 2977
2979sub set_tooltip_from { 2978sub set_tooltip_from {
2980 my ($self, $widget) = @_; 2979 my ($self, $widget) = @_;
2980
2981 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2982 if $widget->{tooltip} =~ /^#(.*)$/;
2981 2983
2982 my $tooltip = $widget->{tooltip}; 2984 my $tooltip = $widget->{tooltip};
2983 2985
2984 if ($ENV{CFPLUS_DEBUG} & 2) { 2986 if ($ENV{CFPLUS_DEBUG} & 2) {
2985 $tooltip .= "\n\n" . (ref $widget) . "\n" 2987 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2989 } 2991 }
2990 2992
2991 $tooltip =~ s/^\n+//; 2993 $tooltip =~ s/^\n+//;
2992 $tooltip =~ s/\n+$//; 2994 $tooltip =~ s/\n+$//;
2993 2995
2994 $self->add (new CFClient::UI::Label 2996 $self->add (new CFPlus::UI::Label
2995 markup => $tooltip, 2997 markup => $tooltip,
2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2998 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997 fontsize => 0.8, 2999 fontsize => 0.8,
2998 fg => [0, 0, 0, 1], 3000 style => 1, # FLAG_INVERSE
2999 ellipsise => 0, 3001 ellipsise => 0,
3000 font => ($widget->{tooltip_font} || $::FONT_PROP), 3002 font => ($widget->{tooltip_font} || $::FONT_PROP),
3001 ); 3003 );
3002} 3004}
3003 3005
… …
3065 $self->SUPER::_draw; 3067 $self->SUPER::_draw;
3066} 3068}
3067 3069
3068############################################################################# 3070#############################################################################
3069 3071
3070package CFClient::UI::Face; 3072package CFPlus::UI::Face;
3071 3073
3072our @ISA = CFClient::UI::DrawBG::; 3074our @ISA = CFPlus::UI::DrawBG::;
3073 3075
3074use CFClient::OpenGL; 3076use CFPlus::OpenGL;
3075 3077
3076sub new { 3078sub new {
3077 my $class = shift; 3079 my $class = shift;
3078 3080
3079 my $self = $class->SUPER::new ( 3081 my $self = $class->SUPER::new (
… …
3147 $self->SUPER::destroy; 3149 $self->SUPER::destroy;
3148} 3150}
3149 3151
3150############################################################################# 3152#############################################################################
3151 3153
3152package CFClient::UI::Buttonbar; 3154package CFPlus::UI::Buttonbar;
3153 3155
3154our @ISA = CFClient::UI::HBox::; 3156our @ISA = CFPlus::UI::HBox::;
3155 3157
3156# TODO: should actualyl wrap buttons and other goodies. 3158# TODO: should actualyl wrap buttons and other goodies.
3157 3159
3158############################################################################# 3160#############################################################################
3159 3161
3160package CFClient::UI::Menu; 3162package CFPlus::UI::Menu;
3161 3163
3162our @ISA = CFClient::UI::FancyFrame::; 3164our @ISA = CFPlus::UI::FancyFrame::;
3163 3165
3164use CFClient::OpenGL; 3166use CFPlus::OpenGL;
3165 3167
3166sub new { 3168sub new {
3167 my $class = shift; 3169 my $class = shift;
3168 3170
3169 my $self = $class->SUPER::new ( 3171 my $self = $class->SUPER::new (
3170 items => [], 3172 items => [],
3171 z => 100, 3173 z => 100,
3172 @_, 3174 @_,
3173 ); 3175 );
3174 3176
3175 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3177 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3176 3178
3177 for my $item (@{ $self->{items} }) { 3179 for my $item (@{ $self->{items} }) {
3178 my ($widget, $cb, $tooltip) = @$item; 3180 my ($widget, $cb, $tooltip) = @$item;
3179 3181
3180 # handle various types of items, only text for now 3182 # handle various types of items, only text for now
3181 if (!ref $widget) { 3183 if (!ref $widget) {
3182 if ($widget =~ /\t/) { 3184 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2; 3185 my ($left, $right) = split /\t/, $widget, 2;
3184 3186
3185 $widget = new CFClient::UI::HBox 3187 $widget = new CFPlus::UI::HBox
3186 can_hover => 1, 3188 can_hover => 1,
3187 can_events => 1, 3189 can_events => 1,
3188 tooltip => $tooltip, 3190 tooltip => $tooltip,
3189 children => [ 3191 children => [
3190 (new CFClient::UI::Label markup => $left, expand => 1), 3192 (new CFPlus::UI::Label markup => $left, expand => 1),
3191 (new CFClient::UI::Label markup => $right, align => +1), 3193 (new CFPlus::UI::Label markup => $right, align => +1),
3192 ], 3194 ],
3193 ; 3195 ;
3194 3196
3195 } else { 3197 } else {
3196 $widget = new CFClient::UI::Label 3198 $widget = new CFPlus::UI::Label
3197 can_hover => 1, 3199 can_hover => 1,
3198 can_events => 1, 3200 can_events => 1,
3199 markup => $widget, 3201 markup => $widget,
3200 tooltip => $tooltip; 3202 tooltip => $tooltip;
3201 } 3203 }
… …
3249 1 3251 1
3250} 3252}
3251 3253
3252############################################################################# 3254#############################################################################
3253 3255
3254package CFClient::UI::Multiplexer; 3256package CFPlus::UI::Multiplexer;
3255 3257
3256our @ISA = CFClient::UI::Container::; 3258our @ISA = CFPlus::UI::Container::;
3257 3259
3258sub new { 3260sub new {
3259 my $class = shift; 3261 my $class = shift;
3260 3262
3261 my $self = $class->SUPER::new ( 3263 my $self = $class->SUPER::new (
… …
3322 $self->{current}->draw; 3324 $self->{current}->draw;
3323} 3325}
3324 3326
3325############################################################################# 3327#############################################################################
3326 3328
3327package CFClient::UI::Notebook; 3329package CFPlus::UI::Notebook;
3328 3330
3329our @ISA = CFClient::UI::VBox::; 3331our @ISA = CFPlus::UI::VBox::;
3330 3332
3331sub new { 3333sub new {
3332 my $class = shift; 3334 my $class = shift;
3333 3335
3334 my $self = $class->SUPER::new ( 3336 my $self = $class->SUPER::new (
3335 buttonbar => (new CFClient::UI::Buttonbar), 3337 buttonbar => (new CFPlus::UI::Buttonbar),
3336 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3338 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3337 # filter => # will be put between multiplexer and $self 3339 # filter => # will be put between multiplexer and $self
3338 @_, 3340 @_,
3339 ); 3341 );
3340 3342
3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3343 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3347sub add { 3349sub add {
3348 my ($self, $title, $widget, $tooltip) = @_; 3350 my ($self, $title, $widget, $tooltip) = @_;
3349 3351
3350 Scalar::Util::weaken $self; 3352 Scalar::Util::weaken $self;
3351 3353
3352 $self->{buttonbar}->add (new CFClient::UI::Button 3354 $self->{buttonbar}->add (new CFPlus::UI::Button
3353 markup => $title, 3355 markup => $title,
3354 tooltip => $tooltip, 3356 tooltip => $tooltip,
3355 on_activate => sub { $self->set_current_page ($widget) }, 3357 on_activate => sub { $self->set_current_page ($widget) },
3356 ); 3358 );
3357 3359
… …
3371 $self->emit (page_changed => $self->{multiplexer}{current}); 3373 $self->emit (page_changed => $self->{multiplexer}{current});
3372} 3374}
3373 3375
3374############################################################################# 3376#############################################################################
3375 3377
3376package CFClient::UI::Selector; 3378package CFPlus::UI::Selector;
3377 3379
3378use utf8; 3380use utf8;
3379 3381
3380our @ISA = CFClient::UI::Button::; 3382our @ISA = CFPlus::UI::Button::;
3381 3383
3382sub new { 3384sub new {
3383 my $class = shift; 3385 my $class = shift;
3384 3386
3385 my $self = $class->SUPER::new ( 3387 my $self = $class->SUPER::new (
… …
3402 my ($value, $title, $tooltip) = @$_; 3404 my ($value, $title, $tooltip) = @$_;
3403 3405
3404 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3406 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405 } 3407 }
3406 3408
3407 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3409 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408} 3410}
3409 3411
3410sub _set_value { 3412sub _set_value {
3411 my ($self, $value) = @_; 3413 my ($self, $value) = @_;
3412 3414
… …
3427 $self->emit (changed => $value); 3429 $self->emit (changed => $value);
3428} 3430}
3429 3431
3430############################################################################# 3432#############################################################################
3431 3433
3432package CFClient::UI::Statusbox; 3434package CFPlus::UI::Statusbox;
3433 3435
3434our @ISA = CFClient::UI::VBox::; 3436our @ISA = CFPlus::UI::VBox::;
3435 3437
3436sub new { 3438sub new {
3437 my $class = shift; 3439 my $class = shift;
3438 3440
3439 my $self = $class->SUPER::new ( 3441 my $self = $class->SUPER::new (
… …
3451sub reorder { 3453sub reorder {
3452 my ($self) = @_; 3454 my ($self) = @_;
3453 my $NOW = Time::HiRes::time; 3455 my $NOW = Time::HiRes::time;
3454 3456
3455 # freeze display when hovering over any label 3457 # freeze display when hovering over any label
3456 return if $CFClient::UI::TOOLTIP->{owner} 3458 return if $CFPlus::UI::TOOLTIP->{owner}
3457 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3459 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458 values %{ $self->{item} }; 3460 values %{ $self->{item} };
3459 3461
3460 while (my ($k, $v) = each %{ $self->{item} }) { 3462 while (my ($k, $v) = each %{ $self->{item} }) {
3461 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3463 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3462 } 3464 }
… …
3483 for ($short) { 3485 for ($short) {
3484 s/^\s+//; 3486 s/^\s+//;
3485 s/\s+/ /g; 3487 s/\s+/ /g;
3486 } 3488 }
3487 3489
3488 new CFClient::UI::Label 3490 new CFPlus::UI::Label
3489 markup => $short, 3491 markup => $short,
3490 tooltip => $item->{tooltip}, 3492 tooltip => $item->{tooltip},
3491 tooltip_font => $::FONT_PROP, 3493 tooltip_font => $::FONT_PROP,
3492 tooltip_width => 0.67, 3494 tooltip_width => 0.67,
3493 fontsize => $item->{fontsize} || $self->{fontsize}, 3495 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3572 $self->SUPER::destroy; 3574 $self->SUPER::destroy;
3573} 3575}
3574 3576
3575############################################################################# 3577#############################################################################
3576 3578
3577package CFClient::UI::Inventory; 3579package CFPlus::UI::Inventory;
3578 3580
3579our @ISA = CFClient::UI::Table::; 3581our @ISA = CFPlus::UI::Table::;
3580 3582
3581sub new { 3583sub new {
3582 my $class = shift; 3584 my $class = shift;
3583 3585
3584 my $self = $class->SUPER::new ( 3586 my $self = $class->SUPER::new (
… …
3600 my @item = $self->{sort}->(@{ $self->{items} }); 3602 my @item = $self->{sort}->(@{ $self->{items} });
3601 3603
3602 my @adds; 3604 my @adds;
3603 my $row = 0; 3605 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) { 3606 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFClient::Item::update_widgets $item; 3607 CFPlus::Item::update_widgets $item;
3606 3608
3607 push @adds, 0, $row, $item->{face_widget}; 3609 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget}; 3610 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget}; 3611 push @adds, 2, $row, $item->{weight_widget};
3610 3612
… …
3634 $self->update_items; 3636 $self->update_items;
3635} 3637}
3636 3638
3637############################################################################# 3639#############################################################################
3638 3640
3639package CFClient::UI::SpellList; 3641package CFPlus::UI::SpellList;
3640 3642
3641our @ISA = CFClient::UI::Table::; 3643our @ISA = CFPlus::UI::Table::;
3642 3644
3643sub new { 3645sub new {
3644 my $class = shift; 3646 my $class = shift;
3645 3647
3646 my $self = $class->SUPER::new ( 3648 my $self = $class->SUPER::new (
… …
3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); 3666 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665 3667
3666sub rebuild_spell_list { 3668sub rebuild_spell_list {
3667 my ($self) = @_; 3669 my ($self) = @_;
3668 3670
3669 $CFClient::UI::ROOT->on_refresh ($self => sub { 3671 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3670 $self->clear; 3672 $self->clear;
3671 3673
3672 return unless $::CONN; 3674 return unless $::CONN;
3673 3675
3674 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); 3676 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); 3677 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3678 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3679 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3680 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679 3681
3680 my $row = 0; 3682 my $row = 0;
3681 3683
3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3684 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683 my $spell = $self->{spell}{$_}; 3685 my $spell = $self->{spell}{$_};
… …
3690 if ($ev->{button} == 1) { 3692 if ($ev->{button} == 1) {
3691 $::CONN->user_send ("cast $spell->{name}"); 3693 $::CONN->user_send ("cast $spell->{name}");
3692 } elsif ($ev->{button} == 2) { 3694 } elsif ($ev->{button} == 2) {
3693 $::CONN->user_send ("invoke $spell->{name}"); 3695 $::CONN->user_send ("invoke $spell->{name}");
3694 } elsif ($ev->{button} == 3) { 3696 } elsif ($ev->{button} == 3) {
3695 (new CFClient::UI::Menu 3697 (new CFPlus::UI::Menu
3696 items => [ 3698 items => [
3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3699 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3700 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699 ], 3701 ],
3700 )->popup ($ev); 3702 )->popup ($ev);
… …
3706 }; 3708 };
3707 3709
3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL"; 3710 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709 3711
3710 #TODO: add path info to tooltip 3712 #TODO: add path info to tooltip
3711 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); 3713 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3712 3714
3713 $self->add (0, $row, new CFClient::UI::Face 3715 $self->add (0, $row, new CFPlus::UI::Face
3714 face => $spell->{face}, 3716 face => $spell->{face},
3715 can_hover => 1, 3717 can_hover => 1,
3716 can_events => 1, 3718 can_events => 1,
3717 tooltip => $tooltip, 3719 tooltip => $tooltip,
3718 on_button_down => $spell_cb, 3720 on_button_down => $spell_cb,
3719 ); 3721 );
3720 3722
3721 $self->add (1, $row, new CFClient::UI::Label 3723 $self->add (1, $row, new CFPlus::UI::Label
3722 expand => 1, 3724 expand => 1,
3723 text => $spell->{name}, 3725 text => $spell->{name},
3724 can_hover => 1, 3726 can_hover => 1,
3725 can_events => 1, 3727 can_events => 1,
3726 tooltip => $tooltip, 3728 tooltip => $tooltip,
3727 on_button_down => $spell_cb, 3729 on_button_down => $spell_cb,
3728 ); 3730 );
3729 3731
3730 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); 3732 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3733 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3734 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3735 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734 } 3736 }
3735 }); 3737 });
3736} 3738}
3737 3739
3738sub add_spell { 3740sub add_spell {
… …
3756 $self->rebuild_spell_list; 3758 $self->rebuild_spell_list;
3757} 3759}
3758 3760
3759############################################################################# 3761#############################################################################
3760 3762
3761package CFClient::UI::Root; 3763package CFPlus::UI::Root;
3762 3764
3763our @ISA = CFClient::UI::Container::; 3765our @ISA = CFPlus::UI::Container::;
3764 3766
3765use List::Util qw(min max); 3767use List::Util qw(min max);
3766 3768
3767use CFClient::OpenGL; 3769use CFPlus::OpenGL;
3768 3770
3769sub new { 3771sub new {
3770 my $class = shift; 3772 my $class = shift;
3771 3773
3772 my $self = $class->SUPER::new ( 3774 my $self = $class->SUPER::new (
… …
3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3991 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3990 glMatrixMode GL_MODELVIEW; 3992 glMatrixMode GL_MODELVIEW;
3991 glLoadIdentity; 3993 glLoadIdentity;
3992 3994
3993 { 3995 {
3994 package CFClient::UI::Base; 3996 package CFPlus::UI::Base;
3995 3997
3996 ($draw_x, $draw_y, $draw_w, $draw_h) = 3998 ($draw_x, $draw_y, $draw_w, $draw_h) =
3997 (0, 0, $self->{w}, $self->{h}); 3999 (0, 0, $self->{w}, $self->{h});
3998 } 4000 }
3999 4001
4000 $self->_draw; 4002 $self->_draw;
4001} 4003}
4002 4004
4003############################################################################# 4005#############################################################################
4004 4006
4005package CFClient::UI; 4007package CFPlus::UI;
4006 4008
4007$ROOT = new CFClient::UI::Root; 4009$ROOT = new CFPlus::UI::Root;
4008$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4010$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4009 4011
40101 40121
4011 4013

Diff Legend

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