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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines