ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.337 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.397 by root, Sat Jul 21 14:01:35 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;
… …
96 99
97sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
98 my ($ev) = @_; 101 my ($ev) = @_;
99 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
100 103
101 unless ($BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
102 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
103 108
104 $GRAB = $widget; 109 $GRAB = $widget;
105 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
106 111
107 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
108 } 113 }
109
110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
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
… …
773} 789}
774 790
775sub clear { 791sub clear {
776 my ($self) = @_; 792 my ($self) = @_;
777 793
778 my $children = delete $self->{children}; 794 my $children = $self->{children};
779 $self->{children} = []; 795 $self->{children} = [];
780 796
781 for (@$children) { 797 for (@$children) {
782 delete $_->{parent}; 798 delete $_->{parent};
783 $_->hide; 799 $_->hide;
… …
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
1050#TODO# update range on size_allocate depending on child
1051 1106
1052sub add { 1107sub add {
1053 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1054 1109
1055 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1056} 1111}
1057 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{hslider})
1125 : $self->SUPER::remove ($self->{hslider});
1126 }
1127
1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1129 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1130
1131 my $visible = $h1 > $h2;
1132 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider});
1136 }
1137}
1138
1139
1140sub start_dragging {
1141 my ($self, $ev) = @_;
1142
1143 $self->grab_focus;
1144
1145 my $ox = $self->{vp}{view_x};
1146 my $oy = $self->{vp}{view_y};
1147
1148 $self->{motion} = sub {
1149 my ($ev, $x, $y) = @_;
1150
1151 $ox -= $ev->{xrel};
1152 $oy -= $ev->{yrel};
1153
1154 $self->{vp}->set_offset ($ox, $oy);
1155 };
1156}
1157
1058sub invoke_mouse_wheel { 1158sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1159 my ($self, $ev) = @_;
1060 1160
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev); 1161 $self->{vslider}->emit (mouse_wheel => $ev);
1162 $self->{hslider}->emit (mouse_wheel => $ev);
1064 1163
1065 1 1164 1
1066} 1165}
1067 1166
1068sub update_slider { 1167sub invoke_button_down {
1069 my ($self) = @_; 1168 my ($self, $ev, $x, $y) = @_;
1070 1169
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1170 $self->start_dragging ($ev);
1072}
1073 1171
1074sub update { 1172 1
1075 my ($self) = @_; 1173}
1076 1174
1077 $self->SUPER::update; 1175sub invoke_button_up {
1176 my ($self, $ev, $x, $y) = @_;
1078 1177
1079 $self->update_slider; 1178 if (delete $self->{motion}) {
1179 return 1;
1180 }
1181
1182 0
1183}
1184
1185sub invoke_mouse_motion {
1186 my ($self, $ev, $x, $y) = @_;
1187
1188 if ($self->{motion}) {
1189 $self->{motion}->($ev, $x, $y);
1190 return 1;
1191 }
1192
1193 0
1080} 1194}
1081 1195
1082sub invoke_size_allocate { 1196sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1197 my ($self, $w, $h) = @_;
1084 1198
1085 $self->update_slider; 1199 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1200 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1201}
1089 1202
1090############################################################################# 1203#############################################################################
1091 1204
1092package CFClient::UI::Frame; 1205package CFPlus::UI::Frame;
1093 1206
1094our @ISA = CFClient::UI::Bin::; 1207our @ISA = CFPlus::UI::Bin::;
1095 1208
1096use CFClient::OpenGL; 1209use CFPlus::OpenGL;
1097 1210
1098sub new { 1211sub new {
1099 my $class = shift; 1212 my $class = shift;
1100 1213
1101 $class->SUPER::new ( 1214 $class->SUPER::new (
… …
1127 $self->SUPER::_draw; 1240 $self->SUPER::_draw;
1128} 1241}
1129 1242
1130############################################################################# 1243#############################################################################
1131 1244
1132package CFClient::UI::FancyFrame; 1245package CFPlus::UI::FancyFrame;
1133 1246
1134our @ISA = CFClient::UI::Bin::; 1247our @ISA = CFPlus::UI::Bin::;
1135 1248
1136use CFClient::OpenGL; 1249use CFPlus::OpenGL;
1250
1251sub new {
1252 my ($class, %arg) = @_;
1253
1254 if ((exists $arg{label}) && !ref $arg{label}) {
1255 $arg{label} = new CFPlus::UI::Label
1256 align => 1,
1257 valign => 0,
1258 text => $arg{label},
1259 fontsize => ($arg{border} || 0.8) * 0.75;
1260 }
1261
1262 my $self = $class->SUPER::new (
1263 # label => "",
1264 fg => [0.6, 0.3, 0.1],
1265 border => 0.8,
1266 style => 'single',
1267 %arg,
1268 );
1269
1270 $self
1271}
1272
1273sub add {
1274 my ($self, @widgets) = @_;
1275
1276 $self->SUPER::add (@widgets);
1277 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1278}
1279
1280sub border {
1281 int $_[0]{border} * $::FONTSIZE
1282}
1283
1284sub size_request {
1285 my ($self) = @_;
1286
1287 ($self->{label_w}, undef) = $self->{label}->size_request
1288 if $self->{label};
1289
1290 my ($w, $h) = $self->SUPER::size_request;
1291
1292 (
1293 $w + $self->border * 2,
1294 $h + $self->border * 2,
1295 )
1296}
1297
1298sub invoke_size_allocate {
1299 my ($self, $w, $h) = @_;
1300
1301 my $border = $self->border;
1302
1303 $w -= List::Util::max 0, $border * 2;
1304 $h -= List::Util::max 0, $border * 2;
1305
1306 if (my $label = $self->{label}) {
1307 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1308 $label->{h} = List::Util::min $h, $border;
1309 $label->invoke_size_allocate ($label->{w}, $label->{h});
1310 }
1311
1312 $self->child->configure ($border, $border, $w, $h);
1313
1314 1
1315}
1316
1317sub _draw {
1318 my ($self) = @_;
1319
1320 my $child = $self->{children}[0];
1321
1322 my $border = $self->border;
1323 my ($w, $h) = ($self->{w}, $self->{h});
1324
1325 $child->draw;
1326
1327 glColor @{$self->{fg}};
1328 glBegin GL_LINE_STRIP;
1329 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1330 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1331 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1332 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1333 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1334 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1335 glEnd;
1336
1337 if ($self->{label}) {
1338 glTranslate $border * 2, 0;
1339 $self->{label}->_draw;
1340 }
1341}
1342
1343#############################################################################
1344
1345package CFPlus::UI::Toplevel;
1346
1347our @ISA = CFPlus::UI::Bin::;
1348
1349use CFPlus::OpenGL;
1137 1350
1138my $bg = 1351my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1352 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1353 mipmap => 1, wrap => 1;
1141 1354
1142my @border = 1355my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1356 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); 1357 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1358
1359my @icon =
1360 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1361 qw(x1_move.png x1_resize.png);
1145 1362
1146sub new { 1363sub new {
1147 my ($class, %arg) = @_; 1364 my ($class, %arg) = @_;
1148 1365
1149 my $self = $class->SUPER::new ( 1366 my $self = $class->SUPER::new (
… …
1154 min_w => 64, 1371 min_w => 64,
1155 min_h => 32, 1372 min_h => 32,
1156 %arg, 1373 %arg,
1157 ); 1374 );
1158 1375
1159 $self->{title_widget} = new CFClient::UI::Label 1376 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1377 align => 0,
1161 valign => 1, 1378 valign => 1,
1162 text => $self->{title}, 1379 text => $self->{title},
1163 fontsize => $self->{border}, 1380 fontsize => $self->{border},
1164 if exists $self->{title}; 1381 if exists $self->{title};
1165 1382
1166 if ($self->{has_close_button}) { 1383 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1384 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1385 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1386 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1387 on_activate => sub { $self->emit ("delete") };
1171 1388
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1389 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1390 }
1174 1391
1175 $self 1392 $self
1176} 1393}
1177 1394
1178sub add { 1395sub add {
1179 my ($self, @widgets) = @_; 1396 my ($self, @widgets) = @_;
1180 1397
1181 $self->SUPER::add (@widgets); 1398 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1399 $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}; 1400 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1401}
1185 1402
1186sub border { 1403sub border {
1187 int $_[0]{border} * $::FONTSIZE 1404 int $_[0]{border} * $::FONTSIZE
1188} 1405}
… …
1296 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1513 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297 1514
1298 ! ! $self->{motion} 1515 ! ! $self->{motion}
1299} 1516}
1300 1517
1518sub invoke_visibility_change {
1519 my ($self, $visible) = @_;
1520
1521 delete $self->{motion} unless $visible;
1522
1523 0
1524}
1525
1301sub _draw { 1526sub _draw {
1302 my ($self) = @_; 1527 my ($self) = @_;
1303 1528
1304 my $child = $self->{children}[0]; 1529 my $child = $self->{children}[0];
1305 1530
… …
1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1535 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1311 1536
1312 my $border = $self->border; 1537 my $border = $self->border;
1313 1538
1314 glColor @{ $self->{border_bg} }; 1539 glColor @{ $self->{border_bg} };
1315 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1540 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1316 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1541 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1317 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1542 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1318 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1543 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1544
1545 # move
1546 my $w2 = ($w - $border) * .5;
1547 my $h2 = ($h - $border) * .5;
1548 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1549 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1551
1552 # resize
1553 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1554 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1555 unless $self->{has_close_button};
1556 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1557 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1319 1558
1320 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1559 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1321 glColor @{ $self->{bg} }; 1560 glColor @{ $self->{bg} };
1322 1561
1323 # TODO: repeat texture not scale 1562 # TODO: repeat texture not scale
… …
1342 if $self->{close_button}; 1581 if $self->{close_button};
1343} 1582}
1344 1583
1345############################################################################# 1584#############################################################################
1346 1585
1347package CFClient::UI::Table; 1586package CFPlus::UI::Table;
1348 1587
1349our @ISA = CFClient::UI::Base::; 1588our @ISA = CFPlus::UI::Container::;
1350 1589
1351use List::Util qw(max sum); 1590use List::Util qw(max sum);
1352 1591
1353use CFClient::OpenGL; 1592use CFPlus::OpenGL;
1354 1593
1355sub new { 1594sub new {
1356 my $class = shift; 1595 my $class = shift;
1357 1596
1358 $class->SUPER::new ( 1597 $class->SUPER::new (
1359 col_expand => [], 1598 col_expand => [],
1599 row_expand => [],
1360 @_, 1600 @_,
1361 ) 1601 )
1362} 1602}
1363 1603
1364sub children {
1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366}
1367
1368sub add { 1604sub add {
1605 my ($self, @widgets) = @_;
1606
1607 for my $child (@widgets) {
1608 $child->{rowspan} ||= 1;
1609 $child->{colspan} ||= 1;
1610 }
1611
1612 $self->SUPER::add (@widgets);
1613}
1614
1615sub add_at {
1369 my ($self) = shift; 1616 my $self = shift;
1617
1618 my @widgets;
1370 1619
1371 while (@_) { 1620 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, (); 1621 my ($col, $row, $child) = splice @_, 0, 3, ();
1373 $child->set_parent ($self);
1374 $self->{children}[$y][$x] = $child;
1375 }
1376 1622
1377 $self->{force_realloc} = 1; 1623 $child->{row} = $row;
1378 $self->{force_size_alloc} = 1; 1624 $child->{col} = $col;
1379 $self->realloc;
1380}
1381 1625
1382sub remove { 1626 push @widgets, $child;
1627 }
1628
1629 $self->add (@widgets);
1630}
1631
1632sub get_wh {
1383 my ($self, $child) = @_; 1633 my ($self) = @_;
1384 1634
1385 # TODO: not yet implemented 1635 my (@w, @h);
1386}
1387
1388# TODO: move to container class maybe? send children a signal on removal?
1389sub clear {
1390 my ($self) = @_;
1391 1636
1392 my @children = $self->children; 1637 my @children = $self->children;
1393 delete $self->{children}; 1638
1639 # first pass, columns
1640 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1641 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1642
1643 my $sw = sum @w[$c .. $c + $cs - 1];
1644
1645 if ($w > $sw) {
1646 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1647 }
1394 1648 }
1395 for (@children) {
1396 delete $_->{parent};
1397 $_->hide;
1398 }
1399 1649
1400 $self->realloc; 1650 # second pass, rows
1401} 1651 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1402
1403sub get_wh {
1404 my ($self) = @_;
1405
1406 my (@w, @h);
1407
1408 for my $y (0 .. $#{$self->{children}}) {
1409 my $row = $self->{children}[$y]
1410 or next;
1411
1412 for my $x (0 .. $#$row) {
1413 my $widget = $row->[$x]
1414 or next;
1415 my ($w, $h) = @$widget{qw(req_w req_h)}; 1652 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1416 1653
1417 $w[$x] = max $w[$x], $w; 1654 my $sh = sum @h[$r .. $r + $rs - 1];
1418 $h[$y] = max $h[$y], $h; 1655
1656 if ($h > $sh) {
1657 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1419 } 1658 }
1420 } 1659 }
1421 1660
1422 (\@w, \@h) 1661 (\@w, \@h)
1423} 1662}
… …
1439 my ($ws, $hs) = $self->get_wh; 1678 my ($ws, $hs) = $self->get_wh;
1440 1679
1441 my $req_w = (sum @$ws) || 1; 1680 my $req_w = (sum @$ws) || 1;
1442 my $req_h = (sum @$hs) || 1; 1681 my $req_h = (sum @$hs) || 1;
1443 1682
1444 # TODO: nicer code && do row_expand 1683 # now linearly scale the rows/columns to the allocated size
1445 my @col_expand = @{$self->{col_expand}}; 1684 my @col_expand = @{$self->{col_expand}};
1446 @col_expand = (1) x @$ws unless @col_expand; 1685 @col_expand = (1) x @$ws unless @col_expand;
1447 my $col_expand = (sum @col_expand) || 1; 1686 my $col_expand = (sum @col_expand) || 1;
1448 1687
1449 # linearly scale sizes
1450 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1688 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452 1689
1453 CFClient::UI::harmonize $ws; 1690 CFPlus::UI::harmonize $ws;
1691
1692 my @row_expand = @{$self->{row_expand}};
1693 @row_expand = (1) x @$ws unless @row_expand;
1694 my $row_expand = (sum @row_expand) || 1;
1695
1696 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1697
1454 CFClient::UI::harmonize $hs; 1698 CFPlus::UI::harmonize $hs;
1455 1699
1456 my $y; 1700 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1701 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1457 1702
1458 for my $r (0 .. $#{$self->{children}}) { 1703 for my $widget ($self->children) {
1459 my $row = $self->{children}[$r] 1704 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1460 or next;
1461 1705
1462 my $x = 0; 1706 $widget->configure (
1463 my $row_h = $hs->[$r]; 1707 $x[$c], $y[$r],
1708 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1464 1709 );
1465 for my $c (0 .. $#$row) { 1710 }
1466 my $col_w = $ws->[$c];
1467 1711
1468 if (my $widget = $row->[$c]) { 1712 1
1469 $widget->configure ($x, $y, $col_w, $row_h); 1713}
1470 }
1471 1714
1472 $x += $col_w; 1715#############################################################################
1716
1717package CFPlus::UI::Fixed;
1718
1719use List::Util qw(min max);
1720
1721our @ISA = CFPlus::UI::Container::;
1722
1723sub add {
1724 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1725
1726 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1727 $self->SUPER::add ($child);
1728}
1729
1730sub _scale($$$) {
1731 my ($mode, $val, $max) = @_;
1732
1733 $mode eq "abs" ? $val
1734 : $mode eq "rel" ? $val * $max
1735 : 0
1736}
1737
1738sub size_request {
1739 my ($self) = @_;
1740
1741 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1742
1743 # determine overall size by querying abs widgets
1744 for my $child ($self->visible_children) {
1745 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1746
1747 if ($pos eq "abs") {
1748 $w = _scale $size, $w, $child->{req_w};
1749 $h = _scale $size, $h, $child->{req_h};
1750
1751 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1752 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1473 } 1753 }
1754 }
1474 1755
1475 $y += $row_h; 1756 my $W = $x2 - $x1;
1757 my $H = $y2 - $y1;
1758
1759 # now layout remaining widgets
1760 for my $child ($self->visible_children) {
1761 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1762
1763 if ($pos ne "abs") {
1764 $x = _scale $pos, $x, $W;
1765 $y = _scale $pos, $x, $H;
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1771 }
1772 }
1773
1774 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1;
1776
1777 ($W, $H)
1778}
1779
1780sub invoke_size_allocate {
1781 my ($self, $W, $H) = @_;
1782
1783 for my $child ($self->visible_children) {
1784 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1785
1786 $x = _scale $pos, $x, $W;
1787 $y = _scale $pos, $x, $H;
1788 $w = _scale $size, $w, $child->{req_w};
1789 $h = _scale $size, $h, $child->{req_h};
1790
1791 $child->configure ($x, $y, $w, $h);
1476 } 1792 }
1477 1793
1478 1 1794 1
1479} 1795}
1480 1796
1481sub find_widget {
1482 my ($self, $x, $y) = @_;
1483
1484 $x -= $self->{x};
1485 $y -= $self->{y};
1486
1487 my $res;
1488
1489 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1490 $res = $_->find_widget ($x, $y)
1491 and return $res;
1492 }
1493
1494 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1495}
1496
1497sub _draw {
1498 my ($self) = @_;
1499
1500 for (grep $_, @{$self->{children}}) {
1501 $_->draw for grep $_, @$_;
1502 }
1503}
1504
1505############################################################################# 1797#############################################################################
1506 1798
1507package CFClient::UI::Box; 1799package CFPlus::UI::Box;
1508 1800
1509our @ISA = CFClient::UI::Container::; 1801our @ISA = CFPlus::UI::Container::;
1510 1802
1511sub size_request { 1803sub size_request {
1512 my ($self) = @_; 1804 my ($self) = @_;
1513 1805
1514 $self->{vertical} 1806 $self->{vertical}
… …
1547 $req[$_] += $space * $children[$_]{expand} 1839 $req[$_] += $space * $children[$_]{expand}
1548 for 0 .. $#children; 1840 for 0 .. $#children;
1549 } 1841 }
1550 } 1842 }
1551 1843
1552 CFClient::UI::harmonize \@req; 1844 CFPlus::UI::harmonize \@req;
1553 1845
1554 my $pos = 0; 1846 my $pos = 0;
1555 for (0 .. $#children) { 1847 for (0 .. $#children) {
1556 my $alloc = $req[$_]; 1848 my $alloc = $req[$_];
1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1849 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1562 1 1854 1
1563} 1855}
1564 1856
1565############################################################################# 1857#############################################################################
1566 1858
1567package CFClient::UI::HBox; 1859package CFPlus::UI::HBox;
1568 1860
1569our @ISA = CFClient::UI::Box::; 1861our @ISA = CFPlus::UI::Box::;
1570 1862
1571sub new { 1863sub new {
1572 my $class = shift; 1864 my $class = shift;
1573 1865
1574 $class->SUPER::new ( 1866 $class->SUPER::new (
… …
1577 ) 1869 )
1578} 1870}
1579 1871
1580############################################################################# 1872#############################################################################
1581 1873
1582package CFClient::UI::VBox; 1874package CFPlus::UI::VBox;
1583 1875
1584our @ISA = CFClient::UI::Box::; 1876our @ISA = CFPlus::UI::Box::;
1585 1877
1586sub new { 1878sub new {
1587 my $class = shift; 1879 my $class = shift;
1588 1880
1589 $class->SUPER::new ( 1881 $class->SUPER::new (
… …
1592 ) 1884 )
1593} 1885}
1594 1886
1595############################################################################# 1887#############################################################################
1596 1888
1597package CFClient::UI::Label; 1889package CFPlus::UI::Label;
1598 1890
1599our @ISA = CFClient::UI::DrawBG::; 1891our @ISA = CFPlus::UI::DrawBG::;
1600 1892
1601use CFClient::OpenGL; 1893use CFPlus::OpenGL;
1602 1894
1603sub new { 1895sub new {
1604 my ($class, %arg) = @_; 1896 my ($class, %arg) = @_;
1605 1897
1606 my $self = $class->SUPER::new ( 1898 my $self = $class->SUPER::new (
… …
1609 #active_bg => none 1901 #active_bg => none
1610 #font => default_font 1902 #font => default_font
1611 #text => initial text 1903 #text => initial text
1612 #markup => initial narkup 1904 #markup => initial narkup
1613 #max_w => maximum pixel width 1905 #max_w => maximum pixel width
1906 #style => 0, # render flags
1614 ellipsise => 3, # end 1907 ellipsise => 3, # end
1615 layout => (new CFClient::Layout), 1908 layout => (new CFPlus::Layout),
1616 fontsize => 1, 1909 fontsize => 1,
1617 align => -1, 1910 align => -1,
1618 valign => -1, 1911 valign => -1,
1619 padding_x => 2, 1912 padding_x => 2,
1620 padding_y => 2, 1913 padding_y => 2,
1621 can_events => 0, 1914 can_events => 0,
1622 %arg 1915 %arg
1623 ); 1916 );
1624 1917
1625 if (exists $self->{template}) { 1918 if (exists $self->{template}) {
1626 my $layout = new CFClient::Layout; 1919 my $layout = new CFPlus::Layout;
1627 $layout->set_text (delete $self->{template}); 1920 $layout->set_text (delete $self->{template});
1628 $self->{template} = $layout; 1921 $self->{template} = $layout;
1629 } 1922 }
1630 1923
1631 if (exists $self->{markup}) { 1924 if (exists $self->{markup}) {
… …
1769 }; 2062 };
1770 2063
1771 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2064 my $w = List::Util::min $self->{w} + 4, $size->[0];
1772 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2065 my $h = List::Util::min $self->{h} + 2, $size->[1];
1773 2066
1774 $self->{layout}->render ($self->{ox}, $self->{oy}); 2067 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775} 2068}
1776 2069
1777############################################################################# 2070#############################################################################
1778 2071
1779package CFClient::UI::EntryBase; 2072package CFPlus::UI::EntryBase;
1780 2073
1781our @ISA = CFClient::UI::Label::; 2074our @ISA = CFPlus::UI::Label::;
1782 2075
1783use CFClient::OpenGL; 2076use CFPlus::OpenGL;
1784 2077
1785sub new { 2078sub new {
1786 my $class = shift; 2079 my $class = shift;
1787 2080
1788 $class->SUPER::new ( 2081 $class->SUPER::new (
… …
1792 active_fg => [0, 0, 0], 2085 active_fg => [0, 0, 0],
1793 can_hover => 1, 2086 can_hover => 1,
1794 can_focus => 1, 2087 can_focus => 1,
1795 valign => 0, 2088 valign => 0,
1796 can_events => 1, 2089 can_events => 1,
2090 ellipsise => 0,
1797 #text => ... 2091 #text => ...
1798 #hidden => "*", 2092 #hidden => "*",
1799 @_ 2093 @_
1800 ) 2094 )
1801} 2095}
… …
1846 my $sym = $ev->{sym}; 2140 my $sym = $ev->{sym};
1847 my $uni = $ev->{unicode}; 2141 my $uni = $ev->{unicode};
1848 2142
1849 my $text = $self->get_text; 2143 my $text = $self->get_text;
1850 2144
2145 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2146
1851 if ($uni == 8) { 2147 if ($uni == 8) {
1852 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2148 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853 } elsif ($uni == 127) { 2149 } elsif ($uni == 127) {
1854 substr $text, $self->{cursor}, 1, ""; 2150 substr $text, $self->{cursor}, 1, "";
1855 } elsif ($sym == CFClient::SDLK_LEFT) { 2151 } elsif ($sym == CFPlus::SDLK_LEFT) {
1856 --$self->{cursor} if $self->{cursor}; 2152 --$self->{cursor} if $self->{cursor};
1857 } elsif ($sym == CFClient::SDLK_RIGHT) { 2153 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1858 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2154 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1859 } elsif ($sym == CFClient::SDLK_HOME) { 2155 } elsif ($sym == CFPlus::SDLK_HOME) {
2156 # what a hack
2157 $self->{cursor} =
2158 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2159 ? length $1
2160 : 0;
2161 } elsif ($sym == CFPlus::SDLK_END) {
2162 # uh, again
2163 $self->{cursor} =
2164 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2165 ? $self->{cursor} + length $1
2166 : length $self->{text};
2167 } elsif ($uni == 21) { # ctrl-u
2168 $text = "";
1860 $self->{cursor} = 0; 2169 $self->{cursor} = 0;
1861 } elsif ($sym == CFClient::SDLK_END) {
1862 $self->{cursor} = length $text;
1863 } elsif ($uni == 27) { 2170 } elsif ($uni == 27) {
1864 $self->emit ('escape'); 2171 $self->emit ('escape');
1865 } elsif ($uni) { 2172 } elsif ($uni == 0x0d) {
2173 substr $text, $self->{cursor}++, 0, "\012";
2174 } elsif ($uni >= 0x20) {
1866 substr $text, $self->{cursor}++, 0, chr $uni; 2175 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else { 2176 } else {
1868 return 0; 2177 return 0;
1869 } 2178 }
1870 2179
1871 $self->_set_text ($text); 2180 $self->_set_text ($text);
1872 2181
1873 $self->realloc; 2182 $self->realloc;
2183 $self->update;
1874 2184
1875 1 2185 1
1876} 2186}
1877 2187
1878sub invoke_focus_in { 2188sub invoke_focus_in {
… …
1940 utf8::encode $text; 2250 utf8::encode $text;
1941 2251
1942 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2252 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1943 } 2253 }
1944 2254
1945 glColor @{$self->{fg}};
1946 glBegin GL_LINES; 2255 glBegin GL_LINES;
1947 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2256 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1948 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2257 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949 glEnd; 2258 glEnd;
1950 } 2259 }
1951} 2260}
1952 2261
2262#############################################################################
2263
1953package CFClient::UI::Entry; 2264package CFPlus::UI::Entry;
1954 2265
1955our @ISA = CFClient::UI::EntryBase::; 2266our @ISA = CFPlus::UI::EntryBase::;
1956 2267
1957use CFClient::OpenGL; 2268use CFPlus::OpenGL;
1958 2269
1959sub invoke_key_down { 2270sub invoke_key_down {
1960 my ($self, $ev) = @_; 2271 my ($self, $ev) = @_;
1961 2272
1962 my $sym = $ev->{sym}; 2273 my $sym = $ev->{sym};
1963 2274
1964 if ($sym == 13) { 2275 if ($ev->{uni} == 0x0d || $sym == 13) {
1965 unshift @{$self->{history}}, 2276 unshift @{$self->{history}},
1966 my $txt = $self->get_text; 2277 my $txt = $self->get_text;
1967 2278
1968 $self->{history_pointer} = -1; 2279 $self->{history_pointer} = -1;
1969 $self->{history_saveback} = ''; 2280 $self->{history_saveback} = '';
1970 $self->emit (activate => $txt); 2281 $self->emit (activate => $txt);
1971 $self->update; 2282 $self->update;
1972 2283
1973 } elsif ($sym == CFClient::SDLK_UP) { 2284 } elsif ($sym == CFPlus::SDLK_UP) {
1974 if ($self->{history_pointer} < 0) { 2285 if ($self->{history_pointer} < 0) {
1975 $self->{history_saveback} = $self->get_text; 2286 $self->{history_saveback} = $self->get_text;
1976 } 2287 }
1977 if (@{$self->{history} || []} > 0) { 2288 if (@{$self->{history} || []} > 0) {
1978 $self->{history_pointer}++; 2289 $self->{history_pointer}++;
… …
1980 $self->{history_pointer} = @{$self->{history} || []} - 1; 2291 $self->{history_pointer} = @{$self->{history} || []} - 1;
1981 } 2292 }
1982 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2293 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1983 } 2294 }
1984 2295
1985 } elsif ($sym == CFClient::SDLK_DOWN) { 2296 } elsif ($sym == CFPlus::SDLK_DOWN) {
1986 $self->{history_pointer}--; 2297 $self->{history_pointer}--;
1987 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2298 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988 2299
1989 if ($self->{history_pointer} >= 0) { 2300 if ($self->{history_pointer} >= 0) {
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2301 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1999 1 2310 1
2000} 2311}
2001 2312
2002############################################################################# 2313#############################################################################
2003 2314
2315package CFPlus::UI::TextEdit;
2316
2317our @ISA = CFPlus::UI::EntryBase::;
2318
2319use CFPlus::OpenGL;
2320
2321sub move_cursor_ver {
2322 my ($self, $dy) = @_;
2323
2324 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2325
2326 $y += $dy;
2327
2328 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2329 $self->{cursor} = $index;
2330 delete $self->{cur_h};
2331 $self->update;
2332 return;
2333 }
2334}
2335
2336sub invoke_key_down {
2337 my ($self, $ev) = @_;
2338
2339 my $sym = $ev->{sym};
2340
2341 if ($sym == CFPlus::SDLK_UP) {
2342 $self->move_cursor_ver (-1);
2343 } elsif ($sym == CFPlus::SDLK_DOWN) {
2344 $self->move_cursor_ver (+1);
2345 } else {
2346 return $self->SUPER::invoke_key_down ($ev)
2347 }
2348
2349 1
2350}
2351
2352#############################################################################
2353
2004package CFClient::UI::Button; 2354package CFPlus::UI::Button;
2005 2355
2006our @ISA = CFClient::UI::Label::; 2356our @ISA = CFPlus::UI::Label::;
2007 2357
2008use CFClient::OpenGL; 2358use CFPlus::OpenGL;
2009 2359
2010my @tex = 2360my @tex =
2011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012 qw(b1_button_active.png); 2362 qw(b1_button_inactive.png b1_button_active.png);
2013 2363
2014sub new { 2364sub new {
2015 my $class = shift; 2365 my $class = shift;
2016 2366
2017 $class->SUPER::new ( 2367 $class->SUPER::new (
2018 padding_x => 4, 2368 padding_x => 4,
2019 padding_y => 4, 2369 padding_y => 4,
2020 fg => [1, 1, 1], 2370 fg => [1.0, 1.0, 1.0],
2021 active_fg => [0, 0, 1], 2371 active_fg => [0.8, 0.8, 0.8],
2022 can_hover => 1, 2372 can_hover => 1,
2023 align => 0, 2373 align => 0,
2024 valign => 0, 2374 valign => 0,
2025 can_events => 1, 2375 can_events => 1,
2026 @_ 2376 @_
… …
2044 2394
2045 glEnable GL_TEXTURE_2D; 2395 glEnable GL_TEXTURE_2D;
2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2396 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2047 glColor 0, 0, 0, 1; 2397 glColor 0, 0, 0, 1;
2048 2398
2399 my $tex = $tex[$GRAB == $self];
2049 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2400 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2050 2401
2051 glDisable GL_TEXTURE_2D; 2402 glDisable GL_TEXTURE_2D;
2052 2403
2053 $self->SUPER::_draw; 2404 $self->SUPER::_draw;
2054} 2405}
2055 2406
2056############################################################################# 2407#############################################################################
2057 2408
2058package CFClient::UI::CheckBox; 2409package CFPlus::UI::CheckBox;
2059 2410
2060our @ISA = CFClient::UI::DrawBG::; 2411our @ISA = CFPlus::UI::DrawBG::;
2061 2412
2062my @tex = 2413my @tex =
2063 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2414 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2064 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2415 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2065 2416
2066use CFClient::OpenGL; 2417use CFPlus::OpenGL;
2067 2418
2068sub new { 2419sub new {
2069 my $class = shift; 2420 my $class = shift;
2070 2421
2071 $class->SUPER::new ( 2422 $class->SUPER::new (
… …
2128 glDisable GL_TEXTURE_2D; 2479 glDisable GL_TEXTURE_2D;
2129} 2480}
2130 2481
2131############################################################################# 2482#############################################################################
2132 2483
2133package CFClient::UI::Image; 2484package CFPlus::UI::Image;
2134 2485
2135our @ISA = CFClient::UI::Base::; 2486our @ISA = CFPlus::UI::Base::;
2136 2487
2137use CFClient::OpenGL; 2488use CFPlus::OpenGL;
2138 2489
2139our %texture_cache; 2490our %texture_cache;
2140 2491
2141sub new { 2492sub new {
2142 my $class = shift; 2493 my $class = shift;
… …
2148 2499
2149 $self->{path} || $self->{tex} 2500 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required"; 2501 or Carp::croak "'path' or 'tex' attributes required";
2151 2502
2152 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2503 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2504 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2154 2505
2155 Scalar::Util::weaken $texture_cache{$self->{path}}; 2506 CFPlus::weaken $texture_cache{$self->{path}};
2156 2507
2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2508 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158 2509
2159 $self 2510 $self
2160} 2511}
2161 2512
2162sub STORABLE_freeze { 2513sub STORABLE_freeze {
2163 my ($self, $cloning) = @_; 2514 my ($self, $cloning) = @_;
2164 2515
2165 $self->{path} 2516 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2517 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2167 2518
2168 $self->{path} 2519 $self->{path}
2169} 2520}
2170 2521
2171sub STORABLE_attach { 2522sub STORABLE_attach {
… …
2202 glDisable GL_TEXTURE_2D; 2553 glDisable GL_TEXTURE_2D;
2203} 2554}
2204 2555
2205############################################################################# 2556#############################################################################
2206 2557
2207package CFClient::UI::ImageButton; 2558package CFPlus::UI::ImageButton;
2208 2559
2209our @ISA = CFClient::UI::Image::; 2560our @ISA = CFPlus::UI::Image::;
2210 2561
2211use CFClient::OpenGL; 2562use CFPlus::OpenGL;
2212 2563
2213my %textures; 2564my %textures;
2214 2565
2215sub new { 2566sub new {
2216 my $class = shift; 2567 my $class = shift;
… …
2238 1 2589 1
2239} 2590}
2240 2591
2241############################################################################# 2592#############################################################################
2242 2593
2243package CFClient::UI::VGauge; 2594package CFPlus::UI::VGauge;
2244 2595
2245our @ISA = CFClient::UI::Base::; 2596our @ISA = CFPlus::UI::Base::;
2246 2597
2247use List::Util qw(min max); 2598use List::Util qw(min max);
2248 2599
2249use CFClient::OpenGL; 2600use CFPlus::OpenGL;
2250 2601
2251my %tex = ( 2602my %tex = (
2252 food => [ 2603 food => [
2253 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2604 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2254 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2605 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255 ], 2606 ],
2256 grace => [ 2607 grace => [
2257 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2608 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2258 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2609 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2259 ], 2610 ],
2260 hp => [ 2611 hp => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2612 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2613 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263 ], 2614 ],
2264 mana => [ 2615 mana => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2617 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2267 ], 2618 ],
2268); 2619);
2269 2620
2270# eg. VGauge->new (gauge => 'food'), default gauge: food 2621# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2373 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2374} 2725}
2375 2726
2376############################################################################# 2727#############################################################################
2377 2728
2378package CFClient::UI::Gauge; 2729package CFPlus::UI::Gauge;
2379 2730
2380our @ISA = CFClient::UI::VBox::; 2731our @ISA = CFPlus::UI::VBox::;
2381 2732
2382sub new { 2733sub new {
2383 my ($class, %arg) = @_; 2734 my ($class, %arg) = @_;
2384 2735
2385 my $self = $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
… …
2387 can_hover => 1, 2738 can_hover => 1,
2388 can_events => 1, 2739 can_events => 1,
2389 %arg, 2740 %arg,
2390 ); 2741 );
2391 2742
2392 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2743 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2393 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2744 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2394 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2745 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2395 2746
2396 $self 2747 $self
2397} 2748}
2398 2749
2399sub set_fontsize { 2750sub set_fontsize {
… …
2420 $self->{value}->set_text ($val); 2771 $self->{value}->set_text ($val);
2421} 2772}
2422 2773
2423############################################################################# 2774#############################################################################
2424 2775
2425package CFClient::UI::Slider; 2776package CFPlus::UI::Slider;
2426 2777
2427use strict; 2778use strict;
2428 2779
2429use CFClient::OpenGL; 2780use CFPlus::OpenGL;
2430 2781
2431our @ISA = CFClient::UI::DrawBG::; 2782our @ISA = CFPlus::UI::DrawBG::;
2432 2783
2433my @tex = 2784my @tex =
2434 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2785 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2435 qw(s1_slider.png s1_slider_bg.png); 2786 qw(s1_slider.png s1_slider_bg.png);
2436 2787
2437sub new { 2788sub new {
2438 my $class = shift; 2789 my $class = shift;
2439 2790
… …
2533sub invoke_mouse_wheel { 2884sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_; 2885 my ($self, $ev) = @_;
2535 2886
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2887 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537 2888
2889 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2890
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2891 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2539 2892
2540 ! ! $delta 2893 ! ! $delta
2541} 2894}
2542 2895
2543sub update { 2896sub update {
… …
2594 glDisable GL_TEXTURE_2D; 2947 glDisable GL_TEXTURE_2D;
2595} 2948}
2596 2949
2597############################################################################# 2950#############################################################################
2598 2951
2599package CFClient::UI::ValSlider; 2952package CFPlus::UI::ValSlider;
2600 2953
2601our @ISA = CFClient::UI::HBox::; 2954our @ISA = CFPlus::UI::HBox::;
2602 2955
2603sub new { 2956sub new {
2604 my ($class, %arg) = @_; 2957 my ($class, %arg) = @_;
2605 2958
2606 my $range = delete $arg{range}; 2959 my $range = delete $arg{range};
2607 2960
2608 my $self = $class->SUPER::new ( 2961 my $self = $class->SUPER::new (
2609 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2962 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2610 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2963 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2611 to_value => sub { shift }, 2964 to_value => sub { shift },
2612 from_value => sub { shift }, 2965 from_value => sub { shift },
2613 %arg, 2966 %arg,
2614 ); 2967 );
2615 2968
… …
2635sub set_range { shift->{slider}->set_range (@_) } 2988sub set_range { shift->{slider}->set_range (@_) }
2636sub set_value { shift->{slider}->set_value (@_) } 2989sub set_value { shift->{slider}->set_value (@_) }
2637 2990
2638############################################################################# 2991#############################################################################
2639 2992
2640package CFClient::UI::TextScroller; 2993package CFPlus::UI::TextScroller;
2641 2994
2642our @ISA = CFClient::UI::HBox::; 2995our @ISA = CFPlus::UI::HBox::;
2643 2996
2644use CFClient::OpenGL; 2997use CFPlus::OpenGL;
2645 2998
2646sub new { 2999sub new {
2647 my $class = shift; 3000 my $class = shift;
2648 3001
2649 my $self = $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
… …
2651 can_events => 1, 3004 can_events => 1,
2652 indent => 0, 3005 indent => 0,
2653 #font => default_font 3006 #font => default_font
2654 @_, 3007 @_,
2655 3008
2656 layout => (new CFClient::Layout), 3009 layout => (new CFPlus::Layout),
2657 par => [], 3010 par => [],
3011 max_par => 0,
2658 height => 0, 3012 height => 0,
2659 children => [ 3013 children => [
2660 (new CFClient::UI::Empty expand => 1), 3014 (new CFPlus::UI::Empty expand => 1),
2661 (new CFClient::UI::Slider vertical => 1), 3015 (new CFPlus::UI::Slider vertical => 1),
2662 ], 3016 ],
2663 ); 3017 );
2664 3018
2665 $self->{children}[1]->connect (changed => sub { $self->update }); 3019 $self->{children}[1]->connect (changed => sub { $self->update });
2666 3020
… …
2743 3097
2744 # todo: base offset on lines or so, not on pixels 3098 # todo: base offset on lines or so, not on pixels
2745 $self->{children}[1]->set_value ($offset); 3099 $self->{children}[1]->set_value ($offset);
2746} 3100}
2747 3101
3102sub current_paragraph {
3103 my ($self) = @_;
3104
3105 $self->{top_paragraph} - 1
3106}
3107
3108sub scroll_to {
3109 my ($self, $para) = @_;
3110
3111 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3112
3113 $self->{scroll_to} = $para;
3114 $self->update;
3115}
3116
2748sub clear { 3117sub clear {
2749 my ($self) = @_; 3118 my ($self) = @_;
2750 3119
2751 my (undef, undef, @other) = @{ $self->{children} }; 3120 my (undef, undef, @other) = @{ $self->{children} };
2752 $self->remove ($_) for @other; 3121 $self->remove ($_) for @other;
… …
2755 $self->{height} = 0; 3124 $self->{height} = 0;
2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3125 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2757} 3126}
2758 3127
2759sub add_paragraph { 3128sub add_paragraph {
2760 my ($self, $color, $para, $indent) = @_; 3129 my $self = shift;
2761 3130
2762 my ($text, @w) = ref $para ? @$para : $para; 3131 for my $para (@_) {
2763
2764 $para = { 3132 $para = {
3133 fg => [1, 1, 1, 1],
3134 indent => 0,
3135 markup => "",
3136 widget => [],
3137 ref $para ? %$para : (markup => $para),
2765 w => 1e10, 3138 w => 1e10,
2766 wrapped => 1, 3139 wrapped => 1,
2767 fg => $color,
2768 indent => $indent,
2769 markup => $text,
2770 widget => \@w,
2771 }; 3140 };
2772 3141
2773 $self->add (@w) if @w; 3142 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774 push @{$self->{par}}, $para; 3143 push @{$self->{par}}, $para;
3144 }
3145
3146 if (my $max = $self->{max_par}) {
3147 shift @{$self->{par}} while @{$self->{par}} > $max;
3148 }
2775 3149
2776 $self->{need_reflow}++; 3150 $self->{need_reflow}++;
2777 $self->update; 3151 $self->update;
2778} 3152}
2779 3153
2780sub scroll_to_bottom { 3154sub scroll_to_bottom {
2781 my ($self) = @_; 3155 my ($self) = @_;
2782 3156
2783 $self->{scroll_to_bottom} = 1; 3157 $self->{scroll_to} = $#{$self->{par}};
2784 $self->update; 3158 $self->update;
2785} 3159}
2786 3160
3161sub force_uptodate {
3162 my ($self) = @_;
3163
3164 if (delete $self->{need_reflow}) {
3165 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3166
3167 my $height = 0;
3168
3169 for my $para (@{$self->{par}}) {
3170 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3171 my $layout = $self->get_layout ($para);
3172 my ($w, $h) = $layout->size;
3173
3174 $para->{w} = $w + $para->{indent};
3175 $para->{h} = $h;
3176 $para->{wrapped} = $layout->has_wrapped;
3177 }
3178
3179 $para->{y} = $height;
3180 $height += $para->{h};
3181 }
3182
3183 $self->{height} = $height;
3184 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3185
3186 delete $self->{texture};
3187 }
3188
3189 if (my $paridx = delete $self->{scroll_to}) {
3190 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3191 }
3192}
3193
2787sub update { 3194sub update {
2788 my ($self) = @_; 3195 my ($self) = @_;
2789 3196
2790 $self->SUPER::update; 3197 $self->SUPER::update;
2791 3198
2792 return unless $self->{h} > 0; 3199 return unless $self->{h} > 0;
2793 3200
2794 delete $self->{texture}; 3201 delete $self->{texture};
2795 3202
2796 $ROOT->on_post_alloc ($self => sub { 3203 $ROOT->on_post_alloc ($self => sub {
3204 $self->force_uptodate;
3205
2797 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3206 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2798 3207
2799 if (delete $self->{need_reflow}) {
2800 my $height = 0;
2801
2802 for my $para (@{$self->{par}}) {
2803 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2804 my $layout = $self->get_layout ($para);
2805 my ($w, $h) = $layout->size;
2806
2807 $para->{w} = $w + $para->{indent};
2808 $para->{h} = $h;
2809 $para->{wrapped} = $layout->has_wrapped;
2810 }
2811
2812 $height += $para->{h};
2813 }
2814
2815 $self->{height} = $height;
2816
2817 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2818
2819 delete $self->{texture};
2820 }
2821
2822 if (delete $self->{scroll_to_bottom}) {
2823 $self->{children}[1]->set_value (1e10);
2824 }
2825
2826 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3208 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2827 glClearColor 0, 0, 0, 0; 3209 glClearColor 0, 0, 0, 0;
2828 glClear GL_COLOR_BUFFER_BIT; 3210 glClear GL_COLOR_BUFFER_BIT;
2829 3211
3212 package CFPlus::UI::Base;
3213 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3214 (0, 0, $self->{w}, $self->{h});
3215
3216 my $top = int $self->{children}[1]{range}[0];
3217
3218 my $paridx = 0;
3219 my $top_paragraph;
2830 my $top = int $self->{children}[1]{range}[0]; 3220 my $top = int $self->{children}[1]{range}[0];
2831 3221
2832 my $y0 = $top; 3222 my $y0 = $top;
2833 my $y1 = $top + $H; 3223 my $y1 = $top + $H;
2834 3224
2835 my $y = 0;
2836
2837 for my $para (@{$self->{par}}) { 3225 for my $para (@{$self->{par}}) {
2838 my $h = $para->{h}; 3226 my $h = $para->{h};
3227 my $y = $para->{y};
2839 3228
2840 if ($y0 < $y + $h && $y < $y1) { 3229 if ($y0 < $y + $h && $y < $y1) {
2841
2842 my $layout = $self->get_layout ($para); 3230 my $layout = $self->get_layout ($para);
2843 3231
2844 $layout->render ($para->{indent}, $y - $y0); 3232 $layout->render ($para->{indent}, $y - $y0);
2845 3233
2846 if (my @w = @{ $para->{widget} }) { 3234 if (my @w = @{ $para->{widget} }) {
… …
2855 $_->draw; 3243 $_->draw;
2856 } 3244 }
2857 } 3245 }
2858 } 3246 }
2859 3247
2860 $y += $h; 3248 $paridx++;
3249 $top_paragraph ||= $paridx if $y >= $top;
2861 } 3250 }
3251
3252 $self->{top_paragraph} = $top_paragraph;
2862 }; 3253 };
2863 }); 3254 });
2864} 3255}
2865 3256
2866sub reconfigure { 3257sub reconfigure {
… …
2884 $self->{children}[1]->draw; 3275 $self->{children}[1]->draw;
2885} 3276}
2886 3277
2887############################################################################# 3278#############################################################################
2888 3279
2889package CFClient::UI::Animator; 3280package CFPlus::UI::Animator;
2890 3281
2891use CFClient::OpenGL; 3282use CFPlus::OpenGL;
2892 3283
2893our @ISA = CFClient::UI::Bin::; 3284our @ISA = CFPlus::UI::Bin::;
2894 3285
2895sub moveto { 3286sub moveto {
2896 my ($self, $x, $y) = @_; 3287 my ($self, $x, $y) = @_;
2897 3288
2898 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3289 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2926 glPopMatrix; 3317 glPopMatrix;
2927} 3318}
2928 3319
2929############################################################################# 3320#############################################################################
2930 3321
2931package CFClient::UI::Flopper; 3322package CFPlus::UI::Flopper;
2932 3323
2933our @ISA = CFClient::UI::Button::; 3324our @ISA = CFPlus::UI::Button::;
2934 3325
2935sub new { 3326sub new {
2936 my $class = shift; 3327 my $class = shift;
2937 3328
2938 my $self = $class->SUPER::new ( 3329 my $self = $class->SUPER::new (
… …
2950 $self->{other}->toggle_visibility; 3341 $self->{other}->toggle_visibility;
2951} 3342}
2952 3343
2953############################################################################# 3344#############################################################################
2954 3345
2955package CFClient::UI::Tooltip; 3346package CFPlus::UI::Tooltip;
2956 3347
2957our @ISA = CFClient::UI::Bin::; 3348our @ISA = CFPlus::UI::Bin::;
2958 3349
2959use CFClient::OpenGL; 3350use CFPlus::OpenGL;
2960 3351
2961sub new { 3352sub new {
2962 my $class = shift; 3353 my $class = shift;
2963 3354
2964 $class->SUPER::new ( 3355 $class->SUPER::new (
… …
2967 ) 3358 )
2968} 3359}
2969 3360
2970sub set_tooltip_from { 3361sub set_tooltip_from {
2971 my ($self, $widget) = @_; 3362 my ($self, $widget) = @_;
3363
3364 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3365 if $widget->{tooltip} =~ /^#(.*)$/;
2972 3366
2973 my $tooltip = $widget->{tooltip}; 3367 my $tooltip = $widget->{tooltip};
2974 3368
2975 if ($ENV{CFPLUS_DEBUG} & 2) { 3369 if ($ENV{CFPLUS_DEBUG} & 2) {
2976 $tooltip .= "\n\n" . (ref $widget) . "\n" 3370 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2980 } 3374 }
2981 3375
2982 $tooltip =~ s/^\n+//; 3376 $tooltip =~ s/^\n+//;
2983 $tooltip =~ s/\n+$//; 3377 $tooltip =~ s/\n+$//;
2984 3378
2985 $self->add (new CFClient::UI::Label 3379 $self->add (new CFPlus::UI::Label
2986 markup => $tooltip, 3380 markup => $tooltip,
2987 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3381 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2988 fontsize => 0.8, 3382 fontsize => 0.8,
2989 fg => [0, 0, 0, 1], 3383 style => 1, # FLAG_INVERSE
2990 ellipsise => 0, 3384 ellipsise => 0,
2991 font => ($widget->{tooltip_font} || $::FONT_PROP), 3385 font => ($widget->{tooltip_font} || $::FONT_PROP),
2992 ); 3386 );
2993} 3387}
2994 3388
… …
3056 $self->SUPER::_draw; 3450 $self->SUPER::_draw;
3057} 3451}
3058 3452
3059############################################################################# 3453#############################################################################
3060 3454
3061package CFClient::UI::Face; 3455package CFPlus::UI::Face;
3062 3456
3063our @ISA = CFClient::UI::DrawBG::; 3457our @ISA = CFPlus::UI::DrawBG::;
3064 3458
3065use CFClient::OpenGL; 3459use CFPlus::OpenGL;
3066 3460
3067sub new { 3461sub new {
3068 my $class = shift; 3462 my $class = shift;
3069 3463
3070 my $self = $class->SUPER::new ( 3464 my $self = $class->SUPER::new (
3465 size_w => 32,
3466 size_h => 8,
3071 aspect => 1, 3467 aspect => 1,
3072 can_events => 0, 3468 can_events => 0,
3073 @_, 3469 @_,
3074 ); 3470 );
3075 3471
3076 if ($self->{anim} && $self->{animspeed}) { 3472 if ($self->{anim} && $self->{animspeed}) {
3077 Scalar::Util::weaken (my $widget = $self); 3473 CFPlus::weaken (my $widget = $self);
3078 3474
3475 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3476 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3079 $self->{timer} = Event->timer ( 3477 $self->{timer} = Event->timer (
3080 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3081 hard => 1, 3478 parked => 1,
3082 interval => $self->{animspeed},
3083 cb => sub { 3479 cb => sub {
3480 return unless $::CONN && $widget;
3481
3084 ++$widget->{frame}; 3482 ++$widget->{frame};
3483 $widget->update_face;
3085 $widget->update; 3484 $widget->update;
3485
3486 $widget->update_timer;
3086 }, 3487 },
3087 ); 3488 );
3489
3490 $self->update_face;
3491 $self->update_timer;
3088 } 3492 }
3089 3493
3090 $self 3494 $self
3091} 3495}
3092 3496
3497sub update_timer {
3498 my ($self) = @_;
3499
3500 return unless $self->{timer};
3501
3502 if ($self->{visible}) {
3503 $self->{timer}->at (
3504 $self->{anim_start}
3505 + $self->{animspeed}
3506 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3507 );
3508 $self->{timer}->start;
3509 } else {
3510 $self->{timer}->stop;
3511 }
3512}
3513
3514sub update_face {
3515 my ($self) = @_;
3516
3517 return unless $::CONN;
3518
3519 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3520 if ($anim && @$anim) {
3521 delete $self->{wait_face};
3522 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3523 }
3524 }
3525}
3526
3093sub size_request { 3527sub size_request {
3094 (32, 8) 3528 my ($self) = @_;
3529
3530 if ($::CONN) {
3531 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3532 if (my $tex = $::CONN->{texture}[$faceid]) {
3533 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3534 } else {
3535 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3536 $self->realloc;
3537 });
3538 }
3539 }
3540 }
3541
3542 ($self->{size_w} || 8, $self->{size_h} || 8)
3095} 3543}
3096 3544
3097sub update { 3545sub update {
3098 my ($self) = @_; 3546 my ($self) = @_;
3099 3547
3100 return unless $self->{visible}; 3548 return unless $self->{visible};
3101 3549
3102 $self->SUPER::update; 3550 $self->SUPER::update;
3103} 3551}
3104 3552
3553sub invoke_visibility_change {
3554 my ($self) = @_;
3555
3556 $self->update_timer;
3557
3558 0
3559}
3560
3105sub _draw { 3561sub _draw {
3106 my ($self) = @_; 3562 my ($self) = @_;
3107 3563
3108 return unless $::CONN; 3564 return unless $::CONN;
3109 3565
3110 $self->SUPER::_draw; 3566 $self->SUPER::_draw;
3111 3567
3112 my $face;
3113
3114 if ($self->{frame}) {
3115 my $anim = $::CONN->{anim}[$self->{anim}]; 3568 my $faceid = $::CONN->{faceid}[$self->{face}]
3116 3569 or return;
3117 $face = $anim->[ $self->{frame} % @$anim ]
3118 if $anim && @$anim;
3119 }
3120 3570
3121 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3571 my $tex = $::CONN->{texture}[$faceid];
3122 3572
3123 if ($tex) { 3573 if ($tex) {
3124 glEnable GL_TEXTURE_2D; 3574 glEnable GL_TEXTURE_2D;
3125 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3575 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3126 glColor 0, 0, 0, 1; 3576 glColor 0, 0, 0, 1;
… …
3130} 3580}
3131 3581
3132sub destroy { 3582sub destroy {
3133 my ($self) = @_; 3583 my ($self) = @_;
3134 3584
3135 $self->{timer}->cancel 3585 (delete $self->{timer})->cancel
3136 if $self->{timer}; 3586 if $self->{timer};
3137 3587
3138 $self->SUPER::destroy; 3588 $self->SUPER::destroy;
3139} 3589}
3140 3590
3141############################################################################# 3591#############################################################################
3142 3592
3143package CFClient::UI::Buttonbar; 3593package CFPlus::UI::Buttonbar;
3144 3594
3145our @ISA = CFClient::UI::HBox::; 3595our @ISA = CFPlus::UI::HBox::;
3146 3596
3147# TODO: should actualyl wrap buttons and other goodies. 3597# TODO: should actually wrap buttons and other goodies.
3148 3598
3149############################################################################# 3599#############################################################################
3150 3600
3151package CFClient::UI::Menu; 3601package CFPlus::UI::Menu;
3152 3602
3153our @ISA = CFClient::UI::FancyFrame::; 3603our @ISA = CFPlus::UI::Toplevel::;
3154 3604
3155use CFClient::OpenGL; 3605use CFPlus::OpenGL;
3156 3606
3157sub new { 3607sub new {
3158 my $class = shift; 3608 my $class = shift;
3159 3609
3160 my $self = $class->SUPER::new ( 3610 my $self = $class->SUPER::new (
3161 items => [], 3611 items => [],
3162 z => 100, 3612 z => 100,
3163 @_, 3613 @_,
3164 ); 3614 );
3165 3615
3166 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3616 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3167 3617
3168 for my $item (@{ $self->{items} }) { 3618 for my $item (@{ $self->{items} }) {
3169 my ($widget, $cb, $tooltip) = @$item; 3619 my ($widget, $cb, $tooltip) = @$item;
3170 3620
3171 # handle various types of items, only text for now 3621 # handle various types of items, only text for now
3172 if (!ref $widget) { 3622 if (!ref $widget) {
3173 if ($widget =~ /\t/) { 3623 if ($widget =~ /\t/) {
3174 my ($left, $right) = split /\t/, $widget, 2; 3624 my ($left, $right) = split /\t/, $widget, 2;
3175 3625
3176 $widget = new CFClient::UI::HBox 3626 $widget = new CFPlus::UI::HBox
3177 can_hover => 1, 3627 can_hover => 1,
3178 can_events => 1, 3628 can_events => 1,
3179 tooltip => $tooltip, 3629 tooltip => $tooltip,
3180 children => [ 3630 children => [
3181 (new CFClient::UI::Label markup => $left, expand => 1), 3631 (new CFPlus::UI::Label markup => $left, expand => 1),
3182 (new CFClient::UI::Label markup => $right, align => +1), 3632 (new CFPlus::UI::Label markup => $right, align => +1),
3183 ], 3633 ],
3184 ; 3634 ;
3185 3635
3186 } else { 3636 } else {
3187 $widget = new CFClient::UI::Label 3637 $widget = new CFPlus::UI::Label
3188 can_hover => 1, 3638 can_hover => 1,
3189 can_events => 1, 3639 can_events => 1,
3190 markup => $widget, 3640 markup => $widget,
3191 tooltip => $tooltip; 3641 tooltip => $tooltip;
3192 } 3642 }
… …
3240 1 3690 1
3241} 3691}
3242 3692
3243############################################################################# 3693#############################################################################
3244 3694
3245package CFClient::UI::Multiplexer; 3695package CFPlus::UI::Multiplexer;
3246 3696
3247our @ISA = CFClient::UI::Container::; 3697our @ISA = CFPlus::UI::Container::;
3248 3698
3249sub new { 3699sub new {
3250 my $class = shift; 3700 my $class = shift;
3251 3701
3252 my $self = $class->SUPER::new ( 3702 my $self = $class->SUPER::new (
… …
3313 $self->{current}->draw; 3763 $self->{current}->draw;
3314} 3764}
3315 3765
3316############################################################################# 3766#############################################################################
3317 3767
3318package CFClient::UI::Notebook; 3768package CFPlus::UI::Notebook;
3319 3769
3320our @ISA = CFClient::UI::VBox::; 3770our @ISA = CFPlus::UI::VBox::;
3321 3771
3322sub new { 3772sub new {
3323 my $class = shift; 3773 my $class = shift;
3324 3774
3325 my $self = $class->SUPER::new ( 3775 my $self = $class->SUPER::new (
3326 buttonbar => (new CFClient::UI::Buttonbar), 3776 buttonbar => (new CFPlus::UI::Buttonbar),
3327 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3777 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3328 # filter => # will be put between multiplexer and $self 3778 # filter => # will be put between multiplexer and $self
3329 @_, 3779 @_,
3330 ); 3780 );
3331 3781
3332 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3782 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3336} 3786}
3337 3787
3338sub add { 3788sub add {
3339 my ($self, $title, $widget, $tooltip) = @_; 3789 my ($self, $title, $widget, $tooltip) = @_;
3340 3790
3341 Scalar::Util::weaken $self; 3791 CFPlus::weaken $self;
3342 3792
3343 $self->{buttonbar}->add (new CFClient::UI::Button 3793 $self->{buttonbar}->add (new CFPlus::UI::Button
3344 markup => $title, 3794 markup => $title,
3345 tooltip => $tooltip, 3795 tooltip => $tooltip,
3346 on_activate => sub { $self->set_current_page ($widget) }, 3796 on_activate => sub { $self->set_current_page ($widget) },
3347 ); 3797 );
3348 3798
… …
3362 $self->emit (page_changed => $self->{multiplexer}{current}); 3812 $self->emit (page_changed => $self->{multiplexer}{current});
3363} 3813}
3364 3814
3365############################################################################# 3815#############################################################################
3366 3816
3367package CFClient::UI::Selector; 3817package CFPlus::UI::Selector;
3368 3818
3369use utf8; 3819use utf8;
3370 3820
3371our @ISA = CFClient::UI::Button::; 3821our @ISA = CFPlus::UI::Button::;
3372 3822
3373sub new { 3823sub new {
3374 my $class = shift; 3824 my $class = shift;
3375 3825
3376 my $self = $class->SUPER::new ( 3826 my $self = $class->SUPER::new (
… …
3393 my ($value, $title, $tooltip) = @$_; 3843 my ($value, $title, $tooltip) = @$_;
3394 3844
3395 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3845 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3396 } 3846 }
3397 3847
3398 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3848 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3399} 3849}
3400 3850
3401sub _set_value { 3851sub _set_value {
3402 my ($self, $value) = @_; 3852 my ($self, $value) = @_;
3403 3853
… …
3418 $self->emit (changed => $value); 3868 $self->emit (changed => $value);
3419} 3869}
3420 3870
3421############################################################################# 3871#############################################################################
3422 3872
3423package CFClient::UI::Statusbox; 3873package CFPlus::UI::Statusbox;
3424 3874
3425our @ISA = CFClient::UI::VBox::; 3875our @ISA = CFPlus::UI::VBox::;
3426 3876
3427sub new { 3877sub new {
3428 my $class = shift; 3878 my $class = shift;
3429 3879
3430 my $self = $class->SUPER::new ( 3880 my $self = $class->SUPER::new (
3431 fontsize => 0.8, 3881 fontsize => 0.8,
3432 @_, 3882 @_,
3433 ); 3883 );
3434 3884
3435 Scalar::Util::weaken (my $this = $self); 3885 CFPlus::weaken (my $this = $self);
3436 3886
3437 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3887 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3438 3888
3439 $self 3889 $self
3440} 3890}
… …
3442sub reorder { 3892sub reorder {
3443 my ($self) = @_; 3893 my ($self) = @_;
3444 my $NOW = Time::HiRes::time; 3894 my $NOW = Time::HiRes::time;
3445 3895
3446 # freeze display when hovering over any label 3896 # freeze display when hovering over any label
3447 return if $CFClient::UI::TOOLTIP->{owner} 3897 return if $CFPlus::UI::TOOLTIP->{owner}
3448 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3898 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3449 values %{ $self->{item} }; 3899 values %{ $self->{item} };
3450 3900
3451 while (my ($k, $v) = each %{ $self->{item} }) { 3901 while (my ($k, $v) = each %{ $self->{item} }) {
3452 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3902 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3453 } 3903 }
… …
3474 for ($short) { 3924 for ($short) {
3475 s/^\s+//; 3925 s/^\s+//;
3476 s/\s+/ /g; 3926 s/\s+/ /g;
3477 } 3927 }
3478 3928
3479 new CFClient::UI::Label 3929 new CFPlus::UI::Label
3480 markup => $short, 3930 markup => $short,
3481 tooltip => $item->{tooltip}, 3931 tooltip => $item->{tooltip},
3482 tooltip_font => $::FONT_PROP, 3932 tooltip_font => $::FONT_PROP,
3483 tooltip_width => 0.67, 3933 tooltip_width => 0.67,
3484 fontsize => $item->{fontsize} || $self->{fontsize}, 3934 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3563 $self->SUPER::destroy; 4013 $self->SUPER::destroy;
3564} 4014}
3565 4015
3566############################################################################# 4016#############################################################################
3567 4017
3568package CFClient::UI::Inventory;
3569
3570our @ISA = CFClient::UI::Table::;
3571
3572sub new {
3573 my $class = shift;
3574
3575 my $self = $class->SUPER::new (
3576 col_expand => [0, 1, 0],
3577 items => [],
3578 @_,
3579 );
3580
3581 $self->set_sort_order (undef);
3582
3583 $self
3584}
3585
3586sub update_items {
3587 my ($self) = @_;
3588
3589 $self->clear;
3590
3591 my @item = $self->{sort}->(@{ $self->{items} });
3592
3593 my @adds;
3594 my $row = 0;
3595 for my $item ($self->{sort}->(@{ $self->{items} })) {
3596 CFClient::Item::update_widgets $item;
3597
3598 push @adds, 0, $row, $item->{face_widget};
3599 push @adds, 1, $row, $item->{desc_widget};
3600 push @adds, 2, $row, $item->{weight_widget};
3601
3602 $row++;
3603 }
3604
3605 $self->add (@adds);
3606}
3607
3608sub set_sort_order {
3609 my ($self, $order) = @_;
3610
3611 $self->{sort} = $order ||= sub {
3612 sort {
3613 $a->{type} <=> $b->{type}
3614 or $a->{name} cmp $b->{name}
3615 } @_
3616 };
3617
3618 $self->update_items;
3619}
3620
3621sub set_items {
3622 my ($self, $items) = @_;
3623
3624 $self->{items} = [$items ? values %$items : ()];
3625 $self->update_items;
3626}
3627
3628#############################################################################
3629
3630package CFClient::UI::SpellList;
3631
3632our @ISA = CFClient::UI::Table::;
3633
3634sub new {
3635 my $class = shift;
3636
3637 my $self = $class->SUPER::new (
3638 binding => [],
3639 commands => [],
3640 @_,
3641 )
3642}
3643
3644my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3645
3646my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3648my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3649 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3650my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3652my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3654my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3655 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3656
3657sub rebuild_spell_list {
3658 my ($self) = @_;
3659
3660 $CFClient::UI::ROOT->on_refresh ($self => sub {
3661 $self->clear;
3662
3663 return unless $::CONN;
3664
3665 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3666 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3667 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3668 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3669 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3670
3671 my $row = 0;
3672
3673 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3674 my $spell = $self->{spell}{$_};
3675
3676 $row++;
3677
3678 my $spell_cb = sub {
3679 my ($widget, $ev) = @_;
3680
3681 if ($ev->{button} == 1) {
3682 $::CONN->user_send ("cast $spell->{name}");
3683 } elsif ($ev->{button} == 2) {
3684 $::CONN->user_send ("invoke $spell->{name}");
3685 } elsif ($ev->{button} == 3) {
3686 (new CFClient::UI::Menu
3687 items => [
3688 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3689 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3690 ],
3691 )->popup ($ev);
3692 } else {
3693 return 0;
3694 }
3695
3696 1
3697 };
3698
3699 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3700
3701 #TODO: add path info to tooltip
3702 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3703
3704 $self->add (0, $row, new CFClient::UI::Face
3705 face => $spell->{face},
3706 can_hover => 1,
3707 can_events => 1,
3708 tooltip => $tooltip,
3709 on_button_down => $spell_cb,
3710 );
3711
3712 $self->add (1, $row, new CFClient::UI::Label
3713 expand => 1,
3714 text => $spell->{name},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3722 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3723 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3724 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3725 }
3726 });
3727}
3728
3729sub add_spell {
3730 my ($self, $spell) = @_;
3731
3732 $self->{spell}->{$spell->{name}} = $spell;
3733 $self->rebuild_spell_list;
3734}
3735
3736sub remove_spell {
3737 my ($self, $spell) = @_;
3738
3739 delete $self->{spell}->{$spell->{name}};
3740 $self->rebuild_spell_list;
3741}
3742
3743sub clear_spells {
3744 my ($self) = @_;
3745
3746 $self->{spell} = {};
3747 $self->rebuild_spell_list;
3748}
3749
3750#############################################################################
3751
3752package CFClient::UI::Root; 4018package CFPlus::UI::Root;
3753 4019
3754our @ISA = CFClient::UI::Container::; 4020our @ISA = CFPlus::UI::Container::;
3755 4021
3756use List::Util qw(min max); 4022use List::Util qw(min max);
3757 4023
3758use CFClient::OpenGL; 4024use CFPlus::OpenGL;
3759 4025
3760sub new { 4026sub new {
3761 my $class = shift; 4027 my $class = shift;
3762 4028
3763 my $self = $class->SUPER::new ( 4029 my $self = $class->SUPER::new (
3764 visible => 1, 4030 visible => 1,
3765 @_, 4031 @_,
3766 ); 4032 );
3767 4033
3768 Scalar::Util::weaken ($self->{root} = $self); 4034 CFPlus::weaken ($self->{root} = $self);
3769 4035
3770 $self 4036 $self
3771} 4037}
3772 4038
3773sub size_request { 4039sub size_request {
… …
3968 while ($self->{post_alloc_hook}) { 4234 while ($self->{post_alloc_hook}) {
3969 $_->() 4235 $_->()
3970 for values %{delete $self->{post_alloc_hook}}; 4236 for values %{delete $self->{post_alloc_hook}};
3971 } 4237 }
3972 4238
3973
3974 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4239 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3975 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4240 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3976 glClear GL_COLOR_BUFFER_BIT; 4241 glClear GL_COLOR_BUFFER_BIT;
3977 4242
3978 glMatrixMode GL_PROJECTION; 4243 glMatrixMode GL_PROJECTION;
… …
3980 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4245 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3981 glMatrixMode GL_MODELVIEW; 4246 glMatrixMode GL_MODELVIEW;
3982 glLoadIdentity; 4247 glLoadIdentity;
3983 4248
3984 { 4249 {
3985 package CFClient::UI::Base; 4250 package CFPlus::UI::Base;
3986 4251
3987 ($draw_x, $draw_y, $draw_w, $draw_h) = 4252 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3988 (0, 0, $self->{w}, $self->{h}); 4253 (0, 0, $self->{w}, $self->{h});
3989 }
3990 4254
3991 $self->_draw; 4255 $self->_draw;
4256 }
3992} 4257}
3993 4258
3994############################################################################# 4259#############################################################################
3995 4260
3996package CFClient::UI; 4261package CFPlus::UI;
3997 4262
3998$ROOT = new CFClient::UI::Root; 4263$ROOT = new CFPlus::UI::Root;
3999$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4264$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4000 4265
40011 42661
4002 4267

Diff Legend

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