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.401 by root, Sat Jul 21 20:05:37 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;
… …
110 } 113 }
111 114
112 if ($GRAB) { 115 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 117 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
117 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
118 } else { 125 } else {
119 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
120 } 127 }
121 } 128 }
… …
207 reconfigure_widgets; 214 reconfigure_widgets;
208} 215}
209 216
210############################################################################# 217#############################################################################
211 218
212package CFClient::UI::Event; 219package CFPlus::UI::Event;
213 220
214sub xy { 221sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216} 223}
217 224
218############################################################################# 225#############################################################################
219 226
220package CFClient::UI::Base; 227package CFPlus::UI::Base;
221 228
222use strict; 229use strict;
223 230
224use CFClient::OpenGL; 231use CFPlus::OpenGL;
225 232
226sub new { 233sub new {
227 my $class = shift; 234 my $class = shift;
228 235
229 my $self = bless { 236 my $self = bless {
… …
234 h => undef, 241 h => undef,
235 can_events => 1, 242 can_events => 1,
236 @_ 243 @_
237 }, $class; 244 }, $class;
238 245
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240 247
241 for (keys %$self) { 248 for (keys %$self) {
242 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
244 } 251 }
245 } 252 }
246 253
247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $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}; 256 $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}; 257 $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}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252 259
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255 262
256 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
261 268
262sub destroy { 269sub destroy {
263 my ($self) = @_; 270 my ($self) = @_;
264 271
265 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
266 %$self = (); 274 %$self = ();
267} 275}
268 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
269sub show { 281sub show {
270 my ($self) = @_; 282 my ($self) = @_;
271 283
272 return if $self->{parent}; 284 return if $self->{parent};
273 285
274 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
275} 287}
276 288
277sub set_visible { 289sub set_visible {
278 my ($self) = @_; 290 my ($self) = @_;
279 291
… …
300 delete $self->{root}; 312 delete $self->{root};
301 313
302 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
303 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
304 316
305 $CFClient::UI::TOOLTIP_WATCHER->cb->() 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
306 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
307 319
308 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
309 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
310} 322}
… …
312sub set_visibility { 324sub set_visibility {
313 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
314 326
315 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
316 328
317 $visible ? $self->hide 329 $visible ? $self->show
318 : $self->show; 330 : $self->hide;
319} 331}
320 332
321sub toggle_visibility { 333sub toggle_visibility {
322 my ($self) = @_; 334 my ($self) = @_;
323 335
… …
367 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
368 380
369 if ($self->{aspect}) { 381 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
371 383
372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374 386
375 # use alignment to adjust x, y 387 # use alignment to adjust x, y
376 388
377 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
378 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
419 431
420 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
421 433
422 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
423 435
424 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
426 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
427 } 439 }
428} 440}
429 441
430# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
431sub coord2local { 443sub coord2local {
… …
497sub connect { 509sub connect {
498 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
499 511
500 push @{ $self->{signal_cb}{$signal} }, $cb; 512 push @{ $self->{signal_cb}{$signal} }, $cb;
501 513
502 defined wantarray and CFClient::guard { 514 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} }; 516 @{ $self->{signal_cb}{$signal} };
505 } 517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
506} 524}
507 525
508my %has_coords = ( 526my %has_coords = (
509 button_down => 1, 527 button_down => 1,
510 button_up => 1, 528 button_up => 1,
… …
513); 531);
514 532
515sub emit { 533sub emit {
516 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
517 535
518 # I do not really like this solution, but I dislike duplication 536 # I do not really like this solution, but I do not like duplication
519 # and needlessly verbose code, too. 537 # and needlessly verbose code, either.
520 my @append 538 my @append
521 = $has_coords{$signal} 539 = $has_coords{$signal}
522 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
523 : (); 541 : ();
524 542
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526 544
527 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
531} 554}
532 555
533sub find_widget { 556#sub find_widget {
534 my ($self, $x, $y) = @_; 557# 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 558
545sub set_parent { 559sub set_parent {
546 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
547 561
548 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
549 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
550} 564}
551 565
552sub realloc { 566sub realloc {
553 my ($self) = @_; 567 my ($self) = @_;
… …
619 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
620 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
621 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
622 glEnd; 636 glEnd;
623 glPopMatrix; 637 glPopMatrix;
624 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625 } 639 }
626 640
627 $self->_draw; 641 $self->_draw;
628 glPopMatrix; 642 glPopMatrix;
629} 643}
… …
635} 649}
636 650
637sub DESTROY { 651sub DESTROY {
638 my ($self) = @_; 652 my ($self) = @_;
639 653
640 return if CFClient::in_destruct; 654 return if CFPlus::in_destruct;
641
642 delete $WIDGET{$self+0};
643 655
644 eval { $self->destroy }; 656 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 657 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
658
659 delete $WIDGET{$self+0};
646} 660}
647 661
648############################################################################# 662#############################################################################
649 663
650package CFClient::UI::DrawBG; 664package CFPlus::UI::DrawBG;
651 665
652our @ISA = CFClient::UI::Base::; 666our @ISA = CFPlus::UI::Base::;
653 667
654use strict; 668use strict;
655use CFClient::OpenGL; 669use CFPlus::OpenGL;
656 670
657sub new { 671sub new {
658 my $class = shift; 672 my $class = shift;
659 673
660 # range [value, low, high, page] 674 # range [value, low, high, page]
… …
691 } 705 }
692} 706}
693 707
694############################################################################# 708#############################################################################
695 709
696package CFClient::UI::Empty; 710package CFPlus::UI::Empty;
697 711
698our @ISA = CFClient::UI::Base::; 712our @ISA = CFPlus::UI::Base::;
699 713
700sub new { 714sub new {
701 my ($class, %arg) = @_; 715 my ($class, %arg) = @_;
702 $class->SUPER::new (can_events => 0, %arg); 716 $class->SUPER::new (can_events => 0, %arg);
703} 717}
… …
710 724
711sub draw { } 725sub draw { }
712 726
713############################################################################# 727#############################################################################
714 728
715package CFClient::UI::Container; 729package CFPlus::UI::Container;
716 730
717our @ISA = CFClient::UI::Base::; 731our @ISA = CFPlus::UI::Base::;
718 732
719sub new { 733sub new {
720 my ($class, %arg) = @_; 734 my ($class, %arg) = @_;
721 735
722 my $children = delete $arg{children}; 736 my $children = delete $arg{children};
… …
726 can_events => 0, 740 can_events => 0,
727 %arg, 741 %arg,
728 ); 742 );
729 743
730 $self->add (@$children) 744 $self->add (@$children)
731 if $children; 745 if $children && @$children;
732 746
733 $self 747 $self
734} 748}
735 749
736sub realloc { 750sub realloc {
… …
745 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
746 760
747 $_->set_parent ($self) 761 $_->set_parent ($self)
748 for @widgets; 762 for @widgets;
749 763
764 # TODO: only do this in widgets that need it, e.g. root, fixed
750 use sort 'stable'; 765 use sort 'stable';
751 766
752 $self->{children} = [ 767 $self->{children} = [
753 sort { $a->{z} <=> $b->{z} } 768 sort { $a->{z} <=> $b->{z} }
754 @{$self->{children}}, @widgets 769 @{$self->{children}}, @widgets
755 ]; 770 ];
756 771
757 $self->realloc; 772 $self->realloc;
773
774 map $_+0, @widgets
758} 775}
759 776
760sub children { 777sub children {
761 @{ $_[0]{children} } 778 @{ $_[0]{children} }
762} 779}
… …
773} 790}
774 791
775sub clear { 792sub clear {
776 my ($self) = @_; 793 my ($self) = @_;
777 794
778 my $children = delete $self->{children}; 795 my $children = $self->{children};
779 $self->{children} = []; 796 $self->{children} = [];
780 797
781 for (@$children) { 798 for (@$children) {
782 delete $_->{parent}; 799 delete $_->{parent};
783 $_->hide; 800 $_->hide;
… …
808 $_->draw for @{$self->{children}}; 825 $_->draw for @{$self->{children}};
809} 826}
810 827
811############################################################################# 828#############################################################################
812 829
813package CFClient::UI::Bin; 830package CFPlus::UI::Bin;
814 831
815our @ISA = CFClient::UI::Container::; 832our @ISA = CFPlus::UI::Container::;
816 833
817sub new { 834sub new {
818 my ($class, %arg) = @_; 835 my ($class, %arg) = @_;
819 836
820 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 837 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821 838
822 $class->SUPER::new (children => [$child], %arg) 839 $class->SUPER::new (children => [$child], %arg)
823} 840}
824 841
825sub add { 842sub add {
… …
832sub remove { 849sub remove {
833 my ($self, $widget) = @_; 850 my ($self, $widget) = @_;
834 851
835 $self->SUPER::remove ($widget); 852 $self->SUPER::remove ($widget);
836 853
837 $self->{children} = [new CFClient::UI::Empty] 854 $self->{children} = [new CFPlus::UI::Empty]
838 unless @{$self->{children}}; 855 unless @{$self->{children}};
839} 856}
840 857
841sub child { $_[0]->{children}[0] } 858sub child { $_[0]->{children}[0] }
842 859
… …
854 871
855############################################################################# 872#############################################################################
856 873
857# back-buffered drawing area 874# back-buffered drawing area
858 875
859package CFClient::UI::Window; 876package CFPlus::UI::Window;
860 877
861our @ISA = CFClient::UI::Bin::; 878our @ISA = CFPlus::UI::Bin::;
862 879
863use CFClient::OpenGL; 880use CFPlus::OpenGL;
864 881
865sub new { 882sub new {
866 my ($class, %arg) = @_; 883 my ($class, %arg) = @_;
867 884
868 my $self = $class->SUPER::new (%arg); 885 my $self = $class->SUPER::new (%arg);
… …
890} 907}
891 908
892sub render_child { 909sub render_child {
893 my ($self) = @_; 910 my ($self) = @_;
894 911
895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 912 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896 glClearColor 0, 0, 0, 0; 913 glClearColor 0, 0, 0, 0;
897 glClear GL_COLOR_BUFFER_BIT; 914 glClear GL_COLOR_BUFFER_BIT;
898 915
899 { 916 {
900 package CFClient::UI::Base; 917 package CFPlus::UI::Base;
901 918
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 919 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 920 (0, 0, $self->{w}, $self->{h});
921
922 $self->_render;
904 } 923 }
905
906 $self->_render;
907 }; 924 };
908} 925}
909 926
910sub _draw { 927sub _draw {
911 my ($self) = @_; 928 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 929
915 my $tex = $self->{texture} 930 my $tex = $self->{texture}
916 or return; 931 or return;
917 932
918 glEnable GL_TEXTURE_2D; 933 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 935 glColor 0, 0, 0, 1;
921 936
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 937 $tex->draw_quad_alpha_premultiplied (0, 0);
923 938
924 glDisable GL_TEXTURE_2D; 939 glDisable GL_TEXTURE_2D;
925} 940}
926 941
927############################################################################# 942#############################################################################
928 943
929package CFClient::UI::ViewPort; 944package CFPlus::UI::ViewPort;
930 945
946use List::Util qw(min max);
947
931our @ISA = CFClient::UI::Window::; 948our @ISA = CFPlus::UI::Window::;
932 949
933sub new { 950sub new {
934 my $class = shift; 951 my $class = shift;
935 952
936 $class->SUPER::new ( 953 $class->SUPER::new (
… …
943sub size_request { 960sub size_request {
944 my ($self) = @_; 961 my ($self) = @_;
945 962
946 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 963 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947 964
948 $w = 10 if $self->{scroll_x}; 965 $w = 1 if $self->{scroll_x};
949 $h = 10 if $self->{scroll_y}; 966 $h = 1 if $self->{scroll_y};
950 967
951 ($w, $h) 968 ($w, $h)
952} 969}
953 970
954sub invoke_size_allocate { 971sub invoke_size_allocate {
… …
966} 983}
967 984
968sub set_offset { 985sub set_offset {
969 my ($self, $x, $y) = @_; 986 my ($self, $x, $y) = @_;
970 987
988 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
989 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
990
991 if ($x != $self->{view_x} or $y != $self->{view_y}) {
971 $self->{view_x} = int $x; 992 $self->{view_x} = $x;
972 $self->{view_y} = int $y; 993 $self->{view_y} = $y;
973 994
995 $self->emit (changed => $x, $y);
974 $self->update; 996 $self->update;
997 }
975} 998}
976 999
977# hmm, this does not work for topleft of $self... but we should not ask for that 1000# hmm, this does not work for topleft of $self... but we should not ask for that
978sub coord2local { 1001sub coord2local {
979 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
994 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
995 1018
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 1021 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 1023 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 1024 $self->CFPlus::UI::Base::find_widget ($x, $y)
1002 } 1025 }
1003} 1026}
1004 1027
1005sub _render { 1028sub _render {
1006 my ($self) = @_; 1029 my ($self) = @_;
1007 1030
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1031 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}; 1032 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010 1033
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 1035
1013 $self->SUPER::_render; 1036 $self->SUPER::_render;
1014} 1037}
1015 1038
1016############################################################################# 1039#############################################################################
1017 1040
1018package CFClient::UI::ScrolledWindow; 1041package CFPlus::UI::ScrolledWindow;
1019 1042
1020our @ISA = CFClient::UI::HBox::; 1043our @ISA = CFPlus::UI::Table::;
1021 1044
1022sub new { 1045sub new {
1023 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
1024 1047
1025 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1026 1049
1027 my $self; 1050 my $self;
1028 1051
1029 my $slider = new CFClient::UI::Slider 1052 my $hslider = new CFPlus::UI::Slider
1053 col => 0,
1054 row => 1,
1055 vertical => 0,
1056 range => [0, 0, 1, 0.01], # HACK fix
1057 on_changed => sub {
1058 $self->{hpos} = $_[1];
1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1060 },
1061 ;
1062
1063 my $vslider = new CFPlus::UI::Slider
1064 col => 1,
1065 row => 0,
1030 vertical => 1, 1066 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1068 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1069 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1071 },
1035 ; 1072 ;
1036 1073
1037 $self = $class->SUPER::new ( 1074 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1075 scroll_x => 0,
1076 scroll_y => 1,
1039 can_events => 1, 1077 can_events => 1,
1040 slider => $slider, 1078 hslider => $hslider,
1079 vslider => $vslider,
1080 col_expand => [1, 0],
1081 row_expand => [1, 0],
1041 %arg, 1082 %arg,
1042 ); 1083 );
1043 1084
1085 $self->{vp} = new CFPlus::UI::ViewPort
1086 col => 0,
1087 row => 0,
1088 expand => 1,
1089 scroll_x => $self->{scroll_x},
1090 scroll_y => $self->{scroll_y},
1091 on_changed => sub {
1092 my ($vp, $x, $y) = @_;
1093
1094 $vp->{parent}{hslider}->set_value ($x);
1095 $vp->{parent}{vslider}->set_value ($y);
1096
1097 0
1098 },
1099 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1104 ;
1105
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1106 $self->SUPER::add ($self->{vp});
1107
1045 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
1046 1109
1047 $self 1110 $self
1048} 1111}
1049
1050#TODO# update range on size_allocate depending on child
1051 1112
1052sub add { 1113sub add {
1053 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1054 1115
1055 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
1056} 1117}
1057 1118
1119sub update_slider {
1120 my ($self) = @_;
1121
1122 my $child = ($self->{vp} or return)->child;
1123
1124 if ($self->{scroll_x}) {
1125 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1126 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1127
1128 my $visible = $w1 > $w2;
1129 if ($visible != $self->{hslider_visible}) {
1130 $self->{hslider_visible} = $visible;
1131 $visible ? $self->SUPER::add ($self->{hslider})
1132 : $self->SUPER::remove ($self->{hslider});
1133 }
1134 }
1135
1136 if ($self->{scroll_y}) {
1137 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1138 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1139
1140 my $visible = $h1 > $h2;
1141 if ($visible != $self->{vslider_visible}) {
1142 $self->{vslider_visible} = $visible;
1143 $visible ? $self->SUPER::add ($self->{vslider})
1144 : $self->SUPER::remove ($self->{vslider});
1145 }
1146 }
1147}
1148
1149sub start_dragging {
1150 my ($self, $ev) = @_;
1151
1152 $self->grab_focus;
1153
1154 my $ox = $self->{vp}{view_x};
1155 my $oy = $self->{vp}{view_y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $ox -= $ev->{xrel};
1161 $oy -= $ev->{yrel};
1162
1163 $self->{vp}->set_offset ($ox, $oy);
1164 };
1165}
1166
1058sub invoke_mouse_wheel { 1167sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1168 my ($self, $ev) = @_;
1060 1169
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev); 1170 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1171 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064 1172
1065 1 1173 1
1066} 1174}
1067 1175
1068sub update_slider { 1176sub invoke_button_down {
1069 my ($self) = @_; 1177 my ($self, $ev, $x, $y) = @_;
1070 1178
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1179 if ($ev->{button} == 2) {
1072} 1180 $self->start_dragging ($ev);
1181 return 1;
1182 }
1073 1183
1074sub update { 1184 0
1075 my ($self) = @_; 1185}
1076 1186
1077 $self->SUPER::update; 1187sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_;
1078 1189
1079 $self->update_slider; 1190 if (delete $self->{motion}) {
1191 return 1;
1192 }
1193
1194 0
1195}
1196
1197sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_;
1199
1200 if ($self->{motion}) {
1201 $self->{motion}->($ev, $x, $y);
1202 return 1;
1203 }
1204
1205 0
1080} 1206}
1081 1207
1082sub invoke_size_allocate { 1208sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1209 my ($self, $w, $h) = @_;
1084 1210
1085 $self->update_slider; 1211 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1212 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1213}
1089 1214
1090############################################################################# 1215#############################################################################
1091 1216
1092package CFClient::UI::Frame; 1217package CFPlus::UI::Frame;
1093 1218
1094our @ISA = CFClient::UI::Bin::; 1219our @ISA = CFPlus::UI::Bin::;
1095 1220
1096use CFClient::OpenGL; 1221use CFPlus::OpenGL;
1097 1222
1098sub new { 1223sub new {
1099 my $class = shift; 1224 my $class = shift;
1100 1225
1101 $class->SUPER::new ( 1226 $class->SUPER::new (
… …
1127 $self->SUPER::_draw; 1252 $self->SUPER::_draw;
1128} 1253}
1129 1254
1130############################################################################# 1255#############################################################################
1131 1256
1132package CFClient::UI::FancyFrame; 1257package CFPlus::UI::FancyFrame;
1133 1258
1134our @ISA = CFClient::UI::Bin::; 1259our @ISA = CFPlus::UI::Bin::;
1135 1260
1136use CFClient::OpenGL; 1261use CFPlus::OpenGL;
1262
1263sub new {
1264 my ($class, %arg) = @_;
1265
1266 if ((exists $arg{label}) && !ref $arg{label}) {
1267 $arg{label} = new CFPlus::UI::Label
1268 align => 1,
1269 valign => 0,
1270 text => $arg{label},
1271 fontsize => ($arg{border} || 0.8) * 0.75;
1272 }
1273
1274 my $self = $class->SUPER::new (
1275 # label => "",
1276 fg => [0.6, 0.3, 0.1],
1277 border => 0.8,
1278 style => 'single',
1279 %arg,
1280 );
1281
1282 $self
1283}
1284
1285sub add {
1286 my ($self, @widgets) = @_;
1287
1288 $self->SUPER::add (@widgets);
1289 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1290}
1291
1292sub border {
1293 int $_[0]{border} * $::FONTSIZE
1294}
1295
1296sub size_request {
1297 my ($self) = @_;
1298
1299 ($self->{label_w}, undef) = $self->{label}->size_request
1300 if $self->{label};
1301
1302 my ($w, $h) = $self->SUPER::size_request;
1303
1304 (
1305 $w + $self->border * 2,
1306 $h + $self->border * 2,
1307 )
1308}
1309
1310sub invoke_size_allocate {
1311 my ($self, $w, $h) = @_;
1312
1313 my $border = $self->border;
1314
1315 $w -= List::Util::max 0, $border * 2;
1316 $h -= List::Util::max 0, $border * 2;
1317
1318 if (my $label = $self->{label}) {
1319 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1320 $label->{h} = List::Util::min $h, $border;
1321 $label->invoke_size_allocate ($label->{w}, $label->{h});
1322 }
1323
1324 $self->child->configure ($border, $border, $w, $h);
1325
1326 1
1327}
1328
1329sub _draw {
1330 my ($self) = @_;
1331
1332 my $child = $self->{children}[0];
1333
1334 my $border = $self->border;
1335 my ($w, $h) = ($self->{w}, $self->{h});
1336
1337 $child->draw;
1338
1339 glColor @{$self->{fg}};
1340 glBegin GL_LINE_STRIP;
1341 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1342 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1343 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1344 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1345 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1346 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1347 glEnd;
1348
1349 if ($self->{label}) {
1350 glTranslate $border * 2, 0;
1351 $self->{label}->_draw;
1352 }
1353}
1354
1355#############################################################################
1356
1357package CFPlus::UI::Toplevel;
1358
1359our @ISA = CFPlus::UI::Bin::;
1360
1361use CFPlus::OpenGL;
1137 1362
1138my $bg = 1363my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1364 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1365 mipmap => 1, wrap => 1;
1141 1366
1142my @border = 1367my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1368 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); 1369 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1370
1371my @icon =
1372 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1373 qw(x1_move.png x1_resize.png);
1145 1374
1146sub new { 1375sub new {
1147 my ($class, %arg) = @_; 1376 my ($class, %arg) = @_;
1148 1377
1149 my $self = $class->SUPER::new ( 1378 my $self = $class->SUPER::new (
… …
1154 min_w => 64, 1383 min_w => 64,
1155 min_h => 32, 1384 min_h => 32,
1156 %arg, 1385 %arg,
1157 ); 1386 );
1158 1387
1159 $self->{title_widget} = new CFClient::UI::Label 1388 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1389 align => 0,
1161 valign => 1, 1390 valign => 1,
1162 text => $self->{title}, 1391 text => $self->{title},
1163 fontsize => $self->{border}, 1392 fontsize => $self->{border},
1164 if exists $self->{title}; 1393 if exists $self->{title};
1165 1394
1166 if ($self->{has_close_button}) { 1395 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1396 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1397 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1398 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1399 on_activate => sub { $self->emit ("delete") };
1171 1400
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1401 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1402 }
1174 1403
1175 $self 1404 $self
1176} 1405}
1177 1406
1178sub add { 1407sub add {
1179 my ($self, @widgets) = @_; 1408 my ($self, @widgets) = @_;
1180 1409
1181 $self->SUPER::add (@widgets); 1410 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1411 $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}; 1412 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1413}
1185 1414
1186sub border { 1415sub border {
1187 int $_[0]{border} * $::FONTSIZE 1416 int $_[0]{border} * $::FONTSIZE
1188} 1417}
… …
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1319 1548
1320 my $border = $self->border; 1549 my $border = $self->border;
1321 1550
1322 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1323 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1324 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1325 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1326 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1556
1557 # move
1558 my $w2 = ($w - $border) * .5;
1559 my $h2 = ($h - $border) * .5;
1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1563
1564 # resize
1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1567 unless $self->{has_close_button};
1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1327 1570
1328 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1571 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1329 glColor @{ $self->{bg} }; 1572 glColor @{ $self->{bg} };
1330 1573
1331 # TODO: repeat texture not scale 1574 # TODO: repeat texture not scale
… …
1350 if $self->{close_button}; 1593 if $self->{close_button};
1351} 1594}
1352 1595
1353############################################################################# 1596#############################################################################
1354 1597
1355package CFClient::UI::Table; 1598package CFPlus::UI::Table;
1356 1599
1357our @ISA = CFClient::UI::Base::; 1600our @ISA = CFPlus::UI::Container::;
1358 1601
1359use List::Util qw(max sum); 1602use List::Util qw(max sum);
1360 1603
1361use CFClient::OpenGL; 1604use CFPlus::OpenGL;
1362 1605
1363sub new { 1606sub new {
1364 my $class = shift; 1607 my $class = shift;
1365 1608
1366 $class->SUPER::new ( 1609 $class->SUPER::new (
1367 col_expand => [], 1610 col_expand => [],
1611 row_expand => [],
1368 @_, 1612 @_,
1369 ) 1613 )
1370} 1614}
1371 1615
1372sub children {
1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1374}
1375
1376sub add { 1616sub add {
1617 my ($self, @widgets) = @_;
1618
1619 for my $child (@widgets) {
1620 $child->{rowspan} ||= 1;
1621 $child->{colspan} ||= 1;
1622 }
1623
1624 $self->SUPER::add (@widgets);
1625}
1626
1627sub add_at {
1377 my ($self) = shift; 1628 my $self = shift;
1629
1630 my @widgets;
1378 1631
1379 while (@_) { 1632 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, (); 1633 my ($col, $row, $child) = splice @_, 0, 3, ();
1381 $child->set_parent ($self);
1382 $self->{children}[$y][$x] = $child;
1383 }
1384 1634
1385 $self->{force_realloc} = 1; 1635 $child->{row} = $row;
1386 $self->{force_size_alloc} = 1; 1636 $child->{col} = $col;
1387 $self->realloc;
1388}
1389 1637
1390sub remove { 1638 push @widgets, $child;
1639 }
1640
1641 $self->add (@widgets);
1642}
1643
1644sub get_wh {
1391 my ($self, $child) = @_; 1645 my ($self) = @_;
1392 1646
1393 # TODO: not yet implemented 1647 my (@w, @h);
1394}
1395
1396# TODO: move to container class maybe? send children a signal on removal?
1397sub clear {
1398 my ($self) = @_;
1399 1648
1400 my @children = $self->children; 1649 my @children = $self->children;
1401 delete $self->{children}; 1650
1651 # first pass, columns
1652 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1653 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1654
1655 my $sw = sum @w[$c .. $c + $cs - 1];
1656
1657 if ($w > $sw) {
1658 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1659 }
1402 1660 }
1403 for (@children) {
1404 delete $_->{parent};
1405 $_->hide;
1406 }
1407 1661
1408 $self->realloc; 1662 # second pass, rows
1409} 1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1410
1411sub get_wh {
1412 my ($self) = @_;
1413
1414 my (@w, @h);
1415
1416 for my $y (0 .. $#{$self->{children}}) {
1417 my $row = $self->{children}[$y]
1418 or next;
1419
1420 for my $x (0 .. $#$row) {
1421 my $widget = $row->[$x]
1422 or next;
1423 my ($w, $h) = @$widget{qw(req_w req_h)}; 1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1424 1665
1425 $w[$x] = max $w[$x], $w; 1666 my $sh = sum @h[$r .. $r + $rs - 1];
1426 $h[$y] = max $h[$y], $h; 1667
1668 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1427 } 1670 }
1428 } 1671 }
1429 1672
1430 (\@w, \@h) 1673 (\@w, \@h)
1431} 1674}
… …
1447 my ($ws, $hs) = $self->get_wh; 1690 my ($ws, $hs) = $self->get_wh;
1448 1691
1449 my $req_w = (sum @$ws) || 1; 1692 my $req_w = (sum @$ws) || 1;
1450 my $req_h = (sum @$hs) || 1; 1693 my $req_h = (sum @$hs) || 1;
1451 1694
1452 # TODO: nicer code && do row_expand 1695 # now linearly scale the rows/columns to the allocated size
1453 my @col_expand = @{$self->{col_expand}}; 1696 my @col_expand = @{$self->{col_expand}};
1454 @col_expand = (1) x @$ws unless @col_expand; 1697 @col_expand = (1) x @$ws unless @col_expand;
1455 my $col_expand = (sum @col_expand) || 1; 1698 my $col_expand = (sum @col_expand) || 1;
1456 1699
1457 # linearly scale sizes
1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1700 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460 1701
1461 CFClient::UI::harmonize $ws; 1702 CFPlus::UI::harmonize $ws;
1703
1704 my @row_expand = @{$self->{row_expand}};
1705 @row_expand = (1) x @$ws unless @row_expand;
1706 my $row_expand = (sum @row_expand) || 1;
1707
1708 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1709
1462 CFClient::UI::harmonize $hs; 1710 CFPlus::UI::harmonize $hs;
1463 1711
1464 my $y; 1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1465 1714
1466 for my $r (0 .. $#{$self->{children}}) { 1715 for my $widget ($self->children) {
1467 my $row = $self->{children}[$r] 1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1468 or next;
1469 1717
1470 my $x = 0; 1718 $widget->configure (
1471 my $row_h = $hs->[$r]; 1719 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1472 1721 );
1473 for my $c (0 .. $#$row) { 1722 }
1474 my $col_w = $ws->[$c];
1475 1723
1476 if (my $widget = $row->[$c]) { 1724 1
1477 $widget->configure ($x, $y, $col_w, $row_h); 1725}
1478 }
1479 1726
1480 $x += $col_w; 1727#############################################################################
1728
1729package CFPlus::UI::Fixed;
1730
1731use List::Util qw(min max);
1732
1733our @ISA = CFPlus::UI::Container::;
1734
1735sub add_fixed {
1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1737
1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1739 $self->SUPER::add ($child);
1740}
1741
1742sub _scale($$$) {
1743 my ($mode, $val, $max) = @_;
1744
1745 $mode eq "abs" ? $val
1746 : $mode eq "rel" ? $val * $max
1747 : 0
1748}
1749
1750sub size_request {
1751 my ($self) = @_;
1752
1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1754
1755 # determine overall size by querying abs widgets
1756 for my $child ($self->visible_children) {
1757 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1758
1759 if ($pos eq "abs") {
1760 $w = _scale $size, $w, $child->{req_w};
1761 $h = _scale $size, $h, $child->{req_h};
1762
1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1481 } 1765 }
1766 }
1482 1767
1483 $y += $row_h; 1768 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1;
1770
1771 # now layout remaining widgets
1772 for my $child ($self->visible_children) {
1773 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1774
1775 if ($pos ne "abs") {
1776 $x = _scale $pos, $x, $W;
1777 $y = _scale $pos, $x, $H;
1778 $w = _scale $size, $w, $child->{req_w};
1779 $h = _scale $size, $h, $child->{req_h};
1780
1781 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1782 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1783 }
1784 }
1785
1786 my $W = $x2 - $x1;
1787 my $H = $y2 - $y1;
1788
1789 ($W, $H)
1790}
1791
1792sub invoke_size_allocate {
1793 my ($self, $W, $H) = @_;
1794
1795 for my $child ($self->visible_children) {
1796 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1797
1798 $x = _scale $pos, $x, $W;
1799 $y = _scale $pos, $x, $H;
1800 $w = _scale $size, $w, $child->{req_w};
1801 $h = _scale $size, $h, $child->{req_h};
1802
1803 $child->configure ($x, $y, $w, $h);
1484 } 1804 }
1485 1805
1486 1 1806 1
1487} 1807}
1488 1808
1489sub find_widget {
1490 my ($self, $x, $y) = @_;
1491
1492 $x -= $self->{x};
1493 $y -= $self->{y};
1494
1495 my $res;
1496
1497 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1498 $res = $_->find_widget ($x, $y)
1499 and return $res;
1500 }
1501
1502 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1503}
1504
1505sub _draw {
1506 my ($self) = @_;
1507
1508 for (grep $_, @{$self->{children}}) {
1509 $_->draw for grep $_, @$_;
1510 }
1511}
1512
1513############################################################################# 1809#############################################################################
1514 1810
1515package CFClient::UI::Box; 1811package CFPlus::UI::Box;
1516 1812
1517our @ISA = CFClient::UI::Container::; 1813our @ISA = CFPlus::UI::Container::;
1518 1814
1519sub size_request { 1815sub size_request {
1520 my ($self) = @_; 1816 my ($self) = @_;
1521 1817
1522 $self->{vertical} 1818 $self->{vertical}
… …
1555 $req[$_] += $space * $children[$_]{expand} 1851 $req[$_] += $space * $children[$_]{expand}
1556 for 0 .. $#children; 1852 for 0 .. $#children;
1557 } 1853 }
1558 } 1854 }
1559 1855
1560 CFClient::UI::harmonize \@req; 1856 CFPlus::UI::harmonize \@req;
1561 1857
1562 my $pos = 0; 1858 my $pos = 0;
1563 for (0 .. $#children) { 1859 for (0 .. $#children) {
1564 my $alloc = $req[$_]; 1860 my $alloc = $req[$_];
1565 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1861 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1570 1 1866 1
1571} 1867}
1572 1868
1573############################################################################# 1869#############################################################################
1574 1870
1575package CFClient::UI::HBox; 1871package CFPlus::UI::HBox;
1576 1872
1577our @ISA = CFClient::UI::Box::; 1873our @ISA = CFPlus::UI::Box::;
1578 1874
1579sub new { 1875sub new {
1580 my $class = shift; 1876 my $class = shift;
1581 1877
1582 $class->SUPER::new ( 1878 $class->SUPER::new (
… …
1585 ) 1881 )
1586} 1882}
1587 1883
1588############################################################################# 1884#############################################################################
1589 1885
1590package CFClient::UI::VBox; 1886package CFPlus::UI::VBox;
1591 1887
1592our @ISA = CFClient::UI::Box::; 1888our @ISA = CFPlus::UI::Box::;
1593 1889
1594sub new { 1890sub new {
1595 my $class = shift; 1891 my $class = shift;
1596 1892
1597 $class->SUPER::new ( 1893 $class->SUPER::new (
… …
1600 ) 1896 )
1601} 1897}
1602 1898
1603############################################################################# 1899#############################################################################
1604 1900
1605package CFClient::UI::Label; 1901package CFPlus::UI::Label;
1606 1902
1607our @ISA = CFClient::UI::DrawBG::; 1903our @ISA = CFPlus::UI::DrawBG::;
1608 1904
1609use CFClient::OpenGL; 1905use CFPlus::OpenGL;
1610 1906
1611sub new { 1907sub new {
1612 my ($class, %arg) = @_; 1908 my ($class, %arg) = @_;
1613 1909
1614 my $self = $class->SUPER::new ( 1910 my $self = $class->SUPER::new (
… …
1617 #active_bg => none 1913 #active_bg => none
1618 #font => default_font 1914 #font => default_font
1619 #text => initial text 1915 #text => initial text
1620 #markup => initial narkup 1916 #markup => initial narkup
1621 #max_w => maximum pixel width 1917 #max_w => maximum pixel width
1918 #style => 0, # render flags
1622 ellipsise => 3, # end 1919 ellipsise => 3, # end
1623 layout => (new CFClient::Layout), 1920 layout => (new CFPlus::Layout),
1624 fontsize => 1, 1921 fontsize => 1,
1625 align => -1, 1922 align => -1,
1626 valign => -1, 1923 valign => -1,
1627 padding_x => 2, 1924 padding_x => 2,
1628 padding_y => 2, 1925 padding_y => 2,
1629 can_events => 0, 1926 can_events => 0,
1630 %arg 1927 %arg
1631 ); 1928 );
1632 1929
1633 if (exists $self->{template}) { 1930 if (exists $self->{template}) {
1634 my $layout = new CFClient::Layout; 1931 my $layout = new CFPlus::Layout;
1635 $layout->set_text (delete $self->{template}); 1932 $layout->set_text (delete $self->{template});
1636 $self->{template} = $layout; 1933 $self->{template} = $layout;
1637 } 1934 }
1638 1935
1639 if (exists $self->{markup}) { 1936 if (exists $self->{markup}) {
… …
1777 }; 2074 };
1778 2075
1779 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2076 my $w = List::Util::min $self->{w} + 4, $size->[0];
1780 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2077 my $h = List::Util::min $self->{h} + 2, $size->[1];
1781 2078
1782 $self->{layout}->render ($self->{ox}, $self->{oy}); 2079 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783} 2080}
1784 2081
1785############################################################################# 2082#############################################################################
1786 2083
1787package CFClient::UI::EntryBase; 2084package CFPlus::UI::EntryBase;
1788 2085
1789our @ISA = CFClient::UI::Label::; 2086our @ISA = CFPlus::UI::Label::;
1790 2087
1791use CFClient::OpenGL; 2088use CFPlus::OpenGL;
1792 2089
1793sub new { 2090sub new {
1794 my $class = shift; 2091 my $class = shift;
1795 2092
1796 $class->SUPER::new ( 2093 $class->SUPER::new (
… …
1800 active_fg => [0, 0, 0], 2097 active_fg => [0, 0, 0],
1801 can_hover => 1, 2098 can_hover => 1,
1802 can_focus => 1, 2099 can_focus => 1,
1803 valign => 0, 2100 valign => 0,
1804 can_events => 1, 2101 can_events => 1,
2102 ellipsise => 0,
1805 #text => ... 2103 #text => ...
1806 #hidden => "*", 2104 #hidden => "*",
1807 @_ 2105 @_
1808 ) 2106 )
1809} 2107}
… …
1854 my $sym = $ev->{sym}; 2152 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2153 my $uni = $ev->{unicode};
1856 2154
1857 my $text = $self->get_text; 2155 my $text = $self->get_text;
1858 2156
2157 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2158
1859 if ($uni == 8) { 2159 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFClient::SDLK_LEFT) { 2163 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFClient::SDLK_RIGHT) { 2165 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFClient::SDLK_HOME) { 2167 } elsif ($sym == CFPlus::SDLK_HOME) {
2168 # what a hack
2169 $self->{cursor} =
2170 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2171 ? length $1
2172 : 0;
2173 } elsif ($sym == CFPlus::SDLK_END) {
2174 # uh, again
2175 $self->{cursor} =
2176 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2177 ? $self->{cursor} + length $1
2178 : length $self->{text};
2179 } elsif ($uni == 21) { # ctrl-u
2180 $text = "";
1868 $self->{cursor} = 0; 2181 $self->{cursor} = 0;
1869 } elsif ($sym == CFClient::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2182 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2183 $self->emit ('escape');
1873 } elsif ($uni) { 2184 } elsif ($uni == 0x0d) {
2185 substr $text, $self->{cursor}++, 0, "\012";
2186 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2187 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2188 } else {
1876 return 0; 2189 return 0;
1877 } 2190 }
1878 2191
1879 $self->_set_text ($text); 2192 $self->_set_text ($text);
1880 2193
1881 $self->realloc; 2194 $self->realloc;
2195 $self->update;
1882 2196
1883 1 2197 1
1884} 2198}
1885 2199
1886sub invoke_focus_in { 2200sub invoke_focus_in {
… …
1948 utf8::encode $text; 2262 utf8::encode $text;
1949 2263
1950 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2264 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1951 } 2265 }
1952 2266
1953 glColor @{$self->{fg}};
1954 glBegin GL_LINES; 2267 glBegin GL_LINES;
1955 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 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}; 2269 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957 glEnd; 2270 glEnd;
1958 } 2271 }
1959} 2272}
1960 2273
2274#############################################################################
2275
1961package CFClient::UI::Entry; 2276package CFPlus::UI::Entry;
1962 2277
1963our @ISA = CFClient::UI::EntryBase::; 2278our @ISA = CFPlus::UI::EntryBase::;
1964 2279
1965use CFClient::OpenGL; 2280use CFPlus::OpenGL;
1966 2281
1967sub invoke_key_down { 2282sub invoke_key_down {
1968 my ($self, $ev) = @_; 2283 my ($self, $ev) = @_;
1969 2284
1970 my $sym = $ev->{sym}; 2285 my $sym = $ev->{sym};
1971 2286
1972 if ($sym == 13) { 2287 if ($ev->{uni} == 0x0d || $sym == 13) {
1973 unshift @{$self->{history}}, 2288 unshift @{$self->{history}},
1974 my $txt = $self->get_text; 2289 my $txt = $self->get_text;
1975 2290
1976 $self->{history_pointer} = -1; 2291 $self->{history_pointer} = -1;
1977 $self->{history_saveback} = ''; 2292 $self->{history_saveback} = '';
1978 $self->emit (activate => $txt); 2293 $self->emit (activate => $txt);
1979 $self->update; 2294 $self->update;
1980 2295
1981 } elsif ($sym == CFClient::SDLK_UP) { 2296 } elsif ($sym == CFPlus::SDLK_UP) {
1982 if ($self->{history_pointer} < 0) { 2297 if ($self->{history_pointer} < 0) {
1983 $self->{history_saveback} = $self->get_text; 2298 $self->{history_saveback} = $self->get_text;
1984 } 2299 }
1985 if (@{$self->{history} || []} > 0) { 2300 if (@{$self->{history} || []} > 0) {
1986 $self->{history_pointer}++; 2301 $self->{history_pointer}++;
… …
1988 $self->{history_pointer} = @{$self->{history} || []} - 1; 2303 $self->{history_pointer} = @{$self->{history} || []} - 1;
1989 } 2304 }
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2305 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1991 } 2306 }
1992 2307
1993 } elsif ($sym == CFClient::SDLK_DOWN) { 2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
1994 $self->{history_pointer}--; 2309 $self->{history_pointer}--;
1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2310 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1996 2311
1997 if ($self->{history_pointer} >= 0) { 2312 if ($self->{history_pointer} >= 0) {
1998 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2313 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
2007 1 2322 1
2008} 2323}
2009 2324
2010############################################################################# 2325#############################################################################
2011 2326
2327package CFPlus::UI::TextEdit;
2328
2329our @ISA = CFPlus::UI::EntryBase::;
2330
2331use CFPlus::OpenGL;
2332
2333sub move_cursor_ver {
2334 my ($self, $dy) = @_;
2335
2336 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2337
2338 $y += $dy;
2339
2340 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2341 $self->{cursor} = $index;
2342 delete $self->{cur_h};
2343 $self->update;
2344 return;
2345 }
2346}
2347
2348sub invoke_key_down {
2349 my ($self, $ev) = @_;
2350
2351 my $sym = $ev->{sym};
2352
2353 if ($sym == CFPlus::SDLK_UP) {
2354 $self->move_cursor_ver (-1);
2355 } elsif ($sym == CFPlus::SDLK_DOWN) {
2356 $self->move_cursor_ver (+1);
2357 } else {
2358 return $self->SUPER::invoke_key_down ($ev)
2359 }
2360
2361 1
2362}
2363
2364#############################################################################
2365
2012package CFClient::UI::Button; 2366package CFPlus::UI::Button;
2013 2367
2014our @ISA = CFClient::UI::Label::; 2368our @ISA = CFPlus::UI::Label::;
2015 2369
2016use CFClient::OpenGL; 2370use CFPlus::OpenGL;
2017 2371
2018my @tex = 2372my @tex =
2019 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2373 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020 qw(b1_button_active.png); 2374 qw(b1_button_inactive.png b1_button_active.png);
2021 2375
2022sub new { 2376sub new {
2023 my $class = shift; 2377 my $class = shift;
2024 2378
2025 $class->SUPER::new ( 2379 $class->SUPER::new (
2026 padding_x => 4, 2380 padding_x => 4,
2027 padding_y => 4, 2381 padding_y => 4,
2028 fg => [1, 1, 1], 2382 fg => [1.0, 1.0, 1.0],
2029 active_fg => [0, 0, 1], 2383 active_fg => [0.8, 0.8, 0.8],
2030 can_hover => 1, 2384 can_hover => 1,
2031 align => 0, 2385 align => 0,
2032 valign => 0, 2386 valign => 0,
2033 can_events => 1, 2387 can_events => 1,
2034 @_ 2388 @_
… …
2052 2406
2053 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
2056 2410
2411 my $tex = $tex[$GRAB == $self];
2057 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2058 2413
2059 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
2060 2415
2061 $self->SUPER::_draw; 2416 $self->SUPER::_draw;
2062} 2417}
2063 2418
2064############################################################################# 2419#############################################################################
2065 2420
2066package CFClient::UI::CheckBox; 2421package CFPlus::UI::CheckBox;
2067 2422
2068our @ISA = CFClient::UI::DrawBG::; 2423our @ISA = CFPlus::UI::DrawBG::;
2069 2424
2070my @tex = 2425my @tex =
2071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2427 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073 2428
2074use CFClient::OpenGL; 2429use CFPlus::OpenGL;
2075 2430
2076sub new { 2431sub new {
2077 my $class = shift; 2432 my $class = shift;
2078 2433
2079 $class->SUPER::new ( 2434 $class->SUPER::new (
… …
2136 glDisable GL_TEXTURE_2D; 2491 glDisable GL_TEXTURE_2D;
2137} 2492}
2138 2493
2139############################################################################# 2494#############################################################################
2140 2495
2141package CFClient::UI::Image; 2496package CFPlus::UI::Image;
2142 2497
2143our @ISA = CFClient::UI::Base::; 2498our @ISA = CFPlus::UI::Base::;
2144 2499
2145use CFClient::OpenGL; 2500use CFPlus::OpenGL;
2146 2501
2147our %texture_cache; 2502our %texture_cache;
2148 2503
2149sub new { 2504sub new {
2150 my $class = shift; 2505 my $class = shift;
… …
2156 2511
2157 $self->{path} || $self->{tex} 2512 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required"; 2513 or Carp::croak "'path' or 'tex' attributes required";
2159 2514
2160 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2515 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2161 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2516 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162 2517
2163 Scalar::Util::weaken $texture_cache{$self->{path}}; 2518 CFPlus::weaken $texture_cache{$self->{path}};
2164 2519
2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2520 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166 2521
2167 $self 2522 $self
2168} 2523}
2169 2524
2170sub STORABLE_freeze { 2525sub STORABLE_freeze {
2171 my ($self, $cloning) = @_; 2526 my ($self, $cloning) = @_;
2172 2527
2173 $self->{path} 2528 $self->{path}
2174 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2529 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175 2530
2176 $self->{path} 2531 $self->{path}
2177} 2532}
2178 2533
2179sub STORABLE_attach { 2534sub STORABLE_attach {
… …
2210 glDisable GL_TEXTURE_2D; 2565 glDisable GL_TEXTURE_2D;
2211} 2566}
2212 2567
2213############################################################################# 2568#############################################################################
2214 2569
2215package CFClient::UI::ImageButton; 2570package CFPlus::UI::ImageButton;
2216 2571
2217our @ISA = CFClient::UI::Image::; 2572our @ISA = CFPlus::UI::Image::;
2218 2573
2219use CFClient::OpenGL; 2574use CFPlus::OpenGL;
2220 2575
2221my %textures; 2576my %textures;
2222 2577
2223sub new { 2578sub new {
2224 my $class = shift; 2579 my $class = shift;
… …
2246 1 2601 1
2247} 2602}
2248 2603
2249############################################################################# 2604#############################################################################
2250 2605
2251package CFClient::UI::VGauge; 2606package CFPlus::UI::VGauge;
2252 2607
2253our @ISA = CFClient::UI::Base::; 2608our @ISA = CFPlus::UI::Base::;
2254 2609
2255use List::Util qw(min max); 2610use List::Util qw(min max);
2256 2611
2257use CFClient::OpenGL; 2612use CFPlus::OpenGL;
2258 2613
2259my %tex = ( 2614my %tex = (
2260 food => [ 2615 food => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2617 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2263 ], 2618 ],
2264 grace => [ 2619 grace => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2620 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/ 2621 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2267 ], 2622 ],
2268 hp => [ 2623 hp => [
2269 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2624 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2625 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2271 ], 2626 ],
2272 mana => [ 2627 mana => [
2273 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2628 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/ 2629 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2275 ], 2630 ],
2276); 2631);
2277 2632
2278# eg. VGauge->new (gauge => 'food'), default gauge: food 2633# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2381 glDisable GL_TEXTURE_2D; 2736 glDisable GL_TEXTURE_2D;
2382} 2737}
2383 2738
2384############################################################################# 2739#############################################################################
2385 2740
2386package CFClient::UI::Gauge; 2741package CFPlus::UI::Gauge;
2387 2742
2388our @ISA = CFClient::UI::VBox::; 2743our @ISA = CFPlus::UI::VBox::;
2389 2744
2390sub new { 2745sub new {
2391 my ($class, %arg) = @_; 2746 my ($class, %arg) = @_;
2392 2747
2393 my $self = $class->SUPER::new ( 2748 my $self = $class->SUPER::new (
… …
2395 can_hover => 1, 2750 can_hover => 1,
2396 can_events => 1, 2751 can_events => 1,
2397 %arg, 2752 %arg,
2398 ); 2753 );
2399 2754
2400 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2755 $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); 2756 $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"); 2757 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2403 2758
2404 $self 2759 $self
2405} 2760}
2406 2761
2407sub set_fontsize { 2762sub set_fontsize {
… …
2428 $self->{value}->set_text ($val); 2783 $self->{value}->set_text ($val);
2429} 2784}
2430 2785
2431############################################################################# 2786#############################################################################
2432 2787
2433package CFClient::UI::Slider; 2788package CFPlus::UI::Slider;
2434 2789
2435use strict; 2790use strict;
2436 2791
2437use CFClient::OpenGL; 2792use CFPlus::OpenGL;
2438 2793
2439our @ISA = CFClient::UI::DrawBG::; 2794our @ISA = CFPlus::UI::DrawBG::;
2440 2795
2441my @tex = 2796my @tex =
2442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2797 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2443 qw(s1_slider.png s1_slider_bg.png); 2798 qw(s1_slider.png s1_slider_bg.png);
2444 2799
2445sub new { 2800sub new {
2446 my $class = shift; 2801 my $class = shift;
2447 2802
… …
2541sub invoke_mouse_wheel { 2896sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_; 2897 my ($self, $ev) = @_;
2543 2898
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2899 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545 2900
2901 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2902
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2903 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547 2904
2548 ! ! $delta 2905 ! ! $delta
2549} 2906}
2550 2907
2551sub update { 2908sub update {
… …
2602 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2603} 2960}
2604 2961
2605############################################################################# 2962#############################################################################
2606 2963
2607package CFClient::UI::ValSlider; 2964package CFPlus::UI::ValSlider;
2608 2965
2609our @ISA = CFClient::UI::HBox::; 2966our @ISA = CFPlus::UI::HBox::;
2610 2967
2611sub new { 2968sub new {
2612 my ($class, %arg) = @_; 2969 my ($class, %arg) = @_;
2613 2970
2614 my $range = delete $arg{range}; 2971 my $range = delete $arg{range};
2615 2972
2616 my $self = $class->SUPER::new ( 2973 my $self = $class->SUPER::new (
2617 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2974 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2618 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2975 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2619 to_value => sub { shift }, 2976 to_value => sub { shift },
2620 from_value => sub { shift }, 2977 from_value => sub { shift },
2621 %arg, 2978 %arg,
2622 ); 2979 );
2623 2980
… …
2643sub set_range { shift->{slider}->set_range (@_) } 3000sub set_range { shift->{slider}->set_range (@_) }
2644sub set_value { shift->{slider}->set_value (@_) } 3001sub set_value { shift->{slider}->set_value (@_) }
2645 3002
2646############################################################################# 3003#############################################################################
2647 3004
2648package CFClient::UI::TextScroller; 3005package CFPlus::UI::TextScroller;
2649 3006
2650our @ISA = CFClient::UI::HBox::; 3007our @ISA = CFPlus::UI::HBox::;
2651 3008
2652use CFClient::OpenGL; 3009use CFPlus::OpenGL;
2653 3010
2654sub new { 3011sub new {
2655 my $class = shift; 3012 my $class = shift;
2656 3013
2657 my $self = $class->SUPER::new ( 3014 my $self = $class->SUPER::new (
… …
2659 can_events => 1, 3016 can_events => 1,
2660 indent => 0, 3017 indent => 0,
2661 #font => default_font 3018 #font => default_font
2662 @_, 3019 @_,
2663 3020
2664 layout => (new CFClient::Layout), 3021 layout => (new CFPlus::Layout),
2665 par => [], 3022 par => [],
3023 max_par => 0,
2666 height => 0, 3024 height => 0,
2667 children => [ 3025 children => [
2668 (new CFClient::UI::Empty expand => 1), 3026 (new CFPlus::UI::Empty expand => 1),
2669 (new CFClient::UI::Slider vertical => 1), 3027 (new CFPlus::UI::Slider vertical => 1),
2670 ], 3028 ],
2671 ); 3029 );
2672 3030
2673 $self->{children}[1]->connect (changed => sub { $self->update }); 3031 $self->{children}[1]->connect (changed => sub { $self->update });
2674 3032
… …
2749sub set_offset { 3107sub set_offset {
2750 my ($self, $offset) = @_; 3108 my ($self, $offset) = @_;
2751 3109
2752 # todo: base offset on lines or so, not on pixels 3110 # todo: base offset on lines or so, not on pixels
2753 $self->{children}[1]->set_value ($offset); 3111 $self->{children}[1]->set_value ($offset);
3112}
3113
3114sub current_paragraph {
3115 my ($self) = @_;
3116
3117 $self->{top_paragraph} - 1
3118}
3119
3120sub scroll_to {
3121 my ($self, $para) = @_;
3122
3123 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3124
3125 $self->{scroll_to} = $para;
3126 $self->update;
2754} 3127}
2755 3128
2756sub clear { 3129sub clear {
2757 my ($self) = @_; 3130 my ($self) = @_;
2758 3131
… …
2780 3153
2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3154 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para; 3155 push @{$self->{par}}, $para;
2783 } 3156 }
2784 3157
3158 if (my $max = $self->{max_par}) {
3159 shift @{$self->{par}} while @{$self->{par}} > $max;
3160 }
3161
2785 $self->{need_reflow}++; 3162 $self->{need_reflow}++;
2786 $self->update; 3163 $self->update;
2787} 3164}
2788 3165
2789sub scroll_to_bottom { 3166sub scroll_to_bottom {
2790 my ($self) = @_; 3167 my ($self) = @_;
2791 3168
2792 $self->{scroll_to_bottom} = 1; 3169 $self->{scroll_to} = $#{$self->{par}};
2793 $self->update; 3170 $self->update;
2794} 3171}
2795 3172
3173sub force_uptodate {
3174 my ($self) = @_;
3175
3176 if (delete $self->{need_reflow}) {
3177 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3178
3179 my $height = 0;
3180
3181 for my $para (@{$self->{par}}) {
3182 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3183 my $layout = $self->get_layout ($para);
3184 my ($w, $h) = $layout->size;
3185
3186 $para->{w} = $w + $para->{indent};
3187 $para->{h} = $h;
3188 $para->{wrapped} = $layout->has_wrapped;
3189 }
3190
3191 $para->{y} = $height;
3192 $height += $para->{h};
3193 }
3194
3195 $self->{height} = $height;
3196 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3197
3198 delete $self->{texture};
3199 }
3200
3201 if (my $paridx = delete $self->{scroll_to}) {
3202 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3203 }
3204}
3205
2796sub update { 3206sub update {
2797 my ($self) = @_; 3207 my ($self) = @_;
2798 3208
2799 $self->SUPER::update; 3209 $self->SUPER::update;
2800 3210
2801 return unless $self->{h} > 0; 3211 return unless $self->{h} > 0;
2802 3212
2803 delete $self->{texture}; 3213 delete $self->{texture};
2804 3214
2805 $ROOT->on_post_alloc ($self => sub { 3215 $ROOT->on_post_alloc ($self => sub {
3216 $self->force_uptodate;
3217
2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3218 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807 3219
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 { 3220 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836 glClearColor 0, 0, 0, 0; 3221 glClearColor 0, 0, 0, 0;
2837 glClear GL_COLOR_BUFFER_BIT; 3222 glClear GL_COLOR_BUFFER_BIT;
2838 3223
3224 package CFPlus::UI::Base;
3225 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3226 (0, 0, $self->{w}, $self->{h});
3227
3228 my $top = int $self->{children}[1]{range}[0];
3229
3230 my $paridx = 0;
3231 my $top_paragraph;
2839 my $top = int $self->{children}[1]{range}[0]; 3232 my $top = int $self->{children}[1]{range}[0];
2840 3233
2841 my $y0 = $top; 3234 my $y0 = $top;
2842 my $y1 = $top + $H; 3235 my $y1 = $top + $H;
2843 3236
2844 my $y = 0;
2845
2846 for my $para (@{$self->{par}}) { 3237 for my $para (@{$self->{par}}) {
2847 my $h = $para->{h}; 3238 my $h = $para->{h};
3239 my $y = $para->{y};
2848 3240
2849 if ($y0 < $y + $h && $y < $y1) { 3241 if ($y0 < $y + $h && $y < $y1) {
2850
2851 my $layout = $self->get_layout ($para); 3242 my $layout = $self->get_layout ($para);
2852 3243
2853 $layout->render ($para->{indent}, $y - $y0); 3244 $layout->render ($para->{indent}, $y - $y0);
2854 3245
2855 if (my @w = @{ $para->{widget} }) { 3246 if (my @w = @{ $para->{widget} }) {
… …
2864 $_->draw; 3255 $_->draw;
2865 } 3256 }
2866 } 3257 }
2867 } 3258 }
2868 3259
2869 $y += $h; 3260 $paridx++;
3261 $top_paragraph ||= $paridx if $y >= $top;
2870 } 3262 }
3263
3264 $self->{top_paragraph} = $top_paragraph;
2871 }; 3265 };
2872 }); 3266 });
2873} 3267}
2874 3268
2875sub reconfigure { 3269sub reconfigure {
… …
2893 $self->{children}[1]->draw; 3287 $self->{children}[1]->draw;
2894} 3288}
2895 3289
2896############################################################################# 3290#############################################################################
2897 3291
2898package CFClient::UI::Animator; 3292package CFPlus::UI::Animator;
2899 3293
2900use CFClient::OpenGL; 3294use CFPlus::OpenGL;
2901 3295
2902our @ISA = CFClient::UI::Bin::; 3296our @ISA = CFPlus::UI::Bin::;
2903 3297
2904sub moveto { 3298sub moveto {
2905 my ($self, $x, $y) = @_; 3299 my ($self, $x, $y) = @_;
2906 3300
2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3301 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2935 glPopMatrix; 3329 glPopMatrix;
2936} 3330}
2937 3331
2938############################################################################# 3332#############################################################################
2939 3333
2940package CFClient::UI::Flopper; 3334package CFPlus::UI::Flopper;
2941 3335
2942our @ISA = CFClient::UI::Button::; 3336our @ISA = CFPlus::UI::Button::;
2943 3337
2944sub new { 3338sub new {
2945 my $class = shift; 3339 my $class = shift;
2946 3340
2947 my $self = $class->SUPER::new ( 3341 my $self = $class->SUPER::new (
… …
2959 $self->{other}->toggle_visibility; 3353 $self->{other}->toggle_visibility;
2960} 3354}
2961 3355
2962############################################################################# 3356#############################################################################
2963 3357
2964package CFClient::UI::Tooltip; 3358package CFPlus::UI::Tooltip;
2965 3359
2966our @ISA = CFClient::UI::Bin::; 3360our @ISA = CFPlus::UI::Bin::;
2967 3361
2968use CFClient::OpenGL; 3362use CFPlus::OpenGL;
2969 3363
2970sub new { 3364sub new {
2971 my $class = shift; 3365 my $class = shift;
2972 3366
2973 $class->SUPER::new ( 3367 $class->SUPER::new (
… …
2976 ) 3370 )
2977} 3371}
2978 3372
2979sub set_tooltip_from { 3373sub set_tooltip_from {
2980 my ($self, $widget) = @_; 3374 my ($self, $widget) = @_;
3375
3376 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3377 if $widget->{tooltip} =~ /^#(.*)$/;
2981 3378
2982 my $tooltip = $widget->{tooltip}; 3379 my $tooltip = $widget->{tooltip};
2983 3380
2984 if ($ENV{CFPLUS_DEBUG} & 2) { 3381 if ($ENV{CFPLUS_DEBUG} & 2) {
2985 $tooltip .= "\n\n" . (ref $widget) . "\n" 3382 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2989 } 3386 }
2990 3387
2991 $tooltip =~ s/^\n+//; 3388 $tooltip =~ s/^\n+//;
2992 $tooltip =~ s/\n+$//; 3389 $tooltip =~ s/\n+$//;
2993 3390
2994 $self->add (new CFClient::UI::Label 3391 $self->add (new CFPlus::UI::Label
2995 markup => $tooltip, 3392 markup => $tooltip,
2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3393 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997 fontsize => 0.8, 3394 fontsize => 0.8,
2998 fg => [0, 0, 0, 1], 3395 style => 1, # FLAG_INVERSE
2999 ellipsise => 0, 3396 ellipsise => 0,
3000 font => ($widget->{tooltip_font} || $::FONT_PROP), 3397 font => ($widget->{tooltip_font} || $::FONT_PROP),
3001 ); 3398 );
3002} 3399}
3003 3400
… …
3065 $self->SUPER::_draw; 3462 $self->SUPER::_draw;
3066} 3463}
3067 3464
3068############################################################################# 3465#############################################################################
3069 3466
3070package CFClient::UI::Face; 3467package CFPlus::UI::Face;
3071 3468
3072our @ISA = CFClient::UI::DrawBG::; 3469our @ISA = CFPlus::UI::DrawBG::;
3073 3470
3074use CFClient::OpenGL; 3471use CFPlus::OpenGL;
3075 3472
3076sub new { 3473sub new {
3077 my $class = shift; 3474 my $class = shift;
3078 3475
3079 my $self = $class->SUPER::new ( 3476 my $self = $class->SUPER::new (
3477 size_w => 32,
3478 size_h => 8,
3080 aspect => 1, 3479 aspect => 1,
3081 can_events => 0, 3480 can_events => 0,
3082 @_, 3481 @_,
3083 ); 3482 );
3084 3483
3085 if ($self->{anim} && $self->{animspeed}) { 3484 if ($self->{anim} && $self->{animspeed}) {
3086 Scalar::Util::weaken (my $widget = $self); 3485 CFPlus::weaken (my $widget = $self);
3087 3486
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3088 $self->{timer} = Event->timer ( 3489 $self->{timer} = Event->timer (
3089 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090 hard => 1, 3490 parked => 1,
3091 interval => $self->{animspeed},
3092 cb => sub { 3491 cb => sub {
3492 return unless $::CONN && $widget;
3493
3093 ++$widget->{frame}; 3494 ++$widget->{frame};
3495 $widget->update_face;
3094 $widget->update; 3496 $widget->update;
3497
3498 $widget->update_timer;
3095 }, 3499 },
3096 ); 3500 );
3501
3502 $self->update_face;
3503 $self->update_timer;
3097 } 3504 }
3098 3505
3099 $self 3506 $self
3100} 3507}
3101 3508
3509sub update_timer {
3510 my ($self) = @_;
3511
3512 return unless $self->{timer};
3513
3514 if ($self->{visible}) {
3515 $self->{timer}->at (
3516 $self->{anim_start}
3517 + $self->{animspeed}
3518 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3519 );
3520 $self->{timer}->start;
3521 } else {
3522 $self->{timer}->stop;
3523 }
3524}
3525
3526sub update_face {
3527 my ($self) = @_;
3528
3529 return unless $::CONN;
3530
3531 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3532 if ($anim && @$anim) {
3533 delete $self->{wait_face};
3534 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3535 }
3536 }
3537}
3538
3102sub size_request { 3539sub size_request {
3103 (32, 8) 3540 my ($self) = @_;
3541
3542 if ($::CONN) {
3543 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3544 if (my $tex = $::CONN->{texture}[$faceid]) {
3545 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3546 } else {
3547 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3548 $self->realloc;
3549 });
3550 }
3551 }
3552 }
3553
3554 ($self->{size_w} || 8, $self->{size_h} || 8)
3104} 3555}
3105 3556
3106sub update { 3557sub update {
3107 my ($self) = @_; 3558 my ($self) = @_;
3108 3559
3109 return unless $self->{visible}; 3560 return unless $self->{visible};
3110 3561
3111 $self->SUPER::update; 3562 $self->SUPER::update;
3112} 3563}
3113 3564
3565sub invoke_visibility_change {
3566 my ($self) = @_;
3567
3568 $self->update_timer;
3569
3570 0
3571}
3572
3114sub _draw { 3573sub _draw {
3115 my ($self) = @_; 3574 my ($self) = @_;
3116 3575
3117 return unless $::CONN; 3576 return unless $::CONN;
3118 3577
3119 $self->SUPER::_draw; 3578 $self->SUPER::_draw;
3120 3579
3121 my $face;
3122
3123 if ($self->{frame}) {
3124 my $anim = $::CONN->{anim}[$self->{anim}]; 3580 my $faceid = $::CONN->{faceid}[$self->{face}]
3125 3581 or return;
3126 $face = $anim->[ $self->{frame} % @$anim ]
3127 if $anim && @$anim;
3128 }
3129 3582
3130 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3583 my $tex = $::CONN->{texture}[$faceid];
3131 3584
3132 if ($tex) { 3585 if ($tex) {
3133 glEnable GL_TEXTURE_2D; 3586 glEnable GL_TEXTURE_2D;
3134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3587 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135 glColor 0, 0, 0, 1; 3588 glColor 0, 0, 0, 1;
… …
3139} 3592}
3140 3593
3141sub destroy { 3594sub destroy {
3142 my ($self) = @_; 3595 my ($self) = @_;
3143 3596
3144 $self->{timer}->cancel 3597 (delete $self->{timer})->cancel
3145 if $self->{timer}; 3598 if $self->{timer};
3146 3599
3147 $self->SUPER::destroy; 3600 $self->SUPER::destroy;
3148} 3601}
3149 3602
3150############################################################################# 3603#############################################################################
3151 3604
3152package CFClient::UI::Buttonbar; 3605package CFPlus::UI::Buttonbar;
3153 3606
3154our @ISA = CFClient::UI::HBox::; 3607our @ISA = CFPlus::UI::HBox::;
3155 3608
3156# TODO: should actualyl wrap buttons and other goodies. 3609# TODO: should actually wrap buttons and other goodies.
3157 3610
3158############################################################################# 3611#############################################################################
3159 3612
3160package CFClient::UI::Menu; 3613package CFPlus::UI::Menu;
3161 3614
3162our @ISA = CFClient::UI::FancyFrame::; 3615our @ISA = CFPlus::UI::Toplevel::;
3163 3616
3164use CFClient::OpenGL; 3617use CFPlus::OpenGL;
3165 3618
3166sub new { 3619sub new {
3167 my $class = shift; 3620 my $class = shift;
3168 3621
3169 my $self = $class->SUPER::new ( 3622 my $self = $class->SUPER::new (
3170 items => [], 3623 items => [],
3171 z => 100, 3624 z => 100,
3172 @_, 3625 @_,
3173 ); 3626 );
3174 3627
3175 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3628 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3176 3629
3177 for my $item (@{ $self->{items} }) { 3630 for my $item (@{ $self->{items} }) {
3178 my ($widget, $cb, $tooltip) = @$item; 3631 my ($widget, $cb, $tooltip) = @$item;
3179 3632
3180 # handle various types of items, only text for now 3633 # handle various types of items, only text for now
3181 if (!ref $widget) { 3634 if (!ref $widget) {
3182 if ($widget =~ /\t/) { 3635 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2; 3636 my ($left, $right) = split /\t/, $widget, 2;
3184 3637
3185 $widget = new CFClient::UI::HBox 3638 $widget = new CFPlus::UI::HBox
3186 can_hover => 1, 3639 can_hover => 1,
3187 can_events => 1, 3640 can_events => 1,
3188 tooltip => $tooltip, 3641 tooltip => $tooltip,
3189 children => [ 3642 children => [
3190 (new CFClient::UI::Label markup => $left, expand => 1), 3643 (new CFPlus::UI::Label markup => $left, expand => 1),
3191 (new CFClient::UI::Label markup => $right, align => +1), 3644 (new CFPlus::UI::Label markup => $right, align => +1),
3192 ], 3645 ],
3193 ; 3646 ;
3194 3647
3195 } else { 3648 } else {
3196 $widget = new CFClient::UI::Label 3649 $widget = new CFPlus::UI::Label
3197 can_hover => 1, 3650 can_hover => 1,
3198 can_events => 1, 3651 can_events => 1,
3199 markup => $widget, 3652 markup => $widget,
3200 tooltip => $tooltip; 3653 tooltip => $tooltip;
3201 } 3654 }
… …
3249 1 3702 1
3250} 3703}
3251 3704
3252############################################################################# 3705#############################################################################
3253 3706
3254package CFClient::UI::Multiplexer; 3707package CFPlus::UI::Multiplexer;
3255 3708
3256our @ISA = CFClient::UI::Container::; 3709our @ISA = CFPlus::UI::Container::;
3257 3710
3258sub new { 3711sub new {
3259 my $class = shift; 3712 my $class = shift;
3260 3713
3261 my $self = $class->SUPER::new ( 3714 my $self = $class->SUPER::new (
… …
3322 $self->{current}->draw; 3775 $self->{current}->draw;
3323} 3776}
3324 3777
3325############################################################################# 3778#############################################################################
3326 3779
3327package CFClient::UI::Notebook; 3780package CFPlus::UI::Notebook;
3328 3781
3329our @ISA = CFClient::UI::VBox::; 3782our @ISA = CFPlus::UI::VBox::;
3330 3783
3331sub new { 3784sub new {
3332 my $class = shift; 3785 my $class = shift;
3333 3786
3334 my $self = $class->SUPER::new ( 3787 my $self = $class->SUPER::new (
3335 buttonbar => (new CFClient::UI::Buttonbar), 3788 buttonbar => (new CFPlus::UI::Buttonbar),
3336 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3789 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3337 # filter => # will be put between multiplexer and $self 3790 # filter => # will be put between multiplexer and $self
3338 @_, 3791 @_,
3339 ); 3792 );
3340 3793
3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3794 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3345} 3798}
3346 3799
3347sub add { 3800sub add {
3348 my ($self, $title, $widget, $tooltip) = @_; 3801 my ($self, $title, $widget, $tooltip) = @_;
3349 3802
3350 Scalar::Util::weaken $self; 3803 CFPlus::weaken $self;
3351 3804
3352 $self->{buttonbar}->add (new CFClient::UI::Button 3805 $self->{buttonbar}->add (new CFPlus::UI::Button
3353 markup => $title, 3806 markup => $title,
3354 tooltip => $tooltip, 3807 tooltip => $tooltip,
3355 on_activate => sub { $self->set_current_page ($widget) }, 3808 on_activate => sub { $self->set_current_page ($widget) },
3356 ); 3809 );
3357 3810
… …
3371 $self->emit (page_changed => $self->{multiplexer}{current}); 3824 $self->emit (page_changed => $self->{multiplexer}{current});
3372} 3825}
3373 3826
3374############################################################################# 3827#############################################################################
3375 3828
3376package CFClient::UI::Selector; 3829package CFPlus::UI::Selector;
3377 3830
3378use utf8; 3831use utf8;
3379 3832
3380our @ISA = CFClient::UI::Button::; 3833our @ISA = CFPlus::UI::Button::;
3381 3834
3382sub new { 3835sub new {
3383 my $class = shift; 3836 my $class = shift;
3384 3837
3385 my $self = $class->SUPER::new ( 3838 my $self = $class->SUPER::new (
… …
3402 my ($value, $title, $tooltip) = @$_; 3855 my ($value, $title, $tooltip) = @$_;
3403 3856
3404 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3857 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405 } 3858 }
3406 3859
3407 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3860 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408} 3861}
3409 3862
3410sub _set_value { 3863sub _set_value {
3411 my ($self, $value) = @_; 3864 my ($self, $value) = @_;
3412 3865
… …
3427 $self->emit (changed => $value); 3880 $self->emit (changed => $value);
3428} 3881}
3429 3882
3430############################################################################# 3883#############################################################################
3431 3884
3432package CFClient::UI::Statusbox; 3885package CFPlus::UI::Statusbox;
3433 3886
3434our @ISA = CFClient::UI::VBox::; 3887our @ISA = CFPlus::UI::VBox::;
3435 3888
3436sub new { 3889sub new {
3437 my $class = shift; 3890 my $class = shift;
3438 3891
3439 my $self = $class->SUPER::new ( 3892 my $self = $class->SUPER::new (
3440 fontsize => 0.8, 3893 fontsize => 0.8,
3441 @_, 3894 @_,
3442 ); 3895 );
3443 3896
3444 Scalar::Util::weaken (my $this = $self); 3897 CFPlus::weaken (my $this = $self);
3445 3898
3446 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3899 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447 3900
3448 $self 3901 $self
3449} 3902}
… …
3451sub reorder { 3904sub reorder {
3452 my ($self) = @_; 3905 my ($self) = @_;
3453 my $NOW = Time::HiRes::time; 3906 my $NOW = Time::HiRes::time;
3454 3907
3455 # freeze display when hovering over any label 3908 # freeze display when hovering over any label
3456 return if $CFClient::UI::TOOLTIP->{owner} 3909 return if $CFPlus::UI::TOOLTIP->{owner}
3457 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3910 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458 values %{ $self->{item} }; 3911 values %{ $self->{item} };
3459 3912
3460 while (my ($k, $v) = each %{ $self->{item} }) { 3913 while (my ($k, $v) = each %{ $self->{item} }) {
3461 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3914 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3462 } 3915 }
… …
3483 for ($short) { 3936 for ($short) {
3484 s/^\s+//; 3937 s/^\s+//;
3485 s/\s+/ /g; 3938 s/\s+/ /g;
3486 } 3939 }
3487 3940
3488 new CFClient::UI::Label 3941 new CFPlus::UI::Label
3489 markup => $short, 3942 markup => $short,
3490 tooltip => $item->{tooltip}, 3943 tooltip => $item->{tooltip},
3491 tooltip_font => $::FONT_PROP, 3944 tooltip_font => $::FONT_PROP,
3492 tooltip_width => 0.67, 3945 tooltip_width => 0.67,
3493 fontsize => $item->{fontsize} || $self->{fontsize}, 3946 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3572 $self->SUPER::destroy; 4025 $self->SUPER::destroy;
3573} 4026}
3574 4027
3575############################################################################# 4028#############################################################################
3576 4029
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; 4030package CFPlus::UI::Root;
3762 4031
3763our @ISA = CFClient::UI::Container::; 4032our @ISA = CFPlus::UI::Container::;
3764 4033
3765use List::Util qw(min max); 4034use List::Util qw(min max);
3766 4035
3767use CFClient::OpenGL; 4036use CFPlus::OpenGL;
3768 4037
3769sub new { 4038sub new {
3770 my $class = shift; 4039 my $class = shift;
3771 4040
3772 my $self = $class->SUPER::new ( 4041 my $self = $class->SUPER::new (
3773 visible => 1, 4042 visible => 1,
3774 @_, 4043 @_,
3775 ); 4044 );
3776 4045
3777 Scalar::Util::weaken ($self->{root} = $self); 4046 CFPlus::weaken ($self->{root} = $self);
3778 4047
3779 $self 4048 $self
3780} 4049}
3781 4050
3782sub size_request { 4051sub size_request {
… …
3877 while ($self->{refresh_hook}) { 4146 while ($self->{refresh_hook}) {
3878 $_->() 4147 $_->()
3879 for values %{delete $self->{refresh_hook}}; 4148 for values %{delete $self->{refresh_hook}};
3880 } 4149 }
3881 4150
3882 if ($self->{realloc}) { 4151 while ($self->{realloc}) {
3883 my %queue; 4152 my %queue;
3884 my @queue; 4153 my @queue;
3885 my $widget; 4154 my $widget;
3886 4155
3887 outer: 4156 outer:
… …
3934 } 4203 }
3935 } 4204 }
3936 4205
3937 delete $self->{realloc}{$widget+0}; 4206 delete $self->{realloc}{$widget+0};
3938 } 4207 }
3939 }
3940 4208
3941 while (my $size_alloc = delete $self->{size_alloc}) { 4209 while (my $size_alloc = delete $self->{size_alloc}) {
3942 my @queue = sort { $b->{visible} <=> $a->{visible} } 4210 my @queue = sort { $a->{visible} <=> $b->{visible} }
3943 values %$size_alloc; 4211 values %$size_alloc;
3944 4212
3945 while () { 4213 while () {
3946 my $widget = pop @queue || last; 4214 my $widget = pop @queue || last;
3947 4215
3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4216 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3949 4217
3950 $w = 0 if $w < 0;
3951 $h = 0 if $h < 0;
3952
3953 $w = max $widget->{min_w}, $w; 4218 $w = max $widget->{min_w}, $w;
3954 $h = max $widget->{min_h}, $h; 4219 $h = max $widget->{min_h}, $h;
3955 4220
3956# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4221# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4222# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958 4223
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4224 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4225 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961 4226
3962 $w = int $w + 0.5; 4227 $w = int $w + 0.5;
3963 $h = int $h + 0.5; 4228 $h = int $h + 0.5;
3964 4229
3965 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4230 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3966 $widget->{old_w} = $widget->{w}; 4231 $widget->{old_w} = $widget->{w};
3967 $widget->{old_h} = $widget->{h}; 4232 $widget->{old_h} = $widget->{h};
3968 4233
3969 $widget->{w} = $w; 4234 $widget->{w} = $w;
3970 $widget->{h} = $h; 4235 $widget->{h} = $h;
3971 4236
3972 $widget->emit (size_allocate => $w, $h); 4237 $widget->emit (size_allocate => $w, $h);
4238 }
3973 } 4239 }
3974 } 4240 }
3975 } 4241 }
3976 4242
3977 while ($self->{post_alloc_hook}) { 4243 while ($self->{post_alloc_hook}) {
3978 $_->() 4244 $_->()
3979 for values %{delete $self->{post_alloc_hook}}; 4245 for values %{delete $self->{post_alloc_hook}};
3980 } 4246 }
3981
3982 4247
3983 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4248 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3984 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4249 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3985 glClear GL_COLOR_BUFFER_BIT; 4250 glClear GL_COLOR_BUFFER_BIT;
3986 4251
… …
3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4254 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3990 glMatrixMode GL_MODELVIEW; 4255 glMatrixMode GL_MODELVIEW;
3991 glLoadIdentity; 4256 glLoadIdentity;
3992 4257
3993 { 4258 {
3994 package CFClient::UI::Base; 4259 package CFPlus::UI::Base;
3995 4260
3996 ($draw_x, $draw_y, $draw_w, $draw_h) = 4261 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997 (0, 0, $self->{w}, $self->{h}); 4262 (0, 0, $self->{w}, $self->{h});
3998 }
3999 4263
4000 $self->_draw; 4264 $self->_draw;
4265 }
4001} 4266}
4002 4267
4003############################################################################# 4268#############################################################################
4004 4269
4005package CFClient::UI; 4270package CFPlus::UI;
4006 4271
4007$ROOT = new CFClient::UI::Root; 4272$ROOT = new CFPlus::UI::Root;
4008$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4273$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4009 4274
40101 42751
4011 4276

Diff Legend

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