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.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

… …
171sub rescale_widgets { 171sub rescale_widgets {
172 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
173 173
174 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178 178
179 $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.]+$/;
180 $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};
181 $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};
182 $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.]+$/;
183 $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};
184 $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};
185 185
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188 188
189 } 189 }
190 } 190 }
191 191
192 reconfigure_widgets; 192 reconfigure_widgets;
… …
371sub size_allocate { 371sub size_allocate {
372 # nothing to be done 372 # nothing to be done
373} 373}
374 374
375sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
376} 381}
377 382
378sub set_max_size { 383sub set_max_size {
379 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
380 385
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
383} 390}
384 391
385sub set_tooltip { 392sub set_tooltip {
386 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
387 394
… …
439 446
440 $::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
441 unless $FOCUS; 448 unless $FOCUS;
442} 449}
443 450
444sub mouse_motion { } 451sub mouse_motion { 0 }
445sub button_up { } 452sub button_up { 0 }
446sub key_down { } 453sub key_down { 0 }
447sub key_up { } 454sub key_up { 0 }
448 455
449sub button_down { 456sub button_down {
450 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
451 458
452 $self->focus_in; 459 $self->focus_in;
460
461 0
453} 462}
454 463
455sub find_widget { 464sub find_widget {
456 my ($self, $x, $y) = @_; 465 my ($self, $x, $y) = @_;
457 466
… …
529sub draw { 538sub draw {
530 my ($self) = @_; 539 my ($self) = @_;
531 540
532 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
533 542
543 # update screen rectangle
534 local $draw_x = $draw_x + $self->{x}; 544 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y}; 545 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
536 548
537 return if $draw_x + $self->{w} < 0; 549 # skip widgets that are entirely outside the drawing area
538 return if $draw_x >= $draw_w; 550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
539 return if $draw_y + $self->{h} < 0; 551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
540 return if $draw_y >= $draw_h;
541 552
542 glPushMatrix; 553 glPushMatrix;
543 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
544 $self->_draw;
545 glPopMatrix;
546 555
547 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
548 my ($x, $y) = @$self{qw(x y)};
549
550 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
551 glEnable GL_BLEND; 558 glEnable GL_BLEND;
552 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
553 glBegin GL_QUADS; 560 glBegin GL_QUADS;
554 glVertex $x , $y; 561 glVertex 0 , 0;
555 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
556 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
557 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
558 glEnd; 565 glEnd;
559 glDisable GL_BLEND; 566 glDisable GL_BLEND;
560 } 567 }
561 568
562 if ($ENV{CFPLUS_DEBUG} & 1) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
563 glPushMatrix; 570 glPushMatrix;
564 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
566 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
567 glVertex 0 , 0; 574 glVertex 0 , 0;
568 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
569 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
570 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
571 glEnd; 578 glEnd;
572 glPopMatrix; 579 glPopMatrix;
573 #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;
574 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
575} 585}
576 586
577sub _draw { 587sub _draw {
578 my ($self) = @_; 588 my ($self) = @_;
579 589
… …
617 627
618 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
619 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
620 630
621 glEnable GL_BLEND; 631 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glColor @$color; 633 glColor_premultiply @$color;
624 634
625 glBegin GL_QUADS; 635 glBegin GL_QUADS;
626 glVertex 0 , 0; 636 glVertex 0 , 0;
627 glVertex 0 , $h; 637 glVertex 0 , $h;
628 glVertex $w, $h; 638 glVertex $w, $h;
… …
659our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
660 670
661sub new { 671sub new {
662 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
663 673
664 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
665 675
666 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
667 children => [], 677 children => [],
668 can_events => 0, 678 can_events => 0,
669 %arg, 679 %arg,
670 ); 680 );
681
671 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
672 684
673 $self 685 $self
674} 686}
675 687
676sub add { 688sub add {
… …
724 $x -= $self->{x}; 736 $x -= $self->{x};
725 $y -= $self->{y}; 737 $y -= $self->{y};
726 738
727 my $res; 739 my $res;
728 740
729 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
730 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
731 and return $res; 743 and return $res;
732 } 744 }
733 745
734 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
783 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
784} 796}
785 797
786############################################################################# 798#############################################################################
787 799
800# back-buffered drawing area
801
788package CFClient::UI::Window; 802package CFClient::UI::Window;
789 803
790our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
791 805
792use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
843 my $tex = $self->{texture} 857 my $tex = $self->{texture}
844 or return; 858 or return;
845 859
846 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
848 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
849 863
850 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
851 865
852 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
853} 867}
… …
944package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
945 959
946our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
947 961
948sub new { 962sub new {
949 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
950 966
951 my $self; 967 my $self;
952 968
953 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
954 vertical => 1, 970 vertical => 1,
… …
959 ; 975 ;
960 976
961 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
962 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
963 slider => $slider, 979 slider => $slider,
964 @_, 980 %arg,
965 ); 981 );
966 982
967 $self->{vp}->add ($self->{scrolled});
968 $self->add ($self->{vp});
969 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
970 985
971 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
972} 993}
973 994
974sub update { 995sub update {
975 my ($self) = @_; 996 my ($self) = @_;
976 997
… …
1015 1036
1016 if ($self->{bg}) { 1037 if ($self->{bg}) {
1017 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
1018 1039
1019 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
1020 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1021 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
1022 1043
1023 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
1024 glVertex 0 , 0; 1045 glVertex 0 , 0;
1025 glVertex 0 , $h; 1046 glVertex 0 , $h;
1026 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1048my @border = 1069my @border =
1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1050 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);
1051 1072
1052sub new { 1073sub new {
1053 my $class = shift; 1074 my ($class, %arg) = @_;
1075
1076 my $title = delete $arg{title};
1054 1077
1055 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1056 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1057 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1058 border => 0.6, 1081 border => 0.6,
1059 can_events => 1, 1082 can_events => 1,
1060 min_w => 16, 1083 min_w => 16,
1061 min_h => 16, 1084 min_h => 16,
1062 @_ 1085 %arg,
1063 ); 1086 );
1064 1087
1065 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
1066 align => 0, 1089 align => 0,
1067 valign => 1, 1090 valign => 1,
1068 text => $self->{title}, 1091 text => $title,
1069 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
1070 1094
1071 $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};
1072} 1103}
1073 1104
1074sub border { 1105sub border {
1075 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1076} 1107}
1077 1108
1078sub size_request { 1109sub size_request {
1079 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
1080 1114
1081 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1082 1116
1083 ( 1117 (
1084 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1087} 1121}
1088 1122
1089sub size_allocate { 1123sub size_allocate {
1090 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1091 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
1092 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1093 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1094 1136
1095 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1096 if $self->{title};
1097
1098 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1099} 1138}
1100 1139
1101sub button_down { 1140sub button_down {
1102 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1103 1142
… …
1122 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1123 1162
1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1127 $self->realloc; 1167 $self->realloc;
1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129 }; 1168 };
1130 1169
1131 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1132 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1133 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1136 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1137 1176
1138 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1139 1178
1140 $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});
1141 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1142 } 1187 1
1143} 1188}
1144 1189
1145sub button_up { 1190sub button_up {
1146 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1147 1192
1148 delete $self->{motion}; 1193 !!delete $self->{motion}
1149} 1194}
1150 1195
1151sub mouse_motion { 1196sub mouse_motion {
1152 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1153 1198
1154 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1155} 1202}
1156 1203
1157sub _draw { 1204sub _draw {
1158 my ($self) = @_; 1205 my ($self) = @_;
1159 1206
1207 my $child = $self->{children}[0];
1208
1160 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1161 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1162 1211
1163 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1165 1214
1166 my $border = $self->border; 1215 my $border = $self->border;
… …
1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1182 } 1231 }
1183 1232
1184 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1185 1234
1186 $self->{title}->draw if $self->{title};
1187
1188 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1189} 1241}
1190 1242
1191############################################################################# 1243#############################################################################
1192 1244
1193package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1486 1538
1487 delete $self->{texture}; 1539 delete $self->{texture};
1488 $self->SUPER::update; 1540 $self->SUPER::update;
1489} 1541}
1490 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 $self->SUPER::realloc;
1548}
1549
1491sub set_text { 1550sub set_text {
1492 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1493 1552
1494 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1495 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1496 1555
1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1498 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
1499 1559
1500 $self->realloc; 1560 $self->realloc;
1501 $self->update; 1561 $self->update;
1502} 1562}
1503 1563
… …
1509 1569
1510 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1511 1571
1512 $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;
1513 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1574 delete $self->{req_h};
1514 1575
1515 $self->realloc; 1576 $self->realloc;
1516 $self->update; 1577 $self->update;
1517} 1578}
1518 1579
1519sub size_request { 1580sub size_request {
1520 my ($self) = @_; 1581 my ($self) = @_;
1521 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1522 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1523 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1524 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1525 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1526 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1527 1591
1528 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1529 1593
1530 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1531 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1532 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1533 1597
1534 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1535 1599
1536 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1537 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1538 } 1602 }
1539 1603
1540 ($w, $h) 1604 ($w, $h)
1605 }
1541} 1606}
1542 1607
1543sub size_allocate { 1608sub size_allocate {
1544 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1610
1611 delete $self->{ox};
1545 1612
1546 delete $self->{texture} 1613 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1548} 1615}
1549 1616
… …
1567 $self->{layout}->set_width ($self->{w}); 1634 $self->{layout}->set_width ($self->{w});
1568 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1635 $self->{layout}->set_ellipsise ($self->{ellipsise});
1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1571 1638
1572 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1639 new_from_layout CFClient::Texture $self->{layout}
1640 };
1573 1641
1642 unless (exists $self->{ox}) {
1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1576 : ($self->{w} - $tex->{w}) * 0.5); 1645 : ($self->{w} - $tex->{w}) * 0.5);
1577 1646
1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1580 : ($self->{h} - $tex->{h}) * 0.5); 1649 : ($self->{h} - $tex->{h}) * 0.5);
1581
1582 $tex
1583 }; 1650 };
1584 1651
1585 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1586 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1587 1654
1655 glColor_premultiply @{$self->{fg}}
1588 if ($tex->{format} == GL_ALPHA) { 1656 if $tex->{format} == GL_ALPHA;
1589 glColor @{$self->{fg}}; 1657
1590 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1591 } else {
1592 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1593 }
1594 1659
1595 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1596} 1661}
1597 1662
1598############################################################################# 1663#############################################################################
… …
1625 1690
1626 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1627 1692
1628 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1629 1694
1630 delete $self->{texture};
1631
1632 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1633 $self->{text} = $text; 1696 $self->{text} = $text;
1634 1697
1635 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1636 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1637 1701
1638 $self->_emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1639} 1706}
1640 1707
1641sub set_text { 1708sub set_text {
1642 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1643 1710
1644 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1645 $self->_set_text ($text); 1712 $self->_set_text ($text);
1646
1647 $self->realloc;
1648} 1713}
1649 1714
1650sub get_text { 1715sub get_text {
1651 $_[0]{text} 1716 $_[0]{text}
1652} 1717}
… …
1682 $self->{cursor} = length $text; 1747 $self->{cursor} = length $text;
1683 } elsif ($uni == 27) { 1748 } elsif ($uni == 27) {
1684 $self->_emit ('escape'); 1749 $self->_emit ('escape');
1685 } elsif ($uni) { 1750 } elsif ($uni) {
1686 substr $text, $self->{cursor}++, 0, chr $uni; 1751 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else {
1753 return 0;
1687 } 1754 }
1688 1755
1689 $self->_set_text ($text); 1756 $self->_set_text ($text);
1690 1757
1691 $self->realloc; 1758 $self->realloc;
1759
1760 1
1692} 1761}
1693 1762
1694sub focus_in { 1763sub focus_in {
1695 my ($self) = @_; 1764 my ($self) = @_;
1696 1765
… …
1711 utf8::encode $text; 1780 utf8::encode $text;
1712 $self->{cursor} = length substr $text, 0, $idx; 1781 $self->{cursor} = length substr $text, 0, $idx;
1713 1782
1714 $self->_set_text ($self->{text}); 1783 $self->_set_text ($self->{text});
1715 $self->update; 1784 $self->update;
1785
1786 1
1716} 1787}
1717 1788
1718sub mouse_motion { 1789sub mouse_motion {
1719 my ($self, $ev, $x, $y) = @_; 1790 my ($self, $ev, $x, $y) = @_;
1720# 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
1721} 1794}
1722 1795
1723sub _draw { 1796sub _draw {
1724 my ($self) = @_; 1797 my ($self) = @_;
1725 1798
1726 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1727 1800
1728 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1729 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1730 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1731 } else { 1804 } else {
1732 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1733 } 1806 }
1734 1807
1735 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1737 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1738 glVertex 0 , 0; 1811 glVertex 0 , 0;
1739 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1740 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1741 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1802 } else { 1875 } else {
1803 $self->set_text ($self->{history_saveback}); 1876 $self->set_text ($self->{history_saveback});
1804 } 1877 }
1805 1878
1806 } else { 1879 } else {
1807 $self->SUPER::key_down ($ev); 1880 return $self->SUPER::key_down ($ev)
1881 }
1882
1808 } 1883 1
1809
1810} 1884}
1811 1885
1812############################################################################# 1886#############################################################################
1813 1887
1814package CFClient::UI::Button; 1888package CFClient::UI::Button;
… …
1843 my ($self, $ev, $x, $y) = @_; 1917 my ($self, $ev, $x, $y) = @_;
1844 1918
1845 $self->emit ("activate") 1919 $self->emit ("activate")
1846 if $x >= 0 && $x < $self->{w} 1920 if $x >= 0 && $x < $self->{w}
1847 && $y >= 0 && $y < $self->{h}; 1921 && $y >= 0 && $y < $self->{h};
1922
1923 1
1848} 1924}
1849 1925
1850sub _draw { 1926sub _draw {
1851 my ($self) = @_; 1927 my ($self) = @_;
1852 1928
1853 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1854
1855 if ($GRAB == $self) {
1856 $self->{fg} = $self->{active_fg};
1857 }
1858 1930
1859 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1862 1934
… …
1906 1978
1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1909 $self->{state} = !$self->{state}; 1981 $self->{state} = !$self->{state};
1910 $self->_emit (changed => $self->{state}); 1982 $self->_emit (changed => $self->{state});
1983 } else {
1984 return 0
1985 }
1986
1911 } 1987 1
1912} 1988}
1913 1989
1914sub _draw { 1990sub _draw {
1915 my ($self) = @_; 1991 my ($self) = @_;
1916 1992
… …
2083 2159
2084 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
2085 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
2086 2162
2087 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
2088 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;
2089 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
2090 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2091 2168
2092 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
2093 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
… …
2254 2331
2255 $self->SUPER::button_down ($ev, $x, $y); 2332 $self->SUPER::button_down ($ev, $x, $y);
2256 2333
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258 2335
2259 $self->mouse_motion ($ev, $x, $y); 2336 $self->mouse_motion ($ev, $x, $y)
2260} 2337}
2261 2338
2262sub mouse_motion { 2339sub mouse_motion {
2263 my ($self, $ev, $x, $y) = @_; 2340 my ($self, $ev, $x, $y) = @_;
2264 2341
… …
2268 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2345 my (undef, $lo, $hi, $page) = @{$self->{range}};
2269 2346
2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2347 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2271 2348
2272 $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
2273 } 2354 1
2274} 2355}
2275 2356
2276sub update { 2357sub update {
2277 my ($self) = @_; 2358 my ($self) = @_;
2278 2359
2279 $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}) {
2280 $self->set_value ($self->{range}[0]); 2368 $self->set_value ($self->{range}[0]);
2281 2369
2282 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100; 2371 my $range = ($hi - $page - $lo) || 1e-100;
2284 2372
… …
2290 $value = ($value - $lo) / $range; 2378 $value = ($value - $lo) / $range;
2291 $value = $value * $self->{scale} + $self->{offset}; 2379 $value = $value * $self->{scale} + $self->{offset};
2292 2380
2293 $self->{knob_x} = $value - $knob_w * 0.5; 2381 $self->{knob_x} = $value - $knob_w * 0.5;
2294 $self->{knob_w} = $knob_w; 2382 $self->{knob_w} = $knob_w;
2295 }); 2383 }
2296
2297 $self->SUPER::update;
2298}
2299
2300sub _draw {
2301 my ($self) = @_;
2302 2384
2303 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
2304 2386
2305 glScale $self->{w}, $self->{h}; 2387 glScale $self->{w}, $self->{h};
2306 2388
… …
2500 2582
2501 delete $self->{texture}; 2583 delete $self->{texture};
2502 } 2584 }
2503 2585
2504 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2505 glClearColor 0.5, 0.5, 0.5, 0; 2587 glClearColor 0, 0, 0, 0;
2506 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2507 2589
2508 my $top = int $self->{children}[1]{range}[0]; 2590 my $top = int $self->{children}[1]{range}[0];
2509 2591
2510 my $y0 = $top; 2592 my $y0 = $top;
… …
2545sub _draw { 2627sub _draw {
2546 my ($self) = @_; 2628 my ($self) = @_;
2547 2629
2548 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2550 glColor 1, 1, 1, 1; 2632 glColor 0, 0, 0, 1;
2551 $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});
2552 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2553 2635
2554 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2555 2637
2556} 2638}
… …
2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2784 2866
2785 if ($tex) { 2867 if ($tex) {
2786 glEnable GL_TEXTURE_2D; 2868 glEnable GL_TEXTURE_2D;
2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2788 glColor 1, 1, 1, 1; 2870 glColor 0, 0, 0, 1;
2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2790 glDisable GL_TEXTURE_2D; 2872 glDisable GL_TEXTURE_2D;
2791 } 2873 }
2792} 2874}
2793 2875
… …
2797 $self->{timer}->cancel 2879 $self->{timer}->cancel
2798 if $self->{timer}; 2880 if $self->{timer};
2799 2881
2800 $self->SUPER::DESTROY; 2882 $self->SUPER::DESTROY;
2801} 2883}
2884
2885#############################################################################
2886
2887package CFClient::UI::Buttonbar;
2888
2889our @ISA = CFClient::UI::HBox::;
2890
2891# TODO: should actualyl wrap buttons and other goodies.
2802 2892
2803############################################################################# 2893#############################################################################
2804 2894
2805package CFClient::UI::Menu; 2895package CFClient::UI::Menu;
2806 2896
… …
2856 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2857 2947
2858 # TODO: should use vbox->find_widget or so 2948 # TODO: should use vbox->find_widget or so
2859 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860 $self->{hover} = $self->{item}{$HOVER}; 2950 $self->{hover} = $self->{item}{$HOVER};
2951
2952 0
2861} 2953}
2862 2954
2863sub button_up { 2955sub button_up {
2864 my ($self, $ev, $x, $y) = @_; 2956 my ($self, $ev, $x, $y) = @_;
2865 2957
… …
2867 undef $GRAB; 2959 undef $GRAB;
2868 $self->hide; 2960 $self->hide;
2869 2961
2870 $self->_emit ("popdown"); 2962 $self->_emit ("popdown");
2871 $self->{hover}[1]->() if $self->{hover}; 2963 $self->{hover}[1]->() if $self->{hover};
2964 } else {
2965 return 0
2966 }
2967
2872 } 2968 1
2873} 2969}
2874 2970
2875############################################################################# 2971#############################################################################
2876 2972
2877package CFClient::UI::Statusbox; 2973package CFClient::UI::Multiplexer;
2878 2974
2879our @ISA = CFClient::UI::VBox::; 2975our @ISA = CFClient::UI::Container::;
2880 2976
2881sub new { 2977sub new {
2882 my $class = shift; 2978 my $class = shift;
2883 2979
2884 $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 (
2885 fontsize => 0.8, 3089 fontsize => 0.8,
2886 @_, 3090 @_,
2887 ) 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
2888} 3098}
2889 3099
2890sub reorder { 3100sub reorder {
2891 my ($self) = @_; 3101 my ($self) = @_;
2892 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} };
2893 3108
2894 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
2895 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896 } 3111 }
2897 3112
… …
2900 my @items = sort { 3115 my @items = sort {
2901 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
2904 3119
3120 $self->{timer}->interval (1);
3121
2905 my $count = 10 + 1; 3122 my $count = 10 + 1;
2906 for my $item (@items) { 3123 for my $item (@items) {
2907 last unless --$count; 3124 last unless --$count;
2908 3125
2909 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
2910 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
2911 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text}; 3130 : $item->{text};
2914 3131
… …
2922 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
2923 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
2924 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize}, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44, 3143 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
2928 can_events => 1, 3145 can_events => 1,
2929 can_hover => 1 3146 can_hover => 1
2930 }; 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;
2931 } 3160 }
2932 3161
2933 $self->clear; 3162 $self->clear;
2934 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
2935} 3164}
… …
2940 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
2942 3171
2943 return unless $text; 3172 return unless $text;
2944 3173
2945 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2946 3175
2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2948 3177
2949 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
2950 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
… …
2980 3209
2981 $self->reorder; 3210 $self->reorder;
2982 $self->SUPER::reconfigure; 3211 $self->SUPER::reconfigure;
2983} 3212}
2984 3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
2985############################################################################# 3222#############################################################################
2986 3223
2987package CFClient::UI::Inventory; 3224package CFClient::UI::Inventory;
2988 3225
2989our @ISA = CFClient::UI::ScrolledWindow::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
2990 3227
2991sub new { 3228sub new {
2992 my $class = shift; 3229 my $class = shift;
2993 3230
2994 my $self = $class->SUPER::new ( 3231 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2996 @_, 3233 @_,
2997 ); 3234 );
2998 3235
2999 $self 3236 $self
3000} 3237}
3001 3238
3002sub set_items { 3239sub set_items {
3003 my ($self, $items) = @_; 3240 my ($self, $items) = @_;
3004 3241
3005 $self->{scrolled}->clear; 3242 $self->{child}->clear;
3006 return unless $items; 3243 return unless $items;
3007 3244
3008 my @items = sort { 3245 my @items = sort {
3009 ($a->{type} <=> $b->{type}) 3246 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name}) 3247 or ($a->{name} cmp $b->{name})
… …
3014 3251
3015 my $row = 0; 3252 my $row = 0;
3016 for my $item (@items) { 3253 for my $item (@items) {
3017 CFClient::Item::update_widgets $item; 3254 CFClient::Item::update_widgets $item;
3018 3255
3019 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3256 $self->{child}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3257 $self->{child}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3258 $self->{child}->add (2, $row, $item->{weight_widget});
3022 3259
3023 $row++; 3260 $row++;
3024 } 3261 }
3025} 3262}
3026 3263
… …
3124 $rec = $::CONN->stop_record if $::CONN; 3361 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY'; 3362 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec); 3363 $self->set_command_list ($rec);
3127} 3364}
3128 3365
3129# 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
3130sub ask_for_bind { 3372sub ask_for_bind {
3131 my ($self, $commit) = @_; 3373 my ($self, $commit) = @_;
3132 3374
3133 CFClient::Binder::open_binding_dialog (sub { 3375 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_; 3376 my ($mod, $sym) = @_;
… …
3218 3460
3219############################################################################# 3461#############################################################################
3220 3462
3221package CFClient::UI::SpellList; 3463package CFClient::UI::SpellList;
3222 3464
3223our @ISA = CFClient::UI::FancyFrame::; 3465our @ISA = CFClient::UI::Table::;
3224 3466
3225sub new { 3467sub new {
3226 my $class = shift; 3468 my $class = shift;
3227 3469
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3470 my $self = $class->SUPER::new (
3229 3471 binding => [],
3230 $self->add (new CFClient::UI::ScrolledWindow 3472 commands => [],
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3473 @_,
3232 3474 )
3233 $self;
3234} 3475}
3235 3476
3236# XXX: Do sorting? Argl... 3477# XXX: Do sorting? Argl...
3237sub add_spell { 3478sub add_spell {
3238 my ($self, $spell) = @_; 3479 my ($self, $spell) = @_;
3239 $self->{spells}->{$spell->{name}} = $spell; 3480 $self->{spells}->{$spell->{name}} = $spell;
3240 3481
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face}, 3483 face => $spell->{face},
3243 can_hover => 1, 3484 can_hover => 1,
3244 can_events => 1, 3485 can_events => 1,
3245 tooltip => $spell->{message}); 3486 tooltip => $spell->{message});
3246 3487
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name}, 3489 text => $spell->{name},
3249 can_hover => 1, 3490 can_hover => 1,
3250 can_events => 1, 3491 can_events => 1,
3251 tooltip => $spell->{message}, 3492 tooltip => $spell->{message},
3252 expand => 1); 3493 expand => 1);
3253 3494
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1); 3498 expand => 1);
3258 3499
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key", 3501 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262} 3503}
3263 3504
3264sub rebuild_spell_list { 3505sub rebuild_spell_list {
… …
3276############################################################################# 3517#############################################################################
3277 3518
3278package CFClient::UI::Root; 3519package CFClient::UI::Root;
3279 3520
3280our @ISA = CFClient::UI::Container::; 3521our @ISA = CFClient::UI::Container::;
3522
3523use List::Util qw(min max);
3281 3524
3282use CFClient::OpenGL; 3525use CFClient::OpenGL;
3283 3526
3284sub new { 3527sub new {
3285 my $class = shift; 3528 my $class = shift;
… …
3420 3663
3421 delete $queue{$widget+0}; 3664 delete $queue{$widget+0};
3422 3665
3423 my ($w, $h) = $widget->size_request; 3666 my ($w, $h) = $widget->size_request;
3424 3667
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3668 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3669 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3670
3671 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3672 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3427 3673
3428 $w = $widget->{force_w} if exists $widget->{force_w}; 3674 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h}; 3675 $h = $widget->{force_h} if exists $widget->{force_h};
3430 3676
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3677 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines