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.387 by root, Fri Jul 20 18:19:45 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
207 reconfigure_widgets; 210 reconfigure_widgets;
208} 211}
209 212
210############################################################################# 213#############################################################################
211 214
212package CFClient::UI::Event; 215package CFPlus::UI::Event;
213 216
214sub xy { 217sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216} 219}
217 220
218############################################################################# 221#############################################################################
219 222
220package CFClient::UI::Base; 223package CFPlus::UI::Base;
221 224
222use strict; 225use strict;
223 226
224use CFClient::OpenGL; 227use CFPlus::OpenGL;
225 228
226sub new { 229sub new {
227 my $class = shift; 230 my $class = shift;
228 231
229 my $self = bless { 232 my $self = bless {
… …
234 h => undef, 237 h => undef,
235 can_events => 1, 238 can_events => 1,
236 @_ 239 @_
237 }, $class; 240 }, $class;
238 241
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240 243
241 for (keys %$self) { 244 for (keys %$self) {
242 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
244 } 247 }
245 } 248 }
246 249
247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $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}; 252 $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}; 253 $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}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252 255
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255 258
256 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
261 264
262sub destroy { 265sub destroy {
263 my ($self) = @_; 266 my ($self) = @_;
264 267
265 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
266 %$self = (); 270 %$self = ();
267} 271}
268 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
269sub show { 277sub show {
270 my ($self) = @_; 278 my ($self) = @_;
271 279
272 return if $self->{parent}; 280 return if $self->{parent};
273 281
274 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
275} 283}
276 284
277sub set_visible { 285sub set_visible {
278 my ($self) = @_; 286 my ($self) = @_;
279 287
… …
300 delete $self->{root}; 308 delete $self->{root};
301 309
302 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
303 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
304 312
305 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
306 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
307 315
308 $self->emit ("focus_out"); 316 $self->emit ("focus_out");
309 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
310} 318}
… …
312sub set_visibility { 320sub set_visibility {
313 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
314 322
315 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
316 324
317 $visible ? $self->hide 325 $visible ? $self->show
318 : $self->show; 326 : $self->hide;
319} 327}
320 328
321sub toggle_visibility { 329sub toggle_visibility {
322 my ($self) = @_; 330 my ($self) = @_;
323 331
… …
367 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
368 376
369 if ($self->{aspect}) { 377 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
371 379
372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374 382
375 # use alignment to adjust x, y 383 # use alignment to adjust x, y
376 384
377 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
378 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
419 427
420 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
421 429
422 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
423 431
424 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
426 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
427 } 435 }
428} 436}
429 437
430# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
431sub coord2local { 439sub coord2local {
… …
497sub connect { 505sub connect {
498 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
499 507
500 push @{ $self->{signal_cb}{$signal} }, $cb; 508 push @{ $self->{signal_cb}{$signal} }, $cb;
501 509
502 defined wantarray and CFClient::guard { 510 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} }; 512 @{ $self->{signal_cb}{$signal} };
505 } 513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
506} 520}
507 521
508my %has_coords = ( 522my %has_coords = (
509 button_down => 1, 523 button_down => 1,
510 button_up => 1, 524 button_up => 1,
… …
513); 527);
514 528
515sub emit { 529sub emit {
516 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
517 531
518 # I do not really like this solution, but I dislike duplication 532 # I do not really like this solution, but I do not like duplication
519 # and needlessly verbose code, too. 533 # and needlessly verbose code, either.
520 my @append 534 my @append
521 = $has_coords{$signal} 535 = $has_coords{$signal}
522 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
523 : (); 537 : ();
524 538
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526 540
527 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
531} 550}
532 551
533sub find_widget { 552#sub find_widget {
534 my ($self, $x, $y) = @_; 553# in .xs
535
536 return () unless $self->{can_events};
537
538 return $self
539 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
540 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
541
542 ()
543}
544 554
545sub set_parent { 555sub set_parent {
546 my ($self, $parent) = @_; 556 my ($self, $parent) = @_;
547 557
548 Scalar::Util::weaken ($self->{parent} = $parent); 558 CFPlus::weaken ($self->{parent} = $parent);
549 $self->set_visible if $parent->{visible}; 559 $self->set_visible if $parent->{visible};
550} 560}
551 561
552sub realloc { 562sub realloc {
553 my ($self) = @_; 563 my ($self) = @_;
… …
619 glVertex $self->{w} - 1, 0; 629 glVertex $self->{w} - 1, 0;
620 glVertex $self->{w} - 1, $self->{h} - 1; 630 glVertex $self->{w} - 1, $self->{h} - 1;
621 glVertex 0 , $self->{h} - 1; 631 glVertex 0 , $self->{h} - 1;
622 glEnd; 632 glEnd;
623 glPopMatrix; 633 glPopMatrix;
624 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 634 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625 } 635 }
626 636
627 $self->_draw; 637 $self->_draw;
628 glPopMatrix; 638 glPopMatrix;
629} 639}
… …
632 my ($self) = @_; 642 my ($self) = @_;
633 643
634 warn "no draw defined for $self\n"; 644 warn "no draw defined for $self\n";
635} 645}
636 646
647my $cntx;#d#
637sub DESTROY { 648sub DESTROY {
638 my ($self) = @_; 649 my ($self) = @_;
639 650
640 return if CFClient::in_destruct; 651 return if CFPlus::in_destruct;
641
642 delete $WIDGET{$self+0};
643 652
644 eval { $self->destroy }; 653 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 654 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
655
656 delete $WIDGET{$self+0};
646} 657}
647 658
648############################################################################# 659#############################################################################
649 660
650package CFClient::UI::DrawBG; 661package CFPlus::UI::DrawBG;
651 662
652our @ISA = CFClient::UI::Base::; 663our @ISA = CFPlus::UI::Base::;
653 664
654use strict; 665use strict;
655use CFClient::OpenGL; 666use CFPlus::OpenGL;
656 667
657sub new { 668sub new {
658 my $class = shift; 669 my $class = shift;
659 670
660 # range [value, low, high, page] 671 # range [value, low, high, page]
… …
691 } 702 }
692} 703}
693 704
694############################################################################# 705#############################################################################
695 706
696package CFClient::UI::Empty; 707package CFPlus::UI::Empty;
697 708
698our @ISA = CFClient::UI::Base::; 709our @ISA = CFPlus::UI::Base::;
699 710
700sub new { 711sub new {
701 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
702 $class->SUPER::new (can_events => 0, %arg); 713 $class->SUPER::new (can_events => 0, %arg);
703} 714}
… …
710 721
711sub draw { } 722sub draw { }
712 723
713############################################################################# 724#############################################################################
714 725
715package CFClient::UI::Container; 726package CFPlus::UI::Container;
716 727
717our @ISA = CFClient::UI::Base::; 728our @ISA = CFPlus::UI::Base::;
718 729
719sub new { 730sub new {
720 my ($class, %arg) = @_; 731 my ($class, %arg) = @_;
721 732
722 my $children = delete $arg{children}; 733 my $children = delete $arg{children};
… …
808 $_->draw for @{$self->{children}}; 819 $_->draw for @{$self->{children}};
809} 820}
810 821
811############################################################################# 822#############################################################################
812 823
813package CFClient::UI::Bin; 824package CFPlus::UI::Bin;
814 825
815our @ISA = CFClient::UI::Container::; 826our @ISA = CFPlus::UI::Container::;
816 827
817sub new { 828sub new {
818 my ($class, %arg) = @_; 829 my ($class, %arg) = @_;
819 830
820 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 831 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821 832
822 $class->SUPER::new (children => [$child], %arg) 833 $class->SUPER::new (children => [$child], %arg)
823} 834}
824 835
825sub add { 836sub add {
… …
832sub remove { 843sub remove {
833 my ($self, $widget) = @_; 844 my ($self, $widget) = @_;
834 845
835 $self->SUPER::remove ($widget); 846 $self->SUPER::remove ($widget);
836 847
837 $self->{children} = [new CFClient::UI::Empty] 848 $self->{children} = [new CFPlus::UI::Empty]
838 unless @{$self->{children}}; 849 unless @{$self->{children}};
839} 850}
840 851
841sub child { $_[0]->{children}[0] } 852sub child { $_[0]->{children}[0] }
842 853
… …
854 865
855############################################################################# 866#############################################################################
856 867
857# back-buffered drawing area 868# back-buffered drawing area
858 869
859package CFClient::UI::Window; 870package CFPlus::UI::Window;
860 871
861our @ISA = CFClient::UI::Bin::; 872our @ISA = CFPlus::UI::Bin::;
862 873
863use CFClient::OpenGL; 874use CFPlus::OpenGL;
864 875
865sub new { 876sub new {
866 my ($class, %arg) = @_; 877 my ($class, %arg) = @_;
867 878
868 my $self = $class->SUPER::new (%arg); 879 my $self = $class->SUPER::new (%arg);
… …
890} 901}
891 902
892sub render_child { 903sub render_child {
893 my ($self) = @_; 904 my ($self) = @_;
894 905
895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 906 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896 glClearColor 0, 0, 0, 0; 907 glClearColor 0, 0, 0, 0;
897 glClear GL_COLOR_BUFFER_BIT; 908 glClear GL_COLOR_BUFFER_BIT;
898 909
899 { 910 {
900 package CFClient::UI::Base; 911 package CFPlus::UI::Base;
901 912
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 913 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 914 (0, 0, $self->{w}, $self->{h});
915
916 $self->_render;
904 } 917 }
905
906 $self->_render;
907 }; 918 };
908} 919}
909 920
910sub _draw { 921sub _draw {
911 my ($self) = @_; 922 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 923
915 my $tex = $self->{texture} 924 my $tex = $self->{texture}
916 or return; 925 or return;
917 926
918 glEnable GL_TEXTURE_2D; 927 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 928 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 929 glColor 0, 0, 0, 1;
921 930
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 931 $tex->draw_quad_alpha_premultiplied (0, 0);
923 932
924 glDisable GL_TEXTURE_2D; 933 glDisable GL_TEXTURE_2D;
925} 934}
926 935
927############################################################################# 936#############################################################################
928 937
929package CFClient::UI::ViewPort; 938package CFPlus::UI::ViewPort;
930 939
940use List::Util qw(min max);
941
931our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
932 943
933sub new { 944sub new {
934 my $class = shift; 945 my $class = shift;
935 946
936 $class->SUPER::new ( 947 $class->SUPER::new (
… …
966} 977}
967 978
968sub set_offset { 979sub set_offset {
969 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
970 981
982 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
983 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
984
985 if ($x != $self->{view_x} or $y != $self->{view_y}) {
971 $self->{view_x} = int $x; 986 $self->{view_x} = $x;
972 $self->{view_y} = int $y; 987 $self->{view_y} = $y;
973 988
989 $self->emit (changed => $x, $y);
974 $self->update; 990 $self->update;
991 }
975} 992}
976 993
977# hmm, this does not work for topleft of $self... but we should not ask for that 994# hmm, this does not work for topleft of $self... but we should not ask for that
978sub coord2local { 995sub coord2local {
979 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
… …
994 my ($self, $x, $y) = @_; 1011 my ($self, $x, $y) = @_;
995 1012
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 1015 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1016 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 1017 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 1018 $self->CFPlus::UI::Base::find_widget ($x, $y)
1002 } 1019 }
1003} 1020}
1004 1021
1005sub _render { 1022sub _render {
1006 my ($self) = @_; 1023 my ($self) = @_;
1007 1024
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1025 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}; 1026 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010 1027
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1028 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 1029
1013 $self->SUPER::_render; 1030 $self->SUPER::_render;
1014} 1031}
1015 1032
1016############################################################################# 1033#############################################################################
1017 1034
1018package CFClient::UI::ScrolledWindow; 1035package CFPlus::UI::ScrolledWindow;
1019 1036
1020our @ISA = CFClient::UI::HBox::; 1037our @ISA = CFPlus::UI::Table::;
1021 1038
1022sub new { 1039sub new {
1023 my ($class, %arg) = @_; 1040 my ($class, %arg) = @_;
1024 1041
1025 my $child = delete $arg{child}; 1042 my $child = delete $arg{child};
1026 1043
1027 my $self; 1044 my $self;
1028 1045
1029 my $slider = new CFClient::UI::Slider 1046 my $hslider = new CFPlus::UI::Slider
1047 vertical => 0,
1048 range => [0, 0, 1, 0.01], # HACK fix
1049 on_changed => sub {
1050 $self->{hpos} = $_[1];
1051 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 },
1053 ;
1054
1055 my $vslider = new CFPlus::UI::Slider
1030 vertical => 1, 1056 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1058 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1059 $self->{vpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1061 },
1035 ; 1062 ;
1036 1063
1037 $self = $class->SUPER::new ( 1064 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1065 scroll_x => 0,
1066 scroll_y => 1,
1039 can_events => 1, 1067 can_events => 1,
1040 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
1041 %arg, 1072 %arg,
1042 ); 1073 );
1043 1074
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1075 $self->{vp} = new CFPlus::UI::ViewPort
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 ;
1088
1089 $self->SUPER::add_at (0, 0, $self->{vp});
1090
1045 $self->add ($child) if $child; 1091 $self->add ($child) if $child;
1046 1092
1047 $self 1093 $self
1048} 1094}
1049 1095
… …
1053 my ($self, $widget) = @_; 1099 my ($self, $widget) = @_;
1054 1100
1055 $self->{vp}->add ($self->{child} = $widget); 1101 $self->{vp}->add ($self->{child} = $widget);
1056} 1102}
1057 1103
1104sub update_slider {
1105 my ($self) = @_;
1106
1107 my $child = ($self->{vp} or return)->child;
1108
1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider}{visible}) {
1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1115 : $self->{hslider}->hide;
1116 }
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1124 : $self->{vslider}->hide;
1125 }
1126}
1127
1128sub update {
1129 my ($self) = @_;
1130
1131 $self->update_slider;
1132 $self->SUPER::update;
1133}
1134
1058sub invoke_mouse_wheel { 1135sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1136 my ($self, $ev) = @_;
1060 1137
1061 return 0 unless $ev->{dy}; # only vertical movements 1138 return 0 unless $ev->{dy}; # only vertical movements for now
1062 1139
1063 $self->{slider}->emit (mouse_wheel => $ev); 1140 $self->{vslider}->emit (mouse_wheel => $ev);
1064 1141
1065 1 1142 1
1066} 1143}
1067 1144
1068sub update_slider { 1145sub invoke_button_down {
1069 my ($self) = @_; 1146 my ($self, $ev, $x, $y) = @_;
1070 1147
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1148 if ($ev->{button} == 2) {
1072} 1149 $self->grab_focus;
1073 1150
1074sub update { 1151 my $ox = $self->{vp}{view_x} + $ev->{x};
1075 my ($self) = @_; 1152 my $oy = $self->{vp}{view_y} + $ev->{y};
1153
1154 $self->{motion} = sub {
1155 my ($ev, $x, $y) = @_;
1076 1156
1077 $self->SUPER::update; 1157 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1158 $self->update;
1159 };
1078 1160
1079 $self->update_slider; 1161 return 1;
1162 }
1163
1164 0
1165}
1166
1167sub invoke_button_up {
1168 my ($self, $ev, $x, $y) = @_;
1169
1170 if (delete $self->{motion}) {
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if ($self->{motion}) {
1181 $self->{motion}->($ev, $x, $y);
1182 return 1;
1183 }
1184
1185 0
1080} 1186}
1081 1187
1082sub invoke_size_allocate { 1188sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1189 my ($self, $w, $h) = @_;
1084 1190
1085 $self->update_slider; 1191 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1192 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1193}
1089 1194
1090############################################################################# 1195#############################################################################
1091 1196
1092package CFClient::UI::Frame; 1197package CFPlus::UI::Frame;
1093 1198
1094our @ISA = CFClient::UI::Bin::; 1199our @ISA = CFPlus::UI::Bin::;
1095 1200
1096use CFClient::OpenGL; 1201use CFPlus::OpenGL;
1097 1202
1098sub new { 1203sub new {
1099 my $class = shift; 1204 my $class = shift;
1100 1205
1101 $class->SUPER::new ( 1206 $class->SUPER::new (
… …
1127 $self->SUPER::_draw; 1232 $self->SUPER::_draw;
1128} 1233}
1129 1234
1130############################################################################# 1235#############################################################################
1131 1236
1132package CFClient::UI::FancyFrame; 1237package CFPlus::UI::FancyFrame;
1133 1238
1134our @ISA = CFClient::UI::Bin::; 1239our @ISA = CFPlus::UI::Bin::;
1135 1240
1136use CFClient::OpenGL; 1241use CFPlus::OpenGL;
1242
1243sub new {
1244 my ($class, %arg) = @_;
1245
1246 if ((exists $arg{label}) && !ref $arg{label}) {
1247 $arg{label} = new CFPlus::UI::Label
1248 align => 1,
1249 valign => 0,
1250 text => $arg{label},
1251 fontsize => ($arg{border} || 0.8) * 0.75;
1252 }
1253
1254 my $self = $class->SUPER::new (
1255 # label => "",
1256 fg => [0.6, 0.3, 0.1],
1257 border => 0.8,
1258 style => 'single',
1259 %arg,
1260 );
1261
1262 $self
1263}
1264
1265sub add {
1266 my ($self, @widgets) = @_;
1267
1268 $self->SUPER::add (@widgets);
1269 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1270}
1271
1272sub border {
1273 int $_[0]{border} * $::FONTSIZE
1274}
1275
1276sub size_request {
1277 my ($self) = @_;
1278
1279 ($self->{label_w}, undef) = $self->{label}->size_request
1280 if $self->{label};
1281
1282 my ($w, $h) = $self->SUPER::size_request;
1283
1284 (
1285 $w + $self->border * 2,
1286 $h + $self->border * 2,
1287 )
1288}
1289
1290sub invoke_size_allocate {
1291 my ($self, $w, $h) = @_;
1292
1293 my $border = $self->border;
1294
1295 $w -= List::Util::max 0, $border * 2;
1296 $h -= List::Util::max 0, $border * 2;
1297
1298 if (my $label = $self->{label}) {
1299 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1300 $label->{h} = List::Util::min $h, $border;
1301 $label->invoke_size_allocate ($label->{w}, $label->{h});
1302 }
1303
1304 $self->child->configure ($border, $border, $w, $h);
1305
1306 1
1307}
1308
1309sub _draw {
1310 my ($self) = @_;
1311
1312 my $child = $self->{children}[0];
1313
1314 my $border = $self->border;
1315 my ($w, $h) = ($self->{w}, $self->{h});
1316
1317 $child->draw;
1318
1319 glColor @{$self->{fg}};
1320 glBegin GL_LINE_STRIP;
1321 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1322 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1323 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1324 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1325 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1327 glEnd;
1328
1329 if ($self->{label}) {
1330 glTranslate $border * 2, 0;
1331 $self->{label}->_draw;
1332 }
1333}
1334
1335#############################################################################
1336
1337package CFPlus::UI::Toplevel;
1338
1339our @ISA = CFPlus::UI::Bin::;
1340
1341use CFPlus::OpenGL;
1137 1342
1138my $bg = 1343my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1344 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1345 mipmap => 1, wrap => 1;
1141 1346
1142my @border = 1347my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1348 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); 1349 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1350
1351my @icon =
1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1353 qw(x1_move.png x1_resize.png);
1145 1354
1146sub new { 1355sub new {
1147 my ($class, %arg) = @_; 1356 my ($class, %arg) = @_;
1148 1357
1149 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
… …
1154 min_w => 64, 1363 min_w => 64,
1155 min_h => 32, 1364 min_h => 32,
1156 %arg, 1365 %arg,
1157 ); 1366 );
1158 1367
1159 $self->{title_widget} = new CFClient::UI::Label 1368 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1369 align => 0,
1161 valign => 1, 1370 valign => 1,
1162 text => $self->{title}, 1371 text => $self->{title},
1163 fontsize => $self->{border}, 1372 fontsize => $self->{border},
1164 if exists $self->{title}; 1373 if exists $self->{title};
1165 1374
1166 if ($self->{has_close_button}) { 1375 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1376 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1377 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1378 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1379 on_activate => sub { $self->emit ("delete") };
1171 1380
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1381 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1382 }
1174 1383
1175 $self 1384 $self
1176} 1385}
1177 1386
1178sub add { 1387sub add {
1179 my ($self, @widgets) = @_; 1388 my ($self, @widgets) = @_;
1180 1389
1181 $self->SUPER::add (@widgets); 1390 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1391 $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}; 1392 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1393}
1185 1394
1186sub border { 1395sub border {
1187 int $_[0]{border} * $::FONTSIZE 1396 int $_[0]{border} * $::FONTSIZE
1188} 1397}
… …
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1319 1528
1320 my $border = $self->border; 1529 my $border = $self->border;
1321 1530
1322 glColor @{ $self->{border_bg} }; 1531 glColor @{ $self->{border_bg} };
1323 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1324 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1325 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1326 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1535 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1536
1537 # move
1538 my $w2 = ($w - $border) * .5;
1539 my $h2 = ($h - $border) * .5;
1540 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1541 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1542 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1543
1544 # resize
1545 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1546 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1547 unless $self->{has_close_button};
1548 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1327 1550
1328 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1329 glColor @{ $self->{bg} }; 1552 glColor @{ $self->{bg} };
1330 1553
1331 # TODO: repeat texture not scale 1554 # TODO: repeat texture not scale
… …
1350 if $self->{close_button}; 1573 if $self->{close_button};
1351} 1574}
1352 1575
1353############################################################################# 1576#############################################################################
1354 1577
1355package CFClient::UI::Table; 1578package CFPlus::UI::Table;
1356 1579
1357our @ISA = CFClient::UI::Base::; 1580our @ISA = CFPlus::UI::Base::;
1358 1581
1359use List::Util qw(max sum); 1582use List::Util qw(max sum);
1360 1583
1361use CFClient::OpenGL; 1584use CFPlus::OpenGL;
1362 1585
1363sub new { 1586sub new {
1364 my $class = shift; 1587 my $class = shift;
1365 1588
1366 $class->SUPER::new ( 1589 $class->SUPER::new (
1590 children => [],
1367 col_expand => [], 1591 col_expand => [],
1592 row_expand => [],
1368 @_, 1593 @_,
1369 ) 1594 )
1370} 1595}
1371 1596
1372sub children { 1597sub children {
1373 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1374} 1599}
1375 1600
1601# TODO: store row/col info in child widget and use standard add/del
1376sub add { 1602sub add {
1377 my ($self) = shift; 1603 my $self = shift;
1604
1605 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1606 $self->add_at (@_);
1607}
1608
1609sub add_at {
1610 my $self = shift;
1378 1611
1379 while (@_) { 1612 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, (); 1613 my ($col, $row, $child) = splice @_, 0, 3, ();
1614
1381 $child->set_parent ($self); 1615 $child->set_parent ($self);
1382 $self->{children}[$y][$x] = $child; 1616 $self->{children}[$row][$col] = $child;
1383 } 1617 }
1384 1618
1385 $self->{force_realloc} = 1; 1619 $self->{force_realloc} = 1;
1386 $self->{force_size_alloc} = 1; 1620 $self->{force_size_alloc} = 1;
1387 $self->realloc; 1621 $self->realloc;
1388} 1622}
1389 1623
1390sub remove { 1624sub remove {
1391 my ($self, $child) = @_; 1625 my ($self, $child) = @_;
1392 1626
1393 # TODO: not yet implemented 1627 for (@{ $self->{children} }) {
1628 for (@{ $_ || [] }) {
1629 $_ = undef if $_ == $child;
1630 }
1631 }
1394} 1632}
1395 1633
1396# TODO: move to container class maybe? send children a signal on removal? 1634# TODO: move to container class maybe? send children a signal on removal?
1397sub clear { 1635sub clear {
1398 my ($self) = @_; 1636 my ($self) = @_;
… …
1447 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1448 1686
1449 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1450 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1451 1689
1452 # TODO: nicer code && do row_expand 1690 # TODO: nicer code
1453 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1454 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1455 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1456 1694
1457 # linearly scale sizes
1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460 1696
1461 CFClient::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1462 CFClient::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1463 1706
1464 my $y; 1707 my $y;
1465 1708
1466 for my $r (0 .. $#{$self->{children}}) { 1709 for my $r (0 .. $#{$self->{children}}) {
1467 my $row = $self->{children}[$r] 1710 my $row = $self->{children}[$r]
… …
1510 } 1753 }
1511} 1754}
1512 1755
1513############################################################################# 1756#############################################################################
1514 1757
1515package CFClient::UI::Box; 1758package CFPlus::UI::Fixed;
1516 1759
1760use List::Util qw(min max);
1761
1517our @ISA = CFClient::UI::Container::; 1762our @ISA = CFPlus::UI::Container::;
1763
1764sub add {
1765 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1766
1767 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1768 $self->SUPER::add ($child);
1769}
1770
1771sub _scale($$$) {
1772 my ($mode, $val, $max) = @_;
1773
1774 $mode eq "abs" ? $val
1775 : $mode eq "rel" ? $val * $max
1776 : 0
1777}
1778
1779sub size_request {
1780 my ($self) = @_;
1781
1782 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1783
1784 # determine overall size by querying abs widgets
1785 for my $child ($self->visible_children) {
1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1787
1788 if ($pos eq "abs") {
1789 $w = _scale $size, $w, $child->{req_w};
1790 $h = _scale $size, $h, $child->{req_h};
1791
1792 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1793 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1794 }
1795 }
1796
1797 my $W = $x2 - $x1;
1798 my $H = $y2 - $y1;
1799
1800 # now layout remaining widgets
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 if ($pos ne "abs") {
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1811 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1812 }
1813 }
1814
1815 my $W = $x2 - $x1;
1816 my $H = $y2 - $y1;
1817
1818 ($W, $H)
1819}
1820
1821sub invoke_size_allocate {
1822 my ($self, $W, $H) = @_;
1823
1824 for my $child ($self->visible_children) {
1825 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1826
1827 $x = _scale $pos, $x, $W;
1828 $y = _scale $pos, $x, $H;
1829 $w = _scale $size, $w, $child->{req_w};
1830 $h = _scale $size, $h, $child->{req_h};
1831
1832 $child->configure ($x, $y, $w, $h);
1833 }
1834
1835 1
1836}
1837
1838#############################################################################
1839
1840package CFPlus::UI::Box;
1841
1842our @ISA = CFPlus::UI::Container::;
1518 1843
1519sub size_request { 1844sub size_request {
1520 my ($self) = @_; 1845 my ($self) = @_;
1521 1846
1522 $self->{vertical} 1847 $self->{vertical}
… …
1555 $req[$_] += $space * $children[$_]{expand} 1880 $req[$_] += $space * $children[$_]{expand}
1556 for 0 .. $#children; 1881 for 0 .. $#children;
1557 } 1882 }
1558 } 1883 }
1559 1884
1560 CFClient::UI::harmonize \@req; 1885 CFPlus::UI::harmonize \@req;
1561 1886
1562 my $pos = 0; 1887 my $pos = 0;
1563 for (0 .. $#children) { 1888 for (0 .. $#children) {
1564 my $alloc = $req[$_]; 1889 my $alloc = $req[$_];
1565 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1890 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1570 1 1895 1
1571} 1896}
1572 1897
1573############################################################################# 1898#############################################################################
1574 1899
1575package CFClient::UI::HBox; 1900package CFPlus::UI::HBox;
1576 1901
1577our @ISA = CFClient::UI::Box::; 1902our @ISA = CFPlus::UI::Box::;
1578 1903
1579sub new { 1904sub new {
1580 my $class = shift; 1905 my $class = shift;
1581 1906
1582 $class->SUPER::new ( 1907 $class->SUPER::new (
… …
1585 ) 1910 )
1586} 1911}
1587 1912
1588############################################################################# 1913#############################################################################
1589 1914
1590package CFClient::UI::VBox; 1915package CFPlus::UI::VBox;
1591 1916
1592our @ISA = CFClient::UI::Box::; 1917our @ISA = CFPlus::UI::Box::;
1593 1918
1594sub new { 1919sub new {
1595 my $class = shift; 1920 my $class = shift;
1596 1921
1597 $class->SUPER::new ( 1922 $class->SUPER::new (
… …
1600 ) 1925 )
1601} 1926}
1602 1927
1603############################################################################# 1928#############################################################################
1604 1929
1605package CFClient::UI::Label; 1930package CFPlus::UI::Label;
1606 1931
1607our @ISA = CFClient::UI::DrawBG::; 1932our @ISA = CFPlus::UI::DrawBG::;
1608 1933
1609use CFClient::OpenGL; 1934use CFPlus::OpenGL;
1610 1935
1611sub new { 1936sub new {
1612 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1613 1938
1614 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
… …
1617 #active_bg => none 1942 #active_bg => none
1618 #font => default_font 1943 #font => default_font
1619 #text => initial text 1944 #text => initial text
1620 #markup => initial narkup 1945 #markup => initial narkup
1621 #max_w => maximum pixel width 1946 #max_w => maximum pixel width
1947 #style => 0, # render flags
1622 ellipsise => 3, # end 1948 ellipsise => 3, # end
1623 layout => (new CFClient::Layout), 1949 layout => (new CFPlus::Layout),
1624 fontsize => 1, 1950 fontsize => 1,
1625 align => -1, 1951 align => -1,
1626 valign => -1, 1952 valign => -1,
1627 padding_x => 2, 1953 padding_x => 2,
1628 padding_y => 2, 1954 padding_y => 2,
1629 can_events => 0, 1955 can_events => 0,
1630 %arg 1956 %arg
1631 ); 1957 );
1632 1958
1633 if (exists $self->{template}) { 1959 if (exists $self->{template}) {
1634 my $layout = new CFClient::Layout; 1960 my $layout = new CFPlus::Layout;
1635 $layout->set_text (delete $self->{template}); 1961 $layout->set_text (delete $self->{template});
1636 $self->{template} = $layout; 1962 $self->{template} = $layout;
1637 } 1963 }
1638 1964
1639 if (exists $self->{markup}) { 1965 if (exists $self->{markup}) {
… …
1777 }; 2103 };
1778 2104
1779 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2105 my $w = List::Util::min $self->{w} + 4, $size->[0];
1780 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2106 my $h = List::Util::min $self->{h} + 2, $size->[1];
1781 2107
1782 $self->{layout}->render ($self->{ox}, $self->{oy}); 2108 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783} 2109}
1784 2110
1785############################################################################# 2111#############################################################################
1786 2112
1787package CFClient::UI::EntryBase; 2113package CFPlus::UI::EntryBase;
1788 2114
1789our @ISA = CFClient::UI::Label::; 2115our @ISA = CFPlus::UI::Label::;
1790 2116
1791use CFClient::OpenGL; 2117use CFPlus::OpenGL;
1792 2118
1793sub new { 2119sub new {
1794 my $class = shift; 2120 my $class = shift;
1795 2121
1796 $class->SUPER::new ( 2122 $class->SUPER::new (
… …
1800 active_fg => [0, 0, 0], 2126 active_fg => [0, 0, 0],
1801 can_hover => 1, 2127 can_hover => 1,
1802 can_focus => 1, 2128 can_focus => 1,
1803 valign => 0, 2129 valign => 0,
1804 can_events => 1, 2130 can_events => 1,
2131 ellipsise => 0,
1805 #text => ... 2132 #text => ...
1806 #hidden => "*", 2133 #hidden => "*",
1807 @_ 2134 @_
1808 ) 2135 )
1809} 2136}
… …
1854 my $sym = $ev->{sym}; 2181 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2182 my $uni = $ev->{unicode};
1856 2183
1857 my $text = $self->get_text; 2184 my $text = $self->get_text;
1858 2185
2186 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2187
1859 if ($uni == 8) { 2188 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2190 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2191 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFClient::SDLK_LEFT) { 2192 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2193 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFClient::SDLK_RIGHT) { 2194 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2195 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFClient::SDLK_HOME) { 2196 } elsif ($sym == CFPlus::SDLK_HOME) {
2197 # what a hack
2198 $self->{cursor} =
2199 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2200 ? length $1
2201 : 0;
2202 } elsif ($sym == CFPlus::SDLK_END) {
2203 # uh, again
2204 $self->{cursor} =
2205 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2206 ? $self->{cursor} + length $1
2207 : length $self->{text};
2208 } elsif ($uni == 21) { # ctrl-u
2209 $text = "";
1868 $self->{cursor} = 0; 2210 $self->{cursor} = 0;
1869 } elsif ($sym == CFClient::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2211 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2212 $self->emit ('escape');
1873 } elsif ($uni) { 2213 } elsif ($uni == 0x0d) {
2214 substr $text, $self->{cursor}++, 0, "\012";
2215 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2216 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2217 } else {
1876 return 0; 2218 return 0;
1877 } 2219 }
1878 2220
1879 $self->_set_text ($text); 2221 $self->_set_text ($text);
1880 2222
1881 $self->realloc; 2223 $self->realloc;
2224 $self->update;
1882 2225
1883 1 2226 1
1884} 2227}
1885 2228
1886sub invoke_focus_in { 2229sub invoke_focus_in {
… …
1948 utf8::encode $text; 2291 utf8::encode $text;
1949 2292
1950 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2293 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1951 } 2294 }
1952 2295
1953 glColor @{$self->{fg}};
1954 glBegin GL_LINES; 2296 glBegin GL_LINES;
1955 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2297 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}; 2298 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957 glEnd; 2299 glEnd;
1958 } 2300 }
1959} 2301}
1960 2302
2303#############################################################################
2304
1961package CFClient::UI::Entry; 2305package CFPlus::UI::Entry;
1962 2306
1963our @ISA = CFClient::UI::EntryBase::; 2307our @ISA = CFPlus::UI::EntryBase::;
1964 2308
1965use CFClient::OpenGL; 2309use CFPlus::OpenGL;
1966 2310
1967sub invoke_key_down { 2311sub invoke_key_down {
1968 my ($self, $ev) = @_; 2312 my ($self, $ev) = @_;
1969 2313
1970 my $sym = $ev->{sym}; 2314 my $sym = $ev->{sym};
1971 2315
1972 if ($sym == 13) { 2316 if ($ev->{uni} == 0x0d || $sym == 13) {
1973 unshift @{$self->{history}}, 2317 unshift @{$self->{history}},
1974 my $txt = $self->get_text; 2318 my $txt = $self->get_text;
1975 2319
1976 $self->{history_pointer} = -1; 2320 $self->{history_pointer} = -1;
1977 $self->{history_saveback} = ''; 2321 $self->{history_saveback} = '';
1978 $self->emit (activate => $txt); 2322 $self->emit (activate => $txt);
1979 $self->update; 2323 $self->update;
1980 2324
1981 } elsif ($sym == CFClient::SDLK_UP) { 2325 } elsif ($sym == CFPlus::SDLK_UP) {
1982 if ($self->{history_pointer} < 0) { 2326 if ($self->{history_pointer} < 0) {
1983 $self->{history_saveback} = $self->get_text; 2327 $self->{history_saveback} = $self->get_text;
1984 } 2328 }
1985 if (@{$self->{history} || []} > 0) { 2329 if (@{$self->{history} || []} > 0) {
1986 $self->{history_pointer}++; 2330 $self->{history_pointer}++;
… …
1988 $self->{history_pointer} = @{$self->{history} || []} - 1; 2332 $self->{history_pointer} = @{$self->{history} || []} - 1;
1989 } 2333 }
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2334 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1991 } 2335 }
1992 2336
1993 } elsif ($sym == CFClient::SDLK_DOWN) { 2337 } elsif ($sym == CFPlus::SDLK_DOWN) {
1994 $self->{history_pointer}--; 2338 $self->{history_pointer}--;
1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2339 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1996 2340
1997 if ($self->{history_pointer} >= 0) { 2341 if ($self->{history_pointer} >= 0) {
1998 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2342 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
2007 1 2351 1
2008} 2352}
2009 2353
2010############################################################################# 2354#############################################################################
2011 2355
2356package CFPlus::UI::TextEdit;
2357
2358our @ISA = CFPlus::UI::EntryBase::;
2359
2360use CFPlus::OpenGL;
2361
2362sub move_cursor_ver {
2363 my ($self, $dy) = @_;
2364
2365 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2366
2367 $y += $dy;
2368
2369 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2370 $self->{cursor} = $index;
2371 delete $self->{cur_h};
2372 $self->update;
2373 return;
2374 }
2375}
2376
2377sub invoke_key_down {
2378 my ($self, $ev) = @_;
2379
2380 my $sym = $ev->{sym};
2381
2382 if ($sym == CFPlus::SDLK_UP) {
2383 $self->move_cursor_ver (-1);
2384 } elsif ($sym == CFPlus::SDLK_DOWN) {
2385 $self->move_cursor_ver (+1);
2386 } else {
2387 return $self->SUPER::invoke_key_down ($ev)
2388 }
2389
2390 1
2391}
2392
2393#############################################################################
2394
2012package CFClient::UI::Button; 2395package CFPlus::UI::Button;
2013 2396
2014our @ISA = CFClient::UI::Label::; 2397our @ISA = CFPlus::UI::Label::;
2015 2398
2016use CFClient::OpenGL; 2399use CFPlus::OpenGL;
2017 2400
2018my @tex = 2401my @tex =
2019 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020 qw(b1_button_active.png); 2403 qw(b1_button_inactive.png b1_button_active.png);
2021 2404
2022sub new { 2405sub new {
2023 my $class = shift; 2406 my $class = shift;
2024 2407
2025 $class->SUPER::new ( 2408 $class->SUPER::new (
2026 padding_x => 4, 2409 padding_x => 4,
2027 padding_y => 4, 2410 padding_y => 4,
2028 fg => [1, 1, 1], 2411 fg => [1.0, 1.0, 1.0],
2029 active_fg => [0, 0, 1], 2412 active_fg => [0.8, 0.8, 0.8],
2030 can_hover => 1, 2413 can_hover => 1,
2031 align => 0, 2414 align => 0,
2032 valign => 0, 2415 valign => 0,
2033 can_events => 1, 2416 can_events => 1,
2034 @_ 2417 @_
… …
2052 2435
2053 glEnable GL_TEXTURE_2D; 2436 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 glColor 0, 0, 0, 1; 2438 glColor 0, 0, 0, 1;
2056 2439
2440 my $tex = $tex[$GRAB == $self];
2057 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2441 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2058 2442
2059 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
2060 2444
2061 $self->SUPER::_draw; 2445 $self->SUPER::_draw;
2062} 2446}
2063 2447
2064############################################################################# 2448#############################################################################
2065 2449
2066package CFClient::UI::CheckBox; 2450package CFPlus::UI::CheckBox;
2067 2451
2068our @ISA = CFClient::UI::DrawBG::; 2452our @ISA = CFPlus::UI::DrawBG::;
2069 2453
2070my @tex = 2454my @tex =
2071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2455 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2456 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073 2457
2074use CFClient::OpenGL; 2458use CFPlus::OpenGL;
2075 2459
2076sub new { 2460sub new {
2077 my $class = shift; 2461 my $class = shift;
2078 2462
2079 $class->SUPER::new ( 2463 $class->SUPER::new (
… …
2136 glDisable GL_TEXTURE_2D; 2520 glDisable GL_TEXTURE_2D;
2137} 2521}
2138 2522
2139############################################################################# 2523#############################################################################
2140 2524
2141package CFClient::UI::Image; 2525package CFPlus::UI::Image;
2142 2526
2143our @ISA = CFClient::UI::Base::; 2527our @ISA = CFPlus::UI::Base::;
2144 2528
2145use CFClient::OpenGL; 2529use CFPlus::OpenGL;
2146 2530
2147our %texture_cache; 2531our %texture_cache;
2148 2532
2149sub new { 2533sub new {
2150 my $class = shift; 2534 my $class = shift;
… …
2156 2540
2157 $self->{path} || $self->{tex} 2541 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required"; 2542 or Carp::croak "'path' or 'tex' attributes required";
2159 2543
2160 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2544 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2161 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2545 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162 2546
2163 Scalar::Util::weaken $texture_cache{$self->{path}}; 2547 CFPlus::weaken $texture_cache{$self->{path}};
2164 2548
2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2549 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166 2550
2167 $self 2551 $self
2168} 2552}
2169 2553
2170sub STORABLE_freeze { 2554sub STORABLE_freeze {
2171 my ($self, $cloning) = @_; 2555 my ($self, $cloning) = @_;
2172 2556
2173 $self->{path} 2557 $self->{path}
2174 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2558 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175 2559
2176 $self->{path} 2560 $self->{path}
2177} 2561}
2178 2562
2179sub STORABLE_attach { 2563sub STORABLE_attach {
… …
2210 glDisable GL_TEXTURE_2D; 2594 glDisable GL_TEXTURE_2D;
2211} 2595}
2212 2596
2213############################################################################# 2597#############################################################################
2214 2598
2215package CFClient::UI::ImageButton; 2599package CFPlus::UI::ImageButton;
2216 2600
2217our @ISA = CFClient::UI::Image::; 2601our @ISA = CFPlus::UI::Image::;
2218 2602
2219use CFClient::OpenGL; 2603use CFPlus::OpenGL;
2220 2604
2221my %textures; 2605my %textures;
2222 2606
2223sub new { 2607sub new {
2224 my $class = shift; 2608 my $class = shift;
… …
2246 1 2630 1
2247} 2631}
2248 2632
2249############################################################################# 2633#############################################################################
2250 2634
2251package CFClient::UI::VGauge; 2635package CFPlus::UI::VGauge;
2252 2636
2253our @ISA = CFClient::UI::Base::; 2637our @ISA = CFPlus::UI::Base::;
2254 2638
2255use List::Util qw(min max); 2639use List::Util qw(min max);
2256 2640
2257use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2258 2642
2259my %tex = ( 2643my %tex = (
2260 food => [ 2644 food => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2645 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2646 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2263 ], 2647 ],
2264 grace => [ 2648 grace => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2649 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/ 2650 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2267 ], 2651 ],
2268 hp => [ 2652 hp => [
2269 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2654 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2271 ], 2655 ],
2272 mana => [ 2656 mana => [
2273 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2657 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/ 2658 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2275 ], 2659 ],
2276); 2660);
2277 2661
2278# eg. VGauge->new (gauge => 'food'), default gauge: food 2662# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2381 glDisable GL_TEXTURE_2D; 2765 glDisable GL_TEXTURE_2D;
2382} 2766}
2383 2767
2384############################################################################# 2768#############################################################################
2385 2769
2386package CFClient::UI::Gauge; 2770package CFPlus::UI::Gauge;
2387 2771
2388our @ISA = CFClient::UI::VBox::; 2772our @ISA = CFPlus::UI::VBox::;
2389 2773
2390sub new { 2774sub new {
2391 my ($class, %arg) = @_; 2775 my ($class, %arg) = @_;
2392 2776
2393 my $self = $class->SUPER::new ( 2777 my $self = $class->SUPER::new (
… …
2395 can_hover => 1, 2779 can_hover => 1,
2396 can_events => 1, 2780 can_events => 1,
2397 %arg, 2781 %arg,
2398 ); 2782 );
2399 2783
2400 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2784 $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); 2785 $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"); 2786 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2403 2787
2404 $self 2788 $self
2405} 2789}
2406 2790
2407sub set_fontsize { 2791sub set_fontsize {
… …
2428 $self->{value}->set_text ($val); 2812 $self->{value}->set_text ($val);
2429} 2813}
2430 2814
2431############################################################################# 2815#############################################################################
2432 2816
2433package CFClient::UI::Slider; 2817package CFPlus::UI::Slider;
2434 2818
2435use strict; 2819use strict;
2436 2820
2437use CFClient::OpenGL; 2821use CFPlus::OpenGL;
2438 2822
2439our @ISA = CFClient::UI::DrawBG::; 2823our @ISA = CFPlus::UI::DrawBG::;
2440 2824
2441my @tex = 2825my @tex =
2442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2826 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2443 qw(s1_slider.png s1_slider_bg.png); 2827 qw(s1_slider.png s1_slider_bg.png);
2444 2828
2445sub new { 2829sub new {
2446 my $class = shift; 2830 my $class = shift;
2447 2831
… …
2541sub invoke_mouse_wheel { 2925sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_; 2926 my ($self, $ev) = @_;
2543 2927
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2928 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545 2929
2930 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2931
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2932 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547 2933
2548 ! ! $delta 2934 ! ! $delta
2549} 2935}
2550 2936
2551sub update { 2937sub update {
… …
2602 glDisable GL_TEXTURE_2D; 2988 glDisable GL_TEXTURE_2D;
2603} 2989}
2604 2990
2605############################################################################# 2991#############################################################################
2606 2992
2607package CFClient::UI::ValSlider; 2993package CFPlus::UI::ValSlider;
2608 2994
2609our @ISA = CFClient::UI::HBox::; 2995our @ISA = CFPlus::UI::HBox::;
2610 2996
2611sub new { 2997sub new {
2612 my ($class, %arg) = @_; 2998 my ($class, %arg) = @_;
2613 2999
2614 my $range = delete $arg{range}; 3000 my $range = delete $arg{range};
2615 3001
2616 my $self = $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
2617 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3003 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2618 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3004 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2619 to_value => sub { shift }, 3005 to_value => sub { shift },
2620 from_value => sub { shift }, 3006 from_value => sub { shift },
2621 %arg, 3007 %arg,
2622 ); 3008 );
2623 3009
… …
2643sub set_range { shift->{slider}->set_range (@_) } 3029sub set_range { shift->{slider}->set_range (@_) }
2644sub set_value { shift->{slider}->set_value (@_) } 3030sub set_value { shift->{slider}->set_value (@_) }
2645 3031
2646############################################################################# 3032#############################################################################
2647 3033
2648package CFClient::UI::TextScroller; 3034package CFPlus::UI::TextScroller;
2649 3035
2650our @ISA = CFClient::UI::HBox::; 3036our @ISA = CFPlus::UI::HBox::;
2651 3037
2652use CFClient::OpenGL; 3038use CFPlus::OpenGL;
2653 3039
2654sub new { 3040sub new {
2655 my $class = shift; 3041 my $class = shift;
2656 3042
2657 my $self = $class->SUPER::new ( 3043 my $self = $class->SUPER::new (
… …
2659 can_events => 1, 3045 can_events => 1,
2660 indent => 0, 3046 indent => 0,
2661 #font => default_font 3047 #font => default_font
2662 @_, 3048 @_,
2663 3049
2664 layout => (new CFClient::Layout), 3050 layout => (new CFPlus::Layout),
2665 par => [], 3051 par => [],
3052 max_par => 0,
2666 height => 0, 3053 height => 0,
2667 children => [ 3054 children => [
2668 (new CFClient::UI::Empty expand => 1), 3055 (new CFPlus::UI::Empty expand => 1),
2669 (new CFClient::UI::Slider vertical => 1), 3056 (new CFPlus::UI::Slider vertical => 1),
2670 ], 3057 ],
2671 ); 3058 );
2672 3059
2673 $self->{children}[1]->connect (changed => sub { $self->update }); 3060 $self->{children}[1]->connect (changed => sub { $self->update });
2674 3061
… …
2749sub set_offset { 3136sub set_offset {
2750 my ($self, $offset) = @_; 3137 my ($self, $offset) = @_;
2751 3138
2752 # todo: base offset on lines or so, not on pixels 3139 # todo: base offset on lines or so, not on pixels
2753 $self->{children}[1]->set_value ($offset); 3140 $self->{children}[1]->set_value ($offset);
3141}
3142
3143sub current_paragraph {
3144 my ($self) = @_;
3145
3146 $self->{top_paragraph} - 1
3147}
3148
3149sub scroll_to {
3150 my ($self, $para) = @_;
3151
3152 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3153
3154 $self->{scroll_to} = $para;
3155 $self->update;
2754} 3156}
2755 3157
2756sub clear { 3158sub clear {
2757 my ($self) = @_; 3159 my ($self) = @_;
2758 3160
… …
2780 3182
2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3183 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para; 3184 push @{$self->{par}}, $para;
2783 } 3185 }
2784 3186
3187 if (my $max = $self->{max_par}) {
3188 shift @{$self->{par}} while @{$self->{par}} > $max;
3189 }
3190
2785 $self->{need_reflow}++; 3191 $self->{need_reflow}++;
2786 $self->update; 3192 $self->update;
2787} 3193}
2788 3194
2789sub scroll_to_bottom { 3195sub scroll_to_bottom {
2790 my ($self) = @_; 3196 my ($self) = @_;
2791 3197
2792 $self->{scroll_to_bottom} = 1; 3198 $self->{scroll_to} = $#{$self->{par}};
2793 $self->update; 3199 $self->update;
2794} 3200}
2795 3201
3202sub force_uptodate {
3203 my ($self) = @_;
3204
3205 if (delete $self->{need_reflow}) {
3206 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3207
3208 my $height = 0;
3209
3210 for my $para (@{$self->{par}}) {
3211 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3212 my $layout = $self->get_layout ($para);
3213 my ($w, $h) = $layout->size;
3214
3215 $para->{w} = $w + $para->{indent};
3216 $para->{h} = $h;
3217 $para->{wrapped} = $layout->has_wrapped;
3218 }
3219
3220 $para->{y} = $height;
3221 $height += $para->{h};
3222 }
3223
3224 $self->{height} = $height;
3225 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3226
3227 delete $self->{texture};
3228 }
3229
3230 if (my $paridx = delete $self->{scroll_to}) {
3231 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3232 }
3233}
3234
2796sub update { 3235sub update {
2797 my ($self) = @_; 3236 my ($self) = @_;
2798 3237
2799 $self->SUPER::update; 3238 $self->SUPER::update;
2800 3239
2801 return unless $self->{h} > 0; 3240 return unless $self->{h} > 0;
2802 3241
2803 delete $self->{texture}; 3242 delete $self->{texture};
2804 3243
2805 $ROOT->on_post_alloc ($self => sub { 3244 $ROOT->on_post_alloc ($self => sub {
3245 $self->force_uptodate;
3246
2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3247 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807 3248
2808 if (delete $self->{need_reflow}) {
2809 my $height = 0;
2810
2811 for my $para (@{$self->{par}}) {
2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2813 my $layout = $self->get_layout ($para);
2814 my ($w, $h) = $layout->size;
2815
2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2819 }
2820
2821 $height += $para->{h};
2822 }
2823
2824 $self->{height} = $height;
2825
2826 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2827
2828 delete $self->{texture};
2829 }
2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834
2835 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3249 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836 glClearColor 0, 0, 0, 0; 3250 glClearColor 0, 0, 0, 0;
2837 glClear GL_COLOR_BUFFER_BIT; 3251 glClear GL_COLOR_BUFFER_BIT;
2838 3252
3253 package CFPlus::UI::Base;
3254 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3255 (0, 0, $self->{w}, $self->{h});
3256
3257 my $top = int $self->{children}[1]{range}[0];
3258
3259 my $paridx = 0;
3260 my $top_paragraph;
2839 my $top = int $self->{children}[1]{range}[0]; 3261 my $top = int $self->{children}[1]{range}[0];
2840 3262
2841 my $y0 = $top; 3263 my $y0 = $top;
2842 my $y1 = $top + $H; 3264 my $y1 = $top + $H;
2843 3265
2844 my $y = 0;
2845
2846 for my $para (@{$self->{par}}) { 3266 for my $para (@{$self->{par}}) {
2847 my $h = $para->{h}; 3267 my $h = $para->{h};
3268 my $y = $para->{y};
2848 3269
2849 if ($y0 < $y + $h && $y < $y1) { 3270 if ($y0 < $y + $h && $y < $y1) {
2850
2851 my $layout = $self->get_layout ($para); 3271 my $layout = $self->get_layout ($para);
2852 3272
2853 $layout->render ($para->{indent}, $y - $y0); 3273 $layout->render ($para->{indent}, $y - $y0);
2854 3274
2855 if (my @w = @{ $para->{widget} }) { 3275 if (my @w = @{ $para->{widget} }) {
… …
2864 $_->draw; 3284 $_->draw;
2865 } 3285 }
2866 } 3286 }
2867 } 3287 }
2868 3288
2869 $y += $h; 3289 $paridx++;
3290 $top_paragraph ||= $paridx if $y >= $top;
2870 } 3291 }
3292
3293 $self->{top_paragraph} = $top_paragraph;
2871 }; 3294 };
2872 }); 3295 });
2873} 3296}
2874 3297
2875sub reconfigure { 3298sub reconfigure {
… …
2893 $self->{children}[1]->draw; 3316 $self->{children}[1]->draw;
2894} 3317}
2895 3318
2896############################################################################# 3319#############################################################################
2897 3320
2898package CFClient::UI::Animator; 3321package CFPlus::UI::Animator;
2899 3322
2900use CFClient::OpenGL; 3323use CFPlus::OpenGL;
2901 3324
2902our @ISA = CFClient::UI::Bin::; 3325our @ISA = CFPlus::UI::Bin::;
2903 3326
2904sub moveto { 3327sub moveto {
2905 my ($self, $x, $y) = @_; 3328 my ($self, $x, $y) = @_;
2906 3329
2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3330 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2935 glPopMatrix; 3358 glPopMatrix;
2936} 3359}
2937 3360
2938############################################################################# 3361#############################################################################
2939 3362
2940package CFClient::UI::Flopper; 3363package CFPlus::UI::Flopper;
2941 3364
2942our @ISA = CFClient::UI::Button::; 3365our @ISA = CFPlus::UI::Button::;
2943 3366
2944sub new { 3367sub new {
2945 my $class = shift; 3368 my $class = shift;
2946 3369
2947 my $self = $class->SUPER::new ( 3370 my $self = $class->SUPER::new (
… …
2959 $self->{other}->toggle_visibility; 3382 $self->{other}->toggle_visibility;
2960} 3383}
2961 3384
2962############################################################################# 3385#############################################################################
2963 3386
2964package CFClient::UI::Tooltip; 3387package CFPlus::UI::Tooltip;
2965 3388
2966our @ISA = CFClient::UI::Bin::; 3389our @ISA = CFPlus::UI::Bin::;
2967 3390
2968use CFClient::OpenGL; 3391use CFPlus::OpenGL;
2969 3392
2970sub new { 3393sub new {
2971 my $class = shift; 3394 my $class = shift;
2972 3395
2973 $class->SUPER::new ( 3396 $class->SUPER::new (
… …
2976 ) 3399 )
2977} 3400}
2978 3401
2979sub set_tooltip_from { 3402sub set_tooltip_from {
2980 my ($self, $widget) = @_; 3403 my ($self, $widget) = @_;
3404
3405 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3406 if $widget->{tooltip} =~ /^#(.*)$/;
2981 3407
2982 my $tooltip = $widget->{tooltip}; 3408 my $tooltip = $widget->{tooltip};
2983 3409
2984 if ($ENV{CFPLUS_DEBUG} & 2) { 3410 if ($ENV{CFPLUS_DEBUG} & 2) {
2985 $tooltip .= "\n\n" . (ref $widget) . "\n" 3411 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2989 } 3415 }
2990 3416
2991 $tooltip =~ s/^\n+//; 3417 $tooltip =~ s/^\n+//;
2992 $tooltip =~ s/\n+$//; 3418 $tooltip =~ s/\n+$//;
2993 3419
2994 $self->add (new CFClient::UI::Label 3420 $self->add (new CFPlus::UI::Label
2995 markup => $tooltip, 3421 markup => $tooltip,
2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3422 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997 fontsize => 0.8, 3423 fontsize => 0.8,
2998 fg => [0, 0, 0, 1], 3424 style => 1, # FLAG_INVERSE
2999 ellipsise => 0, 3425 ellipsise => 0,
3000 font => ($widget->{tooltip_font} || $::FONT_PROP), 3426 font => ($widget->{tooltip_font} || $::FONT_PROP),
3001 ); 3427 );
3002} 3428}
3003 3429
… …
3065 $self->SUPER::_draw; 3491 $self->SUPER::_draw;
3066} 3492}
3067 3493
3068############################################################################# 3494#############################################################################
3069 3495
3070package CFClient::UI::Face; 3496package CFPlus::UI::Face;
3071 3497
3072our @ISA = CFClient::UI::DrawBG::; 3498our @ISA = CFPlus::UI::DrawBG::;
3073 3499
3074use CFClient::OpenGL; 3500use CFPlus::OpenGL;
3075 3501
3076sub new { 3502sub new {
3077 my $class = shift; 3503 my $class = shift;
3078 3504
3079 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
3506 size_w => 32,
3507 size_h => 8,
3080 aspect => 1, 3508 aspect => 1,
3081 can_events => 0, 3509 can_events => 0,
3082 @_, 3510 @_,
3083 ); 3511 );
3084 3512
3085 if ($self->{anim} && $self->{animspeed}) { 3513 if ($self->{anim} && $self->{animspeed}) {
3086 Scalar::Util::weaken (my $widget = $self); 3514 CFPlus::weaken (my $widget = $self);
3087 3515
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3088 $self->{timer} = Event->timer ( 3518 $self->{timer} = Event->timer (
3089 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090 hard => 1, 3519 parked => 1,
3091 interval => $self->{animspeed},
3092 cb => sub { 3520 cb => sub {
3521 return unless $::CONN && $widget;
3522
3093 ++$widget->{frame}; 3523 ++$widget->{frame};
3524 $widget->update_face;
3094 $widget->update; 3525 $widget->update;
3526
3527 $widget->update_timer;
3095 }, 3528 },
3096 ); 3529 );
3530
3531 $self->update_face;
3532 $self->update_timer;
3097 } 3533 }
3098 3534
3099 $self 3535 $self
3100} 3536}
3101 3537
3538sub update_timer {
3539 my ($self) = @_;
3540
3541 return unless $self->{timer};
3542
3543 if ($self->{visible}) {
3544 $self->{timer}->at (
3545 $self->{anim_start}
3546 + $self->{animspeed}
3547 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3548 );
3549 $self->{timer}->start;
3550 } else {
3551 $self->{timer}->stop;
3552 }
3553}
3554
3555sub update_face {
3556 my ($self) = @_;
3557
3558 return unless $::CONN;
3559
3560 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3561 if ($anim && @$anim) {
3562 delete $self->{wait_face};
3563 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3564 }
3565 }
3566}
3567
3102sub size_request { 3568sub size_request {
3103 (32, 8) 3569 my ($self) = @_;
3570
3571 if ($::CONN) {
3572 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3573 if (my $tex = $::CONN->{texture}[$faceid]) {
3574 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3575 } else {
3576 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3577 $self->realloc;
3578 });
3579 }
3580 }
3581 }
3582
3583 ($self->{size_w} || 8, $self->{size_h} || 8)
3104} 3584}
3105 3585
3106sub update { 3586sub update {
3107 my ($self) = @_; 3587 my ($self) = @_;
3108 3588
3109 return unless $self->{visible}; 3589 return unless $self->{visible};
3110 3590
3111 $self->SUPER::update; 3591 $self->SUPER::update;
3112} 3592}
3113 3593
3594sub invoke_visibility_change {
3595 my ($self) = @_;
3596
3597 $self->update_timer;
3598
3599 0
3600}
3601
3114sub _draw { 3602sub _draw {
3115 my ($self) = @_; 3603 my ($self) = @_;
3116 3604
3117 return unless $::CONN; 3605 return unless $::CONN;
3118 3606
3119 $self->SUPER::_draw; 3607 $self->SUPER::_draw;
3120 3608
3121 my $face;
3122
3123 if ($self->{frame}) {
3124 my $anim = $::CONN->{anim}[$self->{anim}]; 3609 my $faceid = $::CONN->{faceid}[$self->{face}]
3125 3610 or return;
3126 $face = $anim->[ $self->{frame} % @$anim ]
3127 if $anim && @$anim;
3128 }
3129 3611
3130 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3612 my $tex = $::CONN->{texture}[$faceid];
3131 3613
3132 if ($tex) { 3614 if ($tex) {
3133 glEnable GL_TEXTURE_2D; 3615 glEnable GL_TEXTURE_2D;
3134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135 glColor 0, 0, 0, 1; 3617 glColor 0, 0, 0, 1;
… …
3139} 3621}
3140 3622
3141sub destroy { 3623sub destroy {
3142 my ($self) = @_; 3624 my ($self) = @_;
3143 3625
3144 $self->{timer}->cancel 3626 (delete $self->{timer})->cancel
3145 if $self->{timer}; 3627 if $self->{timer};
3146 3628
3147 $self->SUPER::destroy; 3629 $self->SUPER::destroy;
3148} 3630}
3149 3631
3150############################################################################# 3632#############################################################################
3151 3633
3152package CFClient::UI::Buttonbar; 3634package CFPlus::UI::Buttonbar;
3153 3635
3154our @ISA = CFClient::UI::HBox::; 3636our @ISA = CFPlus::UI::HBox::;
3155 3637
3156# TODO: should actualyl wrap buttons and other goodies. 3638# TODO: should actually wrap buttons and other goodies.
3157 3639
3158############################################################################# 3640#############################################################################
3159 3641
3160package CFClient::UI::Menu; 3642package CFPlus::UI::Menu;
3161 3643
3162our @ISA = CFClient::UI::FancyFrame::; 3644our @ISA = CFPlus::UI::Toplevel::;
3163 3645
3164use CFClient::OpenGL; 3646use CFPlus::OpenGL;
3165 3647
3166sub new { 3648sub new {
3167 my $class = shift; 3649 my $class = shift;
3168 3650
3169 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
3170 items => [], 3652 items => [],
3171 z => 100, 3653 z => 100,
3172 @_, 3654 @_,
3173 ); 3655 );
3174 3656
3175 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3657 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3176 3658
3177 for my $item (@{ $self->{items} }) { 3659 for my $item (@{ $self->{items} }) {
3178 my ($widget, $cb, $tooltip) = @$item; 3660 my ($widget, $cb, $tooltip) = @$item;
3179 3661
3180 # handle various types of items, only text for now 3662 # handle various types of items, only text for now
3181 if (!ref $widget) { 3663 if (!ref $widget) {
3182 if ($widget =~ /\t/) { 3664 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2; 3665 my ($left, $right) = split /\t/, $widget, 2;
3184 3666
3185 $widget = new CFClient::UI::HBox 3667 $widget = new CFPlus::UI::HBox
3186 can_hover => 1, 3668 can_hover => 1,
3187 can_events => 1, 3669 can_events => 1,
3188 tooltip => $tooltip, 3670 tooltip => $tooltip,
3189 children => [ 3671 children => [
3190 (new CFClient::UI::Label markup => $left, expand => 1), 3672 (new CFPlus::UI::Label markup => $left, expand => 1),
3191 (new CFClient::UI::Label markup => $right, align => +1), 3673 (new CFPlus::UI::Label markup => $right, align => +1),
3192 ], 3674 ],
3193 ; 3675 ;
3194 3676
3195 } else { 3677 } else {
3196 $widget = new CFClient::UI::Label 3678 $widget = new CFPlus::UI::Label
3197 can_hover => 1, 3679 can_hover => 1,
3198 can_events => 1, 3680 can_events => 1,
3199 markup => $widget, 3681 markup => $widget,
3200 tooltip => $tooltip; 3682 tooltip => $tooltip;
3201 } 3683 }
… …
3249 1 3731 1
3250} 3732}
3251 3733
3252############################################################################# 3734#############################################################################
3253 3735
3254package CFClient::UI::Multiplexer; 3736package CFPlus::UI::Multiplexer;
3255 3737
3256our @ISA = CFClient::UI::Container::; 3738our @ISA = CFPlus::UI::Container::;
3257 3739
3258sub new { 3740sub new {
3259 my $class = shift; 3741 my $class = shift;
3260 3742
3261 my $self = $class->SUPER::new ( 3743 my $self = $class->SUPER::new (
… …
3322 $self->{current}->draw; 3804 $self->{current}->draw;
3323} 3805}
3324 3806
3325############################################################################# 3807#############################################################################
3326 3808
3327package CFClient::UI::Notebook; 3809package CFPlus::UI::Notebook;
3328 3810
3329our @ISA = CFClient::UI::VBox::; 3811our @ISA = CFPlus::UI::VBox::;
3330 3812
3331sub new { 3813sub new {
3332 my $class = shift; 3814 my $class = shift;
3333 3815
3334 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3335 buttonbar => (new CFClient::UI::Buttonbar), 3817 buttonbar => (new CFPlus::UI::Buttonbar),
3336 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3818 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3337 # filter => # will be put between multiplexer and $self 3819 # filter => # will be put between multiplexer and $self
3338 @_, 3820 @_,
3339 ); 3821 );
3340 3822
3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3823 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3345} 3827}
3346 3828
3347sub add { 3829sub add {
3348 my ($self, $title, $widget, $tooltip) = @_; 3830 my ($self, $title, $widget, $tooltip) = @_;
3349 3831
3350 Scalar::Util::weaken $self; 3832 CFPlus::weaken $self;
3351 3833
3352 $self->{buttonbar}->add (new CFClient::UI::Button 3834 $self->{buttonbar}->add (new CFPlus::UI::Button
3353 markup => $title, 3835 markup => $title,
3354 tooltip => $tooltip, 3836 tooltip => $tooltip,
3355 on_activate => sub { $self->set_current_page ($widget) }, 3837 on_activate => sub { $self->set_current_page ($widget) },
3356 ); 3838 );
3357 3839
… …
3371 $self->emit (page_changed => $self->{multiplexer}{current}); 3853 $self->emit (page_changed => $self->{multiplexer}{current});
3372} 3854}
3373 3855
3374############################################################################# 3856#############################################################################
3375 3857
3376package CFClient::UI::Selector; 3858package CFPlus::UI::Selector;
3377 3859
3378use utf8; 3860use utf8;
3379 3861
3380our @ISA = CFClient::UI::Button::; 3862our @ISA = CFPlus::UI::Button::;
3381 3863
3382sub new { 3864sub new {
3383 my $class = shift; 3865 my $class = shift;
3384 3866
3385 my $self = $class->SUPER::new ( 3867 my $self = $class->SUPER::new (
… …
3402 my ($value, $title, $tooltip) = @$_; 3884 my ($value, $title, $tooltip) = @$_;
3403 3885
3404 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3886 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405 } 3887 }
3406 3888
3407 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3889 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408} 3890}
3409 3891
3410sub _set_value { 3892sub _set_value {
3411 my ($self, $value) = @_; 3893 my ($self, $value) = @_;
3412 3894
… …
3427 $self->emit (changed => $value); 3909 $self->emit (changed => $value);
3428} 3910}
3429 3911
3430############################################################################# 3912#############################################################################
3431 3913
3432package CFClient::UI::Statusbox; 3914package CFPlus::UI::Statusbox;
3433 3915
3434our @ISA = CFClient::UI::VBox::; 3916our @ISA = CFPlus::UI::VBox::;
3435 3917
3436sub new { 3918sub new {
3437 my $class = shift; 3919 my $class = shift;
3438 3920
3439 my $self = $class->SUPER::new ( 3921 my $self = $class->SUPER::new (
3440 fontsize => 0.8, 3922 fontsize => 0.8,
3441 @_, 3923 @_,
3442 ); 3924 );
3443 3925
3444 Scalar::Util::weaken (my $this = $self); 3926 CFPlus::weaken (my $this = $self);
3445 3927
3446 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3928 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447 3929
3448 $self 3930 $self
3449} 3931}
… …
3451sub reorder { 3933sub reorder {
3452 my ($self) = @_; 3934 my ($self) = @_;
3453 my $NOW = Time::HiRes::time; 3935 my $NOW = Time::HiRes::time;
3454 3936
3455 # freeze display when hovering over any label 3937 # freeze display when hovering over any label
3456 return if $CFClient::UI::TOOLTIP->{owner} 3938 return if $CFPlus::UI::TOOLTIP->{owner}
3457 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3939 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458 values %{ $self->{item} }; 3940 values %{ $self->{item} };
3459 3941
3460 while (my ($k, $v) = each %{ $self->{item} }) { 3942 while (my ($k, $v) = each %{ $self->{item} }) {
3461 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3943 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3462 } 3944 }
… …
3483 for ($short) { 3965 for ($short) {
3484 s/^\s+//; 3966 s/^\s+//;
3485 s/\s+/ /g; 3967 s/\s+/ /g;
3486 } 3968 }
3487 3969
3488 new CFClient::UI::Label 3970 new CFPlus::UI::Label
3489 markup => $short, 3971 markup => $short,
3490 tooltip => $item->{tooltip}, 3972 tooltip => $item->{tooltip},
3491 tooltip_font => $::FONT_PROP, 3973 tooltip_font => $::FONT_PROP,
3492 tooltip_width => 0.67, 3974 tooltip_width => 0.67,
3493 fontsize => $item->{fontsize} || $self->{fontsize}, 3975 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3572 $self->SUPER::destroy; 4054 $self->SUPER::destroy;
3573} 4055}
3574 4056
3575############################################################################# 4057#############################################################################
3576 4058
3577package CFClient::UI::Inventory;
3578
3579our @ISA = CFClient::UI::Table::;
3580
3581sub new {
3582 my $class = shift;
3583
3584 my $self = $class->SUPER::new (
3585 col_expand => [0, 1, 0],
3586 items => [],
3587 @_,
3588 );
3589
3590 $self->set_sort_order (undef);
3591
3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFClient::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3628}
3629
3630sub set_items {
3631 my ($self, $items) = @_;
3632
3633 $self->{items} = [$items ? values %$items : ()];
3634 $self->update_items;
3635}
3636
3637#############################################################################
3638
3639package CFClient::UI::SpellList;
3640
3641our @ISA = CFClient::UI::Table::;
3642
3643sub new {
3644 my $class = shift;
3645
3646 my $self = $class->SUPER::new (
3647 binding => [],
3648 commands => [],
3649 @_,
3650 )
3651}
3652
3653my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666sub rebuild_spell_list {
3667 my ($self) = @_;
3668
3669 $CFClient::UI::ROOT->on_refresh ($self => sub {
3670 $self->clear;
3671
3672 return unless $::CONN;
3673
3674 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680 my $row = 0;
3681
3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683 my $spell = $self->{spell}{$_};
3684
3685 $row++;
3686
3687 my $spell_cb = sub {
3688 my ($widget, $ev) = @_;
3689
3690 if ($ev->{button} == 1) {
3691 $::CONN->user_send ("cast $spell->{name}");
3692 } elsif ($ev->{button} == 2) {
3693 $::CONN->user_send ("invoke $spell->{name}");
3694 } elsif ($ev->{button} == 3) {
3695 (new CFClient::UI::Menu
3696 items => [
3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699 ],
3700 )->popup ($ev);
3701 } else {
3702 return 0;
3703 }
3704
3705 1
3706 };
3707
3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710 #TODO: add path info to tooltip
3711 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3712
3713 $self->add (0, $row, new CFClient::UI::Face
3714 face => $spell->{face},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (1, $row, new CFClient::UI::Label
3722 expand => 1,
3723 text => $spell->{name},
3724 can_hover => 1,
3725 can_events => 1,
3726 tooltip => $tooltip,
3727 on_button_down => $spell_cb,
3728 );
3729
3730 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734 }
3735 });
3736}
3737
3738sub add_spell {
3739 my ($self, $spell) = @_;
3740
3741 $self->{spell}->{$spell->{name}} = $spell;
3742 $self->rebuild_spell_list;
3743}
3744
3745sub remove_spell {
3746 my ($self, $spell) = @_;
3747
3748 delete $self->{spell}->{$spell->{name}};
3749 $self->rebuild_spell_list;
3750}
3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3759#############################################################################
3760
3761package CFClient::UI::Root; 4059package CFPlus::UI::Root;
3762 4060
3763our @ISA = CFClient::UI::Container::; 4061our @ISA = CFPlus::UI::Container::;
3764 4062
3765use List::Util qw(min max); 4063use List::Util qw(min max);
3766 4064
3767use CFClient::OpenGL; 4065use CFPlus::OpenGL;
3768 4066
3769sub new { 4067sub new {
3770 my $class = shift; 4068 my $class = shift;
3771 4069
3772 my $self = $class->SUPER::new ( 4070 my $self = $class->SUPER::new (
3773 visible => 1, 4071 visible => 1,
3774 @_, 4072 @_,
3775 ); 4073 );
3776 4074
3777 Scalar::Util::weaken ($self->{root} = $self); 4075 CFPlus::weaken ($self->{root} = $self);
3778 4076
3779 $self 4077 $self
3780} 4078}
3781 4079
3782sub size_request { 4080sub size_request {
… …
3977 while ($self->{post_alloc_hook}) { 4275 while ($self->{post_alloc_hook}) {
3978 $_->() 4276 $_->()
3979 for values %{delete $self->{post_alloc_hook}}; 4277 for values %{delete $self->{post_alloc_hook}};
3980 } 4278 }
3981 4279
3982
3983 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4280 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3984 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4281 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3985 glClear GL_COLOR_BUFFER_BIT; 4282 glClear GL_COLOR_BUFFER_BIT;
3986 4283
3987 glMatrixMode GL_PROJECTION; 4284 glMatrixMode GL_PROJECTION;
… …
3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4286 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3990 glMatrixMode GL_MODELVIEW; 4287 glMatrixMode GL_MODELVIEW;
3991 glLoadIdentity; 4288 glLoadIdentity;
3992 4289
3993 { 4290 {
3994 package CFClient::UI::Base; 4291 package CFPlus::UI::Base;
3995 4292
3996 ($draw_x, $draw_y, $draw_w, $draw_h) = 4293 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997 (0, 0, $self->{w}, $self->{h}); 4294 (0, 0, $self->{w}, $self->{h});
3998 }
3999 4295
4000 $self->_draw; 4296 $self->_draw;
4297 }
4001} 4298}
4002 4299
4003############################################################################# 4300#############################################################################
4004 4301
4005package CFClient::UI; 4302package CFPlus::UI;
4006 4303
4007$ROOT = new CFClient::UI::Root; 4304$ROOT = new CFPlus::UI::Root;
4008$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4305$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4009 4306
40101 43071
4011 4308

Diff Legend

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