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.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC

26 26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/; 27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/; 28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w}; 29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h}; 30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
31 } 33 }
32 34
33 $layout 35 $layout
34} 36}
35 37
36sub set_layout { 38sub set_layout {
37 my ($layout) = @_; 39 my ($layout) = @_;
40
38 $LAYOUT = $layout; 41 $LAYOUT = $layout;
39} 42}
40 43
41sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
42 if (!$GRAB) { 47 if (!$GRAB) {
43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
44 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
45
46 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide; 51 $TOOLTIP->hide;
48 52
49 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
50 54
167sub rescale_widgets { 171sub rescale_widgets {
168 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
169 173
170 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
171 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
172 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174 178
175 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
177 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
178 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
179 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
180 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
181 185
182 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184 188
185 } 189 }
186 } 190 }
187 191
188 reconfigure_widgets; 192 reconfigure_widgets;
207 h => undef, 211 h => undef,
208 can_events => 1, 212 can_events => 1,
209 @_ 213 @_
210 }, $class; 214 }, $class;
211 215
212 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220 }
221
222 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223 217
224 for (keys %$self) { 218 for (keys %$self) {
225 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
226 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
227 } 221 }
228 } 222 }
229 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
230 $self 236 $self
231} 237}
232 238
233sub destroy { 239sub destroy {
234 my ($self) = @_; 240 my ($self) = @_;
350 $self->{x} = $x; 356 $self->{x} = $x;
351 $self->{y} = $y; 357 $self->{y} = $y;
352 $self->update; 358 $self->update;
353 } 359 }
354 360
355 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
356 return unless $self->{visible}; 362 return unless $self->{visible};
357 363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 367 $self->{root}{size_alloc}{$self+0} = $self;
359 } 368 }
360} 369}
361 370
362sub size_allocate { 371sub size_allocate {
363 # nothing to be done 372 # nothing to be done
364} 373}
365 374
366sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
367} 381}
368 382
369sub set_max_size { 383sub set_max_size {
370 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
371 385
430 444
431 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
432 unless $FOCUS; 446 unless $FOCUS;
433} 447}
434 448
435sub mouse_motion { } 449sub mouse_motion { 0 }
436sub button_up { } 450sub button_up { 0 }
437sub key_down { } 451sub key_down { 0 }
438sub key_up { } 452sub key_up { 0 }
439 453
440sub button_down { 454sub button_down {
441 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
442 456
443 $self->focus_in; 457 $self->focus_in;
444}
445 458
446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
450sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
451 461
452sub find_widget { 462sub find_widget {
453 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
454 464
455 return () unless $self->{can_events}; 465 return () unless $self->{can_events};
463 473
464sub set_parent { 474sub set_parent {
465 my ($self, $parent) = @_; 475 my ($self, $parent) = @_;
466 476
467 Scalar::Util::weaken ($self->{parent} = $parent); 477 Scalar::Util::weaken ($self->{parent} = $parent);
468
469 $self->set_visible if $parent->{visible}; 478 $self->set_visible if $parent->{visible};
470} 479}
471 480
472sub connect { 481sub connect {
473 my ($self, $signal, $cb) = @_; 482 my ($self, $signal, $cb) = @_;
494 503
495sub realloc { 504sub realloc {
496 my ($self) = @_; 505 my ($self) = @_;
497 506
498 if ($self->{visible}) { 507 if ($self->{visible}) {
499 return if $self->{root}{realloc}{$self}; 508 return if $self->{root}{realloc}{$self+0};
500 509
501 $self->{root}{realloc}{$self} = $self; 510 $self->{root}{realloc}{$self+0} = $self;
502 $self->{root}->update; 511 $self->{root}->update;
503 } else { 512 } else {
504 delete $self->{req_w}; 513 delete $self->{req_w};
514 delete $self->{req_h};
505 } 515 }
506} 516}
507 517
508sub update { 518sub update {
509 my ($self) = @_; 519 my ($self) = @_;
517 527
518 $self->realloc; 528 $self->realloc;
519 $self->update; 529 $self->update;
520} 530}
521 531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535
522sub draw { 536sub draw {
523 my ($self) = @_; 537 my ($self) = @_;
524 538
525 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
526 550
527 glPushMatrix; 551 glPushMatrix;
528 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
529 $self->_draw;
530 glPopMatrix;
531 553
532 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
533 my ($x, $y) = @$self{qw(x y)};
534
535 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
536 glEnable GL_BLEND; 556 glEnable GL_BLEND;
537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538 glBegin GL_QUADS; 558 glBegin GL_QUADS;
539 glVertex $x , $y; 559 glVertex 0 , 0;
540 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
541 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
542 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
543 glEnd; 563 glEnd;
544 glDisable GL_BLEND; 564 glDisable GL_BLEND;
545 } 565 }
546 566
547 if ($ENV{CFPLUS_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
548 glPushMatrix; 568 glPushMatrix;
549 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
551 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
552 glVertex 0 , 0; 572 glVertex 0 , 0;
553 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
554 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
555 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
556 glEnd; 576 glEnd;
557 glPopMatrix; 577 glPopMatrix;
558 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
559 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
560} 583}
561 584
562sub _draw { 585sub _draw {
563 my ($self) = @_; 586 my ($self) = @_;
564 587
602 625
603 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
604 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
605 628
606 glEnable GL_BLEND; 629 glEnable GL_BLEND;
607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
608 glColor @$color; 631 glColor_premultiply @$color;
609 632
610 glBegin GL_QUADS; 633 glBegin GL_QUADS;
611 glVertex 0 , 0; 634 glVertex 0 , 0;
612 glVertex 0 , $h; 635 glVertex 0 , $h;
613 glVertex $w, $h; 636 glVertex $w, $h;
644our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
645 668
646sub new { 669sub new {
647 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
648 671
649 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
650 673
651 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
652 children => [], 675 children => [],
653 can_events => 0, 676 can_events => 0,
654 %arg, 677 %arg,
655 ); 678 );
679
656 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
657 682
658 $self 683 $self
659} 684}
660 685
661sub add { 686sub add {
709 $x -= $self->{x}; 734 $x -= $self->{x};
710 $y -= $self->{y}; 735 $y -= $self->{y};
711 736
712 my $res; 737 my $res;
713 738
714 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
715 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
716 and return $res; 741 and return $res;
717 } 742 }
718 743
719 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
761sub size_request { 786sub size_request {
762 $_[0]{children}[0]->size_request 787 $_[0]{children}[0]->size_request
763} 788}
764 789
765sub size_allocate { 790sub size_allocate {
766 my ($self, $w, $h, $changed) = @_; 791 my ($self, $w, $h) = @_;
767 792
768 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
769} 794}
770 795
771############################################################################# 796#############################################################################
797
798# back-buffered drawing area
772 799
773package CFClient::UI::Window; 800package CFClient::UI::Window;
774 801
775our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
776 803
788 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 815 $ROOT->on_post_alloc ($self => sub { $self->render_child });
789 $self->SUPER::update; 816 $self->SUPER::update;
790} 817}
791 818
792sub size_allocate { 819sub size_allocate {
793 my ($self, $w, $h, $changed) = @_; 820 my ($self, $w, $h) = @_;
794 821
795 $self->SUPER::size_allocate ($w, $h, $changed); 822 $self->SUPER::size_allocate ($w, $h);
796 $self->update 823 $self->update;
797 if $changed;
798} 824}
799 825
800sub _render { 826sub _render {
827 my ($self) = @_;
828
801 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
802} 830}
803 831
804sub render_child { 832sub render_child {
805 my ($self) = @_; 833 my ($self) = @_;
806 834
807 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
808 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
809 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
810 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
811 $self->_render; 846 $self->_render;
812 }; 847 };
813} 848}
814 849
815sub _draw { 850sub _draw {
816 my ($self) = @_; 851 my ($self) = @_;
817 852
818 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
819 854
820 my $tex = $self->{texture} 855 my $tex = $self->{texture}
821 or return; 856 or return;
822 857
823 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
825 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
826 861
827 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
828 863
829 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
830} 865}
846} 881}
847 882
848sub size_request { 883sub size_request {
849 my ($self) = @_; 884 my ($self) = @_;
850 885
851 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852 887
853 $w = 10 if $self->{scroll_x}; 888 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
855 890
856 ($w, $h) 891 ($w, $h)
857} 892}
858 893
859sub size_allocate { 894sub size_allocate {
860 my ($self, $w, $h, $changed) = @_; 895 my ($self, $w, $h) = @_;
861 896
897 my $child = $self->child;
898
862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864 901
865 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
866 $self->update; 903 $self->update;
867} 904}
868 905
904} 941}
905 942
906sub _render { 943sub _render {
907 my ($self) = @_; 944 my ($self) = @_;
908 945
946 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
947 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
948
909 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910 950
911 $self->SUPER::_render; 951 $self->SUPER::_render;
912} 952}
913 953
916package CFClient::UI::ScrolledWindow; 956package CFClient::UI::ScrolledWindow;
917 957
918our @ISA = CFClient::UI::HBox::; 958our @ISA = CFClient::UI::HBox::;
919 959
920sub new { 960sub new {
921 my $class = shift; 961 my ($class, %arg) = @_;
962
963 my $child = delete $arg{child};
922 964
923 my $self; 965 my $self;
924 966
925 my $slider = new CFClient::UI::Slider 967 my $slider = new CFClient::UI::Slider
926 vertical => 1, 968 vertical => 1,
931 ; 973 ;
932 974
933 $self = $class->SUPER::new ( 975 $self = $class->SUPER::new (
934 vp => (new CFClient::UI::ViewPort expand => 1), 976 vp => (new CFClient::UI::ViewPort expand => 1),
935 slider => $slider, 977 slider => $slider,
936 @_, 978 %arg,
937 ); 979 );
938 980
939 $self->{vp}->add ($self->{scrolled});
940 $self->add ($self->{vp});
941 $self->add ($self->{slider}); 981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
942 983
943 $self 984 $self
985}
986
987sub add {
988 my ($self, $widget) = @_;
989
990 $self->{vp}->add ($self->{child} = $widget);
944} 991}
945 992
946sub update { 993sub update {
947 my ($self) = @_; 994 my ($self) = @_;
948 995
952 my $child = $self->{vp}->child; 999 my $child = $self->{vp}->child;
953 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1000 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954} 1001}
955 1002
956sub size_allocate { 1003sub size_allocate {
957 my ($self, $w, $h, $changed) = @_; 1004 my ($self, $w, $h) = @_;
958 1005
959 $self->SUPER::size_allocate ($w, $h, $changed); 1006 $self->SUPER::size_allocate ($w, $h);
960 1007
961 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 1010}
964 1011
987 1034
988 if ($self->{bg}) { 1035 if ($self->{bg}) {
989 my ($w, $h) = @$self{qw(w h)}; 1036 my ($w, $h) = @$self{qw(w h)};
990 1037
991 glEnable GL_BLEND; 1038 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1039 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
993 glColor @{ $self->{bg} }; 1040 glColor_premultiply @{ $self->{bg} };
994 1041
995 glBegin GL_QUADS; 1042 glBegin GL_QUADS;
996 glVertex 0 , 0; 1043 glVertex 0 , 0;
997 glVertex 0 , $h; 1044 glVertex 0 , $h;
998 glVertex $w, $h; 1045 glVertex $w, $h;
1020my @border = 1067my @border =
1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1022 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023 1070
1024sub new { 1071sub new {
1025 my $class = shift; 1072 my ($class, %arg) = @_;
1073
1074 my $title = delete $arg{title};
1026 1075
1027 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1028 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1029 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1030 border => 0.6, 1079 border => 0.6,
1031 is_toplevel => 1,
1032 can_events => 1, 1080 can_events => 1,
1033 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
1034 ); 1084 );
1035 1085
1036 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
1037 align => 0, 1087 align => 0,
1038 valign => 1, 1088 valign => 1,
1039 text => $self->{title}, 1089 text => $title,
1040 fontsize => $self->{border}; 1090 fontsize => $self->{border}
1091 if defined $title;
1041 1092
1042 $self 1093 $self
1094}
1095
1096sub add {
1097 my ($self, @widgets) = @_;
1098
1099 $self->SUPER::add (@widgets);
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1043} 1101}
1044 1102
1045sub border { 1103sub border {
1046 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
1047} 1105}
1048 1106
1049sub size_request { 1107sub size_request {
1050 my ($self) = @_; 1108 my ($self) = @_;
1109
1110 $self->{title}->size_request
1111 if $self->{title};
1051 1112
1052 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
1053 1114
1054 ( 1115 (
1055 $w + $self->border * 2, 1116 $w + $self->border * 2,
1056 $h + $self->border * 2, 1117 $h + $self->border * 2,
1057 ) 1118 )
1058} 1119}
1059 1120
1060sub size_allocate { 1121sub size_allocate {
1061 my ($self, $w, $h, $changed) = @_; 1122 my ($self, $w, $h) = @_;
1062 1123
1063 return unless $changed; 1124 if ($self->{title}) {
1125 $self->{title}{w} = $w;
1126 $self->{title}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h);
1128 }
1064 1129
1130 my $border = $self->border;
1131
1065 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
1066 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
1067 1134
1068 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1069 if $self->{title};
1070
1071 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
1072} 1136}
1073 1137
1074sub button_down { 1138sub button_down {
1075 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
1076 1140
1095 my $dy = $ev->{y} - $oy; 1159 my $dy = $ev->{y} - $oy;
1096 1160
1097 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1098 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1099 1163
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1100 $self->realloc; 1165 $self->realloc;
1101 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1102 }; 1166 };
1103 1167
1104 } elsif ($lr ^ $td) { 1168 } elsif ($lr ^ $td) {
1105 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1106 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
1109 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
1110 1174
1111 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
1112 1176
1113 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1178 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1114 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
1115 } 1185 1
1116} 1186}
1117 1187
1118sub button_up { 1188sub button_up {
1119 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
1120 1190
1121 delete $self->{motion}; 1191 !!delete $self->{motion}
1122} 1192}
1123 1193
1124sub mouse_motion { 1194sub mouse_motion {
1125 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
1126 1196
1127 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
1128} 1200}
1129 1201
1130sub _draw { 1202sub _draw {
1131 my ($self) = @_; 1203 my ($self) = @_;
1132 1204
1205 my $child = $self->{children}[0];
1206
1133 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
1134 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
1135 1209
1136 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
1137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1138 1212
1139 my $border = $self->border; 1213 my $border = $self->border;
1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 } 1229 }
1156 1230
1157 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
1158 1232
1159 $self->{title}->draw if $self->{title};
1160
1161 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
1162} 1239}
1163 1240
1164############################################################################# 1241#############################################################################
1165 1242
1166package CFClient::UI::Table; 1243package CFClient::UI::Table;
1240 (sum @$hs), 1317 (sum @$hs),
1241 ) 1318 )
1242} 1319}
1243 1320
1244sub size_allocate { 1321sub size_allocate {
1245 my ($self, $w, $h, $changed) = @_; 1322 my ($self, $w, $h) = @_;
1246 1323
1247 my ($ws, $hs) = $self->get_wh; 1324 my ($ws, $hs) = $self->get_wh;
1248 1325
1249 my $req_w = (sum @$ws) || 1; 1326 my $req_w = (sum @$ws) || 1;
1250 my $req_h = (sum @$hs) || 1; 1327 my $req_h = (sum @$hs) || 1;
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 ) 1406 )
1330} 1407}
1331 1408
1332sub size_allocate { 1409sub size_allocate {
1333 my ($self, $w, $h, $changed) = @_; 1410 my ($self, $w, $h) = @_;
1334 1411
1335 my $space = $self->{vertical} ? $h : $w; 1412 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children}; 1413 my $children = $self->{children};
1337 1414
1338 my @req; 1415 my @req;
1421 ellipsise => 3, # end 1498 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1499 layout => (new CFClient::Layout),
1423 fontsize => 1, 1500 fontsize => 1,
1424 align => -1, 1501 align => -1,
1425 valign => -1, 1502 valign => -1,
1426 padding => 2, 1503 padding_x => 2,
1504 padding_y => 2,
1427 can_events => 0, 1505 can_events => 0,
1428 %arg 1506 %arg
1429 ); 1507 );
1430 1508
1431 if (exists $self->{template}) { 1509 if (exists $self->{template}) {
1507 1585
1508 $w = List::Util::max $w, $w2; 1586 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1587 $h = List::Util::max $h, $h2;
1510 } 1588 }
1511 1589
1512 ( 1590 ($w, $h)
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1591}
1517 1592
1518sub size_allocate { 1593sub size_allocate {
1519 my ($self, $w, $h, $changed) = @_; 1594 my ($self, $w, $h) = @_;
1595
1596 delete $self->{ox};
1520 1597
1521 delete $self->{texture} 1598 delete $self->{texture}
1522 if $changed; 1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1523} 1600}
1524 1601
1525sub set_fontsize { 1602sub set_fontsize {
1526 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1527 1604
1542 $self->{layout}->set_width ($self->{w}); 1619 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1620 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1623
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1624 new_from_layout CFClient::Texture $self->{layout}
1625 };
1548 1626
1627 unless (exists $self->{ox}) {
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551 : ($self->{w} - $tex->{w}) * 0.5); 1630 : ($self->{w} - $tex->{w}) * 0.5);
1552 1631
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555 : ($self->{h} - $tex->{h}) * 0.5); 1634 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1635 };
1559 1636
1560 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562 1639
1640 glColor_premultiply @{$self->{fg}}
1563 if ($tex->{format} == GL_ALPHA) { 1641 if $tex->{format} == GL_ALPHA;
1564 glColor @{$self->{fg}}; 1642
1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1566 } else {
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568 }
1569 1644
1570 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1571} 1646}
1572 1647
1573############################################################################# 1648#############################################################################
1600 1675
1601 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1602 1677
1603 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1604 1679
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1681 $self->{text} = $text;
1609 1682
1610 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1612 1685
1613 $self->_emit (changed => $self->{text}); 1686 $self->_emit (changed => $self->{text});
1687 $self->update;
1614} 1688}
1615 1689
1616sub set_text { 1690sub set_text {
1617 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1618 1692
1657 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1733 $self->_emit ('escape');
1660 } elsif ($uni) { 1734 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1662 } 1738 }
1663 1739
1664 $self->_set_text ($text); 1740 $self->_set_text ($text);
1665 1741
1666 $self->realloc; 1742 $self->realloc;
1743
1744 1
1667} 1745}
1668 1746
1669sub focus_in { 1747sub focus_in {
1670 my ($self) = @_; 1748 my ($self) = @_;
1671 1749
1686 utf8::encode $text; 1764 utf8::encode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1688 1766
1689 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1690 $self->update; 1768 $self->update;
1769
1770 1
1691} 1771}
1692 1772
1693sub mouse_motion { 1773sub mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1695# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1696} 1778}
1697 1779
1698sub _draw { 1780sub _draw {
1699 my ($self) = @_; 1781 my ($self) = @_;
1700 1782
1701 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1702 1784
1703 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1706 } else { 1788 } else {
1707 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1708 } 1790 }
1709 1791
1710 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1795 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
1777 } else { 1859 } else {
1778 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1779 } 1861 }
1780 1862
1781 } else { 1863 } else {
1782 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1783 } 1867 1
1784
1785} 1868}
1786 1869
1787############################################################################# 1870#############################################################################
1788 1871
1789package CFClient::UI::Button; 1872package CFClient::UI::Button;
1798 1881
1799sub new { 1882sub new {
1800 my $class = shift; 1883 my $class = shift;
1801 1884
1802 $class->SUPER::new ( 1885 $class->SUPER::new (
1803 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1804 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1806 can_hover => 1, 1890 can_hover => 1,
1807 align => 0, 1891 align => 0,
1808 valign => 0, 1892 valign => 0,
1817 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1818 1902
1819 $self->emit ("activate") 1903 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 1905 && $y >= 0 && $y < $self->{h};
1906
1907 1
1822} 1908}
1823 1909
1824sub _draw { 1910sub _draw {
1825 my ($self) = @_; 1911 my ($self) = @_;
1826 1912
1827 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 1914
1833 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1836 1918
1855 1937
1856sub new { 1938sub new {
1857 my $class = shift; 1939 my $class = shift;
1858 1940
1859 $class->SUPER::new ( 1941 $class->SUPER::new (
1860 padding => 2, 1942 padding_x => 2,
1943 padding_y => 2,
1861 fg => [1, 1, 1], 1944 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 1945 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 1946 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 1947 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 1948 state => 0,
1869} 1952}
1870 1953
1871sub size_request { 1954sub size_request {
1872 my ($self) = @_; 1955 my ($self) = @_;
1873 1956
1874 ($self->{padding} * 2 + 6) x 2 1957 (6) x 2
1875} 1958}
1876 1959
1877sub button_down { 1960sub button_down {
1878 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1879 1962
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1883 $self->_emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1884 } 1971 1
1885} 1972}
1886 1973
1887sub _draw { 1974sub _draw {
1888 my ($self) = @_; 1975 my ($self) = @_;
1889 1976
1890 $self->SUPER::_draw; 1977 $self->SUPER::_draw;
1891 1978
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 1980
1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1981 my ($w, $h) = @$self{qw(w h)};
1982
1983 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895 1984
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1985 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 1986
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1987 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 1988
2054 2143
2055 my $h1 = $self->{h} * (1 - $ycut1); 2144 my $h1 = $self->{h} * (1 - $ycut1);
2056 my $h2 = $self->{h} * (1 - $ycut2); 2145 my $h2 = $self->{h} * (1 - $ycut2);
2057 2146
2058 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
2059 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2152
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
2164 fg => [1, 1, 1], 2254 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2255 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2256 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2257 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2258 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2259 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2260 min_h => $::WIDTH / 80,
2171 vertical => 0, 2261 vertical => 0,
2172 can_hover => 1, 2262 can_hover => 1,
2173 inner_pad => 0.02, 2263 inner_pad => 0.02,
2174 @_ 2264 @_
2175 ); 2265 );
2215} 2305}
2216 2306
2217sub size_request { 2307sub size_request {
2218 my ($self) = @_; 2308 my ($self) = @_;
2219 2309
2220 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
2221 my $h = $self->{req_h};
2222
2223 $self->{vertical} ? ($h, $w) : ($w, $h)
2224} 2311}
2225 2312
2226sub button_down { 2313sub button_down {
2227 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
2228 2315
2229 $self->SUPER::button_down ($ev, $x, $y); 2316 $self->SUPER::button_down ($ev, $x, $y);
2230 2317
2231 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232 2319
2233 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
2234} 2321}
2235 2322
2236sub mouse_motion { 2323sub mouse_motion {
2237 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
2238 2325
2242 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2329 my (undef, $lo, $hi, $page) = @{$self->{range}};
2243 2330
2244 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2331 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245 2332
2246 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2333 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2334 } else {
2335 return 0;
2336 }
2337
2247 } 2338 1
2248} 2339}
2249 2340
2250sub update { 2341sub update {
2251 my ($self) = @_; 2342 my ($self) = @_;
2252 2343
2253 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2344 delete $self->{knob_w};
2345 $self->SUPER::update;
2346}
2347
2348sub _draw {
2349 my ($self) = @_;
2350
2351 unless ($self->{knob_w}) {
2254 $self->set_value ($self->{range}[0]); 2352 $self->set_value ($self->{range}[0]);
2255 2353
2256 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100; 2355 my $range = ($hi - $page - $lo) || 1e-100;
2258 2356
2264 $value = ($value - $lo) / $range; 2362 $value = ($value - $lo) / $range;
2265 $value = $value * $self->{scale} + $self->{offset}; 2363 $value = $value * $self->{scale} + $self->{offset};
2266 2364
2267 $self->{knob_x} = $value - $knob_w * 0.5; 2365 $self->{knob_x} = $value - $knob_w * 0.5;
2268 $self->{knob_w} = $knob_w; 2366 $self->{knob_w} = $knob_w;
2269 }); 2367 }
2270
2271 $self->SUPER::update;
2272}
2273
2274sub _draw {
2275 my ($self) = @_;
2276 2368
2277 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
2278 2370
2279 glScale $self->{w}, $self->{h}; 2371 glScale $self->{w}, $self->{h};
2280 2372
2378 $self->{fontsize} = $fontsize; 2470 $self->{fontsize} = $fontsize;
2379 $self->reflow; 2471 $self->reflow;
2380} 2472}
2381 2473
2382sub size_allocate { 2474sub size_allocate {
2383 my ($self, $w, $h, $changed) = @_; 2475 my ($self, $w, $h) = @_;
2384 2476
2385 $self->SUPER::size_allocate ($w, $h, $changed); 2477 $self->SUPER::size_allocate ($w, $h);
2386
2387 return unless $changed;
2388 2478
2389 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2479 $self->{layout}->set_font ($self->{font}) if $self->{font};
2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $self->{layout}->set_width ($self->{children}[0]{w}); 2481 $self->{layout}->set_width ($self->{children}[0]{w});
2392 2482
2476 2566
2477 delete $self->{texture}; 2567 delete $self->{texture};
2478 } 2568 }
2479 2569
2480 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2481 glClearColor 0.5, 0.5, 0.5, 0; 2571 glClearColor 0, 0, 0, 0;
2482 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
2483 2573
2484 my $top = int $self->{children}[1]{range}[0]; 2574 my $top = int $self->{children}[1]{range}[0];
2485 2575
2486 my $y0 = $top; 2576 my $y0 = $top;
2521sub _draw { 2611sub _draw {
2522 my ($self) = @_; 2612 my ($self) = @_;
2523 2613
2524 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2526 glColor 1, 1, 1, 1; 2616 glColor 0, 0, 0, 1;
2527 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2528 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
2529 2619
2530 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
2531 2621
2532} 2622}
2615} 2705}
2616 2706
2617sub set_tooltip_from { 2707sub set_tooltip_from {
2618 my ($self, $widget) = @_; 2708 my ($self, $widget) = @_;
2619 2709
2710 my $tooltip = $widget->{tooltip};
2711
2712 if ($ENV{CFPLUS_DEBUG} & 2) {
2713 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}";
2717 }
2718
2620 $self->add (new CFClient::UI::Label 2719 $self->add (new CFClient::UI::Label
2621 markup => $widget->{tooltip}, 2720 markup => $tooltip,
2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623 fontsize => 0.8, 2722 fontsize => 0.8,
2624 fg => [0, 0, 0, 1], 2723 fg => [0, 0, 0, 1],
2625 ellipsise => 0, 2724 ellipsise => 0,
2626 font => ($widget->{tooltip_font} || $::FONT_PROP), 2725 font => ($widget->{tooltip_font} || $::FONT_PROP),
2634 2733
2635 ($w + 4, $h + 4) 2734 ($w + 4, $h + 4)
2636} 2735}
2637 2736
2638sub size_allocate { 2737sub size_allocate {
2639 my ($self, $w, $h, $changed) = @_; 2738 my ($self, $w, $h) = @_;
2640 2739
2641 return unless $changed;
2642
2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2740 $self->SUPER::size_allocate ($w - 4, $h - 4);
2644} 2741}
2645 2742
2646sub visibility_change { 2743sub visibility_change {
2647 my ($self, $visible) = @_; 2744 my ($self, $visible) = @_;
2648 2745
2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2753 2850
2754 if ($tex) { 2851 if ($tex) {
2755 glEnable GL_TEXTURE_2D; 2852 glEnable GL_TEXTURE_2D;
2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2757 glColor 1, 1, 1, 1; 2854 glColor 0, 0, 0, 1;
2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2759 glDisable GL_TEXTURE_2D; 2856 glDisable GL_TEXTURE_2D;
2760 } 2857 }
2761} 2858}
2762 2859
2769 $self->SUPER::DESTROY; 2866 $self->SUPER::DESTROY;
2770} 2867}
2771 2868
2772############################################################################# 2869#############################################################################
2773 2870
2774package CFClient::UI::Inventory; 2871package CFClient::UI::Buttonbar;
2775 2872
2776our @ISA = CFClient::UI::ScrolledWindow::; 2873our @ISA = CFClient::UI::HBox::;
2777 2874
2778sub new { 2875# TODO: should actualyl wrap buttons and other goodies.
2779 my $class = shift;
2780
2781 my $self = $class->SUPER::new (
2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783 @_,
2784 );
2785
2786 $self
2787}
2788
2789sub set_items {
2790 my ($self, $items) = @_;
2791
2792 $self->{scrolled}->clear;
2793 return unless $items;
2794
2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2799
2800 $self->{real_items} = \@items;
2801
2802 my $row = 0;
2803 for my $item (@items) {
2804 CFClient::Item::update_widgets $item;
2805
2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810 $row++;
2811 }
2812}
2813 2876
2814############################################################################# 2877#############################################################################
2815 2878
2816package CFClient::UI::Menu; 2879package CFClient::UI::Menu;
2817 2880
2858 # maybe save $GRAB? must be careful about events... 2921 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 2922 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 2923 $self->{button} = $ev->{button};
2861 2924
2862 $self->show; 2925 $self->show;
2863 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864} 2927}
2865 2928
2866sub mouse_motion { 2929sub mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 2930 my ($self, $ev, $x, $y) = @_;
2868 2931
2869 # TODO: should use vbox->find_widget or so 2932 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 2934 $self->{hover} = $self->{item}{$HOVER};
2935
2936 0
2872} 2937}
2873 2938
2874sub button_up { 2939sub button_up {
2875 my ($self, $ev, $x, $y) = @_; 2940 my ($self, $ev, $x, $y) = @_;
2876 2941
2878 undef $GRAB; 2943 undef $GRAB;
2879 $self->hide; 2944 $self->hide;
2880 2945
2881 $self->_emit ("popdown"); 2946 $self->_emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 2947 $self->{hover}[1]->() if $self->{hover};
2948 } else {
2949 return 0
2950 }
2951
2952 1
2953}
2954
2955#############################################################################
2956
2957package CFClient::UI::Multiplexer;
2958
2959our @ISA = CFClient::UI::Container::;
2960
2961sub new {
2962 my $class = shift;
2963
2964 my $self = $class->SUPER::new (
2965 @_,
2966 );
2967
2968 $self->{current} = $self->{children}[0]
2969 if @{ $self->{children} };
2970
2971 $self
2972}
2973
2974sub add {
2975 my ($self, @widgets) = @_;
2976
2977 $self->SUPER::add (@widgets);
2978
2979 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} };
2981}
2982
2983sub set_current_page {
2984 my ($self, $page_or_widget) = @_;
2985
2986 my $widget = ref $page_or_widget
2987 ? $page_or_widget
2988 : $self->{children}[$page_or_widget];
2989
2990 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992
2993 $self->_emit (page_changed => $self->{current});
2994
2995 $self->realloc;
2996}
2997
2998sub visible_children {
2999 $_[0]{current}
3000}
3001
3002sub size_request {
3003 my ($self) = @_;
3004
3005 $self->{current}->size_request
3006}
3007
3008sub size_allocate {
3009 my ($self, $w, $h) = @_;
3010
3011 $self->{current}->configure (0, 0, $w, $h);
3012}
3013
3014sub _draw {
3015 my ($self) = @_;
3016
3017 $self->{current}->draw;
3018}
3019
3020#############################################################################
3021
3022package CFClient::UI::Notebook;
3023
3024our @ISA = CFClient::UI::VBox::;
3025
3026sub new {
3027 my $class = shift;
3028
3029 my $self = $class->SUPER::new (
3030 buttonbar => (new CFClient::UI::Buttonbar),
3031 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3032 # filter => # will be put between multiplexer and $self
3033 @_,
3034 );
2883 } 3035
3036 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3037 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3038
3039 $self
3040}
3041
3042sub add {
3043 my ($self, $title, $widget, $tooltip) = @_;
3044
3045 Scalar::Util::weaken $self;
3046
3047 $self->{buttonbar}->add (new CFClient::UI::Button
3048 markup => $title,
3049 tooltip => $tooltip,
3050 on_activate => sub { $self->set_current_page ($widget) },
3051 );
3052
3053 $self->{multiplexer}->add ($widget);
3054}
3055
3056sub set_current_page {
3057 my ($self, $page) = @_;
3058
3059 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current});
2884} 3061}
2885 3062
2886############################################################################# 3063#############################################################################
2887 3064
2888package CFClient::UI::Statusbox; 3065package CFClient::UI::Statusbox;
2993 $self->SUPER::reconfigure; 3170 $self->SUPER::reconfigure;
2994} 3171}
2995 3172
2996############################################################################# 3173#############################################################################
2997 3174
3175package CFClient::UI::Inventory;
3176
3177our @ISA = CFClient::UI::ScrolledWindow::;
3178
3179sub new {
3180 my $class = shift;
3181
3182 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3184 @_,
3185 );
3186
3187 $self
3188}
3189
3190sub set_items {
3191 my ($self, $items) = @_;
3192
3193 $self->{child}->clear;
3194 return unless $items;
3195
3196 my @items = sort {
3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3200
3201 $self->{real_items} = \@items;
3202
3203 my $row = 0;
3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3206
3207 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3210
3211 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 }
3410}
3411
3412#############################################################################
3413
3414package CFClient::UI::SpellList;
3415
3416our @ISA = CFClient::UI::Table::;
3417
3418sub new {
3419 my $class = shift;
3420
3421 my $self = $class->SUPER::new (
3422 binding => [],
3423 commands => [],
3424 @_,
3425 )
3426}
3427
3428# XXX: Do sorting? Argl...
3429sub add_spell {
3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
3432
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460}
3461
3462sub remove_spell {
3463 my ($self, $spell) = @_;
3464 delete $self->{spells}->{$spell->{name}};
3465 $self->rebuild_spell_list;
3466}
3467
3468#############################################################################
3469
2998package CFClient::UI::Root; 3470package CFClient::UI::Root;
2999 3471
3000our @ISA = CFClient::UI::Container::; 3472our @ISA = CFClient::UI::Container::;
3001 3473
3002use CFClient::OpenGL; 3474use CFClient::OpenGL;
3012 Scalar::Util::weaken ($self->{root} = $self); 3484 Scalar::Util::weaken ($self->{root} = $self);
3013 3485
3014 $self 3486 $self
3015} 3487}
3016 3488
3017sub configure {
3018 my ($self, $x, $y, $w, $h) = @_;
3019
3020 $self->{w} = $w;
3021 $self->{h} = $h;
3022}
3023
3024sub reconfigure {
3025 my ($self) = @_;
3026
3027 $self->SUPER::reconfigure;
3028
3029 $self->size_allocate ($self->{w}, $self->{h}, 1)
3030 if $self->{w};
3031}
3032
3033sub size_request { 3489sub size_request {
3034 my ($self) = @_; 3490 my ($self) = @_;
3035 3491
3036 ($self->{w}, $self->{h}) 3492 ($self->{w}, $self->{h})
3037} 3493}
3049 3505
3050 int $coord + 0.5 3506 int $coord + 0.5
3051} 3507}
3052 3508
3053sub size_allocate { 3509sub size_allocate {
3054 my ($self, $w, $h, $changed) = @_; 3510 my ($self, $w, $h) = @_;
3055 3511
3056 for my $child ($self->children) { 3512 for my $child ($self->children) {
3057 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3058 3514
3059 $X = $child->{force_x} if exists $child->{force_x}; 3515 $X = $child->{force_x} if exists $child->{force_x};
3127 $_->() 3583 $_->()
3128 for values %{delete $self->{refresh_hook}}; 3584 for values %{delete $self->{refresh_hook}};
3129 } 3585 }
3130 3586
3131 if ($self->{realloc}) { 3587 if ($self->{realloc}) {
3588 my %queue;
3132 my @queue; 3589 my @queue;
3590 my $widget;
3133 3591
3592 outer:
3134 while () { 3593 while () {
3135 if ($self->{realloc}) { 3594 if (my $realloc = delete $self->{realloc}) {
3136 #TODO use array-of-depth approach 3595 for $widget (values %$realloc) {
3596 $widget->{visible} or next; # do not resize invisible widgets
3137 3597
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3598 $queue{$widget+0}++ and next; # duplicates are common
3139 @queue, values %{delete $self->{realloc}}; 3599
3600 push @{ $queue[$widget->{visible}] }, $widget;
3601 }
3140 } 3602 }
3141 3603
3604 while () {
3605 @queue or last outer;
3606
3607 $widget = pop @{ $queue[-1] || [] }
3608 and last;
3609
3610 pop @queue;
3611 }
3612
3613 delete $queue{$widget+0};
3614
3615 my ($w, $h) = $widget->size_request;
3616
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3619
3620 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h};
3622
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3624 || delete $widget->{force_realloc}) {
3625 $widget->{req_w} = $w;
3626 $widget->{req_h} = $h;
3627
3628 $self->{size_alloc}{$widget+0} = $widget;
3629
3630 if (my $parent = $widget->{parent}) {
3631 $self->{realloc}{$parent+0} = $parent
3632 unless $queue{$parent+0};
3633
3634 $parent->{force_size_alloc} = 1;
3635 $self->{size_alloc}{$parent+0} = $parent;
3636 }
3637 }
3638
3639 delete $self->{realloc}{$widget+0};
3640 }
3641 }
3642
3643 while (my $size_alloc = delete $self->{size_alloc}) {
3644 my @queue = sort { $b->{visible} <=> $a->{visible} }
3645 values %$size_alloc;
3646
3647 while () {
3142 my $widget = pop @queue || last; 3648 my $widget = pop @queue || last;
3143 3649
3144 $widget->{visible} or last; # do not resize invisible widgets 3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145
3146 my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3147 ? @$widget{qw(force_w force_h)}
3148 : $widget->size_request;
3149
3150 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3151
3152 $w = $min_size if $w < $min_size;
3153 $h = $min_size if $h < $min_size;
3154
3155 $widget->{req_w} = $w;
3156 $widget->{req_h} = $h;
3157
3158 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3159
3160 push @queue, $widget->{parent}
3161 if $widget->{parent};
3162 }
3163 }
3164
3165 while (my $size_alloc = delete $self->{size_alloc}) {
3166 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3167 values %$size_alloc;
3168
3169 while () {
3170 my ($widget, $w, $h) = @{ pop @queue or last };
3171
3172 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3173 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3174 3651
3175 $w = 0 if $w < 0; 3652 $w = 0 if $w < 0;
3176 $h = 0 if $h < 0; 3653 $h = 0 if $h < 0;
3177 3654
3178 $w = int $w + 0.5; 3655 $w = int $w + 0.5;
3179 $h = int $h + 0.5; 3656 $h = int $h + 0.5;
3180 3657
3181 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3658 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3659 $widget->{old_w} = $widget->{w};
3660 $widget->{old_h} = $widget->{h};
3182 3661
3183 $widget->{w} = $w; 3662 $widget->{w} = $w;
3184 $widget->{h} = $h; 3663 $widget->{h} = $h;
3185 3664
3186 $widget->emit (size_allocate => $w, $h, $changed); 3665 $widget->emit (size_allocate => $w, $h);
3666 }
3187 } 3667 }
3188 } 3668 }
3189 3669
3190 while ($self->{post_alloc_hook}) { 3670 while ($self->{post_alloc_hook}) {
3191 $_->() 3671 $_->()
3192 for values %{delete $self->{post_alloc_hook}}; 3672 for values %{delete $self->{post_alloc_hook}};
3193 } 3673 }
3674
3194 3675
3195 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3196 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3197 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
3198 3679
3200 glLoadIdentity; 3681 glLoadIdentity;
3201 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3202 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
3203 glLoadIdentity; 3684 glLoadIdentity;
3204 3685
3686 {
3687 package CFClient::UI::Base;
3688
3689 ($draw_x, $draw_y, $draw_w, $draw_h) =
3690 (0, 0, $self->{w}, $self->{h});
3691 }
3692
3205 $self->_draw; 3693 $self->_draw;
3206} 3694}
3207 3695
3208############################################################################# 3696#############################################################################
3209 3697

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines