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.80 by root, Wed Apr 12 00:36:13 2006 UTC vs.
Revision 1.105 by root, Fri Apr 14 14:55:28 2006 UTC

… …
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
62 62
63 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
65 65
66 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71} 71}
72 72
… …
133 my ($self, $x, $y, $w, $h) = @_; 133 my ($self, $x, $y, $w, $h) = @_;
134 134
135 $self->_size_allocate ($x, $y, $w, $h); 135 $self->_size_allocate ($x, $y, $w, $h);
136} 136}
137 137
138# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
139sub translate { 139sub translate {
140 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
141 141
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
143} 143}
144 144
145sub focus_in { 145sub focus_in {
146 my ($self) = @_; 146 my ($self) = @_;
147 147
148 return if $FOCUS == $self; 148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
149 150
150 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
151 $focus->update if $focus; 152 $focus->update if $focus;
152 $FOCUS->update; 153 $FOCUS->update;
153} 154}
… …
186 glPushMatrix; 187 glPushMatrix;
187 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
188 $self->_draw; 189 $self->_draw;
189 glPopMatrix; 190 glPopMatrix;
190 191
191 if ($self == $HOVER) { 192 if ($self == $HOVER && $self->{can_hover}) {
192 my ($x, $y) = @$self{qw(x y)}; 193 my ($x, $y) = @$self{qw(x y)};
193 194
194 glColor 0, 0, 1, 0.2; 195 glColor 0, 0, 1, 0.2;
195 glEnable GL_BLEND; 196 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
438} 439}
439 440
440sub render_chld { 441sub render_chld {
441 my ($self) = @_; 442 my ($self) = @_;
442 443
443 $self->{texture} = 444 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
444 CFClient::Texture->new_from_opengl ( 445 glClearColor 0, 0, 0, 1;
445 $self->{w}, $self->{h}, sub { $self->child->draw } 446 glClear GL_COLOR_BUFFER_BIT;
446 ); 447 $self->child->draw;
448 };
447} 449}
448 450
449sub size_allocate { 451sub size_allocate {
450 my ($self, $x, $y, $w, $h) = @_; 452 my ($self, $x, $y, $w, $h) = @_;
451 453
… …
529 531
530my @tex = 532my @tex =
531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 534 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533 535
536sub new {
537 my $class = shift;
538
539 # TODO: user_x, user_y, overwrite moveto?
540
541 $class->SUPER::new (
542 bg => [1, 1, 1, 1],
543 border_bg => [1, 1, 1, 1],
544 border => $::FONTSIZE * 0.8,
545 @_
546 )
547}
548
534sub size_request { 549sub size_request {
535 my ($self) = @_; 550 my ($self) = @_;
536 551
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 552 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538 553
539 my ($w, $h) = $self->SUPER::size_request; 554 my ($w, $h) = $self->SUPER::size_request;
540 555
541 $h += $tex[1]->{h}; 556 (
542 $h += $tex[4]->{h}; 557 $w + $self->{border} * 2,
543 $w += $tex[2]->{w}; 558 $h + $self->{border} * 2,
544 $w += $tex[3]->{w}; 559 )
545
546 ($w, $h)
547} 560}
548 561
549sub size_allocate { 562sub size_allocate {
550 my ($self, $x, $y, $w, $h) = @_; 563 my ($self, $x, $y, $w, $h) = @_;
551 564
552 $self->_size_allocate ($x, $y, $w, $h) or return; 565 $self->_size_allocate ($x, $y, $w, $h) or return;
553 566
554 $h -= $tex[1]{h}; 567 $h -= List::Util::max 0, $self->{border} * 2;
555 $h -= $tex[4]{h}; 568 $w -= List::Util::max 0, $self->{border} * 2;
556 $w -= $tex[2]{w};
557 $w -= $tex[3]{w};
558 569
559 $h = $h < 0 ? 0 : $h; 570 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
560 $w = $w < 0 ? 0 : $w;
561
562 my $child = $self->child;
563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565} 571}
566 572
567sub button_down { 573sub button_down {
568 my ($self, $ev, $x, $y) = @_; 574 my ($self, $ev, $x, $y) = @_;
569 575
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 576 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 577 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
572 578
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 579 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h}); 580 my ($bw, $bh) = ($self->{w}, $self->{h});
575 581
576 $self->{motion} = sub { 582 $self->{motion} = sub {
… …
582 $self->{user_h} = $bh + $y - $oy; 588 $self->{user_h} = $bh + $y - $oy;
583 $self->update; 589 $self->update;
584 }; 590 };
585 591
586 } elsif ($x >= 0 && $x < $self->{w} 592 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) { 593 && $y >= 0 && $y < $self->{border}) {
588 594
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 595 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y}); 596 my ($bx, $by) = ($self->{x}, $self->{y});
591 597
592 $self->{motion} = sub { 598 $self->{motion} = sub {
… …
613} 619}
614 620
615sub _draw { 621sub _draw {
616 my ($self) = @_; 622 my ($self) = @_;
617 623
618 my ($w, $h) = ($self->{w}, $self->{h}); 624 my ($w, $h ) = ($self->{w}, $self->{h});
619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 625 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620 626
621 glEnable GL_BLEND; 627 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623 glEnable GL_TEXTURE_2D; 629 glEnable GL_TEXTURE_2D;
624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
625 631
626 my $top = $tex[1]; 632 glColor @{ $self->{border_bg} };
627 $top->draw_quad (0, 0, $w, $top->{h}); 633 $tex[1]->draw_quad (0, 0, $w, $self->{border});
628 634 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
629 my $left = $tex[3]; 635 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 636 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
631
632 my $right = $tex[2];
633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
634
635 my $bottom = $tex[4];
636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
637 637
638 my $bg = $tex[0]; 638 my $bg = $tex[0];
639 639
640 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 # TODO: repeat texture not scale
641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
643 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
644
645 my $rep_x = $cw / $bg->{w}; 641 my $rep_x = $cw / $bg->{w};
646 my $rep_y = $ch / $bg->{h}; 642 my $rep_y = $ch / $bg->{h};
647 643
644 glColor @{ $self->{bg} };
645
646 $bg->{s} = $rep_x;
647 $bg->{t} = $rep_y;
648 $bg->{wrap_mode} = 1;
648 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 649 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
649 650
650 glDisable GL_TEXTURE_2D; 651 glDisable GL_TEXTURE_2D;
651 glDisable GL_BLEND; 652 glDisable GL_BLEND;
652 653
653 $self->child->draw; 654 $self->child->draw;
654
655} 655}
656 656
657############################################################################# 657#############################################################################
658 658
659package CFClient::UI::Table; 659package CFClient::UI::Table;
… …
743 743
744 my $x = 0; 744 my $x = 0;
745 my $row_h = $hs->[$r]; 745 my $row_h = $hs->[$r];
746 746
747 for my $c (0 .. $#$row) { 747 for my $c (0 .. $#$row) {
748 my $widget = $row->[$c]
749 or next;
750
751 my $col_w = $ws->[$c]; 748 my $col_w = $ws->[$c];
752 749
750 if (my $widget = $row->[$c]) {
753 $widget->size_allocate ($x, $y, $col_w, $row_h); 751 $widget->size_allocate ($x, $y, $col_w, $row_h);
752 }
754 753
755 $x += $col_w; 754 $x += $col_w;
756 } 755 }
757 756
758 $y += $row_h; 757 $y += $row_h;
… …
804} 803}
805 804
806sub size_allocate { 805sub size_allocate {
807 my ($self, $x, $y, $w, $h) = @_; 806 my ($self, $x, $y, $w, $h) = @_;
808 807
809 $self->_size_allocate ($x, $y, $w, $h) or return; 808 $self->_size_allocate ($x, $y, $w, $h);
810
811 return unless $self->{w};
812 809
813 ($h, $w) = ($w, $h); 810 ($h, $w) = ($w, $h);
814 811
815 my $children = $self->{children}; 812 my $children = $self->{children};
816 813
… …
835 } 832 }
836 833
837 my $y = 0; 834 my $y = 0;
838 for (0 .. $#$children) { 835 for (0 .. $#$children) {
839 my $child = $children->[$_]; 836 my $child = $children->[$_];
840 my $h = $h[$_]; 837 my $h = int $h[$_];
841 $child->size_allocate ($y, 0, $h, $w); 838 $child->size_allocate ($y, 0, $h, $w);
842 839
843 $y += $h; 840 $y += $h;
844 } 841 }
845} 842}
… …
864} 861}
865 862
866sub size_allocate { 863sub size_allocate {
867 my ($self, $x, $y, $w, $h) = @_; 864 my ($self, $x, $y, $w, $h) = @_;
868 865
869 $self->_size_allocate ($x, $y, $w, $h) or return; 866 $self->_size_allocate ($x, $y, $w, $h);
870
871 return unless $self->{h};
872 867
873 my $children = $self->{children}; 868 my $children = $self->{children};
874 869
875 my @h = map +($_->size_request)[1], @$children; 870 my @h = map +($_->size_request)[1], @$children;
876 871
… …
891 } 886 }
892 887
893 my $y = 0; 888 my $y = 0;
894 for (0 .. $#$children) { 889 for (0 .. $#$children) {
895 my $child = $children->[$_]; 890 my $child = $children->[$_];
896 my $h = $h[$_]; 891 my $h = int $h[$_];
897 $child->size_allocate (0, $y, $w, $h); 892 $child->size_allocate (0, $y, $w, $h);
898 893
899 $y += $h; 894 $y += $h;
900 } 895 }
901} 896}
… …
910 905
911sub new { 906sub new {
912 my ($class, %arg) = @_; 907 my ($class, %arg) = @_;
913 908
914 my $self = $class->SUPER::new ( 909 my $self = $class->SUPER::new (
915 fg => [1, 1, 1], 910 fg => [1, 1, 1],
916 height => $::FONTSIZE, 911 fontsize => $::FONTSIZE,
917 text => "", 912 text => "",
918 align => -1, 913 align => -1,
919 padding => 2, 914 padding => 2,
920 layout => new CFClient::Layout, 915 layout => new CFClient::Layout,
921 %arg 916 %arg
922 ); 917 );
923 918
924 $self->set_text ($self->{text}); 919 $self->set_text ($self->{text});
925 920
… …
941 936
942 $self->{text} = $text; 937 $self->{text} = $text;
943 $self->{layout}->set_markup ($text); 938 $self->{layout}->set_markup ($text);
944 939
945 delete $self->{texture}; 940 delete $self->{texture};
941# $self->{w} = $self->{h} = -1;
946 $self->update; 942 $self->update;
947} 943}
948 944
949sub get_text { 945sub get_text {
950 my ($self, $text) = @_; 946 my ($self, $text) = @_;
… …
954 950
955sub size_request { 951sub size_request {
956 my ($self) = @_; 952 my ($self) = @_;
957 953
958 $self->{layout}->set_width; 954 $self->{layout}->set_width;
959 $self->{layout}->set_height ($self->{height}); 955 $self->{layout}->set_height ($self->{fontsize});
960 my ($w, $h) = $self->{layout}->size; 956 my ($w, $h) = $self->{layout}->size;
961 957
962 ( 958 (
963 $w + $self->{padding} * 2, 959 $w + $self->{padding} * 2,
964 $h + $self->{padding} * 2, 960 $h + $self->{padding} * 2,
… …
983sub _draw { 979sub _draw {
984 my ($self) = @_; 980 my ($self) = @_;
985 981
986 my $tex = $self->{texture} ||= do { 982 my $tex = $self->{texture} ||= do {
987 $self->{layout}->set_width ($self->{w}); 983 $self->{layout}->set_width ($self->{w});
988 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{height}); 984 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
989 new_from_layout CFClient::Texture $self->{layout} 985 new_from_layout CFClient::Texture $self->{layout}
990 }; 986 };
991 987
992 glEnable GL_BLEND; 988 glEnable GL_BLEND;
993 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 989 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
994 glEnable GL_TEXTURE_2D; 990 glEnable GL_TEXTURE_2D;
995 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
996 992
997 glColor @{$self->{fg}}; 993 glColor @{$self->{fg}};
998 994
999 my $x = 995 my $x =
1000 $self->{align} < 0 ? $self->{padding} 996 $self->{align} < 0 ? $self->{padding}
1001 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 997 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1002 : ($self->{w} - $tex->{w}) * 0.5; 998 : ($self->{w} - $tex->{w}) * 0.5;
1003 999
1004 $tex->draw_quad ($x, $self->{padding}); 1000 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1005 1001
1006 glDisable GL_TEXTURE_2D; 1002 glDisable GL_TEXTURE_2D;
1007 glDisable GL_BLEND; 1003 glDisable GL_BLEND;
1008} 1004}
1009 1005
… …
1022 $class->SUPER::new ( 1018 $class->SUPER::new (
1023 fg => [1, 1, 1], 1019 fg => [1, 1, 1],
1024 bg => [0, 0, 0, 0.2], 1020 bg => [0, 0, 0, 0.2],
1025 active_bg => [1, 1, 1, 0.5], 1021 active_bg => [1, 1, 1, 0.5],
1026 active_fg => [0, 0, 0], 1022 active_fg => [0, 0, 0],
1023 can_hover => 1,
1024 can_focus => 1,
1027 @_ 1025 @_
1028 ) 1026 )
1029} 1027}
1030 1028
1031sub _set_text { 1029sub _set_text {
1032 my ($self, $text) = @_; 1030 my ($self, $text) = @_;
1033 1031
1032 my $old_text = $self->{text};
1033
1034 $self->{last_activity} = $::NOW; 1034 $self->{last_activity} = $::NOW;
1035 1035
1036 $self->{text} = $text; 1036 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w}); 1037 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1038 1039
1039 $text =~ s/./*/g if $self->{hidden}; 1040 $text =~ s/./*/g if $self->{hidden};
1040 1041
1041 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1042 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1042 1043
1043 $text = substr $text, 0, $self->{cursor}; 1044 $text = substr $text, 0, $self->{cursor};
1044 utf8::encode $text; 1045 utf8::encode $text;
1045 1046
1046 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050 if $old_text ne $self->{text};
1047} 1051}
1048 1052
1049sub size_request { 1053sub size_request {
1050 my ($self) = @_; 1054 my ($self) = @_;
1051 1055
… …
1090 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1094 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1091 } elsif ($sym == SDLK_HOME) { 1095 } elsif ($sym == SDLK_HOME) {
1092 $self->{cursor} = 0; 1096 $self->{cursor} = 0;
1093 } elsif ($sym == SDLK_END) { 1097 } elsif ($sym == SDLK_END) {
1094 $self->{cursor} = length $text; 1098 $self->{cursor} = length $text;
1099 } elsif ($sym == SDLK_ESCAPE) {
1100 $self->emit ('escape');
1095 } elsif ($uni) { 1101 } elsif ($uni) {
1096 substr $text, $self->{cursor}++, 0, chr $uni; 1102 substr $text, $self->{cursor}++, 0, chr $uni;
1097 } 1103 }
1098 1104
1099 $self->_set_text ($text); 1105 $self->_set_text ($text);
… …
1161 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1167 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1162 glEnd; 1168 glEnd;
1163 } 1169 }
1164} 1170}
1165 1171
1166#############################################################################
1167
1168package CFClient::UI::Button; 1172package CFClient::UI::LineEntry;
1169 1173
1170our @ISA = CFClient::UI::Label::; 1174our @ISA = CFClient::UI::Entry::;
1171 1175
1172use SDL; 1176use SDL;
1173use SDL::OpenGL; 1177use SDL::OpenGL;
1178
1179sub key_down {
1180 my ($self, $ev) = @_;
1181
1182 my $sym = $ev->key_sym;
1183
1184 if ($sym == SDLK_RETURN) {
1185 $self->emit (activate => $self->get_text);
1186 $self->update;
1187
1188 } else {
1189 $self->SUPER::key_down ($ev);
1190 }
1191
1192}
1193
1194#############################################################################
1195
1196package CFClient::UI::Button;
1197
1198our @ISA = CFClient::UI::Label::;
1199
1200use SDL;
1201use SDL::OpenGL;
1202
1203my @tex =
1204 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1205 qw(b1_button_active.png);
1174 1206
1175sub new { 1207sub new {
1176 my $class = shift; 1208 my $class = shift;
1177 1209
1178 $class->SUPER::new ( 1210 $class->SUPER::new (
1179 padding => 4, 1211 padding => 4,
1180 fg => [1, 1, 1], 1212 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2], 1213 bg => [1, 1, 1, 0.2],
1182 active_bg => [0, 0, 0, 0.5],
1183 active_fg => [1, 1, 0], 1214 active_fg => [1, 1, 0],
1184 border_fg => [1, 1, 0], 1215 can_hover => 1,
1185 @_ 1216 @_
1186 ) 1217 )
1187} 1218}
1188 1219
1189sub button_up { 1220sub button_up {
… …
1197 1228
1198sub _draw { 1229sub _draw {
1199 my ($self) = @_; 1230 my ($self) = @_;
1200 1231
1201 local $self->{fg} = $self->{fg}; 1232 local $self->{fg} = $self->{fg};
1233 my $tex = $tex[0];
1202 1234
1203 glEnable GL_BLEND; 1235 glEnable GL_BLEND;
1236 glEnable GL_TEXTURE_2D;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1237 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205 1238
1206 glTranslate 0.375, 0.375, 0; # make line and polyogon coordinates behave similarly
1207
1208 glBegin GL_LINE_LOOP;
1209 glColor @{$self->{border_fg}};
1210 glVertex 1 , 1;
1211 glVertex 1 , $self->{h} - 2;
1212 glVertex $self->{w} - 2, $self->{h} - 2;
1213 glVertex $self->{w} - 2, 1;
1214 glEnd;
1215
1216 if ($GRAB == $self) { 1239 if ($GRAB == $self) {
1217 glColor @{$self->{active_bg}};
1218 $self->{fg} = $self->{active_fg}; 1240 $self->{fg} = $self->{active_fg};
1219 } else {
1220 glColor @{$self->{bg}};
1221 } 1241 }
1222 1242
1223 glBegin GL_QUADS; 1243 glBindTexture GL_TEXTURE_2D, $tex->{name};
1224 glVertex 2 , 2; 1244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1225 glVertex 2 , $self->{h} - 2; 1245
1226 glVertex $self->{w} - 2, $self->{h} - 2; 1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1227 glVertex $self->{w} - 2, 2; 1247
1228 glEnd; 1248 glDisable GL_TEXTURE_2D;
1229 glDisable GL_BLEND; 1249 glDisable GL_BLEND;
1230 1250
1231 $self->SUPER::_draw; 1251 $self->SUPER::_draw;
1232} 1252}
1233 1253
1234############################################################################# 1254#############################################################################
1235 1255
1236package CFClient::UI::Slider; 1256package CFClient::UI::CheckBox;
1237 1257
1238use strict; 1258our @ISA = CFClient::UI::DrawBG::;
1239 1259
1260my @tex =
1261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1262 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1263
1264use SDL;
1240use SDL::OpenGL; 1265use SDL::OpenGL;
1241
1242our @ISA = CFClient::UI::DrawBG::;
1243 1266
1244sub new { 1267sub new {
1245 my $class = shift; 1268 my $class = shift;
1246 1269
1270 $class->SUPER::new (
1271 padding => 2,
1272 fg => [1, 1, 1],
1273 active_fg => [1, 1, 0],
1274 state => 0,
1275 can_hover => 1,
1276 @_
1277 )
1278}
1279
1280sub size_request {
1281 my ($self) = @_;
1282
1283 ($self->{padding} * 2 + 6) x 2
1284}
1285
1286sub size_allocate {
1287 my ($self, $x, $y, $w, $h) = @_;
1288
1289 $self->_size_allocate ($x, $y, $w, $h);
1290}
1291
1292sub button_down {
1293 my ($self, $ev, $x, $y) = @_;
1294
1295 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1296 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1297 $self->{state} = !$self->{state};
1298 $self->emit (changed => $self->{state});
1299 }
1300}
1301
1302sub _draw {
1303 my ($self) = @_;
1304
1305 $self->SUPER::_draw;
1306
1307 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1308
1309 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1310
1311 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1312
1313 glEnable GL_BLEND;
1314 glEnable GL_TEXTURE_2D;
1315 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1316
1317 my $tex = $self->{state} ? $tex[1] : $tex[0];
1318
1319 $tex->draw_quad (0, 0, $s, $s);
1320
1321 glDisable GL_TEXTURE_2D;
1322 glDisable GL_BLEND;
1323}
1324
1325#############################################################################
1326
1327package CFClient::UI::Slider;
1328
1329use strict;
1330
1331use SDL::OpenGL;
1332
1333our @ISA = CFClient::UI::DrawBG::;
1334
1335my @tex =
1336 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1337 qw(s1_slider.png s1_slider_bg.png);
1338
1339sub new {
1340 my $class = shift;
1341
1247 # range [value, low, high, page] 1342 # range [value, low, high, page]
1248 1343
1344 # TODO: 0-width page
1345 # TODO: req_w/h are wrong with vertical
1346 # TODO: calculations are off
1249 my $self = $class->SUPER::new ( 1347 my $self = $class->SUPER::new (
1250 fg => [1, 1, 1], 1348 fg => [1, 1, 1],
1251 active_fg => [0, 0, 0], 1349 active_fg => [0, 0, 0],
1252 range => [0, 0, 100, 10], 1350 range => [0, 0, 100, 10],
1253 req_w => 40, 1351 req_w => 40,
1254 req_h => 10, 1352 req_h => 13,
1255 vertical => 0, 1353 vertical => 0,
1354 can_hover => 1,
1355 inner_pad => 5,
1256 @_ 1356 @_
1257 ); 1357 );
1258 1358
1259 $self 1359 $self
1260} 1360}
… …
1281 if ($GRAB == $self) { 1381 if ($GRAB == $self) {
1282 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1382 my ($value, $lo, $hi, $page) = @{$self->{range}};
1283 1383
1284 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1384 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1285 1385
1386 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1387 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1388
1389 $x -= $inner_pad_px; # substract the padding
1286 $x = $x * ($hi - $lo) / $w + $lo; 1390 $x = $x * ($hi - $lo) / $inner_w + $lo;
1287 $x = $lo if $x < $lo; 1391 $x = $lo if $x < $lo;
1288 $x = $hi - $page if $x > $hi - $page; 1392 $x = $hi - $page if $x > $hi - $page;
1289 $self->{range}[0] = $x; 1393 $self->{range}[0] = $x;
1290 1394
1291 $self->emit (changed => $x); 1395 $self->emit (changed => $x);
1292 $self->update; 1396 $self->update;
1293 } 1397 }
1398}
1399
1400# the inner_* stuff is for generating a padding for the slider handle,
1401# so that the handle doesn't leave the texture. This calculation isn't 100%
1402# correct propably, but it does the job for now
1403sub _calc_inner_pad_px {
1404 my ($self, $w) = @_;
1405 ($w / 100) * $self->{inner_pad} # % to pixels
1294} 1406}
1295 1407
1296sub _draw { 1408sub _draw {
1297 my ($self) = @_; 1409 my ($self) = @_;
1298 1410
… …
1312 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1313 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1314 1426
1315 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1427 my ($value, $lo, $hi, $page) = @{$self->{range}};
1316 1428
1429 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431
1317 $page = int $page * $w / ($hi - $lo); 1432 $page = int $page * $inner_w / ($hi - $lo);
1318 $value = int +($value - $lo) * $w / ($hi - $lo); 1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1319 1434
1320 $w -= $page; 1435 $w -= $page;
1321 $page &= ~1; 1436 $page &= ~1;
1322 glTranslate $page * 0.5, 0, 0; 1437 glTranslate $page * 0.5, 0, 0;
1323 $page ||= 2; 1438 $page ||= 2;
1324 1439
1325 glColor @$fg;
1326 glBegin GL_LINES;
1327 glVertex 0, 0; glVertex 0, $h;
1328 glVertex $w - 1, 0; glVertex $w - 1, $h;
1329 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1330 glEnd;
1331
1332 my $knob_a = $value - $page * 0.5; 1440 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1333 my $knob_b = $value + $page * 0.5; 1441 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1334 1442
1335 glBegin GL_QUADS; 1443 glEnable GL_BLEND;
1336 glColor @$fg; 1444 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1337 glVertex $knob_a, 0; 1445 glEnable GL_TEXTURE_2D;
1338 glVertex $knob_a, $h; 1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1339 glVertex $knob_b, $h;
1340 glVertex $knob_b, 0;
1341 1447
1342 if ($knob_a < $knob_b - 2) { 1448 # draw background
1343 glColor @$bg; 1449 $tex[1]->draw_quad (0, 0, $w, $h);
1344 glVertex $knob_a + 1, 1; 1450
1345 glVertex $knob_a + 1, $h - 1; 1451 # draw handle
1346 glVertex $knob_b - 1, $h - 1; 1452 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1347 glVertex $knob_b - 1, 1; 1453
1454 glDisable GL_BLEND;
1455 glDisable GL_TEXTURE_2D;
1456}
1457
1458#############################################################################
1459
1460package CFClient::UI::TextView;
1461
1462our @ISA = CFClient::UI::HBox::;
1463
1464use SDL::OpenGL;
1465
1466sub new {
1467 my $class = shift;
1468
1469 my $self = $class->SUPER::new (
1470 req_w => $::WIDTH / 6,
1471 req_h => $::HEIGHT / 6,
1472 fontsize => $::FONTSIZE,
1473 @_,
1474
1475 layout => (new CFClient::Layout),
1476 par => [],
1477 height => 0,
1478 children => [
1479 (new CFClient::UI::Empty expand => 1),
1480 (new CFClient::UI::Slider vertical => 1),
1481 ],
1482 );
1483
1484 $self
1485}
1486
1487sub text_height {
1488 my ($self, $text) = @_;
1489
1490 my $layout = $self->{layout};
1491
1492 $layout->set_height ($self->{fontsize});
1493 $layout->set_width ($self->{w});
1494 $layout->set_text ($text);
1495
1496 ($layout->size)[1]
1497}
1498
1499sub reflow {
1500 my ($self) = @_;
1501
1502 my $height = 0;
1503
1504 for (@{$self->{par}}) {
1505 $height += $_->[0] = $self->text_height ($_->[2]);
1506 }
1507
1508 $self->{height} = $height;
1509
1510 $self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1511}
1512
1513sub size_request {
1514 my ($self) = @_;
1515
1516 ($self->{req_w}, $self->{req_h})
1517}
1518
1519sub size_allocate {
1520 my ($self, $x, $y, $w, $h) = @_;
1521
1522 $self->SUPER::size_allocate ($x, $y, $w, $h);
1523
1524 $self->{layout}->set_height ($self->{fontsize});
1525 $self->{layout}->set_width ($self->{w});
1526
1527 $self->reflow;
1528 $self->update;
1529}
1530
1531sub add_paragraph {
1532 my ($self, $color, $text) = @_;
1533
1534 #TODO: intelligently "reformat" paragraph
1535
1536 my $height = $self->text_height ($text);
1537
1538 $self->{height} += $height;
1539
1540 push @{$self->{par}}, [$height, $color, $text];
1541
1542 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1543 $self->{children}[1]->update;
1544}
1545
1546sub update {
1547 my ($self) = @_;
1548
1549 $self->SUPER::update;
1550
1551 return unless $self->{h} > 0;
1552
1553 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1554 glClearColor 0, 0, 0, 1;
1555 glClear GL_COLOR_BUFFER_BIT;
1556
1557 my $y0 = $self->{height} - $self->{h};
1558 my $y1 = $self->{height};
1559
1560 glEnable GL_BLEND;
1561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1562 glEnable GL_TEXTURE_2D;
1563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564
1565 my $y = 0;
1566
1567 my $layout = $self->{layout};
1568
1569 for my $par (@{$self->{par}}) {
1570 my $h = $par->[0];
1571
1572 if ($y0 < $y + $h && $y < $y1) {
1573 $layout->set_text ($par->[2]);
1574
1575 glColor @{ $par->[1] };
1576 my ($W, $H) = $layout->size;
1577 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1578 }
1579
1580 $y += $h;
1581 }
1582
1583 glDisable GL_TEXTURE_2D;
1584 glDisable GL_BLEND;
1348 } 1585 };
1349 glEnd; 1586}
1587
1588sub _draw {
1589 my ($self) = @_;
1590
1591 if ($self->{texture}) {
1592 glEnable GL_TEXTURE_2D;
1593 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1594 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1595 glDisable GL_TEXTURE_2D;
1596 }
1597
1350} 1598}
1351 1599
1352############################################################################# 1600#############################################################################
1353 1601
1354package CFClient::UI::MapWidget; 1602package CFClient::UI::MapWidget;
… …
1364 1612
1365sub new { 1613sub new {
1366 my $class = shift; 1614 my $class = shift;
1367 1615
1368 $class->SUPER::new ( 1616 $class->SUPER::new (
1369 z => -1, 1617 z => -1,
1618 can_focus => 1,
1370 list => (glGenLists 1), 1619 list => (glGenLists 1),
1371 @_ 1620 @_
1372 ) 1621 )
1373} 1622}
1374 1623
1375sub key_down { 1624sub key_down {
… …
1394} 1643}
1395 1644
1396sub draw { 1645sub draw {
1397 my ($self) = @_; 1646 my ($self) = @_;
1398 1647
1648 $self->{need_update}++;#d#
1399 if (delete $self->{need_update}) { 1649 if (delete $self->{need_update}) {
1400 glNewList $self->{list}, GL_COMPILE; 1650 glNewList $self->{list}, GL_COMPILE;
1401 1651
1402 my $mx = $::CONN->{mapx};
1403 my $my = $::CONN->{mapy};
1404
1405 my $map = $::CONN->{map};
1406
1407 my ($xofs, $yofs);
1408
1409 my $sw = 1 + int $::WIDTH / 32; 1652 my $sw = int $::WIDTH / 32;
1410 my $sh = 1 + int $::HEIGHT / 32; 1653 my $sh = int $::HEIGHT / 32;
1411 1654
1412 if ($::CONN->{mapw} > $sw) { 1655 if ($::MAP) {
1413 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1656 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1414 } else {
1415 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1416 }
1417 1657
1418 if ($::CONN->{maph} > $sh) { 1658 if ($::CFG->{fow_enable}) {
1419 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1659 if ($::CFG->{fow_smooth}) { # smooth fog of war
1420 } else { 1660 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1421 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1661 glConvolutionFilter2D
1422 } 1662 GL_CONVOLUTION_2D,
1423 1663 GL_ALPHA,
1424 glEnable GL_TEXTURE_2D; 1664 3, 3,
1425 glEnable GL_BLEND; 1665 GL_ALPHA, GL_FLOAT,
1426 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1666 pack "f*",
1427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1667 0.1, 0.1, 0.1,
1428 1668 0.1, 0.2, 0.1,
1429 my $sw4 = ($sw + 3) & ~3; 1669 0.1, 0.1, 0.1,
1430 my $darkness = "\x00" x ($sw4 * $sh);
1431
1432 for my $x (0 .. $sw - 1) {
1433 my $row = $map->[$x + $xofs];
1434 for my $y (0 .. $sh - 1) {
1435
1436 my $cell = $row->[$y + $yofs]
1437 or next; 1670 ;
1438 1671 glEnable GL_CONVOLUTION_2D;
1439 my $dark = $cell->[0];
1440 if ($dark < 0) {
1441 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1442 } else {
1443 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1444 } 1672 }
1445 1673
1446 for my $num (grep $_, @$cell[1,2,3]) { 1674 my $tex = new CFClient::Texture
1447 my $tex = $::CONN->{face}[$num]{texture} || next; 1675 w => $w,
1448 1676 h => $h,
1449 my ($w, $h) = @$tex{qw(w h)}; 1677 data => $data,
1678 internalformat => GL_ALPHA,
1679 format => GL_ALPHA;
1450 1680
1451 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1681 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1452 } 1682
1683 glEnable GL_BLEND;
1684 glEnable GL_TEXTURE_2D;
1685 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1686
1687 glColor +($::CFG->{fow_intensity}) x 3, 1;
1688 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1689
1690 glDisable GL_TEXTURE_2D;
1691 glDisable GL_BLEND;
1453 } 1692 }
1454 } 1693 }
1455 1694
1456# if (1) { # higher quality darkness
1457# $lighting =~ s/(.)/$1$1$1/gs;
1458# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1459#
1460# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1461#
1462# $lighting = $pb->get_pixels;
1463# $lighting =~ s/(.)../$1/gs;
1464# }
1465
1466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1467
1468 $darkness = new CFClient::Texture
1469 w => $sw4,
1470 h => $sh,
1471 data => $darkness,
1472 internalformat => GL_ALPHA,
1473 format => GL_ALPHA;
1474
1475 glColor 0.45, 0.45, 0.45, 1;
1476 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1477
1478 glDisable GL_TEXTURE_2D;
1479 glDisable GL_BLEND;
1480
1481 glEndList; 1695 glEndList;
1482 } 1696 }
1483 1697
1484 glCallList $self->{list}; 1698 glCallList $self->{list};
1699
1700 if ($FOCUS != $self) {
1701 glColor 64/255, 64/255, 64/255;
1702 glLogicOp GL_AND;
1703 glEnable GL_COLOR_LOGIC_OP;
1704 glBegin GL_QUADS;
1705 glVertex 0, 0;
1706 glVertex 0, $::HEIGHT;
1707 glVertex $::WIDTH, $::HEIGHT;
1708 glVertex $::WIDTH, 0;
1709 glEnd;
1710 glDisable GL_COLOR_LOGIC_OP;
1711 }
1485} 1712}
1486 1713
1487my %DIR = ( 1714my %DIR = (
1488 SDLK_KP8, [1, "north"], 1715 SDLK_KP8, [1, "north"],
1489 SDLK_KP9, [2, "northeast"], 1716 SDLK_KP9, [2, "northeast"],
… …
1505 1732
1506 my $mod = $ev->key_mod; 1733 my $mod = $ev->key_mod;
1507 my $sym = $ev->key_sym; 1734 my $sym = $ev->key_sym;
1508 1735
1509 if ($sym == SDLK_KP5) { 1736 if ($sym == SDLK_KP5) {
1510 $::CONN->send ("command stay fire"); 1737 $::CONN->user_send ("command stay fire");
1738 } elsif ($sym == SDLK_a) {
1739 $::CONN->user_send ("command apply");
1740 } elsif ($sym == SDLK_QUOTE) {
1741 $self->emit ('activate_console');
1742 } elsif ($sym == SDLK_SLASH) {
1743 $self->emit ('activate_console' => '/');
1511 } elsif (exists $DIR{$sym}) { 1744 } elsif (exists $DIR{$sym}) {
1512 if ($mod & KMOD_SHIFT) { 1745 if ($mod & KMOD_SHIFT) {
1513 $self->{shft}++; 1746 $self->{shft}++;
1514 $::CONN->send ("command fire $DIR{$sym}[0]"); 1747 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1515 } elsif ($mod & KMOD_CTRL) { 1748 } elsif ($mod & KMOD_CTRL) {
1516 $self->{ctrl}++; 1749 $self->{ctrl}++;
1517 $::CONN->send ("command run $DIR{$sym}[0]"); 1750 $::CONN->user_send ("command run $DIR{$sym}[0]");
1518 } else { 1751 } else {
1519 $::CONN->send ("command $DIR{$sym}[1]"); 1752 $::CONN->user_send ("command $DIR{$sym}[1]");
1520 } 1753 }
1521 } 1754 }
1522} 1755}
1523 1756
1524sub key_up { 1757sub key_up {
… …
1526 1759
1527 my $mod = $ev->key_mod; 1760 my $mod = $ev->key_mod;
1528 my $sym = $ev->key_sym; 1761 my $sym = $ev->key_sym;
1529 1762
1530 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1763 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1531 $::CONN->send ("command fire_stop"); 1764 $::CONN->user_send ("command fire_stop");
1532 } 1765 }
1533 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1766 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1534 $::CONN->send ("command run_stop"); 1767 $::CONN->user_send ("command run_stop");
1535 } 1768 }
1536} 1769}
1537 1770
1538############################################################################# 1771#############################################################################
1539 1772
… …
1577 glPopMatrix; 1810 glPopMatrix;
1578} 1811}
1579 1812
1580############################################################################# 1813#############################################################################
1581 1814
1815package CFClient::UI::Flopper;
1816
1817our @ISA = CFClient::UI::Button::;
1818
1819sub new {
1820 my $class = shift;
1821
1822 my $self = $class->SUPER::new (
1823 state => 0,
1824 connect_activate => \&toggle_flopper,
1825 @_
1826 );
1827
1828 if ($self->{state}) {
1829 $self->{state} = 0;
1830 $self->toggle_flopper;
1831 }
1832
1833 $self
1834}
1835
1836sub toggle_flopper {
1837 my ($self) = @_;
1838
1839 # TODO: use animation
1840 if ($self->{state} = !$self->{state}) {
1841 $CFClient::UI::TOPLEVEL->add ($self->{other});
1842 $self->{other}->move (
1843 ($::WIDTH - $self->{other}{w}) * 0.5,
1844 ($::HEIGHT - $self->{other}{h}) * 0.5,
1845 );
1846 } else {
1847 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1848 }
1849}
1850
1851#############################################################################
1852
1582package CFClient::UI::Toplevel; 1853package CFClient::UI::Toplevel;
1583 1854
1584our @ISA = CFClient::UI::Container::; 1855our @ISA = CFClient::UI::Container::;
1585 1856
1586sub size_request { 1857sub size_request {

Diff Legend

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