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.282 by root, Mon Jun 5 02:25:10 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 $self->{max_w} = int $w if defined $w;
378 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $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;
1464 1538
1465 delete $self->{texture}; 1539 delete $self->{texture};
1466 $self->SUPER::update; 1540 $self->SUPER::update;
1467} 1541}
1468 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc;
1549}
1550
1469sub set_text { 1551sub set_text {
1470 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1471 1553
1472 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1473 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1495} 1577}
1496 1578
1497sub size_request { 1579sub size_request {
1498 my ($self) = @_; 1580 my ($self) = @_;
1499 1581
1582 if (exists $self->{req_h}) {
1583 @$self{qw(req_w req_h)}
1584 } else {
1500 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1501 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1590
1506 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1507 1592
1508 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1509 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1510 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1596
1512 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1513 1598
1514 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1515 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1516 } 1601 }
1517 1602
1518 ($w, $h) 1603 ($w, $h)
1604 }
1519} 1605}
1520 1606
1521sub size_allocate { 1607sub size_allocate {
1522 my ($self, $w, $h, $changed) = @_; 1608 my ($self, $w, $h) = @_;
1609
1610 delete $self->{ox};
1523 1611
1524 delete $self->{texture} 1612 delete $self->{texture}
1525 if $changed; 1613 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1526} 1614}
1527 1615
1528sub set_fontsize { 1616sub set_fontsize {
1529 my ($self, $fontsize) = @_; 1617 my ($self, $fontsize) = @_;
1530 1618
1545 $self->{layout}->set_width ($self->{w}); 1633 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1634 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1635 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1636 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549 1637
1550 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1638 new_from_layout CFClient::Texture $self->{layout}
1639 };
1551 1640
1641 unless (exists $self->{ox}) {
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1642 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1643 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5); 1644 : ($self->{w} - $tex->{w}) * 0.5);
1555 1645
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1646 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1647 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5); 1648 : ($self->{h} - $tex->{h}) * 0.5);
1559
1560 $tex
1561 }; 1649 };
1562 1650
1563 glEnable GL_TEXTURE_2D; 1651 glEnable GL_TEXTURE_2D;
1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1565 1653
1654 glColor_premultiply @{$self->{fg}}
1566 if ($tex->{format} == GL_ALPHA) { 1655 if $tex->{format} == GL_ALPHA;
1567 glColor @{$self->{fg}}; 1656
1568 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1569 } else {
1570 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1571 }
1572 1658
1573 glDisable GL_TEXTURE_2D; 1659 glDisable GL_TEXTURE_2D;
1574} 1660}
1575 1661
1576############################################################################# 1662#############################################################################
1603 1689
1604 delete $self->{cur_h}; 1690 delete $self->{cur_h};
1605 1691
1606 return if $self->{text} eq $text; 1692 return if $self->{text} eq $text;
1607 1693
1608 delete $self->{texture};
1609
1610 $self->{last_activity} = $::NOW; 1694 $self->{last_activity} = $::NOW;
1611 $self->{text} = $text; 1695 $self->{text} = $text;
1612 1696
1613 $text =~ s/./*/g if $self->{hidden}; 1697 $text =~ s/./*/g if $self->{hidden};
1614 $self->{layout}->set_text ("$text "); 1698 $self->{layout}->set_text ("$text ");
1615 1699
1616 $self->_emit (changed => $self->{text}); 1700 $self->_emit (changed => $self->{text});
1701 $self->update;
1617} 1702}
1618 1703
1619sub set_text { 1704sub set_text {
1620 my ($self, $text) = @_; 1705 my ($self, $text) = @_;
1621 1706
1660 $self->{cursor} = length $text; 1745 $self->{cursor} = length $text;
1661 } elsif ($uni == 27) { 1746 } elsif ($uni == 27) {
1662 $self->_emit ('escape'); 1747 $self->_emit ('escape');
1663 } elsif ($uni) { 1748 } elsif ($uni) {
1664 substr $text, $self->{cursor}++, 0, chr $uni; 1749 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else {
1751 return 0;
1665 } 1752 }
1666 1753
1667 $self->_set_text ($text); 1754 $self->_set_text ($text);
1668 1755
1669 $self->realloc; 1756 $self->realloc;
1757
1758 1
1670} 1759}
1671 1760
1672sub focus_in { 1761sub focus_in {
1673 my ($self) = @_; 1762 my ($self) = @_;
1674 1763
1689 utf8::encode $text; 1778 utf8::encode $text;
1690 $self->{cursor} = length substr $text, 0, $idx; 1779 $self->{cursor} = length substr $text, 0, $idx;
1691 1780
1692 $self->_set_text ($self->{text}); 1781 $self->_set_text ($self->{text});
1693 $self->update; 1782 $self->update;
1783
1784 1
1694} 1785}
1695 1786
1696sub mouse_motion { 1787sub mouse_motion {
1697 my ($self, $ev, $x, $y) = @_; 1788 my ($self, $ev, $x, $y) = @_;
1698# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1789# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1790
1791 0
1699} 1792}
1700 1793
1701sub _draw { 1794sub _draw {
1702 my ($self) = @_; 1795 my ($self) = @_;
1703 1796
1704 local $self->{fg} = $self->{fg}; 1797 local $self->{fg} = $self->{fg};
1705 1798
1706 if ($FOCUS == $self) { 1799 if ($FOCUS == $self) {
1707 glColor @{$self->{active_bg}}; 1800 glColor_premultiply @{$self->{active_bg}};
1708 $self->{fg} = $self->{active_fg}; 1801 $self->{fg} = $self->{active_fg};
1709 } else { 1802 } else {
1710 glColor @{$self->{bg}}; 1803 glColor_premultiply @{$self->{bg}};
1711 } 1804 }
1712 1805
1713 glEnable GL_BLEND; 1806 glEnable GL_BLEND;
1714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1807 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715 glBegin GL_QUADS; 1808 glBegin GL_QUADS;
1716 glVertex 0 , 0; 1809 glVertex 0 , 0;
1717 glVertex 0 , $self->{h}; 1810 glVertex 0 , $self->{h};
1718 glVertex $self->{w}, $self->{h}; 1811 glVertex $self->{w}, $self->{h};
1719 glVertex $self->{w}, 0; 1812 glVertex $self->{w}, 0;
1780 } else { 1873 } else {
1781 $self->set_text ($self->{history_saveback}); 1874 $self->set_text ($self->{history_saveback});
1782 } 1875 }
1783 1876
1784 } else { 1877 } else {
1785 $self->SUPER::key_down ($ev); 1878 return $self->SUPER::key_down ($ev)
1879 }
1880
1786 } 1881 1
1787
1788} 1882}
1789 1883
1790############################################################################# 1884#############################################################################
1791 1885
1792package CFClient::UI::Button; 1886package CFClient::UI::Button;
1821 my ($self, $ev, $x, $y) = @_; 1915 my ($self, $ev, $x, $y) = @_;
1822 1916
1823 $self->emit ("activate") 1917 $self->emit ("activate")
1824 if $x >= 0 && $x < $self->{w} 1918 if $x >= 0 && $x < $self->{w}
1825 && $y >= 0 && $y < $self->{h}; 1919 && $y >= 0 && $y < $self->{h};
1920
1921 1
1826} 1922}
1827 1923
1828sub _draw { 1924sub _draw {
1829 my ($self) = @_; 1925 my ($self) = @_;
1830 1926
1831 local $self->{fg} = $self->{fg}; 1927 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1832
1833 if ($GRAB == $self) {
1834 $self->{fg} = $self->{active_fg};
1835 }
1836 1928
1837 glEnable GL_TEXTURE_2D; 1929 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 glColor 0, 0, 0, 1; 1931 glColor 0, 0, 0, 1;
1840 1932
1884 1976
1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887 $self->{state} = !$self->{state}; 1979 $self->{state} = !$self->{state};
1888 $self->_emit (changed => $self->{state}); 1980 $self->_emit (changed => $self->{state});
1981 } else {
1982 return 0
1983 }
1984
1889 } 1985 1
1890} 1986}
1891 1987
1892sub _draw { 1988sub _draw {
1893 my ($self) = @_; 1989 my ($self) = @_;
1894 1990
2061 2157
2062 my $h1 = $self->{h} * (1 - $ycut1); 2158 my $h1 = $self->{h} * (1 - $ycut1);
2063 my $h2 = $self->{h} * (1 - $ycut2); 2159 my $h2 = $self->{h} * (1 - $ycut2);
2064 2160
2065 glEnable GL_BLEND; 2161 glEnable GL_BLEND;
2066 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2162 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067 glEnable GL_TEXTURE_2D; 2164 glEnable GL_TEXTURE_2D;
2068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2165 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069 2166
2070 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2167 glBindTexture GL_TEXTURE_2D, $t1->{name};
2071 glBegin GL_QUADS; 2168 glBegin GL_QUADS;
2232 2329
2233 $self->SUPER::button_down ($ev, $x, $y); 2330 $self->SUPER::button_down ($ev, $x, $y);
2234 2331
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236 2333
2237 $self->mouse_motion ($ev, $x, $y); 2334 $self->mouse_motion ($ev, $x, $y)
2238} 2335}
2239 2336
2240sub mouse_motion { 2337sub mouse_motion {
2241 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2242 2339
2246 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2343 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247 2344
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2345 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249 2346
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2347 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2348 } else {
2349 return 0;
2350 }
2351
2251 } 2352 1
2252} 2353}
2253 2354
2254sub update { 2355sub update {
2255 my ($self) = @_; 2356 my ($self) = @_;
2256 2357
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2358 delete $self->{knob_w};
2359 $self->SUPER::update;
2360}
2361
2362sub _draw {
2363 my ($self) = @_;
2364
2365 unless ($self->{knob_w}) {
2258 $self->set_value ($self->{range}[0]); 2366 $self->set_value ($self->{range}[0]);
2259 2367
2260 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2368 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100; 2369 my $range = ($hi - $page - $lo) || 1e-100;
2262 2370
2268 $value = ($value - $lo) / $range; 2376 $value = ($value - $lo) / $range;
2269 $value = $value * $self->{scale} + $self->{offset}; 2377 $value = $value * $self->{scale} + $self->{offset};
2270 2378
2271 $self->{knob_x} = $value - $knob_w * 0.5; 2379 $self->{knob_x} = $value - $knob_w * 0.5;
2272 $self->{knob_w} = $knob_w; 2380 $self->{knob_w} = $knob_w;
2273 }); 2381 }
2274
2275 $self->SUPER::update;
2276}
2277
2278sub _draw {
2279 my ($self) = @_;
2280 2382
2281 $self->SUPER::_draw (); 2383 $self->SUPER::_draw ();
2282 2384
2283 glScale $self->{w}, $self->{h}; 2385 glScale $self->{w}, $self->{h};
2284 2386
2382 $self->{fontsize} = $fontsize; 2484 $self->{fontsize} = $fontsize;
2383 $self->reflow; 2485 $self->reflow;
2384} 2486}
2385 2487
2386sub size_allocate { 2488sub size_allocate {
2387 my ($self, $w, $h, $changed) = @_; 2489 my ($self, $w, $h) = @_;
2388 2490
2389 $self->SUPER::size_allocate ($w, $h, $changed); 2491 $self->SUPER::size_allocate ($w, $h);
2390
2391 return unless $changed;
2392 2492
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2493 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2494 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2495 $self->{layout}->set_width ($self->{children}[0]{w});
2396 2496
2480 2580
2481 delete $self->{texture}; 2581 delete $self->{texture};
2482 } 2582 }
2483 2583
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2584 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2585 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2586 glClear GL_COLOR_BUFFER_BIT;
2487 2587
2488 my $top = int $self->{children}[1]{range}[0]; 2588 my $top = int $self->{children}[1]{range}[0];
2489 2589
2490 my $y0 = $top; 2590 my $y0 = $top;
2525sub _draw { 2625sub _draw {
2526 my ($self) = @_; 2626 my ($self) = @_;
2527 2627
2528 glEnable GL_TEXTURE_2D; 2628 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2630 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2631 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2632 glDisable GL_TEXTURE_2D;
2533 2633
2534 $self->{children}[1]->draw; 2634 $self->{children}[1]->draw;
2535 2635
2536} 2636}
2619} 2719}
2620 2720
2621sub set_tooltip_from { 2721sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2722 my ($self, $widget) = @_;
2623 2723
2724 my $tooltip = $widget->{tooltip};
2725
2726 if ($ENV{CFPLUS_DEBUG} & 2) {
2727 $tooltip .= "\n\n" . (ref $widget) . "\n"
2728 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729 . "req $widget->{req_w} $widget->{req_h}\n"
2730 . "visible $widget->{visible}";
2731 }
2732
2624 $self->add (new CFClient::UI::Label 2733 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2734 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2735 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2736 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2737 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2738 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2739 font => ($widget->{tooltip_font} || $::FONT_PROP),
2638 2747
2639 ($w + 4, $h + 4) 2748 ($w + 4, $h + 4)
2640} 2749}
2641 2750
2642sub size_allocate { 2751sub size_allocate {
2643 my ($self, $w, $h, $changed) = @_; 2752 my ($self, $w, $h) = @_;
2644 2753
2645 return unless $changed;
2646
2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2754 $self->SUPER::size_allocate ($w - 4, $h - 4);
2648} 2755}
2649 2756
2650sub visibility_change { 2757sub visibility_change {
2651 my ($self, $visible) = @_; 2758 my ($self, $visible) = @_;
2652 2759
2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2863 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2757 2864
2758 if ($tex) { 2865 if ($tex) {
2759 glEnable GL_TEXTURE_2D; 2866 glEnable GL_TEXTURE_2D;
2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761 glColor 1, 1, 1, 1; 2868 glColor 0, 0, 0, 1;
2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763 glDisable GL_TEXTURE_2D; 2870 glDisable GL_TEXTURE_2D;
2764 } 2871 }
2765} 2872}
2766 2873
2773 $self->SUPER::DESTROY; 2880 $self->SUPER::DESTROY;
2774} 2881}
2775 2882
2776############################################################################# 2883#############################################################################
2777 2884
2778package CFClient::UI::Inventory; 2885package CFClient::UI::Buttonbar;
2779 2886
2780our @ISA = CFClient::UI::ScrolledWindow::; 2887our @ISA = CFClient::UI::HBox::;
2781 2888
2782sub new { 2889# 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 2890
2818############################################################################# 2891#############################################################################
2819 2892
2820package CFClient::UI::Menu; 2893package CFClient::UI::Menu;
2821 2894
2871 my ($self, $ev, $x, $y) = @_; 2944 my ($self, $ev, $x, $y) = @_;
2872 2945
2873 # TODO: should use vbox->find_widget or so 2946 # TODO: should use vbox->find_widget or so
2874 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875 $self->{hover} = $self->{item}{$HOVER}; 2948 $self->{hover} = $self->{item}{$HOVER};
2949
2950 0
2876} 2951}
2877 2952
2878sub button_up { 2953sub button_up {
2879 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2880 2955
2882 undef $GRAB; 2957 undef $GRAB;
2883 $self->hide; 2958 $self->hide;
2884 2959
2885 $self->_emit ("popdown"); 2960 $self->_emit ("popdown");
2886 $self->{hover}[1]->() if $self->{hover}; 2961 $self->{hover}[1]->() if $self->{hover};
2962 } else {
2963 return 0
2964 }
2965
2887 } 2966 1
2888} 2967}
2889 2968
2890############################################################################# 2969#############################################################################
2891 2970
2892package CFClient::UI::Statusbox; 2971package CFClient::UI::Multiplexer;
2893 2972
2894our @ISA = CFClient::UI::VBox::; 2973our @ISA = CFClient::UI::Container::;
2895 2974
2896sub new { 2975sub new {
2897 my $class = shift; 2976 my $class = shift;
2898 2977
2899 $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2979 @_,
2980 );
2981
2982 $self->{current} = $self->{children}[0]
2983 if @{ $self->{children} };
2984
2985 $self
2986}
2987
2988sub add {
2989 my ($self, @widgets) = @_;
2990
2991 $self->SUPER::add (@widgets);
2992
2993 $self->{current} = $self->{children}[0]
2994 if @{ $self->{children} };
2995}
2996
2997sub set_current_page {
2998 my ($self, $page_or_widget) = @_;
2999
3000 my $widget = ref $page_or_widget
3001 ? $page_or_widget
3002 : $self->{children}[$page_or_widget];
3003
3004 $self->{current} = $widget;
3005 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006
3007 $self->_emit (page_changed => $self->{current});
3008
3009 $self->realloc;
3010}
3011
3012sub visible_children {
3013 $_[0]{current}
3014}
3015
3016sub size_request {
3017 my ($self) = @_;
3018
3019 $self->{current}->size_request
3020}
3021
3022sub size_allocate {
3023 my ($self, $w, $h) = @_;
3024
3025 $self->{current}->configure (0, 0, $w, $h);
3026}
3027
3028sub _draw {
3029 my ($self) = @_;
3030
3031 $self->{current}->draw;
3032}
3033
3034#############################################################################
3035
3036package CFClient::UI::Notebook;
3037
3038our @ISA = CFClient::UI::VBox::;
3039
3040sub new {
3041 my $class = shift;
3042
3043 my $self = $class->SUPER::new (
3044 buttonbar => (new CFClient::UI::Buttonbar),
3045 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3046 # filter => # will be put between multiplexer and $self
3047 @_,
3048 );
3049
3050 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3051 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3052
3053 $self
3054}
3055
3056sub add {
3057 my ($self, $title, $widget, $tooltip) = @_;
3058
3059 Scalar::Util::weaken $self;
3060
3061 $self->{buttonbar}->add (new CFClient::UI::Button
3062 markup => $title,
3063 tooltip => $tooltip,
3064 on_activate => sub { $self->set_current_page ($widget) },
3065 );
3066
3067 $self->{multiplexer}->add ($widget);
3068}
3069
3070sub set_current_page {
3071 my ($self, $page) = @_;
3072
3073 $self->{multiplexer}->set_current_page ($page);
3074 $self->_emit (page_changed => $self->{multiplexer}{current});
3075}
3076
3077#############################################################################
3078
3079package CFClient::UI::Statusbox;
3080
3081our @ISA = CFClient::UI::VBox::;
3082
3083sub new {
3084 my $class = shift;
3085
3086 my $self = $class->SUPER::new (
2900 fontsize => 0.8, 3087 fontsize => 0.8,
2901 @_, 3088 @_,
2902 ) 3089 );
3090
3091 Scalar::Util::weaken (my $this = $self);
3092
3093 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3094
3095 $self
2903} 3096}
2904 3097
2905sub reorder { 3098sub reorder {
2906 my ($self) = @_; 3099 my ($self) = @_;
2907 my $NOW = time; 3100 my $NOW = Time::HiRes::time;
3101
3102 # freeze display when hovering over any label
3103 return if $CFClient::UI::TOOLTIP->{owner}
3104 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3105 values %{ $self->{item} };
2908 3106
2909 while (my ($k, $v) = each %{ $self->{item} }) { 3107 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3108 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 } 3109 }
2912 3110
2915 my @items = sort { 3113 my @items = sort {
2916 $a->{pri} <=> $b->{pri} 3114 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id} 3115 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} }; 3116 } values %{ $self->{item} };
2919 3117
3118 $self->{timer}->interval (1);
3119
2920 my $count = 10 + 1; 3120 my $count = 10 + 1;
2921 for my $item (@items) { 3121 for my $item (@items) {
2922 last unless --$count; 3122 last unless --$count;
2923 3123
2924 push @widgets, $item->{label} ||= do { 3124 my $label = $item->{label} ||= do {
2925 # TODO: doesn't handle markup well (read as: at all) 3125 # TODO: doesn't handle markup well (read as: at all)
2926 my $short = $item->{count} > 1 3126 my $short = $item->{count} > 1
2927 ? "<b>$item->{count} ×</b> $item->{text}" 3127 ? "<b>$item->{count} ×</b> $item->{text}"
2928 : $item->{text}; 3128 : $item->{text};
2929 3129
2937 tooltip => $item->{tooltip}, 3137 tooltip => $item->{tooltip},
2938 tooltip_font => $::FONT_PROP, 3138 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67, 3139 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize}, 3140 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44, 3141 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg}, 3142 fg => [@{ $item->{fg} }],
2943 can_events => 1, 3143 can_events => 1,
2944 can_hover => 1 3144 can_hover => 1
2945 }; 3145 };
3146
3147 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3148 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3149 $label->update;
3150 $label->set_max_size (undef, $label->{req_h} * $diff)
3151 if $diff < 1;
3152 $self->{timer}->interval (1/30);
3153 } else {
3154 $label->{fg}[3] = $item->{fg}[3] || 1;
3155 }
3156
3157 push @widgets, $label;
2946 } 3158 }
2947 3159
2948 $self->clear; 3160 $self->clear;
2949 $self->SUPER::add (reverse @widgets); 3161 $self->SUPER::add (reverse @widgets);
2950} 3162}
2955 $text =~ s/^\s+//; 3167 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//; 3168 $text =~ s/\s+$//;
2957 3169
2958 return unless $text; 3170 return unless $text;
2959 3171
2960 my $timeout = time + ((delete $arg{timeout}) || 60); 3172 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2961 3173
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3174 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963 3175
2964 if (my $item = $self->{item}{$group}) { 3176 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) { 3177 if ($item->{text} eq $text) {
2995 3207
2996 $self->reorder; 3208 $self->reorder;
2997 $self->SUPER::reconfigure; 3209 $self->SUPER::reconfigure;
2998} 3210}
2999 3211
3212sub DESTROY {
3213 my ($self) = @_;
3214
3215 $self->{timer}->cancel;
3216
3217 $self->SUPER::DESTROY;
3218}
3219
3000############################################################################# 3220#############################################################################
3001 3221
3222package CFClient::UI::Inventory;
3223
3224our @ISA = CFClient::UI::ScrolledWindow::;
3225
3226sub new {
3227 my $class = shift;
3228
3229 my $self = $class->SUPER::new (
3230 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3231 @_,
3232 );
3233
3234 $self
3235}
3236
3237sub set_items {
3238 my ($self, $items) = @_;
3239
3240 $self->{child}->clear;
3241 return unless $items;
3242
3243 my @items = sort {
3244 ($a->{type} <=> $b->{type})
3245 or ($a->{name} cmp $b->{name})
3246 } @$items;
3247
3248 $self->{real_items} = \@items;
3249
3250 my $row = 0;
3251 for my $item (@items) {
3252 CFClient::Item::update_widgets $item;
3253
3254 $self->{child}->add (0, $row, $item->{face_widget});
3255 $self->{child}->add (1, $row, $item->{desc_widget});
3256 $self->{child}->add (2, $row, $item->{weight_widget});
3257
3258 $row++;
3259 }
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::BindEditor;
3265
3266our @ISA = CFClient::UI::FancyFrame::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273 $self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277 text => "start recording",
3278 tooltip => "Start/Stops recording of actions."
3279 ."All subsequent actions after the recording started will be captured."
3280 ."The actions are displayed after the record was stopped."
3281 ."To bind the action you have to click on the 'Bind' button",
3282 on_activate => sub {
3283 unless ($self->{recording}) {
3284 $self->start;
3285 } else {
3286 $self->stop;
3287 }
3288 });
3289
3290 $vb->add (new CFClient::UI::Label text => "Actions:");
3291 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3294 $vb->add (my $hb = new CFClient::UI::HBox);
3295 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296 $hb->add (new CFClient::UI::Button
3297 text => "bind",
3298 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299 on_activate => sub {
3300 $self->ask_for_bind;
3301 });
3302
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add (new CFClient::UI::Button
3305 text => "ok",
3306 expand => 1,
3307 tooltip => "This closes the binding editor and saves the binding",
3308 on_activate => sub {
3309 $self->hide;
3310 $self->commit;
3311 });
3312
3313 $hb->add (new CFClient::UI::Button
3314 text => "cancel",
3315 expand => 1,
3316 tooltip => "This closes the binding editor without saving",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->{binding_cancel}->()
3320 if $self->{binding_cancel};
3321 });
3322
3323 $self->update_binding_widgets;
3324
3325 $self
3326}
3327
3328sub commit {
3329 my ($self) = @_;
3330 my ($mod, $sym, $cmds) = $self->get_binding;
3331 if ($sym != 0 && @$cmds > 0) {
3332 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333 ."'. Don't forget 'Save Config'!");
3334 $self->{binding_change}->($mod, $sym, $cmds)
3335 if $self->{binding_change};
3336 } else {
3337 $::STATUSBOX->add ("No action bound, no key or action specified!");
3338 $self->{binding_cancel}->()
3339 if $self->{binding_cancel};
3340 }
3341}
3342
3343sub start {
3344 my ($self) = @_;
3345
3346 $self->{rec_btn}->set_text ("stop recording");
3347 $self->{recording} = 1;
3348 $self->clear_command_list;
3349 $::CONN->start_record if $::CONN;
3350}
3351
3352sub stop {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("start recording");
3356 $self->{recording} = 0;
3357
3358 my $rec;
3359 $rec = $::CONN->stop_record if $::CONN;
3360 return unless ref $rec eq 'ARRAY';
3361 $self->set_command_list ($rec);
3362}
3363
3364
3365sub ask_for_bind_and_commit {
3366 my ($self) = @_;
3367 $self->ask_for_bind (1);
3368}
3369
3370sub ask_for_bind {
3371 my ($self, $commit) = @_;
3372
3373 CFClient::Binder::open_binding_dialog (sub {
3374 my ($mod, $sym) = @_;
3375 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376 $self->update_binding_widgets;
3377 $self->commit if $commit;
3378 });
3379}
3380
3381# $mod and $sym are the modifiers and key symbol
3382# $cmds is a array ref of strings (the commands)
3383# $cb is the callback that is executed on OK
3384# $ccb is the callback that is executed on CANCEL and
3385# when the binding was unsuccessful on OK
3386sub set_binding {
3387 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389 $self->clear_command_list;
3390 $self->{recording} = 0;
3391 $self->{rec_btn}->set_text ("start recording");
3392
3393 $self->{binding} = [$mod, $sym];
3394 $self->{commands} = $cmds;
3395
3396 $self->{binding_change} = $cb;
3397 $self->{binding_cancel} = $ccb;
3398
3399 $self->update_binding_widgets;
3400}
3401
3402# this is a shortcut method that asks for a binding
3403# and then just binds it.
3404sub do_quick_binding {
3405 my ($self, $cmds) = @_;
3406 $self->set_binding (undef, undef, $cmds, sub {
3407 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408 });
3409 $self->ask_for_bind (1);
3410}
3411
3412sub update_binding_widgets {
3413 my ($self) = @_;
3414 my ($mod, $sym, $cmds) = $self->get_binding;
3415 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416 $self->set_command_list ($cmds);
3417}
3418
3419sub get_binding {
3420 my ($self) = @_;
3421 return (
3422 $self->{binding}->[0],
3423 $self->{binding}->[1],
3424 [ grep { defined $_ } @{$self->{commands}} ]
3425 );
3426}
3427
3428sub clear_command_list {
3429 my ($self) = @_;
3430 $self->{cmdbox}->clear ();
3431}
3432
3433sub set_command_list {
3434 my ($self, $cmds) = @_;
3435
3436 $self->{cmdbox}->clear ();
3437 $self->{commands} = $cmds;
3438
3439 my $idx = 0;
3440
3441 for (@$cmds) {
3442 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444 my $i = $idx;
3445 $hb->add (new CFClient::UI::Label text => $_);
3446 $hb->add (new CFClient::UI::Button
3447 text => "delete",
3448 tooltip => "Deletes the action from the record",
3449 on_activate => sub {
3450 $self->{cmdbox}->remove ($hb);
3451 $cmds->[$i] = undef;
3452 });
3453
3454
3455 $idx++
3456 }
3457}
3458
3459#############################################################################
3460
3461package CFClient::UI::SpellList;
3462
3463our @ISA = CFClient::UI::Table::;
3464
3465sub new {
3466 my $class = shift;
3467
3468 my $self = $class->SUPER::new (
3469 binding => [],
3470 commands => [],
3471 @_,
3472 )
3473}
3474
3475# XXX: Do sorting? Argl...
3476sub add_spell {
3477 my ($self, $spell) = @_;
3478 $self->{spells}->{$spell->{name}} = $spell;
3479
3480 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3481 face => $spell->{face},
3482 can_hover => 1,
3483 can_events => 1,
3484 tooltip => $spell->{message});
3485
3486 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487 text => $spell->{name},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message},
3491 expand => 1);
3492
3493 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496 expand => 1);
3497
3498 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499 text => "bind to key",
3500 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501}
3502
3503sub rebuild_spell_list {
3504 my ($self) = @_;
3505 $self->{tbl_idx} = 0;
3506 $self->add_spell ($_) for values %{$self->{spells}};
3507}
3508
3509sub remove_spell {
3510 my ($self, $spell) = @_;
3511 delete $self->{spells}->{$spell->{name}};
3512 $self->rebuild_spell_list;
3513}
3514
3515#############################################################################
3516
3002package CFClient::UI::Root; 3517package CFClient::UI::Root;
3003 3518
3004our @ISA = CFClient::UI::Container::; 3519our @ISA = CFClient::UI::Container::;
3520
3521use List::Util qw(min max);
3005 3522
3006use CFClient::OpenGL; 3523use CFClient::OpenGL;
3007 3524
3008sub new { 3525sub new {
3009 my $class = shift; 3526 my $class = shift;
3016 Scalar::Util::weaken ($self->{root} = $self); 3533 Scalar::Util::weaken ($self->{root} = $self);
3017 3534
3018 $self 3535 $self
3019} 3536}
3020 3537
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 { 3538sub size_request {
3038 my ($self) = @_; 3539 my ($self) = @_;
3039 3540
3040 ($self->{w}, $self->{h}) 3541 ($self->{w}, $self->{h})
3041} 3542}
3053 3554
3054 int $coord + 0.5 3555 int $coord + 0.5
3055} 3556}
3056 3557
3057sub size_allocate { 3558sub size_allocate {
3058 my ($self, $w, $h, $changed) = @_; 3559 my ($self, $w, $h) = @_;
3059 3560
3060 for my $child ($self->children) { 3561 for my $child ($self->children) {
3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3562 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062 3563
3063 $X = $child->{force_x} if exists $child->{force_x}; 3564 $X = $child->{force_x} if exists $child->{force_x};
3131 $_->() 3632 $_->()
3132 for values %{delete $self->{refresh_hook}}; 3633 for values %{delete $self->{refresh_hook}};
3133 } 3634 }
3134 3635
3135 if ($self->{realloc}) { 3636 if ($self->{realloc}) {
3637 my %queue;
3136 my @queue; 3638 my @queue;
3639 my $widget;
3137 3640
3641 outer:
3138 while () { 3642 while () {
3139 if ($self->{realloc}) { 3643 if (my $realloc = delete $self->{realloc}) {
3140 #TODO use array-of-depth approach 3644 for $widget (values %$realloc) {
3645 $widget->{visible} or next; # do not resize invisible widgets
3141 3646
3142 @queue = sort { $a->{visible} <=> $b->{visible} } 3647 $queue{$widget+0}++ and next; # duplicates are common
3143 @queue, values %{delete $self->{realloc}}; 3648
3649 push @{ $queue[$widget->{visible}] }, $widget;
3650 }
3144 } 3651 }
3145 3652
3653 while () {
3654 @queue or last outer;
3655
3146 my $widget = pop @queue || last; 3656 $widget = pop @{ $queue[-1] || [] }
3657 and last;
3658
3659 pop @queue;
3660 }
3147 3661
3148 $widget->{visible} or last; # do not resize invisible widgets 3662 delete $queue{$widget+0};
3149 3663
3150 my ($w, $h) = $widget->size_request; 3664 my ($w, $h) = $widget->size_request;
3151 3665
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3666 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3667 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3668
3669 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3670 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3154 3671
3155 $w = $widget->{force_w} if exists $widget->{force_w}; 3672 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h}; 3673 $h = $widget->{force_h} if exists $widget->{force_h};
3157 3674
3675 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3676 || delete $widget->{force_realloc}) {
3158 $widget->{req_w} = $w; 3677 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h; 3678 $widget->{req_h} = $h;
3160 3679
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3680 $self->{size_alloc}{$widget+0} = $widget;
3162 3681
3163 push @queue, $widget->{parent} 3682 if (my $parent = $widget->{parent}) {
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 3683 $self->{realloc}{$parent+0} = $parent
3684 unless $queue{$parent+0};
3685
3686 $parent->{force_size_alloc} = 1;
3687 $self->{size_alloc}{$parent+0} = $parent;
3688 }
3689 }
3690
3691 delete $self->{realloc}{$widget+0};
3165 } 3692 }
3166 } 3693 }
3167 3694
3168 while (my $size_alloc = delete $self->{size_alloc}) { 3695 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3696 my @queue = sort { $b->{visible} <=> $a->{visible} }
3170 values %$size_alloc; 3697 values %$size_alloc;
3171 3698
3172 while () { 3699 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last }; 3700 my $widget = pop @queue || last;
3174 3701
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3702 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177 3703
3178 $w = 0 if $w < 0; 3704 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0; 3705 $h = 0 if $h < 0;
3180 3706
3181 $w = int $w + 0.5; 3707 $w = int $w + 0.5;
3182 $h = int $h + 0.5; 3708 $h = int $h + 0.5;
3183 3709
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3710 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3711 $widget->{old_w} = $widget->{w};
3712 $widget->{old_h} = $widget->{h};
3185 3713
3186 $widget->{w} = $w; 3714 $widget->{w} = $w;
3187 $widget->{h} = $h; 3715 $widget->{h} = $h;
3188 3716
3189 $widget->emit (size_allocate => $w, $h, $changed); 3717 $widget->emit (size_allocate => $w, $h);
3718 }
3190 } 3719 }
3191 } 3720 }
3192 3721
3193 while ($self->{post_alloc_hook}) { 3722 while ($self->{post_alloc_hook}) {
3194 $_->() 3723 $_->()
3195 for values %{delete $self->{post_alloc_hook}}; 3724 for values %{delete $self->{post_alloc_hook}};
3196 } 3725 }
3726
3197 3727
3198 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3728 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3729 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200 glClear GL_COLOR_BUFFER_BIT; 3730 glClear GL_COLOR_BUFFER_BIT;
3201 3731
3203 glLoadIdentity; 3733 glLoadIdentity;
3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3734 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205 glMatrixMode GL_MODELVIEW; 3735 glMatrixMode GL_MODELVIEW;
3206 glLoadIdentity; 3736 glLoadIdentity;
3207 3737
3738 {
3739 package CFClient::UI::Base;
3740
3741 ($draw_x, $draw_y, $draw_w, $draw_h) =
3742 (0, 0, $self->{w}, $self->{h});
3743 }
3744
3208 $self->_draw; 3745 $self->_draw;
3209} 3746}
3210 3747
3211############################################################################# 3748#############################################################################
3212 3749

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines