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.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC

40 40
41 $LAYOUT = $layout; 41 $LAYOUT = $layout;
42} 42}
43 43
44sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
45 if (!$GRAB) { 47 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide; 51 $TOOLTIP->hide;
51 52
52 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
53 54
170sub rescale_widgets { 171sub rescale_widgets {
171 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
172 173
173 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 178
178 $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.]+$/;
179 $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};
180 $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};
181 $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.]+$/;
182 $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};
183 $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};
184 185
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 188
188 } 189 }
189 } 190 }
190 191
191 reconfigure_widgets; 192 reconfigure_widgets;
219 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
220 } 221 }
221 } 222 }
222 223
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x}; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y}; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w}; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h}; 228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228 229
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231 232
232 $self->show if $layout->{show}; 233 $self->show if $layout->{show};
355 $self->{x} = $x; 356 $self->{x} = $x;
356 $self->{y} = $y; 357 $self->{y} = $y;
357 $self->update; 358 $self->update;
358 } 359 }
359 360
360 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible}; 362 return unless $self->{visible};
362 363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 367 $self->{root}{size_alloc}{$self+0} = $self;
364 } 368 }
365} 369}
366 370
367sub size_allocate { 371sub size_allocate {
368 # nothing to be done 372 # nothing to be done
369} 373}
370 374
371sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
372} 381}
373 382
374sub set_max_size { 383sub set_max_size {
375 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
376 385
377 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
378 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
388
389 $self->realloc;
379} 390}
380 391
381sub set_tooltip { 392sub set_tooltip {
382 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
383 394
435 446
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
437 unless $FOCUS; 448 unless $FOCUS;
438} 449}
439 450
440sub mouse_motion { } 451sub mouse_motion { 0 }
441sub button_up { } 452sub button_up { 0 }
442sub key_down { } 453sub key_down { 0 }
443sub key_up { } 454sub key_up { 0 }
444 455
445sub button_down { 456sub button_down {
446 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
447 458
448 $self->focus_in; 459 $self->focus_in;
449}
450 460
451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
456 463
457sub find_widget { 464sub find_widget {
458 my ($self, $x, $y) = @_; 465 my ($self, $x, $y) = @_;
459 466
460 return () unless $self->{can_events}; 467 return () unless $self->{can_events};
498 505
499sub realloc { 506sub realloc {
500 my ($self) = @_; 507 my ($self) = @_;
501 508
502 if ($self->{visible}) { 509 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self}; 510 return if $self->{root}{realloc}{$self+0};
504 511
505 $self->{root}{realloc}{$self} = $self; 512 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update; 513 $self->{root}->update;
507 } else { 514 } else {
508 delete $self->{req_w}; 515 delete $self->{req_w};
516 delete $self->{req_h};
509 } 517 }
510} 518}
511 519
512sub update { 520sub update {
513 my ($self) = @_; 521 my ($self) = @_;
521 529
522 $self->realloc; 530 $self->realloc;
523 $self->update; 531 $self->update;
524} 532}
525 533
534# using global variables seems a bit hacky, but passing through all drawing
535# functions seems pointless.
536our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
537
526sub draw { 538sub draw {
527 my ($self) = @_; 539 my ($self) = @_;
528 540
529 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548
549 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
530 552
531 glPushMatrix; 553 glPushMatrix;
532 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
533 $self->_draw;
534 glPopMatrix;
535 555
536 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
537 my ($x, $y) = @$self{qw(x y)};
538
539 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
540 glEnable GL_BLEND; 558 glEnable GL_BLEND;
541 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542 glBegin GL_QUADS; 560 glBegin GL_QUADS;
543 glVertex $x , $y; 561 glVertex 0 , 0;
544 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
545 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
546 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
547 glEnd; 565 glEnd;
548 glDisable GL_BLEND; 566 glDisable GL_BLEND;
549 } 567 }
550 568
551 if ($ENV{CFPLUS_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
552 glPushMatrix; 570 glPushMatrix;
553 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
555 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
556 glVertex 0 , 0; 574 glVertex 0 , 0;
557 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
558 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
559 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
560 glEnd; 578 glEnd;
561 glPopMatrix; 579 glPopMatrix;
562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
563 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
564} 585}
565 586
566sub _draw { 587sub _draw {
567 my ($self) = @_; 588 my ($self) = @_;
568 589
606 627
607 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
608 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
609 630
610 glEnable GL_BLEND; 631 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glColor @$color; 633 glColor_premultiply @$color;
613 634
614 glBegin GL_QUADS; 635 glBegin GL_QUADS;
615 glVertex 0 , 0; 636 glVertex 0 , 0;
616 glVertex 0 , $h; 637 glVertex 0 , $h;
617 glVertex $w, $h; 638 glVertex $w, $h;
648our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
649 670
650sub new { 671sub new {
651 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
652 673
653 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
654 675
655 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
656 children => [], 677 children => [],
657 can_events => 0, 678 can_events => 0,
658 %arg, 679 %arg,
659 ); 680 );
681
660 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
661 684
662 $self 685 $self
663} 686}
664 687
665sub add { 688sub add {
713 $x -= $self->{x}; 736 $x -= $self->{x};
714 $y -= $self->{y}; 737 $y -= $self->{y};
715 738
716 my $res; 739 my $res;
717 740
718 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
719 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
720 and return $res; 743 and return $res;
721 } 744 }
722 745
723 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
765sub size_request { 788sub size_request {
766 $_[0]{children}[0]->size_request 789 $_[0]{children}[0]->size_request
767} 790}
768 791
769sub size_allocate { 792sub size_allocate {
770 my ($self, $w, $h, $changed) = @_; 793 my ($self, $w, $h) = @_;
771 794
772 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
773} 796}
774 797
775############################################################################# 798#############################################################################
799
800# back-buffered drawing area
776 801
777package CFClient::UI::Window; 802package CFClient::UI::Window;
778 803
779our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
780 805
792 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 817 $ROOT->on_post_alloc ($self => sub { $self->render_child });
793 $self->SUPER::update; 818 $self->SUPER::update;
794} 819}
795 820
796sub size_allocate { 821sub size_allocate {
797 my ($self, $w, $h, $changed) = @_; 822 my ($self, $w, $h) = @_;
798 823
799 $self->SUPER::size_allocate ($w, $h, $changed); 824 $self->SUPER::size_allocate ($w, $h);
800 $self->update 825 $self->update;
801 if $changed;
802} 826}
803 827
804sub _render { 828sub _render {
829 my ($self) = @_;
830
805 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
806} 832}
807 833
808sub render_child { 834sub render_child {
809 my ($self) = @_; 835 my ($self) = @_;
810 836
811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
812 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
813 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
814 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
815 $self->_render; 848 $self->_render;
816 }; 849 };
817} 850}
818 851
819sub _draw { 852sub _draw {
820 my ($self) = @_; 853 my ($self) = @_;
821 854
822 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
823 856
824 my $tex = $self->{texture} 857 my $tex = $self->{texture}
825 or return; 858 or return;
826 859
827 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
830 863
831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
832 865
833 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
834} 867}
850} 883}
851 884
852sub size_request { 885sub size_request {
853 my ($self) = @_; 886 my ($self) = @_;
854 887
855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856 889
857 $w = 10 if $self->{scroll_x}; 890 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
859 892
860 ($w, $h) 893 ($w, $h)
861} 894}
862 895
863sub size_allocate { 896sub size_allocate {
864 my ($self, $w, $h, $changed) = @_; 897 my ($self, $w, $h) = @_;
865 898
899 my $child = $self->child;
900
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868 903
869 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
870 $self->update; 905 $self->update;
871} 906}
872 907
908} 943}
909 944
910sub _render { 945sub _render {
911 my ($self) = @_; 946 my ($self) = @_;
912 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
913 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914 952
915 $self->SUPER::_render; 953 $self->SUPER::_render;
916} 954}
917 955
920package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
921 959
922our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
923 961
924sub new { 962sub new {
925 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
926 966
927 my $self; 967 my $self;
928 968
929 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
930 vertical => 1, 970 vertical => 1,
935 ; 975 ;
936 976
937 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
938 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
939 slider => $slider, 979 slider => $slider,
940 @_, 980 %arg,
941 ); 981 );
942 982
943 $self->{vp}->add ($self->{scrolled});
944 $self->add ($self->{vp});
945 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
946 985
947 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
948} 993}
949 994
950sub update { 995sub update {
951 my ($self) = @_; 996 my ($self) = @_;
952 997
956 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1003}
959 1004
960sub size_allocate { 1005sub size_allocate {
961 my ($self, $w, $h, $changed) = @_; 1006 my ($self, $w, $h) = @_;
962 1007
963 $self->SUPER::size_allocate ($w, $h, $changed); 1008 $self->SUPER::size_allocate ($w, $h);
964 1009
965 my $child = $self->{vp}->child; 1010 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967} 1012}
968 1013
991 1036
992 if ($self->{bg}) { 1037 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
994 1039
995 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
997 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
998 1043
999 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
1000 glVertex 0 , 0; 1045 glVertex 0 , 0;
1001 glVertex 0 , $h; 1046 glVertex 0 , $h;
1002 glVertex $w, $h; 1047 glVertex $w, $h;
1024my @border = 1069my @border =
1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027 1072
1028sub new { 1073sub new {
1029 my $class = shift; 1074 my ($class, %arg) = @_;
1075
1076 my $title = delete $arg{title};
1030 1077
1031 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1032 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1033 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1034 border => 0.6, 1081 border => 0.6,
1035 can_events => 1, 1082 can_events => 1,
1036 min_w => 16, 1083 min_w => 16,
1037 min_h => 16, 1084 min_h => 16,
1038 @_ 1085 %arg,
1039 ); 1086 );
1040 1087
1041 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
1042 align => 0, 1089 align => 0,
1043 valign => 1, 1090 valign => 1,
1044 text => $self->{title}, 1091 text => $title,
1045 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
1046 1094
1047 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1048} 1103}
1049 1104
1050sub border { 1105sub border {
1051 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1052} 1107}
1053 1108
1054sub size_request { 1109sub size_request {
1055 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
1056 1114
1057 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1058 1116
1059 ( 1117 (
1060 $w + $self->border * 2, 1118 $w + $self->border * 2,
1061 $h + $self->border * 2, 1119 $h + $self->border * 2,
1062 ) 1120 )
1063} 1121}
1064 1122
1065sub size_allocate { 1123sub size_allocate {
1066 my ($self, $w, $h, $changed) = @_; 1124 my ($self, $w, $h) = @_;
1067 1125
1068 return unless $changed; 1126 if ($self->{title}) {
1127 $self->{title}{w} = $w;
1128 $self->{title}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h);
1130 }
1069 1131
1132 my $border = $self->border;
1133
1070 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1071 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1072 1136
1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1074 if $self->{title};
1075
1076 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1077} 1138}
1078 1139
1079sub button_down { 1140sub button_down {
1080 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1081 1142
1100 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1101 1162
1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105 $self->realloc; 1167 $self->realloc;
1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107 }; 1168 };
1108 1169
1109 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1110 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
1114 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1115 1176
1116 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1117 1178
1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1120 } 1187 1
1121} 1188}
1122 1189
1123sub button_up { 1190sub button_up {
1124 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1125 1192
1126 delete $self->{motion}; 1193 !!delete $self->{motion}
1127} 1194}
1128 1195
1129sub mouse_motion { 1196sub mouse_motion {
1130 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1131 1198
1132 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1133} 1202}
1134 1203
1135sub _draw { 1204sub _draw {
1136 my ($self) = @_; 1205 my ($self) = @_;
1137 1206
1207 my $child = $self->{children}[0];
1208
1138 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1140 1211
1141 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143 1214
1144 my $border = $self->border; 1215 my $border = $self->border;
1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 } 1231 }
1161 1232
1162 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1163 1234
1164 $self->{title}->draw if $self->{title};
1165
1166 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1167} 1241}
1168 1242
1169############################################################################# 1243#############################################################################
1170 1244
1171package CFClient::UI::Table; 1245package CFClient::UI::Table;
1245 (sum @$hs), 1319 (sum @$hs),
1246 ) 1320 )
1247} 1321}
1248 1322
1249sub size_allocate { 1323sub size_allocate {
1250 my ($self, $w, $h, $changed) = @_; 1324 my ($self, $w, $h) = @_;
1251 1325
1252 my ($ws, $hs) = $self->get_wh; 1326 my ($ws, $hs) = $self->get_wh;
1253 1327
1254 my $req_w = (sum @$ws) || 1; 1328 my $req_w = (sum @$ws) || 1;
1255 my $req_h = (sum @$hs) || 1; 1329 my $req_h = (sum @$hs) || 1;
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 ) 1408 )
1335} 1409}
1336 1410
1337sub size_allocate { 1411sub size_allocate {
1338 my ($self, $w, $h, $changed) = @_; 1412 my ($self, $w, $h) = @_;
1339 1413
1340 my $space = $self->{vertical} ? $h : $w; 1414 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children}; 1415 my $children = $self->{children};
1342 1416
1343 my @req; 1417 my @req;
1517 1591
1518 ($w, $h) 1592 ($w, $h)
1519} 1593}
1520 1594
1521sub size_allocate { 1595sub size_allocate {
1522 my ($self, $w, $h, $changed) = @_; 1596 my ($self, $w, $h) = @_;
1597
1598 delete $self->{ox};
1523 1599
1524 delete $self->{texture} 1600 delete $self->{texture}
1525 if $changed; 1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1526} 1602}
1527 1603
1528sub set_fontsize { 1604sub set_fontsize {
1529 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1530 1606
1545 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549 1625
1550 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1551 1628
1629 unless (exists $self->{ox}) {
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5); 1632 : ($self->{w} - $tex->{w}) * 0.5);
1555 1633
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5); 1636 : ($self->{h} - $tex->{h}) * 0.5);
1559
1560 $tex
1561 }; 1637 };
1562 1638
1563 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1565 1641
1642 glColor_premultiply @{$self->{fg}}
1566 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1567 glColor @{$self->{fg}}; 1644
1568 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1569 } else {
1570 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1571 }
1572 1646
1573 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1574} 1648}
1575 1649
1576############################################################################# 1650#############################################################################
1603 1677
1604 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1605 1679
1606 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1607 1681
1608 delete $self->{texture};
1609
1610 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1611 $self->{text} = $text; 1683 $self->{text} = $text;
1612 1684
1613 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1614 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1615 1687
1616 $self->_emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1617} 1690}
1618 1691
1619sub set_text { 1692sub set_text {
1620 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1621 1694
1660 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1661 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1662 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1663 } elsif ($uni) { 1736 } elsif ($uni) {
1664 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1665 } 1740 }
1666 1741
1667 $self->_set_text ($text); 1742 $self->_set_text ($text);
1668 1743
1669 $self->realloc; 1744 $self->realloc;
1745
1746 1
1670} 1747}
1671 1748
1672sub focus_in { 1749sub focus_in {
1673 my ($self) = @_; 1750 my ($self) = @_;
1674 1751
1689 utf8::encode $text; 1766 utf8::encode $text;
1690 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1691 1768
1692 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1693 $self->update; 1770 $self->update;
1771
1772 1
1694} 1773}
1695 1774
1696sub mouse_motion { 1775sub mouse_motion {
1697 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1698# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1699} 1780}
1700 1781
1701sub _draw { 1782sub _draw {
1702 my ($self) = @_; 1783 my ($self) = @_;
1703 1784
1704 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1705 1786
1706 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1707 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1708 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1709 } else { 1790 } else {
1710 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1711 } 1792 }
1712 1793
1713 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1716 glVertex 0 , 0; 1797 glVertex 0 , 0;
1717 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1718 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1719 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
1780 } else { 1861 } else {
1781 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1782 } 1863 }
1783 1864
1784 } else { 1865 } else {
1785 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1786 } 1869 1
1787
1788} 1870}
1789 1871
1790############################################################################# 1872#############################################################################
1791 1873
1792package CFClient::UI::Button; 1874package CFClient::UI::Button;
1821 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1822 1904
1823 $self->emit ("activate") 1905 $self->emit ("activate")
1824 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1825 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1826} 1910}
1827 1911
1828sub _draw { 1912sub _draw {
1829 my ($self) = @_; 1913 my ($self) = @_;
1830 1914
1831 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1832
1833 if ($GRAB == $self) {
1834 $self->{fg} = $self->{active_fg};
1835 }
1836 1916
1837 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1840 1920
1884 1964
1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1888 $self->_emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1889 } 1973 1
1890} 1974}
1891 1975
1892sub _draw { 1976sub _draw {
1893 my ($self) = @_; 1977 my ($self) = @_;
1894 1978
2061 2145
2062 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
2063 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
2064 2148
2065 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
2066 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
2068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069 2154
2070 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
2071 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
2232 2317
2233 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2234 2319
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236 2321
2237 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2238} 2323}
2239 2324
2240sub mouse_motion { 2325sub mouse_motion {
2241 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2242 2327
2246 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247 2332
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249 2334
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2335 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2336 } else {
2337 return 0;
2338 }
2339
2251 } 2340 1
2252} 2341}
2253 2342
2254sub update { 2343sub update {
2255 my ($self) = @_; 2344 my ($self) = @_;
2256 2345
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2346 delete $self->{knob_w};
2347 $self->SUPER::update;
2348}
2349
2350sub _draw {
2351 my ($self) = @_;
2352
2353 unless ($self->{knob_w}) {
2258 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2259 2355
2260 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100; 2357 my $range = ($hi - $page - $lo) || 1e-100;
2262 2358
2268 $value = ($value - $lo) / $range; 2364 $value = ($value - $lo) / $range;
2269 $value = $value * $self->{scale} + $self->{offset}; 2365 $value = $value * $self->{scale} + $self->{offset};
2270 2366
2271 $self->{knob_x} = $value - $knob_w * 0.5; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2272 $self->{knob_w} = $knob_w; 2368 $self->{knob_w} = $knob_w;
2273 }); 2369 }
2274
2275 $self->SUPER::update;
2276}
2277
2278sub _draw {
2279 my ($self) = @_;
2280 2370
2281 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2282 2372
2283 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2284 2374
2382 $self->{fontsize} = $fontsize; 2472 $self->{fontsize} = $fontsize;
2383 $self->reflow; 2473 $self->reflow;
2384} 2474}
2385 2475
2386sub size_allocate { 2476sub size_allocate {
2387 my ($self, $w, $h, $changed) = @_; 2477 my ($self, $w, $h) = @_;
2388 2478
2389 $self->SUPER::size_allocate ($w, $h, $changed); 2479 $self->SUPER::size_allocate ($w, $h);
2390
2391 return unless $changed;
2392 2480
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2481 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2483 $self->{layout}->set_width ($self->{children}[0]{w});
2396 2484
2480 2568
2481 delete $self->{texture}; 2569 delete $self->{texture};
2482 } 2570 }
2483 2571
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2487 2575
2488 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2489 2577
2490 my $y0 = $top; 2578 my $y0 = $top;
2525sub _draw { 2613sub _draw {
2526 my ($self) = @_; 2614 my ($self) = @_;
2527 2615
2528 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2533 2621
2534 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2535 2623
2536} 2624}
2619} 2707}
2620 2708
2621sub set_tooltip_from { 2709sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2623 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2624 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2724 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2726 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
2638 2735
2639 ($w + 4, $h + 4) 2736 ($w + 4, $h + 4)
2640} 2737}
2641 2738
2642sub size_allocate { 2739sub size_allocate {
2643 my ($self, $w, $h, $changed) = @_; 2740 my ($self, $w, $h) = @_;
2644 2741
2645 return unless $changed;
2646
2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2648} 2743}
2649 2744
2650sub visibility_change { 2745sub visibility_change {
2651 my ($self, $visible) = @_; 2746 my ($self, $visible) = @_;
2652 2747
2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2757 2852
2758 if ($tex) { 2853 if ($tex) {
2759 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2764 } 2859 }
2765} 2860}
2766 2861
2773 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2774} 2869}
2775 2870
2776############################################################################# 2871#############################################################################
2777 2872
2778package CFClient::UI::Inventory; 2873package CFClient::UI::Buttonbar;
2779 2874
2780our @ISA = CFClient::UI::ScrolledWindow::; 2875our @ISA = CFClient::UI::HBox::;
2781 2876
2782sub new { 2877# TODO: should actualyl wrap buttons and other goodies.
2783 my $class = shift;
2784
2785 my $self = $class->SUPER::new (
2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787 @_,
2788 );
2789
2790 $self
2791}
2792
2793sub set_items {
2794 my ($self, $items) = @_;
2795
2796 $self->{scrolled}->clear;
2797 return unless $items;
2798
2799 my @items = sort {
2800 ($a->{type} <=> $b->{type})
2801 or ($a->{name} cmp $b->{name})
2802 } @$items;
2803
2804 $self->{real_items} = \@items;
2805
2806 my $row = 0;
2807 for my $item (@items) {
2808 CFClient::Item::update_widgets $item;
2809
2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814 $row++;
2815 }
2816}
2817 2878
2818############################################################################# 2879#############################################################################
2819 2880
2820package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2821 2882
2871 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2872 2933
2873 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2874 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2876} 2939}
2877 2940
2878sub button_up { 2941sub button_up {
2879 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2880 2943
2882 undef $GRAB; 2945 undef $GRAB;
2883 $self->hide; 2946 $self->hide;
2884 2947
2885 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2886 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2887 } 2954 1
2888} 2955}
2889 2956
2890############################################################################# 2957#############################################################################
2891 2958
2892package CFClient::UI::Statusbox; 2959package CFClient::UI::Multiplexer;
2893 2960
2894our @ISA = CFClient::UI::VBox::; 2961our @ISA = CFClient::UI::Container::;
2895 2962
2896sub new { 2963sub new {
2897 my $class = shift; 2964 my $class = shift;
2898 2965
2899 $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
3063}
3064
3065#############################################################################
3066
3067package CFClient::UI::Statusbox;
3068
3069our @ISA = CFClient::UI::VBox::;
3070
3071sub new {
3072 my $class = shift;
3073
3074 my $self = $class->SUPER::new (
2900 fontsize => 0.8, 3075 fontsize => 0.8,
2901 @_, 3076 @_,
2902 ) 3077 );
3078
3079 Scalar::Util::weaken (my $this = $self);
3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
3082 $this->reorder;
3083 $this->update;
3084 });
3085
3086 $self
2903} 3087}
2904 3088
2905sub reorder { 3089sub reorder {
2906 my ($self) = @_; 3090 my ($self) = @_;
2907 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
2908 3092
2909 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 } 3095 }
2912 3096
2914 3098
2915 my @items = sort { 3099 my @items = sort {
2916 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
2919 3105
2920 my $count = 10 + 1; 3106 my $count = 10 + 1;
2921 for my $item (@items) { 3107 for my $item (@items) {
2922 last unless --$count; 3108 last unless --$count;
2923 3109
2938 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44, 3127 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
2943 can_events => 1, 3130 can_events => 1,
2944 can_hover => 1 3131 can_hover => 1
2945 }; 3132 };
3133
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update;
3141 $self->{timer}->interval (1/30);
3142 }
2946 } 3143 }
2947 3144
2948 $self->clear; 3145 $self->clear;
2949 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
2950} 3147}
2955 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
2957 3154
2958 return unless $text; 3155 return unless $text;
2959 3156
2960 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2961 3158
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963 3160
2964 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
2995 3192
2996 $self->reorder; 3193 $self->reorder;
2997 $self->SUPER::reconfigure; 3194 $self->SUPER::reconfigure;
2998} 3195}
2999 3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
3000############################################################################# 3205#############################################################################
3001 3206
3207package CFClient::UI::Inventory;
3208
3209our @ISA = CFClient::UI::ScrolledWindow::;
3210
3211sub new {
3212 my $class = shift;
3213
3214 my $self = $class->SUPER::new (
3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3216 @_,
3217 );
3218
3219 $self
3220}
3221
3222sub set_items {
3223 my ($self, $items) = @_;
3224
3225 $self->{child}->clear;
3226 return unless $items;
3227
3228 my @items = sort {
3229 ($a->{type} <=> $b->{type})
3230 or ($a->{name} cmp $b->{name})
3231 } @$items;
3232
3233 $self->{real_items} = \@items;
3234
3235 my $row = 0;
3236 for my $item (@items) {
3237 CFClient::Item::update_widgets $item;
3238
3239 $self->{child}->add (0, $row, $item->{face_widget});
3240 $self->{child}->add (1, $row, $item->{desc_widget});
3241 $self->{child}->add (2, $row, $item->{weight_widget});
3242
3243 $row++;
3244 }
3245}
3246
3247#############################################################################
3248
3249package CFClient::UI::BindEditor;
3250
3251our @ISA = CFClient::UI::FancyFrame::;
3252
3253sub new {
3254 my $class = shift;
3255
3256 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3257
3258 $self->add (my $vb = new CFClient::UI::VBox);
3259
3260
3261 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3262 text => "start recording",
3263 tooltip => "Start/Stops recording of actions."
3264 ."All subsequent actions after the recording started will be captured."
3265 ."The actions are displayed after the record was stopped."
3266 ."To bind the action you have to click on the 'Bind' button",
3267 on_activate => sub {
3268 unless ($self->{recording}) {
3269 $self->start;
3270 } else {
3271 $self->stop;
3272 }
3273 });
3274
3275 $vb->add (new CFClient::UI::Label text => "Actions:");
3276 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3277
3278 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3279 $vb->add (my $hb = new CFClient::UI::HBox);
3280 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3281 $hb->add (new CFClient::UI::Button
3282 text => "bind",
3283 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3284 on_activate => sub {
3285 $self->ask_for_bind;
3286 });
3287
3288 $vb->add (my $hb = new CFClient::UI::HBox);
3289 $hb->add (new CFClient::UI::Button
3290 text => "ok",
3291 expand => 1,
3292 tooltip => "This closes the binding editor and saves the binding",
3293 on_activate => sub {
3294 $self->hide;
3295 $self->commit;
3296 });
3297
3298 $hb->add (new CFClient::UI::Button
3299 text => "cancel",
3300 expand => 1,
3301 tooltip => "This closes the binding editor without saving",
3302 on_activate => sub {
3303 $self->hide;
3304 $self->{binding_cancel}->()
3305 if $self->{binding_cancel};
3306 });
3307
3308 $self->update_binding_widgets;
3309
3310 $self
3311}
3312
3313sub commit {
3314 my ($self) = @_;
3315 my ($mod, $sym, $cmds) = $self->get_binding;
3316 if ($sym != 0 && @$cmds > 0) {
3317 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3318 ."'. Don't forget 'Save Config'!");
3319 $self->{binding_change}->($mod, $sym, $cmds)
3320 if $self->{binding_change};
3321 } else {
3322 $::STATUSBOX->add ("No action bound, no key or action specified!");
3323 $self->{binding_cancel}->()
3324 if $self->{binding_cancel};
3325 }
3326}
3327
3328sub start {
3329 my ($self) = @_;
3330
3331 $self->{rec_btn}->set_text ("stop recording");
3332 $self->{recording} = 1;
3333 $self->clear_command_list;
3334 $::CONN->start_record if $::CONN;
3335}
3336
3337sub stop {
3338 my ($self) = @_;
3339
3340 $self->{rec_btn}->set_text ("start recording");
3341 $self->{recording} = 0;
3342
3343 my $rec;
3344 $rec = $::CONN->stop_record if $::CONN;
3345 return unless ref $rec eq 'ARRAY';
3346 $self->set_command_list ($rec);
3347}
3348
3349
3350sub ask_for_bind_and_commit {
3351 my ($self) = @_;
3352 $self->ask_for_bind (1);
3353}
3354
3355sub ask_for_bind {
3356 my ($self, $commit) = @_;
3357
3358 CFClient::Binder::open_binding_dialog (sub {
3359 my ($mod, $sym) = @_;
3360 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3361 $self->update_binding_widgets;
3362 $self->commit if $commit;
3363 });
3364}
3365
3366# $mod and $sym are the modifiers and key symbol
3367# $cmds is a array ref of strings (the commands)
3368# $cb is the callback that is executed on OK
3369# $ccb is the callback that is executed on CANCEL and
3370# when the binding was unsuccessful on OK
3371sub set_binding {
3372 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3373
3374 $self->clear_command_list;
3375 $self->{recording} = 0;
3376 $self->{rec_btn}->set_text ("start recording");
3377
3378 $self->{binding} = [$mod, $sym];
3379 $self->{commands} = $cmds;
3380
3381 $self->{binding_change} = $cb;
3382 $self->{binding_cancel} = $ccb;
3383
3384 $self->update_binding_widgets;
3385}
3386
3387# this is a shortcut method that asks for a binding
3388# and then just binds it.
3389sub do_quick_binding {
3390 my ($self, $cmds) = @_;
3391 $self->set_binding (undef, undef, $cmds, sub {
3392 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3393 });
3394 $self->ask_for_bind (1);
3395}
3396
3397sub update_binding_widgets {
3398 my ($self) = @_;
3399 my ($mod, $sym, $cmds) = $self->get_binding;
3400 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3401 $self->set_command_list ($cmds);
3402}
3403
3404sub get_binding {
3405 my ($self) = @_;
3406 return (
3407 $self->{binding}->[0],
3408 $self->{binding}->[1],
3409 [ grep { defined $_ } @{$self->{commands}} ]
3410 );
3411}
3412
3413sub clear_command_list {
3414 my ($self) = @_;
3415 $self->{cmdbox}->clear ();
3416}
3417
3418sub set_command_list {
3419 my ($self, $cmds) = @_;
3420
3421 $self->{cmdbox}->clear ();
3422 $self->{commands} = $cmds;
3423
3424 my $idx = 0;
3425
3426 for (@$cmds) {
3427 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3428
3429 my $i = $idx;
3430 $hb->add (new CFClient::UI::Label text => $_);
3431 $hb->add (new CFClient::UI::Button
3432 text => "delete",
3433 tooltip => "Deletes the action from the record",
3434 on_activate => sub {
3435 $self->{cmdbox}->remove ($hb);
3436 $cmds->[$i] = undef;
3437 });
3438
3439
3440 $idx++
3441 }
3442}
3443
3444#############################################################################
3445
3446package CFClient::UI::SpellList;
3447
3448our @ISA = CFClient::UI::Table::;
3449
3450sub new {
3451 my $class = shift;
3452
3453 my $self = $class->SUPER::new (
3454 binding => [],
3455 commands => [],
3456 @_,
3457 )
3458}
3459
3460# XXX: Do sorting? Argl...
3461sub add_spell {
3462 my ($self, $spell) = @_;
3463 $self->{spells}->{$spell->{name}} = $spell;
3464
3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3466 face => $spell->{face},
3467 can_hover => 1,
3468 can_events => 1,
3469 tooltip => $spell->{message});
3470
3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472 text => $spell->{name},
3473 can_hover => 1,
3474 can_events => 1,
3475 tooltip => $spell->{message},
3476 expand => 1);
3477
3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481 expand => 1);
3482
3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484 text => "bind to key",
3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486}
3487
3488sub rebuild_spell_list {
3489 my ($self) = @_;
3490 $self->{tbl_idx} = 0;
3491 $self->add_spell ($_) for values %{$self->{spells}};
3492}
3493
3494sub remove_spell {
3495 my ($self, $spell) = @_;
3496 delete $self->{spells}->{$spell->{name}};
3497 $self->rebuild_spell_list;
3498}
3499
3500#############################################################################
3501
3002package CFClient::UI::Root; 3502package CFClient::UI::Root;
3003 3503
3004our @ISA = CFClient::UI::Container::; 3504our @ISA = CFClient::UI::Container::;
3505
3506use List::Util qw(min max);
3005 3507
3006use CFClient::OpenGL; 3508use CFClient::OpenGL;
3007 3509
3008sub new { 3510sub new {
3009 my $class = shift; 3511 my $class = shift;
3016 Scalar::Util::weaken ($self->{root} = $self); 3518 Scalar::Util::weaken ($self->{root} = $self);
3017 3519
3018 $self 3520 $self
3019} 3521}
3020 3522
3021sub configure {
3022 my ($self, $x, $y, $w, $h) = @_;
3023
3024 $self->{w} = $w;
3025 $self->{h} = $h;
3026}
3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 $self->SUPER::reconfigure;
3032
3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3034 if $self->{w};
3035}
3036
3037sub size_request { 3523sub size_request {
3038 my ($self) = @_; 3524 my ($self) = @_;
3039 3525
3040 ($self->{w}, $self->{h}) 3526 ($self->{w}, $self->{h})
3041} 3527}
3053 3539
3054 int $coord + 0.5 3540 int $coord + 0.5
3055} 3541}
3056 3542
3057sub size_allocate { 3543sub size_allocate {
3058 my ($self, $w, $h, $changed) = @_; 3544 my ($self, $w, $h) = @_;
3059 3545
3060 for my $child ($self->children) { 3546 for my $child ($self->children) {
3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062 3548
3063 $X = $child->{force_x} if exists $child->{force_x}; 3549 $X = $child->{force_x} if exists $child->{force_x};
3131 $_->() 3617 $_->()
3132 for values %{delete $self->{refresh_hook}}; 3618 for values %{delete $self->{refresh_hook}};
3133 } 3619 }
3134 3620
3135 if ($self->{realloc}) { 3621 if ($self->{realloc}) {
3622 my %queue;
3136 my @queue; 3623 my @queue;
3624 my $widget;
3137 3625
3626 outer:
3138 while () { 3627 while () {
3139 if ($self->{realloc}) { 3628 if (my $realloc = delete $self->{realloc}) {
3140 #TODO use array-of-depth approach 3629 for $widget (values %$realloc) {
3630 $widget->{visible} or next; # do not resize invisible widgets
3141 3631
3142 @queue = sort { $a->{visible} <=> $b->{visible} } 3632 $queue{$widget+0}++ and next; # duplicates are common
3143 @queue, values %{delete $self->{realloc}}; 3633
3634 push @{ $queue[$widget->{visible}] }, $widget;
3635 }
3144 } 3636 }
3145 3637
3638 while () {
3639 @queue or last outer;
3640
3146 my $widget = pop @queue || last; 3641 $widget = pop @{ $queue[-1] || [] }
3642 and last;
3643
3644 pop @queue;
3645 }
3147 3646
3148 $widget->{visible} or last; # do not resize invisible widgets 3647 delete $queue{$widget+0};
3149 3648
3150 my ($w, $h) = $widget->size_request; 3649 my ($w, $h) = $widget->size_request;
3151 3650
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3651 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3652 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3653
3654 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3655 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3154 3656
3155 $w = $widget->{force_w} if exists $widget->{force_w}; 3657 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h}; 3658 $h = $widget->{force_h} if exists $widget->{force_h};
3157 3659
3660 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3661 || delete $widget->{force_realloc}) {
3158 $widget->{req_w} = $w; 3662 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h; 3663 $widget->{req_h} = $h;
3160 3664
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3665 $self->{size_alloc}{$widget+0} = $widget;
3162 3666
3163 push @queue, $widget->{parent} 3667 if (my $parent = $widget->{parent}) {
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 3668 $self->{realloc}{$parent+0} = $parent
3669 unless $queue{$parent+0};
3670
3671 $parent->{force_size_alloc} = 1;
3672 $self->{size_alloc}{$parent+0} = $parent;
3673 }
3674 }
3675
3676 delete $self->{realloc}{$widget+0};
3165 } 3677 }
3166 } 3678 }
3167 3679
3168 while (my $size_alloc = delete $self->{size_alloc}) { 3680 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3681 my @queue = sort { $b->{visible} <=> $a->{visible} }
3170 values %$size_alloc; 3682 values %$size_alloc;
3171 3683
3172 while () { 3684 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last }; 3685 my $widget = pop @queue || last;
3174 3686
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3687 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177 3688
3178 $w = 0 if $w < 0; 3689 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0; 3690 $h = 0 if $h < 0;
3180 3691
3181 $w = int $w + 0.5; 3692 $w = int $w + 0.5;
3182 $h = int $h + 0.5; 3693 $h = int $h + 0.5;
3183 3694
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3695 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3696 $widget->{old_w} = $widget->{w};
3697 $widget->{old_h} = $widget->{h};
3185 3698
3186 $widget->{w} = $w; 3699 $widget->{w} = $w;
3187 $widget->{h} = $h; 3700 $widget->{h} = $h;
3188 3701
3189 $widget->emit (size_allocate => $w, $h, $changed); 3702 $widget->emit (size_allocate => $w, $h);
3703 }
3190 } 3704 }
3191 } 3705 }
3192 3706
3193 while ($self->{post_alloc_hook}) { 3707 while ($self->{post_alloc_hook}) {
3194 $_->() 3708 $_->()
3195 for values %{delete $self->{post_alloc_hook}}; 3709 for values %{delete $self->{post_alloc_hook}};
3196 } 3710 }
3711
3197 3712
3198 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3713 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3714 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200 glClear GL_COLOR_BUFFER_BIT; 3715 glClear GL_COLOR_BUFFER_BIT;
3201 3716
3203 glLoadIdentity; 3718 glLoadIdentity;
3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205 glMatrixMode GL_MODELVIEW; 3720 glMatrixMode GL_MODELVIEW;
3206 glLoadIdentity; 3721 glLoadIdentity;
3207 3722
3723 {
3724 package CFClient::UI::Base;
3725
3726 ($draw_x, $draw_y, $draw_w, $draw_h) =
3727 (0, 0, $self->{w}, $self->{h});
3728 }
3729
3208 $self->_draw; 3730 $self->_draw;
3209} 3731}
3210 3732
3211############################################################################# 3733#############################################################################
3212 3734

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines