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.119 by root, Sun Apr 16 07:25:30 2006 UTC vs.
Revision 1.130 by root, Tue Apr 18 01:51:06 2006 UTC

… …
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} = int $x; 118 $self->{x} = int $x;
118 $self->{y} = int $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
… …
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;
709 $self->update; 750
751 $child->check_size;
710} 752}
711 753
712# TODO: move to container class maybe? send childs a signal on removal? 754# TODO: move to container class maybe? send childs a signal on removal?
713sub clear { 755sub clear {
714 my ($self) = @_; 756 my ($self) = @_;
… …
749 (sum @$hs), 791 (sum @$hs),
750 ) 792 )
751} 793}
752 794
753sub size_allocate { 795sub size_allocate {
754 my ($self, $x, $y, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
755
756 $self->_size_allocate ($x, $y, $w, $h) or return;
757 797
758 my ($ws, $hs) = $self->get_wh; 798 my ($ws, $hs) = $self->get_wh;
759 799
760 my $req_w = sum @$ws; 800 my $req_w = sum @$ws;
761 my $req_h = sum @$hs; 801 my $req_h = sum @$hs;
… …
783 823
784 for my $c (0 .. $#$row) { 824 for my $c (0 .. $#$row) {
785 my $col_w = $ws->[$c]; 825 my $col_w = $ws->[$c];
786 826
787 if (my $widget = $row->[$c]) { 827 if (my $widget = $row->[$c]) {
788 $widget->size_allocate ($x, $y, $col_w, $row_h); 828 $widget->configure ($x, $y, $col_w, $row_h);
789 } 829 }
790 830
791 $x += $col_w; 831 $x += $col_w;
792 } 832 }
793 833
… …
838 (List::Util::max map $_->[1], @alloc), 878 (List::Util::max map $_->[1], @alloc),
839 ) 879 )
840} 880}
841 881
842sub size_allocate { 882sub size_allocate {
843 my ($self, $x, $y, $w, $h) = @_; 883 my ($self, $w, $h) = @_;
844
845 $self->_size_allocate ($x, $y, $w, $h);
846 884
847 ($h, $w) = ($w, $h); 885 ($h, $w) = ($w, $h);
848 886
849 my $children = $self->{children}; 887 my $children = $self->{children};
850 888
… …
872 910
873 my $y = 0; 911 my $y = 0;
874 for (0 .. $#$children) { 912 for (0 .. $#$children) {
875 my $child = $children->[$_]; 913 my $child = $children->[$_];
876 my $h = $h[$_]; 914 my $h = $h[$_];
877 $child->size_allocate ($y, 0, $h, $w); 915 $child->configure ($y, 0, $h, $w);
878 916
879 $y += $h; 917 $y += $h;
880 } 918 }
919
920 1
881} 921}
882 922
883############################################################################# 923#############################################################################
884 924
885package CFClient::UI::VBox; 925package CFClient::UI::VBox;
… …
898 (List::Util::sum map $_->[1], @alloc), 938 (List::Util::sum map $_->[1], @alloc),
899 ) 939 )
900} 940}
901 941
902sub size_allocate { 942sub size_allocate {
903 my ($self, $x, $y, $w, $h) = @_; 943 my ($self, $w, $h) = @_;
904
905 $self->_size_allocate ($x, $y, $w, $h);
906 944
907 my $children = $self->{children}; 945 my $children = $self->{children};
908 946
909 my @h = map +($_->size_request)[1], @$children; 947 my @h = map +($_->size_request)[1], @$children;
910 948
… …
928 966
929 my $y = 0; 967 my $y = 0;
930 for (0 .. $#$children) { 968 for (0 .. $#$children) {
931 my $child = $children->[$_]; 969 my $child = $children->[$_];
932 my $h = $h[$_]; 970 my $h = $h[$_];
933 $child->size_allocate (0, $y, $w, $h); 971 $child->configure (0, $y, $w, $h);
934 972
935 $y += $h; 973 $y += $h;
936 } 974 }
975
976 1
937} 977}
938 978
939############################################################################# 979#############################################################################
940 980
941package CFClient::UI::Label; 981package CFClient::UI::Label;
… …
956 padding => 2, 996 padding => 2,
957 layout => new CFClient::Layout, 997 layout => new CFClient::Layout,
958 %arg 998 %arg
959 ); 999 );
960 1000
961 $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};
962 1005
963 $self 1006 $self
964} 1007}
965 1008
966sub escape_text { 1009sub escape_text {
… …
974} 1017}
975 1018
976sub set_text { 1019sub set_text {
977 my ($self, $text) = @_; 1020 my ($self, $text) = @_;
978 1021
979 $self->{text} = $text;
980 $self->{layout}->set_markup ($text); 1022 $self->{layout}->set_text ($text);
981 1023
982 delete $self->{texture}; 1024 delete $self->{texture};
983# $self->{w} = $self->{h} = -1;
984 $self->update; 1025 $self->update;
985} 1026}
986 1027
987sub get_text { 1028sub set_markup {
988 my ($self, $text) = @_; 1029 my ($self, $markup) = @_;
989 1030
990 $self->{text} 1031 $self->{layout}->set_markup ($markup);
1032
1033 delete $self->{texture};
1034 $self->update;
991} 1035}
992 1036
993sub size_request { 1037sub size_request {
994 my ($self) = @_; 1038 my ($self) = @_;
995 1039
996 $self->{layout}->set_width; 1040 $self->{layout}->set_width;
997 $self->{layout}->set_height ($self->{fontsize}); 1041 $self->{layout}->set_height ($self->{fontsize});
1042
998 my ($w, $h) = $self->{layout}->size; 1043 my ($w, $h) = $self->{layout}->size;
999 1044
1000 ( 1045 (
1001 $w + $self->{padding} * 2, 1046 $w + $self->{padding} * 2,
1002 $h + $self->{padding} * 2, 1047 $h + $self->{padding} * 2,
1003 ) 1048 )
1004} 1049}
1005 1050
1006sub size_allocate { 1051sub size_allocate {
1007 my ($self, $x, $y, $w, $h) = @_; 1052 my ($self, $w, $h) = @_;
1008
1009 $self->_size_allocate ($x, $y, $w, $h) or return;
1010 1053
1011 delete $self->{texture}; 1054 delete $self->{texture};
1012} 1055}
1013 1056
1014sub update { 1057sub update {
… …
1021sub _draw { 1064sub _draw {
1022 my ($self) = @_; 1065 my ($self) = @_;
1023 1066
1024 my $tex = $self->{texture} ||= do { 1067 my $tex = $self->{texture} ||= do {
1025 $self->{layout}->set_width ($self->{w}); 1068 $self->{layout}->set_width ($self->{w});
1026 $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});
1027 new_from_layout CFClient::Texture $self->{layout} 1070 new_from_layout CFClient::Texture $self->{layout}
1028 }; 1071 };
1029 1072
1030 glEnable GL_BLEND; 1073 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1074 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1032 glEnable GL_TEXTURE_2D; 1075 glEnable GL_TEXTURE_2D;
1033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1076 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1034 1077
1035 glColor @{$self->{fg}}; 1078 glColor @{$self->{fg}};
1036 1079
1037 my $x = 1080 $self->{ox} = int (
1038 $self->{align} < 0 ? $self->{padding} 1081 $self->{align} < 0 ? $self->{padding}
1039 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1082 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1040 : ($self->{w} - $tex->{w}) * 0.5; 1083 : ($self->{w} - $tex->{w}) * 0.5
1084 );
1041 1085
1042 my $y = 1086 $self->{oy} = int (
1043 $self->{valign} < 0 ? $self->{padding} 1087 $self->{valign} < 0 ? $self->{padding}
1044 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1088 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1045 : ($self->{h} - $tex->{h}) * 0.5; 1089 : ($self->{h} - $tex->{h}) * 0.5
1090 );
1046 1091
1047 $tex->draw_quad (int $x, int $y); 1092 $tex->draw_quad ($self->{ox}, $self->{oy});
1048 1093
1049 glDisable GL_TEXTURE_2D; 1094 glDisable GL_TEXTURE_2D;
1050 glDisable GL_BLEND; 1095 glDisable GL_BLEND;
1051} 1096}
1052 1097
1053############################################################################# 1098#############################################################################
1054 1099
1055package CFClient::UI::Entry; 1100package CFClient::UI::EntryBase;
1056 1101
1057our @ISA = CFClient::UI::Label::; 1102our @ISA = CFClient::UI::Label::;
1058 1103
1059use SDL; 1104use SDL;
1060use SDL::OpenGL; 1105use SDL::OpenGL;
… …
1075} 1120}
1076 1121
1077sub _set_text { 1122sub _set_text {
1078 my ($self, $text) = @_; 1123 my ($self, $text) = @_;
1079 1124
1080 my $old_text = $self->{text}; 1125 delete $self->{cur_h};
1126
1127 return if $self->{text} eq $text;
1081 1128
1082 $self->{last_activity} = $::NOW; 1129 $self->{last_activity} = $::NOW;
1083
1084 $self->{text} = $text; 1130 $self->{text} = $text;
1085 $self->{layout}->set_width ($self->{w});
1086 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1087 1131
1088 $text =~ s/./*/g if $self->{hidden}; 1132 $text =~ s/./*/g if $self->{hidden};
1133 $self->{layout}->set_text ("$text ");
1089 1134
1090 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1135 $self->emit (changed => $self->{text});
1136}
1091 1137
1092 $text = substr $text, 0, $self->{cursor}; 1138sub get_text {
1093 utf8::encode $text; 1139 $_[0]{text}
1094
1095 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1096
1097 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1098 if $old_text ne $self->{text};
1099} 1140}
1100 1141
1101sub size_request { 1142sub size_request {
1102 my ($self) = @_; 1143 my ($self) = @_;
1103 1144
… …
1105 1146
1106 ($w + 1, $h) # add 1 for cursor 1147 ($w + 1, $h) # add 1 for cursor
1107} 1148}
1108 1149
1109sub size_allocate { 1150sub size_allocate {
1110 my ($self, $x, $y, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
1111
1112 $self->SUPER::size_allocate ($x, $y, $w, $h);
1113 1152
1114 $self->_set_text ($self->{text}); 1153 $self->_set_text ($self->{text});
1115} 1154}
1116 1155
1117sub set_text { 1156sub set_text {
… …
1207 1246
1208 $self->SUPER::_draw; 1247 $self->SUPER::_draw;
1209 1248
1210 #TODO: force update every cursor change :( 1249 #TODO: force update every cursor change :(
1211 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
1212 glColor @{$self->{fg}}; 1259 glColor @{$self->{fg}};
1213 glBegin GL_LINES; 1260 glBegin GL_LINES;
1214 glVertex $self->{cur_x}, $self->{cur_y};
1215 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};
1216 glEnd; 1263 glEnd;
1217 } 1264 }
1218} 1265}
1219 1266
1220package CFClient::UI::LineEntry; 1267package CFClient::UI::Entry;
1221 1268
1222our @ISA = CFClient::UI::Entry::; 1269our @ISA = CFClient::UI::EntryBase::;
1223 1270
1224use SDL; 1271use SDL;
1225use SDL::OpenGL; 1272use SDL::OpenGL;
1226 1273
1227sub key_down { 1274sub key_down {
… …
1257 1304
1258 $class->SUPER::new ( 1305 $class->SUPER::new (
1259 padding => 4, 1306 padding => 4,
1260 fg => [1, 1, 1], 1307 fg => [1, 1, 1],
1261 bg => [1, 1, 1, 0.2], 1308 bg => [1, 1, 1, 0.2],
1262 active_fg => [1, 1, 0], 1309 active_fg => [0, 0, 1],
1263 can_hover => 1, 1310 can_hover => 1,
1311 align => 0,
1312 valign => 0,
1264 @_ 1313 @_
1265 ) 1314 )
1266} 1315}
1267 1316
1268sub button_up { 1317sub button_up {
… …
1327 my ($self) = @_; 1376 my ($self) = @_;
1328 1377
1329 ($self->{padding} * 2 + 6) x 2 1378 ($self->{padding} * 2 + 6) x 2
1330} 1379}
1331 1380
1332sub size_allocate {
1333 my ($self, $x, $y, $w, $h) = @_;
1334
1335 $self->_size_allocate ($x, $y, $w, $h);
1336}
1337
1338sub button_down { 1381sub button_down {
1339 my ($self, $ev, $x, $y) = @_; 1382 my ($self, $ev, $x, $y) = @_;
1340 1383
1341 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1384 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1342 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1385 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1364 1407
1365 $tex->draw_quad (0, 0, $s, $s); 1408 $tex->draw_quad (0, 0, $s, $s);
1366 1409
1367 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1368 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;
1369} 1519}
1370 1520
1371############################################################################# 1521#############################################################################
1372 1522
1373package CFClient::UI::Slider; 1523package CFClient::UI::Slider;
… …
1567 1717
1568 ($self->{req_w}, $self->{req_h}) 1718 ($self->{req_w}, $self->{req_h})
1569} 1719}
1570 1720
1571sub size_allocate { 1721sub size_allocate {
1572 my ($self, $x, $y, $w, $h) = @_; 1722 my ($self, $w, $h) = @_;
1573
1574 $self->SUPER::size_allocate ($x, $y, $w, $h);
1575 1723
1576 $self->{layout}->set_height ($self->{fontsize}); 1724 $self->{layout}->set_height ($self->{fontsize});
1577 $self->{layout}->set_width ($self->{w}); 1725 $self->{layout}->set_width ($self->{w});
1578 1726
1579 $self->reflow; 1727 $self->reflow;
1728 $self->update;
1580} 1729}
1581 1730
1582sub add_paragraph { 1731sub add_paragraph {
1583 my ($self, $color, $text) = @_; 1732 my ($self, $color, $text) = @_;
1584 1733
… …
1765 1914
1766 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);
1767 1916
1768 if ($::CFG->{fow_enable}) { 1917 if ($::CFG->{fow_enable}) {
1769 if ($::CFG->{fow_smooth}) { # smooth fog of war 1918 if ($::CFG->{fow_smooth}) { # smooth fog of war
1770 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1919 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1771 glConvolutionFilter2D 1920 glConvolutionFilter2D (
1772 GL_CONVOLUTION_2D, 1921 GL_CONVOLUTION_2D,
1773 GL_ALPHA, 1922 GL_ALPHA,
1774 3, 3, 1923 3, 3,
1775 GL_ALPHA, GL_FLOAT, 1924 GL_ALPHA, GL_FLOAT,
1776 pack "f*", 1925 pack "f*",
1777 0.1, 0.1, 0.1, 1926 0.1, 0.1, 0.1,
1778 0.1, 0.2, 0.1, 1927 0.1, 0.2, 0.1,
1779 0.1, 0.1, 0.1, 1928 0.1, 0.1, 0.1,
1780 ; 1929 );
1781 glEnable GL_CONVOLUTION_2D; 1930 glEnable GL_CONVOLUTION_2D;
1782 } 1931 }
1783 1932
1784 $self->{fow_texture} = new CFClient::Texture 1933 $self->{fow_texture} = new CFClient::Texture
1785 w => $w, 1934 w => $w,
… …
1815 $self->{mapmap_texture} = 1964 $self->{mapmap_texture} =
1816 new CFClient::Texture 1965 new CFClient::Texture
1817 w => $w, 1966 w => $w,
1818 h => $h, 1967 h => $h,
1819 data => $::MAP->mapmap ($w, $h), 1968 data => $::MAP->mapmap ($w, $h),
1820 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;
1821 1970
1822 $self->{mapmap_texture}->draw_quad (100, 100); 1971 $self->{mapmap_texture}->draw_quad (100, 100);
1823 1972
1824 glDisable GL_TEXTURE_2D; 1973 glDisable GL_TEXTURE_2D;
1825 glDisable GL_BLEND; 1974 glDisable GL_BLEND;
… …
1869 2018
1870 my $mod = $ev->key_mod; 2019 my $mod = $ev->key_mod;
1871 my $sym = $ev->key_sym; 2020 my $sym = $ev->key_sym;
1872 2021
1873 if ($sym == SDLK_KP5) { 2022 if ($sym == SDLK_KP5) {
1874 $::CONN->user_send ("command stay fire"); 2023 $::CONN->user_send ("stay fire");
1875 } elsif ($sym == SDLK_a) { 2024 } elsif ($sym == SDLK_a) {
1876 $::CONN->user_send ("command apply"); 2025 $::CONN->user_send ("apply");
1877 } elsif ($sym == SDLK_QUOTE) { 2026 } elsif ($sym == SDLK_QUOTE) {
1878 $self->emit ('activate_console'); 2027 $self->emit ('activate_console');
1879 } elsif ($sym == SDLK_SLASH) { 2028 } elsif ($sym == SDLK_SLASH) {
1880 $self->emit ('activate_console' => '/'); 2029 $self->emit ('activate_console' => '/');
1881 } elsif (exists $DIR{$sym}) { 2030 } elsif (exists $DIR{$sym}) {
1882 if ($mod & KMOD_SHIFT) { 2031 if ($mod & KMOD_SHIFT) {
1883 $self->{shft}++; 2032 $self->{shft}++;
1884 $::CONN->user_send ("command fire $DIR{$sym}[0]"); 2033 $::CONN->user_send ("fire $DIR{$sym}[0]");
1885 } elsif ($mod & KMOD_CTRL) { 2034 } elsif ($mod & KMOD_CTRL) {
1886 $self->{ctrl}++; 2035 $self->{ctrl}++;
1887 $::CONN->user_send ("command run $DIR{$sym}[0]"); 2036 $::CONN->user_send ("run $DIR{$sym}[0]");
1888 } else { 2037 } else {
1889 $::CONN->user_send ("command $DIR{$sym}[1]"); 2038 $::CONN->user_send ("$DIR{$sym}[1]");
1890 } 2039 }
1891 } 2040 }
1892} 2041}
1893 2042
1894sub key_up { 2043sub key_up {
… …
1896 2045
1897 my $mod = $ev->key_mod; 2046 my $mod = $ev->key_mod;
1898 my $sym = $ev->key_sym; 2047 my $sym = $ev->key_sym;
1899 2048
1900 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 2049 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1901 $::CONN->user_send ("command fire_stop"); 2050 $::CONN->user_send ("fire_stop");
1902 } 2051 }
1903 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 2052 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1904 $::CONN->user_send ("command run_stop"); 2053 $::CONN->user_send ("run_stop");
1905 } 2054 }
1906} 2055}
1907 2056
1908############################################################################# 2057#############################################################################
1909 2058
… …
1992 2141
1993our @ISA = CFClient::UI::Container::; 2142our @ISA = CFClient::UI::Container::;
1994 2143
1995use SDL::OpenGL; 2144use SDL::OpenGL;
1996 2145
2146sub check_size {
2147 my ($self) = @_;
2148
2149 $self->configure (0, 0, $::WITH, $::HEIGHT);
2150}
2151
1997sub size_request { 2152sub size_request {
1998 ($::WIDTH, $::HEIGHT) 2153 ($::WIDTH, $::HEIGHT)
1999} 2154}
2000 2155
2001sub size_allocate { 2156sub configure {
2002 my ($self, $x, $y, $w, $h) = @_; 2157 my ($self, $x, $y, $w, $h) = @_;
2003 2158
2004 $self->_size_allocate ($x, $y, $w, $h); 2159 $self->SUPER::configure ($x, $y, $w, $h);
2005 2160
2006 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2161 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2007 for @{$self->{children}}; 2162 for @{$self->{children}};
2008} 2163}
2009 2164
2010sub _topleft { 2165sub _topleft {
2011 my ($self, $x, $y) = @_; 2166 my ($self, $x, $y) = @_;
… …
2014} 2169}
2015 2170
2016sub update { 2171sub update {
2017 my ($self) = @_; 2172 my ($self) = @_;
2018 2173
2019 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2174 $self->check_size;
2020 ::refresh (); 2175 ::refresh ();
2021} 2176}
2022 2177
2023sub add { 2178sub add {
2024 my ($self, $widget) = @_; 2179 my ($self, $child) = @_;
2025 2180
2026 $self->SUPER::add ($widget); 2181 $self->SUPER::add ($child);
2027
2028 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2029} 2182}
2030 2183
2031sub on_refresh { 2184sub on_refresh {
2032 my ($self, $id, $cb) = @_; 2185 my ($self, $id, $cb) = @_;
2033 2186

Diff Legend

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