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.262 by elmex, Wed May 31 13:44:26 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;
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 $self->SUPER::realloc;
1548}
1549
1472sub set_text { 1550sub set_text {
1473 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1474 1552
1475 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1477 1555
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
1480 1559
1481 $self->realloc; 1560 $self->realloc;
1482 $self->update; 1561 $self->update;
1483} 1562}
1484 1563
1490 1569
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1571
1493 $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;
1494 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1574 delete $self->{req_h};
1495 1575
1496 $self->realloc; 1576 $self->realloc;
1497 $self->update; 1577 $self->update;
1498} 1578}
1499 1579
1500sub size_request { 1580sub size_request {
1501 my ($self) = @_; 1581 my ($self) = @_;
1502 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1591
1509 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1510 1593
1511 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1597
1515 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1516 1599
1517 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1519 } 1602 }
1520 1603
1521 ($w, $h) 1604 ($w, $h)
1605 }
1522} 1606}
1523 1607
1524sub size_allocate { 1608sub size_allocate {
1525 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1526 1610
1611 delete $self->{ox};
1612
1527 delete $self->{texture}; 1613 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1528} 1615}
1529 1616
1530sub set_fontsize { 1617sub set_fontsize {
1531 my ($self, $fontsize) = @_; 1618 my ($self, $fontsize) = @_;
1532 1619
1547 $self->{layout}->set_width ($self->{w}); 1634 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1635 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 1638
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1639 new_from_layout CFClient::Texture $self->{layout}
1640 };
1553 1641
1642 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 1645 : ($self->{w} - $tex->{w}) * 0.5);
1557 1646
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 1649 : ($self->{h} - $tex->{h}) * 0.5);
1561
1562 $tex
1563 }; 1650 };
1564 1651
1565 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567 1654
1655 glColor_premultiply @{$self->{fg}}
1568 if ($tex->{format} == GL_ALPHA) { 1656 if $tex->{format} == GL_ALPHA;
1569 glColor @{$self->{fg}}; 1657
1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 }
1574 1659
1575 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1576} 1661}
1577 1662
1578############################################################################# 1663#############################################################################
1605 1690
1606 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1607 1692
1608 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1609 1694
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 1696 $self->{text} = $text;
1614 1697
1615 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1617 1701
1618 $self->_emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1619} 1706}
1620 1707
1621sub set_text { 1708sub set_text {
1622 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1623 1710
1624 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1625 $self->_set_text ($text); 1712 $self->_set_text ($text);
1626
1627 $self->realloc;
1628} 1713}
1629 1714
1630sub get_text { 1715sub get_text {
1631 $_[0]{text} 1716 $_[0]{text}
1632} 1717}
1662 $self->{cursor} = length $text; 1747 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 1748 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 1749 $self->_emit ('escape');
1665 } elsif ($uni) { 1750 } elsif ($uni) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 1751 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else {
1753 return 0;
1667 } 1754 }
1668 1755
1669 $self->_set_text ($text); 1756 $self->_set_text ($text);
1670 1757
1671 $self->realloc; 1758 $self->realloc;
1759
1760 1
1672} 1761}
1673 1762
1674sub focus_in { 1763sub focus_in {
1675 my ($self) = @_; 1764 my ($self) = @_;
1676 1765
1691 utf8::encode $text; 1780 utf8::encode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 1781 $self->{cursor} = length substr $text, 0, $idx;
1693 1782
1694 $self->_set_text ($self->{text}); 1783 $self->_set_text ($self->{text});
1695 $self->update; 1784 $self->update;
1785
1786 1
1696} 1787}
1697 1788
1698sub mouse_motion { 1789sub mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 1790 my ($self, $ev, $x, $y) = @_;
1700# 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
1701} 1794}
1702 1795
1703sub _draw { 1796sub _draw {
1704 my ($self) = @_; 1797 my ($self) = @_;
1705 1798
1706 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1707 1800
1708 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1709 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1710 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1711 } else { 1804 } else {
1712 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1713 } 1806 }
1714 1807
1715 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1716 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1718 glVertex 0 , 0; 1811 glVertex 0 , 0;
1719 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1720 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1721 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
1782 } else { 1875 } else {
1783 $self->set_text ($self->{history_saveback}); 1876 $self->set_text ($self->{history_saveback});
1784 } 1877 }
1785 1878
1786 } else { 1879 } else {
1787 $self->SUPER::key_down ($ev); 1880 return $self->SUPER::key_down ($ev)
1881 }
1882
1788 } 1883 1
1789
1790} 1884}
1791 1885
1792############################################################################# 1886#############################################################################
1793 1887
1794package CFClient::UI::Button; 1888package CFClient::UI::Button;
1823 my ($self, $ev, $x, $y) = @_; 1917 my ($self, $ev, $x, $y) = @_;
1824 1918
1825 $self->emit ("activate") 1919 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 1920 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 1921 && $y >= 0 && $y < $self->{h};
1922
1923 1
1828} 1924}
1829 1925
1830sub _draw { 1926sub _draw {
1831 my ($self) = @_; 1927 my ($self) = @_;
1832 1928
1833 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835 if ($GRAB == $self) {
1836 $self->{fg} = $self->{active_fg};
1837 }
1838 1930
1839 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1842 1934
1886 1978
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 1981 $self->{state} = !$self->{state};
1890 $self->_emit (changed => $self->{state}); 1982 $self->_emit (changed => $self->{state});
1983 } else {
1984 return 0
1985 }
1986
1891 } 1987 1
1892} 1988}
1893 1989
1894sub _draw { 1990sub _draw {
1895 my ($self) = @_; 1991 my ($self) = @_;
1896 1992
2063 2159
2064 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
2066 2162
2067 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
2068 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;
2069 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071 2168
2072 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
2234 2331
2235 $self->SUPER::button_down ($ev, $x, $y); 2332 $self->SUPER::button_down ($ev, $x, $y);
2236 2333
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2335
2239 $self->mouse_motion ($ev, $x, $y); 2336 $self->mouse_motion ($ev, $x, $y)
2240} 2337}
2241 2338
2242sub mouse_motion { 2339sub mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2340 my ($self, $ev, $x, $y) = @_;
2244 2341
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2345 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2346
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2347 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2348
2252 $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
2253 } 2354 1
2254} 2355}
2255 2356
2256sub update { 2357sub update {
2257 my ($self) = @_; 2358 my ($self) = @_;
2258 2359
2259 $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}) {
2260 $self->set_value ($self->{range}[0]); 2368 $self->set_value ($self->{range}[0]);
2261 2369
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2371 my $range = ($hi - $page - $lo) || 1e-100;
2264 2372
2270 $value = ($value - $lo) / $range; 2378 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 2379 $value = $value * $self->{scale} + $self->{offset};
2272 2380
2273 $self->{knob_x} = $value - $knob_w * 0.5; 2381 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 2382 $self->{knob_w} = $knob_w;
2275 }); 2383 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 2384
2283 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
2284 2386
2285 glScale $self->{w}, $self->{h}; 2387 glScale $self->{w}, $self->{h};
2286 2388
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}
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764 2866
2765 if ($tex) { 2867 if ($tex) {
2766 glEnable GL_TEXTURE_2D; 2868 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1; 2870 glColor 0, 0, 0, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D; 2872 glDisable GL_TEXTURE_2D;
2771 } 2873 }
2772} 2874}
2773 2875
2780 $self->SUPER::DESTROY; 2882 $self->SUPER::DESTROY;
2781} 2883}
2782 2884
2783############################################################################# 2885#############################################################################
2784 2886
2785package CFClient::UI::Inventory; 2887package CFClient::UI::Buttonbar;
2786 2888
2787our @ISA = CFClient::UI::ScrolledWindow::; 2889our @ISA = CFClient::UI::HBox::;
2788 2890
2789sub new { 2891# 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 2892
2825############################################################################# 2893#############################################################################
2826 2894
2827package CFClient::UI::Menu; 2895package CFClient::UI::Menu;
2828 2896
2878 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2879 2947
2880 # TODO: should use vbox->find_widget or so 2948 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER}; 2950 $self->{hover} = $self->{item}{$HOVER};
2951
2952 0
2883} 2953}
2884 2954
2885sub button_up { 2955sub button_up {
2886 my ($self, $ev, $x, $y) = @_; 2956 my ($self, $ev, $x, $y) = @_;
2887 2957
2889 undef $GRAB; 2959 undef $GRAB;
2890 $self->hide; 2960 $self->hide;
2891 2961
2892 $self->_emit ("popdown"); 2962 $self->_emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover}; 2963 $self->{hover}[1]->() if $self->{hover};
2964 } else {
2965 return 0
2966 }
2967
2894 } 2968 1
2895} 2969}
2896 2970
2897############################################################################# 2971#############################################################################
2898 2972
2899package CFClient::UI::Statusbox; 2973package CFClient::UI::Multiplexer;
2900 2974
2901our @ISA = CFClient::UI::VBox::; 2975our @ISA = CFClient::UI::Container::;
2902 2976
2903sub new { 2977sub new {
2904 my $class = shift; 2978 my $class = shift;
2905 2979
2906 $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 (
2907 fontsize => 0.8, 3089 fontsize => 0.8,
2908 @_, 3090 @_,
2909 ) 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
2910} 3098}
2911 3099
2912sub reorder { 3100sub reorder {
2913 my ($self) = @_; 3101 my ($self) = @_;
2914 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} };
2915 3108
2916 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 } 3111 }
2919 3112
2922 my @items = sort { 3115 my @items = sort {
2923 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
2926 3119
3120 $self->{timer}->interval (1);
3121
2927 my $count = 10 + 1; 3122 my $count = 10 + 1;
2928 for my $item (@items) { 3123 for my $item (@items) {
2929 last unless --$count; 3124 last unless --$count;
2930 3125
2931 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text}; 3130 : $item->{text};
2936 3131
2944 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize}, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44, 3143 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
2950 can_events => 1, 3145 can_events => 1,
2951 can_hover => 1 3146 can_hover => 1
2952 }; 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;
2953 } 3160 }
2954 3161
2955 $self->clear; 3162 $self->clear;
2956 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
2957} 3164}
2962 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
2964 3171
2965 return unless $text; 3172 return unless $text;
2966 3173
2967 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968 3175
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970 3177
2971 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
3002 3209
3003 $self->reorder; 3210 $self->reorder;
3004 $self->SUPER::reconfigure; 3211 $self->SUPER::reconfigure;
3005} 3212}
3006 3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
3007############################################################################# 3222#############################################################################
3008 3223
3009package CFClient::UI::Root; 3224package CFClient::UI::Inventory;
3010 3225
3011our @ISA = CFClient::UI::Container::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
3012
3013use CFClient::OpenGL;
3014 3227
3015sub new { 3228sub new {
3016 my $class = shift; 3229 my $class = shift;
3017 3230
3018 my $self = $class->SUPER::new ( 3231 my $self = $class->SUPER::new (
3019 visible => 1, 3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3020 @_, 3233 @_,
3021 ); 3234 );
3022 3235
3023 Scalar::Util::weaken ($self->{root} = $self);
3024
3025 $self 3236 $self
3026} 3237}
3027 3238
3028sub size_request { 3239sub set_items {
3029 my ($self) = @_; 3240 my ($self, $items) = @_;
3030 3241
3031 ($self->{w}, $self->{h}) 3242 $self->{child}->clear;
3032} 3243 return unless $items;
3033 3244
3034sub _to_pixel { 3245 my @items = sort {
3035 my ($coord, $size, $max) = @_; 3246 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name})
3248 } @$items;
3036 3249
3037 $coord = 3250 $self->{real_items} = \@items;
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041 3251
3042 $coord = 0 if $coord < 0; 3252 my $row = 0;
3043 $coord = $max - $size if $coord > $max - $size; 3253 for my $item (@items) {
3254 CFClient::Item::update_widgets $item;
3044 3255
3045 int $coord + 0.5 3256 $self->{child}->add (0, $row, $item->{face_widget});
3046} 3257 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget});
3047 3259
3048sub size_allocate { 3260 $row++;
3049 my ($self, $w, $h) = @_;
3050
3051 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053
3054 $X = $child->{force_x} if exists $child->{force_x};
3055 $Y = $child->{force_y} if exists $child->{force_y};
3056
3057 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h};
3059
3060 $child->configure ($X, $Y, $W, $H);
3061 } 3261 }
3062}
3063
3064sub coord2local {
3065 my ($self, $x, $y) = @_;
3066
3067 ($x, $y)
3068}
3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
3076sub update {
3077 my ($self) = @_;
3078
3079 $::WANT_REFRESH++;
3080}
3081
3082sub add {
3083 my ($self, @children) = @_;
3084
3085 $_->{is_toplevel} = 1
3086 for @children;
3087
3088 $self->SUPER::add (@children);
3089}
3090
3091sub remove {
3092 my ($self, @children) = @_;
3093
3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
3104}
3105
3106sub on_refresh {
3107 my ($self, $id, $cb) = @_;
3108
3109 $self->{refresh_hook}{$id} = $cb;
3110}
3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
3118sub draw {
3119 my ($self) = @_;
3120
3121 while ($self->{refresh_hook}) {
3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
3124 }
3125
3126 if ($self->{realloc}) {
3127 my @queue;
3128
3129 while () {
3130 if ($self->{realloc}) {
3131 #TODO use array-of-depth approach
3132
3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
3137 }
3138
3139 my $widget = pop @queue || last;
3140
3141 $widget->{visible} or last; # do not resize invisible widgets
3142
3143 my ($w, $h) = $widget->size_request;
3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3152 || delete $widget->{force_realloc}) {
3153 $widget->{req_w} = $w;
3154 $widget->{req_h} = $h;
3155
3156 $self->{size_alloc}{$widget+0} = $widget;
3157
3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3167 }
3168 }
3169
3170 while (my $size_alloc = delete $self->{size_alloc}) {
3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178
3179 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0;
3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h);
3190 }
3191 }
3192 }
3193
3194 while ($self->{post_alloc_hook}) {
3195 $_->()
3196 for values %{delete $self->{post_alloc_hook}};
3197 }
3198
3199
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT;
3203
3204 glMatrixMode GL_PROJECTION;
3205 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity;
3209
3210 $self->_draw;
3211} 3262}
3212 3263
3213############################################################################# 3264#############################################################################
3214 3265
3215package CFClient::UI::BindEditor; 3266package CFClient::UI::BindEditor;
3310 $rec = $::CONN->stop_record if $::CONN; 3361 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY'; 3362 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec); 3363 $self->set_command_list ($rec);
3313} 3364}
3314 3365
3315# if $commit is true, the binding will be set after the user entered a key combo 3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3316sub ask_for_bind { 3372sub ask_for_bind {
3317 my ($self, $commit) = @_; 3373 my ($self, $commit) = @_;
3318 3374
3319 CFClient::Binder::open_binding_dialog (sub { 3375 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_; 3376 my ($mod, $sym) = @_;
3386 3442
3387 for (@$cmds) { 3443 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox); 3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389 3445
3390 my $i = $idx; 3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3391 $hb->add (new CFClient::UI::Button 3448 $hb->add (new CFClient::UI::Button
3392 text => "delete", 3449 text => "delete",
3393 tooltip => "Deletes the action from the record", 3450 tooltip => "Deletes the action from the record",
3394 on_activate => sub { 3451 on_activate => sub {
3395 $self->{cmdbox}->remove ($hb); 3452 $self->{cmdbox}->remove ($hb);
3396 $cmds->[$i] = undef; 3453 $cmds->[$i] = undef;
3397 }); 3454 });
3398 3455
3399 $hb->add (new CFClient::UI::Label text => $_);
3400 3456
3401 $idx++ 3457 $idx++
3402 } 3458 }
3403} 3459}
3404 3460
3405
3406############################################################################# 3461#############################################################################
3407 3462
3408package CFClient::UI::SpellList; 3463package CFClient::UI::SpellList;
3409 3464
3410our @ISA = CFClient::UI::FancyFrame::; 3465our @ISA = CFClient::UI::Table::;
3411 3466
3412sub new { 3467sub new {
3413 my $class = shift; 3468 my $class = shift;
3414 3469
3415 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3470 my $self = $class->SUPER::new (
3416 3471 binding => [],
3417 $self->add (new CFClient::UI::ScrolledWindow 3472 commands => [],
3418 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3473 @_,
3419 3474 )
3420 $self;
3421} 3475}
3422 3476
3423# XXX: Do sorting? Argl... 3477# XXX: Do sorting? Argl...
3424sub add_spell { 3478sub add_spell {
3425 my ($self, $spell) = @_; 3479 my ($self, $spell) = @_;
3426 $self->{spells}->{$spell->{name}} = $spell; 3480 $self->{spells}->{$spell->{name}} = $spell;
3427 3481
3428 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3429 face => $spell->{face}, 3483 face => $spell->{face},
3430 can_hover => 1, 3484 can_hover => 1,
3431 can_events => 1, 3485 can_events => 1,
3432 tooltip => $spell->{message}); 3486 tooltip => $spell->{message});
3433 3487
3434 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3435 text => $spell->{name}, 3489 text => $spell->{name},
3436 can_hover => 1, 3490 can_hover => 1,
3437 can_events => 1, 3491 can_events => 1,
3438 tooltip => $spell->{message}, 3492 tooltip => $spell->{message},
3439 expand => 1); 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
3440 $self->{spellbox}->add (2, $self->{tbl_idx}++, new CFClient::UI::Button 3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3441 text => "bind to key", 3501 text => "bind to key",
3442 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3443} 3503}
3444 3504
3445sub rebuild_spell_list { 3505sub rebuild_spell_list {
3454 $self->rebuild_spell_list; 3514 $self->rebuild_spell_list;
3455} 3515}
3456 3516
3457############################################################################# 3517#############################################################################
3458 3518
3519package CFClient::UI::Root;
3520
3521our @ISA = CFClient::UI::Container::;
3522
3523use List::Util qw(min max);
3524
3525use CFClient::OpenGL;
3526
3527sub new {
3528 my $class = shift;
3529
3530 my $self = $class->SUPER::new (
3531 visible => 1,
3532 @_,
3533 );
3534
3535 Scalar::Util::weaken ($self->{root} = $self);
3536
3537 $self
3538}
3539
3540sub size_request {
3541 my ($self) = @_;
3542
3543 ($self->{w}, $self->{h})
3544}
3545
3546sub _to_pixel {
3547 my ($coord, $size, $max) = @_;
3548
3549 $coord =
3550 $coord eq "center" ? ($max - $size) * 0.5
3551 : $coord eq "max" ? $max
3552 : $coord;
3553
3554 $coord = 0 if $coord < 0;
3555 $coord = $max - $size if $coord > $max - $size;
3556
3557 int $coord + 0.5
3558}
3559
3560sub size_allocate {
3561 my ($self, $w, $h) = @_;
3562
3563 for my $child ($self->children) {
3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3565
3566 $X = $child->{force_x} if exists $child->{force_x};
3567 $Y = $child->{force_y} if exists $child->{force_y};
3568
3569 $X = _to_pixel $X, $W, $self->{w};
3570 $Y = _to_pixel $Y, $H, $self->{h};
3571
3572 $child->configure ($X, $Y, $W, $H);
3573 }
3574}
3575
3576sub coord2local {
3577 my ($self, $x, $y) = @_;
3578
3579 ($x, $y)
3580}
3581
3582sub coord2global {
3583 my ($self, $x, $y) = @_;
3584
3585 ($x, $y)
3586}
3587
3588sub update {
3589 my ($self) = @_;
3590
3591 $::WANT_REFRESH++;
3592}
3593
3594sub add {
3595 my ($self, @children) = @_;
3596
3597 $_->{is_toplevel} = 1
3598 for @children;
3599
3600 $self->SUPER::add (@children);
3601}
3602
3603sub remove {
3604 my ($self, @children) = @_;
3605
3606 $self->SUPER::remove (@children);
3607
3608 delete $self->{is_toplevel}
3609 for @children;
3610
3611 while (@children) {
3612 my $w = pop @children;
3613 push @children, $w->children;
3614 $w->set_invisible;
3615 }
3616}
3617
3618sub on_refresh {
3619 my ($self, $id, $cb) = @_;
3620
3621 $self->{refresh_hook}{$id} = $cb;
3622}
3623
3624sub on_post_alloc {
3625 my ($self, $id, $cb) = @_;
3626
3627 $self->{post_alloc_hook}{$id} = $cb;
3628}
3629
3630sub draw {
3631 my ($self) = @_;
3632
3633 while ($self->{refresh_hook}) {
3634 $_->()
3635 for values %{delete $self->{refresh_hook}};
3636 }
3637
3638 if ($self->{realloc}) {
3639 my %queue;
3640 my @queue;
3641 my $widget;
3642
3643 outer:
3644 while () {
3645 if (my $realloc = delete $self->{realloc}) {
3646 for $widget (values %$realloc) {
3647 $widget->{visible} or next; # do not resize invisible widgets
3648
3649 $queue{$widget+0}++ and next; # duplicates are common
3650
3651 push @{ $queue[$widget->{visible}] }, $widget;
3652 }
3653 }
3654
3655 while () {
3656 @queue or last outer;
3657
3658 $widget = pop @{ $queue[-1] || [] }
3659 and last;
3660
3661 pop @queue;
3662 }
3663
3664 delete $queue{$widget+0};
3665
3666 my ($w, $h) = $widget->size_request;
3667
3668 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 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};
3673
3674 $w = $widget->{force_w} if exists $widget->{force_w};
3675 $h = $widget->{force_h} if exists $widget->{force_h};
3676
3677 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3678 || delete $widget->{force_realloc}) {
3679 $widget->{req_w} = $w;
3680 $widget->{req_h} = $h;
3681
3682 $self->{size_alloc}{$widget+0} = $widget;
3683
3684 if (my $parent = $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};
3694 }
3695 }
3696
3697 while (my $size_alloc = delete $self->{size_alloc}) {
3698 my @queue = sort { $b->{visible} <=> $a->{visible} }
3699 values %$size_alloc;
3700
3701 while () {
3702 my $widget = pop @queue || last;
3703
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3705
3706 $w = 0 if $w < 0;
3707 $h = 0 if $h < 0;
3708
3709 $w = int $w + 0.5;
3710 $h = int $h + 0.5;
3711
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};
3715
3716 $widget->{w} = $w;
3717 $widget->{h} = $h;
3718
3719 $widget->emit (size_allocate => $w, $h);
3720 }
3721 }
3722 }
3723
3724 while ($self->{post_alloc_hook}) {
3725 $_->()
3726 for values %{delete $self->{post_alloc_hook}};
3727 }
3728
3729
3730 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3731 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3732 glClear GL_COLOR_BUFFER_BIT;
3733
3734 glMatrixMode GL_PROJECTION;
3735 glLoadIdentity;
3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3737 glMatrixMode GL_MODELVIEW;
3738 glLoadIdentity;
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
3747 $self->_draw;
3748}
3749
3750#############################################################################
3751
3459package CFClient::UI; 3752package CFClient::UI;
3460 3753
3461$ROOT = new CFClient::UI::Root; 3754$ROOT = new CFClient::UI::Root;
3462$TOOLTIP = new CFClient::UI::Tooltip z => 900; 3755$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3463 3756

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines