ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.4 by root, Wed Apr 19 23:37:49 2006 UTC vs.
Revision 1.15 by root, Mon Apr 24 13:01:13 2006 UTC

1package CFClient::MapWidget; 1package CFClient::MapWidget;
2 2
3use strict; 3use strict;
4use utf8;
4 5
5use List::Util qw(min max); 6use List::Util qw(min max);
6 7
7use CFClient::OpenGL; 8use CFClient::OpenGL;
8 9
… …
25 glDeleteList $self->{list}; 26 glDeleteList $self->{list};
26 27
27 $self->SUPER::DESTROY; 28 $self->SUPER::DESTROY;
28} 29}
29 30
30sub key_down {
31 print "MAPKEYDOWN\n";
32}
33
34sub key_up {
35}
36
37sub button_down { 31sub button_down {
38 my ($self, $ev, $x, $y) = @_; 32 my ($self, $ev, $x, $y) = @_;
39 33
40 $self->focus_in; 34 $self->focus_in;
41 35
42 if ($ev->button == 2) { 36 if ($ev->{button} == 2) {
43 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 37 my ($ox, $oy) = ($ev->{x}, $ev->{y});
44 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 38 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
45 39
46 $self->{motion} = sub { 40 $self->{motion} = sub {
47 my ($ev, $x, $y) = @_; 41 my ($ev, $x, $y) = @_;
48 42
49 ($x, $y) = ($ev->motion_x, $ev->motion_y); 43 ($x, $y) = ($ev->{x}, $ev->{y});
50 44
51 $::CFG->{map_shift_x} = $bw + $x - $ox; 45 $::CFG->{map_shift_x} = $bw + $x - $ox;
52 $::CFG->{map_shift_y} = $bh + $y - $oy; 46 $::CFG->{map_shift_y} = $bh + $y - $oy;
53 47
54 $self->update; 48 $self->update;
… …
87 81
88 if (delete $self->{need_update}) { 82 if (delete $self->{need_update}) {
89 glNewList $self->{list}; 83 glNewList $self->{list};
90 84
91 if ($::MAP) { 85 if ($::MAP) {
92 my $sw = int $::WIDTH / 32; 86 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale});
93 my $sh = int $::HEIGHT / 32; 87 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale});
94 88
89 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
90
95 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; 91 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
96 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; 92 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
97 93
98 glTranslate $sx0 - 32, $sy0 - 32, 0; 94 glTranslate $sx0 - 32, $sy0 - 32, 0;
99 95
100 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 96 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
101 97
… …
106 GL_CONVOLUTION_2D, 102 GL_CONVOLUTION_2D,
107 GL_ALPHA, 103 GL_ALPHA,
108 3, 3, 104 3, 3,
109 GL_ALPHA, GL_FLOAT, 105 GL_ALPHA, GL_FLOAT,
110 pack "f*", 106 pack "f*",
111 0.1, 0.1, 0.1, 107 0.05, 0.13, 0.05,
112 0.1, 0.2, 0.1, 108 0.13, 0.30, 0.13,
113 0.1, 0.1, 0.1, 109 0.05, 0.13, 0.05,
114 ); 110 );
115 glEnable GL_CONVOLUTION_2D; 111 glEnable GL_CONVOLUTION_2D;
116 } 112 }
117 113
118 $self->{fow_texture} = new CFClient::Texture 114 $self->{fow_texture} = new CFClient::Texture
… …
127 glEnable GL_BLEND; 123 glEnable GL_BLEND;
128 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 124 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
129 glEnable GL_TEXTURE_2D; 125 glEnable GL_TEXTURE_2D;
130 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 126 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
131 127
132 glColor +($::CFG->{fow_intensity}) x 3, 1; 128 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
133 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 129 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
134 130
135 glDisable GL_TEXTURE_2D; 131 glDisable GL_TEXTURE_2D;
136 glDisable GL_BLEND; 132 glDisable GL_BLEND;
137 } 133 }
138 134
139 # HACK BEGIN 135 # HACK BEGIN
140 { 136 {
141 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove 137 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
138
139 glTranslate 0, 30;
142 my ($w, $h) = (250, 250); 140 my ($w, $h) = (250, 250);
141
142 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
143 143
144 glEnable GL_BLEND; 144 glEnable GL_BLEND;
145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
146 glEnable GL_TEXTURE_2D; 146 glEnable GL_TEXTURE_2D;
147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
148 148
149 $self->{mapmap_texture} = 149 $self->{mapmap_texture} =
150 new CFClient::Texture 150 new CFClient::Texture
151 w => $w, 151 w => $w,
152 h => $h, 152 h => $h,
153 data => $::MAP->mapmap ($w, $h), 153 data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
154 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 154 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
155 155
156 $self->{mapmap_texture}->draw_quad (100, 100); 156 $self->{mapmap_texture}->draw_quad (0, 0);
157 157
158 glDisable GL_TEXTURE_2D; 158 glDisable GL_TEXTURE_2D;
159
160 glTranslate 0.375, 0.375;
161
162 glColor 1, 1, 0, 1;
163 glBegin GL_LINE_LOOP;
164 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
165 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
166 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
167 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
168 glEnd;
169
159 glDisable GL_BLEND; 170 glDisable GL_BLEND;
160 } 171 }
161 # HACK END 172 # HACK END
162 } 173 }
163 174
… …
199); 210);
200 211
201sub key_down { 212sub key_down {
202 my ($self, $ev) = @_; 213 my ($self, $ev) = @_;
203 214
204 my $mod = $ev->key_mod; 215 my $mod = $ev->{mod};
205 my $sym = $ev->key_sym; 216 my $sym = $ev->{sym};
206 217
207 if ($sym == CFClient::SDLK_KP5) { 218 if ($sym == CFClient::SDLK_KP5) {
208 $::CONN->user_send ("stay fire"); 219 $::CONN->user_send ("stay fire");
220 } elsif ($sym == ord ",") {
221 $::CONN->user_send ("take");
209 } elsif ($sym == ord "a") { 222 } elsif ($sym == ord "a") {
210 $::CONN->user_send ("apply"); 223 $::CONN->user_send ("apply");
211 } elsif ($sym == ord "'") { 224 } elsif ($sym == ord "'") {
212 $self->emit ('activate_console'); 225 $self->emit ('activate_console');
213 } elsif ($sym == ord "/") { 226 } elsif ($sym == ord "/") {
214 $self->emit ('activate_console' => '/'); 227 $self->emit (activate_console => '/');
215 } elsif (exists $DIR{$sym}) { 228 } elsif (exists $DIR{$sym}) {
216 if ($mod & CFClient::KMOD_SHIFT) { 229 if ($mod & CFClient::KMOD_SHIFT) {
217 $self->{shft}++; 230 $self->{shft}++;
218 $::CONN->user_send ("fire $DIR{$sym}[0]"); 231 $::CONN->user_send ("fire $DIR{$sym}[0]");
219 } elsif ($mod & CFClient::KMOD_CTRL) { 232 } elsif ($mod & CFClient::KMOD_CTRL) {
220 $self->{ctrl}++; 233 $self->{ctrl}++;
221 $::CONN->user_send ("run $DIR{$sym}[0]"); 234 $::CONN->user_send ("run $DIR{$sym}[0]");
222 } else { 235 } else {
223 $::CONN->user_send ("$DIR{$sym}[1]"); 236 $::CONN->user_send ("$DIR{$sym}[1]");
224 } 237 }
238 } elsif ($ev->{unicode}) {
239 $self->{command_widget} ||=
240 new CFClient::MapWidget::Command::
241 command => $self->{command},
242 can_focus => 1,
243 connect_execute => sub {
244 # todo: support callback instead of user_send
245 $::CONN->user_send ($_[1][1]);
246 },
247 connect_close => sub {
248 (delete $self->{command_widget})->hide;
249 $self->focus_in;
250 },
251 ;
252 $self->{command_widget}->key_down ($ev);
253 return unless $self->{command_widget};
254 $self->{command_widget}->show;
255 $self->{command_widget}->focus_in;
225 } 256 }
226} 257}
227 258
228sub key_up { 259sub key_up {
229 my ($self, $ev) = @_; 260 my ($self, $ev) = @_;
230 261
231 my $mod = $ev->key_mod; 262 my $mod = $ev->{mod};
232 my $sym = $ev->key_sym; 263 my $sym = $ev->{sym};
233 264
234 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 265 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
235 $::CONN->user_send ("fire_stop"); 266 $::CONN->user_send ("fire_stop");
236 } 267 }
237 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 268 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
238 $::CONN->user_send ("run_stop"); 269 $::CONN->user_send ("run_stop");
239 } 270 }
240} 271}
241 272
242sub add_command { 273sub add_command {
243 my ($self, $command, $widget, $cb) = @_; 274 my ($self, $command, $tooltip, $widget, $cb) = @_;
244 275
245 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; 276 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
246 warn "$command|$abbrev|$widget\n";#d# 277
278 push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];
279}
280
281package CFClient::MapWidget::Command;
282
283use strict;
284
285use CFClient::OpenGL;
286
287our @ISA = CFClient::UI::VBox::;
288
289sub new {
290 my $class = shift;
291
292 my $self = $class->SUPER::new (
293 @_,
294 children => [map
295 CFClient::UI::Label->new (
296 can_hover => 1,
297 can_events => 1,
298 fontsize => $_,
299 ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8
300 ],
301 );
302
303 $self
304}
305
306sub size_allocate {
307 my ($self, $w, $h) = @_;
308
309 $self->SUPER::size_allocate ($w, $h);
310 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
311}
312
313sub update_labels {
314 my ($self) = @_;
315
316 my $command = $self->{command};
317 my $search_abbrev = qr/^\Q$self->{search}/;
318 my $search_full = qr/\Q$self->{search}/;
319
320 my @found;
321
322 for (@$command) {
323 if ($_->[0] =~ $search_abbrev) {
324 push @found, [$_->[0], $_];
325 } elsif ($_->[1] =~ $search_full) {
326 push @found, [$_->[1], $_];
327 }
328 }
329
330 @found = sort { $a->[0] cmp $b->[0] } @found;
331
332 $self->{children}[0]->set_text ("$self->{search}_");
333
334 for (0..5) {
335 $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
336 $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
337 }
338
339 $self->{select} = $found[0][1]
340 if @found;
341
342 if (@found > 6) {
343 $self->{children}[6]->set_text ("...");
344 }
345
346 $self->check_size;
347}
348
349sub key_down {
350 my ($self, $ev) = @_;
351
352 if ($ev->{sym} == 8) {
353 substr $self->{search}, -1, 1, "";
354 $self->update_labels;
355 } elsif ($ev->{sym} == 13) {
356 if (exists $self->{select}) {
357 $self->emit (execute => $self->{select});
358 $self->emit ("close");
359 }
360 } elsif ($ev->{sym} == 27) {
361 $self->emit ("close");
362 return;
363 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
364 $self->{search} .= chr $ev->{unicode};
365 $self->update_labels;
366 }
367
368 length $self->{search}
369 or $self->emit ("close");
247} 370}
248 371
2491 3721

Diff Legend

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