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

Diff Legend

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