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.113 by root, Sat Apr 15 12:46:48 2006 UTC vs.
Revision 1.130 by root, Tue Apr 18 01:51:06 2006 UTC

… …
74sub harmonize { 74sub harmonize {
75 my ($vals) = @_; 75 my ($vals) = @_;
76 76
77 my $rem = 0; 77 my $rem = 0;
78 78
79 for ($vals) { 79 for (@$vals) {
80 my $i = int $_ + $rem; 80 my $i = int $_ + $rem;
81 $rem += $_ - $i; 81 $rem += $_ - $i;
82 $_ = $i; 82 $_ = $i;
83 } 83 }
84} 84}
… …
112 $self 112 $self
113} 113}
114 114
115sub move { 115sub move {
116 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
117
117 $self->{x} = $x; 118 $self->{x} = int $x;
118 $self->{y} = $y; 119 $self->{y} = int $y;
119 $self->{z} = $z if defined $z; 120 $self->{z} = $z if defined $z;
121
122 $self->update;
120} 123}
121 124
122sub needs_redraw { 125sub needs_redraw {
123 0 126 0
124} 127}
… …
126sub size_request { 129sub size_request {
127 require Carp; 130 require Carp;
128 Carp::confess "size_request is abtract"; 131 Carp::confess "size_request is abtract";
129} 132}
130 133
131sub _size_allocate { 134sub configure {
132 my ($self, $x, $y, $w, $h) = @_; 135 my ($self, $x, $y, $w, $h) = @_;
133 136
134 $self->{x} = $x; 137 $self->{x} = $x;
135 $self->{y} = $y; 138 $self->{y} = $y;
136 139
137 return unless $self->{w} != $w || $self->{h} != $h; 140 return unless $self->{w} != $w || $self->{h} != $h;
138 141
139 $self->{w} = $w; 142 $self->{w} = $w;
140 $self->{h} = $h; 143 $self->{h} = $h;
141 144
142 1 145 $self->size_allocate ($w, $h);
143} 146}
144 147
145sub size_allocate { 148sub size_allocate {
146 my ($self, $x, $y, $w, $h) = @_; 149 # nothing to be done
147
148 $self->_size_allocate ($x, $y, $w, $h);
149} 150}
150 151
151# return top left coordinates 152# return top left coordinates
152sub _topleft { 153sub _topleft {
153 my ($self, $x, $y) = @_; 154 my ($self, $x, $y) = @_;
… …
176 177
177 return if $FOCUS == $self; 178 return if $FOCUS == $self;
178 return unless $self->{can_focus}; 179 return unless $self->{can_focus};
179 180
180 my $focus = $FOCUS; $FOCUS = $self; 181 my $focus = $FOCUS; $FOCUS = $self;
182
183 $self->emit (focus_in => $focus);
184
181 $focus->update if $focus; 185 $focus->update if $focus;
182 $FOCUS->update; 186 $FOCUS->update;
183} 187}
184 188
185sub focus_out { 189sub focus_out {
186 my ($self) = @_; 190 my ($self) = @_;
187 191
188 return unless $FOCUS == $self; 192 return unless $FOCUS == $self;
189 193
190 my $focus = $FOCUS; undef $FOCUS; 194 my $focus = $FOCUS; undef $FOCUS;
195
196 $self->emit (focus_out => $focus);
197
191 $focus->update if $focus; #? 198 $focus->update if $focus; #?
192} 199}
193 200
194sub mouse_motion { } 201sub mouse_motion { }
195sub button_up { } 202sub button_up { }
… …
219 glPopMatrix; 226 glPopMatrix;
220 227
221 if ($self == $HOVER && $self->{can_hover}) { 228 if ($self == $HOVER && $self->{can_hover}) {
222 my ($x, $y) = @$self{qw(x y)}; 229 my ($x, $y) = @$self{qw(x y)};
223 230
224 glColor 0, 0, 1, 0.2; 231 glColor 1, 0.8, 0.5, 0.2;
225 glEnable GL_BLEND; 232 glEnable GL_BLEND;
226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 233 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
227 glBegin GL_QUADS; 234 glBegin GL_QUADS;
228 glVertex $x , $y; 235 glVertex $x , $y;
229 glVertex $x + $self->{w}, $y; 236 glVertex $x + $self->{w}, $y;
… …
254 my ($self, $parent) = @_; 261 my ($self, $parent) = @_;
255 262
256 Scalar::Util::weaken ($self->{parent} = $parent); 263 Scalar::Util::weaken ($self->{parent} = $parent);
257} 264}
258 265
266sub check_size {
267 my ($self) = @_;
268
269 my ($w, $h) = $self->size_request;
270
271 if ($w != $self->{req_w} || $h != $self->{req_h}) {
272 $self->{req_w} = $w;
273 $self->{req_h} = $h;
274
275 $self->{parent}->check_size
276 if $self->{parent};
277
278 $self->size_allocate ($w, $h);
279 $self->update;
280 }
281}
282
259sub update { 283sub update {
260 my ($self) = @_; 284 my ($self) = @_;
261 285
262 $self->{parent}->update 286 $self->{parent}->update
263 if $self->{parent}; 287 if $self->{parent};
… …
362 sort { $a->{z} <=> $b->{z} } 386 sort { $a->{z} <=> $b->{z} }
363 @{$self->{children}}, $child 387 @{$self->{children}}, $child
364 ]; 388 ];
365 389
366 $self->{w} = $self->{h} = -1; 390 $self->{w} = $self->{h} = -1;
367 $self->update; 391
392 $child->check_size;
368} 393}
369 394
370sub remove { 395sub remove {
371 my ($self, $widget) = @_; 396 my ($self, $widget) = @_;
372 397
373 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 398 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
374 399
375 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 400 $self->check_size;
376} 401}
377 402
378sub find_widget { 403sub find_widget {
379 my ($self, $x, $y) = @_; 404 my ($self, $x, $y) = @_;
380 405
… …
433sub size_request { 458sub size_request {
434 $_[0]{children}[0]->size_request 459 $_[0]{children}[0]->size_request
435} 460}
436 461
437sub size_allocate { 462sub size_allocate {
438 my ($self, $x, $y, $w, $h) = @_; 463 my ($self, $w, $h) = @_;
439 464
440 $self->_size_allocate ($x, $y, $w, $h) or return;
441
442 $self->{children}[0]->size_allocate (0, 0, $w, $h); 465 $self->{children}[0]->configure (0, 0, $w, $h);
443} 466}
444 467
445############################################################################# 468#############################################################################
446 469
447package CFClient::UI::Window; 470package CFClient::UI::Window;
… …
473 $self->child->draw; 496 $self->child->draw;
474 }; 497 };
475} 498}
476 499
477sub size_allocate { 500sub size_allocate {
478 my ($self, $x, $y, $w, $h) = @_; 501 my ($self, $w, $h) = @_;
479 502
480 $self->_size_allocate ($x, $y, $w, $h) or return;
481
482 $self->child->size_allocate (0, 0, $w, $h); 503 $self->child->configure (0, 0, $w, $h);
483 504
484 $self->render_chld; 505 $self->render_chld;
485} 506}
486 507
487sub _draw { 508sub _draw {
… …
503 glDisable GL_TEXTURE_2D; 524 glDisable GL_TEXTURE_2D;
504} 525}
505 526
506############################################################################# 527#############################################################################
507 528
529package CFClient::UI::ViewPort;
530
531our @ISA = CFClient::UI::Window::;
532
533sub new { die }
534
535sub size_request {
536 my ($self) = @_;
537
538 @$self{qw(child_w child_h)} = $self->child->size_request;
539 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
540
541 @$self{qw(child_w child_h)}
542}
543
544sub _draw {
545 my ($self) = @_;
546
547 $self->{children}[1]->draw;
548}
549
550
551#############################################################################
552
508package CFClient::UI::Frame; 553package CFClient::UI::Frame;
509 554
510our @ISA = CFClient::UI::Bin::; 555our @ISA = CFClient::UI::Bin::;
511 556
512use SDL::OpenGL; 557use SDL::OpenGL;
… …
522} 567}
523 568
524sub size_allocate { 569sub size_allocate {
525 my ($self, $x, $y, $w, $h) = @_; 570 my ($self, $x, $y, $w, $h) = @_;
526 571
527 $self->_size_allocate ($x, $y, $w, $h) or return;
528
529 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 572 $self->child->configure (2, 2, $w - 4, $h - 4);
530} 573}
531 574
532sub _draw { 575sub _draw {
533 my ($self) = @_; 576 my ($self) = @_;
534 577
… …
565 # TODO: user_x, user_y, overwrite moveto? 608 # TODO: user_x, user_y, overwrite moveto?
566 609
567 $class->SUPER::new ( 610 $class->SUPER::new (
568 bg => [1, 1, 1, 1], 611 bg => [1, 1, 1, 1],
569 border_bg => [1, 1, 1, 1], 612 border_bg => [1, 1, 1, 1],
570 border => $::FONTSIZE * 0.8, 613 border => int $::FONTSIZE * 0.8,
571 @_ 614 @_
572 ) 615 )
573} 616}
574 617
575sub size_request { 618sub size_request {
… …
584 $h + $self->{border} * 2, 627 $h + $self->{border} * 2,
585 ) 628 )
586} 629}
587 630
588sub size_allocate { 631sub size_allocate {
589 my ($self, $x, $y, $w, $h) = @_; 632 my ($self, $w, $h) = @_;
590
591 $self->_size_allocate ($x, $y, $w, $h) or return;
592 633
593 $h -= List::Util::max 0, $self->{border} * 2; 634 $h -= List::Util::max 0, $self->{border} * 2;
594 $w -= List::Util::max 0, $self->{border} * 2; 635 $w -= List::Util::max 0, $self->{border} * 2;
595 636
596 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 637 $self->child->configure ($self->{border}, $self->{border}, $w, $h);
597} 638}
598 639
599sub button_down { 640sub button_down {
600 my ($self, $ev, $x, $y) = @_; 641 my ($self, $ev, $x, $y) = @_;
601 642
… …
610 651
611 ($x, $y) = ($ev->motion_x, $ev->motion_y); 652 ($x, $y) = ($ev->motion_x, $ev->motion_y);
612 653
613 $self->{user_w} = $bw + $x - $ox; 654 $self->{user_w} = $bw + $x - $ox;
614 $self->{user_h} = $bh + $y - $oy; 655 $self->{user_h} = $bh + $y - $oy;
615 $self->update; 656 $self->check_size;
616 }; 657 };
617 658
618 } elsif ($x >= 0 && $x < $self->{w} 659 } elsif ($x >= 0 && $x < $self->{w}
619 && $y >= 0 && $y < $self->{border}) { 660 && $y >= 0 && $y < $self->{border}) {
620 661
… …
704 745
705 $child->set_parent ($self); 746 $child->set_parent ($self);
706 $self->{children}[$y][$x] = $child; 747 $self->{children}[$y][$x] = $child;
707 748
708 $self->{w} = $self->{h} = -1; 749 $self->{w} = $self->{h} = -1;
750
751 $child->check_size;
752}
753
754# TODO: move to container class maybe? send childs a signal on removal?
755sub clear {
756 my ($self) = @_;
757
758 delete $self->{children};
709 $self->update; 759 $self->update;
710} 760}
711 761
712sub get_wh { 762sub get_wh {
713 my ($self) = @_; 763 my ($self) = @_;
… …
741 (sum @$hs), 791 (sum @$hs),
742 ) 792 )
743} 793}
744 794
745sub size_allocate { 795sub size_allocate {
746 my ($self, $x, $y, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
747
748 $self->_size_allocate ($x, $y, $w, $h) or return;
749 797
750 my ($ws, $hs) = $self->get_wh; 798 my ($ws, $hs) = $self->get_wh;
751 799
752 my $req_w = sum @$ws; 800 my $req_w = sum @$ws;
753 my $req_h = sum @$hs; 801 my $req_h = sum @$hs;
… …
775 823
776 for my $c (0 .. $#$row) { 824 for my $c (0 .. $#$row) {
777 my $col_w = $ws->[$c]; 825 my $col_w = $ws->[$c];
778 826
779 if (my $widget = $row->[$c]) { 827 if (my $widget = $row->[$c]) {
780 $widget->size_allocate ($x, $y, $col_w, $row_h); 828 $widget->configure ($x, $y, $col_w, $row_h);
781 } 829 }
782 830
783 $x += $col_w; 831 $x += $col_w;
784 } 832 }
785 833
… …
830 (List::Util::max map $_->[1], @alloc), 878 (List::Util::max map $_->[1], @alloc),
831 ) 879 )
832} 880}
833 881
834sub size_allocate { 882sub size_allocate {
835 my ($self, $x, $y, $w, $h) = @_; 883 my ($self, $w, $h) = @_;
836
837 $self->_size_allocate ($x, $y, $w, $h);
838 884
839 ($h, $w) = ($w, $h); 885 ($h, $w) = ($w, $h);
840 886
841 my $children = $self->{children}; 887 my $children = $self->{children};
842 888
… …
864 910
865 my $y = 0; 911 my $y = 0;
866 for (0 .. $#$children) { 912 for (0 .. $#$children) {
867 my $child = $children->[$_]; 913 my $child = $children->[$_];
868 my $h = $h[$_]; 914 my $h = $h[$_];
869 $child->size_allocate ($y, 0, $h, $w); 915 $child->configure ($y, 0, $h, $w);
870 916
871 $y += $h; 917 $y += $h;
872 } 918 }
919
920 1
873} 921}
874 922
875############################################################################# 923#############################################################################
876 924
877package CFClient::UI::VBox; 925package CFClient::UI::VBox;
… …
890 (List::Util::sum map $_->[1], @alloc), 938 (List::Util::sum map $_->[1], @alloc),
891 ) 939 )
892} 940}
893 941
894sub size_allocate { 942sub size_allocate {
895 my ($self, $x, $y, $w, $h) = @_; 943 my ($self, $w, $h) = @_;
896
897 $self->_size_allocate ($x, $y, $w, $h);
898 944
899 my $children = $self->{children}; 945 my $children = $self->{children};
900 946
901 my @h = map +($_->size_request)[1], @$children; 947 my @h = map +($_->size_request)[1], @$children;
902 948
… …
920 966
921 my $y = 0; 967 my $y = 0;
922 for (0 .. $#$children) { 968 for (0 .. $#$children) {
923 my $child = $children->[$_]; 969 my $child = $children->[$_];
924 my $h = $h[$_]; 970 my $h = $h[$_];
925 $child->size_allocate (0, $y, $w, $h); 971 $child->configure (0, $y, $w, $h);
926 972
927 $y += $h; 973 $y += $h;
928 } 974 }
975
976 1
929} 977}
930 978
931############################################################################# 979#############################################################################
932 980
933package CFClient::UI::Label; 981package CFClient::UI::Label;
… …
942 my $self = $class->SUPER::new ( 990 my $self = $class->SUPER::new (
943 fg => [1, 1, 1], 991 fg => [1, 1, 1],
944 fontsize => $::FONTSIZE, 992 fontsize => $::FONTSIZE,
945 text => "", 993 text => "",
946 align => -1, 994 align => -1,
995 valign => -1,
947 padding => 2, 996 padding => 2,
948 layout => new CFClient::Layout, 997 layout => new CFClient::Layout,
949 %arg 998 %arg
950 ); 999 );
951 1000
952 $self->set_text ($self->{text}); 1001 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
1002
1003 $self->set_text (delete $self->{text}) if exists $self->{text};
1004 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
953 1005
954 $self 1006 $self
955} 1007}
956 1008
957sub escape_text { 1009sub escape_text {
… …
965} 1017}
966 1018
967sub set_text { 1019sub set_text {
968 my ($self, $text) = @_; 1020 my ($self, $text) = @_;
969 1021
970 $self->{text} = $text;
971 $self->{layout}->set_markup ($text); 1022 $self->{layout}->set_text ($text);
972 1023
973 delete $self->{texture}; 1024 delete $self->{texture};
974# $self->{w} = $self->{h} = -1;
975 $self->update; 1025 $self->update;
976} 1026}
977 1027
978sub get_text { 1028sub set_markup {
979 my ($self, $text) = @_; 1029 my ($self, $markup) = @_;
980 1030
981 $self->{text} 1031 $self->{layout}->set_markup ($markup);
1032
1033 delete $self->{texture};
1034 $self->update;
982} 1035}
983 1036
984sub size_request { 1037sub size_request {
985 my ($self) = @_; 1038 my ($self) = @_;
986 1039
987 $self->{layout}->set_width; 1040 $self->{layout}->set_width;
988 $self->{layout}->set_height ($self->{fontsize}); 1041 $self->{layout}->set_height ($self->{fontsize});
1042
989 my ($w, $h) = $self->{layout}->size; 1043 my ($w, $h) = $self->{layout}->size;
990 1044
991 ( 1045 (
992 $w + $self->{padding} * 2, 1046 $w + $self->{padding} * 2,
993 $h + $self->{padding} * 2, 1047 $h + $self->{padding} * 2,
994 ) 1048 )
995} 1049}
996 1050
997sub size_allocate { 1051sub size_allocate {
998 my ($self, $x, $y, $w, $h) = @_; 1052 my ($self, $w, $h) = @_;
999
1000 $self->_size_allocate ($x, $y, $w, $h) or return;
1001 1053
1002 delete $self->{texture}; 1054 delete $self->{texture};
1003} 1055}
1004 1056
1005sub update { 1057sub update {
… …
1012sub _draw { 1064sub _draw {
1013 my ($self) = @_; 1065 my ($self) = @_;
1014 1066
1015 my $tex = $self->{texture} ||= do { 1067 my $tex = $self->{texture} ||= do {
1016 $self->{layout}->set_width ($self->{w}); 1068 $self->{layout}->set_width ($self->{w});
1017 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize}); 1069 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
1018 new_from_layout CFClient::Texture $self->{layout} 1070 new_from_layout CFClient::Texture $self->{layout}
1019 }; 1071 };
1020 1072
1021 glEnable GL_BLEND; 1073 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1074 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1023 glEnable GL_TEXTURE_2D; 1075 glEnable GL_TEXTURE_2D;
1024 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1076 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1025 1077
1026 glColor @{$self->{fg}}; 1078 glColor @{$self->{fg}};
1027 1079
1028 my $x = 1080 $self->{ox} = int (
1029 $self->{align} < 0 ? $self->{padding} 1081 $self->{align} < 0 ? $self->{padding}
1030 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1082 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1031 : ($self->{w} - $tex->{w}) * 0.5; 1083 : ($self->{w} - $tex->{w}) * 0.5
1084 );
1032 1085
1033 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5); 1086 $self->{oy} = int (
1087 $self->{valign} < 0 ? $self->{padding}
1088 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1089 : ($self->{h} - $tex->{h}) * 0.5
1090 );
1091
1092 $tex->draw_quad ($self->{ox}, $self->{oy});
1034 1093
1035 glDisable GL_TEXTURE_2D; 1094 glDisable GL_TEXTURE_2D;
1036 glDisable GL_BLEND; 1095 glDisable GL_BLEND;
1037} 1096}
1038 1097
1039############################################################################# 1098#############################################################################
1040 1099
1041package CFClient::UI::Entry; 1100package CFClient::UI::EntryBase;
1042 1101
1043our @ISA = CFClient::UI::Label::; 1102our @ISA = CFClient::UI::Label::;
1044 1103
1045use SDL; 1104use SDL;
1046use SDL::OpenGL; 1105use SDL::OpenGL;
… …
1053 bg => [0, 0, 0, 0.2], 1112 bg => [0, 0, 0, 0.2],
1054 active_bg => [1, 1, 1, 0.5], 1113 active_bg => [1, 1, 1, 0.5],
1055 active_fg => [0, 0, 0], 1114 active_fg => [0, 0, 0],
1056 can_hover => 1, 1115 can_hover => 1,
1057 can_focus => 1, 1116 can_focus => 1,
1117 valign => 0,
1058 @_ 1118 @_
1059 ) 1119 )
1060} 1120}
1061 1121
1062sub _set_text { 1122sub _set_text {
1063 my ($self, $text) = @_; 1123 my ($self, $text) = @_;
1064 1124
1065 my $old_text = $self->{text}; 1125 delete $self->{cur_h};
1126
1127 return if $self->{text} eq $text;
1066 1128
1067 $self->{last_activity} = $::NOW; 1129 $self->{last_activity} = $::NOW;
1068
1069 $self->{text} = $text; 1130 $self->{text} = $text;
1070 $self->{layout}->set_width ($self->{w});
1071 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1072 1131
1073 $text =~ s/./*/g if $self->{hidden}; 1132 $text =~ s/./*/g if $self->{hidden};
1133 $self->{layout}->set_text ("$text ");
1074 1134
1075 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1135 $self->emit (changed => $self->{text});
1136}
1076 1137
1077 $text = substr $text, 0, $self->{cursor}; 1138sub get_text {
1078 utf8::encode $text; 1139 $_[0]{text}
1079
1080 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1081
1082 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1083 if $old_text ne $self->{text};
1084} 1140}
1085 1141
1086sub size_request { 1142sub size_request {
1087 my ($self) = @_; 1143 my ($self) = @_;
1088 1144
… …
1090 1146
1091 ($w + 1, $h) # add 1 for cursor 1147 ($w + 1, $h) # add 1 for cursor
1092} 1148}
1093 1149
1094sub size_allocate { 1150sub size_allocate {
1095 my ($self, $x, $y, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
1096
1097 $self->SUPER::size_allocate ($x, $y, $w, $h);
1098 1152
1099 $self->_set_text ($self->{text}); 1153 $self->_set_text ($self->{text});
1100} 1154}
1101 1155
1102sub set_text { 1156sub set_text {
… …
1192 1246
1193 $self->SUPER::_draw; 1247 $self->SUPER::_draw;
1194 1248
1195 #TODO: force update every cursor change :( 1249 #TODO: force update every cursor change :(
1196 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1250 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1251
1252 unless (exists $self->{cur_h}) {
1253 my $text = substr $self->{text}, 0, $self->{cursor};
1254 utf8::encode $text;
1255
1256 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1257 }
1258
1197 glColor @{$self->{fg}}; 1259 glColor @{$self->{fg}};
1198 glBegin GL_LINES; 1260 glBegin GL_LINES;
1199 glVertex $self->{cur_x}, $self->{cur_y};
1200 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1261 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1262 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1201 glEnd; 1263 glEnd;
1202 } 1264 }
1203} 1265}
1204 1266
1205package CFClient::UI::LineEntry; 1267package CFClient::UI::Entry;
1206 1268
1207our @ISA = CFClient::UI::Entry::; 1269our @ISA = CFClient::UI::EntryBase::;
1208 1270
1209use SDL; 1271use SDL;
1210use SDL::OpenGL; 1272use SDL::OpenGL;
1211 1273
1212sub key_down { 1274sub key_down {
… …
1242 1304
1243 $class->SUPER::new ( 1305 $class->SUPER::new (
1244 padding => 4, 1306 padding => 4,
1245 fg => [1, 1, 1], 1307 fg => [1, 1, 1],
1246 bg => [1, 1, 1, 0.2], 1308 bg => [1, 1, 1, 0.2],
1247 active_fg => [1, 1, 0], 1309 active_fg => [0, 0, 1],
1248 can_hover => 1, 1310 can_hover => 1,
1311 align => 0,
1312 valign => 0,
1249 @_ 1313 @_
1250 ) 1314 )
1251} 1315}
1252 1316
1253sub button_up { 1317sub button_up {
… …
1261 1325
1262sub _draw { 1326sub _draw {
1263 my ($self) = @_; 1327 my ($self) = @_;
1264 1328
1265 local $self->{fg} = $self->{fg}; 1329 local $self->{fg} = $self->{fg};
1266 my $tex = $tex[0];
1267
1268 glEnable GL_BLEND;
1269 glEnable GL_TEXTURE_2D;
1270 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1271 1330
1272 if ($GRAB == $self) { 1331 if ($GRAB == $self) {
1273 $self->{fg} = $self->{active_fg}; 1332 $self->{fg} = $self->{active_fg};
1274 } 1333 }
1275 1334
1276 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1335 glEnable GL_BLEND;
1336 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1337 glEnable GL_TEXTURE_2D;
1277 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1338 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1339 glColor 0, 0, 0, 1;
1278 1340
1279 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1341 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1280 1342
1281 glDisable GL_TEXTURE_2D; 1343 glDisable GL_TEXTURE_2D;
1282 glDisable GL_BLEND; 1344 glDisable GL_BLEND;
1283 1345
1284 $self->SUPER::_draw; 1346 $self->SUPER::_draw;
… …
1314 my ($self) = @_; 1376 my ($self) = @_;
1315 1377
1316 ($self->{padding} * 2 + 6) x 2 1378 ($self->{padding} * 2 + 6) x 2
1317} 1379}
1318 1380
1319sub size_allocate {
1320 my ($self, $x, $y, $w, $h) = @_;
1321
1322 $self->_size_allocate ($x, $y, $w, $h);
1323}
1324
1325sub button_down { 1381sub button_down {
1326 my ($self, $ev, $x, $y) = @_; 1382 my ($self, $ev, $x, $y) = @_;
1327 1383
1328 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1384 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1329 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1385 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1351 1407
1352 $tex->draw_quad (0, 0, $s, $s); 1408 $tex->draw_quad (0, 0, $s, $s);
1353 1409
1354 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1355 glDisable GL_BLEND; 1411 glDisable GL_BLEND;
1412}
1413
1414#############################################################################
1415
1416package CFClient::UI::VGauge;
1417
1418our @ISA = CFClient::UI::Base::;
1419
1420use SDL::OpenGL;
1421
1422my %tex = (
1423 food => [
1424 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1425 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1426 ],
1427 grace => [
1428 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1429 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1430 ],
1431 hp => [
1432 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1433 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1434 ],
1435 mana => [
1436 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1437 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1438 ],
1439);
1440
1441# eg. VGauge->new (gauge => 'food'), default gauge: food
1442sub new {
1443 my $class = shift;
1444
1445 my $self = $class->SUPER::new (gauge => 'food', @_);
1446
1447 $self
1448}
1449
1450sub size_request {
1451 my ($self) = @_;
1452
1453 my $tex = $tex{$self->{gauge}}[0];
1454
1455 @$tex{qw(w h)}
1456}
1457
1458sub set_max {
1459 my ($self, $max) = @_;
1460
1461 $self->{max_val} = $max;
1462}
1463
1464sub set_value {
1465 my ($self, $val, $max) = @_;
1466
1467 $self->set_max ($max)
1468 if defined $max;
1469
1470 $max = $self->{max_val};
1471 $self->{val} = $val;
1472
1473 $self->update;
1474}
1475
1476sub _draw {
1477 my ($self) = @_;
1478
1479 my $tex = $tex{$self->{gauge}};
1480
1481 my ($w, $h) = ($self->{w}, $self->{h});
1482
1483 my $ycut = $self->{val} / ($self->{max_val} || 1);
1484 $ycut = 1 if $self->{val} > $self->{max_val};
1485
1486 my $t1 = $tex->[0];
1487 my $t2 = $tex->[1];
1488
1489 glEnable GL_BLEND;
1490 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1491 glEnable GL_TEXTURE_2D;
1492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1493
1494 my $h1 = $self->{h} - $ycut * $self->{h};
1495 my $h2 = $ycut * $self->{h};
1496
1497 my $yp = 0;
1498
1499 glBindTexture (GL_TEXTURE_2D, $t1->{name});
1500 glBegin (GL_QUADS);
1501 glTexCoord (0, 0); glVertex (0 , $yp);
1502 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
1503 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
1504 glTexCoord (1, 0); glVertex (0 + $w, $yp);
1505 glEnd ();
1506
1507 $yp += $h1;
1508
1509 glBindTexture (GL_TEXTURE_2D, $t2->{name});
1510 glBegin (GL_QUADS);
1511 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
1512 glTexCoord (0, 1); glVertex (0 , $yp + $h2);
1513 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
1514 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
1515 glEnd ();
1516
1517 glDisable GL_BLEND;
1518 glDisable GL_TEXTURE_2D;
1356} 1519}
1357 1520
1358############################################################################# 1521#############################################################################
1359 1522
1360package CFClient::UI::Slider; 1523package CFClient::UI::Slider;
… …
1554 1717
1555 ($self->{req_w}, $self->{req_h}) 1718 ($self->{req_w}, $self->{req_h})
1556} 1719}
1557 1720
1558sub size_allocate { 1721sub size_allocate {
1559 my ($self, $x, $y, $w, $h) = @_; 1722 my ($self, $w, $h) = @_;
1560
1561 $self->SUPER::size_allocate ($x, $y, $w, $h);
1562 1723
1563 $self->{layout}->set_height ($self->{fontsize}); 1724 $self->{layout}->set_height ($self->{fontsize});
1564 $self->{layout}->set_width ($self->{w}); 1725 $self->{layout}->set_width ($self->{w});
1565 1726
1566 $self->reflow; 1727 $self->reflow;
1728 $self->update;
1567} 1729}
1568 1730
1569sub add_paragraph { 1731sub add_paragraph {
1570 my ($self, $color, $text) = @_; 1732 my ($self, $color, $text) = @_;
1571 1733
… …
1752 1914
1753 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 1915 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1754 1916
1755 if ($::CFG->{fow_enable}) { 1917 if ($::CFG->{fow_enable}) {
1756 if ($::CFG->{fow_smooth}) { # smooth fog of war 1918 if ($::CFG->{fow_smooth}) { # smooth fog of war
1757 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1919 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1758 glConvolutionFilter2D 1920 glConvolutionFilter2D (
1759 GL_CONVOLUTION_2D, 1921 GL_CONVOLUTION_2D,
1760 GL_ALPHA, 1922 GL_ALPHA,
1761 3, 3, 1923 3, 3,
1762 GL_ALPHA, GL_FLOAT, 1924 GL_ALPHA, GL_FLOAT,
1763 pack "f*", 1925 pack "f*",
1764 0.1, 0.1, 0.1, 1926 0.1, 0.1, 0.1,
1765 0.1, 0.2, 0.1, 1927 0.1, 0.2, 0.1,
1766 0.1, 0.1, 0.1, 1928 0.1, 0.1, 0.1,
1767 ; 1929 );
1768 glEnable GL_CONVOLUTION_2D; 1930 glEnable GL_CONVOLUTION_2D;
1769 } 1931 }
1770 1932
1771 my $tex = new CFClient::Texture 1933 $self->{fow_texture} = new CFClient::Texture
1772 w => $w, 1934 w => $w,
1773 h => $h, 1935 h => $h,
1774 data => $data, 1936 data => $data,
1775 internalformat => GL_ALPHA, 1937 internalformat => GL_ALPHA,
1776 format => GL_ALPHA; 1938 format => GL_ALPHA;
… …
1781 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1943 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1782 glEnable GL_TEXTURE_2D; 1944 glEnable GL_TEXTURE_2D;
1783 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1784 1946
1785 glColor +($::CFG->{fow_intensity}) x 3, 1; 1947 glColor +($::CFG->{fow_intensity}) x 3, 1;
1786 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1948 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1787 1949
1788 glDisable GL_TEXTURE_2D; 1950 glDisable GL_TEXTURE_2D;
1789 glDisable GL_BLEND; 1951 glDisable GL_BLEND;
1790 } 1952 }
1791 1953
… …
1797 glEnable GL_BLEND; 1959 glEnable GL_BLEND;
1798 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1960 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1799 glEnable GL_TEXTURE_2D; 1961 glEnable GL_TEXTURE_2D;
1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1801 1963
1964 $self->{mapmap_texture} =
1802 CFClient::Texture->new ( 1965 new CFClient::Texture
1803 w => $w, 1966 w => $w,
1804 h => $h, 1967 h => $h,
1805 data => $::MAP->mapmap ($w, $h), 1968 data => $::MAP->mapmap ($w, $h),
1806 type => GL_UNSIGNED_INT_8_8_8_8_REV 1969 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1807 )->draw_quad (100, 100); 1970
1971 $self->{mapmap_texture}->draw_quad (100, 100);
1808 1972
1809 glDisable GL_TEXTURE_2D; 1973 glDisable GL_TEXTURE_2D;
1810 glDisable GL_BLEND; 1974 glDisable GL_BLEND;
1811 } 1975 }
1812 # HACK END 1976 # HACK END
… …
1854 2018
1855 my $mod = $ev->key_mod; 2019 my $mod = $ev->key_mod;
1856 my $sym = $ev->key_sym; 2020 my $sym = $ev->key_sym;
1857 2021
1858 if ($sym == SDLK_KP5) { 2022 if ($sym == SDLK_KP5) {
1859 $::CONN->user_send ("command stay fire"); 2023 $::CONN->user_send ("stay fire");
1860 } elsif ($sym == SDLK_a) { 2024 } elsif ($sym == SDLK_a) {
1861 $::CONN->user_send ("command apply"); 2025 $::CONN->user_send ("apply");
1862 } elsif ($sym == SDLK_QUOTE) { 2026 } elsif ($sym == SDLK_QUOTE) {
1863 $self->emit ('activate_console'); 2027 $self->emit ('activate_console');
1864 } elsif ($sym == SDLK_SLASH) { 2028 } elsif ($sym == SDLK_SLASH) {
1865 $self->emit ('activate_console' => '/'); 2029 $self->emit ('activate_console' => '/');
1866 } elsif (exists $DIR{$sym}) { 2030 } elsif (exists $DIR{$sym}) {
1867 if ($mod & KMOD_SHIFT) { 2031 if ($mod & KMOD_SHIFT) {
1868 $self->{shft}++; 2032 $self->{shft}++;
1869 $::CONN->user_send ("command fire $DIR{$sym}[0]"); 2033 $::CONN->user_send ("fire $DIR{$sym}[0]");
1870 } elsif ($mod & KMOD_CTRL) { 2034 } elsif ($mod & KMOD_CTRL) {
1871 $self->{ctrl}++; 2035 $self->{ctrl}++;
1872 $::CONN->user_send ("command run $DIR{$sym}[0]"); 2036 $::CONN->user_send ("run $DIR{$sym}[0]");
1873 } else { 2037 } else {
1874 $::CONN->user_send ("command $DIR{$sym}[1]"); 2038 $::CONN->user_send ("$DIR{$sym}[1]");
1875 } 2039 }
1876 } 2040 }
1877} 2041}
1878 2042
1879sub key_up { 2043sub key_up {
… …
1881 2045
1882 my $mod = $ev->key_mod; 2046 my $mod = $ev->key_mod;
1883 my $sym = $ev->key_sym; 2047 my $sym = $ev->key_sym;
1884 2048
1885 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 2049 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1886 $::CONN->user_send ("command fire_stop"); 2050 $::CONN->user_send ("fire_stop");
1887 } 2051 }
1888 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 2052 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1889 $::CONN->user_send ("command run_stop"); 2053 $::CONN->user_send ("run_stop");
1890 } 2054 }
1891} 2055}
1892 2056
1893############################################################################# 2057#############################################################################
1894 2058
… …
1960 2124
1961 # TODO: use animation 2125 # TODO: use animation
1962 if ($self->{state} = !$self->{state}) { 2126 if ($self->{state} = !$self->{state}) {
1963 $CFClient::UI::ROOT->add ($self->{other}); 2127 $CFClient::UI::ROOT->add ($self->{other});
1964 $self->{other}->move ($self->coord2global (0, $self->{h})); 2128 $self->{other}->move ($self->coord2global (0, $self->{h}));
2129 $self->emit ("open");
1965 } else { 2130 } else {
1966 $CFClient::UI::ROOT->remove ($self->{other}); 2131 $CFClient::UI::ROOT->remove ($self->{other});
2132 $self->emit ("close");
1967 } 2133 }
2134
2135 $self->emit (changed => $self->{state});
1968} 2136}
1969 2137
1970############################################################################# 2138#############################################################################
1971 2139
1972package CFClient::UI::Root; 2140package CFClient::UI::Root;
1973 2141
1974our @ISA = CFClient::UI::Container::; 2142our @ISA = CFClient::UI::Container::;
1975 2143
1976use SDL::OpenGL; 2144use SDL::OpenGL;
2145
2146sub check_size {
2147 my ($self) = @_;
2148
2149 $self->configure (0, 0, $::WITH, $::HEIGHT);
2150}
1977 2151
1978sub size_request { 2152sub size_request {
1979 ($::WIDTH, $::HEIGHT) 2153 ($::WIDTH, $::HEIGHT)
1980} 2154}
1981 2155
1982sub size_allocate { 2156sub configure {
1983 my ($self, $x, $y, $w, $h) = @_; 2157 my ($self, $x, $y, $w, $h) = @_;
1984 2158
1985 $self->_size_allocate ($x, $y, $w, $h); 2159 $self->SUPER::configure ($x, $y, $w, $h);
1986 2160
1987 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2161 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1988 for @{$self->{children}}; 2162 for @{$self->{children}};
1989} 2163}
1990 2164
1991sub _topleft { 2165sub _topleft {
1992 my ($self, $x, $y) = @_; 2166 my ($self, $x, $y) = @_;
… …
1995} 2169}
1996 2170
1997sub update { 2171sub update {
1998 my ($self) = @_; 2172 my ($self) = @_;
1999 2173
2000 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2174 $self->check_size;
2001 ::refresh (); 2175 ::refresh ();
2002} 2176}
2003 2177
2004sub add { 2178sub add {
2005 my ($self, $widget) = @_; 2179 my ($self, $child) = @_;
2006 2180
2007 $self->SUPER::add ($widget); 2181 $self->SUPER::add ($child);
2008
2009 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
2010} 2182}
2011 2183
2012sub on_refresh { 2184sub on_refresh {
2013 my ($self, $id, $cb) = @_; 2185 my ($self, $id, $cb) = @_;
2014 2186

Diff Legend

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