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.34 by root, Tue May 23 21:14:41 2006 UTC vs.
Revision 1.43 by elmex, Mon May 29 19:30:28 2006 UTC

… …
17 can_focus => 1, 17 can_focus => 1,
18 list => glGenList, 18 list => glGenList,
19 @_ 19 @_
20 ); 20 );
21 21
22 $self->{completer} = new CFClient::MapWidget::Command::
23 command => $self->{command},
24 can_focus => 1,
25 tooltip => "<b>The Command Completer</b>\n\n"
26 . "This is your central interface to send text commands to the server. "
27 . "To enter a verbatim command to send to the server, just type the command, "
28 . "followed by a space, and press return. "
29 . "Typing the initial letters of words (or just any letters) displays guesses "
30 . "for commands you might want to use.\n"
31 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
32 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
33 ;
34
22 $self 35 $self
23} 36}
24 37
25sub DESTROY { 38sub add_command {
39 my ($self, $command, $tooltip, $widget, $cb) = @_;
40
41 (my $data = $command) =~ s/\\//g;
42
43 $tooltip =~ s/^\s+//;
44 $tooltip = "<big>$data</big>\n\n$tooltip";
45 $tooltip =~ s/\s+$//;
46
47 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
48}
49
50sub clr_commands {
26 my $self = shift; 51 my ($self) = @_;
27 52
28 glDeleteList $self->{list}; 53 %{$self->{completer}{command}} = ();
29
30 $self->SUPER::DESTROY;
31} 54}
32 55
33sub button_down { 56sub button_down {
34 my ($self, $ev, $x, $y) = @_; 57 my ($self, $ev, $x, $y) = @_;
35 58
… …
76 99
77 $self->{need_update} = 1; 100 $self->{need_update} = 1;
78 $self->SUPER::update; 101 $self->SUPER::update;
79} 102}
80 103
104my %DIR = (
105 CFClient::SDLK_KP8, [1, "north"],
106 CFClient::SDLK_KP9, [2, "northeast"],
107 CFClient::SDLK_KP6, [3, "east"],
108 CFClient::SDLK_KP3, [4, "southeast"],
109 CFClient::SDLK_KP2, [5, "south"],
110 CFClient::SDLK_KP1, [6, "southwest"],
111 CFClient::SDLK_KP4, [7, "west"],
112 CFClient::SDLK_KP7, [8, "northwest"],
113
114 CFClient::SDLK_UP, [1, "north"],
115 CFClient::SDLK_RIGHT, [3, "east"],
116 CFClient::SDLK_DOWN, [5, "south"],
117 CFClient::SDLK_LEFT, [7, "west"],
118);
119
120sub key_down {
121 my ($self, $ev) = @_;
122
123 return unless $::CONN;
124
125 my $mod = $ev->{mod};
126 my $sym = $ev->{sym};
127 my $uni = $ev->{unicode};
128
129 if ($sym == CFClient::SDLK_KP5) {
130 $::CONN->user_send ("stay fire");
131 } elsif ($uni == ord ",") {
132 $::CONN->user_send ("take");
133 } elsif ($uni == ord " ") {
134 $::CONN->user_send ("apply");
135 } elsif ($uni == ord ".") {
136 $::CONN->user_send ($self->{completer}{last_command})
137 if exists $self->{completer}{last_command};
138 } elsif ($uni == ord "\t") {
139 $::INV_WINDOW->toggle_visibility;
140 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
141 $::CONN->user_send ("rotateshoottype +");
142 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
143 $::CONN->user_send ("rotateshoottype -");
144 } elsif ($uni == ord '"') {
145 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
146 $self->{completer}->show;
147 } elsif ($uni == ord "'") {
148 $self->{completer}->set_prefix ("");
149 $self->{completer}->show;
150 } elsif (exists $DIR{$sym}) {
151 if ($mod & CFClient::KMOD_SHIFT) {
152 $self->{shft}++;
153 $::CONN->user_send ("fire $DIR{$sym}[0]");
154 } elsif ($mod & CFClient::KMOD_CTRL) {
155 $self->{ctrl}++;
156 $::CONN->user_send ("run $DIR{$sym}[0]");
157 } else {
158 $::CONN->user_send ("$DIR{$sym}[1]");
159 }
160 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
161 CFClient::Recorder::start (1);
162 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
163 CFClient::Recorder::stop (1);
164 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
165 $::CONN->user_send ($_) for @$bind_cmd;
166 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
167 $self->{completer}->key_down ($ev);
168 $self->{completer}->show;
169 }
170}
171
172sub key_up {
173 my ($self, $ev) = @_;
174
175 my $mod = $ev->{mod};
176 my $sym = $ev->{sym};
177
178 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
179 $::CONN->user_send ("fire_stop");
180 }
181 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
182 $::CONN->user_send ("run_stop");
183 }
184}
185
81sub draw { 186sub draw {
82 my ($self) = @_; 187 my ($self) = @_;
83 188
189 my $focused = $CFClient::UI::FOCUS == $self
190 || $CFClient::UI::FOCUS == $self->{completer}{entry};
191
84 return 192 return
85 unless $CFClient::UI::FOCUS == $self || !$::FAST; 193 unless $focused || !$::FAST;
86 194
87 if (delete $self->{need_update}) { 195 if (delete $self->{need_update}) {
88 glNewList $self->{list}; 196 glNewList $self->{list};
89 197
90 if ($::MAP) { 198 if ($::MAP) {
… …
100 glTranslate $sx0 - 32, $sy0 - 32, 0; 208 glTranslate $sx0 - 32, $sy0 - 32, 0;
101 209
102 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 210 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
103 211
104 if ($::CFG->{fow_enable}) { 212 if ($::CFG->{fow_enable}) {
105 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war 213 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
106 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 214 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
107 glConvolutionFilter2D ( 215 glConvolutionFilter2D (
108 GL_CONVOLUTION_2D, 216 GL_CONVOLUTION_2D,
109 GL_ALPHA, 217 GL_ALPHA,
110 3, 3, 218 3, 3,
… …
115 0.05, 0.13, 0.05, 223 0.05, 0.13, 0.05,
116 ); 224 );
117 glEnable GL_CONVOLUTION_2D; 225 glEnable GL_CONVOLUTION_2D;
118 } 226 }
119 227
228 $self->{fow_texture_name} ||= glGenTexture;
120 # try to re-use the texture name: TODO improve texture class instead 229 # try to re-use the texture name: TODO improve texture class instead
121 my $prev_name = ((delete $self->{fow_texture}) || {})->{name};
122 230
123 $self->{fow_texture} = new CFClient::Texture 231 $self->{fow_texture} = new CFClient::Texture
124 w => $w, 232 w => $w,
125 h => $h, 233 h => $h,
126 data => $data, 234 data => $data,
127 name => $prev_name, # a bit hackish 235 name => $self->{fow_texture_name},
128 internalformat => GL_ALPHA, 236 internalformat => GL_ALPHA,
129 format => GL_ALPHA; 237 format => GL_ALPHA;
130 238
131 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 239 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
132 240
… …
148 glPushMatrix; 256 glPushMatrix;
149 glCallList $self->{list}; 257 glCallList $self->{list};
150 glPopMatrix; 258 glPopMatrix;
151 259
152 # TNT2 emulates logops in software (or worse :) 260 # TNT2 emulates logops in software (or worse :)
153 if ($CFClient::UI::FOCUS == $self) { 261 if ($focused) {
154 (delete $self->{out_of_focus})->destroy 262 (delete $self->{out_of_focus})->destroy
155 if $self->{out_of_focus}; 263 if $self->{out_of_focus};
156 } else { 264 } else {
157 glColor 0.4, 0.2, 0.2, 0.6; 265 glColor 0.4, 0.2, 0.2, 0.6;
158 glEnable GL_BLEND; 266 glEnable GL_BLEND;
… …
163 glVertex $::WIDTH, $::HEIGHT; 271 glVertex $::WIDTH, $::HEIGHT;
164 glVertex $::WIDTH, 0; 272 glVertex $::WIDTH, 0;
165 glEnd; 273 glEnd;
166 glDisable GL_BLEND; 274 glDisable GL_BLEND;
167 275
168 $self->{out_of_focus} ||= do { 276# $self->{out_of_focus} ||= do {
169 my $label = new CFClient::UI::Label 277# my $label = new CFClient::UI::Label
170 x => 0, 278# x => 0,
171 y => 0, 279# y => 0,
172 z => 1, 280# z => 1,
173 ellipsise => 0, 281# ellipsise => 0,
174 text => "map out of focus (click map to play)"; 282# text => "map out of focus (click map to play)";
175 283#
176 $label->show; 284# $label->show;
177 $label->update; 285# $label->update;
178 286#
179 $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { 287# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
180 $label->move ( 288# $label->move (
181 ($::WIDTH - $label->{w}) * 0.5, 289# ($::WIDTH - $label->{w}) * 0.5,
182 ($::HEIGHT - $label->{h}) * 0.5, 290# ($::HEIGHT - $label->{h}) * 0.5,
183 ); 291# );
184 }); 292# });
185 293#
186 $label 294# $label
187 }; 295# };
188 } 296 }
189} 297}
190 298
191my %DIR = ( 299sub DESTROY {
192 CFClient::SDLK_KP8, [1, "north"],
193 CFClient::SDLK_KP9, [2, "northeast"],
194 CFClient::SDLK_KP6, [3, "east"],
195 CFClient::SDLK_KP3, [4, "southeast"],
196 CFClient::SDLK_KP2, [5, "south"],
197 CFClient::SDLK_KP1, [6, "southwest"],
198 CFClient::SDLK_KP4, [7, "west"],
199 CFClient::SDLK_KP7, [8, "northwest"],
200
201 CFClient::SDLK_UP, [1, "north"],
202 CFClient::SDLK_RIGHT, [3, "east"],
203 CFClient::SDLK_DOWN, [5, "south"],
204 CFClient::SDLK_LEFT, [7, "west"],
205);
206
207sub key_down {
208 my ($self, $ev) = @_;
209
210 return unless $::CONN;
211
212 my $mod = $ev->{mod};
213 my $sym = $ev->{sym};
214 my $uni = $ev->{unicode};
215
216 if ($sym == CFClient::SDLK_KP5) {
217 $::CONN->user_send ("stay fire");
218 } elsif ($uni == ord ",") {
219 $::CONN->user_send ("take");
220 } elsif ($uni == ord "\t" or $uni == ord " ") {
221 $::CONN->user_send ("apply");
222 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
223 $::CONN->user_send ("rotateshoottype +");
224 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
225 $::CONN->user_send ("rotateshoottype -");
226 } elsif ($uni == ord "'") {
227 $self->emit ('activate_console');
228 } elsif ($uni == ord "/") {
229 $self->emit (activate_console => '/');
230 } elsif (exists $DIR{$sym}) {
231 if ($mod & CFClient::KMOD_SHIFT) {
232 $self->{shft}++;
233 $::CONN->user_send ("fire $DIR{$sym}[0]");
234 } elsif ($mod & CFClient::KMOD_CTRL) {
235 $self->{ctrl}++;
236 $::CONN->user_send ("run $DIR{$sym}[0]");
237 } else {
238 $::CONN->user_send ("$DIR{$sym}[1]");
239 }
240 } elsif ($ev->{unicode}) {
241 $self->{command_widget} ||=
242 new CFClient::MapWidget::Command::
243 command => $self->{command},
244 can_focus => 1,
245 connect_execute => sub {
246 # todo: support callback instead of user_send
247 $::CONN->user_send ($_[1]);
248 },
249 connect_close => sub {
250 (delete $self->{command_widget})->hide;
251 $self->focus_in;
252 },
253 ;
254 $self->{command_widget}->key_down ($ev)
255 unless $ev->{unicode} == 20;
256 return unless $self->{command_widget};
257 $self->{command_widget}->show;
258 $self->{command_widget}->focus_in;
259 }
260}
261
262sub key_up {
263 my ($self, $ev) = @_;
264
265 my $mod = $ev->{mod};
266 my $sym = $ev->{sym};
267
268 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
269 $::CONN->user_send ("fire_stop");
270 }
271 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
272 $::CONN->user_send ("run_stop");
273 }
274}
275
276sub add_command {
277 my ($self, $command, $tooltip, $widget, $cb) = @_;
278
279 (my $data = $command) =~ s/\\//g;
280
281 $tooltip =~ s/^\s+//;
282
283 $tooltip = "<big>$data</big>\n\n$tooltip";
284
285 $tooltip =~ s/\s+$//;
286
287 $self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
288}
289
290sub clr_commands {
291 my ($self) = @_; 300 my $self = shift;
292 301
293 %{$self->{command}} = (); 302 glDeleteList $self->{list};
303
304 $self->SUPER::DESTROY;
294} 305}
295 306
296package CFClient::MapWidget::MapMap; 307package CFClient::MapWidget::MapMap;
297 308
298our @ISA = CFClient::UI::Base::; 309our @ISA = CFClient::UI::Base::;
… …
399 fontsize => $_, 410 fontsize => $_,
400 ), (0.8) x 16 411 ), (0.8) x 16
401 ]; 412 ];
402 413
403 $self->{entry} = new CFClient::UI::Entry 414 $self->{entry} = new CFClient::UI::Entry
404 connect_changed => sub { 415 on_changed => sub {
405 $self->update_labels; 416 $self->update_labels;
417 },
418 on_key_down => sub {
419 my ($entry, $ev) = @_;
420
421 my $self = $entry->{parent}{parent};
422
423 if ($ev->{sym} == 13) {
424 if (exists $self->{select}) {
425 $self->{last_command} = $self->{select};
426 $::CONN->user_send ($self->{select});
427 $self->hide;
428 }
429 } elsif ($ev->{sym} == 27) {
430 $self->hide;
431 return;
432 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
433 ++$self->{select_offset}
434 if $self->{select_offset} < $#{ $self->{last_match} || [] };
435 $self->update_labels;
436 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
437 --$self->{select_offset}
438 if $self->{select_offset};
439 $self->update_labels;
440 } else {
441 return 0;
442 }
443
444 1
406 }; 445 }
446 ;
407 447
408 $self->{vbox}->add ( 448 $self->{vbox}->add (
409 $self->{entry}, 449 $self->{entry},
410 @{$self->{label}}, 450 @{$self->{label}},
411 ); 451 );
412 452
413 $self 453 $self
414} 454}
415 455
456sub set_prefix {
457 my ($self, $prefix) = @_;
458
459 $self->{entry}->set_text ($prefix);
460 $self->show;
461}
462
416sub size_allocate { 463sub size_allocate {
417 my ($self, $w, $h) = @_; 464 my ($self, $w, $h) = @_;
418 465
419 $self->SUPER::size_allocate ($w, $h); 466 $self->SUPER::size_allocate ($w, $h);
420 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 467 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
421} 468}
422 469
470sub show {
471 my ($self) = @_;
472
473 $self->SUPER::show;
474 $self->{entry}->focus_in;
475}
476
477sub hide {
478 my ($self) = @_;
479
480 $self->SUPER::hide;
481 $self->{entry}->set_text ("");
482}
483
423sub key_down { 484sub key_down {
424 my ($self, $ev) = @_; 485 my ($self, $ev) = @_;
425 486
426 if ($ev->{sym} == 13) { 487 $self->{entry}->key_down ($ev);
427 if (exists $self->{select}) { 488}
428 $self->emit (execute => $self->{select}); 489
429 $self->emit ("close"); 490sub update_labels {
491 my ($self) = @_;
492
493 my $text = $self->{entry}->get_text;
494
495 length $text
496 or return $self->hide;
497
498 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
499
500 if ($text ne $self->{last_search}) {
501 my @match;
502
503 if ($text =~ /^(.*?)\s+$/) {
504 @match = [$cmd, "(appended whitespace suppresses completion)"];
505 } else {
506 my $regexp = do {
507 my ($beg, @chr) = split //, lc $cmd;
508
509 # the following regex is used to match our "completion entry"
510 # to an actual command - the parentheses match kind of "overhead"
511 # - the more characters the parentheses match, the less attractive
512 # is the match.
513 my $regexp = "^\Q$beg\E"
514 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
515 qr<$regexp>
516 };
517
518 my @penalty;
519
520 for (keys %{$self->{command}}) {
521 if (@penalty = $_ =~ $regexp) {
522 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
523 }
524 }
525
526 @match = map $self->{command}{$_->[0]},
527 sort {
528 $a->[1] <=> $b->[1]
529 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
530 or (length $b->[0]) <=> (length $a->[0])
531 } @match;
430 } 532 }
431 } elsif ($ev->{sym} == 27) {
432 $self->{entry}->set_text ("");
433 $self->emit ("close");
434 return;
435 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
436 ++$self->{select_offset}
437 if $self->{select_offset} < $#{ $self->{last_match} || [] };
438 $self->update_labels;
439 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
440 --$self->{select_offset}
441 if $self->{select_offset};
442 $self->update_labels;
443 } else {
444 #$self->{entry}{force_alloc} = 1;
445 $self->{entry}->key_down ($ev);
446 }
447}
448 533
449sub update_labels {
450 my ($self) = @_;
451
452 my $text = $self->{entry}->get_text;
453
454 length $text
455 or return $self->emit ("close");
456
457 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
458
459 if ($cmd ne $self->{last_search}) {
460 my $regexp = do {
461 my ($beg, @chr) = split //, lc $cmd;
462
463 # the following regex is used to match our "completion entry"
464 # to an actual command - the parentheses match kind of "overhead"
465 # - the more characters the parentheses match, the less attractive
466 # is the match.
467 my $regexp = "^\Q$beg\E"
468 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
469 qr<$regexp>
470 };
471
472 my @match;
473 my @penalty;
474
475 for (keys %{$self->{command}}) {
476 if (@penalty = $_ =~ $regexp) {
477 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
478 }
479 }
480
481 @match = map $self->{command}{$_->[0]},
482 sort {
483 $a->[1] <=> $b->[1]
484 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
485 or (length $a->[0]) <=> (length $b->[0])
486 } @match;
487
488 $self->{last_search} = $cmd; 534 $self->{last_search} = $text;
489 $self->{last_match} = \@match; 535 $self->{last_match} = \@match;
490 536
491 $self->{select_offset} = 0; 537 $self->{select_offset} = 0;
492 } 538 }
493 539

Diff Legend

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