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.97 by root, Fri Apr 14 02:03:11 2006 UTC vs.
Revision 1.124 by elmex, Mon Apr 17 20:29:37 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
… …
116} 129}
117 130
118sub _size_allocate { 131sub _size_allocate {
119 my ($self, $x, $y, $w, $h) = @_; 132 my ($self, $x, $y, $w, $h) = @_;
120 133
121 $self->{x} = int $x; 134 $self->{x} = $x;
122 $self->{y} = int $y; 135 $self->{y} = $y;
123 136
124 return unless $self->{w} != $w || $self->{h} != $h; 137 return unless $self->{w} != $w || $self->{h} != $h;
125 138
126 $self->{w} = int $w; 139 $self->{w} = $w;
127 $self->{h} = int $h; 140 $self->{h} = $h;
128 141
129 1 142 1
130} 143}
131 144
132sub size_allocate { 145sub size_allocate {
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}
230
231sub get_parent {
232 $_[0]->{parent}
233} 263}
234 264
235sub update { 265sub update {
236 my ($self) = @_; 266 my ($self) = @_;
237 267
… …
326 356
327 $self 357 $self
328} 358}
329 359
330sub add { 360sub add {
331 my ($self, $chld) = @_; 361 my ($self, $child) = @_;
332 362
333 $chld->set_parent ($self); 363 $child->set_parent ($self);
364
365 use sort 'stable';
334 366
335 $self->{children} = [ 367 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 368 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 369 @{$self->{children}}, $child
338 ]; 370 ];
339 371
340 $self->{w} = $self->{h} = -1; 372 $self->{w} = $self->{h} = -1;
341 $self->update; 373 $self->update;
342} 374}
… …
439} 471}
440 472
441sub render_chld { 473sub render_chld {
442 my ($self) = @_; 474 my ($self) = @_;
443 475
444 $self->{texture} = 476 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445 CFClient::Texture->new_from_opengl ( 477 glClearColor 0, 0, 0, 1;
446 $self->{w}, $self->{h}, sub { $self->child->draw } 478 glClear GL_COLOR_BUFFER_BIT;
447 ); 479 $self->child->draw;
480 };
448} 481}
449 482
450sub size_allocate { 483sub size_allocate {
451 my ($self, $x, $y, $w, $h) = @_; 484 my ($self, $x, $y, $w, $h) = @_;
452 485
… …
538 # TODO: user_x, user_y, overwrite moveto? 571 # TODO: user_x, user_y, overwrite moveto?
539 572
540 $class->SUPER::new ( 573 $class->SUPER::new (
541 bg => [1, 1, 1, 1], 574 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1], 575 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8, 576 border => int $::FONTSIZE * 0.8,
544 @_ 577 @_
545 ) 578 )
546} 579}
547 580
548sub size_request { 581sub size_request {
… …
639 # TODO: repeat texture not scale 672 # TODO: repeat texture not scale
640 my $rep_x = $cw / $bg->{w}; 673 my $rep_x = $cw / $bg->{w};
641 my $rep_y = $ch / $bg->{h}; 674 my $rep_y = $ch / $bg->{h};
642 675
643 glColor @{ $self->{bg} }; 676 glColor @{ $self->{bg} };
677
678 $bg->{s} = $rep_x;
679 $bg->{t} = $rep_y;
680 $bg->{wrap_mode} = 1;
644 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 681 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
645 682
646 glDisable GL_TEXTURE_2D; 683 glDisable GL_TEXTURE_2D;
647 glDisable GL_BLEND; 684 glDisable GL_BLEND;
648 685
… …
667 @_ 704 @_
668 ) 705 )
669} 706}
670 707
671sub add { 708sub add {
672 my ($self, $x, $y, $chld) = @_; 709 my ($self, $x, $y, $child) = @_;
673 710
711 $child->set_parent ($self);
674 $self->{children}[$y][$x] = $chld; 712 $self->{children}[$y][$x] = $child;
675 $chld->set_parent ($self);
676 713
677 $self->{w} = $self->{h} = -1; 714 $self->{w} = $self->{h} = -1;
715 $self->update;
716}
717
718# TODO: move to container class maybe? send childs a signal on removal?
719sub clear {
720 my ($self) = @_;
721
722 delete $self->{children};
678 $self->update; 723 $self->update;
679} 724}
680 725
681sub get_wh { 726sub get_wh {
682 my ($self) = @_; 727 my ($self) = @_;
… …
727 my $col_expand = (sum @col_expand) || 1; 772 my $col_expand = (sum @col_expand) || 1;
728 773
729 # linearly scale sizes 774 # linearly scale sizes
730 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 775 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
731 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 776 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
777
778 CFClient::UI::harmonize $ws;
779 CFClient::UI::harmonize $hs;
732 780
733 my $y; 781 my $y;
734 782
735 for my $r (0 .. $#{$self->{children}}) { 783 for my $r (0 .. $#{$self->{children}}) {
736 my $row = $self->{children}[$r] 784 my $row = $self->{children}[$r]
… …
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 872 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h; 873 $h[$_] = $alloc_h;
826 } 874 }
827 } 875 }
828 876
877 CFClient::UI::harmonize \@h;
878
829 my $y = 0; 879 my $y = 0;
830 for (0 .. $#$children) { 880 for (0 .. $#$children) {
831 my $child = $children->[$_]; 881 my $child = $children->[$_];
832 my $h = $h[$_]; 882 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w); 883 $child->size_allocate ($y, 0, $h, $w);
… …
878 928
879 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 929 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
880 } 930 }
881 } 931 }
882 932
933 CFClient::UI::harmonize \@h;
934
883 my $y = 0; 935 my $y = 0;
884 for (0 .. $#$children) { 936 for (0 .. $#$children) {
885 my $child = $children->[$_]; 937 my $child = $children->[$_];
886 my $h = $h[$_]; 938 my $h = $h[$_];
887 $child->size_allocate (0, $y, $w, $h); 939 $child->size_allocate (0, $y, $w, $h);
… …
900 952
901sub new { 953sub new {
902 my ($class, %arg) = @_; 954 my ($class, %arg) = @_;
903 955
904 my $self = $class->SUPER::new ( 956 my $self = $class->SUPER::new (
905 fg => [1, 1, 1], 957 fg => [1, 1, 1],
906 height => $::FONTSIZE, 958 fontsize => $::FONTSIZE,
907 text => "", 959 text => "",
908 align => -1, 960 align => -1,
961 valign => -1,
909 padding => 2, 962 padding => 2,
910 layout => new CFClient::Layout, 963 layout => new CFClient::Layout,
911 %arg 964 %arg
912 ); 965 );
913 966
914 $self->set_text ($self->{text}); 967 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
968
969 $self->set_text (delete $self->{text}) if exists $self->{text};
970 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
915 971
916 $self 972 $self
917} 973}
918 974
919sub escape_text { 975sub escape_text {
… …
927} 983}
928 984
929sub set_text { 985sub set_text {
930 my ($self, $text) = @_; 986 my ($self, $text) = @_;
931 987
932 $self->{text} = $text;
933 $self->{layout}->set_markup ($text); 988 $self->{layout}->set_text ($text);
934 989
935 delete $self->{texture}; 990 delete $self->{texture};
936# $self->{w} = $self->{h} = -1;
937 $self->update; 991 $self->update;
938} 992}
939 993
940sub get_text { 994sub set_markup {
941 my ($self, $text) = @_; 995 my ($self, $markup) = @_;
942 996
943 $self->{text} 997 $self->{layout}->set_markup ($markup);
998
999 delete $self->{texture};
1000 $self->update;
944} 1001}
945 1002
946sub size_request { 1003sub size_request {
947 my ($self) = @_; 1004 my ($self) = @_;
948 1005
949 $self->{layout}->set_width; 1006 $self->{layout}->set_width;
950 $self->{layout}->set_height ($self->{height}); 1007 $self->{layout}->set_height ($self->{fontsize});
1008
951 my ($w, $h) = $self->{layout}->size; 1009 my ($w, $h) = $self->{layout}->size;
952 1010
953 ( 1011 (
954 $w + $self->{padding} * 2, 1012 $w + $self->{padding} * 2,
955 $h + $self->{padding} * 2, 1013 $h + $self->{padding} * 2,
… …
974sub _draw { 1032sub _draw {
975 my ($self) = @_; 1033 my ($self) = @_;
976 1034
977 my $tex = $self->{texture} ||= do { 1035 my $tex = $self->{texture} ||= do {
978 $self->{layout}->set_width ($self->{w}); 1036 $self->{layout}->set_width ($self->{w});
979 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 1037 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
980 new_from_layout CFClient::Texture $self->{layout} 1038 new_from_layout CFClient::Texture $self->{layout}
981 }; 1039 };
982 1040
983 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985 glEnable GL_TEXTURE_2D; 1043 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
987 1045
988 glColor @{$self->{fg}}; 1046 glColor @{$self->{fg}};
989 1047
990 my $x = 1048 $self->{ox} = int (
991 $self->{align} < 0 ? $self->{padding} 1049 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1050 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5; 1051 : ($self->{w} - $tex->{w}) * 0.5
1052 );
994 1053
995 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0; 1054 $self->{oy} = int (
996 $tex->draw_quad (0, 0); 1055 $self->{valign} < 0 ? $self->{padding}
1056 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1057 : ($self->{h} - $tex->{h}) * 0.5
1058 );
1059
1060 $tex->draw_quad ($self->{ox}, $self->{oy});
997 1061
998 glDisable GL_TEXTURE_2D; 1062 glDisable GL_TEXTURE_2D;
999 glDisable GL_BLEND; 1063 glDisable GL_BLEND;
1000} 1064}
1001 1065
1002############################################################################# 1066#############################################################################
1003 1067
1004package CFClient::UI::Entry; 1068package CFClient::UI::EntryBase;
1005 1069
1006our @ISA = CFClient::UI::Label::; 1070our @ISA = CFClient::UI::Label::;
1007 1071
1008use SDL; 1072use SDL;
1009use SDL::OpenGL; 1073use SDL::OpenGL;
… …
1016 bg => [0, 0, 0, 0.2], 1080 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1, 0.5], 1081 active_bg => [1, 1, 1, 0.5],
1018 active_fg => [0, 0, 0], 1082 active_fg => [0, 0, 0],
1019 can_hover => 1, 1083 can_hover => 1,
1020 can_focus => 1, 1084 can_focus => 1,
1085 valign => 0,
1021 @_ 1086 @_
1022 ) 1087 )
1023} 1088}
1024 1089
1025sub _set_text { 1090sub _set_text {
1026 my ($self, $text) = @_; 1091 my ($self, $text) = @_;
1027 1092
1093 delete $self->{cur_h};
1094
1095 return if $self->{text} eq $text;
1096
1028 $self->{last_activity} = $::NOW; 1097 $self->{last_activity} = $::NOW;
1029
1030 $self->{text} = $text; 1098 $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 1099
1034 $text =~ s/./*/g if $self->{hidden}; 1100 $text =~ s/./*/g if $self->{hidden};
1101 $self->{layout}->set_text ("$text ");
1035 1102
1036 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1103 $self->emit (changed => $self->{text});
1104}
1037 1105
1038 $text = substr $text, 0, $self->{cursor}; 1106sub get_text {
1039 utf8::encode $text; 1107 $_[0]{text}
1040
1041 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1042} 1108}
1043 1109
1044sub size_request { 1110sub size_request {
1045 my ($self) = @_; 1111 my ($self) = @_;
1046 1112
… …
1085 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1151 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1086 } elsif ($sym == SDLK_HOME) { 1152 } elsif ($sym == SDLK_HOME) {
1087 $self->{cursor} = 0; 1153 $self->{cursor} = 0;
1088 } elsif ($sym == SDLK_END) { 1154 } elsif ($sym == SDLK_END) {
1089 $self->{cursor} = length $text; 1155 $self->{cursor} = length $text;
1156 } elsif ($sym == SDLK_ESCAPE) {
1157 $self->emit ('escape');
1090 } elsif ($uni) { 1158 } elsif ($uni) {
1091 substr $text, $self->{cursor}++, 0, chr $uni; 1159 substr $text, $self->{cursor}++, 0, chr $uni;
1092 } 1160 }
1093 1161
1094 $self->_set_text ($text); 1162 $self->_set_text ($text);
… …
1148 1216
1149 $self->SUPER::_draw; 1217 $self->SUPER::_draw;
1150 1218
1151 #TODO: force update every cursor change :( 1219 #TODO: force update every cursor change :(
1152 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1220 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1221
1222 unless (exists $self->{cur_h}) {
1223 my $text = substr $self->{text}, 0, $self->{cursor};
1224 utf8::encode $text;
1225
1226 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1227 }
1228
1153 glColor @{$self->{fg}}; 1229 glColor @{$self->{fg}};
1154 glBegin GL_LINES; 1230 glBegin GL_LINES;
1155 glVertex $self->{cur_x}, $self->{cur_y};
1156 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1231 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1232 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1157 glEnd; 1233 glEnd;
1158 } 1234 }
1235}
1236
1237package CFClient::UI::Entry;
1238
1239our @ISA = CFClient::UI::EntryBase::;
1240
1241use SDL;
1242use SDL::OpenGL;
1243
1244sub key_down {
1245 my ($self, $ev) = @_;
1246
1247 my $sym = $ev->key_sym;
1248
1249 if ($sym == SDLK_RETURN) {
1250 $self->emit (activate => $self->get_text);
1251 $self->update;
1252
1253 } else {
1254 $self->SUPER::key_down ($ev);
1255 }
1256
1159} 1257}
1160 1258
1161############################################################################# 1259#############################################################################
1162 1260
1163package CFClient::UI::Button; 1261package CFClient::UI::Button;
… …
1176 1274
1177 $class->SUPER::new ( 1275 $class->SUPER::new (
1178 padding => 4, 1276 padding => 4,
1179 fg => [1, 1, 1], 1277 fg => [1, 1, 1],
1180 bg => [1, 1, 1, 0.2], 1278 bg => [1, 1, 1, 0.2],
1181 active_fg => [1, 1, 0], 1279 active_fg => [0, 0, 1],
1182 can_hover => 1, 1280 can_hover => 1,
1183 @_ 1281 @_
1184 ) 1282 )
1185} 1283}
1186 1284
… …
1195 1293
1196sub _draw { 1294sub _draw {
1197 my ($self) = @_; 1295 my ($self) = @_;
1198 1296
1199 local $self->{fg} = $self->{fg}; 1297 local $self->{fg} = $self->{fg};
1200 my $tex = $tex[0];
1201
1202 glEnable GL_BLEND;
1203 glEnable GL_TEXTURE_2D;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205 1298
1206 if ($GRAB == $self) { 1299 if ($GRAB == $self) {
1207 $self->{fg} = $self->{active_fg}; 1300 $self->{fg} = $self->{active_fg};
1208 } 1301 }
1209 1302
1210 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1303 glEnable GL_BLEND;
1304 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1305 glEnable GL_TEXTURE_2D;
1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1306 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1307 glColor 0, 0, 0, 1;
1212 1308
1213 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1309 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1214 1310
1215 glDisable GL_TEXTURE_2D; 1311 glDisable GL_TEXTURE_2D;
1216 glDisable GL_BLEND; 1312 glDisable GL_BLEND;
1217 1313
1218 $self->SUPER::_draw; 1314 $self->SUPER::_draw;
… …
1221############################################################################# 1317#############################################################################
1222 1318
1223package CFClient::UI::CheckBox; 1319package CFClient::UI::CheckBox;
1224 1320
1225our @ISA = CFClient::UI::DrawBG::; 1321our @ISA = CFClient::UI::DrawBG::;
1322
1323my @tex =
1324 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1325 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1226 1326
1227use SDL; 1327use SDL;
1228use SDL::OpenGL; 1328use SDL::OpenGL;
1229 1329
1230sub new { 1330sub new {
… …
1268 $self->SUPER::_draw; 1368 $self->SUPER::_draw;
1269 1369
1270 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1370 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1271 1371
1272 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1372 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1273 1373
1274 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1374 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1275 1375
1276 glBegin GL_LINE_LOOP; 1376 glEnable GL_BLEND;
1277 glVertex 0 , 0; 1377 glEnable GL_TEXTURE_2D;
1278 glVertex 0 , $s; 1378 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1279 glVertex $s, $s; 1379
1280 glVertex $s, 0; 1380 my $tex = $self->{state} ? $tex[1] : $tex[0];
1381
1382 $tex->draw_quad (0, 0, $s, $s);
1383
1384 glDisable GL_TEXTURE_2D;
1385 glDisable GL_BLEND;
1386}
1387
1388#############################################################################
1389
1390package CFClient::UI::VGauge;
1391
1392our @ISA = CFClient::UI::Base::;
1393
1394use SDL::OpenGL;
1395
1396my %tex = (
1397 food => [
1398 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1399 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1400 ],
1401 grace => [
1402 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1403 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1404 ],
1405 hp => [
1406 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1407 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1408 ],
1409 mana => [
1410 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1411 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1412 ],
1413);
1414
1415# eg. VGauge->new (gauge => 'food'), default gauge: food
1416sub new {
1417 my $class = shift;
1418
1419 my $self = $class->SUPER::new (gauge => 'food', @_);
1420
1421 $self
1422}
1423
1424sub size_request {
1425 my ($self) = @_;
1426
1427 ($self->{w}, $self->{h})
1428}
1429
1430sub set_max {
1431 my ($self, $max) = @_;
1432 $self->{max_val} = $max;
1433}
1434
1435sub set_value {
1436 my ($self, $val, $max) = @_;
1437
1438 $self->set_max ($max)
1439 if defined $max;
1440
1441 $max = $self->{max_val};
1442 $self->{val} = $val;
1443
1444 $self->update;
1445}
1446
1447sub _draw {
1448 my ($self) = @_;
1449
1450 my $tex = $tex{$self->{gauge}};
1451
1452 my ($w, $h) = ($self->{w}, $self->{h});
1453
1454 my $ycut = $self->{val} / ($self->{max_val} || 1);
1455 $ycut = 1 if $self->{val} > $self->{max_val};
1456
1457 my $t1 = $tex->[0];
1458 my $t2 = $tex->[1];
1459
1460 glEnable GL_BLEND;
1461 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1462 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464
1465 my $h1 = $self->{h} - $ycut * $self->{h};
1466 my $h2 = $ycut * $self->{h};
1467
1468 my $yp = 0;
1469
1470 glBindTexture (GL_TEXTURE_2D, $t1->{name});
1471 glBegin (GL_QUADS);
1472 glTexCoord (0, 0); glVertex (0 , $yp);
1473 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
1474 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
1475 glTexCoord (1, 0); glVertex (0 + $w, $yp);
1281 glEnd; 1476 glEnd ();
1282 1477
1283 if ($self->{state}) { 1478 $yp += $h1;
1284 glBegin GL_LINES; 1479
1285 glVertex 0 , 0; 1480 glBindTexture (GL_TEXTURE_2D, $t2->{name});
1286 glVertex $s, $s; 1481 glBegin (GL_QUADS);
1287 glVertex $s, 0; 1482 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
1288 glVertex 0 , $s; 1483 glTexCoord (0, 1); glVertex (0 , $yp + $h2);
1484 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
1485 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
1289 glEnd; 1486 glEnd ();
1290 } 1487
1488 glDisable GL_BLEND;
1489 glDisable GL_TEXTURE_2D;
1291} 1490}
1292 1491
1293############################################################################# 1492#############################################################################
1294 1493
1295package CFClient::UI::Slider; 1494package CFClient::UI::Slider;
… …
1297use strict; 1496use strict;
1298 1497
1299use SDL::OpenGL; 1498use SDL::OpenGL;
1300 1499
1301our @ISA = CFClient::UI::DrawBG::; 1500our @ISA = CFClient::UI::DrawBG::;
1501
1502my @tex =
1503 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1504 qw(s1_slider.png s1_slider_bg.png);
1302 1505
1303sub new { 1506sub new {
1304 my $class = shift; 1507 my $class = shift;
1305 1508
1306 # range [value, low, high, page] 1509 # range [value, low, high, page]
… …
1314 range => [0, 0, 100, 10], 1517 range => [0, 0, 100, 10],
1315 req_w => 40, 1518 req_w => 40,
1316 req_h => 13, 1519 req_h => 13,
1317 vertical => 0, 1520 vertical => 0,
1318 can_hover => 1, 1521 can_hover => 1,
1522 inner_pad => 5,
1319 @_ 1523 @_
1320 ); 1524 );
1321 1525
1322 $self 1526 $self
1323} 1527}
… …
1344 if ($GRAB == $self) { 1548 if ($GRAB == $self) {
1345 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1549 my ($value, $lo, $hi, $page) = @{$self->{range}};
1346 1550
1347 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1551 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1348 1552
1553 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1554 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1555
1556 $x -= $inner_pad_px; # substract the padding
1349 $x = $x * ($hi - $lo) / $w + $lo; 1557 $x = $x * ($hi - $lo) / $inner_w + $lo;
1350 $x = $lo if $x < $lo; 1558 $x = $lo if $x < $lo;
1351 $x = $hi - $page if $x > $hi - $page; 1559 $x = $hi - $page if $x > $hi - $page;
1352 $self->{range}[0] = $x; 1560 $self->{range}[0] = $x;
1353 1561
1354 $self->emit (changed => $x); 1562 $self->emit (changed => $x);
1355 $self->update; 1563 $self->update;
1356 } 1564 }
1565}
1566
1567# the inner_* stuff is for generating a padding for the slider handle,
1568# so that the handle doesn't leave the texture. This calculation isn't 100%
1569# correct propably, but it does the job for now
1570sub _calc_inner_pad_px {
1571 my ($self, $w) = @_;
1572 ($w / 100) * $self->{inner_pad} # % to pixels
1357} 1573}
1358 1574
1359sub _draw { 1575sub _draw {
1360 my ($self) = @_; 1576 my ($self) = @_;
1361 1577
… …
1375 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1591 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1376 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1592 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1377 1593
1378 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1594 my ($value, $lo, $hi, $page) = @{$self->{range}};
1379 1595
1596 $hi = $value + 1 if $lo == $hi;
1597
1598 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1599 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1600
1380 $page = int $page * $w / ($hi - $lo); 1601 $page = int $page * $inner_w / ($hi - $lo);
1381 $value = int +($value - $lo) * $w / ($hi - $lo); 1602 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1382 1603
1383 $w -= $page; 1604 $w -= $page;
1384 $page &= ~1; 1605 $page &= ~1;
1385 glTranslate $page * 0.5, 0, 0; 1606 glTranslate $page * 0.5, 0, 0;
1386 $page ||= 2; 1607 $page ||= 2;
1387 1608
1388 glColor @$fg;
1389 glBegin GL_LINES;
1390 glVertex 0, 0; glVertex 0, $h;
1391 glVertex $w - 1, 0; glVertex $w - 1, $h;
1392 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1393 glEnd;
1394
1395 my $knob_a = $value - $page * 0.5; 1609 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1396 my $knob_b = $value + $page * 0.5; 1610 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1397 1611
1398 glBegin GL_QUADS; 1612 glEnable GL_BLEND;
1399 glColor @$fg; 1613 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1400 glVertex $knob_a, 0; 1614 glEnable GL_TEXTURE_2D;
1401 glVertex $knob_a, $h; 1615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1402 glVertex $knob_b, $h;
1403 glVertex $knob_b, 0;
1404 1616
1405 if ($knob_a < $knob_b - 2) { 1617 # draw background
1406 glColor @$bg; 1618 $tex[1]->draw_quad (0, 0, $w, $h);
1407 glVertex $knob_a + 1, 1; 1619
1408 glVertex $knob_a + 1, $h - 1; 1620 # draw handle
1409 glVertex $knob_b - 1, $h - 1; 1621 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1410 glVertex $knob_b - 1, 1; 1622
1411 } 1623 glDisable GL_BLEND;
1412 glEnd; 1624 glDisable GL_TEXTURE_2D;
1413} 1625}
1414 1626
1415############################################################################# 1627#############################################################################
1416 1628
1417package CFClient::UI::TextView; 1629package CFClient::UI::TextView;
… …
1422 1634
1423sub new { 1635sub new {
1424 my $class = shift; 1636 my $class = shift;
1425 1637
1426 my $self = $class->SUPER::new ( 1638 my $self = $class->SUPER::new (
1639 req_w => $::WIDTH / 6,
1640 req_h => $::HEIGHT / 6,
1641 fontsize => $::FONTSIZE,
1642 @_,
1643
1644 layout => (new CFClient::Layout),
1427 par => [], 1645 par => [],
1428 @_, 1646 height => 0,
1429 children => [ 1647 children => [
1430 (new CFClient::UI::Empty expand => 1), 1648 (new CFClient::UI::Empty expand => 1),
1431 (new CFClient::UI::Slider vertical => 1), 1649 (new CFClient::UI::Slider vertical => 1),
1432 ], 1650 ],
1433 ); 1651 );
1434 1652
1653 $self->{children}[1]->connect (changed => sub {
1654 $self->update;
1655 });
1656
1435 $self 1657 $self
1658}
1659
1660sub set_fontsize {
1661 my ($self, $fontsize) = @_;
1662
1663 $self->{fontsize} = $fontsize;
1664 $self->reflow;
1665}
1666
1667sub text_height {
1668 my ($self, $text) = @_;
1669
1670 my $layout = $self->{layout};
1671
1672 $layout->set_height ($self->{fontsize});
1673 $layout->set_width ($self->{w});
1674 $layout->set_text ($text);
1675
1676 ($layout->size)[1]
1677}
1678
1679sub reflow {
1680 my ($self) = @_;
1681
1682 $self->{need_reflow}++;
1683 $self->update;
1684}
1685
1686sub size_request {
1687 my ($self) = @_;
1688
1689 ($self->{req_w}, $self->{req_h})
1690}
1691
1692sub size_allocate {
1693 my ($self, $x, $y, $w, $h) = @_;
1694
1695 $self->SUPER::size_allocate ($x, $y, $w, $h);
1696
1697 $self->{layout}->set_height ($self->{fontsize});
1698 $self->{layout}->set_width ($self->{w});
1699
1700 $self->reflow;
1436} 1701}
1437 1702
1438sub add_paragraph { 1703sub add_paragraph {
1439 my ($self, $color, $text) = @_; 1704 my ($self, $color, $text) = @_;
1440 1705
1706 #TODO: intelligently "reformat" paragraph
1707
1708 my $height = $self->text_height ($text);
1709
1710 $self->{height} += $height;
1711
1441 push @{$self->{par}}, [$color, $text]; 1712 push @{$self->{par}}, [$height, $color, $text];
1442 my $count = scalar @{$self->{par}}; 1713
1443 $self->{children}[1]{range} = [$count - 1, 0, $count, 1]; 1714 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1444 $self->{children}[1]->update; 1715 $self->{children}[1]->update;
1445} 1716}
1446 1717
1718sub update {
1719 my ($self) = @_;
1720
1721 $self->SUPER::update;
1722
1723 return unless $self->{h} > 0;
1724
1725 delete $self->{texture};
1726
1727 $ROOT->on_refresh ($self, sub {
1728 if (delete $self->{need_reflow}) {
1729 my $height = 0;
1730
1731 $height += $_->[0] = $self->text_height ($_->[2])
1732 for @{$self->{par}};
1733
1734 $self->{height} = $height;
1735
1736 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1737
1738 delete $self->{texture};
1739 }
1740
1741 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1742 glClearColor 0, 0, 0, 1;
1743 glClear GL_COLOR_BUFFER_BIT;
1744
1745 glEnable GL_BLEND;
1746 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1747 glEnable GL_TEXTURE_2D;
1748 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1749
1750 my $top = int $self->{children}[1]{range}[0];
1751
1752 my $y0 = $top;
1753 my $y1 = $top + $self->{h};
1754
1755 my $y = 0;
1756
1757 my $layout = $self->{layout};
1758
1759 for my $par (@{$self->{par}}) {
1760 my $h = $par->[0];
1761
1762 if ($y0 < $y + $h && $y < $y1) {
1763 $layout->set_text ($par->[2]);
1764
1765 glColor @{ $par->[1] };
1766 my ($W, $H) = $layout->size;
1767 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1768 }
1769
1770 $y += $h;
1771 }
1772
1773 glDisable GL_TEXTURE_2D;
1774 glDisable GL_BLEND;
1775 };
1776 });
1777}
1778
1447sub _draw { 1779sub _draw {
1448 my ($self) = @_; 1780 my ($self) = @_;
1449 1781
1450 my $par = $self->{par}; 1782 if ($self->{texture}) {
1451
1452 my $bottom = (scalar @$par) - 1;
1453
1454 my $w = $self->{children}[0]{w};
1455 my $y = $self->{h};
1456
1457 glEnable GL_BLEND;
1458 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1459 glEnable GL_TEXTURE_2D; 1783 glEnable GL_TEXTURE_2D;
1460 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1784 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1461 1785 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1462 # TODO: everything!
1463 while ($y > 0 && $bottom >= 0) {
1464 my $par = $par->[$bottom--];
1465
1466 my $layout = new CFClient::Layout;
1467
1468 $layout->set_height ($::FONTSIZE);
1469 $layout->set_width ($w);
1470 $layout->set_text ($par->[1]);
1471 my $tex = new_from_layout CFClient::Texture $layout;
1472 $y -= $tex->{h};
1473
1474 glColor @{ $par->[0] };
1475 $tex->draw_quad (0, $y);
1476 }
1477
1478 glDisable GL_TEXTURE_2D; 1786 glDisable GL_TEXTURE_2D;
1479 glDisable GL_BLEND; 1787 }
1788
1789 $self->{children}[1]->draw;
1790
1480} 1791}
1481 1792
1482############################################################################# 1793#############################################################################
1483 1794
1484package CFClient::UI::MapWidget; 1795package CFClient::UI::MapWidget;
… …
1508} 1819}
1509 1820
1510sub key_up { 1821sub key_up {
1511} 1822}
1512 1823
1824sub button_down {
1825 my ($self, $ev, $x, $y) = @_;
1826
1827 $self->focus_in;
1828
1829 if ($ev->button == 2) {
1830 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1831 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1832
1833 $self->{motion} = sub {
1834 my ($ev, $x, $y) = @_;
1835
1836 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1837
1838 $::CFG->{map_shift_x} = $bw + $x - $ox;
1839 $::CFG->{map_shift_y} = $bh + $y - $oy;
1840
1841 $self->update;
1842 };
1843 }
1844}
1845
1846sub button_up {
1847 my ($self, $ev, $x, $y) = @_;
1848
1849 delete $self->{motion};
1850}
1851
1852sub mouse_motion {
1853 my ($self, $ev, $x, $y) = @_;
1854
1855 $self->{motion}->($ev, $x, $y) if $self->{motion};
1856}
1857
1513sub size_request { 1858sub size_request {
1514 ( 1859 (
1515 1 + 32 * int $::WIDTH / 32, 1860 1 + 32 * int $::WIDTH / 32,
1516 1 + 32 * int $::HEIGHT / 32, 1861 1 + 32 * int $::HEIGHT / 32,
1517 ) 1862 )
… …
1525} 1870}
1526 1871
1527sub draw { 1872sub draw {
1528 my ($self) = @_; 1873 my ($self) = @_;
1529 1874
1530 $self->{need_update}++;#d#
1531 if (delete $self->{need_update}) { 1875 if (delete $self->{need_update}) {
1532 glNewList $self->{list}, GL_COMPILE; 1876 glNewList $self->{list}, GL_COMPILE;
1533 1877
1534 my $sw = int $::WIDTH / 32;
1535 my $sh = int $::HEIGHT / 32;
1536
1537 if ($::MAP) { 1878 if ($::MAP) {
1879 my $sw = int $::WIDTH / 32;
1880 my $sh = int $::HEIGHT / 32;
1881
1882 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1883 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1884
1885 glTranslate $sx0 - 32, $sy0 - 32, 0;
1886
1538 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh); 1887 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1539 1888
1540 if ($::CFG->{fow_enable}) { 1889 if ($::CFG->{fow_enable}) {
1541 if ($::CFG->{fow_smooth}) { # smooth fog of war 1890 if ($::CFG->{fow_smooth}) { # smooth fog of war
1542 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1891 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1543 glConvolutionFilter2D 1892 glConvolutionFilter2D
… …
1551 0.1, 0.1, 0.1, 1900 0.1, 0.1, 0.1,
1552 ; 1901 ;
1553 glEnable GL_CONVOLUTION_2D; 1902 glEnable GL_CONVOLUTION_2D;
1554 } 1903 }
1555 1904
1556 my $tex = new CFClient::Texture 1905 $self->{fow_texture} = new CFClient::Texture
1557 w => $w, 1906 w => $w,
1558 h => $h, 1907 h => $h,
1559 data => $data, 1908 data => $data,
1560 internalformat => GL_ALPHA, 1909 internalformat => GL_ALPHA,
1561 format => GL_ALPHA; 1910 format => GL_ALPHA;
1562 1911
1563 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 1912 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1564 1913
1565 glEnable GL_BLEND; 1914 glEnable GL_BLEND;
1915 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1566 glEnable GL_TEXTURE_2D; 1916 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1917 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1568 1918
1569 glColor +($::CFG->{fow_intensity}) x 3, 1; 1919 glColor +($::CFG->{fow_intensity}) x 3, 1;
1570 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1920 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1571 1921
1572 glDisable GL_TEXTURE_2D; 1922 glDisable GL_TEXTURE_2D;
1573 glDisable GL_BLEND; 1923 glDisable GL_BLEND;
1574 } 1924 }
1925
1926 # HACK BEGIN
1927 {
1928 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1929 my ($w, $h) = (250, 250);
1930
1931 glEnable GL_BLEND;
1932 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1933 glEnable GL_TEXTURE_2D;
1934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1935
1936 $self->{mapmap_texture} =
1937 new CFClient::Texture
1938 w => $w,
1939 h => $h,
1940 data => $::MAP->mapmap ($w, $h),
1941 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1942
1943 $self->{mapmap_texture}->draw_quad (100, 100);
1944
1945 glDisable GL_TEXTURE_2D;
1946 glDisable GL_BLEND;
1947 }
1948 # HACK END
1575 } 1949 }
1576 1950
1577 glEndList; 1951 glEndList;
1578 } 1952 }
1579 1953
1954 glPushMatrix;
1580 glCallList $self->{list}; 1955 glCallList $self->{list};
1956 glPopMatrix;
1581 1957
1582 if ($FOCUS != $self) { 1958 if ($FOCUS != $self) {
1583 glColor 64/255, 64/255, 64/255; 1959 glColor 64/255, 64/255, 64/255;
1584 glLogicOp GL_AND; 1960 glLogicOp GL_AND;
1585 glEnable GL_COLOR_LOGIC_OP; 1961 glEnable GL_COLOR_LOGIC_OP;
… …
1614 1990
1615 my $mod = $ev->key_mod; 1991 my $mod = $ev->key_mod;
1616 my $sym = $ev->key_sym; 1992 my $sym = $ev->key_sym;
1617 1993
1618 if ($sym == SDLK_KP5) { 1994 if ($sym == SDLK_KP5) {
1619 $::CONN->user_send ("command stay fire"); 1995 $::CONN->user_send ("stay fire");
1620 } elsif ($sym == SDLK_a) { 1996 } elsif ($sym == SDLK_a) {
1621 $::CONN->user_send ("command apply"); 1997 $::CONN->user_send ("apply");
1998 } elsif ($sym == SDLK_QUOTE) {
1999 $self->emit ('activate_console');
2000 } elsif ($sym == SDLK_SLASH) {
2001 $self->emit ('activate_console' => '/');
1622 } elsif (exists $DIR{$sym}) { 2002 } elsif (exists $DIR{$sym}) {
1623 if ($mod & KMOD_SHIFT) { 2003 if ($mod & KMOD_SHIFT) {
1624 $self->{shft}++; 2004 $self->{shft}++;
1625 $::CONN->user_send ("command fire $DIR{$sym}[0]"); 2005 $::CONN->user_send ("fire $DIR{$sym}[0]");
1626 } elsif ($mod & KMOD_CTRL) { 2006 } elsif ($mod & KMOD_CTRL) {
1627 $self->{ctrl}++; 2007 $self->{ctrl}++;
1628 $::CONN->user_send ("command run $DIR{$sym}[0]"); 2008 $::CONN->user_send ("run $DIR{$sym}[0]");
1629 } else { 2009 } else {
1630 $::CONN->user_send ("command $DIR{$sym}[1]"); 2010 $::CONN->user_send ("$DIR{$sym}[1]");
1631 } 2011 }
1632 } 2012 }
1633} 2013}
1634 2014
1635sub key_up { 2015sub key_up {
… …
1637 2017
1638 my $mod = $ev->key_mod; 2018 my $mod = $ev->key_mod;
1639 my $sym = $ev->key_sym; 2019 my $sym = $ev->key_sym;
1640 2020
1641 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 2021 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1642 $::CONN->user_send ("command fire_stop"); 2022 $::CONN->user_send ("fire_stop");
1643 } 2023 }
1644 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 2024 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1645 $::CONN->user_send ("command run_stop"); 2025 $::CONN->user_send ("run_stop");
1646 } 2026 }
1647} 2027}
1648 2028
1649############################################################################# 2029#############################################################################
1650 2030
… …
1714sub toggle_flopper { 2094sub toggle_flopper {
1715 my ($self) = @_; 2095 my ($self) = @_;
1716 2096
1717 # TODO: use animation 2097 # TODO: use animation
1718 if ($self->{state} = !$self->{state}) { 2098 if ($self->{state} = !$self->{state}) {
1719 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2099 $CFClient::UI::ROOT->add ($self->{other});
1720 $self->{other}->move ( 2100 $self->{other}->move ($self->coord2global (0, $self->{h}));
1721 ($::WIDTH - $self->{other}{w}) * 0.5, 2101 $self->emit ("open");
1722 ($::HEIGHT - $self->{other}{h}) * 0.5,
1723 );
1724 } else { 2102 } else {
1725 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 2103 $CFClient::UI::ROOT->remove ($self->{other});
2104 $self->emit ("close");
1726 } 2105 }
1727}
1728 2106
1729############################################################################# 2107 $self->emit (changed => $self->{state});
2108}
1730 2109
2110#############################################################################
2111
1731package CFClient::UI::Toplevel; 2112package CFClient::UI::Root;
1732 2113
1733our @ISA = CFClient::UI::Container::; 2114our @ISA = CFClient::UI::Container::;
2115
2116use SDL::OpenGL;
1734 2117
1735sub size_request { 2118sub size_request {
1736 ($::WIDTH, $::HEIGHT) 2119 ($::WIDTH, $::HEIGHT)
1737} 2120}
1738 2121
… …
1743 2126
1744 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2127 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1745 for @{$self->{children}}; 2128 for @{$self->{children}};
1746} 2129}
1747 2130
1748sub translate { 2131sub _topleft {
1749 my ($self, $x, $y) = @_; 2132 my ($self, $x, $y) = @_;
1750 2133
1751 ($x, $y) 2134 ($x, $y)
1752} 2135}
1753 2136
… …
1761sub add { 2144sub add {
1762 my ($self, $widget) = @_; 2145 my ($self, $widget) = @_;
1763 2146
1764 $self->SUPER::add ($widget); 2147 $self->SUPER::add ($widget);
1765 2148
1766 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2149 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2150}
2151
2152sub on_refresh {
2153 my ($self, $id, $cb) = @_;
2154
2155 $self->{refresh_hook}{$id} = $cb;
1767} 2156}
1768 2157
1769sub draw { 2158sub draw {
1770 my ($self) = @_; 2159 my ($self) = @_;
1771 2160
2161 while (my $rcb = delete $self->{refresh_hook}) {
2162 $_->() for values %$rcb;
2163 }
2164
2165 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2166 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2167 glClear GL_COLOR_BUFFER_BIT;
2168
2169 glMatrixMode GL_PROJECTION;
2170 glLoadIdentity;
2171 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2172 glMatrixMode GL_MODELVIEW;
2173 glLoadIdentity;
2174
1772 $self->_draw; 2175 $self->_draw;
1773} 2176}
1774 2177
1775############################################################################# 2178#############################################################################
1776 2179
1777package CFClient::UI; 2180package CFClient::UI;
1778 2181
1779$TOPLEVEL = new CFClient::UI::Toplevel; 2182$ROOT = new CFClient::UI::Root;
1780 2183
17811 21841
1782 2185

Diff Legend

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