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.110 by root, Sat Apr 15 01:16:17 2006 UTC vs.
Revision 1.123 by root, Mon Apr 17 19:50:22 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 && $hover->{can_hover}; 66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_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}
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}
… …
539 # TODO: user_x, user_y, overwrite moveto? 571 # TODO: user_x, user_y, overwrite moveto?
540 572
541 $class->SUPER::new ( 573 $class->SUPER::new (
542 bg => [1, 1, 1, 1], 574 bg => [1, 1, 1, 1],
543 border_bg => [1, 1, 1, 1], 575 border_bg => [1, 1, 1, 1],
544 border => $::FONTSIZE * 0.8, 576 border => int $::FONTSIZE * 0.8,
545 @_ 577 @_
546 ) 578 )
547} 579}
548 580
549sub size_request { 581sub size_request {
… …
672 @_ 704 @_
673 ) 705 )
674} 706}
675 707
676sub add { 708sub add {
677 my ($self, $x, $y, $chld) = @_; 709 my ($self, $x, $y, $child) = @_;
678 710
711 $child->set_parent ($self);
679 $self->{children}[$y][$x] = $chld; 712 $self->{children}[$y][$x] = $child;
680 $chld->set_parent ($self);
681 713
682 $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};
683 $self->update; 723 $self->update;
684} 724}
685 725
686sub get_wh { 726sub get_wh {
687 my ($self) = @_; 727 my ($self) = @_;
… …
733 773
734 # linearly scale sizes 774 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 775 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 776 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737 777
738 $_ = int $_ for @$ws; #TODO: avoid rounding problems 778 CFClient::UI::harmonize $ws;
739 $_ = int $_ for @$hs; #TODO: avoid rounding problems 779 CFClient::UI::harmonize $hs;
740 780
741 my $y; 781 my $y;
742 782
743 for my $r (0 .. $#{$self->{children}}) { 783 for my $r (0 .. $#{$self->{children}}) {
744 my $row = $self->{children}[$r] 784 my $row = $self->{children}[$r]
… …
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 872 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h; 873 $h[$_] = $alloc_h;
834 } 874 }
835 } 875 }
836 876
877 CFClient::UI::harmonize \@h;
878
837 my $y = 0; 879 my $y = 0;
838 for (0 .. $#$children) { 880 for (0 .. $#$children) {
839 my $child = $children->[$_]; 881 my $child = $children->[$_];
840 my $h = int $h[$_]; 882 my $h = $h[$_];
841 $child->size_allocate ($y, 0, $h, $w); 883 $child->size_allocate ($y, 0, $h, $w);
842 884
843 $y += $h; 885 $y += $h;
844 } 886 }
845} 887}
… …
886 928
887 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 929 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
888 } 930 }
889 } 931 }
890 932
933 CFClient::UI::harmonize \@h;
934
891 my $y = 0; 935 my $y = 0;
892 for (0 .. $#$children) { 936 for (0 .. $#$children) {
893 my $child = $children->[$_]; 937 my $child = $children->[$_];
894 my $h = int $h[$_]; 938 my $h = $h[$_];
895 $child->size_allocate (0, $y, $w, $h); 939 $child->size_allocate (0, $y, $w, $h);
896 940
897 $y += $h; 941 $y += $h;
898 } 942 }
899} 943}
… …
912 my $self = $class->SUPER::new ( 956 my $self = $class->SUPER::new (
913 fg => [1, 1, 1], 957 fg => [1, 1, 1],
914 fontsize => $::FONTSIZE, 958 fontsize => $::FONTSIZE,
915 text => "", 959 text => "",
916 align => -1, 960 align => -1,
961 valign => -1,
917 padding => 2, 962 padding => 2,
918 layout => new CFClient::Layout, 963 layout => new CFClient::Layout,
919 %arg 964 %arg
920 ); 965 );
921 966
922 $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};
923 971
924 $self 972 $self
925} 973}
926 974
927sub escape_text { 975sub escape_text {
… …
935} 983}
936 984
937sub set_text { 985sub set_text {
938 my ($self, $text) = @_; 986 my ($self, $text) = @_;
939 987
940 $self->{text} = $text;
941 $self->{layout}->set_markup ($text); 988 $self->{layout}->set_text ($text);
942 989
943 delete $self->{texture}; 990 delete $self->{texture};
944# $self->{w} = $self->{h} = -1;
945 $self->update; 991 $self->update;
946} 992}
947 993
948sub get_text { 994sub set_markup {
949 my ($self, $text) = @_; 995 my ($self, $markup) = @_;
950 996
951 $self->{text} 997 $self->{layout}->set_markup ($markup);
998
999 delete $self->{texture};
1000 $self->update;
952} 1001}
953 1002
954sub size_request { 1003sub size_request {
955 my ($self) = @_; 1004 my ($self) = @_;
956 1005
957 $self->{layout}->set_width; 1006 $self->{layout}->set_width;
958 $self->{layout}->set_height ($self->{fontsize}); 1007 $self->{layout}->set_height ($self->{fontsize});
1008
959 my ($w, $h) = $self->{layout}->size; 1009 my ($w, $h) = $self->{layout}->size;
960 1010
961 ( 1011 (
962 $w + $self->{padding} * 2, 1012 $w + $self->{padding} * 2,
963 $h + $self->{padding} * 2, 1013 $h + $self->{padding} * 2,
… …
982sub _draw { 1032sub _draw {
983 my ($self) = @_; 1033 my ($self) = @_;
984 1034
985 my $tex = $self->{texture} ||= do { 1035 my $tex = $self->{texture} ||= do {
986 $self->{layout}->set_width ($self->{w}); 1036 $self->{layout}->set_width ($self->{w});
987 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize}); 1037 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
988 new_from_layout CFClient::Texture $self->{layout} 1038 new_from_layout CFClient::Texture $self->{layout}
989 }; 1039 };
990 1040
991 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
993 glEnable GL_TEXTURE_2D; 1043 glEnable GL_TEXTURE_2D;
994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
995 1045
996 glColor @{$self->{fg}}; 1046 glColor @{$self->{fg}};
997 1047
998 my $x = 1048 $self->{ox} = int (
999 $self->{align} < 0 ? $self->{padding} 1049 $self->{align} < 0 ? $self->{padding}
1000 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1050 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1001 : ($self->{w} - $tex->{w}) * 0.5; 1051 : ($self->{w} - $tex->{w}) * 0.5
1052 );
1002 1053
1003 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5); 1054 $self->{oy} = int (
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});
1004 1061
1005 glDisable GL_TEXTURE_2D; 1062 glDisable GL_TEXTURE_2D;
1006 glDisable GL_BLEND; 1063 glDisable GL_BLEND;
1007} 1064}
1008 1065
1009############################################################################# 1066#############################################################################
1010 1067
1011package CFClient::UI::Entry; 1068package CFClient::UI::EntryBase;
1012 1069
1013our @ISA = CFClient::UI::Label::; 1070our @ISA = CFClient::UI::Label::;
1014 1071
1015use SDL; 1072use SDL;
1016use SDL::OpenGL; 1073use SDL::OpenGL;
… …
1023 bg => [0, 0, 0, 0.2], 1080 bg => [0, 0, 0, 0.2],
1024 active_bg => [1, 1, 1, 0.5], 1081 active_bg => [1, 1, 1, 0.5],
1025 active_fg => [0, 0, 0], 1082 active_fg => [0, 0, 0],
1026 can_hover => 1, 1083 can_hover => 1,
1027 can_focus => 1, 1084 can_focus => 1,
1085 valign => 0,
1028 @_ 1086 @_
1029 ) 1087 )
1030} 1088}
1031 1089
1032sub _set_text { 1090sub _set_text {
1033 my ($self, $text) = @_; 1091 my ($self, $text) = @_;
1034 1092
1035 my $old_text = $self->{text}; 1093 delete $self->{cur_h};
1094
1095 return if $self->{text} eq $text;
1036 1096
1037 $self->{last_activity} = $::NOW; 1097 $self->{last_activity} = $::NOW;
1038
1039 $self->{text} = $text; 1098 $self->{text} = $text;
1040 $self->{layout}->set_width ($self->{w});
1041 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1042 1099
1043 $text =~ s/./*/g if $self->{hidden}; 1100 $text =~ s/./*/g if $self->{hidden};
1101 $self->{layout}->set_text ("$text ");
1044 1102
1045 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1103 $self->emit (changed => $self->{text});
1104}
1046 1105
1047 $text = substr $text, 0, $self->{cursor}; 1106sub get_text {
1048 utf8::encode $text; 1107 $_[0]{text}
1049
1050 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1051
1052 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1053 if $old_text ne $self->{text};
1054} 1108}
1055 1109
1056sub size_request { 1110sub size_request {
1057 my ($self) = @_; 1111 my ($self) = @_;
1058 1112
… …
1162 1216
1163 $self->SUPER::_draw; 1217 $self->SUPER::_draw;
1164 1218
1165 #TODO: force update every cursor change :( 1219 #TODO: force update every cursor change :(
1166 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
1167 glColor @{$self->{fg}}; 1229 glColor @{$self->{fg}};
1168 glBegin GL_LINES; 1230 glBegin GL_LINES;
1169 glVertex $self->{cur_x}, $self->{cur_y};
1170 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};
1171 glEnd; 1233 glEnd;
1172 } 1234 }
1173} 1235}
1174 1236
1175package CFClient::UI::LineEntry; 1237package CFClient::UI::Entry;
1176 1238
1177our @ISA = CFClient::UI::Entry::; 1239our @ISA = CFClient::UI::EntryBase::;
1178 1240
1179use SDL; 1241use SDL;
1180use SDL::OpenGL; 1242use SDL::OpenGL;
1181 1243
1182sub key_down { 1244sub key_down {
… …
1212 1274
1213 $class->SUPER::new ( 1275 $class->SUPER::new (
1214 padding => 4, 1276 padding => 4,
1215 fg => [1, 1, 1], 1277 fg => [1, 1, 1],
1216 bg => [1, 1, 1, 0.2], 1278 bg => [1, 1, 1, 0.2],
1217 active_fg => [1, 1, 0], 1279 active_fg => [0, 0, 1],
1218 can_hover => 1, 1280 can_hover => 1,
1219 @_ 1281 @_
1220 ) 1282 )
1221} 1283}
1222 1284
… …
1231 1293
1232sub _draw { 1294sub _draw {
1233 my ($self) = @_; 1295 my ($self) = @_;
1234 1296
1235 local $self->{fg} = $self->{fg}; 1297 local $self->{fg} = $self->{fg};
1236 my $tex = $tex[0];
1237
1238 glEnable GL_BLEND;
1239 glEnable GL_TEXTURE_2D;
1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241 1298
1242 if ($GRAB == $self) { 1299 if ($GRAB == $self) {
1243 $self->{fg} = $self->{active_fg}; 1300 $self->{fg} = $self->{active_fg};
1244 } 1301 }
1245 1302
1246 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;
1247 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;
1248 1308
1249 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1309 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1250 1310
1251 glDisable GL_TEXTURE_2D; 1311 glDisable GL_TEXTURE_2D;
1252 glDisable GL_BLEND; 1312 glDisable GL_BLEND;
1253 1313
1254 $self->SUPER::_draw; 1314 $self->SUPER::_draw;
… …
1558 1618
1559 return unless $self->{h} > 0; 1619 return unless $self->{h} > 0;
1560 1620
1561 delete $self->{texture}; 1621 delete $self->{texture};
1562 1622
1563 $TOPLEVEL->on_refresh ($self, sub { 1623 $ROOT->on_refresh ($self, sub {
1564 if (delete $self->{need_reflow}) { 1624 if (delete $self->{need_reflow}) {
1565 my $height = 0; 1625 my $height = 0;
1566 1626
1567 $height += $_->[0] = $self->text_height ($_->[2]) 1627 $height += $_->[0] = $self->text_height ($_->[2])
1568 for @{$self->{par}}; 1628 for @{$self->{par}};
… …
1713 1773
1714 if ($::MAP) { 1774 if ($::MAP) {
1715 my $sw = int $::WIDTH / 32; 1775 my $sw = int $::WIDTH / 32;
1716 my $sh = int $::HEIGHT / 32; 1776 my $sh = int $::HEIGHT / 32;
1717 1777
1718 my $sx = $::CFG->{map_shift_x}; 1778 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1719 my $sy = $::CFG->{map_shift_y}; 1779 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1720 1780
1721 glTranslate +($sx & 31) - 32, ($sy & 31) - 32, 0; 1781 glTranslate $sx0 - 32, $sy0 - 32, 0;
1722 1782
1723 my ($w, $h, $data) = $::MAP->draw ($sx >> 5, $sy >> 5, 0, 0, $sw + 1, $sh + 1); 1783 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1724 1784
1725 if ($::CFG->{fow_enable}) { 1785 if ($::CFG->{fow_enable}) {
1726 if ($::CFG->{fow_smooth}) { # smooth fog of war 1786 if ($::CFG->{fow_smooth}) { # smooth fog of war
1727 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER; 1787 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1728 glConvolutionFilter2D 1788 glConvolutionFilter2D
… …
1736 0.1, 0.1, 0.1, 1796 0.1, 0.1, 0.1,
1737 ; 1797 ;
1738 glEnable GL_CONVOLUTION_2D; 1798 glEnable GL_CONVOLUTION_2D;
1739 } 1799 }
1740 1800
1741 my $tex = new CFClient::Texture 1801 $self->{fow_texture} = new CFClient::Texture
1742 w => $w, 1802 w => $w,
1743 h => $h, 1803 h => $h,
1744 data => $data, 1804 data => $data,
1745 internalformat => GL_ALPHA, 1805 internalformat => GL_ALPHA,
1746 format => GL_ALPHA; 1806 format => GL_ALPHA;
… …
1751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1752 glEnable GL_TEXTURE_2D; 1812 glEnable GL_TEXTURE_2D;
1753 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1754 1814
1755 glColor +($::CFG->{fow_intensity}) x 3, 1; 1815 glColor +($::CFG->{fow_intensity}) x 3, 1;
1756 $tex->draw_quad (0, 0, $w * 32, $h * 32); 1816 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1757 1817
1758 glDisable GL_TEXTURE_2D; 1818 glDisable GL_TEXTURE_2D;
1759 glDisable GL_BLEND; 1819 glDisable GL_BLEND;
1760 } 1820 }
1761 1821
1762 # HACK BEGIN 1822 # HACK BEGIN
1763 { 1823 {
1764 glTranslate -(($sx & 31) - 32), -(($sy & 31) - 32), 0;#remove 1824 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1765 my ($w, $h) = (250, 250); 1825 my ($w, $h) = (250, 250);
1766 1826
1767 glEnable GL_BLEND; 1827 glEnable GL_BLEND;
1768 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1769 glEnable GL_TEXTURE_2D; 1829 glEnable GL_TEXTURE_2D;
1770 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1830 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1771 1831
1832 $self->{mapmap_texture} =
1772 CFClient::Texture->new ( 1833 new CFClient::Texture
1773 w => $w, 1834 w => $w,
1774 h => $h, 1835 h => $h,
1775 data => $::MAP->mapmap ($w, $h), 1836 data => $::MAP->mapmap ($w, $h),
1776 type => GL_UNSIGNED_INT_8_8_8_8_REV 1837 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1777 )->draw_quad (100, 100); 1838
1839 $self->{mapmap_texture}->draw_quad (100, 100);
1778 1840
1779 glDisable GL_TEXTURE_2D; 1841 glDisable GL_TEXTURE_2D;
1780 glDisable GL_BLEND; 1842 glDisable GL_BLEND;
1781 } 1843 }
1782 # HACK END 1844 # HACK END
… …
1824 1886
1825 my $mod = $ev->key_mod; 1887 my $mod = $ev->key_mod;
1826 my $sym = $ev->key_sym; 1888 my $sym = $ev->key_sym;
1827 1889
1828 if ($sym == SDLK_KP5) { 1890 if ($sym == SDLK_KP5) {
1829 $::CONN->user_send ("command stay fire"); 1891 $::CONN->user_send ("stay fire");
1830 } elsif ($sym == SDLK_a) { 1892 } elsif ($sym == SDLK_a) {
1831 $::CONN->user_send ("command apply"); 1893 $::CONN->user_send ("apply");
1832 } elsif ($sym == SDLK_QUOTE) { 1894 } elsif ($sym == SDLK_QUOTE) {
1833 $self->emit ('activate_console'); 1895 $self->emit ('activate_console');
1834 } elsif ($sym == SDLK_SLASH) { 1896 } elsif ($sym == SDLK_SLASH) {
1835 $self->emit ('activate_console' => '/'); 1897 $self->emit ('activate_console' => '/');
1836 } elsif (exists $DIR{$sym}) { 1898 } elsif (exists $DIR{$sym}) {
1837 if ($mod & KMOD_SHIFT) { 1899 if ($mod & KMOD_SHIFT) {
1838 $self->{shft}++; 1900 $self->{shft}++;
1839 $::CONN->user_send ("command fire $DIR{$sym}[0]"); 1901 $::CONN->user_send ("fire $DIR{$sym}[0]");
1840 } elsif ($mod & KMOD_CTRL) { 1902 } elsif ($mod & KMOD_CTRL) {
1841 $self->{ctrl}++; 1903 $self->{ctrl}++;
1842 $::CONN->user_send ("command run $DIR{$sym}[0]"); 1904 $::CONN->user_send ("run $DIR{$sym}[0]");
1843 } else { 1905 } else {
1844 $::CONN->user_send ("command $DIR{$sym}[1]"); 1906 $::CONN->user_send ("$DIR{$sym}[1]");
1845 } 1907 }
1846 } 1908 }
1847} 1909}
1848 1910
1849sub key_up { 1911sub key_up {
… …
1851 1913
1852 my $mod = $ev->key_mod; 1914 my $mod = $ev->key_mod;
1853 my $sym = $ev->key_sym; 1915 my $sym = $ev->key_sym;
1854 1916
1855 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1917 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1856 $::CONN->user_send ("command fire_stop"); 1918 $::CONN->user_send ("fire_stop");
1857 } 1919 }
1858 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1920 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1859 $::CONN->user_send ("command run_stop"); 1921 $::CONN->user_send ("run_stop");
1860 } 1922 }
1861} 1923}
1862 1924
1863############################################################################# 1925#############################################################################
1864 1926
… …
1928sub toggle_flopper { 1990sub toggle_flopper {
1929 my ($self) = @_; 1991 my ($self) = @_;
1930 1992
1931 # TODO: use animation 1993 # TODO: use animation
1932 if ($self->{state} = !$self->{state}) { 1994 if ($self->{state} = !$self->{state}) {
1933 $CFClient::UI::TOPLEVEL->add ($self->{other}); 1995 $CFClient::UI::ROOT->add ($self->{other});
1934 $self->{other}->move ( 1996 $self->{other}->move ($self->coord2global (0, $self->{h}));
1935 ($::WIDTH - $self->{other}{w}) * 0.5, 1997 $self->emit ("open");
1936 ($::HEIGHT - $self->{other}{h}) * 0.5,
1937 );
1938 } else { 1998 } else {
1939 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 1999 $CFClient::UI::ROOT->remove ($self->{other});
2000 $self->emit ("close");
1940 } 2001 }
1941}
1942 2002
1943############################################################################# 2003 $self->emit (changed => $self->{state});
2004}
1944 2005
2006#############################################################################
2007
1945package CFClient::UI::Toplevel; 2008package CFClient::UI::Root;
1946 2009
1947our @ISA = CFClient::UI::Container::; 2010our @ISA = CFClient::UI::Container::;
1948 2011
1949use SDL::OpenGL; 2012use SDL::OpenGL;
1950 2013
… …
1959 2022
1960 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2023 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1961 for @{$self->{children}}; 2024 for @{$self->{children}};
1962} 2025}
1963 2026
1964sub translate { 2027sub _topleft {
1965 my ($self, $x, $y) = @_; 2028 my ($self, $x, $y) = @_;
1966 2029
1967 ($x, $y) 2030 ($x, $y)
1968} 2031}
1969 2032
… …
1977sub add { 2040sub add {
1978 my ($self, $widget) = @_; 2041 my ($self, $widget) = @_;
1979 2042
1980 $self->SUPER::add ($widget); 2043 $self->SUPER::add ($widget);
1981 2044
1982 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2045 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
1983} 2046}
1984 2047
1985sub on_refresh { 2048sub on_refresh {
1986 my ($self, $id, $cb) = @_; 2049 my ($self, $id, $cb) = @_;
1987 2050
… …
2010 2073
2011############################################################################# 2074#############################################################################
2012 2075
2013package CFClient::UI; 2076package CFClient::UI;
2014 2077
2015$TOPLEVEL = new CFClient::UI::Toplevel; 2078$ROOT = new CFClient::UI::Root;
2016 2079
20171 20801
2018 2081

Diff Legend

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