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

Diff Legend

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