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.99 by elmex, Fri Apr 14 10:57:35 2006 UTC vs.
Revision 1.127 by root, Mon Apr 17 21:03:31 2006 UTC

… …
7 7
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $TOPLEVEL; 12our $ROOT;
13our $BUTTON_STATE; 13our $BUTTON_STATE;
14 14
15# class methods for events 15# class methods for events
16sub feed_sdl_key_down_event { 16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 17 $FOCUS->key_down ($_[0]) if $FOCUS;
… …
24sub feed_sdl_button_down_event { 24sub feed_sdl_button_down_event {
25 my ($ev) = @_; 25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27 27
28 if (!$BUTTON_STATE) { 28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y); 29 my $widget = $ROOT->find_widget ($x, $y);
30 30
31 $GRAB = $widget; 31 $GRAB = $widget;
32 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
33 } 33 }
34 34
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
36 36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38} 38}
39 39
40sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
41 my ($ev) = @_; 41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43 43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47 47
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
56 56
57sub feed_sdl_motion_event { 57sub feed_sdl_motion_event {
58 my ($ev) = @_; 58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60 60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 62
63 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
65 65
66 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71}
72
73# convert position array to integers
74sub harmonize {
75 my ($vals) = @_;
76
77 my $rem = 0;
78
79 for (@$vals) {
80 my $i = int $_ + $rem;
81 $rem += $_ - $i;
82 $_ = $i;
83 }
71} 84}
72 85
73############################################################################# 86#############################################################################
74 87
75package CFClient::UI::Base; 88package CFClient::UI::Base;
… …
99 $self 112 $self
100} 113}
101 114
102sub move { 115sub move {
103 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
104 $self->{x} = $x; 117 $self->{x} = int $x;
105 $self->{y} = $y; 118 $self->{y} = int $y;
106 $self->{z} = $z if defined $z; 119 $self->{z} = $z if defined $z;
107} 120}
108 121
109sub needs_redraw { 122sub needs_redraw {
110 0 123 0
… …
133 my ($self, $x, $y, $w, $h) = @_; 146 my ($self, $x, $y, $w, $h) = @_;
134 147
135 $self->_size_allocate ($x, $y, $w, $h); 148 $self->_size_allocate ($x, $y, $w, $h);
136} 149}
137 150
151# return top left coordinates
152sub _topleft {
153 my ($self, $x, $y) = @_;
154
155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156}
157
138# translate global coordinates to local coordinate system 158# translate global coordinates to local coordinate system
139sub translate { 159sub coord2local {
140 my ($self, $x, $y) = @_; 160 my ($self, $x, $y) = @_;
141 161
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 162 my ($X, $Y) = $self->_topleft;
163 ($x - $X, $y - $Y)
164}
165
166# translate local coordinates to global coordinate system
167sub coord2global {
168 my ($self, $x, $y) = @_;
169
170 my ($X, $Y) = $self->_topleft;
171 ($x + $X, $y + $Y)
143} 172}
144 173
145sub focus_in { 174sub focus_in {
146 my ($self) = @_; 175 my ($self) = @_;
147 176
148 return if $FOCUS == $self; 177 return if $FOCUS == $self;
149 return unless $self->{can_focus}; 178 return unless $self->{can_focus};
150 179
151 my $focus = $FOCUS; $FOCUS = $self; 180 my $focus = $FOCUS; $FOCUS = $self;
181
182 $self->emit (focus_in => $focus);
183
152 $focus->update if $focus; 184 $focus->update if $focus;
153 $FOCUS->update; 185 $FOCUS->update;
154} 186}
155 187
156sub focus_out { 188sub focus_out {
157 my ($self) = @_; 189 my ($self) = @_;
158 190
159 return unless $FOCUS == $self; 191 return unless $FOCUS == $self;
160 192
161 my $focus = $FOCUS; undef $FOCUS; 193 my $focus = $FOCUS; undef $FOCUS;
194
195 $self->emit (focus_out => $focus);
196
162 $focus->update if $focus; #? 197 $focus->update if $focus; #?
163} 198}
164 199
165sub mouse_motion { } 200sub mouse_motion { }
166sub button_up { } 201sub button_up { }
… …
190 glPopMatrix; 225 glPopMatrix;
191 226
192 if ($self == $HOVER && $self->{can_hover}) { 227 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)}; 228 my ($x, $y) = @$self{qw(x y)};
194 229
195 glColor 0, 0, 1, 0.2; 230 glColor 1, 0.8, 0.5, 0.2;
196 glEnable GL_BLEND; 231 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
198 glBegin GL_QUADS; 233 glBegin GL_QUADS;
199 glVertex $x , $y; 234 glVertex $x , $y;
200 glVertex $x + $self->{w}, $y; 235 glVertex $x + $self->{w}, $y;
… …
220 255
221 () 256 ()
222} 257}
223 258
224sub set_parent { 259sub set_parent {
225 my ($self, $par) = @_; 260 my ($self, $parent) = @_;
226 261
227 $self->{parent} = $par;
228 Scalar::Util::weaken $self->{parent}; 262 Scalar::Util::weaken ($self->{parent} = $parent);
229} 263}
230 264
231sub get_parent { 265sub check_size {
232 $_[0]->{parent} 266 my ($self) = @_;
267
268 my ($w, $h) = $self->size_request;
269
270 if ($w != $self->{req_w} || $h != $self->{req_h}) {
271 $self->{req_w} = $w;
272 $self->{req_h} = $h;
273
274 $self->{parent}->check_size
275 if $self->{parent};
276 }
233} 277}
234 278
235sub update { 279sub update {
236 my ($self) = @_; 280 my ($self) = @_;
237 281
… …
326 370
327 $self 371 $self
328} 372}
329 373
330sub add { 374sub add {
331 my ($self, $chld) = @_; 375 my ($self, $child) = @_;
332 376
333 $chld->set_parent ($self); 377 $child->set_parent ($self);
378
379 use sort 'stable';
334 380
335 $self->{children} = [ 381 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 382 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 383 @{$self->{children}}, $child
338 ]; 384 ];
339 385
340 $self->{w} = $self->{h} = -1; 386 $self->{w} = $self->{h} = -1;
341 $self->update; 387
388 $child->check_size;
342} 389}
343 390
344sub remove { 391sub remove {
345 my ($self, $widget) = @_; 392 my ($self, $widget) = @_;
346 393
347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 394 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
348 395
349 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 396 $self->check_size;
350} 397}
351 398
352sub find_widget { 399sub find_widget {
353 my ($self, $x, $y) = @_; 400 my ($self, $x, $y) = @_;
354 401
… …
439} 486}
440 487
441sub render_chld { 488sub render_chld {
442 my ($self) = @_; 489 my ($self) = @_;
443 490
444 $self->{texture} = 491 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445 CFClient::Texture->new_from_opengl ( 492 glClearColor 0, 0, 0, 1;
446 $self->{w}, $self->{h}, sub { $self->child->draw } 493 glClear GL_COLOR_BUFFER_BIT;
447 ); 494 $self->child->draw;
495 };
448} 496}
449 497
450sub size_allocate { 498sub size_allocate {
451 my ($self, $x, $y, $w, $h) = @_; 499 my ($self, $x, $y, $w, $h) = @_;
452 500
… …
473 $tex->draw_quad (0, 0, $w, $h); 521 $tex->draw_quad (0, 0, $w, $h);
474 522
475 glDisable GL_BLEND; 523 glDisable GL_BLEND;
476 glDisable GL_TEXTURE_2D; 524 glDisable GL_TEXTURE_2D;
477} 525}
526
527#############################################################################
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 size_allocate {
545 my ($self, $x, $y, $w, $h) = @_;
546
547 $self->_size_allocate ($x, $y, $w, $h) or return;
548}
549
550sub _draw {
551 my ($self) = @_;
552
553 $self->{children}[1]->draw;
554}
555
478 556
479############################################################################# 557#############################################################################
480 558
481package CFClient::UI::Frame; 559package CFClient::UI::Frame;
482 560
… …
538 # TODO: user_x, user_y, overwrite moveto? 616 # TODO: user_x, user_y, overwrite moveto?
539 617
540 $class->SUPER::new ( 618 $class->SUPER::new (
541 bg => [1, 1, 1, 1], 619 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1], 620 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8, 621 border => int $::FONTSIZE * 0.8,
544 @_ 622 @_
545 ) 623 )
546} 624}
547 625
548sub size_request { 626sub size_request {
… …
639 # TODO: repeat texture not scale 717 # TODO: repeat texture not scale
640 my $rep_x = $cw / $bg->{w}; 718 my $rep_x = $cw / $bg->{w};
641 my $rep_y = $ch / $bg->{h}; 719 my $rep_y = $ch / $bg->{h};
642 720
643 glColor @{ $self->{bg} }; 721 glColor @{ $self->{bg} };
722
723 $bg->{s} = $rep_x;
724 $bg->{t} = $rep_y;
725 $bg->{wrap_mode} = 1;
644 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 726 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
645 727
646 glDisable GL_TEXTURE_2D; 728 glDisable GL_TEXTURE_2D;
647 glDisable GL_BLEND; 729 glDisable GL_BLEND;
648 730
… …
667 @_ 749 @_
668 ) 750 )
669} 751}
670 752
671sub add { 753sub add {
672 my ($self, $x, $y, $chld) = @_; 754 my ($self, $x, $y, $child) = @_;
673 755
756 $child->set_parent ($self);
674 $self->{children}[$y][$x] = $chld; 757 $self->{children}[$y][$x] = $child;
675 $chld->set_parent ($self);
676 758
677 $self->{w} = $self->{h} = -1; 759 $self->{w} = $self->{h} = -1;
760
761 $child->check_size;
762}
763
764# TODO: move to container class maybe? send childs a signal on removal?
765sub clear {
766 my ($self) = @_;
767
768 delete $self->{children};
678 $self->update; 769 $self->update;
679} 770}
680 771
681sub get_wh { 772sub get_wh {
682 my ($self) = @_; 773 my ($self) = @_;
… …
727 my $col_expand = (sum @col_expand) || 1; 818 my $col_expand = (sum @col_expand) || 1;
728 819
729 # linearly scale sizes 820 # linearly scale sizes
730 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 821 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
731 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 822 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
823
824 CFClient::UI::harmonize $ws;
825 CFClient::UI::harmonize $hs;
732 826
733 my $y; 827 my $y;
734 828
735 for my $r (0 .. $#{$self->{children}}) { 829 for my $r (0 .. $#{$self->{children}}) {
736 my $row = $self->{children}[$r] 830 my $row = $self->{children}[$r]
… …
798} 892}
799 893
800sub size_allocate { 894sub size_allocate {
801 my ($self, $x, $y, $w, $h) = @_; 895 my ($self, $x, $y, $w, $h) = @_;
802 896
803 $self->_size_allocate ($x, $y, $w, $h); 897 $self->_size_allocate ($x, $y, $w, $h) or return;
804 898
805 ($h, $w) = ($w, $h); 899 ($h, $w) = ($w, $h);
806 900
807 my $children = $self->{children}; 901 my $children = $self->{children};
808 902
… …
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 918 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h; 919 $h[$_] = $alloc_h;
826 } 920 }
827 } 921 }
828 922
923 CFClient::UI::harmonize \@h;
924
829 my $y = 0; 925 my $y = 0;
830 for (0 .. $#$children) { 926 for (0 .. $#$children) {
831 my $child = $children->[$_]; 927 my $child = $children->[$_];
832 my $h = $h[$_]; 928 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w); 929 $child->size_allocate ($y, 0, $h, $w);
834 930
835 $y += $h; 931 $y += $h;
836 } 932 }
933
934 1
837} 935}
838 936
839############################################################################# 937#############################################################################
840 938
841package CFClient::UI::VBox; 939package CFClient::UI::VBox;
… …
856} 954}
857 955
858sub size_allocate { 956sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 957 my ($self, $x, $y, $w, $h) = @_;
860 958
861 $self->_size_allocate ($x, $y, $w, $h); 959 $self->_size_allocate ($x, $y, $w, $h) or return;
862 960
863 my $children = $self->{children}; 961 my $children = $self->{children};
864 962
865 my @h = map +($_->size_request)[1], @$children; 963 my @h = map +($_->size_request)[1], @$children;
866 964
… …
878 976
879 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 977 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
880 } 978 }
881 } 979 }
882 980
981 CFClient::UI::harmonize \@h;
982
883 my $y = 0; 983 my $y = 0;
884 for (0 .. $#$children) { 984 for (0 .. $#$children) {
885 my $child = $children->[$_]; 985 my $child = $children->[$_];
886 my $h = $h[$_]; 986 my $h = $h[$_];
887 $child->size_allocate (0, $y, $w, $h); 987 $child->size_allocate (0, $y, $w, $h);
888 988
889 $y += $h; 989 $y += $h;
890 } 990 }
991
992 1
891} 993}
892 994
893############################################################################# 995#############################################################################
894 996
895package CFClient::UI::Label; 997package CFClient::UI::Label;
… …
900 1002
901sub new { 1003sub new {
902 my ($class, %arg) = @_; 1004 my ($class, %arg) = @_;
903 1005
904 my $self = $class->SUPER::new ( 1006 my $self = $class->SUPER::new (
905 fg => [1, 1, 1], 1007 fg => [1, 1, 1],
906 height => $::FONTSIZE, 1008 fontsize => $::FONTSIZE,
907 text => "", 1009 text => "",
908 align => -1, 1010 align => -1,
1011 valign => -1,
909 padding => 2, 1012 padding => 2,
910 layout => new CFClient::Layout, 1013 layout => new CFClient::Layout,
911 %arg 1014 %arg
912 ); 1015 );
913 1016
914 $self->set_text ($self->{text}); 1017 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
1018
1019 $self->set_text (delete $self->{text}) if exists $self->{text};
1020 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
915 1021
916 $self 1022 $self
917} 1023}
918 1024
919sub escape_text { 1025sub escape_text {
… …
927} 1033}
928 1034
929sub set_text { 1035sub set_text {
930 my ($self, $text) = @_; 1036 my ($self, $text) = @_;
931 1037
932 $self->{text} = $text;
933 $self->{layout}->set_markup ($text); 1038 $self->{layout}->set_text ($text);
934 1039
935 delete $self->{texture}; 1040 delete $self->{texture};
936# $self->{w} = $self->{h} = -1;
937 $self->update; 1041 $self->update;
938} 1042}
939 1043
940sub get_text { 1044sub set_markup {
941 my ($self, $text) = @_; 1045 my ($self, $markup) = @_;
942 1046
943 $self->{text} 1047 $self->{layout}->set_markup ($markup);
1048
1049 delete $self->{texture};
1050 $self->update;
944} 1051}
945 1052
946sub size_request { 1053sub size_request {
947 my ($self) = @_; 1054 my ($self) = @_;
948 1055
949 $self->{layout}->set_width; 1056 $self->{layout}->set_width;
950 $self->{layout}->set_height ($self->{height}); 1057 $self->{layout}->set_height ($self->{fontsize});
1058
951 my ($w, $h) = $self->{layout}->size; 1059 my ($w, $h) = $self->{layout}->size;
952 1060
953 ( 1061 (
954 $w + $self->{padding} * 2, 1062 $w + $self->{padding} * 2,
955 $h + $self->{padding} * 2, 1063 $h + $self->{padding} * 2,
… …
974sub _draw { 1082sub _draw {
975 my ($self) = @_; 1083 my ($self) = @_;
976 1084
977 my $tex = $self->{texture} ||= do { 1085 my $tex = $self->{texture} ||= do {
978 $self->{layout}->set_width ($self->{w}); 1086 $self->{layout}->set_width ($self->{w});
979 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 1087 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
980 new_from_layout CFClient::Texture $self->{layout} 1088 new_from_layout CFClient::Texture $self->{layout}
981 }; 1089 };
982 1090
983 glEnable GL_BLEND; 1091 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1092 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985 glEnable GL_TEXTURE_2D; 1093 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1094 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
987 1095
988 glColor @{$self->{fg}}; 1096 glColor @{$self->{fg}};
989 1097
990 my $x = 1098 $self->{ox} = int (
991 $self->{align} < 0 ? $self->{padding} 1099 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1100 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5; 1101 : ($self->{w} - $tex->{w}) * 0.5
1102 );
994 1103
995 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0; 1104 $self->{oy} = int (
996 $tex->draw_quad (0, 0); 1105 $self->{valign} < 0 ? $self->{padding}
1106 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1107 : ($self->{h} - $tex->{h}) * 0.5
1108 );
1109
1110 $tex->draw_quad ($self->{ox}, $self->{oy});
997 1111
998 glDisable GL_TEXTURE_2D; 1112 glDisable GL_TEXTURE_2D;
999 glDisable GL_BLEND; 1113 glDisable GL_BLEND;
1000} 1114}
1001 1115
1002############################################################################# 1116#############################################################################
1003 1117
1004package CFClient::UI::Entry; 1118package CFClient::UI::EntryBase;
1005 1119
1006our @ISA = CFClient::UI::Label::; 1120our @ISA = CFClient::UI::Label::;
1007 1121
1008use SDL; 1122use SDL;
1009use SDL::OpenGL; 1123use SDL::OpenGL;
… …
1016 bg => [0, 0, 0, 0.2], 1130 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1, 0.5], 1131 active_bg => [1, 1, 1, 0.5],
1018 active_fg => [0, 0, 0], 1132 active_fg => [0, 0, 0],
1019 can_hover => 1, 1133 can_hover => 1,
1020 can_focus => 1, 1134 can_focus => 1,
1135 valign => 0,
1021 @_ 1136 @_
1022 ) 1137 )
1023} 1138}
1024 1139
1025sub _set_text { 1140sub _set_text {
1026 my ($self, $text) = @_; 1141 my ($self, $text) = @_;
1027 1142
1143 delete $self->{cur_h};
1144
1145 return if $self->{text} eq $text;
1146
1028 $self->{last_activity} = $::NOW; 1147 $self->{last_activity} = $::NOW;
1029
1030 $self->{text} = $text; 1148 $self->{text} = $text;
1031 $self->{layout}->set_width ($self->{w});
1032 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1033 1149
1034 $text =~ s/./*/g if $self->{hidden}; 1150 $text =~ s/./*/g if $self->{hidden};
1151 $self->{layout}->set_text ("$text ");
1035 1152
1036 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1153 $self->emit (changed => $self->{text});
1154}
1037 1155
1038 $text = substr $text, 0, $self->{cursor}; 1156sub get_text {
1039 utf8::encode $text; 1157 $_[0]{text}
1040
1041 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1042} 1158}
1043 1159
1044sub size_request { 1160sub size_request {
1045 my ($self) = @_; 1161 my ($self) = @_;
1046 1162
… …
1050} 1166}
1051 1167
1052sub size_allocate { 1168sub size_allocate {
1053 my ($self, $x, $y, $w, $h) = @_; 1169 my ($self, $x, $y, $w, $h) = @_;
1054 1170
1055 $self->SUPER::size_allocate ($x, $y, $w, $h); 1171 $self->SUPER::size_allocate ($x, $y, $w, $h) or return;
1056 1172
1057 $self->_set_text ($self->{text}); 1173 $self->_set_text ($self->{text});
1058} 1174}
1059 1175
1060sub set_text { 1176sub set_text {
… …
1085 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1201 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1086 } elsif ($sym == SDLK_HOME) { 1202 } elsif ($sym == SDLK_HOME) {
1087 $self->{cursor} = 0; 1203 $self->{cursor} = 0;
1088 } elsif ($sym == SDLK_END) { 1204 } elsif ($sym == SDLK_END) {
1089 $self->{cursor} = length $text; 1205 $self->{cursor} = length $text;
1206 } elsif ($sym == SDLK_ESCAPE) {
1207 $self->emit ('escape');
1090 } elsif ($uni) { 1208 } elsif ($uni) {
1091 substr $text, $self->{cursor}++, 0, chr $uni; 1209 substr $text, $self->{cursor}++, 0, chr $uni;
1092 } 1210 }
1093 1211
1094 $self->_set_text ($text); 1212 $self->_set_text ($text);
… …
1148 1266
1149 $self->SUPER::_draw; 1267 $self->SUPER::_draw;
1150 1268
1151 #TODO: force update every cursor change :( 1269 #TODO: force update every cursor change :(
1152 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1270 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1271
1272 unless (exists $self->{cur_h}) {
1273 my $text = substr $self->{text}, 0, $self->{cursor};
1274 utf8::encode $text;
1275
1276 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1277 }
1278
1153 glColor @{$self->{fg}}; 1279 glColor @{$self->{fg}};
1154 glBegin GL_LINES; 1280 glBegin GL_LINES;
1155 glVertex $self->{cur_x}, $self->{cur_y};
1156 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1281 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1282 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1157 glEnd; 1283 glEnd;
1158 } 1284 }
1159} 1285}
1160 1286
1161package CFClient::UI::LineEntry; 1287package CFClient::UI::Entry;
1162 1288
1163our @ISA = CFClient::UI::Entry::; 1289our @ISA = CFClient::UI::EntryBase::;
1164 1290
1165use SDL; 1291use SDL;
1166use SDL::OpenGL; 1292use SDL::OpenGL;
1167 1293
1168sub key_down { 1294sub key_down {
… …
1198 1324
1199 $class->SUPER::new ( 1325 $class->SUPER::new (
1200 padding => 4, 1326 padding => 4,
1201 fg => [1, 1, 1], 1327 fg => [1, 1, 1],
1202 bg => [1, 1, 1, 0.2], 1328 bg => [1, 1, 1, 0.2],
1203 active_fg => [1, 1, 0], 1329 active_fg => [0, 0, 1],
1204 can_hover => 1, 1330 can_hover => 1,
1331 align => 0,
1332 valign => 0,
1205 @_ 1333 @_
1206 ) 1334 )
1207} 1335}
1208 1336
1209sub button_up { 1337sub button_up {
… …
1217 1345
1218sub _draw { 1346sub _draw {
1219 my ($self) = @_; 1347 my ($self) = @_;
1220 1348
1221 local $self->{fg} = $self->{fg}; 1349 local $self->{fg} = $self->{fg};
1222 my $tex = $tex[0];
1223
1224 glEnable GL_BLEND;
1225 glEnable GL_TEXTURE_2D;
1226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1227 1350
1228 if ($GRAB == $self) { 1351 if ($GRAB == $self) {
1229 $self->{fg} = $self->{active_fg}; 1352 $self->{fg} = $self->{active_fg};
1230 } 1353 }
1231 1354
1232 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1355 glEnable GL_BLEND;
1356 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1357 glEnable GL_TEXTURE_2D;
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1359 glColor 0, 0, 0, 1;
1234 1360
1235 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1361 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1236 1362
1237 glDisable GL_TEXTURE_2D; 1363 glDisable GL_TEXTURE_2D;
1238 glDisable GL_BLEND; 1364 glDisable GL_BLEND;
1239 1365
1240 $self->SUPER::_draw; 1366 $self->SUPER::_draw;
… …
1243############################################################################# 1369#############################################################################
1244 1370
1245package CFClient::UI::CheckBox; 1371package CFClient::UI::CheckBox;
1246 1372
1247our @ISA = CFClient::UI::DrawBG::; 1373our @ISA = CFClient::UI::DrawBG::;
1374
1375my @tex =
1376 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1377 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1248 1378
1249use SDL; 1379use SDL;
1250use SDL::OpenGL; 1380use SDL::OpenGL;
1251 1381
1252sub new { 1382sub new {
… …
1269} 1399}
1270 1400
1271sub size_allocate { 1401sub size_allocate {
1272 my ($self, $x, $y, $w, $h) = @_; 1402 my ($self, $x, $y, $w, $h) = @_;
1273 1403
1274 $self->_size_allocate ($x, $y, $w, $h); 1404 $self->_size_allocate ($x, $y, $w, $h) or return;
1275} 1405}
1276 1406
1277sub button_down { 1407sub button_down {
1278 my ($self, $ev, $x, $y) = @_; 1408 my ($self, $ev, $x, $y) = @_;
1279 1409
… …
1290 $self->SUPER::_draw; 1420 $self->SUPER::_draw;
1291 1421
1292 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1422 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1293 1423
1294 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1424 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1425
1426 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1427
1428 glEnable GL_BLEND;
1429 glEnable GL_TEXTURE_2D;
1430 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1431
1432 my $tex = $self->{state} ? $tex[1] : $tex[0];
1433
1434 $tex->draw_quad (0, 0, $s, $s);
1435
1436 glDisable GL_TEXTURE_2D;
1437 glDisable GL_BLEND;
1438}
1439
1440#############################################################################
1441
1442package CFClient::UI::VGauge;
1443
1444our @ISA = CFClient::UI::Base::;
1445
1446use SDL::OpenGL;
1447
1448my %tex = (
1449 food => [
1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1451 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1452 ],
1453 grace => [
1454 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1455 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1456 ],
1457 hp => [
1458 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1459 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1460 ],
1461 mana => [
1462 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1463 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1464 ],
1465);
1466
1467# eg. VGauge->new (gauge => 'food'), default gauge: food
1468sub new {
1469 my $class = shift;
1470
1471 my $self = $class->SUPER::new (gauge => 'food', @_);
1472
1473 $self
1474}
1475
1476sub size_request {
1477 my ($self) = @_;
1478
1479 my $tex = $tex{$self->{gauge}}[0];
1295 1480
1296 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1481 @$tex{qw(w h)}
1482}
1297 1483
1298 glBegin GL_LINE_LOOP; 1484sub set_max {
1299 glVertex 0 , 0; 1485 my ($self, $max) = @_;
1300 glVertex 0 , $s; 1486
1301 glVertex $s, $s; 1487 $self->{max_val} = $max;
1302 glVertex $s, 0; 1488}
1489
1490sub set_value {
1491 my ($self, $val, $max) = @_;
1492
1493 $self->set_max ($max)
1494 if defined $max;
1495
1496 $max = $self->{max_val};
1497 $self->{val} = $val;
1498
1499 $self->update;
1500}
1501
1502sub _draw {
1503 my ($self) = @_;
1504
1505 my $tex = $tex{$self->{gauge}};
1506
1507 my ($w, $h) = ($self->{w}, $self->{h});
1508
1509 my $ycut = $self->{val} / ($self->{max_val} || 1);
1510 $ycut = 1 if $self->{val} > $self->{max_val};
1511
1512 my $t1 = $tex->[0];
1513 my $t2 = $tex->[1];
1514
1515 glEnable GL_BLEND;
1516 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1517 glEnable GL_TEXTURE_2D;
1518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1519
1520 my $h1 = $self->{h} - $ycut * $self->{h};
1521 my $h2 = $ycut * $self->{h};
1522
1523 my $yp = 0;
1524
1525 glBindTexture (GL_TEXTURE_2D, $t1->{name});
1526 glBegin (GL_QUADS);
1527 glTexCoord (0, 0); glVertex (0 , $yp);
1528 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
1529 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
1530 glTexCoord (1, 0); glVertex (0 + $w, $yp);
1303 glEnd; 1531 glEnd ();
1304 1532
1305 if ($self->{state}) { 1533 $yp += $h1;
1306 glBegin GL_LINES; 1534
1307 glVertex 0 , 0; 1535 glBindTexture (GL_TEXTURE_2D, $t2->{name});
1308 glVertex $s, $s; 1536 glBegin (GL_QUADS);
1309 glVertex $s, 0; 1537 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
1310 glVertex 0 , $s; 1538 glTexCoord (0, 1); glVertex (0 , $yp + $h2);
1539 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
1540 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
1311 glEnd; 1541 glEnd ();
1312 } 1542
1543 glDisable GL_BLEND;
1544 glDisable GL_TEXTURE_2D;
1313} 1545}
1314 1546
1315############################################################################# 1547#############################################################################
1316 1548
1317package CFClient::UI::Slider; 1549package CFClient::UI::Slider;
… …
1340 range => [0, 0, 100, 10], 1572 range => [0, 0, 100, 10],
1341 req_w => 40, 1573 req_w => 40,
1342 req_h => 13, 1574 req_h => 13,
1343 vertical => 0, 1575 vertical => 0,
1344 can_hover => 1, 1576 can_hover => 1,
1577 inner_pad => 5,
1345 @_ 1578 @_
1346 ); 1579 );
1347 1580
1348 $self 1581 $self
1349} 1582}
… …
1370 if ($GRAB == $self) { 1603 if ($GRAB == $self) {
1371 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1604 my ($value, $lo, $hi, $page) = @{$self->{range}};
1372 1605
1373 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1606 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1374 1607
1608 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1609 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1610
1611 $x -= $inner_pad_px; # substract the padding
1375 $x = $x * ($hi - $lo) / $w + $lo; 1612 $x = $x * ($hi - $lo) / $inner_w + $lo;
1376 $x = $lo if $x < $lo; 1613 $x = $lo if $x < $lo;
1377 $x = $hi - $page if $x > $hi - $page; 1614 $x = $hi - $page if $x > $hi - $page;
1378 $self->{range}[0] = $x; 1615 $self->{range}[0] = $x;
1379 1616
1380 $self->emit (changed => $x); 1617 $self->emit (changed => $x);
1381 $self->update; 1618 $self->update;
1382 } 1619 }
1620}
1621
1622# the inner_* stuff is for generating a padding for the slider handle,
1623# so that the handle doesn't leave the texture. This calculation isn't 100%
1624# correct propably, but it does the job for now
1625sub _calc_inner_pad_px {
1626 my ($self, $w) = @_;
1627 ($w / 100) * $self->{inner_pad} # % to pixels
1383} 1628}
1384 1629
1385sub _draw { 1630sub _draw {
1386 my ($self) = @_; 1631 my ($self) = @_;
1387 1632
… …
1401 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1646 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1402 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1647 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1403 1648
1404 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1649 my ($value, $lo, $hi, $page) = @{$self->{range}};
1405 1650
1406 # the inner_* stuff is for generating a padding for the slider handle, 1651 $hi = $value + 1 if $lo == $hi;
1407 # so that the handle doesn't leave the texture. This calculation isn't 100% 1652
1408 # correct propably, but it does the job for now 1653 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1409 my $inner_pad = 5; # 5% of width for slider bg texture border
1410 my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1411 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 1654 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1412 1655
1413 $page = int $page * $inner_w / ($hi - $lo); 1656 $page = int $page * $inner_w / ($hi - $lo);
1414 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 1657 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1415 1658
1416 $w -= $page; 1659 $w -= $page;
… …
1446 1689
1447sub new { 1690sub new {
1448 my $class = shift; 1691 my $class = shift;
1449 1692
1450 my $self = $class->SUPER::new ( 1693 my $self = $class->SUPER::new (
1694 req_w => $::WIDTH / 6,
1695 req_h => $::HEIGHT / 6,
1696 fontsize => $::FONTSIZE,
1697 @_,
1698
1699 layout => (new CFClient::Layout),
1451 par => [], 1700 par => [],
1452 @_, 1701 height => 0,
1453 children => [ 1702 children => [
1454 (new CFClient::UI::Empty expand => 1), 1703 (new CFClient::UI::Empty expand => 1),
1455 (new CFClient::UI::Slider vertical => 1), 1704 (new CFClient::UI::Slider vertical => 1),
1456 ], 1705 ],
1457 ); 1706 );
1458 1707
1708 $self->{children}[1]->connect (changed => sub {
1709 $self->update;
1710 });
1711
1459 $self 1712 $self
1713}
1714
1715sub set_fontsize {
1716 my ($self, $fontsize) = @_;
1717
1718 $self->{fontsize} = $fontsize;
1719 $self->reflow;
1720}
1721
1722sub text_height {
1723 my ($self, $text) = @_;
1724
1725 my $layout = $self->{layout};
1726
1727 $layout->set_height ($self->{fontsize});
1728 $layout->set_width ($self->{w});
1729 $layout->set_text ($text);
1730
1731 ($layout->size)[1]
1732}
1733
1734sub reflow {
1735 my ($self) = @_;
1736
1737 $self->{need_reflow}++;
1738 $self->update;
1739}
1740
1741sub size_request {
1742 my ($self) = @_;
1743
1744 ($self->{req_w}, $self->{req_h})
1745}
1746
1747sub size_allocate {
1748 my ($self, $x, $y, $w, $h) = @_;
1749
1750 $self->SUPER::size_allocate ($x, $y, $w, $h) or return;
1751
1752 $self->{layout}->set_height ($self->{fontsize});
1753 $self->{layout}->set_width ($self->{w});
1754
1755 $self->reflow;
1756 $self->update;
1460} 1757}
1461 1758
1462sub add_paragraph { 1759sub add_paragraph {
1463 my ($self, $color, $text) = @_; 1760 my ($self, $color, $text) = @_;
1464 1761
1762 #TODO: intelligently "reformat" paragraph
1763
1764 my $height = $self->text_height ($text);
1765
1766 $self->{height} += $height;
1767
1465 push @{$self->{par}}, [$color, $text]; 1768 push @{$self->{par}}, [$height, $color, $text];
1466 my $count = scalar @{$self->{par}}; 1769
1467 $self->{children}[1]{range} = [$count - 1, 0, $count, 1]; 1770 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1468 $self->{children}[1]->update; 1771 $self->{children}[1]->update;
1469} 1772}
1470 1773
1774sub update {
1775 my ($self) = @_;
1776
1777 $self->SUPER::update;
1778
1779 return unless $self->{h} > 0;
1780
1781 delete $self->{texture};
1782
1783 $ROOT->on_refresh ($self, sub {
1784 if (delete $self->{need_reflow}) {
1785 my $height = 0;
1786
1787 $height += $_->[0] = $self->text_height ($_->[2])
1788 for @{$self->{par}};
1789
1790 $self->{height} = $height;
1791
1792 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1793
1794 delete $self->{texture};
1795 }
1796
1797 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1798 glClearColor 0, 0, 0, 1;
1799 glClear GL_COLOR_BUFFER_BIT;
1800
1801 glEnable GL_BLEND;
1802 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1803 glEnable GL_TEXTURE_2D;
1804 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1805
1806 my $top = int $self->{children}[1]{range}[0];
1807
1808 my $y0 = $top;
1809 my $y1 = $top + $self->{h};
1810
1811 my $y = 0;
1812
1813 my $layout = $self->{layout};
1814
1815 for my $par (@{$self->{par}}) {
1816 my $h = $par->[0];
1817
1818 if ($y0 < $y + $h && $y < $y1) {
1819 $layout->set_text ($par->[2]);
1820
1821 glColor @{ $par->[1] };
1822 my ($W, $H) = $layout->size;
1823 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1824 }
1825
1826 $y += $h;
1827 }
1828
1829 glDisable GL_TEXTURE_2D;
1830 glDisable GL_BLEND;
1831 };
1832 });
1833}
1834
1471sub _draw { 1835sub _draw {
1472 my ($self) = @_; 1836 my ($self) = @_;
1473 1837
1474 my $par = $self->{par}; 1838 if ($self->{texture}) {
1475
1476 my $bottom = (scalar @$par) - 1;
1477
1478 my $w = $self->{children}[0]{w};
1479 my $y = $self->{h};
1480
1481 glEnable GL_BLEND;
1482 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1483 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1484 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1485 1841 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1486 # TODO: everything!
1487 while ($y > 0 && $bottom >= 0) {
1488 my $par = $par->[$bottom--];
1489
1490 my $layout = new CFClient::Layout;
1491
1492 $layout->set_height ($::FONTSIZE);
1493 $layout->set_width ($w);
1494 $layout->set_text ($par->[1]);
1495 my $tex = new_from_layout CFClient::Texture $layout;
1496 $y -= $tex->{h};
1497
1498 glColor @{ $par->[0] };
1499 $tex->draw_quad (0, $y);
1500 }
1501
1502 glDisable GL_TEXTURE_2D; 1842 glDisable GL_TEXTURE_2D;
1503 glDisable GL_BLEND; 1843 }
1844
1845 $self->{children}[1]->draw;
1846
1504} 1847}
1505 1848
1506############################################################################# 1849#############################################################################
1507 1850
1508package CFClient::UI::MapWidget; 1851package CFClient::UI::MapWidget;
… …
1532} 1875}
1533 1876
1534sub key_up { 1877sub key_up {
1535} 1878}
1536 1879
1880sub button_down {
1881 my ($self, $ev, $x, $y) = @_;
1882
1883 $self->focus_in;
1884
1885 if ($ev->button == 2) {
1886 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1887 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1888
1889 $self->{motion} = sub {
1890 my ($ev, $x, $y) = @_;
1891
1892 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1893
1894 $::CFG->{map_shift_x} = $bw + $x - $ox;
1895 $::CFG->{map_shift_y} = $bh + $y - $oy;
1896
1897 $self->update;
1898 };
1899 }
1900}
1901
1902sub button_up {
1903 my ($self, $ev, $x, $y) = @_;
1904
1905 delete $self->{motion};
1906}
1907
1908sub mouse_motion {
1909 my ($self, $ev, $x, $y) = @_;
1910
1911 $self->{motion}->($ev, $x, $y) if $self->{motion};
1912}
1913
1537sub size_request { 1914sub size_request {
1538 ( 1915 (
1539 1 + 32 * int $::WIDTH / 32, 1916 1 + 32 * int $::WIDTH / 32,
1540 1 + 32 * int $::HEIGHT / 32, 1917 1 + 32 * int $::HEIGHT / 32,
1541 ) 1918 )
… …
1549} 1926}
1550 1927
1551sub draw { 1928sub draw {
1552 my ($self) = @_; 1929 my ($self) = @_;
1553 1930
1554 $self->{need_update}++;#d#
1555 if (delete $self->{need_update}) { 1931 if (delete $self->{need_update}) {
1556 glNewList $self->{list}, GL_COMPILE; 1932 glNewList $self->{list}, GL_COMPILE;
1557 1933
1558 my $sw = int $::WIDTH / 32;
1559 my $sh = int $::HEIGHT / 32;
1560
1561 if ($::MAP) { 1934 if ($::MAP) {
1935 my $sw = int $::WIDTH / 32;
1936 my $sh = int $::HEIGHT / 32;
1937
1938 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1939 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1940
1941 glTranslate $sx0 - 32, $sy0 - 32, 0;
1942
1562 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh); 1943 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1563 1944
1564 if ($::CFG->{fow_enable}) { 1945 if ($::CFG->{fow_enable}) {
1565 if ($::CFG->{fow_smooth}) { # smooth fog of war 1946 if ($::CFG->{fow_smooth}) { # smooth fog of war
1566 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1947 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1567 glConvolutionFilter2D 1948 glConvolutionFilter2D
… …
1575 0.1, 0.1, 0.1, 1956 0.1, 0.1, 0.1,
1576 ; 1957 ;
1577 glEnable GL_CONVOLUTION_2D; 1958 glEnable GL_CONVOLUTION_2D;
1578 } 1959 }
1579 1960
1580 my $tex = new CFClient::Texture 1961 $self->{fow_texture} = new CFClient::Texture
1581 w => $w, 1962 w => $w,
1582 h => $h, 1963 h => $h,
1583 data => $data, 1964 data => $data,
1584 internalformat => GL_ALPHA, 1965 internalformat => GL_ALPHA,
1585 format => GL_ALPHA; 1966 format => GL_ALPHA;
1586 1967
1587 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 1968 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1588 1969
1589 glEnable GL_BLEND; 1970 glEnable GL_BLEND;
1971 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590 glEnable GL_TEXTURE_2D; 1972 glEnable GL_TEXTURE_2D;
1591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1973 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1592 1974
1593 glColor +($::CFG->{fow_intensity}) x 3, 1; 1975 glColor +($::CFG->{fow_intensity}) x 3, 1;
1594 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1976 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1595 1977
1596 glDisable GL_TEXTURE_2D; 1978 glDisable GL_TEXTURE_2D;
1597 glDisable GL_BLEND; 1979 glDisable GL_BLEND;
1598 } 1980 }
1981
1982 # HACK BEGIN
1983 {
1984 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1985 my ($w, $h) = (250, 250);
1986
1987 glEnable GL_BLEND;
1988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1989 glEnable GL_TEXTURE_2D;
1990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1991
1992 $self->{mapmap_texture} =
1993 new CFClient::Texture
1994 w => $w,
1995 h => $h,
1996 data => $::MAP->mapmap ($w, $h),
1997 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1998
1999 $self->{mapmap_texture}->draw_quad (100, 100);
2000
2001 glDisable GL_TEXTURE_2D;
2002 glDisable GL_BLEND;
2003 }
2004 # HACK END
1599 } 2005 }
1600 2006
1601 glEndList; 2007 glEndList;
1602 } 2008 }
1603 2009
2010 glPushMatrix;
1604 glCallList $self->{list}; 2011 glCallList $self->{list};
2012 glPopMatrix;
1605 2013
1606 if ($FOCUS != $self) { 2014 if ($FOCUS != $self) {
1607 glColor 64/255, 64/255, 64/255; 2015 glColor 64/255, 64/255, 64/255;
1608 glLogicOp GL_AND; 2016 glLogicOp GL_AND;
1609 glEnable GL_COLOR_LOGIC_OP; 2017 glEnable GL_COLOR_LOGIC_OP;
… …
1638 2046
1639 my $mod = $ev->key_mod; 2047 my $mod = $ev->key_mod;
1640 my $sym = $ev->key_sym; 2048 my $sym = $ev->key_sym;
1641 2049
1642 if ($sym == SDLK_KP5) { 2050 if ($sym == SDLK_KP5) {
1643 $::CONN->user_send ("command stay fire"); 2051 $::CONN->user_send ("stay fire");
1644 } elsif ($sym == SDLK_a) { 2052 } elsif ($sym == SDLK_a) {
1645 $::CONN->user_send ("command apply"); 2053 $::CONN->user_send ("apply");
2054 } elsif ($sym == SDLK_QUOTE) {
2055 $self->emit ('activate_console');
2056 } elsif ($sym == SDLK_SLASH) {
2057 $self->emit ('activate_console' => '/');
1646 } elsif (exists $DIR{$sym}) { 2058 } elsif (exists $DIR{$sym}) {
1647 if ($mod & KMOD_SHIFT) { 2059 if ($mod & KMOD_SHIFT) {
1648 $self->{shft}++; 2060 $self->{shft}++;
1649 $::CONN->user_send ("command fire $DIR{$sym}[0]"); 2061 $::CONN->user_send ("fire $DIR{$sym}[0]");
1650 } elsif ($mod & KMOD_CTRL) { 2062 } elsif ($mod & KMOD_CTRL) {
1651 $self->{ctrl}++; 2063 $self->{ctrl}++;
1652 $::CONN->user_send ("command run $DIR{$sym}[0]"); 2064 $::CONN->user_send ("run $DIR{$sym}[0]");
1653 } else { 2065 } else {
1654 $::CONN->user_send ("command $DIR{$sym}[1]"); 2066 $::CONN->user_send ("$DIR{$sym}[1]");
1655 } 2067 }
1656 } 2068 }
1657} 2069}
1658 2070
1659sub key_up { 2071sub key_up {
… …
1661 2073
1662 my $mod = $ev->key_mod; 2074 my $mod = $ev->key_mod;
1663 my $sym = $ev->key_sym; 2075 my $sym = $ev->key_sym;
1664 2076
1665 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 2077 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1666 $::CONN->user_send ("command fire_stop"); 2078 $::CONN->user_send ("fire_stop");
1667 } 2079 }
1668 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 2080 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1669 $::CONN->user_send ("command run_stop"); 2081 $::CONN->user_send ("run_stop");
1670 } 2082 }
1671} 2083}
1672 2084
1673############################################################################# 2085#############################################################################
1674 2086
… …
1738sub toggle_flopper { 2150sub toggle_flopper {
1739 my ($self) = @_; 2151 my ($self) = @_;
1740 2152
1741 # TODO: use animation 2153 # TODO: use animation
1742 if ($self->{state} = !$self->{state}) { 2154 if ($self->{state} = !$self->{state}) {
1743 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2155 $CFClient::UI::ROOT->add ($self->{other});
1744 $self->{other}->move ( 2156 $self->{other}->move ($self->coord2global (0, $self->{h}));
1745 ($::WIDTH - $self->{other}{w}) * 0.5, 2157 $self->emit ("open");
1746 ($::HEIGHT - $self->{other}{h}) * 0.5,
1747 );
1748 } else { 2158 } else {
1749 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 2159 $CFClient::UI::ROOT->remove ($self->{other});
2160 $self->emit ("close");
1750 } 2161 }
1751}
1752 2162
1753############################################################################# 2163 $self->emit (changed => $self->{state});
2164}
1754 2165
2166#############################################################################
2167
1755package CFClient::UI::Toplevel; 2168package CFClient::UI::Root;
1756 2169
1757our @ISA = CFClient::UI::Container::; 2170our @ISA = CFClient::UI::Container::;
2171
2172use SDL::OpenGL;
2173
2174sub check_size {
2175 my ($self) = @_;
2176
2177 $self->size_allocate (0, 0, $::WITH, $::HEIGHT);
2178}
1758 2179
1759sub size_request { 2180sub size_request {
1760 ($::WIDTH, $::HEIGHT) 2181 ($::WIDTH, $::HEIGHT)
1761} 2182}
1762 2183
… …
1767 2188
1768 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2189 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1769 for @{$self->{children}}; 2190 for @{$self->{children}};
1770} 2191}
1771 2192
1772sub translate { 2193sub _topleft {
1773 my ($self, $x, $y) = @_; 2194 my ($self, $x, $y) = @_;
1774 2195
1775 ($x, $y) 2196 ($x, $y)
1776} 2197}
1777 2198
1778sub update { 2199sub update {
1779 my ($self) = @_; 2200 my ($self) = @_;
1780 2201
1781 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2202 $self->check_size;
1782 ::refresh (); 2203 ::refresh ();
1783} 2204}
1784 2205
1785sub add { 2206sub add {
1786 my ($self, $widget) = @_; 2207 my ($self, $widget) = @_;
1787 2208
1788 $self->SUPER::add ($widget); 2209 $self->SUPER::add ($widget);
1789 2210
1790 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2211 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2212}
2213
2214sub on_refresh {
2215 my ($self, $id, $cb) = @_;
2216
2217 $self->{refresh_hook}{$id} = $cb;
1791} 2218}
1792 2219
1793sub draw { 2220sub draw {
1794 my ($self) = @_; 2221 my ($self) = @_;
1795 2222
2223 while (my $rcb = delete $self->{refresh_hook}) {
2224 $_->() for values %$rcb;
2225 }
2226
2227 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2228 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2229 glClear GL_COLOR_BUFFER_BIT;
2230
2231 glMatrixMode GL_PROJECTION;
2232 glLoadIdentity;
2233 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2234 glMatrixMode GL_MODELVIEW;
2235 glLoadIdentity;
2236
1796 $self->_draw; 2237 $self->_draw;
1797} 2238}
1798 2239
1799############################################################################# 2240#############################################################################
1800 2241
1801package CFClient::UI; 2242package CFClient::UI;
1802 2243
1803$TOPLEVEL = new CFClient::UI::Toplevel; 2244$ROOT = new CFClient::UI::Root;
1804 2245
18051 22461
1806 2247

Diff Legend

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