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.259 by root, Tue May 30 07:13:09 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;
370sub size_allocate { 371sub size_allocate {
371 # nothing to be done 372 # nothing to be done
372} 373}
373 374
374sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
375} 381}
376 382
377sub set_max_size { 383sub set_max_size {
378 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
379 385
380 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
382} 390}
383 391
384sub set_tooltip { 392sub set_tooltip {
385 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
386 394
438 446
439 $::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
440 unless $FOCUS; 448 unless $FOCUS;
441} 449}
442 450
443sub mouse_motion { } 451sub mouse_motion { 0 }
444sub button_up { } 452sub button_up { 0 }
445sub key_down { } 453sub key_down { 0 }
446sub key_up { } 454sub key_up { 0 }
447 455
448sub button_down { 456sub button_down {
449 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
450 458
451 $self->focus_in; 459 $self->focus_in;
452}
453 460
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459 463
460sub find_widget { 464sub find_widget {
461 my ($self, $x, $y) = @_; 465 my ($self, $x, $y) = @_;
462 466
463 return () unless $self->{can_events}; 467 return () unless $self->{can_events};
525 529
526 $self->realloc; 530 $self->realloc;
527 $self->update; 531 $self->update;
528} 532}
529 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
530sub draw { 538sub draw {
531 my ($self) = @_; 539 my ($self) = @_;
532 540
533 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);
534 552
535 glPushMatrix; 553 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw;
538 glPopMatrix;
539 555
540 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
541 my ($x, $y) = @$self{qw(x y)};
542
543 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
544 glEnable GL_BLEND; 558 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glBegin GL_QUADS; 560 glBegin GL_QUADS;
547 glVertex $x , $y; 561 glVertex 0 , 0;
548 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
549 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
550 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
551 glEnd; 565 glEnd;
552 glDisable GL_BLEND; 566 glDisable GL_BLEND;
553 } 567 }
554 568
555 if ($ENV{CFPLUS_DEBUG} & 1) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix; 570 glPushMatrix;
557 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
559 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0; 574 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
564 glEnd; 578 glEnd;
565 glPopMatrix; 579 glPopMatrix;
566 #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;
567 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
568} 585}
569 586
570sub _draw { 587sub _draw {
571 my ($self) = @_; 588 my ($self) = @_;
572 589
610 627
611 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
613 630
614 glEnable GL_BLEND; 631 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 633 glColor_premultiply @$color;
617 634
618 glBegin GL_QUADS; 635 glBegin GL_QUADS;
619 glVertex 0 , 0; 636 glVertex 0 , 0;
620 glVertex 0 , $h; 637 glVertex 0 , $h;
621 glVertex $w, $h; 638 glVertex $w, $h;
652our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
653 670
654sub new { 671sub new {
655 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
656 673
657 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
658 675
659 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
660 children => [], 677 children => [],
661 can_events => 0, 678 can_events => 0,
662 %arg, 679 %arg,
663 ); 680 );
681
664 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
665 684
666 $self 685 $self
667} 686}
668 687
669sub add { 688sub add {
717 $x -= $self->{x}; 736 $x -= $self->{x};
718 $y -= $self->{y}; 737 $y -= $self->{y};
719 738
720 my $res; 739 my $res;
721 740
722 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
724 and return $res; 743 and return $res;
725 } 744 }
726 745
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
776 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
777} 796}
778 797
779############################################################################# 798#############################################################################
780 799
800# back-buffered drawing area
801
781package CFClient::UI::Window; 802package CFClient::UI::Window;
782 803
783our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
784 805
785use CFClient::OpenGL; 806use CFClient::OpenGL;
803 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 825 $self->update;
805} 826}
806 827
807sub _render { 828sub _render {
829 my ($self) = @_;
830
808 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
809} 832}
810 833
811sub render_child { 834sub render_child {
812 my ($self) = @_; 835 my ($self) = @_;
813 836
814 $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 {
815 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
817 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
818 $self->_render; 848 $self->_render;
819 }; 849 };
820} 850}
821 851
822sub _draw { 852sub _draw {
823 my ($self) = @_; 853 my ($self) = @_;
824 854
825 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
826 856
827 my $tex = $self->{texture} 857 my $tex = $self->{texture}
828 or return; 858 or return;
829 859
830 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
833 863
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835 865
836 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
837} 867}
913} 943}
914 944
915sub _render { 945sub _render {
916 my ($self) = @_; 946 my ($self) = @_;
917 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
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 952
920 $self->SUPER::_render; 953 $self->SUPER::_render;
921} 954}
922 955
925package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
926 959
927our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
928 961
929sub new { 962sub new {
930 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
931 966
932 my $self; 967 my $self;
933 968
934 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
935 vertical => 1, 970 vertical => 1,
940 ; 975 ;
941 976
942 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider, 979 slider => $slider,
945 @_, 980 %arg,
946 ); 981 );
947 982
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
951 985
952 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
953} 993}
954 994
955sub update { 995sub update {
956 my ($self) = @_; 996 my ($self) = @_;
957 997
996 1036
997 if ($self->{bg}) { 1037 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
999 1039
1000 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
1003 1043
1004 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1045 glVertex 0 , 0;
1006 glVertex 0 , $h; 1046 glVertex 0 , $h;
1007 glVertex $w, $h; 1047 glVertex $w, $h;
1029my @border = 1069my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 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);
1032 1072
1033sub new { 1073sub new {
1034 my $class = shift; 1074 my ($class, %arg) = @_;
1075
1076 my $title = delete $arg{title};
1035 1077
1036 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1081 border => 0.6,
1040 can_events => 1, 1082 can_events => 1,
1041 min_w => 16, 1083 min_w => 16,
1042 min_h => 16, 1084 min_h => 16,
1043 @_ 1085 %arg,
1044 ); 1086 );
1045 1087
1046 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
1047 align => 0, 1089 align => 0,
1048 valign => 1, 1090 valign => 1,
1049 text => $self->{title}, 1091 text => $title,
1050 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
1051 1094
1052 $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};
1053} 1103}
1054 1104
1055sub border { 1105sub border {
1056 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1057} 1107}
1058 1108
1059sub size_request { 1109sub size_request {
1060 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
1061 1114
1062 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1063 1116
1064 ( 1117 (
1065 $w + $self->border * 2, 1118 $w + $self->border * 2,
1068} 1121}
1069 1122
1070sub size_allocate { 1123sub size_allocate {
1071 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1072 1125
1126 if ($self->{title}) {
1127 $self->{title}{w} = $w;
1128 $self->{title}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
1073 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1075 1136
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
1079 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1080} 1138}
1081 1139
1082sub button_down { 1140sub button_down {
1083 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1084 1142
1103 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1104 1162
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1167 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1168 };
1111 1169
1112 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
1117 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1118 1176
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1178
1121 $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});
1122 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1123 } 1187 1
1124} 1188}
1125 1189
1126sub button_up { 1190sub button_up {
1127 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1128 1192
1129 delete $self->{motion}; 1193 !!delete $self->{motion}
1130} 1194}
1131 1195
1132sub mouse_motion { 1196sub mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1134 1198
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1136} 1202}
1137 1203
1138sub _draw { 1204sub _draw {
1139 my ($self) = @_; 1205 my ($self) = @_;
1140 1206
1207 my $child = $self->{children}[0];
1208
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1211
1144 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1214
1147 my $border = $self->border; 1215 my $border = $self->border;
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1231 }
1164 1232
1165 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1166 1234
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1170} 1241}
1171 1242
1172############################################################################# 1243#############################################################################
1173 1244
1174package CFClient::UI::Table; 1245package CFClient::UI::Table;
1467 1538
1468 delete $self->{texture}; 1539 delete $self->{texture};
1469 $self->SUPER::update; 1540 $self->SUPER::update;
1470} 1541}
1471 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc;
1549}
1550
1472sub set_text { 1551sub set_text {
1473 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1474 1553
1475 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1498} 1577}
1499 1578
1500sub size_request { 1579sub size_request {
1501 my ($self) = @_; 1580 my ($self) = @_;
1502 1581
1582 if (exists $self->{req_h}) {
1583 @$self{qw(req_w req_h)}
1584 } else {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1590
1509 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1510 1592
1511 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1596
1515 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1516 1598
1517 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1519 } 1601 }
1520 1602
1521 ($w, $h) 1603 ($w, $h)
1604 }
1522} 1605}
1523 1606
1524sub size_allocate { 1607sub size_allocate {
1525 my ($self, $w, $h) = @_; 1608 my ($self, $w, $h) = @_;
1526 1609
1610 delete $self->{ox};
1611
1527 delete $self->{texture}; 1612 delete $self->{texture}
1613 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1528} 1614}
1529 1615
1530sub set_fontsize { 1616sub set_fontsize {
1531 my ($self, $fontsize) = @_; 1617 my ($self, $fontsize) = @_;
1532 1618
1547 $self->{layout}->set_width ($self->{w}); 1633 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1634 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1635 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1636 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 1637
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1638 new_from_layout CFClient::Texture $self->{layout}
1639 };
1553 1640
1641 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1642 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1643 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 1644 : ($self->{w} - $tex->{w}) * 0.5);
1557 1645
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1646 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1647 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 1648 : ($self->{h} - $tex->{h}) * 0.5);
1561
1562 $tex
1563 }; 1649 };
1564 1650
1565 glEnable GL_TEXTURE_2D; 1651 glEnable GL_TEXTURE_2D;
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567 1653
1654 glColor_premultiply @{$self->{fg}}
1568 if ($tex->{format} == GL_ALPHA) { 1655 if $tex->{format} == GL_ALPHA;
1569 glColor @{$self->{fg}}; 1656
1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 }
1574 1658
1575 glDisable GL_TEXTURE_2D; 1659 glDisable GL_TEXTURE_2D;
1576} 1660}
1577 1661
1578############################################################################# 1662#############################################################################
1605 1689
1606 delete $self->{cur_h}; 1690 delete $self->{cur_h};
1607 1691
1608 return if $self->{text} eq $text; 1692 return if $self->{text} eq $text;
1609 1693
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 1694 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 1695 $self->{text} = $text;
1614 1696
1615 $text =~ s/./*/g if $self->{hidden}; 1697 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 1698 $self->{layout}->set_text ("$text ");
1617 1699
1618 $self->_emit (changed => $self->{text}); 1700 $self->_emit (changed => $self->{text});
1701 $self->update;
1619} 1702}
1620 1703
1621sub set_text { 1704sub set_text {
1622 my ($self, $text) = @_; 1705 my ($self, $text) = @_;
1623 1706
1662 $self->{cursor} = length $text; 1745 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 1746 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 1747 $self->_emit ('escape');
1665 } elsif ($uni) { 1748 } elsif ($uni) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 1749 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else {
1751 return 0;
1667 } 1752 }
1668 1753
1669 $self->_set_text ($text); 1754 $self->_set_text ($text);
1670 1755
1671 $self->realloc; 1756 $self->realloc;
1757
1758 1
1672} 1759}
1673 1760
1674sub focus_in { 1761sub focus_in {
1675 my ($self) = @_; 1762 my ($self) = @_;
1676 1763
1691 utf8::encode $text; 1778 utf8::encode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 1779 $self->{cursor} = length substr $text, 0, $idx;
1693 1780
1694 $self->_set_text ($self->{text}); 1781 $self->_set_text ($self->{text});
1695 $self->update; 1782 $self->update;
1783
1784 1
1696} 1785}
1697 1786
1698sub mouse_motion { 1787sub mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 1788 my ($self, $ev, $x, $y) = @_;
1700# 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
1701} 1792}
1702 1793
1703sub _draw { 1794sub _draw {
1704 my ($self) = @_; 1795 my ($self) = @_;
1705 1796
1706 local $self->{fg} = $self->{fg}; 1797 local $self->{fg} = $self->{fg};
1707 1798
1708 if ($FOCUS == $self) { 1799 if ($FOCUS == $self) {
1709 glColor @{$self->{active_bg}}; 1800 glColor_premultiply @{$self->{active_bg}};
1710 $self->{fg} = $self->{active_fg}; 1801 $self->{fg} = $self->{active_fg};
1711 } else { 1802 } else {
1712 glColor @{$self->{bg}}; 1803 glColor_premultiply @{$self->{bg}};
1713 } 1804 }
1714 1805
1715 glEnable GL_BLEND; 1806 glEnable GL_BLEND;
1716 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1807 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717 glBegin GL_QUADS; 1808 glBegin GL_QUADS;
1718 glVertex 0 , 0; 1809 glVertex 0 , 0;
1719 glVertex 0 , $self->{h}; 1810 glVertex 0 , $self->{h};
1720 glVertex $self->{w}, $self->{h}; 1811 glVertex $self->{w}, $self->{h};
1721 glVertex $self->{w}, 0; 1812 glVertex $self->{w}, 0;
1782 } else { 1873 } else {
1783 $self->set_text ($self->{history_saveback}); 1874 $self->set_text ($self->{history_saveback});
1784 } 1875 }
1785 1876
1786 } else { 1877 } else {
1787 $self->SUPER::key_down ($ev); 1878 return $self->SUPER::key_down ($ev)
1879 }
1880
1788 } 1881 1
1789
1790} 1882}
1791 1883
1792############################################################################# 1884#############################################################################
1793 1885
1794package CFClient::UI::Button; 1886package CFClient::UI::Button;
1823 my ($self, $ev, $x, $y) = @_; 1915 my ($self, $ev, $x, $y) = @_;
1824 1916
1825 $self->emit ("activate") 1917 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 1918 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 1919 && $y >= 0 && $y < $self->{h};
1920
1921 1
1828} 1922}
1829 1923
1830sub _draw { 1924sub _draw {
1831 my ($self) = @_; 1925 my ($self) = @_;
1832 1926
1833 local $self->{fg} = $self->{fg}; 1927 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835 if ($GRAB == $self) {
1836 $self->{fg} = $self->{active_fg};
1837 }
1838 1928
1839 glEnable GL_TEXTURE_2D; 1929 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1; 1931 glColor 0, 0, 0, 1;
1842 1932
1886 1976
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 1979 $self->{state} = !$self->{state};
1890 $self->_emit (changed => $self->{state}); 1980 $self->_emit (changed => $self->{state});
1981 } else {
1982 return 0
1983 }
1984
1891 } 1985 1
1892} 1986}
1893 1987
1894sub _draw { 1988sub _draw {
1895 my ($self) = @_; 1989 my ($self) = @_;
1896 1990
2063 2157
2064 my $h1 = $self->{h} * (1 - $ycut1); 2158 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2); 2159 my $h2 = $self->{h} * (1 - $ycut2);
2066 2160
2067 glEnable GL_BLEND; 2161 glEnable GL_BLEND;
2068 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;
2069 glEnable GL_TEXTURE_2D; 2164 glEnable GL_TEXTURE_2D;
2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2165 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071 2166
2072 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2167 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS; 2168 glBegin GL_QUADS;
2234 2329
2235 $self->SUPER::button_down ($ev, $x, $y); 2330 $self->SUPER::button_down ($ev, $x, $y);
2236 2331
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2333
2239 $self->mouse_motion ($ev, $x, $y); 2334 $self->mouse_motion ($ev, $x, $y)
2240} 2335}
2241 2336
2242sub mouse_motion { 2337sub mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2244 2339
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2343 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2344
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2345 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2346
2252 $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
2253 } 2352 1
2254} 2353}
2255 2354
2256sub update { 2355sub update {
2257 my ($self) = @_; 2356 my ($self) = @_;
2258 2357
2259 $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}) {
2260 $self->set_value ($self->{range}[0]); 2366 $self->set_value ($self->{range}[0]);
2261 2367
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2368 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2369 my $range = ($hi - $page - $lo) || 1e-100;
2264 2370
2270 $value = ($value - $lo) / $range; 2376 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 2377 $value = $value * $self->{scale} + $self->{offset};
2272 2378
2273 $self->{knob_x} = $value - $knob_w * 0.5; 2379 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 2380 $self->{knob_w} = $knob_w;
2275 }); 2381 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 2382
2283 $self->SUPER::_draw (); 2383 $self->SUPER::_draw ();
2284 2384
2285 glScale $self->{w}, $self->{h}; 2385 glScale $self->{w}, $self->{h};
2286 2386
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}
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2863 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764 2864
2765 if ($tex) { 2865 if ($tex) {
2766 glEnable GL_TEXTURE_2D; 2866 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1; 2868 glColor 0, 0, 0, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D; 2870 glDisable GL_TEXTURE_2D;
2771 } 2871 }
2772} 2872}
2773 2873
2780 $self->SUPER::DESTROY; 2880 $self->SUPER::DESTROY;
2781} 2881}
2782 2882
2783############################################################################# 2883#############################################################################
2784 2884
2785package CFClient::UI::Inventory; 2885package CFClient::UI::Buttonbar;
2786 2886
2787our @ISA = CFClient::UI::ScrolledWindow::; 2887our @ISA = CFClient::UI::HBox::;
2788 2888
2789sub new { 2889# TODO: should actualyl wrap buttons and other goodies.
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824 2890
2825############################################################################# 2891#############################################################################
2826 2892
2827package CFClient::UI::Menu; 2893package CFClient::UI::Menu;
2828 2894
2878 my ($self, $ev, $x, $y) = @_; 2944 my ($self, $ev, $x, $y) = @_;
2879 2945
2880 # TODO: should use vbox->find_widget or so 2946 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER}; 2948 $self->{hover} = $self->{item}{$HOVER};
2949
2950 0
2883} 2951}
2884 2952
2885sub button_up { 2953sub button_up {
2886 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2887 2955
2889 undef $GRAB; 2957 undef $GRAB;
2890 $self->hide; 2958 $self->hide;
2891 2959
2892 $self->_emit ("popdown"); 2960 $self->_emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover}; 2961 $self->{hover}[1]->() if $self->{hover};
2962 } else {
2963 return 0
2964 }
2965
2894 } 2966 1
2895} 2967}
2896 2968
2897############################################################################# 2969#############################################################################
2898 2970
2899package CFClient::UI::Statusbox; 2971package CFClient::UI::Multiplexer;
2900 2972
2901our @ISA = CFClient::UI::VBox::; 2973our @ISA = CFClient::UI::Container::;
2902 2974
2903sub new { 2975sub new {
2904 my $class = shift; 2976 my $class = shift;
2905 2977
2906 $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 (
2907 fontsize => 0.8, 3087 fontsize => 0.8,
2908 @_, 3088 @_,
2909 ) 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
2910} 3096}
2911 3097
2912sub reorder { 3098sub reorder {
2913 my ($self) = @_; 3099 my ($self) = @_;
2914 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} };
2915 3106
2916 while (my ($k, $v) = each %{ $self->{item} }) { 3107 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3108 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 } 3109 }
2919 3110
2922 my @items = sort { 3113 my @items = sort {
2923 $a->{pri} <=> $b->{pri} 3114 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id} 3115 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} }; 3116 } values %{ $self->{item} };
2926 3117
3118 $self->{timer}->interval (1);
3119
2927 my $count = 10 + 1; 3120 my $count = 10 + 1;
2928 for my $item (@items) { 3121 for my $item (@items) {
2929 last unless --$count; 3122 last unless --$count;
2930 3123
2931 push @widgets, $item->{label} ||= do { 3124 my $label = $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all) 3125 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1 3126 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}" 3127 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text}; 3128 : $item->{text};
2936 3129
2944 tooltip => $item->{tooltip}, 3137 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP, 3138 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67, 3139 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize}, 3140 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44, 3141 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg}, 3142 fg => [@{ $item->{fg} }],
2950 can_events => 1, 3143 can_events => 1,
2951 can_hover => 1 3144 can_hover => 1
2952 }; 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;
2953 } 3158 }
2954 3159
2955 $self->clear; 3160 $self->clear;
2956 $self->SUPER::add (reverse @widgets); 3161 $self->SUPER::add (reverse @widgets);
2957} 3162}
2962 $text =~ s/^\s+//; 3167 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//; 3168 $text =~ s/\s+$//;
2964 3169
2965 return unless $text; 3170 return unless $text;
2966 3171
2967 my $timeout = time + ((delete $arg{timeout}) || 60); 3172 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968 3173
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3174 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970 3175
2971 if (my $item = $self->{item}{$group}) { 3176 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) { 3177 if ($item->{text} eq $text) {
3002 3207
3003 $self->reorder; 3208 $self->reorder;
3004 $self->SUPER::reconfigure; 3209 $self->SUPER::reconfigure;
3005} 3210}
3006 3211
3212sub DESTROY {
3213 my ($self) = @_;
3214
3215 $self->{timer}->cancel;
3216
3217 $self->SUPER::DESTROY;
3218}
3219
3007############################################################################# 3220#############################################################################
3008 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
3009package CFClient::UI::Root; 3517package CFClient::UI::Root;
3010 3518
3011our @ISA = CFClient::UI::Container::; 3519our @ISA = CFClient::UI::Container::;
3520
3521use List::Util qw(min max);
3012 3522
3013use CFClient::OpenGL; 3523use CFClient::OpenGL;
3014 3524
3015sub new { 3525sub new {
3016 my $class = shift; 3526 my $class = shift;
3122 $_->() 3632 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3633 for values %{delete $self->{refresh_hook}};
3124 } 3634 }
3125 3635
3126 if ($self->{realloc}) { 3636 if ($self->{realloc}) {
3637 my %queue;
3127 my @queue; 3638 my @queue;
3639 my $widget;
3128 3640
3641 outer:
3129 while () { 3642 while () {
3130 if ($self->{realloc}) { 3643 if (my $realloc = delete $self->{realloc}) {
3131 #TODO use array-of-depth approach 3644 for $widget (values %$realloc) {
3645 $widget->{visible} or next; # do not resize invisible widgets
3132 3646
3133 use sort 'stable'; 3647 $queue{$widget+0}++ and next; # duplicates are common
3134 3648
3135 @queue = sort { $a->{visible} <=> $b->{visible} } 3649 push @{ $queue[$widget->{visible}] }, $widget;
3136 @queue, values %{delete $self->{realloc}}; 3650 }
3137 } 3651 }
3138 3652
3653 while () {
3654 @queue or last outer;
3655
3139 my $widget = pop @queue || last; 3656 $widget = pop @{ $queue[-1] || [] }
3657 and last;
3658
3659 pop @queue;
3660 }
3140 3661
3141 $widget->{visible} or last; # do not resize invisible widgets 3662 delete $queue{$widget+0};
3142 3663
3143 my ($w, $h) = $widget->size_request; 3664 my ($w, $h) = $widget->size_request;
3144 3665
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3666 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $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};
3147 3671
3148 $w = $widget->{force_w} if exists $widget->{force_w}; 3672 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h}; 3673 $h = $widget->{force_h} if exists $widget->{force_h};
3150 3674
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3675 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3154 $widget->{req_h} = $h; 3678 $widget->{req_h} = $h;
3155 3679
3156 $self->{size_alloc}{$widget+0} = $widget; 3680 $self->{size_alloc}{$widget+0} = $widget;
3157 3681
3158 if (my $parent = $widget->{parent}) { 3682 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent; 3683 $self->{realloc}{$parent+0} = $parent
3160 #unshift @queue, $parent; 3684 unless $queue{$parent+0};
3685
3161 $parent->{force_size_alloc} = 1; 3686 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent; 3687 $self->{size_alloc}{$parent+0} = $parent;
3163 } 3688 }
3164 } 3689 }
3165 3690
3181 3706
3182 $w = int $w + 0.5; 3707 $w = int $w + 0.5;
3183 $h = int $h + 0.5; 3708 $h = int $h + 0.5;
3184 3709
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 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};
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); 3717 $widget->emit (size_allocate => $w, $h);
3190 } 3718 }
3205 glLoadIdentity; 3733 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3734 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3735 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3736 glLoadIdentity;
3209 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
3210 $self->_draw; 3745 $self->_draw;
3211} 3746}
3212 3747
3213############################################################################# 3748#############################################################################
3214 3749

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines