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.392 by root, Sat Jul 21 13:37:09 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}
… …
632 my ($self) = @_; 646 my ($self) = @_;
633 647
634 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
635} 649}
636 650
651my $cntx;#d#
637sub DESTROY { 652sub DESTROY {
638 my ($self) = @_; 653 my ($self) = @_;
639 654
640 return if CFClient::in_destruct; 655 return if CFPlus::in_destruct;
641
642 delete $WIDGET{$self+0};
643 656
644 eval { $self->destroy }; 657 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659
660 delete $WIDGET{$self+0};
646} 661}
647 662
648############################################################################# 663#############################################################################
649 664
650package CFClient::UI::DrawBG; 665package CFPlus::UI::DrawBG;
651 666
652our @ISA = CFClient::UI::Base::; 667our @ISA = CFPlus::UI::Base::;
653 668
654use strict; 669use strict;
655use CFClient::OpenGL; 670use CFPlus::OpenGL;
656 671
657sub new { 672sub new {
658 my $class = shift; 673 my $class = shift;
659 674
660 # range [value, low, high, page] 675 # range [value, low, high, page]
… …
691 } 706 }
692} 707}
693 708
694############################################################################# 709#############################################################################
695 710
696package CFClient::UI::Empty; 711package CFPlus::UI::Empty;
697 712
698our @ISA = CFClient::UI::Base::; 713our @ISA = CFPlus::UI::Base::;
699 714
700sub new { 715sub new {
701 my ($class, %arg) = @_; 716 my ($class, %arg) = @_;
702 $class->SUPER::new (can_events => 0, %arg); 717 $class->SUPER::new (can_events => 0, %arg);
703} 718}
… …
710 725
711sub draw { } 726sub draw { }
712 727
713############################################################################# 728#############################################################################
714 729
715package CFClient::UI::Container; 730package CFPlus::UI::Container;
716 731
717our @ISA = CFClient::UI::Base::; 732our @ISA = CFPlus::UI::Base::;
718 733
719sub new { 734sub new {
720 my ($class, %arg) = @_; 735 my ($class, %arg) = @_;
721 736
722 my $children = delete $arg{children}; 737 my $children = delete $arg{children};
… …
726 can_events => 0, 741 can_events => 0,
727 %arg, 742 %arg,
728 ); 743 );
729 744
730 $self->add (@$children) 745 $self->add (@$children)
731 if $children; 746 if $children && @$children;
732 747
733 $self 748 $self
734} 749}
735 750
736sub realloc { 751sub realloc {
… …
745 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
746 761
747 $_->set_parent ($self) 762 $_->set_parent ($self)
748 for @widgets; 763 for @widgets;
749 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
750 use sort 'stable'; 766 use sort 'stable';
751 767
752 $self->{children} = [ 768 $self->{children} = [
753 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
754 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
… …
808 $_->draw for @{$self->{children}}; 824 $_->draw for @{$self->{children}};
809} 825}
810 826
811############################################################################# 827#############################################################################
812 828
813package CFClient::UI::Bin; 829package CFPlus::UI::Bin;
814 830
815our @ISA = CFClient::UI::Container::; 831our @ISA = CFPlus::UI::Container::;
816 832
817sub new { 833sub new {
818 my ($class, %arg) = @_; 834 my ($class, %arg) = @_;
819 835
820 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 836 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821 837
822 $class->SUPER::new (children => [$child], %arg) 838 $class->SUPER::new (children => [$child], %arg)
823} 839}
824 840
825sub add { 841sub add {
… …
832sub remove { 848sub remove {
833 my ($self, $widget) = @_; 849 my ($self, $widget) = @_;
834 850
835 $self->SUPER::remove ($widget); 851 $self->SUPER::remove ($widget);
836 852
837 $self->{children} = [new CFClient::UI::Empty] 853 $self->{children} = [new CFPlus::UI::Empty]
838 unless @{$self->{children}}; 854 unless @{$self->{children}};
839} 855}
840 856
841sub child { $_[0]->{children}[0] } 857sub child { $_[0]->{children}[0] }
842 858
… …
854 870
855############################################################################# 871#############################################################################
856 872
857# back-buffered drawing area 873# back-buffered drawing area
858 874
859package CFClient::UI::Window; 875package CFPlus::UI::Window;
860 876
861our @ISA = CFClient::UI::Bin::; 877our @ISA = CFPlus::UI::Bin::;
862 878
863use CFClient::OpenGL; 879use CFPlus::OpenGL;
864 880
865sub new { 881sub new {
866 my ($class, %arg) = @_; 882 my ($class, %arg) = @_;
867 883
868 my $self = $class->SUPER::new (%arg); 884 my $self = $class->SUPER::new (%arg);
… …
890} 906}
891 907
892sub render_child { 908sub render_child {
893 my ($self) = @_; 909 my ($self) = @_;
894 910
895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 911 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896 glClearColor 0, 0, 0, 0; 912 glClearColor 0, 0, 0, 0;
897 glClear GL_COLOR_BUFFER_BIT; 913 glClear GL_COLOR_BUFFER_BIT;
898 914
899 { 915 {
900 package CFClient::UI::Base; 916 package CFPlus::UI::Base;
901 917
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 918 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 919 (0, 0, $self->{w}, $self->{h});
920
921 $self->_render;
904 } 922 }
905
906 $self->_render;
907 }; 923 };
908} 924}
909 925
910sub _draw { 926sub _draw {
911 my ($self) = @_; 927 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 928
915 my $tex = $self->{texture} 929 my $tex = $self->{texture}
916 or return; 930 or return;
917 931
918 glEnable GL_TEXTURE_2D; 932 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 934 glColor 0, 0, 0, 1;
921 935
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 936 $tex->draw_quad_alpha_premultiplied (0, 0);
923 937
924 glDisable GL_TEXTURE_2D; 938 glDisable GL_TEXTURE_2D;
925} 939}
926 940
927############################################################################# 941#############################################################################
928 942
929package CFClient::UI::ViewPort; 943package CFPlus::UI::ViewPort;
930 944
945use List::Util qw(min max);
946
931our @ISA = CFClient::UI::Window::; 947our @ISA = CFPlus::UI::Window::;
932 948
933sub new { 949sub new {
934 my $class = shift; 950 my $class = shift;
935 951
936 $class->SUPER::new ( 952 $class->SUPER::new (
… …
943sub size_request { 959sub size_request {
944 my ($self) = @_; 960 my ($self) = @_;
945 961
946 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947 963
948 $w = 10 if $self->{scroll_x}; 964 $w = 1 if $self->{scroll_x};
949 $h = 10 if $self->{scroll_y}; 965 $h = 1 if $self->{scroll_y};
950 966
951 ($w, $h) 967 ($w, $h)
952} 968}
953 969
954sub invoke_size_allocate { 970sub invoke_size_allocate {
… …
966} 982}
967 983
968sub set_offset { 984sub set_offset {
969 my ($self, $x, $y) = @_; 985 my ($self, $x, $y) = @_;
970 986
987 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
988 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
989
990 if ($x != $self->{view_x} or $y != $self->{view_y}) {
971 $self->{view_x} = int $x; 991 $self->{view_x} = $x;
972 $self->{view_y} = int $y; 992 $self->{view_y} = $y;
973 993
994 $self->emit (changed => $x, $y);
974 $self->update; 995 $self->update;
996 }
975} 997}
976 998
977# hmm, this does not work for topleft of $self... but we should not ask for that 999# hmm, this does not work for topleft of $self... but we should not ask for that
978sub coord2local { 1000sub coord2local {
979 my ($self, $x, $y) = @_; 1001 my ($self, $x, $y) = @_;
… …
994 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
995 1017
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 1020 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1021 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 1022 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 1023 $self->CFPlus::UI::Base::find_widget ($x, $y)
1002 } 1024 }
1003} 1025}
1004 1026
1005sub _render { 1027sub _render {
1006 my ($self) = @_; 1028 my ($self) = @_;
1007 1029
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1030 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}; 1031 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010 1032
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1033 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 1034
1013 $self->SUPER::_render; 1035 $self->SUPER::_render;
1014} 1036}
1015 1037
1016############################################################################# 1038#############################################################################
1017 1039
1018package CFClient::UI::ScrolledWindow; 1040package CFPlus::UI::ScrolledWindow;
1019 1041
1020our @ISA = CFClient::UI::HBox::; 1042our @ISA = CFPlus::UI::Table::;
1021 1043
1022sub new { 1044sub new {
1023 my ($class, %arg) = @_; 1045 my ($class, %arg) = @_;
1024 1046
1025 my $child = delete $arg{child}; 1047 my $child = delete $arg{child};
1026 1048
1027 my $self; 1049 my $self;
1028 1050
1029 my $slider = new CFClient::UI::Slider 1051 my $hslider = new CFPlus::UI::Slider
1052 col => 0,
1053 row => 1,
1054 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub {
1057 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 },
1060 ;
1061
1062 my $vslider = new CFPlus::UI::Slider
1063 col => 1,
1064 row => 0,
1030 vertical => 1, 1065 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1067 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1070 },
1035 ; 1071 ;
1036 1072
1037 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1039 can_events => 1, 1076 can_events => 1,
1040 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1041 %arg, 1081 %arg,
1042 ); 1082 );
1043 1083
1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0,
1086 row => 0,
1087 expand => 1,
1088 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y},
1090 on_changed => sub {
1091 my ($vp, $x, $y) = @_;
1092
1093 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y);
1095
1096 0
1097 },
1098 ;
1099
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1100 $self->SUPER::add ($self->{vp});
1101
1045 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
1046 1103
1047 $self 1104 $self
1048} 1105}
1049 1106
1050#TODO# update range on size_allocate depending on child 1107#TODO# update range on size_allocate depending on child?
1051 1108
1052sub add { 1109sub add {
1053 my ($self, $widget) = @_; 1110 my ($self, $widget) = @_;
1054 1111
1055 $self->{vp}->add ($self->{child} = $widget); 1112 $self->{vp}->add ($self->{child} = $widget);
1056} 1113}
1057 1114
1115sub update_slider {
1116 my ($self) = @_;
1117
1118 my $child = ($self->{vp} or return)->child;
1119
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122
1123 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider}{visible}) {
1125 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider});
1127 }
1128
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131
1132 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider}{visible}) {
1134 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider});
1136 }
1137}
1138
1139sub update {
1140 my ($self) = @_;
1141
1142 $self->update_slider;
1143 $self->SUPER::update;
1144}
1145
1058sub invoke_mouse_wheel { 1146sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1147 my ($self, $ev) = @_;
1060 1148
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev)
1150 if $ev->{dy};
1151
1152 $self->{hslider}->emit (mouse_wheel => $ev)
1153 if $ev->{dx};
1064 1154
1065 1 1155 1
1066} 1156}
1067 1157
1068sub update_slider { 1158sub invoke_button_down {
1069 my ($self) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1070 1160
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1161 if ($ev->{button} == 2) {
1072} 1162 $self->grab_focus;
1073 1163
1074sub update { 1164 my $ox = $self->{vp}{view_x} + $ev->{x};
1075 my ($self) = @_; 1165 my $oy = $self->{vp}{view_y} + $ev->{y};
1166
1167 $self->{motion} = sub {
1168 my ($ev, $x, $y) = @_;
1076 1169
1077 $self->SUPER::update; 1170 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1171 $self->update;
1172 };
1078 1173
1079 $self->update_slider; 1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_button_up {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if (delete $self->{motion}) {
1184 return 1;
1185 }
1186
1187 0
1188}
1189
1190sub invoke_mouse_motion {
1191 my ($self, $ev, $x, $y) = @_;
1192
1193 if ($self->{motion}) {
1194 $self->{motion}->($ev, $x, $y);
1195 return 1;
1196 }
1197
1198 0
1080} 1199}
1081 1200
1082sub invoke_size_allocate { 1201sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1202 my ($self, $w, $h) = @_;
1084 1203
1085 $self->update_slider; 1204 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1205 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1206}
1089 1207
1090############################################################################# 1208#############################################################################
1091 1209
1092package CFClient::UI::Frame; 1210package CFPlus::UI::Frame;
1093 1211
1094our @ISA = CFClient::UI::Bin::; 1212our @ISA = CFPlus::UI::Bin::;
1095 1213
1096use CFClient::OpenGL; 1214use CFPlus::OpenGL;
1097 1215
1098sub new { 1216sub new {
1099 my $class = shift; 1217 my $class = shift;
1100 1218
1101 $class->SUPER::new ( 1219 $class->SUPER::new (
… …
1127 $self->SUPER::_draw; 1245 $self->SUPER::_draw;
1128} 1246}
1129 1247
1130############################################################################# 1248#############################################################################
1131 1249
1132package CFClient::UI::FancyFrame; 1250package CFPlus::UI::FancyFrame;
1133 1251
1134our @ISA = CFClient::UI::Bin::; 1252our @ISA = CFPlus::UI::Bin::;
1135 1253
1136use CFClient::OpenGL; 1254use CFPlus::OpenGL;
1255
1256sub new {
1257 my ($class, %arg) = @_;
1258
1259 if ((exists $arg{label}) && !ref $arg{label}) {
1260 $arg{label} = new CFPlus::UI::Label
1261 align => 1,
1262 valign => 0,
1263 text => $arg{label},
1264 fontsize => ($arg{border} || 0.8) * 0.75;
1265 }
1266
1267 my $self = $class->SUPER::new (
1268 # label => "",
1269 fg => [0.6, 0.3, 0.1],
1270 border => 0.8,
1271 style => 'single',
1272 %arg,
1273 );
1274
1275 $self
1276}
1277
1278sub add {
1279 my ($self, @widgets) = @_;
1280
1281 $self->SUPER::add (@widgets);
1282 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1283}
1284
1285sub border {
1286 int $_[0]{border} * $::FONTSIZE
1287}
1288
1289sub size_request {
1290 my ($self) = @_;
1291
1292 ($self->{label_w}, undef) = $self->{label}->size_request
1293 if $self->{label};
1294
1295 my ($w, $h) = $self->SUPER::size_request;
1296
1297 (
1298 $w + $self->border * 2,
1299 $h + $self->border * 2,
1300 )
1301}
1302
1303sub invoke_size_allocate {
1304 my ($self, $w, $h) = @_;
1305
1306 my $border = $self->border;
1307
1308 $w -= List::Util::max 0, $border * 2;
1309 $h -= List::Util::max 0, $border * 2;
1310
1311 if (my $label = $self->{label}) {
1312 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1313 $label->{h} = List::Util::min $h, $border;
1314 $label->invoke_size_allocate ($label->{w}, $label->{h});
1315 }
1316
1317 $self->child->configure ($border, $border, $w, $h);
1318
1319 1
1320}
1321
1322sub _draw {
1323 my ($self) = @_;
1324
1325 my $child = $self->{children}[0];
1326
1327 my $border = $self->border;
1328 my ($w, $h) = ($self->{w}, $self->{h});
1329
1330 $child->draw;
1331
1332 glColor @{$self->{fg}};
1333 glBegin GL_LINE_STRIP;
1334 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1335 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1336 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1337 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1338 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1339 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1340 glEnd;
1341
1342 if ($self->{label}) {
1343 glTranslate $border * 2, 0;
1344 $self->{label}->_draw;
1345 }
1346}
1347
1348#############################################################################
1349
1350package CFPlus::UI::Toplevel;
1351
1352our @ISA = CFPlus::UI::Bin::;
1353
1354use CFPlus::OpenGL;
1137 1355
1138my $bg = 1356my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1357 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1358 mipmap => 1, wrap => 1;
1141 1359
1142my @border = 1360my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1361 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); 1362 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1363
1364my @icon =
1365 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1366 qw(x1_move.png x1_resize.png);
1145 1367
1146sub new { 1368sub new {
1147 my ($class, %arg) = @_; 1369 my ($class, %arg) = @_;
1148 1370
1149 my $self = $class->SUPER::new ( 1371 my $self = $class->SUPER::new (
… …
1154 min_w => 64, 1376 min_w => 64,
1155 min_h => 32, 1377 min_h => 32,
1156 %arg, 1378 %arg,
1157 ); 1379 );
1158 1380
1159 $self->{title_widget} = new CFClient::UI::Label 1381 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1382 align => 0,
1161 valign => 1, 1383 valign => 1,
1162 text => $self->{title}, 1384 text => $self->{title},
1163 fontsize => $self->{border}, 1385 fontsize => $self->{border},
1164 if exists $self->{title}; 1386 if exists $self->{title};
1165 1387
1166 if ($self->{has_close_button}) { 1388 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1389 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1390 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1391 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1392 on_activate => sub { $self->emit ("delete") };
1171 1393
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1394 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1395 }
1174 1396
1175 $self 1397 $self
1176} 1398}
1177 1399
1178sub add { 1400sub add {
1179 my ($self, @widgets) = @_; 1401 my ($self, @widgets) = @_;
1180 1402
1181 $self->SUPER::add (@widgets); 1403 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1404 $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}; 1405 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1406}
1185 1407
1186sub border { 1408sub border {
1187 int $_[0]{border} * $::FONTSIZE 1409 int $_[0]{border} * $::FONTSIZE
1188} 1410}
… …
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1540 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1319 1541
1320 my $border = $self->border; 1542 my $border = $self->border;
1321 1543
1322 glColor @{ $self->{border_bg} }; 1544 glColor @{ $self->{border_bg} };
1323 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1545 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1324 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1546 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1325 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1547 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1326 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1548 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1549
1550 # move
1551 my $w2 = ($w - $border) * .5;
1552 my $h2 = ($h - $border) * .5;
1553 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1554 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1556
1557 # resize
1558 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1559 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1560 unless $self->{has_close_button};
1561 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1562 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1327 1563
1328 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1564 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1329 glColor @{ $self->{bg} }; 1565 glColor @{ $self->{bg} };
1330 1566
1331 # TODO: repeat texture not scale 1567 # TODO: repeat texture not scale
… …
1350 if $self->{close_button}; 1586 if $self->{close_button};
1351} 1587}
1352 1588
1353############################################################################# 1589#############################################################################
1354 1590
1355package CFClient::UI::Table; 1591package CFPlus::UI::Table;
1356 1592
1357our @ISA = CFClient::UI::Base::; 1593our @ISA = CFPlus::UI::Container::;
1358 1594
1359use List::Util qw(max sum); 1595use List::Util qw(max sum);
1360 1596
1361use CFClient::OpenGL; 1597use CFPlus::OpenGL;
1362 1598
1363sub new { 1599sub new {
1364 my $class = shift; 1600 my $class = shift;
1365 1601
1366 $class->SUPER::new ( 1602 $class->SUPER::new (
1367 col_expand => [], 1603 col_expand => [],
1604 row_expand => [],
1368 @_, 1605 @_,
1369 ) 1606 )
1370} 1607}
1371 1608
1372sub children {
1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1374}
1375
1376sub add { 1609sub add {
1610 my ($self, @widgets) = @_;
1611
1612 for my $child (@widgets) {
1613 $child->{rowspan} ||= 1;
1614 $child->{colspan} ||= 1;
1615 }
1616
1617 $self->SUPER::add (@widgets);
1618}
1619
1620sub add_at {
1377 my ($self) = shift; 1621 my $self = shift;
1622
1623 my @widgets;
1378 1624
1379 while (@_) { 1625 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, (); 1626 my ($col, $row, $child) = splice @_, 0, 3, ();
1381 $child->set_parent ($self);
1382 $self->{children}[$y][$x] = $child;
1383 }
1384 1627
1385 $self->{force_realloc} = 1; 1628 $child->{row} = $row;
1386 $self->{force_size_alloc} = 1; 1629 $child->{col} = $col;
1387 $self->realloc;
1388}
1389 1630
1390sub remove { 1631 push @widgets, $child;
1632 }
1633
1634 $self->add (@widgets);
1635}
1636
1637sub get_wh {
1391 my ($self, $child) = @_; 1638 my ($self) = @_;
1392 1639
1393 # TODO: not yet implemented 1640 my (@w, @h);
1394}
1395
1396# TODO: move to container class maybe? send children a signal on removal?
1397sub clear {
1398 my ($self) = @_;
1399 1641
1400 my @children = $self->children; 1642 my @children = $self->children;
1401 delete $self->{children}; 1643
1644 # first pass, columns
1645 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1646 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1647
1648 my $sw = sum @w[$c .. $c + $cs - 1];
1649
1650 if ($w > $sw) {
1651 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1652 }
1402 1653 }
1403 for (@children) {
1404 delete $_->{parent};
1405 $_->hide;
1406 }
1407 1654
1408 $self->realloc; 1655 # second pass, rows
1409} 1656 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)}; 1657 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1424 1658
1425 $w[$x] = max $w[$x], $w; 1659 my $sh = sum @h[$r .. $r + $rs - 1];
1426 $h[$y] = max $h[$y], $h; 1660
1661 if ($h > $sh) {
1662 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1427 } 1663 }
1428 } 1664 }
1429 1665
1430 (\@w, \@h) 1666 (\@w, \@h)
1431} 1667}
… …
1447 my ($ws, $hs) = $self->get_wh; 1683 my ($ws, $hs) = $self->get_wh;
1448 1684
1449 my $req_w = (sum @$ws) || 1; 1685 my $req_w = (sum @$ws) || 1;
1450 my $req_h = (sum @$hs) || 1; 1686 my $req_h = (sum @$hs) || 1;
1451 1687
1452 # TODO: nicer code && do row_expand 1688 # now linearly scale the rows/columns to the allocated size
1453 my @col_expand = @{$self->{col_expand}}; 1689 my @col_expand = @{$self->{col_expand}};
1454 @col_expand = (1) x @$ws unless @col_expand; 1690 @col_expand = (1) x @$ws unless @col_expand;
1455 my $col_expand = (sum @col_expand) || 1; 1691 my $col_expand = (sum @col_expand) || 1;
1456 1692
1457 # linearly scale sizes
1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1693 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460 1694
1461 CFClient::UI::harmonize $ws; 1695 CFPlus::UI::harmonize $ws;
1696
1697 my @row_expand = @{$self->{row_expand}};
1698 @row_expand = (1) x @$ws unless @row_expand;
1699 my $row_expand = (sum @row_expand) || 1;
1700
1701 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1702
1462 CFClient::UI::harmonize $hs; 1703 CFPlus::UI::harmonize $hs;
1463 1704
1464 my $y; 1705 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1706 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1465 1707
1466 for my $r (0 .. $#{$self->{children}}) { 1708 for my $widget ($self->children) {
1467 my $row = $self->{children}[$r] 1709 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1468 or next;
1469 1710
1470 my $x = 0; 1711 $widget->configure (
1471 my $row_h = $hs->[$r]; 1712 $x[$c], $y[$r],
1713 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1472 1714 );
1473 for my $c (0 .. $#$row) { 1715 }
1474 my $col_w = $ws->[$c];
1475 1716
1476 if (my $widget = $row->[$c]) { 1717 1
1477 $widget->configure ($x, $y, $col_w, $row_h); 1718}
1478 }
1479 1719
1480 $x += $col_w; 1720#############################################################################
1721
1722package CFPlus::UI::Fixed;
1723
1724use List::Util qw(min max);
1725
1726our @ISA = CFPlus::UI::Container::;
1727
1728sub add {
1729 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1730
1731 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1732 $self->SUPER::add ($child);
1733}
1734
1735sub _scale($$$) {
1736 my ($mode, $val, $max) = @_;
1737
1738 $mode eq "abs" ? $val
1739 : $mode eq "rel" ? $val * $max
1740 : 0
1741}
1742
1743sub size_request {
1744 my ($self) = @_;
1745
1746 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1747
1748 # determine overall size by querying abs widgets
1749 for my $child ($self->visible_children) {
1750 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1751
1752 if ($pos eq "abs") {
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1757 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1481 } 1758 }
1759 }
1482 1760
1483 $y += $row_h; 1761 my $W = $x2 - $x1;
1762 my $H = $y2 - $y1;
1763
1764 # now layout remaining widgets
1765 for my $child ($self->visible_children) {
1766 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1767
1768 if ($pos ne "abs") {
1769 $x = _scale $pos, $x, $W;
1770 $y = _scale $pos, $x, $H;
1771 $w = _scale $size, $w, $child->{req_w};
1772 $h = _scale $size, $h, $child->{req_h};
1773
1774 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1776 }
1777 }
1778
1779 my $W = $x2 - $x1;
1780 my $H = $y2 - $y1;
1781
1782 ($W, $H)
1783}
1784
1785sub invoke_size_allocate {
1786 my ($self, $W, $H) = @_;
1787
1788 for my $child ($self->visible_children) {
1789 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1790
1791 $x = _scale $pos, $x, $W;
1792 $y = _scale $pos, $x, $H;
1793 $w = _scale $size, $w, $child->{req_w};
1794 $h = _scale $size, $h, $child->{req_h};
1795
1796 $child->configure ($x, $y, $w, $h);
1484 } 1797 }
1485 1798
1486 1 1799 1
1487} 1800}
1488 1801
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############################################################################# 1802#############################################################################
1514 1803
1515package CFClient::UI::Box; 1804package CFPlus::UI::Box;
1516 1805
1517our @ISA = CFClient::UI::Container::; 1806our @ISA = CFPlus::UI::Container::;
1518 1807
1519sub size_request { 1808sub size_request {
1520 my ($self) = @_; 1809 my ($self) = @_;
1521 1810
1522 $self->{vertical} 1811 $self->{vertical}
… …
1555 $req[$_] += $space * $children[$_]{expand} 1844 $req[$_] += $space * $children[$_]{expand}
1556 for 0 .. $#children; 1845 for 0 .. $#children;
1557 } 1846 }
1558 } 1847 }
1559 1848
1560 CFClient::UI::harmonize \@req; 1849 CFPlus::UI::harmonize \@req;
1561 1850
1562 my $pos = 0; 1851 my $pos = 0;
1563 for (0 .. $#children) { 1852 for (0 .. $#children) {
1564 my $alloc = $req[$_]; 1853 my $alloc = $req[$_];
1565 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1854 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1570 1 1859 1
1571} 1860}
1572 1861
1573############################################################################# 1862#############################################################################
1574 1863
1575package CFClient::UI::HBox; 1864package CFPlus::UI::HBox;
1576 1865
1577our @ISA = CFClient::UI::Box::; 1866our @ISA = CFPlus::UI::Box::;
1578 1867
1579sub new { 1868sub new {
1580 my $class = shift; 1869 my $class = shift;
1581 1870
1582 $class->SUPER::new ( 1871 $class->SUPER::new (
… …
1585 ) 1874 )
1586} 1875}
1587 1876
1588############################################################################# 1877#############################################################################
1589 1878
1590package CFClient::UI::VBox; 1879package CFPlus::UI::VBox;
1591 1880
1592our @ISA = CFClient::UI::Box::; 1881our @ISA = CFPlus::UI::Box::;
1593 1882
1594sub new { 1883sub new {
1595 my $class = shift; 1884 my $class = shift;
1596 1885
1597 $class->SUPER::new ( 1886 $class->SUPER::new (
… …
1600 ) 1889 )
1601} 1890}
1602 1891
1603############################################################################# 1892#############################################################################
1604 1893
1605package CFClient::UI::Label; 1894package CFPlus::UI::Label;
1606 1895
1607our @ISA = CFClient::UI::DrawBG::; 1896our @ISA = CFPlus::UI::DrawBG::;
1608 1897
1609use CFClient::OpenGL; 1898use CFPlus::OpenGL;
1610 1899
1611sub new { 1900sub new {
1612 my ($class, %arg) = @_; 1901 my ($class, %arg) = @_;
1613 1902
1614 my $self = $class->SUPER::new ( 1903 my $self = $class->SUPER::new (
… …
1617 #active_bg => none 1906 #active_bg => none
1618 #font => default_font 1907 #font => default_font
1619 #text => initial text 1908 #text => initial text
1620 #markup => initial narkup 1909 #markup => initial narkup
1621 #max_w => maximum pixel width 1910 #max_w => maximum pixel width
1911 #style => 0, # render flags
1622 ellipsise => 3, # end 1912 ellipsise => 3, # end
1623 layout => (new CFClient::Layout), 1913 layout => (new CFPlus::Layout),
1624 fontsize => 1, 1914 fontsize => 1,
1625 align => -1, 1915 align => -1,
1626 valign => -1, 1916 valign => -1,
1627 padding_x => 2, 1917 padding_x => 2,
1628 padding_y => 2, 1918 padding_y => 2,
1629 can_events => 0, 1919 can_events => 0,
1630 %arg 1920 %arg
1631 ); 1921 );
1632 1922
1633 if (exists $self->{template}) { 1923 if (exists $self->{template}) {
1634 my $layout = new CFClient::Layout; 1924 my $layout = new CFPlus::Layout;
1635 $layout->set_text (delete $self->{template}); 1925 $layout->set_text (delete $self->{template});
1636 $self->{template} = $layout; 1926 $self->{template} = $layout;
1637 } 1927 }
1638 1928
1639 if (exists $self->{markup}) { 1929 if (exists $self->{markup}) {
… …
1777 }; 2067 };
1778 2068
1779 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2069 my $w = List::Util::min $self->{w} + 4, $size->[0];
1780 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2070 my $h = List::Util::min $self->{h} + 2, $size->[1];
1781 2071
1782 $self->{layout}->render ($self->{ox}, $self->{oy}); 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783} 2073}
1784 2074
1785############################################################################# 2075#############################################################################
1786 2076
1787package CFClient::UI::EntryBase; 2077package CFPlus::UI::EntryBase;
1788 2078
1789our @ISA = CFClient::UI::Label::; 2079our @ISA = CFPlus::UI::Label::;
1790 2080
1791use CFClient::OpenGL; 2081use CFPlus::OpenGL;
1792 2082
1793sub new { 2083sub new {
1794 my $class = shift; 2084 my $class = shift;
1795 2085
1796 $class->SUPER::new ( 2086 $class->SUPER::new (
… …
1800 active_fg => [0, 0, 0], 2090 active_fg => [0, 0, 0],
1801 can_hover => 1, 2091 can_hover => 1,
1802 can_focus => 1, 2092 can_focus => 1,
1803 valign => 0, 2093 valign => 0,
1804 can_events => 1, 2094 can_events => 1,
2095 ellipsise => 0,
1805 #text => ... 2096 #text => ...
1806 #hidden => "*", 2097 #hidden => "*",
1807 @_ 2098 @_
1808 ) 2099 )
1809} 2100}
… …
1854 my $sym = $ev->{sym}; 2145 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2146 my $uni = $ev->{unicode};
1856 2147
1857 my $text = $self->get_text; 2148 my $text = $self->get_text;
1858 2149
2150 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2151
1859 if ($uni == 8) { 2152 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2153 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2154 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2155 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFClient::SDLK_LEFT) { 2156 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2157 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFClient::SDLK_RIGHT) { 2158 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2159 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFClient::SDLK_HOME) { 2160 } elsif ($sym == CFPlus::SDLK_HOME) {
2161 # what a hack
2162 $self->{cursor} =
2163 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2164 ? length $1
2165 : 0;
2166 } elsif ($sym == CFPlus::SDLK_END) {
2167 # uh, again
2168 $self->{cursor} =
2169 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2170 ? $self->{cursor} + length $1
2171 : length $self->{text};
2172 } elsif ($uni == 21) { # ctrl-u
2173 $text = "";
1868 $self->{cursor} = 0; 2174 $self->{cursor} = 0;
1869 } elsif ($sym == CFClient::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2175 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2176 $self->emit ('escape');
1873 } elsif ($uni) { 2177 } elsif ($uni == 0x0d) {
2178 substr $text, $self->{cursor}++, 0, "\012";
2179 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2180 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2181 } else {
1876 return 0; 2182 return 0;
1877 } 2183 }
1878 2184
1879 $self->_set_text ($text); 2185 $self->_set_text ($text);
1880 2186
1881 $self->realloc; 2187 $self->realloc;
2188 $self->update;
1882 2189
1883 1 2190 1
1884} 2191}
1885 2192
1886sub invoke_focus_in { 2193sub invoke_focus_in {
… …
1948 utf8::encode $text; 2255 utf8::encode $text;
1949 2256
1950 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1951 } 2258 }
1952 2259
1953 glColor @{$self->{fg}};
1954 glBegin GL_LINES; 2260 glBegin GL_LINES;
1955 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2261 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}; 2262 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957 glEnd; 2263 glEnd;
1958 } 2264 }
1959} 2265}
1960 2266
2267#############################################################################
2268
1961package CFClient::UI::Entry; 2269package CFPlus::UI::Entry;
1962 2270
1963our @ISA = CFClient::UI::EntryBase::; 2271our @ISA = CFPlus::UI::EntryBase::;
1964 2272
1965use CFClient::OpenGL; 2273use CFPlus::OpenGL;
1966 2274
1967sub invoke_key_down { 2275sub invoke_key_down {
1968 my ($self, $ev) = @_; 2276 my ($self, $ev) = @_;
1969 2277
1970 my $sym = $ev->{sym}; 2278 my $sym = $ev->{sym};
1971 2279
1972 if ($sym == 13) { 2280 if ($ev->{uni} == 0x0d || $sym == 13) {
1973 unshift @{$self->{history}}, 2281 unshift @{$self->{history}},
1974 my $txt = $self->get_text; 2282 my $txt = $self->get_text;
1975 2283
1976 $self->{history_pointer} = -1; 2284 $self->{history_pointer} = -1;
1977 $self->{history_saveback} = ''; 2285 $self->{history_saveback} = '';
1978 $self->emit (activate => $txt); 2286 $self->emit (activate => $txt);
1979 $self->update; 2287 $self->update;
1980 2288
1981 } elsif ($sym == CFClient::SDLK_UP) { 2289 } elsif ($sym == CFPlus::SDLK_UP) {
1982 if ($self->{history_pointer} < 0) { 2290 if ($self->{history_pointer} < 0) {
1983 $self->{history_saveback} = $self->get_text; 2291 $self->{history_saveback} = $self->get_text;
1984 } 2292 }
1985 if (@{$self->{history} || []} > 0) { 2293 if (@{$self->{history} || []} > 0) {
1986 $self->{history_pointer}++; 2294 $self->{history_pointer}++;
… …
1988 $self->{history_pointer} = @{$self->{history} || []} - 1; 2296 $self->{history_pointer} = @{$self->{history} || []} - 1;
1989 } 2297 }
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2298 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1991 } 2299 }
1992 2300
1993 } elsif ($sym == CFClient::SDLK_DOWN) { 2301 } elsif ($sym == CFPlus::SDLK_DOWN) {
1994 $self->{history_pointer}--; 2302 $self->{history_pointer}--;
1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2303 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1996 2304
1997 if ($self->{history_pointer} >= 0) { 2305 if ($self->{history_pointer} >= 0) {
1998 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2306 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
2007 1 2315 1
2008} 2316}
2009 2317
2010############################################################################# 2318#############################################################################
2011 2319
2320package CFPlus::UI::TextEdit;
2321
2322our @ISA = CFPlus::UI::EntryBase::;
2323
2324use CFPlus::OpenGL;
2325
2326sub move_cursor_ver {
2327 my ($self, $dy) = @_;
2328
2329 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2330
2331 $y += $dy;
2332
2333 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2334 $self->{cursor} = $index;
2335 delete $self->{cur_h};
2336 $self->update;
2337 return;
2338 }
2339}
2340
2341sub invoke_key_down {
2342 my ($self, $ev) = @_;
2343
2344 my $sym = $ev->{sym};
2345
2346 if ($sym == CFPlus::SDLK_UP) {
2347 $self->move_cursor_ver (-1);
2348 } elsif ($sym == CFPlus::SDLK_DOWN) {
2349 $self->move_cursor_ver (+1);
2350 } else {
2351 return $self->SUPER::invoke_key_down ($ev)
2352 }
2353
2354 1
2355}
2356
2357#############################################################################
2358
2012package CFClient::UI::Button; 2359package CFPlus::UI::Button;
2013 2360
2014our @ISA = CFClient::UI::Label::; 2361our @ISA = CFPlus::UI::Label::;
2015 2362
2016use CFClient::OpenGL; 2363use CFPlus::OpenGL;
2017 2364
2018my @tex = 2365my @tex =
2019 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2366 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020 qw(b1_button_active.png); 2367 qw(b1_button_inactive.png b1_button_active.png);
2021 2368
2022sub new { 2369sub new {
2023 my $class = shift; 2370 my $class = shift;
2024 2371
2025 $class->SUPER::new ( 2372 $class->SUPER::new (
2026 padding_x => 4, 2373 padding_x => 4,
2027 padding_y => 4, 2374 padding_y => 4,
2028 fg => [1, 1, 1], 2375 fg => [1.0, 1.0, 1.0],
2029 active_fg => [0, 0, 1], 2376 active_fg => [0.8, 0.8, 0.8],
2030 can_hover => 1, 2377 can_hover => 1,
2031 align => 0, 2378 align => 0,
2032 valign => 0, 2379 valign => 0,
2033 can_events => 1, 2380 can_events => 1,
2034 @_ 2381 @_
… …
2052 2399
2053 glEnable GL_TEXTURE_2D; 2400 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 glColor 0, 0, 0, 1; 2402 glColor 0, 0, 0, 1;
2056 2403
2404 my $tex = $tex[$GRAB == $self];
2057 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2405 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2058 2406
2059 glDisable GL_TEXTURE_2D; 2407 glDisable GL_TEXTURE_2D;
2060 2408
2061 $self->SUPER::_draw; 2409 $self->SUPER::_draw;
2062} 2410}
2063 2411
2064############################################################################# 2412#############################################################################
2065 2413
2066package CFClient::UI::CheckBox; 2414package CFPlus::UI::CheckBox;
2067 2415
2068our @ISA = CFClient::UI::DrawBG::; 2416our @ISA = CFPlus::UI::DrawBG::;
2069 2417
2070my @tex = 2418my @tex =
2071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2419 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2420 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073 2421
2074use CFClient::OpenGL; 2422use CFPlus::OpenGL;
2075 2423
2076sub new { 2424sub new {
2077 my $class = shift; 2425 my $class = shift;
2078 2426
2079 $class->SUPER::new ( 2427 $class->SUPER::new (
… …
2136 glDisable GL_TEXTURE_2D; 2484 glDisable GL_TEXTURE_2D;
2137} 2485}
2138 2486
2139############################################################################# 2487#############################################################################
2140 2488
2141package CFClient::UI::Image; 2489package CFPlus::UI::Image;
2142 2490
2143our @ISA = CFClient::UI::Base::; 2491our @ISA = CFPlus::UI::Base::;
2144 2492
2145use CFClient::OpenGL; 2493use CFPlus::OpenGL;
2146 2494
2147our %texture_cache; 2495our %texture_cache;
2148 2496
2149sub new { 2497sub new {
2150 my $class = shift; 2498 my $class = shift;
… …
2156 2504
2157 $self->{path} || $self->{tex} 2505 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required"; 2506 or Carp::croak "'path' or 'tex' attributes required";
2159 2507
2160 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2508 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2161 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2509 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162 2510
2163 Scalar::Util::weaken $texture_cache{$self->{path}}; 2511 CFPlus::weaken $texture_cache{$self->{path}};
2164 2512
2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2513 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166 2514
2167 $self 2515 $self
2168} 2516}
2169 2517
2170sub STORABLE_freeze { 2518sub STORABLE_freeze {
2171 my ($self, $cloning) = @_; 2519 my ($self, $cloning) = @_;
2172 2520
2173 $self->{path} 2521 $self->{path}
2174 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2522 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175 2523
2176 $self->{path} 2524 $self->{path}
2177} 2525}
2178 2526
2179sub STORABLE_attach { 2527sub STORABLE_attach {
… …
2210 glDisable GL_TEXTURE_2D; 2558 glDisable GL_TEXTURE_2D;
2211} 2559}
2212 2560
2213############################################################################# 2561#############################################################################
2214 2562
2215package CFClient::UI::ImageButton; 2563package CFPlus::UI::ImageButton;
2216 2564
2217our @ISA = CFClient::UI::Image::; 2565our @ISA = CFPlus::UI::Image::;
2218 2566
2219use CFClient::OpenGL; 2567use CFPlus::OpenGL;
2220 2568
2221my %textures; 2569my %textures;
2222 2570
2223sub new { 2571sub new {
2224 my $class = shift; 2572 my $class = shift;
… …
2246 1 2594 1
2247} 2595}
2248 2596
2249############################################################################# 2597#############################################################################
2250 2598
2251package CFClient::UI::VGauge; 2599package CFPlus::UI::VGauge;
2252 2600
2253our @ISA = CFClient::UI::Base::; 2601our @ISA = CFPlus::UI::Base::;
2254 2602
2255use List::Util qw(min max); 2603use List::Util qw(min max);
2256 2604
2257use CFClient::OpenGL; 2605use CFPlus::OpenGL;
2258 2606
2259my %tex = ( 2607my %tex = (
2260 food => [ 2608 food => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2609 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2263 ], 2611 ],
2264 grace => [ 2612 grace => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2613 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/ 2614 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2267 ], 2615 ],
2268 hp => [ 2616 hp => [
2269 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2617 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2271 ], 2619 ],
2272 mana => [ 2620 mana => [
2273 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2621 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/ 2622 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2275 ], 2623 ],
2276); 2624);
2277 2625
2278# eg. VGauge->new (gauge => 'food'), default gauge: food 2626# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2381 glDisable GL_TEXTURE_2D; 2729 glDisable GL_TEXTURE_2D;
2382} 2730}
2383 2731
2384############################################################################# 2732#############################################################################
2385 2733
2386package CFClient::UI::Gauge; 2734package CFPlus::UI::Gauge;
2387 2735
2388our @ISA = CFClient::UI::VBox::; 2736our @ISA = CFPlus::UI::VBox::;
2389 2737
2390sub new { 2738sub new {
2391 my ($class, %arg) = @_; 2739 my ($class, %arg) = @_;
2392 2740
2393 my $self = $class->SUPER::new ( 2741 my $self = $class->SUPER::new (
… …
2395 can_hover => 1, 2743 can_hover => 1,
2396 can_events => 1, 2744 can_events => 1,
2397 %arg, 2745 %arg,
2398 ); 2746 );
2399 2747
2400 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2748 $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); 2749 $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"); 2750 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2403 2751
2404 $self 2752 $self
2405} 2753}
2406 2754
2407sub set_fontsize { 2755sub set_fontsize {
… …
2428 $self->{value}->set_text ($val); 2776 $self->{value}->set_text ($val);
2429} 2777}
2430 2778
2431############################################################################# 2779#############################################################################
2432 2780
2433package CFClient::UI::Slider; 2781package CFPlus::UI::Slider;
2434 2782
2435use strict; 2783use strict;
2436 2784
2437use CFClient::OpenGL; 2785use CFPlus::OpenGL;
2438 2786
2439our @ISA = CFClient::UI::DrawBG::; 2787our @ISA = CFPlus::UI::DrawBG::;
2440 2788
2441my @tex = 2789my @tex =
2442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2790 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2443 qw(s1_slider.png s1_slider_bg.png); 2791 qw(s1_slider.png s1_slider_bg.png);
2444 2792
2445sub new { 2793sub new {
2446 my $class = shift; 2794 my $class = shift;
2447 2795
… …
2541sub invoke_mouse_wheel { 2889sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_; 2890 my ($self, $ev) = @_;
2543 2891
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2892 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545 2893
2894 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2895
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2896 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547 2897
2548 ! ! $delta 2898 ! ! $delta
2549} 2899}
2550 2900
2551sub update { 2901sub update {
… …
2602 glDisable GL_TEXTURE_2D; 2952 glDisable GL_TEXTURE_2D;
2603} 2953}
2604 2954
2605############################################################################# 2955#############################################################################
2606 2956
2607package CFClient::UI::ValSlider; 2957package CFPlus::UI::ValSlider;
2608 2958
2609our @ISA = CFClient::UI::HBox::; 2959our @ISA = CFPlus::UI::HBox::;
2610 2960
2611sub new { 2961sub new {
2612 my ($class, %arg) = @_; 2962 my ($class, %arg) = @_;
2613 2963
2614 my $range = delete $arg{range}; 2964 my $range = delete $arg{range};
2615 2965
2616 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2617 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2967 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2618 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2968 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2619 to_value => sub { shift }, 2969 to_value => sub { shift },
2620 from_value => sub { shift }, 2970 from_value => sub { shift },
2621 %arg, 2971 %arg,
2622 ); 2972 );
2623 2973
… …
2643sub set_range { shift->{slider}->set_range (@_) } 2993sub set_range { shift->{slider}->set_range (@_) }
2644sub set_value { shift->{slider}->set_value (@_) } 2994sub set_value { shift->{slider}->set_value (@_) }
2645 2995
2646############################################################################# 2996#############################################################################
2647 2997
2648package CFClient::UI::TextScroller; 2998package CFPlus::UI::TextScroller;
2649 2999
2650our @ISA = CFClient::UI::HBox::; 3000our @ISA = CFPlus::UI::HBox::;
2651 3001
2652use CFClient::OpenGL; 3002use CFPlus::OpenGL;
2653 3003
2654sub new { 3004sub new {
2655 my $class = shift; 3005 my $class = shift;
2656 3006
2657 my $self = $class->SUPER::new ( 3007 my $self = $class->SUPER::new (
… …
2659 can_events => 1, 3009 can_events => 1,
2660 indent => 0, 3010 indent => 0,
2661 #font => default_font 3011 #font => default_font
2662 @_, 3012 @_,
2663 3013
2664 layout => (new CFClient::Layout), 3014 layout => (new CFPlus::Layout),
2665 par => [], 3015 par => [],
3016 max_par => 0,
2666 height => 0, 3017 height => 0,
2667 children => [ 3018 children => [
2668 (new CFClient::UI::Empty expand => 1), 3019 (new CFPlus::UI::Empty expand => 1),
2669 (new CFClient::UI::Slider vertical => 1), 3020 (new CFPlus::UI::Slider vertical => 1),
2670 ], 3021 ],
2671 ); 3022 );
2672 3023
2673 $self->{children}[1]->connect (changed => sub { $self->update }); 3024 $self->{children}[1]->connect (changed => sub { $self->update });
2674 3025
… …
2749sub set_offset { 3100sub set_offset {
2750 my ($self, $offset) = @_; 3101 my ($self, $offset) = @_;
2751 3102
2752 # todo: base offset on lines or so, not on pixels 3103 # todo: base offset on lines or so, not on pixels
2753 $self->{children}[1]->set_value ($offset); 3104 $self->{children}[1]->set_value ($offset);
3105}
3106
3107sub current_paragraph {
3108 my ($self) = @_;
3109
3110 $self->{top_paragraph} - 1
3111}
3112
3113sub scroll_to {
3114 my ($self, $para) = @_;
3115
3116 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3117
3118 $self->{scroll_to} = $para;
3119 $self->update;
2754} 3120}
2755 3121
2756sub clear { 3122sub clear {
2757 my ($self) = @_; 3123 my ($self) = @_;
2758 3124
… …
2780 3146
2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3147 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para; 3148 push @{$self->{par}}, $para;
2783 } 3149 }
2784 3150
3151 if (my $max = $self->{max_par}) {
3152 shift @{$self->{par}} while @{$self->{par}} > $max;
3153 }
3154
2785 $self->{need_reflow}++; 3155 $self->{need_reflow}++;
2786 $self->update; 3156 $self->update;
2787} 3157}
2788 3158
2789sub scroll_to_bottom { 3159sub scroll_to_bottom {
2790 my ($self) = @_; 3160 my ($self) = @_;
2791 3161
2792 $self->{scroll_to_bottom} = 1; 3162 $self->{scroll_to} = $#{$self->{par}};
2793 $self->update; 3163 $self->update;
2794} 3164}
2795 3165
3166sub force_uptodate {
3167 my ($self) = @_;
3168
3169 if (delete $self->{need_reflow}) {
3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3171
3172 my $height = 0;
3173
3174 for my $para (@{$self->{par}}) {
3175 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3176 my $layout = $self->get_layout ($para);
3177 my ($w, $h) = $layout->size;
3178
3179 $para->{w} = $w + $para->{indent};
3180 $para->{h} = $h;
3181 $para->{wrapped} = $layout->has_wrapped;
3182 }
3183
3184 $para->{y} = $height;
3185 $height += $para->{h};
3186 }
3187
3188 $self->{height} = $height;
3189 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3190
3191 delete $self->{texture};
3192 }
3193
3194 if (my $paridx = delete $self->{scroll_to}) {
3195 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3196 }
3197}
3198
2796sub update { 3199sub update {
2797 my ($self) = @_; 3200 my ($self) = @_;
2798 3201
2799 $self->SUPER::update; 3202 $self->SUPER::update;
2800 3203
2801 return unless $self->{h} > 0; 3204 return unless $self->{h} > 0;
2802 3205
2803 delete $self->{texture}; 3206 delete $self->{texture};
2804 3207
2805 $ROOT->on_post_alloc ($self => sub { 3208 $ROOT->on_post_alloc ($self => sub {
3209 $self->force_uptodate;
3210
2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3211 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807 3212
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 { 3213 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836 glClearColor 0, 0, 0, 0; 3214 glClearColor 0, 0, 0, 0;
2837 glClear GL_COLOR_BUFFER_BIT; 3215 glClear GL_COLOR_BUFFER_BIT;
2838 3216
3217 package CFPlus::UI::Base;
3218 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3219 (0, 0, $self->{w}, $self->{h});
3220
3221 my $top = int $self->{children}[1]{range}[0];
3222
3223 my $paridx = 0;
3224 my $top_paragraph;
2839 my $top = int $self->{children}[1]{range}[0]; 3225 my $top = int $self->{children}[1]{range}[0];
2840 3226
2841 my $y0 = $top; 3227 my $y0 = $top;
2842 my $y1 = $top + $H; 3228 my $y1 = $top + $H;
2843 3229
2844 my $y = 0;
2845
2846 for my $para (@{$self->{par}}) { 3230 for my $para (@{$self->{par}}) {
2847 my $h = $para->{h}; 3231 my $h = $para->{h};
3232 my $y = $para->{y};
2848 3233
2849 if ($y0 < $y + $h && $y < $y1) { 3234 if ($y0 < $y + $h && $y < $y1) {
2850
2851 my $layout = $self->get_layout ($para); 3235 my $layout = $self->get_layout ($para);
2852 3236
2853 $layout->render ($para->{indent}, $y - $y0); 3237 $layout->render ($para->{indent}, $y - $y0);
2854 3238
2855 if (my @w = @{ $para->{widget} }) { 3239 if (my @w = @{ $para->{widget} }) {
… …
2864 $_->draw; 3248 $_->draw;
2865 } 3249 }
2866 } 3250 }
2867 } 3251 }
2868 3252
2869 $y += $h; 3253 $paridx++;
3254 $top_paragraph ||= $paridx if $y >= $top;
2870 } 3255 }
3256
3257 $self->{top_paragraph} = $top_paragraph;
2871 }; 3258 };
2872 }); 3259 });
2873} 3260}
2874 3261
2875sub reconfigure { 3262sub reconfigure {
… …
2893 $self->{children}[1]->draw; 3280 $self->{children}[1]->draw;
2894} 3281}
2895 3282
2896############################################################################# 3283#############################################################################
2897 3284
2898package CFClient::UI::Animator; 3285package CFPlus::UI::Animator;
2899 3286
2900use CFClient::OpenGL; 3287use CFPlus::OpenGL;
2901 3288
2902our @ISA = CFClient::UI::Bin::; 3289our @ISA = CFPlus::UI::Bin::;
2903 3290
2904sub moveto { 3291sub moveto {
2905 my ($self, $x, $y) = @_; 3292 my ($self, $x, $y) = @_;
2906 3293
2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3294 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2935 glPopMatrix; 3322 glPopMatrix;
2936} 3323}
2937 3324
2938############################################################################# 3325#############################################################################
2939 3326
2940package CFClient::UI::Flopper; 3327package CFPlus::UI::Flopper;
2941 3328
2942our @ISA = CFClient::UI::Button::; 3329our @ISA = CFPlus::UI::Button::;
2943 3330
2944sub new { 3331sub new {
2945 my $class = shift; 3332 my $class = shift;
2946 3333
2947 my $self = $class->SUPER::new ( 3334 my $self = $class->SUPER::new (
… …
2959 $self->{other}->toggle_visibility; 3346 $self->{other}->toggle_visibility;
2960} 3347}
2961 3348
2962############################################################################# 3349#############################################################################
2963 3350
2964package CFClient::UI::Tooltip; 3351package CFPlus::UI::Tooltip;
2965 3352
2966our @ISA = CFClient::UI::Bin::; 3353our @ISA = CFPlus::UI::Bin::;
2967 3354
2968use CFClient::OpenGL; 3355use CFPlus::OpenGL;
2969 3356
2970sub new { 3357sub new {
2971 my $class = shift; 3358 my $class = shift;
2972 3359
2973 $class->SUPER::new ( 3360 $class->SUPER::new (
… …
2976 ) 3363 )
2977} 3364}
2978 3365
2979sub set_tooltip_from { 3366sub set_tooltip_from {
2980 my ($self, $widget) = @_; 3367 my ($self, $widget) = @_;
3368
3369 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3370 if $widget->{tooltip} =~ /^#(.*)$/;
2981 3371
2982 my $tooltip = $widget->{tooltip}; 3372 my $tooltip = $widget->{tooltip};
2983 3373
2984 if ($ENV{CFPLUS_DEBUG} & 2) { 3374 if ($ENV{CFPLUS_DEBUG} & 2) {
2985 $tooltip .= "\n\n" . (ref $widget) . "\n" 3375 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2989 } 3379 }
2990 3380
2991 $tooltip =~ s/^\n+//; 3381 $tooltip =~ s/^\n+//;
2992 $tooltip =~ s/\n+$//; 3382 $tooltip =~ s/\n+$//;
2993 3383
2994 $self->add (new CFClient::UI::Label 3384 $self->add (new CFPlus::UI::Label
2995 markup => $tooltip, 3385 markup => $tooltip,
2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3386 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997 fontsize => 0.8, 3387 fontsize => 0.8,
2998 fg => [0, 0, 0, 1], 3388 style => 1, # FLAG_INVERSE
2999 ellipsise => 0, 3389 ellipsise => 0,
3000 font => ($widget->{tooltip_font} || $::FONT_PROP), 3390 font => ($widget->{tooltip_font} || $::FONT_PROP),
3001 ); 3391 );
3002} 3392}
3003 3393
… …
3065 $self->SUPER::_draw; 3455 $self->SUPER::_draw;
3066} 3456}
3067 3457
3068############################################################################# 3458#############################################################################
3069 3459
3070package CFClient::UI::Face; 3460package CFPlus::UI::Face;
3071 3461
3072our @ISA = CFClient::UI::DrawBG::; 3462our @ISA = CFPlus::UI::DrawBG::;
3073 3463
3074use CFClient::OpenGL; 3464use CFPlus::OpenGL;
3075 3465
3076sub new { 3466sub new {
3077 my $class = shift; 3467 my $class = shift;
3078 3468
3079 my $self = $class->SUPER::new ( 3469 my $self = $class->SUPER::new (
3470 size_w => 32,
3471 size_h => 8,
3080 aspect => 1, 3472 aspect => 1,
3081 can_events => 0, 3473 can_events => 0,
3082 @_, 3474 @_,
3083 ); 3475 );
3084 3476
3085 if ($self->{anim} && $self->{animspeed}) { 3477 if ($self->{anim} && $self->{animspeed}) {
3086 Scalar::Util::weaken (my $widget = $self); 3478 CFPlus::weaken (my $widget = $self);
3087 3479
3480 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3481 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3088 $self->{timer} = Event->timer ( 3482 $self->{timer} = Event->timer (
3089 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090 hard => 1, 3483 parked => 1,
3091 interval => $self->{animspeed},
3092 cb => sub { 3484 cb => sub {
3485 return unless $::CONN && $widget;
3486
3093 ++$widget->{frame}; 3487 ++$widget->{frame};
3488 $widget->update_face;
3094 $widget->update; 3489 $widget->update;
3490
3491 $widget->update_timer;
3095 }, 3492 },
3096 ); 3493 );
3494
3495 $self->update_face;
3496 $self->update_timer;
3097 } 3497 }
3098 3498
3099 $self 3499 $self
3100} 3500}
3101 3501
3502sub update_timer {
3503 my ($self) = @_;
3504
3505 return unless $self->{timer};
3506
3507 if ($self->{visible}) {
3508 $self->{timer}->at (
3509 $self->{anim_start}
3510 + $self->{animspeed}
3511 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3512 );
3513 $self->{timer}->start;
3514 } else {
3515 $self->{timer}->stop;
3516 }
3517}
3518
3519sub update_face {
3520 my ($self) = @_;
3521
3522 return unless $::CONN;
3523
3524 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3525 if ($anim && @$anim) {
3526 delete $self->{wait_face};
3527 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3528 }
3529 }
3530}
3531
3102sub size_request { 3532sub size_request {
3103 (32, 8) 3533 my ($self) = @_;
3534
3535 if ($::CONN) {
3536 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3537 if (my $tex = $::CONN->{texture}[$faceid]) {
3538 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3539 } else {
3540 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3541 $self->realloc;
3542 });
3543 }
3544 }
3545 }
3546
3547 ($self->{size_w} || 8, $self->{size_h} || 8)
3104} 3548}
3105 3549
3106sub update { 3550sub update {
3107 my ($self) = @_; 3551 my ($self) = @_;
3108 3552
3109 return unless $self->{visible}; 3553 return unless $self->{visible};
3110 3554
3111 $self->SUPER::update; 3555 $self->SUPER::update;
3112} 3556}
3113 3557
3558sub invoke_visibility_change {
3559 my ($self) = @_;
3560
3561 $self->update_timer;
3562
3563 0
3564}
3565
3114sub _draw { 3566sub _draw {
3115 my ($self) = @_; 3567 my ($self) = @_;
3116 3568
3117 return unless $::CONN; 3569 return unless $::CONN;
3118 3570
3119 $self->SUPER::_draw; 3571 $self->SUPER::_draw;
3120 3572
3121 my $face;
3122
3123 if ($self->{frame}) {
3124 my $anim = $::CONN->{anim}[$self->{anim}]; 3573 my $faceid = $::CONN->{faceid}[$self->{face}]
3125 3574 or return;
3126 $face = $anim->[ $self->{frame} % @$anim ]
3127 if $anim && @$anim;
3128 }
3129 3575
3130 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3576 my $tex = $::CONN->{texture}[$faceid];
3131 3577
3132 if ($tex) { 3578 if ($tex) {
3133 glEnable GL_TEXTURE_2D; 3579 glEnable GL_TEXTURE_2D;
3134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135 glColor 0, 0, 0, 1; 3581 glColor 0, 0, 0, 1;
… …
3139} 3585}
3140 3586
3141sub destroy { 3587sub destroy {
3142 my ($self) = @_; 3588 my ($self) = @_;
3143 3589
3144 $self->{timer}->cancel 3590 (delete $self->{timer})->cancel
3145 if $self->{timer}; 3591 if $self->{timer};
3146 3592
3147 $self->SUPER::destroy; 3593 $self->SUPER::destroy;
3148} 3594}
3149 3595
3150############################################################################# 3596#############################################################################
3151 3597
3152package CFClient::UI::Buttonbar; 3598package CFPlus::UI::Buttonbar;
3153 3599
3154our @ISA = CFClient::UI::HBox::; 3600our @ISA = CFPlus::UI::HBox::;
3155 3601
3156# TODO: should actualyl wrap buttons and other goodies. 3602# TODO: should actually wrap buttons and other goodies.
3157 3603
3158############################################################################# 3604#############################################################################
3159 3605
3160package CFClient::UI::Menu; 3606package CFPlus::UI::Menu;
3161 3607
3162our @ISA = CFClient::UI::FancyFrame::; 3608our @ISA = CFPlus::UI::Toplevel::;
3163 3609
3164use CFClient::OpenGL; 3610use CFPlus::OpenGL;
3165 3611
3166sub new { 3612sub new {
3167 my $class = shift; 3613 my $class = shift;
3168 3614
3169 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
3170 items => [], 3616 items => [],
3171 z => 100, 3617 z => 100,
3172 @_, 3618 @_,
3173 ); 3619 );
3174 3620
3175 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3621 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3176 3622
3177 for my $item (@{ $self->{items} }) { 3623 for my $item (@{ $self->{items} }) {
3178 my ($widget, $cb, $tooltip) = @$item; 3624 my ($widget, $cb, $tooltip) = @$item;
3179 3625
3180 # handle various types of items, only text for now 3626 # handle various types of items, only text for now
3181 if (!ref $widget) { 3627 if (!ref $widget) {
3182 if ($widget =~ /\t/) { 3628 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2; 3629 my ($left, $right) = split /\t/, $widget, 2;
3184 3630
3185 $widget = new CFClient::UI::HBox 3631 $widget = new CFPlus::UI::HBox
3186 can_hover => 1, 3632 can_hover => 1,
3187 can_events => 1, 3633 can_events => 1,
3188 tooltip => $tooltip, 3634 tooltip => $tooltip,
3189 children => [ 3635 children => [
3190 (new CFClient::UI::Label markup => $left, expand => 1), 3636 (new CFPlus::UI::Label markup => $left, expand => 1),
3191 (new CFClient::UI::Label markup => $right, align => +1), 3637 (new CFPlus::UI::Label markup => $right, align => +1),
3192 ], 3638 ],
3193 ; 3639 ;
3194 3640
3195 } else { 3641 } else {
3196 $widget = new CFClient::UI::Label 3642 $widget = new CFPlus::UI::Label
3197 can_hover => 1, 3643 can_hover => 1,
3198 can_events => 1, 3644 can_events => 1,
3199 markup => $widget, 3645 markup => $widget,
3200 tooltip => $tooltip; 3646 tooltip => $tooltip;
3201 } 3647 }
… …
3249 1 3695 1
3250} 3696}
3251 3697
3252############################################################################# 3698#############################################################################
3253 3699
3254package CFClient::UI::Multiplexer; 3700package CFPlus::UI::Multiplexer;
3255 3701
3256our @ISA = CFClient::UI::Container::; 3702our @ISA = CFPlus::UI::Container::;
3257 3703
3258sub new { 3704sub new {
3259 my $class = shift; 3705 my $class = shift;
3260 3706
3261 my $self = $class->SUPER::new ( 3707 my $self = $class->SUPER::new (
… …
3322 $self->{current}->draw; 3768 $self->{current}->draw;
3323} 3769}
3324 3770
3325############################################################################# 3771#############################################################################
3326 3772
3327package CFClient::UI::Notebook; 3773package CFPlus::UI::Notebook;
3328 3774
3329our @ISA = CFClient::UI::VBox::; 3775our @ISA = CFPlus::UI::VBox::;
3330 3776
3331sub new { 3777sub new {
3332 my $class = shift; 3778 my $class = shift;
3333 3779
3334 my $self = $class->SUPER::new ( 3780 my $self = $class->SUPER::new (
3335 buttonbar => (new CFClient::UI::Buttonbar), 3781 buttonbar => (new CFPlus::UI::Buttonbar),
3336 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3782 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3337 # filter => # will be put between multiplexer and $self 3783 # filter => # will be put between multiplexer and $self
3338 @_, 3784 @_,
3339 ); 3785 );
3340 3786
3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3787 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3345} 3791}
3346 3792
3347sub add { 3793sub add {
3348 my ($self, $title, $widget, $tooltip) = @_; 3794 my ($self, $title, $widget, $tooltip) = @_;
3349 3795
3350 Scalar::Util::weaken $self; 3796 CFPlus::weaken $self;
3351 3797
3352 $self->{buttonbar}->add (new CFClient::UI::Button 3798 $self->{buttonbar}->add (new CFPlus::UI::Button
3353 markup => $title, 3799 markup => $title,
3354 tooltip => $tooltip, 3800 tooltip => $tooltip,
3355 on_activate => sub { $self->set_current_page ($widget) }, 3801 on_activate => sub { $self->set_current_page ($widget) },
3356 ); 3802 );
3357 3803
… …
3371 $self->emit (page_changed => $self->{multiplexer}{current}); 3817 $self->emit (page_changed => $self->{multiplexer}{current});
3372} 3818}
3373 3819
3374############################################################################# 3820#############################################################################
3375 3821
3376package CFClient::UI::Selector; 3822package CFPlus::UI::Selector;
3377 3823
3378use utf8; 3824use utf8;
3379 3825
3380our @ISA = CFClient::UI::Button::; 3826our @ISA = CFPlus::UI::Button::;
3381 3827
3382sub new { 3828sub new {
3383 my $class = shift; 3829 my $class = shift;
3384 3830
3385 my $self = $class->SUPER::new ( 3831 my $self = $class->SUPER::new (
… …
3402 my ($value, $title, $tooltip) = @$_; 3848 my ($value, $title, $tooltip) = @$_;
3403 3849
3404 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3850 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405 } 3851 }
3406 3852
3407 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3853 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408} 3854}
3409 3855
3410sub _set_value { 3856sub _set_value {
3411 my ($self, $value) = @_; 3857 my ($self, $value) = @_;
3412 3858
… …
3427 $self->emit (changed => $value); 3873 $self->emit (changed => $value);
3428} 3874}
3429 3875
3430############################################################################# 3876#############################################################################
3431 3877
3432package CFClient::UI::Statusbox; 3878package CFPlus::UI::Statusbox;
3433 3879
3434our @ISA = CFClient::UI::VBox::; 3880our @ISA = CFPlus::UI::VBox::;
3435 3881
3436sub new { 3882sub new {
3437 my $class = shift; 3883 my $class = shift;
3438 3884
3439 my $self = $class->SUPER::new ( 3885 my $self = $class->SUPER::new (
3440 fontsize => 0.8, 3886 fontsize => 0.8,
3441 @_, 3887 @_,
3442 ); 3888 );
3443 3889
3444 Scalar::Util::weaken (my $this = $self); 3890 CFPlus::weaken (my $this = $self);
3445 3891
3446 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3892 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447 3893
3448 $self 3894 $self
3449} 3895}
… …
3451sub reorder { 3897sub reorder {
3452 my ($self) = @_; 3898 my ($self) = @_;
3453 my $NOW = Time::HiRes::time; 3899 my $NOW = Time::HiRes::time;
3454 3900
3455 # freeze display when hovering over any label 3901 # freeze display when hovering over any label
3456 return if $CFClient::UI::TOOLTIP->{owner} 3902 return if $CFPlus::UI::TOOLTIP->{owner}
3457 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3903 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458 values %{ $self->{item} }; 3904 values %{ $self->{item} };
3459 3905
3460 while (my ($k, $v) = each %{ $self->{item} }) { 3906 while (my ($k, $v) = each %{ $self->{item} }) {
3461 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3907 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3462 } 3908 }
… …
3483 for ($short) { 3929 for ($short) {
3484 s/^\s+//; 3930 s/^\s+//;
3485 s/\s+/ /g; 3931 s/\s+/ /g;
3486 } 3932 }
3487 3933
3488 new CFClient::UI::Label 3934 new CFPlus::UI::Label
3489 markup => $short, 3935 markup => $short,
3490 tooltip => $item->{tooltip}, 3936 tooltip => $item->{tooltip},
3491 tooltip_font => $::FONT_PROP, 3937 tooltip_font => $::FONT_PROP,
3492 tooltip_width => 0.67, 3938 tooltip_width => 0.67,
3493 fontsize => $item->{fontsize} || $self->{fontsize}, 3939 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3572 $self->SUPER::destroy; 4018 $self->SUPER::destroy;
3573} 4019}
3574 4020
3575############################################################################# 4021#############################################################################
3576 4022
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; 4023package CFPlus::UI::Root;
3762 4024
3763our @ISA = CFClient::UI::Container::; 4025our @ISA = CFPlus::UI::Container::;
3764 4026
3765use List::Util qw(min max); 4027use List::Util qw(min max);
3766 4028
3767use CFClient::OpenGL; 4029use CFPlus::OpenGL;
3768 4030
3769sub new { 4031sub new {
3770 my $class = shift; 4032 my $class = shift;
3771 4033
3772 my $self = $class->SUPER::new ( 4034 my $self = $class->SUPER::new (
3773 visible => 1, 4035 visible => 1,
3774 @_, 4036 @_,
3775 ); 4037 );
3776 4038
3777 Scalar::Util::weaken ($self->{root} = $self); 4039 CFPlus::weaken ($self->{root} = $self);
3778 4040
3779 $self 4041 $self
3780} 4042}
3781 4043
3782sub size_request { 4044sub size_request {
… …
3977 while ($self->{post_alloc_hook}) { 4239 while ($self->{post_alloc_hook}) {
3978 $_->() 4240 $_->()
3979 for values %{delete $self->{post_alloc_hook}}; 4241 for values %{delete $self->{post_alloc_hook}};
3980 } 4242 }
3981 4243
3982
3983 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4244 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3984 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4245 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3985 glClear GL_COLOR_BUFFER_BIT; 4246 glClear GL_COLOR_BUFFER_BIT;
3986 4247
3987 glMatrixMode GL_PROJECTION; 4248 glMatrixMode GL_PROJECTION;
… …
3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4250 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3990 glMatrixMode GL_MODELVIEW; 4251 glMatrixMode GL_MODELVIEW;
3991 glLoadIdentity; 4252 glLoadIdentity;
3992 4253
3993 { 4254 {
3994 package CFClient::UI::Base; 4255 package CFPlus::UI::Base;
3995 4256
3996 ($draw_x, $draw_y, $draw_w, $draw_h) = 4257 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997 (0, 0, $self->{w}, $self->{h}); 4258 (0, 0, $self->{w}, $self->{h});
3998 }
3999 4259
4000 $self->_draw; 4260 $self->_draw;
4261 }
4001} 4262}
4002 4263
4003############################################################################# 4264#############################################################################
4004 4265
4005package CFClient::UI; 4266package CFPlus::UI;
4006 4267
4007$ROOT = new CFClient::UI::Root; 4268$ROOT = new CFPlus::UI::Root;
4008$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4269$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4009 4270
40101 42711
4011 4272

Diff Legend

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