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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.339 by root, Sun Jul 30 12:15:19 2006 UTC vs.
Revision 1.418 by elmex, Tue Jul 24 18:39:39 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
110 } 113 }
111 114
112 if ($GRAB) { 115 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 117 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
117 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
118 } else { 125 } else {
119 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
120 } 127 }
121 } 128 }
… …
207 reconfigure_widgets; 214 reconfigure_widgets;
208} 215}
209 216
210############################################################################# 217#############################################################################
211 218
212package CFClient::UI::Event; 219package CFPlus::UI::Event;
213 220
214sub xy { 221sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216} 223}
217 224
218############################################################################# 225#############################################################################
219 226
220package CFClient::UI::Base; 227package CFPlus::UI::Base;
221 228
222use strict; 229use strict;
223 230
224use CFClient::OpenGL; 231use CFPlus::OpenGL;
225 232
226sub new { 233sub new {
227 my $class = shift; 234 my $class = shift;
228 235
229 my $self = bless { 236 my $self = bless {
… …
234 h => undef, 241 h => undef,
235 can_events => 1, 242 can_events => 1,
236 @_ 243 @_
237 }, $class; 244 }, $class;
238 245
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240 247
241 for (keys %$self) { 248 for (keys %$self) {
242 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
244 } 251 }
245 } 252 }
246 253
247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252 259
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255 262
256 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
261 268
262sub destroy { 269sub destroy {
263 my ($self) = @_; 270 my ($self) = @_;
264 271
265 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
266 %$self = (); 274 %$self = ();
267} 275}
268 276
277sub TO_JSON {
278 { __w_ => $_[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) = @_;
… …
579 593
580# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
581# functions seems pointless. 595# functions seems pointless.
582our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
583 597
584sub draw { 598#sub draw {
585 my ($self) = @_; 599#CFPlus.xs
586
587 return unless $self->{h} && $self->{w};
588
589 # update screen rectangle
590 local $draw_x = $draw_x + $self->{x};
591 local $draw_y = $draw_y + $self->{y};
592
593 # skip widgets that are entirely outside the drawing area
594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
596
597 glPushMatrix;
598 glTranslate $self->{x}, $self->{y}, 0;
599
600 if ($self == $HOVER && $self->{can_hover}) {
601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
602 glEnable GL_BLEND;
603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
604 glBegin GL_QUADS;
605 glVertex 0 , 0;
606 glVertex $self->{w}, 0;
607 glVertex $self->{w}, $self->{h};
608 glVertex 0 , $self->{h};
609 glEnd;
610 glDisable GL_BLEND;
611 }
612
613 if ($ENV{CFPLUS_DEBUG} & 1) {
614 glPushMatrix;
615 glColor 1, 1, 0, 1;
616 glTranslate 0.375, 0.375;
617 glBegin GL_LINE_LOOP;
618 glVertex 0 , 0;
619 glVertex $self->{w} - 1, 0;
620 glVertex $self->{w} - 1, $self->{h} - 1;
621 glVertex 0 , $self->{h} - 1;
622 glEnd;
623 glPopMatrix;
624 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625 }
626
627 $self->_draw;
628 glPopMatrix;
629}
630 600
631sub _draw { 601sub _draw {
632 my ($self) = @_; 602 my ($self) = @_;
633 603
634 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
635} 605}
636 606
637sub DESTROY { 607sub DESTROY {
638 my ($self) = @_; 608 my ($self) = @_;
639 609
640 return if CFClient::in_destruct; 610 return if CFPlus::in_destruct;
641
642 delete $WIDGET{$self+0};
643 611
644 eval { $self->destroy }; 612 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
615 delete $WIDGET{$self+0};
646} 616}
647 617
648############################################################################# 618#############################################################################
649 619
650package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
651 621
652our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
653 623
654use strict; 624use strict;
655use CFClient::OpenGL; 625use CFPlus::OpenGL;
656 626
657sub new { 627sub new {
658 my $class = shift; 628 my $class = shift;
659 629
660 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
691 } 661 }
692} 662}
693 663
694############################################################################# 664#############################################################################
695 665
696package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
697 667
698our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
699 669
700sub new { 670sub new {
701 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
702 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
703} 673}
… …
710 680
711sub draw { } 681sub draw { }
712 682
713############################################################################# 683#############################################################################
714 684
715package CFClient::UI::Container; 685package CFPlus::UI::Container;
716 686
717our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
718 688
719sub new { 689sub new {
720 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
721 691
722 my $children = delete $arg{children}; 692 my $children = delete $arg{children};
… …
726 can_events => 0, 696 can_events => 0,
727 %arg, 697 %arg,
728 ); 698 );
729 699
730 $self->add (@$children) 700 $self->add (@$children)
731 if $children; 701 if $children && @$children;
732 702
733 $self 703 $self
734} 704}
735 705
736sub realloc { 706sub realloc {
… …
745 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
746 716
747 $_->set_parent ($self) 717 $_->set_parent ($self)
748 for @widgets; 718 for @widgets;
749 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
750 use sort 'stable'; 721 use sort 'stable';
751 722
752 $self->{children} = [ 723 $self->{children} = [
753 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
754 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
755 ]; 726 ];
756 727
757 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
758} 733}
759 734
760sub children { 735sub children {
761 @{ $_[0]{children} } 736 @{ $_[0]{children} }
762} 737}
763 738
764sub remove { 739sub remove {
765 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
766 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
767 delete $child->{parent}; 745 delete $child->{parent};
768 $child->hide; 746 $child->hide;
769
770 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
771 749
772 $self->realloc; 750 $self->realloc;
773} 751}
774 752
775sub clear { 753sub clear {
776 my ($self) = @_; 754 my ($self) = @_;
777 755
778 my $children = delete $self->{children}; 756 my $children = $self->{children};
779 $self->{children} = []; 757 $self->{children} = [];
780 758
781 for (@$children) { 759 for (@$children) {
782 delete $_->{parent}; 760 delete $_->{parent};
783 $_->hide; 761 $_->hide;
… …
803} 781}
804 782
805sub _draw { 783sub _draw {
806 my ($self) = @_; 784 my ($self) = @_;
807 785
808 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
809} 787}
810 788
811############################################################################# 789#############################################################################
812 790
813package CFClient::UI::Bin; 791package CFPlus::UI::Bin;
814 792
815our @ISA = CFClient::UI::Container::; 793our @ISA = CFPlus::UI::Container::;
816 794
817sub new { 795sub new {
818 my ($class, %arg) = @_; 796 my ($class, %arg) = @_;
819 797
820 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 798 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821 799
822 $class->SUPER::new (children => [$child], %arg) 800 $class->SUPER::new (children => [$child], %arg)
823} 801}
824 802
825sub add { 803sub add {
826 my ($self, $child) = @_; 804 my ($self, $child) = @_;
827 805
828 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
829 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
830} 808}
831 809
832sub remove { 810sub remove {
833 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
834 812
835 $self->SUPER::remove ($widget); 813 $self->SUPER::remove ($widget);
836 814
837 $self->{children} = [new CFClient::UI::Empty] 815 $self->{children} = [new CFPlus::UI::Empty]
838 unless @{$self->{children}}; 816 unless @{$self->{children}};
839} 817}
840 818
841sub child { $_[0]->{children}[0] } 819sub child { $_[0]->{children}[0] }
842 820
… …
854 832
855############################################################################# 833#############################################################################
856 834
857# back-buffered drawing area 835# back-buffered drawing area
858 836
859package CFClient::UI::Window; 837package CFPlus::UI::Window;
860 838
861our @ISA = CFClient::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
862 840
863use CFClient::OpenGL; 841use CFPlus::OpenGL;
864 842
865sub new { 843sub new {
866 my ($class, %arg) = @_; 844 my ($class, %arg) = @_;
867 845
868 my $self = $class->SUPER::new (%arg); 846 my $self = $class->SUPER::new (%arg);
… …
890} 868}
891 869
892sub render_child { 870sub render_child {
893 my ($self) = @_; 871 my ($self) = @_;
894 872
895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 873 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896 glClearColor 0, 0, 0, 0; 874 glClearColor 0, 0, 0, 0;
897 glClear GL_COLOR_BUFFER_BIT; 875 glClear GL_COLOR_BUFFER_BIT;
898 876
899 { 877 {
900 package CFClient::UI::Base; 878 package CFPlus::UI::Base;
901 879
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 880 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 881 (0, 0, $self->{w}, $self->{h});
882
883 $self->_render;
904 } 884 }
905
906 $self->_render;
907 }; 885 };
908} 886}
909 887
910sub _draw { 888sub _draw {
911 my ($self) = @_; 889 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 890
915 my $tex = $self->{texture} 891 my $tex = $self->{texture}
916 or return; 892 or return;
917 893
918 glEnable GL_TEXTURE_2D; 894 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 896 glColor 0, 0, 0, 1;
921 897
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 898 $tex->draw_quad_alpha_premultiplied (0, 0);
923 899
924 glDisable GL_TEXTURE_2D; 900 glDisable GL_TEXTURE_2D;
925} 901}
926 902
927############################################################################# 903#############################################################################
928 904
929package CFClient::UI::ViewPort; 905package CFPlus::UI::ViewPort;
930 906
907use List::Util qw(min max);
908
931our @ISA = CFClient::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
932 910
933sub new { 911sub new {
934 my $class = shift; 912 my $class = shift;
935 913
936 $class->SUPER::new ( 914 $class->SUPER::new (
… …
943sub size_request { 921sub size_request {
944 my ($self) = @_; 922 my ($self) = @_;
945 923
946 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947 925
948 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
949 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
950 928
951 ($w, $h) 929 ($w, $h)
952} 930}
953 931
954sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
966} 944}
967 945
968sub set_offset { 946sub set_offset {
969 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
970 948
949 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
950 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
951
952 if ($x != $self->{view_x} or $y != $self->{view_y}) {
971 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
972 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
973 955
956 $self->emit (changed => $x, $y);
974 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
976 }
975} 977}
976 978
977# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
978sub coord2local { 980sub coord2local {
979 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
994 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
995 997
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 1000 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1001 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 1002 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
1002 } 1004 }
1003} 1005}
1004 1006
1005sub _render { 1007sub _render {
1006 my ($self) = @_; 1008 my ($self) = @_;
1007 1009
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1010 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}; 1011 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010 1012
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1013 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 1014
1013 $self->SUPER::_render; 1015 $self->SUPER::_render;
1014} 1016}
1015 1017
1016############################################################################# 1018#############################################################################
1017 1019
1018package CFClient::UI::ScrolledWindow; 1020package CFPlus::UI::ScrolledWindow;
1019 1021
1020our @ISA = CFClient::UI::HBox::; 1022our @ISA = CFPlus::UI::Table::;
1021 1023
1022sub new { 1024sub new {
1023 my ($class, %arg) = @_; 1025 my ($class, %arg) = @_;
1024 1026
1025 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1026 1028
1027 my $self; 1029 my $self;
1028 1030
1029 my $slider = new CFClient::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 col => 0,
1033 row => 1,
1034 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub {
1037 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 },
1040 ;
1041
1042 my $vslider = new CFPlus::UI::Slider
1043 col => 1,
1044 row => 0,
1030 vertical => 1, 1045 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1047 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1050 },
1035 ; 1051 ;
1036 1052
1037 $self = $class->SUPER::new ( 1053 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1054 scroll_x => 0,
1055 scroll_y => 1,
1039 can_events => 1, 1056 can_events => 1,
1040 slider => $slider, 1057 hslider => $hslider,
1058 vslider => $vslider,
1059 col_expand => [1, 0],
1060 row_expand => [1, 0],
1041 %arg, 1061 %arg,
1042 ); 1062 );
1043 1063
1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 col => 0,
1066 row => 0,
1067 expand => 1,
1068 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y},
1070 on_changed => sub {
1071 my ($vp, $x, $y) = @_;
1072
1073 $vp->{parent}{hslider}->set_value ($x);
1074 $vp->{parent}{vslider}->set_value ($y);
1075
1076 0
1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1083 ;
1084
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1085 $self->SUPER::add ($self->{vp});
1086
1045 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
1046 1088
1047 $self 1089 $self
1048} 1090}
1049
1050#TODO# update range on size_allocate depending on child
1051 1091
1052sub add { 1092sub add {
1053 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1054 1094
1055 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1056} 1096}
1057 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 if ($self->{scroll_x}) {
1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1110
1111 my $visible = $w1 > $w2;
1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1114 $visible ? $self->SUPER::add ($self->{hslider})
1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1117 }
1118
1119 if ($self->{scroll_y}) {
1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1122
1123 my $visible = $h1 > $h2;
1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1129 }
1130}
1131
1132sub start_dragging {
1133 my ($self, $ev) = @_;
1134
1135 $self->grab_focus;
1136
1137 my $ox = $self->{vp}{view_x};
1138 my $oy = $self->{vp}{view_y};
1139
1140 $self->{motion} = sub {
1141 my ($ev, $x, $y) = @_;
1142
1143 $ox -= $ev->{xrel};
1144 $oy -= $ev->{yrel};
1145
1146 $self->{vp}->set_offset ($ox, $oy);
1147 };
1148}
1149
1058sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1060 1152
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev); 1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064 1155
1065 1 1156 1
1066} 1157}
1067 1158
1068sub update_slider { 1159sub invoke_button_down {
1069 my ($self) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1070 1161
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1162 if ($ev->{button} == 2) {
1072} 1163 $self->start_dragging ($ev);
1164 return 1;
1165 }
1073 1166
1074sub update { 1167 0
1075 my ($self) = @_; 1168}
1076 1169
1077 $self->SUPER::update; 1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1078 1172
1079 $self->update_slider; 1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1080} 1189}
1081 1190
1082sub invoke_size_allocate { 1191sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1084 1193
1085 $self->update_slider; 1194 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1196}
1089 1197
1090############################################################################# 1198#############################################################################
1091 1199
1092package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
1093 1201
1094our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
1095 1203
1096use CFClient::OpenGL; 1204use CFPlus::OpenGL;
1097 1205
1098sub new { 1206sub new {
1099 my $class = shift; 1207 my $class = shift;
1100 1208
1101 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
1127 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
1128} 1236}
1129 1237
1130############################################################################# 1238#############################################################################
1131 1239
1132package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
1133 1241
1134our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1135 1243
1136use CFClient::OpenGL; 1244use CFPlus::OpenGL;
1245
1246sub new {
1247 my ($class, %arg) = @_;
1248
1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
1256
1257 my $self = $class->SUPER::new (
1258 # label => "",
1259 fg => [0.6, 0.3, 0.1],
1260 border => 0.8,
1261 style => 'single',
1262 %arg,
1263 );
1264
1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1273}
1274
1275sub border {
1276 int $_[0]{border} * $::FONTSIZE
1277}
1278
1279sub size_request {
1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
1284
1285 my ($w, $h) = $self->SUPER::size_request;
1286
1287 (
1288 $w + $self->border * 2,
1289 $h + $self->border * 2,
1290 )
1291}
1292
1293sub invoke_size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 my $border = $self->border;
1297
1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
1300
1301 if (my $label = $self->{label}) {
1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
1306
1307 $self->child->configure ($border, $border, $w, $h);
1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1137 1345
1138my $bg = 1346my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1348 mipmap => 1, wrap => 1;
1141 1349
1142my @border = 1350my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1351 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); 1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353
1354my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png);
1145 1357
1146sub new { 1358sub new {
1147 my ($class, %arg) = @_; 1359 my ($class, %arg) = @_;
1148 1360
1149 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
… …
1154 min_w => 64, 1366 min_w => 64,
1155 min_h => 32, 1367 min_h => 32,
1156 %arg, 1368 %arg,
1157 ); 1369 );
1158 1370
1159 $self->{title_widget} = new CFClient::UI::Label 1371 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1372 align => 0,
1161 valign => 1, 1373 valign => 1,
1162 text => $self->{title}, 1374 text => $self->{title},
1163 fontsize => $self->{border}, 1375 fontsize => $self->{border},
1164 if exists $self->{title}; 1376 if exists $self->{title};
1165 1377
1166 if ($self->{has_close_button}) { 1378 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1379 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1380 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1381 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1382 on_activate => sub { $self->emit ("delete") };
1171 1383
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1384 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1385 }
1174 1386
1175 $self 1387 $self
1176} 1388}
1177 1389
1178sub add { 1390sub add {
1179 my ($self, @widgets) = @_; 1391 my ($self, @widgets) = @_;
1180 1392
1181 $self->SUPER::add (@widgets); 1393 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1394 $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}; 1395 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1396}
1185 1397
1186sub border { 1398sub border {
1187 int $_[0]{border} * $::FONTSIZE 1399 int $_[0]{border} * $::FONTSIZE
1188} 1400}
… …
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1319 1531
1320 my $border = $self->border; 1532 my $border = $self->border;
1321 1533
1322 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1323 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1324 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1325 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1326 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539
1540 # move
1541 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546
1547 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1327 1553
1328 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1329 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1330 1556
1331 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1350 if $self->{close_button}; 1576 if $self->{close_button};
1351} 1577}
1352 1578
1353############################################################################# 1579#############################################################################
1354 1580
1355package CFClient::UI::Table; 1581package CFPlus::UI::Table;
1356 1582
1357our @ISA = CFClient::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1358 1584
1359use List::Util qw(max sum); 1585use List::Util qw(max sum);
1360 1586
1361use CFClient::OpenGL; 1587use CFPlus::OpenGL;
1362 1588
1363sub new { 1589sub new {
1364 my $class = shift; 1590 my $class = shift;
1365 1591
1366 $class->SUPER::new ( 1592 $class->SUPER::new (
1367 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1368 @_, 1595 @_,
1369 ) 1596 )
1370} 1597}
1371 1598
1372sub children {
1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1374}
1375
1376sub add { 1599sub add {
1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{rowspan} ||= 1;
1604 $child->{colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1608}
1609
1610sub add_at {
1377 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1378 1614
1379 while (@_) { 1615 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1381 $child->set_parent ($self);
1382 $self->{children}[$y][$x] = $child;
1383 }
1384 1617
1385 $self->{force_realloc} = 1; 1618 $child->{row} = $row;
1386 $self->{force_size_alloc} = 1; 1619 $child->{col} = $col;
1387 $self->realloc;
1388}
1389 1620
1390sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1391 my ($self, $child) = @_; 1628 my ($self) = @_;
1392 1629
1393 # TODO: not yet implemented 1630 my (@w, @h);
1394}
1395
1396# TODO: move to container class maybe? send children a signal on removal?
1397sub clear {
1398 my ($self) = @_;
1399 1631
1400 my @children = $self->children; 1632 my @children = $self->children;
1401 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
1402 1643 }
1403 for (@children) {
1404 delete $_->{parent};
1405 $_->hide;
1406 }
1407 1644
1408 $self->realloc; 1645 # second pass, rows
1409} 1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1410
1411sub get_wh {
1412 my ($self) = @_;
1413
1414 my (@w, @h);
1415
1416 for my $y (0 .. $#{$self->{children}}) {
1417 my $row = $self->{children}[$y]
1418 or next;
1419
1420 for my $x (0 .. $#$row) {
1421 my $widget = $row->[$x]
1422 or next;
1423 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1424 1648
1425 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1426 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1427 } 1653 }
1428 } 1654 }
1429 1655
1430 (\@w, \@h) 1656 (\@w, \@h)
1431} 1657}
… …
1447 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1448 1674
1449 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1450 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1451 1677
1452 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1453 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1454 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1455 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1456 1682
1457 # linearly scale sizes
1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460 1684
1461 CFClient::UI::harmonize $ws; 1685 CFPlus::UI::harmonize $ws;
1686
1687 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1;
1690
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692
1462 CFClient::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1463 1694
1464 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1465 1697
1466 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1467 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1468 or next;
1469 1700
1470 my $x = 0; 1701 $widget->configure (
1471 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1472 1704 );
1473 for my $c (0 .. $#$row) { 1705 }
1474 my $col_w = $ws->[$c];
1475 1706
1476 if (my $widget = $row->[$c]) { 1707 1
1477 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1478 }
1479 1709
1480 $x += $col_w; 1710#############################################################################
1711
1712package CFPlus::UI::Fixed;
1713
1714use List::Util qw(min max);
1715
1716our @ISA = CFPlus::UI::Container::;
1717
1718sub _scale($$$) {
1719 my ($rel, $val, $max) = @_;
1720
1721 $rel ? $val * $max : $val
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1728
1729 # determine overall size by querying abs widgets
1730 for my $child ($self->visible_children) {
1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1734
1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1481 } 1737 }
1738 }
1482 1739
1483 $y += $row_h; 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1742
1743 # now layout remaining widgets
1744 for my $child ($self->visible_children) {
1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 }
1752 }
1753
1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 ($W, $H)
1758}
1759
1760sub invoke_size_allocate {
1761 my ($self, $W, $H) = @_;
1762
1763 for my $child ($self->visible_children) {
1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766
1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1769
1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1484 } 1771 }
1485 1772
1486 1 1773 1
1487} 1774}
1488 1775
1489sub find_widget {
1490 my ($self, $x, $y) = @_;
1491
1492 $x -= $self->{x};
1493 $y -= $self->{y};
1494
1495 my $res;
1496
1497 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1498 $res = $_->find_widget ($x, $y)
1499 and return $res;
1500 }
1501
1502 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1503}
1504
1505sub _draw {
1506 my ($self) = @_;
1507
1508 for (grep $_, @{$self->{children}}) {
1509 $_->draw for grep $_, @$_;
1510 }
1511}
1512
1513############################################################################# 1776#############################################################################
1514 1777
1515package CFClient::UI::Box; 1778package CFPlus::UI::Box;
1516 1779
1517our @ISA = CFClient::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1518 1781
1519sub size_request { 1782sub size_request {
1520 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1521 1786
1522 $self->{vertical} 1787 $self->{vertical}
1523 ? ( 1788 ? (
1524 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1525 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1526 ) 1791 )
1527 : ( 1792 : (
1528 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1529 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1530 ) 1795 )
1531} 1796}
1532 1797
1533sub invoke_size_allocate { 1798sub invoke_size_allocate {
1534 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1555 $req[$_] += $space * $children[$_]{expand} 1820 $req[$_] += $space * $children[$_]{expand}
1556 for 0 .. $#children; 1821 for 0 .. $#children;
1557 } 1822 }
1558 } 1823 }
1559 1824
1560 CFClient::UI::harmonize \@req; 1825 CFPlus::UI::harmonize \@req;
1561 1826
1562 my $pos = 0; 1827 my $pos = 0;
1563 for (0 .. $#children) { 1828 for (0 .. $#children) {
1564 my $alloc = $req[$_]; 1829 my $alloc = $req[$_];
1565 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1830 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1570 1 1835 1
1571} 1836}
1572 1837
1573############################################################################# 1838#############################################################################
1574 1839
1575package CFClient::UI::HBox; 1840package CFPlus::UI::HBox;
1576 1841
1577our @ISA = CFClient::UI::Box::; 1842our @ISA = CFPlus::UI::Box::;
1578 1843
1579sub new { 1844sub new {
1580 my $class = shift; 1845 my $class = shift;
1581 1846
1582 $class->SUPER::new ( 1847 $class->SUPER::new (
… …
1585 ) 1850 )
1586} 1851}
1587 1852
1588############################################################################# 1853#############################################################################
1589 1854
1590package CFClient::UI::VBox; 1855package CFPlus::UI::VBox;
1591 1856
1592our @ISA = CFClient::UI::Box::; 1857our @ISA = CFPlus::UI::Box::;
1593 1858
1594sub new { 1859sub new {
1595 my $class = shift; 1860 my $class = shift;
1596 1861
1597 $class->SUPER::new ( 1862 $class->SUPER::new (
… …
1600 ) 1865 )
1601} 1866}
1602 1867
1603############################################################################# 1868#############################################################################
1604 1869
1605package CFClient::UI::Label; 1870package CFPlus::UI::Label;
1606 1871
1607our @ISA = CFClient::UI::DrawBG::; 1872our @ISA = CFPlus::UI::DrawBG::;
1608 1873
1609use CFClient::OpenGL; 1874use CFPlus::OpenGL;
1610 1875
1611sub new { 1876sub new {
1612 my ($class, %arg) = @_; 1877 my ($class, %arg) = @_;
1613 1878
1614 my $self = $class->SUPER::new ( 1879 my $self = $class->SUPER::new (
… …
1617 #active_bg => none 1882 #active_bg => none
1618 #font => default_font 1883 #font => default_font
1619 #text => initial text 1884 #text => initial text
1620 #markup => initial narkup 1885 #markup => initial narkup
1621 #max_w => maximum pixel width 1886 #max_w => maximum pixel width
1887 #style => 0, # render flags
1622 ellipsise => 3, # end 1888 ellipsise => 3, # end
1623 layout => (new CFClient::Layout), 1889 layout => (new CFPlus::Layout),
1624 fontsize => 1, 1890 fontsize => 1,
1625 align => -1, 1891 align => -1,
1626 valign => -1, 1892 valign => -1,
1627 padding_x => 2, 1893 padding_x => 2,
1628 padding_y => 2, 1894 padding_y => 2,
1629 can_events => 0, 1895 can_events => 0,
1630 %arg 1896 %arg
1631 ); 1897 );
1632 1898
1633 if (exists $self->{template}) { 1899 if (exists $self->{template}) {
1634 my $layout = new CFClient::Layout; 1900 my $layout = new CFPlus::Layout;
1635 $layout->set_text (delete $self->{template}); 1901 $layout->set_text (delete $self->{template});
1636 $self->{template} = $layout; 1902 $self->{template} = $layout;
1637 } 1903 }
1638 1904
1639 if (exists $self->{markup}) { 1905 if (exists $self->{markup}) {
… …
1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1776 : ($self->{h} - $size->[1]) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
1777 }; 2043 };
1778 2044
1779 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2045# unless ($self->{list}) {
1780 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2046# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list};
2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049# CFPlus::OpenGL::glEndList;
2050# }
2051#
2052# CFPlus::OpenGL::glCallList $self->{list};
1781 2053
1782 $self->{layout}->render ($self->{ox}, $self->{oy}); 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783} 2055}
2056
2057#sub destroy {
2058# my ($self) = @_;
2059#
2060# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061#
2062# $self->SUPER::destroy;
2063#}
1784 2064
1785############################################################################# 2065#############################################################################
1786 2066
1787package CFClient::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
1788 2068
1789our @ISA = CFClient::UI::Label::; 2069our @ISA = CFPlus::UI::Label::;
1790 2070
1791use CFClient::OpenGL; 2071use CFPlus::OpenGL;
1792 2072
1793sub new { 2073sub new {
1794 my $class = shift; 2074 my $class = shift;
1795 2075
1796 $class->SUPER::new ( 2076 $class->SUPER::new (
1797 fg => [1, 1, 1], 2077 fg => [1, 1, 1],
1798 bg => [0, 0, 0, 0.2], 2078 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5], 2079 active_bg => [0, 0, 1, .2],
1800 active_fg => [0, 0, 0], 2080 active_fg => [1, 1, 1],
2081 active_outline => [1, 1, 0],
1801 can_hover => 1, 2082 can_hover => 1,
1802 can_focus => 1, 2083 can_focus => 1,
1803 valign => 0, 2084 valign => 0,
1804 can_events => 1, 2085 can_events => 1,
2086 ellipsise => 0,
1805 #text => ... 2087 #text => ...
1806 #hidden => "*", 2088 #hidden => "*",
1807 @_ 2089 @_
1808 ) 2090 )
1809} 2091}
… …
1854 my $sym = $ev->{sym}; 2136 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2137 my $uni = $ev->{unicode};
1856 2138
1857 my $text = $self->get_text; 2139 my $text = $self->get_text;
1858 2140
2141 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2142
1859 if ($uni == 8) { 2143 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2144 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2145 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2146 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFClient::SDLK_LEFT) { 2147 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2148 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFClient::SDLK_RIGHT) { 2149 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2150 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFClient::SDLK_HOME) { 2151 } elsif ($sym == CFPlus::SDLK_HOME) {
2152 # what a hack
2153 $self->{cursor} =
2154 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2155 ? length $1
2156 : 0;
2157 } elsif ($sym == CFPlus::SDLK_END) {
2158 # uh, again
2159 $self->{cursor} =
2160 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2161 ? $self->{cursor} + length $1
2162 : length $self->{text};
2163 } elsif ($uni == 21) { # ctrl-u
2164 $text = "";
1868 $self->{cursor} = 0; 2165 $self->{cursor} = 0;
1869 } elsif ($sym == CFClient::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2166 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2167 $self->emit ('escape');
1873 } elsif ($uni) { 2168 } elsif ($uni == 0x0d) {
2169 substr $text, $self->{cursor}++, 0, "\012";
2170 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2171 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2172 } else {
1876 return 0; 2173 return 0;
1877 } 2174 }
1878 2175
1879 $self->_set_text ($text); 2176 $self->_set_text ($text);
1880 2177
1881 $self->realloc; 2178 $self->realloc;
2179 $self->update;
1882 2180
1883 1 2181 1
1884} 2182}
1885 2183
1886sub invoke_focus_in { 2184sub invoke_focus_in {
… …
1945 2243
1946 unless (exists $self->{cur_h}) { 2244 unless (exists $self->{cur_h}) {
1947 my $text = substr $self->{text}, 0, $self->{cursor}; 2245 my $text = substr $self->{text}, 0, $self->{cursor};
1948 utf8::encode $text; 2246 utf8::encode $text;
1949 2247
1950 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2248 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1951 } 2249 }
1952 2250
1953 glColor @{$self->{fg}}; 2251 glColor_premultiply @{$self->{active_fg}};
1954 glBegin GL_LINES; 2252 glBegin GL_LINES;
1955 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2253 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957 glEnd; 2255 glEnd;
1958 }
1959}
1960 2256
2257 glLineWidth 3;
2258 glColor @{$self->{active_outline}};
2259 glTranslate -.375, -.375;
2260 glBegin GL_LINE_LOOP;
2261 glVertex 0, 0;
2262 glVertex $self->{w}, 0;
2263 glVertex $self->{w}, $self->{h};
2264 glVertex 0, $self->{h};
2265 glEnd;
2266 glLineWidth 1;
2267 }
2268}
2269
2270#############################################################################
2271
1961package CFClient::UI::Entry; 2272package CFPlus::UI::Entry;
1962 2273
1963our @ISA = CFClient::UI::EntryBase::; 2274our @ISA = CFPlus::UI::EntryBase::;
1964 2275
1965use CFClient::OpenGL; 2276use CFPlus::OpenGL;
1966 2277
1967sub invoke_key_down { 2278sub invoke_key_down {
1968 my ($self, $ev) = @_; 2279 my ($self, $ev) = @_;
1969 2280
1970 my $sym = $ev->{sym}; 2281 my $sym = $ev->{sym};
1971 2282
1972 if ($sym == 13) { 2283 if ($ev->{uni} == 0x0d || $sym == 13) {
1973 unshift @{$self->{history}}, 2284 unshift @{$self->{history}},
1974 my $txt = $self->get_text; 2285 my $txt = $self->get_text;
1975 2286
1976 $self->{history_pointer} = -1; 2287 $self->{history_pointer} = -1;
1977 $self->{history_saveback} = ''; 2288 $self->{history_saveback} = '';
1978 $self->emit (activate => $txt); 2289 $self->emit (activate => $txt);
1979 $self->update; 2290 $self->update;
1980 2291
1981 } elsif ($sym == CFClient::SDLK_UP) { 2292 } elsif ($sym == CFPlus::SDLK_UP) {
1982 if ($self->{history_pointer} < 0) { 2293 if ($self->{history_pointer} < 0) {
1983 $self->{history_saveback} = $self->get_text; 2294 $self->{history_saveback} = $self->get_text;
1984 } 2295 }
1985 if (@{$self->{history} || []} > 0) { 2296 if (@{$self->{history} || []} > 0) {
1986 $self->{history_pointer}++; 2297 $self->{history_pointer}++;
… …
1988 $self->{history_pointer} = @{$self->{history} || []} - 1; 2299 $self->{history_pointer} = @{$self->{history} || []} - 1;
1989 } 2300 }
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2301 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1991 } 2302 }
1992 2303
1993 } elsif ($sym == CFClient::SDLK_DOWN) { 2304 } elsif ($sym == CFPlus::SDLK_DOWN) {
1994 $self->{history_pointer}--; 2305 $self->{history_pointer}--;
1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2306 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1996 2307
1997 if ($self->{history_pointer} >= 0) { 2308 if ($self->{history_pointer} >= 0) {
1998 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2309 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
2007 1 2318 1
2008} 2319}
2009 2320
2010############################################################################# 2321#############################################################################
2011 2322
2323package CFPlus::UI::TextEdit;
2324
2325our @ISA = CFPlus::UI::EntryBase::;
2326
2327use CFPlus::OpenGL;
2328
2329sub move_cursor_ver {
2330 my ($self, $dy) = @_;
2331
2332 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2333
2334 $y += $dy;
2335
2336 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2337 $self->{cursor} = $index;
2338 delete $self->{cur_h};
2339 $self->update;
2340 return;
2341 }
2342}
2343
2344sub invoke_key_down {
2345 my ($self, $ev) = @_;
2346
2347 my $sym = $ev->{sym};
2348
2349 if ($sym == CFPlus::SDLK_UP) {
2350 $self->move_cursor_ver (-1);
2351 } elsif ($sym == CFPlus::SDLK_DOWN) {
2352 $self->move_cursor_ver (+1);
2353 } else {
2354 return $self->SUPER::invoke_key_down ($ev)
2355 }
2356
2357 1
2358}
2359
2360#############################################################################
2361
2012package CFClient::UI::Button; 2362package CFPlus::UI::ButtonBin;
2013 2363
2014our @ISA = CFClient::UI::Label::; 2364our @ISA = CFPlus::UI::Bin::;
2015 2365
2016use CFClient::OpenGL; 2366use CFPlus::OpenGL;
2017 2367
2018my @tex = 2368my @tex =
2019 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2369 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020 qw(b1_button_active.png); 2370 qw(b1_button_inactive.png b1_button_active.png);
2021 2371
2022sub new { 2372sub new {
2023 my $class = shift; 2373 my $class = shift;
2024 2374
2025 $class->SUPER::new ( 2375 $class->SUPER::new (
2026 padding_x => 4,
2027 padding_y => 4,
2028 fg => [1, 1, 1],
2029 active_fg => [0, 0, 1],
2030 can_hover => 1, 2376 can_hover => 1,
2031 align => 0, 2377 align => 0,
2032 valign => 0, 2378 valign => 0,
2033 can_events => 1, 2379 can_events => 1,
2034 @_ 2380 @_
… …
2046} 2392}
2047 2393
2048sub _draw { 2394sub _draw {
2049 my ($self) = @_; 2395 my ($self) = @_;
2050 2396
2051 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2052
2053 glEnable GL_TEXTURE_2D; 2397 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2398 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 glColor 0, 0, 0, 1; 2399 glColor 0, 0, 0, 1;
2056 2400
2401 my $tex = $tex[$GRAB == $self];
2057 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2402 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2058 2403
2059 glDisable GL_TEXTURE_2D; 2404 glDisable GL_TEXTURE_2D;
2060 2405
2061 $self->SUPER::_draw; 2406 $self->SUPER::_draw;
2062} 2407}
2063 2408
2064############################################################################# 2409#############################################################################
2065 2410
2066package CFClient::UI::CheckBox; 2411package CFPlus::UI::Button;
2067 2412
2068our @ISA = CFClient::UI::DrawBG::; 2413our @ISA = CFPlus::UI::Label::;
2414
2415use CFPlus::OpenGL;
2069 2416
2070my @tex = 2417my @tex =
2071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2418 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2419 qw(b1_button_inactive.png b1_button_active.png);
2420
2421sub new {
2422 my $class = shift;
2423
2424 $class->SUPER::new (
2425 padding_x => 4,
2426 padding_y => 4,
2427 fg => [1.0, 1.0, 1.0],
2428 active_fg => [0.8, 0.8, 0.8],
2429 can_hover => 1,
2430 align => 0,
2431 valign => 0,
2432 can_events => 1,
2433 @_
2434 )
2435}
2436
2437sub invoke_button_up {
2438 my ($self, $ev, $x, $y) = @_;
2439
2440 $self->emit ("activate")
2441 if $x >= 0 && $x < $self->{w}
2442 && $y >= 0 && $y < $self->{h};
2443
2444 1
2445}
2446
2447sub _draw {
2448 my ($self) = @_;
2449
2450 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2451
2452 glEnable GL_TEXTURE_2D;
2453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2454 glColor 0, 0, 0, 1;
2455
2456 my $tex = $tex[$GRAB == $self];
2457 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2458
2459 glDisable GL_TEXTURE_2D;
2460
2461 $self->SUPER::_draw;
2462}
2463
2464#############################################################################
2465
2466package CFPlus::UI::CheckBox;
2467
2468our @ISA = CFPlus::UI::DrawBG::;
2469
2470my @tex =
2471 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2472 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073 2473
2074use CFClient::OpenGL; 2474use CFPlus::OpenGL;
2075 2475
2076sub new { 2476sub new {
2077 my $class = shift; 2477 my $class = shift;
2078 2478
2079 $class->SUPER::new ( 2479 $class->SUPER::new (
… …
2136 glDisable GL_TEXTURE_2D; 2536 glDisable GL_TEXTURE_2D;
2137} 2537}
2138 2538
2139############################################################################# 2539#############################################################################
2140 2540
2141package CFClient::UI::Image; 2541package CFPlus::UI::Image;
2142 2542
2143our @ISA = CFClient::UI::Base::; 2543our @ISA = CFPlus::UI::Base::;
2144 2544
2145use CFClient::OpenGL; 2545use CFPlus::OpenGL;
2146 2546
2147our %texture_cache; 2547our %texture_cache;
2148 2548
2149sub new { 2549sub new {
2150 my $class = shift; 2550 my $class = shift;
2151 2551
2152 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2153 can_events => 0, 2553 can_events => 0,
2554 scale => 1,
2154 @_, 2555 @_,
2155 ); 2556 );
2156 2557
2157 $self->{path} || $self->{tex} 2558 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required"; 2559 or Carp::croak "'path' or 'tex' attributes required";
2159 2560
2160 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2561 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2161 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2562 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162 2563
2163 Scalar::Util::weaken $texture_cache{$self->{path}}; 2564 CFPlus::weaken $texture_cache{$self->{path}};
2164 2565
2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2566 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166 2567
2167 $self 2568 $self
2168} 2569}
2169 2570
2170sub STORABLE_freeze { 2571sub STORABLE_freeze {
2171 my ($self, $cloning) = @_; 2572 my ($self, $cloning) = @_;
2172 2573
2173 $self->{path} 2574 $self->{path}
2174 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2575 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175 2576
2176 $self->{path} 2577 $self->{path}
2177} 2578}
2178 2579
2179sub STORABLE_attach { 2580sub STORABLE_attach {
… …
2183} 2584}
2184 2585
2185sub size_request { 2586sub size_request {
2186 my ($self) = @_; 2587 my ($self) = @_;
2187 2588
2188 ($self->{tex}{w}, $self->{tex}{h}) 2589 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2189} 2590}
2190 2591
2191sub _draw { 2592sub _draw {
2192 my ($self) = @_; 2593 my ($self) = @_;
2193 2594
… …
2203 } 2604 }
2204 2605
2205 glEnable GL_TEXTURE_2D; 2606 glEnable GL_TEXTURE_2D;
2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2607 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207 2608
2208 $tex->draw_quad (0, 0, $w, $h); 2609 $tex->draw_quad_alpha (0, 0, $w, $h);
2209 2610
2210 glDisable GL_TEXTURE_2D; 2611 glDisable GL_TEXTURE_2D;
2211} 2612}
2212 2613
2213############################################################################# 2614#############################################################################
2214 2615
2215package CFClient::UI::ImageButton; 2616package CFPlus::UI::ImageButton;
2216 2617
2217our @ISA = CFClient::UI::Image::; 2618our @ISA = CFPlus::UI::Image::;
2218 2619
2219use CFClient::OpenGL; 2620use CFPlus::OpenGL;
2220 2621
2221my %textures; 2622my %textures;
2222 2623
2223sub new { 2624sub new {
2224 my $class = shift; 2625 my $class = shift;
… …
2246 1 2647 1
2247} 2648}
2248 2649
2249############################################################################# 2650#############################################################################
2250 2651
2251package CFClient::UI::VGauge; 2652package CFPlus::UI::VGauge;
2252 2653
2253our @ISA = CFClient::UI::Base::; 2654our @ISA = CFPlus::UI::Base::;
2254 2655
2255use List::Util qw(min max); 2656use List::Util qw(min max);
2256 2657
2257use CFClient::OpenGL; 2658use CFPlus::OpenGL;
2258 2659
2259my %tex = ( 2660my %tex = (
2260 food => [ 2661 food => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2662 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2663 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2263 ], 2664 ],
2264 grace => [ 2665 grace => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2666 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2667 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2267 ], 2668 ],
2268 hp => [ 2669 hp => [
2269 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2670 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2671 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2271 ], 2672 ],
2272 mana => [ 2673 mana => [
2273 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2674 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2274 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2675 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2275 ], 2676 ],
2276); 2677);
2277 2678
2278# eg. VGauge->new (gauge => 'food'), default gauge: food 2679# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2381 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2382} 2783}
2383 2784
2384############################################################################# 2785#############################################################################
2385 2786
2386package CFClient::UI::Gauge; 2787package CFPlus::UI::Gauge;
2387 2788
2388our @ISA = CFClient::UI::VBox::; 2789our @ISA = CFPlus::UI::VBox::;
2389 2790
2390sub new { 2791sub new {
2391 my ($class, %arg) = @_; 2792 my ($class, %arg) = @_;
2392 2793
2393 my $self = $class->SUPER::new ( 2794 my $self = $class->SUPER::new (
… …
2395 can_hover => 1, 2796 can_hover => 1,
2396 can_events => 1, 2797 can_events => 1,
2397 %arg, 2798 %arg,
2398 ); 2799 );
2399 2800
2400 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2801 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2401 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2802 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2402 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2803 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2403 2804
2404 $self 2805 $self
2405} 2806}
2406 2807
2407sub set_fontsize { 2808sub set_fontsize {
… …
2428 $self->{value}->set_text ($val); 2829 $self->{value}->set_text ($val);
2429} 2830}
2430 2831
2431############################################################################# 2832#############################################################################
2432 2833
2433package CFClient::UI::Slider; 2834package CFPlus::UI::Slider;
2434 2835
2435use strict; 2836use strict;
2436 2837
2437use CFClient::OpenGL; 2838use CFPlus::OpenGL;
2438 2839
2439our @ISA = CFClient::UI::DrawBG::; 2840our @ISA = CFPlus::UI::DrawBG::;
2440 2841
2441my @tex = 2842my @tex =
2442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2843 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2443 qw(s1_slider.png s1_slider_bg.png); 2844 qw(s1_slider.png s1_slider_bg.png);
2444 2845
2445sub new { 2846sub new {
2446 my $class = shift; 2847 my $class = shift;
2447 2848
… …
2515 2916
2516 $self->SUPER::invoke_button_down ($ev, $x, $y); 2917 $self->SUPER::invoke_button_down ($ev, $x, $y);
2517 2918
2518 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2919 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2519 2920
2520 $self->invoke_mouse_motion ($ev, $x, $y) 2921 $self->invoke_mouse_motion ($ev, $x, $y);
2922
2923 1
2521} 2924}
2522 2925
2523sub invoke_mouse_motion { 2926sub invoke_mouse_motion {
2524 my ($self, $ev, $x, $y) = @_; 2927 my ($self, $ev, $x, $y) = @_;
2525 2928
… …
2541sub invoke_mouse_wheel { 2944sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_; 2945 my ($self, $ev) = @_;
2543 2946
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2947 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545 2948
2949 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2950
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2951 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547 2952
2548 ! ! $delta 2953 1
2549} 2954}
2550 2955
2551sub update { 2956sub update {
2552 my ($self) = @_; 2957 my ($self) = @_;
2553 2958
… …
2602 glDisable GL_TEXTURE_2D; 3007 glDisable GL_TEXTURE_2D;
2603} 3008}
2604 3009
2605############################################################################# 3010#############################################################################
2606 3011
2607package CFClient::UI::ValSlider; 3012package CFPlus::UI::ValSlider;
2608 3013
2609our @ISA = CFClient::UI::HBox::; 3014our @ISA = CFPlus::UI::HBox::;
2610 3015
2611sub new { 3016sub new {
2612 my ($class, %arg) = @_; 3017 my ($class, %arg) = @_;
2613 3018
2614 my $range = delete $arg{range}; 3019 my $range = delete $arg{range};
2615 3020
2616 my $self = $class->SUPER::new ( 3021 my $self = $class->SUPER::new (
2617 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3022 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2618 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3023 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2619 to_value => sub { shift }, 3024 to_value => sub { shift },
2620 from_value => sub { shift }, 3025 from_value => sub { shift },
2621 %arg, 3026 %arg,
2622 ); 3027 );
2623 3028
… …
2643sub set_range { shift->{slider}->set_range (@_) } 3048sub set_range { shift->{slider}->set_range (@_) }
2644sub set_value { shift->{slider}->set_value (@_) } 3049sub set_value { shift->{slider}->set_value (@_) }
2645 3050
2646############################################################################# 3051#############################################################################
2647 3052
2648package CFClient::UI::TextScroller; 3053package CFPlus::UI::TextScroller;
2649 3054
2650our @ISA = CFClient::UI::HBox::; 3055our @ISA = CFPlus::UI::HBox::;
2651 3056
2652use CFClient::OpenGL; 3057use CFPlus::OpenGL;
2653 3058
2654sub new { 3059sub new {
2655 my $class = shift; 3060 my $class = shift;
2656 3061
2657 my $self = $class->SUPER::new ( 3062 my $self = $class->SUPER::new (
… …
2659 can_events => 1, 3064 can_events => 1,
2660 indent => 0, 3065 indent => 0,
2661 #font => default_font 3066 #font => default_font
2662 @_, 3067 @_,
2663 3068
2664 layout => (new CFClient::Layout), 3069 layout => (new CFPlus::Layout),
2665 par => [], 3070 par => [],
3071 max_par => 0,
2666 height => 0, 3072 height => 0,
2667 children => [ 3073 children => [
2668 (new CFClient::UI::Empty expand => 1), 3074 (new CFPlus::UI::Empty expand => 1),
2669 (new CFClient::UI::Slider vertical => 1), 3075 (new CFPlus::UI::Slider vertical => 1),
2670 ], 3076 ],
2671 ); 3077 );
2672 3078
2673 $self->{children}[1]->connect (changed => sub { $self->update }); 3079 $self->{children}[1]->connect (changed => sub { $self->update });
2674 3080
… …
2683} 3089}
2684 3090
2685sub size_request { 3091sub size_request {
2686 my ($self) = @_; 3092 my ($self) = @_;
2687 3093
2688 my ($empty, $slider) = @{ $self->{children} }; 3094 my ($empty, $slider) = $self->visible_children;
2689 3095
2690 local $self->{children} = [$empty, $slider]; 3096 local $self->{children} = [$empty, $slider];
2691 $self->SUPER::size_request 3097 $self->SUPER::size_request
2692} 3098}
2693 3099
… …
2749sub set_offset { 3155sub set_offset {
2750 my ($self, $offset) = @_; 3156 my ($self, $offset) = @_;
2751 3157
2752 # todo: base offset on lines or so, not on pixels 3158 # todo: base offset on lines or so, not on pixels
2753 $self->{children}[1]->set_value ($offset); 3159 $self->{children}[1]->set_value ($offset);
3160}
3161
3162sub current_paragraph {
3163 my ($self) = @_;
3164
3165 $self->{top_paragraph} - 1
3166}
3167
3168sub scroll_to {
3169 my ($self, $para) = @_;
3170
3171 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3172
3173 $self->{scroll_to} = $para;
3174 $self->update;
2754} 3175}
2755 3176
2756sub clear { 3177sub clear {
2757 my ($self) = @_; 3178 my ($self) = @_;
2758 3179
… …
2780 3201
2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3202 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para; 3203 push @{$self->{par}}, $para;
2783 } 3204 }
2784 3205
3206 if (my $max = $self->{max_par}) {
3207 shift @{$self->{par}} while @{$self->{par}} > $max;
3208 }
3209
2785 $self->{need_reflow}++; 3210 $self->{need_reflow}++;
2786 $self->update; 3211 $self->update;
2787} 3212}
2788 3213
2789sub scroll_to_bottom { 3214sub scroll_to_bottom {
2790 my ($self) = @_; 3215 my ($self) = @_;
2791 3216
2792 $self->{scroll_to_bottom} = 1; 3217 $self->{scroll_to} = $#{$self->{par}};
2793 $self->update; 3218 $self->update;
2794} 3219}
2795 3220
3221sub force_uptodate {
3222 my ($self) = @_;
3223
3224 if (delete $self->{need_reflow}) {
3225 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3226
3227 my $height = 0;
3228
3229 for my $para (@{$self->{par}}) {
3230 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3231 my $layout = $self->get_layout ($para);
3232 my ($w, $h) = $layout->size;
3233
3234 $para->{w} = $w + $para->{indent};
3235 $para->{h} = $h;
3236 $para->{wrapped} = $layout->has_wrapped;
3237 }
3238
3239 $para->{y} = $height;
3240 $height += $para->{h};
3241 }
3242
3243 $self->{height} = $height;
3244 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3245
3246 delete $self->{texture};
3247 }
3248
3249 if (my $paridx = delete $self->{scroll_to}) {
3250 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3251 }
3252}
3253
2796sub update { 3254sub update {
2797 my ($self) = @_; 3255 my ($self) = @_;
2798 3256
2799 $self->SUPER::update; 3257 $self->SUPER::update;
2800 3258
2801 return unless $self->{h} > 0; 3259 return unless $self->{h} > 0;
2802 3260
2803 delete $self->{texture}; 3261 delete $self->{texture};
2804 3262
2805 $ROOT->on_post_alloc ($self => sub { 3263 $ROOT->on_post_alloc ($self => sub {
3264 $self->force_uptodate;
3265
2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3266 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807 3267
2808 if (delete $self->{need_reflow}) {
2809 my $height = 0;
2810
2811 for my $para (@{$self->{par}}) {
2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2813 my $layout = $self->get_layout ($para);
2814 my ($w, $h) = $layout->size;
2815
2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2819 }
2820
2821 $height += $para->{h};
2822 }
2823
2824 $self->{height} = $height;
2825
2826 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2827
2828 delete $self->{texture};
2829 }
2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834
2835 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3268 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836 glClearColor 0, 0, 0, 0; 3269 glClearColor 0, 0, 0, 0;
2837 glClear GL_COLOR_BUFFER_BIT; 3270 glClear GL_COLOR_BUFFER_BIT;
2838 3271
3272 package CFPlus::UI::Base;
3273 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3274 (0, 0, $self->{w}, $self->{h});
3275
3276 my $top = int $self->{children}[1]{range}[0];
3277
3278 my $paridx = 0;
3279 my $top_paragraph;
2839 my $top = int $self->{children}[1]{range}[0]; 3280 my $top = int $self->{children}[1]{range}[0];
2840 3281
2841 my $y0 = $top; 3282 my $y0 = $top;
2842 my $y1 = $top + $H; 3283 my $y1 = $top + $H;
2843 3284
2844 my $y = 0;
2845
2846 for my $para (@{$self->{par}}) { 3285 for my $para (@{$self->{par}}) {
2847 my $h = $para->{h}; 3286 my $h = $para->{h};
3287 my $y = $para->{y};
2848 3288
2849 if ($y0 < $y + $h && $y < $y1) { 3289 if ($y0 < $y + $h && $y < $y1) {
2850
2851 my $layout = $self->get_layout ($para); 3290 my $layout = $self->get_layout ($para);
2852 3291
2853 $layout->render ($para->{indent}, $y - $y0); 3292 $layout->render ($para->{indent}, $y - $y0);
2854 3293
2855 if (my @w = @{ $para->{widget} }) { 3294 if (my @w = @{ $para->{widget} }) {
… …
2864 $_->draw; 3303 $_->draw;
2865 } 3304 }
2866 } 3305 }
2867 } 3306 }
2868 3307
2869 $y += $h; 3308 $paridx++;
3309 $top_paragraph ||= $paridx if $y >= $top;
2870 } 3310 }
3311
3312 $self->{top_paragraph} = $top_paragraph;
2871 }; 3313 };
2872 }); 3314 });
2873} 3315}
2874 3316
2875sub reconfigure { 3317sub reconfigure {
… …
2893 $self->{children}[1]->draw; 3335 $self->{children}[1]->draw;
2894} 3336}
2895 3337
2896############################################################################# 3338#############################################################################
2897 3339
2898package CFClient::UI::Animator; 3340package CFPlus::UI::Animator;
2899 3341
2900use CFClient::OpenGL; 3342use CFPlus::OpenGL;
2901 3343
2902our @ISA = CFClient::UI::Bin::; 3344our @ISA = CFPlus::UI::Bin::;
2903 3345
2904sub moveto { 3346sub moveto {
2905 my ($self, $x, $y) = @_; 3347 my ($self, $x, $y) = @_;
2906 3348
2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3349 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2935 glPopMatrix; 3377 glPopMatrix;
2936} 3378}
2937 3379
2938############################################################################# 3380#############################################################################
2939 3381
2940package CFClient::UI::Flopper; 3382package CFPlus::UI::Flopper;
2941 3383
2942our @ISA = CFClient::UI::Button::; 3384our @ISA = CFPlus::UI::Button::;
2943 3385
2944sub new { 3386sub new {
2945 my $class = shift; 3387 my $class = shift;
2946 3388
2947 my $self = $class->SUPER::new ( 3389 my $self = $class->SUPER::new (
… …
2959 $self->{other}->toggle_visibility; 3401 $self->{other}->toggle_visibility;
2960} 3402}
2961 3403
2962############################################################################# 3404#############################################################################
2963 3405
2964package CFClient::UI::Tooltip; 3406package CFPlus::UI::Tooltip;
2965 3407
2966our @ISA = CFClient::UI::Bin::; 3408our @ISA = CFPlus::UI::Bin::;
2967 3409
2968use CFClient::OpenGL; 3410use CFPlus::OpenGL;
2969 3411
2970sub new { 3412sub new {
2971 my $class = shift; 3413 my $class = shift;
2972 3414
2973 $class->SUPER::new ( 3415 $class->SUPER::new (
… …
2976 ) 3418 )
2977} 3419}
2978 3420
2979sub set_tooltip_from { 3421sub set_tooltip_from {
2980 my ($self, $widget) = @_; 3422 my ($self, $widget) = @_;
3423
3424 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3425 if $widget->{tooltip} =~ /^#(.*)$/;
2981 3426
2982 my $tooltip = $widget->{tooltip}; 3427 my $tooltip = $widget->{tooltip};
2983 3428
2984 if ($ENV{CFPLUS_DEBUG} & 2) { 3429 if ($ENV{CFPLUS_DEBUG} & 2) {
2985 $tooltip .= "\n\n" . (ref $widget) . "\n" 3430 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2989 } 3434 }
2990 3435
2991 $tooltip =~ s/^\n+//; 3436 $tooltip =~ s/^\n+//;
2992 $tooltip =~ s/\n+$//; 3437 $tooltip =~ s/\n+$//;
2993 3438
2994 $self->add (new CFClient::UI::Label 3439 $self->add (new CFPlus::UI::Label
2995 markup => $tooltip, 3440 markup => $tooltip,
2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997 fontsize => 0.8, 3442 fontsize => 0.8,
2998 fg => [0, 0, 0, 1], 3443 style => 1, # FLAG_INVERSE
2999 ellipsise => 0, 3444 ellipsise => 0,
3000 font => ($widget->{tooltip_font} || $::FONT_PROP), 3445 font => ($widget->{tooltip_font} || $::FONT_PROP),
3001 ); 3446 );
3002} 3447}
3003 3448
… …
3065 $self->SUPER::_draw; 3510 $self->SUPER::_draw;
3066} 3511}
3067 3512
3068############################################################################# 3513#############################################################################
3069 3514
3070package CFClient::UI::Face; 3515package CFPlus::UI::Face;
3071 3516
3072our @ISA = CFClient::UI::DrawBG::; 3517our @ISA = CFPlus::UI::DrawBG::;
3073 3518
3074use CFClient::OpenGL; 3519use CFPlus::OpenGL;
3075 3520
3076sub new { 3521sub new {
3077 my $class = shift; 3522 my $class = shift;
3078 3523
3079 my $self = $class->SUPER::new ( 3524 my $self = $class->SUPER::new (
3525 size_w => 32,
3526 size_h => 8,
3080 aspect => 1, 3527 aspect => 1,
3081 can_events => 0, 3528 can_events => 0,
3082 @_, 3529 @_,
3083 ); 3530 );
3084 3531
3085 if ($self->{anim} && $self->{animspeed}) { 3532 if ($self->{anim} && $self->{animspeed}) {
3086 Scalar::Util::weaken (my $widget = $self); 3533 CFPlus::weaken (my $widget = $self);
3087 3534
3535 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3536 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3088 $self->{timer} = Event->timer ( 3537 $self->{timer} = Event->timer (
3089 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090 hard => 1, 3538 parked => 1,
3091 interval => $self->{animspeed},
3092 cb => sub { 3539 cb => sub {
3540 return unless $::CONN && $widget;
3541
3093 ++$widget->{frame}; 3542 ++$widget->{frame};
3543 $widget->update_face;
3094 $widget->update; 3544 $widget->update;
3545
3546 $widget->update_timer;
3095 }, 3547 },
3096 ); 3548 );
3549
3550 $self->update_face;
3551 $self->update_timer;
3097 } 3552 }
3098 3553
3099 $self 3554 $self
3100} 3555}
3101 3556
3557sub update_timer {
3558 my ($self) = @_;
3559
3560 return unless $self->{timer};
3561
3562 if ($self->{visible}) {
3563 $self->{timer}->at (
3564 $self->{anim_start}
3565 + $self->{animspeed}
3566 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3567 );
3568 $self->{timer}->start;
3569 } else {
3570 $self->{timer}->stop;
3571 }
3572}
3573
3574sub update_face {
3575 my ($self) = @_;
3576
3577 return unless $::CONN;
3578
3579 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3580 if ($anim && @$anim) {
3581 delete $self->{wait_face};
3582 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3583 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3584 }
3585 }
3586}
3587
3102sub size_request { 3588sub size_request {
3103 (32, 8) 3589 my ($self) = @_;
3590
3591 if ($::CONN) {
3592 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3593 if (my $tex = $::CONN->{texture}[$faceid]) {
3594 $self->{tex} = $tex;
3595 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3596 } else {
3597 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3598 $self->realloc;
3599 });
3600 }
3601 }
3602 }
3603
3604 ($self->{size_w} || 8, $self->{size_h} || 8)
3104} 3605}
3105 3606
3106sub update { 3607sub update {
3107 my ($self) = @_; 3608 my ($self) = @_;
3108 3609
3109 return unless $self->{visible}; 3610 return unless $self->{visible};
3110 3611
3111 $self->SUPER::update; 3612 $self->SUPER::update;
3112} 3613}
3113 3614
3615sub invoke_visibility_change {
3616 my ($self) = @_;
3617
3618 $self->update_timer;
3619
3620 0
3621}
3622
3114sub _draw { 3623sub _draw {
3115 my ($self) = @_; 3624 my ($self) = @_;
3116 3625
3117 return unless $::CONN;
3118
3119 $self->SUPER::_draw; 3626 $self->SUPER::_draw;
3120 3627
3121 my $face; 3628 if (my $tex = $self->{tex}) {
3122
3123 if ($self->{frame}) {
3124 my $anim = $::CONN->{anim}[$self->{anim}];
3125
3126 $face = $anim->[ $self->{frame} % @$anim ]
3127 if $anim && @$anim;
3128 }
3129
3130 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3131
3132 if ($tex) {
3133 glEnable GL_TEXTURE_2D; 3629 glEnable GL_TEXTURE_2D;
3134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135 glColor 0, 0, 0, 1; 3631 glColor 0, 0, 0, 1;
3136 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3632 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3137 glDisable GL_TEXTURE_2D; 3633 glDisable GL_TEXTURE_2D;
… …
3139} 3635}
3140 3636
3141sub destroy { 3637sub destroy {
3142 my ($self) = @_; 3638 my ($self) = @_;
3143 3639
3144 $self->{timer}->cancel 3640 (delete $self->{timer})->cancel
3145 if $self->{timer}; 3641 if $self->{timer};
3146 3642
3147 $self->SUPER::destroy; 3643 $self->SUPER::destroy;
3148} 3644}
3149 3645
3150############################################################################# 3646#############################################################################
3151 3647
3152package CFClient::UI::Buttonbar; 3648package CFPlus::UI::Buttonbar;
3153 3649
3154our @ISA = CFClient::UI::HBox::; 3650our @ISA = CFPlus::UI::HBox::;
3155 3651
3156# TODO: should actualyl wrap buttons and other goodies. 3652# TODO: should actually wrap buttons and other goodies.
3157 3653
3158############################################################################# 3654#############################################################################
3159 3655
3160package CFClient::UI::Menu; 3656package CFPlus::UI::Menu;
3161 3657
3162our @ISA = CFClient::UI::FancyFrame::; 3658our @ISA = CFPlus::UI::Toplevel::;
3163 3659
3164use CFClient::OpenGL; 3660use CFPlus::OpenGL;
3165 3661
3166sub new { 3662sub new {
3167 my $class = shift; 3663 my $class = shift;
3168 3664
3169 my $self = $class->SUPER::new ( 3665 my $self = $class->SUPER::new (
3170 items => [], 3666 items => [],
3171 z => 100, 3667 z => 100,
3172 @_, 3668 @_,
3173 ); 3669 );
3174 3670
3175 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3671 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3176 3672
3177 for my $item (@{ $self->{items} }) { 3673 for my $item (@{ $self->{items} }) {
3178 my ($widget, $cb, $tooltip) = @$item; 3674 my ($widget, $cb, $tooltip) = @$item;
3179 3675
3180 # handle various types of items, only text for now 3676 # handle various types of items, only text for now
3181 if (!ref $widget) { 3677 if (!ref $widget) {
3182 if ($widget =~ /\t/) { 3678 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2; 3679 my ($left, $right) = split /\t/, $widget, 2;
3184 3680
3185 $widget = new CFClient::UI::HBox 3681 $widget = new CFPlus::UI::HBox
3186 can_hover => 1, 3682 can_hover => 1,
3187 can_events => 1, 3683 can_events => 1,
3188 tooltip => $tooltip, 3684 tooltip => $tooltip,
3189 children => [ 3685 children => [
3190 (new CFClient::UI::Label markup => $left, expand => 1), 3686 (new CFPlus::UI::Label markup => $left, expand => 1),
3191 (new CFClient::UI::Label markup => $right, align => +1), 3687 (new CFPlus::UI::Label markup => $right, align => +1),
3192 ], 3688 ],
3193 ; 3689 ;
3194 3690
3195 } else { 3691 } else {
3196 $widget = new CFClient::UI::Label 3692 $widget = new CFPlus::UI::Label
3197 can_hover => 1, 3693 can_hover => 1,
3198 can_events => 1, 3694 can_events => 1,
3199 markup => $widget, 3695 markup => $widget,
3200 tooltip => $tooltip; 3696 tooltip => $tooltip;
3201 } 3697 }
… …
3249 1 3745 1
3250} 3746}
3251 3747
3252############################################################################# 3748#############################################################################
3253 3749
3254package CFClient::UI::Multiplexer; 3750package CFPlus::UI::Multiplexer;
3255 3751
3256our @ISA = CFClient::UI::Container::; 3752our @ISA = CFPlus::UI::Container::;
3257 3753
3258sub new { 3754sub new {
3259 my $class = shift; 3755 my $class = shift;
3260 3756
3261 my $self = $class->SUPER::new ( 3757 my $self = $class->SUPER::new (
… …
3322 $self->{current}->draw; 3818 $self->{current}->draw;
3323} 3819}
3324 3820
3325############################################################################# 3821#############################################################################
3326 3822
3327package CFClient::UI::Notebook; 3823package CFPlus::UI::Notebook;
3328 3824
3329our @ISA = CFClient::UI::VBox::; 3825our @ISA = CFPlus::UI::VBox::;
3330 3826
3331sub new { 3827sub new {
3332 my $class = shift; 3828 my $class = shift;
3333 3829
3334 my $self = $class->SUPER::new ( 3830 my $self = $class->SUPER::new (
3335 buttonbar => (new CFClient::UI::Buttonbar), 3831 buttonbar => (new CFPlus::UI::Buttonbar),
3336 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3832 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3337 # filter => # will be put between multiplexer and $self 3833 # filter => # will be put between multiplexer and $self
3338 @_, 3834 @_,
3339 ); 3835 );
3340 3836
3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3837 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3342 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3838 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3343 3839
3840 {
3841 Scalar::Util::weaken (my $wself = $self);
3842
3843 $self->{multiplexer}->connect (c_add => sub {
3844 my ($mplex, $widgets) = @_;
3845
3846 for my $child (@$widgets) {
3847 Scalar::Util::weaken $child;
3848 $child->{c_tab_} ||= do {
3849 my $tab =
3850 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3851 ? $child->{c_tab}
3852 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3853
3854 $tab->connect (activate => sub {
3855 $wself->set_current_page ($child);
3856 });
3857
3858 $tab
3859 };
3860
3861 $self->{buttonbar}->add ($child->{c_tab_});
3862 }
3863 });
3864
3865 $self->{multiplexer}->connect (c_remove => sub {
3866 my ($mplex, $widgets) = @_;
3867
3868 for my $child (@$widgets) {
3869 $wself->{buttonbar}->remove ($child->{c_tab_});
3870 }
3871 });
3872 }
3873
3344 $self 3874 $self
3345} 3875}
3346 3876
3347sub add { 3877sub add {
3878 my ($self, @widgets) = @_;
3879
3880 $self->{multiplexer}->add (@widgets)
3881}
3882
3883sub remove {
3884 my ($self, @widgets) = @_;
3885
3886 $self->{multiplexer}->remove (@widgets)
3887}
3888
3889sub pages {
3890 my ($self) = @_;
3891 $self->{multiplexer}->children
3892}
3893
3894sub add_tab {
3348 my ($self, $title, $widget, $tooltip) = @_; 3895 my ($self, $title, $widget, $tooltip) = @_;
3349 3896
3350 Scalar::Util::weaken $self; 3897 $title = [$title, $tooltip] unless ref $title;
3898 $widget->{c_tab} = $title;
3351 3899
3352 $self->{buttonbar}->add (new CFClient::UI::Button
3353 markup => $title,
3354 tooltip => $tooltip,
3355 on_activate => sub { $self->set_current_page ($widget) },
3356 );
3357
3358 $self->{multiplexer}->add ($widget); 3900 $self->add ($widget);
3359} 3901}
3360 3902
3361sub get_current_page { 3903sub get_current_page {
3362 my ($self) = @_; 3904 my ($self) = @_;
3363 3905
… …
3371 $self->emit (page_changed => $self->{multiplexer}{current}); 3913 $self->emit (page_changed => $self->{multiplexer}{current});
3372} 3914}
3373 3915
3374############################################################################# 3916#############################################################################
3375 3917
3376package CFClient::UI::Selector; 3918package CFPlus::UI::Selector;
3377 3919
3378use utf8; 3920use utf8;
3379 3921
3380our @ISA = CFClient::UI::Button::; 3922our @ISA = CFPlus::UI::Button::;
3381 3923
3382sub new { 3924sub new {
3383 my $class = shift; 3925 my $class = shift;
3384 3926
3385 my $self = $class->SUPER::new ( 3927 my $self = $class->SUPER::new (
… …
3402 my ($value, $title, $tooltip) = @$_; 3944 my ($value, $title, $tooltip) = @$_;
3403 3945
3404 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3946 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405 } 3947 }
3406 3948
3407 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3949 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408} 3950}
3409 3951
3410sub _set_value { 3952sub _set_value {
3411 my ($self, $value) = @_; 3953 my ($self, $value) = @_;
3412 3954
… …
3427 $self->emit (changed => $value); 3969 $self->emit (changed => $value);
3428} 3970}
3429 3971
3430############################################################################# 3972#############################################################################
3431 3973
3432package CFClient::UI::Statusbox; 3974package CFPlus::UI::Statusbox;
3433 3975
3434our @ISA = CFClient::UI::VBox::; 3976our @ISA = CFPlus::UI::VBox::;
3435 3977
3436sub new { 3978sub new {
3437 my $class = shift; 3979 my $class = shift;
3438 3980
3439 my $self = $class->SUPER::new ( 3981 my $self = $class->SUPER::new (
3440 fontsize => 0.8, 3982 fontsize => 0.8,
3441 @_, 3983 @_,
3442 ); 3984 );
3443 3985
3444 Scalar::Util::weaken (my $this = $self); 3986 CFPlus::weaken (my $this = $self);
3445 3987
3446 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3988 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447 3989
3448 $self 3990 $self
3449} 3991}
… …
3451sub reorder { 3993sub reorder {
3452 my ($self) = @_; 3994 my ($self) = @_;
3453 my $NOW = Time::HiRes::time; 3995 my $NOW = Time::HiRes::time;
3454 3996
3455 # freeze display when hovering over any label 3997 # freeze display when hovering over any label
3456 return if $CFClient::UI::TOOLTIP->{owner} 3998 return if $CFPlus::UI::TOOLTIP->{owner}
3457 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3999 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458 values %{ $self->{item} }; 4000 values %{ $self->{item} };
3459 4001
3460 while (my ($k, $v) = each %{ $self->{item} }) { 4002 while (my ($k, $v) = each %{ $self->{item} }) {
3461 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4003 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3462 } 4004 }
… …
3483 for ($short) { 4025 for ($short) {
3484 s/^\s+//; 4026 s/^\s+//;
3485 s/\s+/ /g; 4027 s/\s+/ /g;
3486 } 4028 }
3487 4029
3488 new CFClient::UI::Label 4030 new CFPlus::UI::Label
3489 markup => $short, 4031 markup => $short,
3490 tooltip => $item->{tooltip}, 4032 tooltip => $item->{tooltip},
3491 tooltip_font => $::FONT_PROP, 4033 tooltip_font => $::FONT_PROP,
3492 tooltip_width => 0.67, 4034 tooltip_width => 0.67,
3493 fontsize => $item->{fontsize} || $self->{fontsize}, 4035 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3572 $self->SUPER::destroy; 4114 $self->SUPER::destroy;
3573} 4115}
3574 4116
3575############################################################################# 4117#############################################################################
3576 4118
3577package CFClient::UI::Inventory;
3578
3579our @ISA = CFClient::UI::Table::;
3580
3581sub new {
3582 my $class = shift;
3583
3584 my $self = $class->SUPER::new (
3585 col_expand => [0, 1, 0],
3586 items => [],
3587 @_,
3588 );
3589
3590 $self->set_sort_order (undef);
3591
3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFClient::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3628}
3629
3630sub set_items {
3631 my ($self, $items) = @_;
3632
3633 $self->{items} = [$items ? values %$items : ()];
3634 $self->update_items;
3635}
3636
3637#############################################################################
3638
3639package CFClient::UI::SpellList;
3640
3641our @ISA = CFClient::UI::Table::;
3642
3643sub new {
3644 my $class = shift;
3645
3646 my $self = $class->SUPER::new (
3647 binding => [],
3648 commands => [],
3649 @_,
3650 )
3651}
3652
3653my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666sub rebuild_spell_list {
3667 my ($self) = @_;
3668
3669 $CFClient::UI::ROOT->on_refresh ($self => sub {
3670 $self->clear;
3671
3672 return unless $::CONN;
3673
3674 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680 my $row = 0;
3681
3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683 my $spell = $self->{spell}{$_};
3684
3685 $row++;
3686
3687 my $spell_cb = sub {
3688 my ($widget, $ev) = @_;
3689
3690 if ($ev->{button} == 1) {
3691 $::CONN->user_send ("cast $spell->{name}");
3692 } elsif ($ev->{button} == 2) {
3693 $::CONN->user_send ("invoke $spell->{name}");
3694 } elsif ($ev->{button} == 3) {
3695 (new CFClient::UI::Menu
3696 items => [
3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699 ],
3700 )->popup ($ev);
3701 } else {
3702 return 0;
3703 }
3704
3705 1
3706 };
3707
3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710 #TODO: add path info to tooltip
3711 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3712
3713 $self->add (0, $row, new CFClient::UI::Face
3714 face => $spell->{face},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (1, $row, new CFClient::UI::Label
3722 expand => 1,
3723 text => $spell->{name},
3724 can_hover => 1,
3725 can_events => 1,
3726 tooltip => $tooltip,
3727 on_button_down => $spell_cb,
3728 );
3729
3730 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734 }
3735 });
3736}
3737
3738sub add_spell {
3739 my ($self, $spell) = @_;
3740
3741 $self->{spell}->{$spell->{name}} = $spell;
3742 $self->rebuild_spell_list;
3743}
3744
3745sub remove_spell {
3746 my ($self, $spell) = @_;
3747
3748 delete $self->{spell}->{$spell->{name}};
3749 $self->rebuild_spell_list;
3750}
3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3759#############################################################################
3760
3761package CFClient::UI::Root; 4119package CFPlus::UI::Root;
3762 4120
3763our @ISA = CFClient::UI::Container::; 4121our @ISA = CFPlus::UI::Container::;
3764 4122
3765use List::Util qw(min max); 4123use List::Util qw(min max);
3766 4124
3767use CFClient::OpenGL; 4125use CFPlus::OpenGL;
3768 4126
3769sub new { 4127sub new {
3770 my $class = shift; 4128 my $class = shift;
3771 4129
3772 my $self = $class->SUPER::new ( 4130 my $self = $class->SUPER::new (
3773 visible => 1, 4131 visible => 1,
3774 @_, 4132 @_,
3775 ); 4133 );
3776 4134
3777 Scalar::Util::weaken ($self->{root} = $self); 4135 CFPlus::weaken ($self->{root} = $self);
3778 4136
3779 $self 4137 $self
3780} 4138}
3781 4139
3782sub size_request { 4140sub size_request {
… …
3877 while ($self->{refresh_hook}) { 4235 while ($self->{refresh_hook}) {
3878 $_->() 4236 $_->()
3879 for values %{delete $self->{refresh_hook}}; 4237 for values %{delete $self->{refresh_hook}};
3880 } 4238 }
3881 4239
3882 if ($self->{realloc}) { 4240 while ($self->{realloc}) {
3883 my %queue; 4241 my %queue;
3884 my @queue; 4242 my @queue;
3885 my $widget; 4243 my $widget;
3886 4244
3887 outer: 4245 outer:
… …
3934 } 4292 }
3935 } 4293 }
3936 4294
3937 delete $self->{realloc}{$widget+0}; 4295 delete $self->{realloc}{$widget+0};
3938 } 4296 }
3939 }
3940 4297
3941 while (my $size_alloc = delete $self->{size_alloc}) { 4298 while (my $size_alloc = delete $self->{size_alloc}) {
3942 my @queue = sort { $b->{visible} <=> $a->{visible} } 4299 my @queue = sort { $a->{visible} <=> $b->{visible} }
3943 values %$size_alloc; 4300 values %$size_alloc;
3944 4301
3945 while () { 4302 while () {
3946 my $widget = pop @queue || last; 4303 my $widget = pop @queue || last;
3947 4304
3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4305 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3949 4306
3950 $w = 0 if $w < 0;
3951 $h = 0 if $h < 0;
3952
3953 $w = max $widget->{min_w}, $w; 4307 $w = max $widget->{min_w}, $w;
3954 $h = max $widget->{min_h}, $h; 4308 $h = max $widget->{min_h}, $h;
3955 4309
3956# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4310# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4311# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958 4312
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4313 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4314 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961 4315
3962 $w = int $w + 0.5; 4316 $w = int $w + 0.5;
3963 $h = int $h + 0.5; 4317 $h = int $h + 0.5;
3964 4318
3965 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4319 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3966 $widget->{old_w} = $widget->{w}; 4320 $widget->{old_w} = $widget->{w};
3967 $widget->{old_h} = $widget->{h}; 4321 $widget->{old_h} = $widget->{h};
3968 4322
3969 $widget->{w} = $w; 4323 $widget->{w} = $w;
3970 $widget->{h} = $h; 4324 $widget->{h} = $h;
3971 4325
3972 $widget->emit (size_allocate => $w, $h); 4326 $widget->emit (size_allocate => $w, $h);
4327 }
3973 } 4328 }
3974 } 4329 }
3975 } 4330 }
3976 4331
3977 while ($self->{post_alloc_hook}) { 4332 while ($self->{post_alloc_hook}) {
3978 $_->() 4333 $_->()
3979 for values %{delete $self->{post_alloc_hook}}; 4334 for values %{delete $self->{post_alloc_hook}};
3980 } 4335 }
3981
3982 4336
3983 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4337 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3984 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4338 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3985 glClear GL_COLOR_BUFFER_BIT; 4339 glClear GL_COLOR_BUFFER_BIT;
3986 4340
… …
3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4343 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3990 glMatrixMode GL_MODELVIEW; 4344 glMatrixMode GL_MODELVIEW;
3991 glLoadIdentity; 4345 glLoadIdentity;
3992 4346
3993 { 4347 {
3994 package CFClient::UI::Base; 4348 package CFPlus::UI::Base;
3995 4349
3996 ($draw_x, $draw_y, $draw_w, $draw_h) = 4350 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997 (0, 0, $self->{w}, $self->{h}); 4351 (0, 0, $self->{w}, $self->{h});
3998 }
3999 4352
4000 $self->_draw; 4353 $self->_draw;
4354 }
4001} 4355}
4002 4356
4003############################################################################# 4357#############################################################################
4004 4358
4005package CFClient::UI; 4359package CFPlus::UI;
4006 4360
4007$ROOT = new CFClient::UI::Root; 4361$ROOT = new CFPlus::UI::Root;
4008$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4362$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4009 4363
40101 43641
4011 4365

Diff Legend

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