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.28 by root, Wed May 17 20:50:19 2006 UTC vs.
Revision 1.41 by root, Sun May 28 02:31:03 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 ($ev->{unicode}) {
161 $self->{completer}->key_down ($ev);
162 $self->{completer}->show;
163 }
164}
165
166sub key_up {
167 my ($self, $ev) = @_;
168
169 my $mod = $ev->{mod};
170 my $sym = $ev->{sym};
171
172 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
173 $::CONN->user_send ("fire_stop");
174 }
175 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
176 $::CONN->user_send ("run_stop");
177 }
178}
179
81sub draw { 180sub draw {
82 my ($self) = @_; 181 my ($self) = @_;
83 182
183 my $focused = $CFClient::UI::FOCUS == $self
184 || $CFClient::UI::FOCUS == $self->{completer}{entry};
185
84 return 186 return
85 unless $CFClient::UI::FOCUS == $self || !$::FAST; 187 unless $focused || !$::FAST;
86 188
87 if (delete $self->{need_update}) { 189 if (delete $self->{need_update}) {
88 glNewList $self->{list}; 190 glNewList $self->{list};
89 191
90 if ($::MAP) { 192 if ($::MAP) {
… …
100 glTranslate $sx0 - 32, $sy0 - 32, 0; 202 glTranslate $sx0 - 32, $sy0 - 32, 0;
101 203
102 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 204 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
103 205
104 if ($::CFG->{fow_enable}) { 206 if ($::CFG->{fow_enable}) {
105 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war 207 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); 208 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
107 glConvolutionFilter2D ( 209 glConvolutionFilter2D (
108 GL_CONVOLUTION_2D, 210 GL_CONVOLUTION_2D,
109 GL_ALPHA, 211 GL_ALPHA,
110 3, 3, 212 3, 3,
… …
115 0.05, 0.13, 0.05, 217 0.05, 0.13, 0.05,
116 ); 218 );
117 glEnable GL_CONVOLUTION_2D; 219 glEnable GL_CONVOLUTION_2D;
118 } 220 }
119 221
222 $self->{fow_texture_name} ||= glGenTexture;
223 # try to re-use the texture name: TODO improve texture class instead
224
120 $self->{fow_texture} = new CFClient::Texture 225 $self->{fow_texture} = new CFClient::Texture
121 w => $w, 226 w => $w,
122 h => $h, 227 h => $h,
123 data => $data, 228 data => $data,
229 name => $self->{fow_texture_name},
124 internalformat => GL_ALPHA, 230 internalformat => GL_ALPHA,
125 format => GL_ALPHA; 231 format => GL_ALPHA;
126 232
127 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 233 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
128 234
129 glEnable GL_BLEND;
130 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
131 glEnable GL_TEXTURE_2D; 235 glEnable GL_TEXTURE_2D;
132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 236 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
133 237
134 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 238 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
135 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 239 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
136 240
137 glDisable GL_TEXTURE_2D; 241 glDisable GL_TEXTURE_2D;
138 glDisable GL_BLEND;
139 } 242 }
140 243
141 glPopMatrix; 244 glPopMatrix;
142 } 245 }
143 246
… …
146 249
147 glPushMatrix; 250 glPushMatrix;
148 glCallList $self->{list}; 251 glCallList $self->{list};
149 glPopMatrix; 252 glPopMatrix;
150 253
151 if ($CFClient::UI::FOCUS != $self) { 254 # TNT2 emulates logops in software (or worse :)
152 glColor 64/255, 64/255, 64/255; 255 if ($focused) {
153 glLogicOp GL_AND; 256 (delete $self->{out_of_focus})->destroy
154 glEnable GL_COLOR_LOGIC_OP; 257 if $self->{out_of_focus};
258 } else {
259 glColor 0.4, 0.2, 0.2, 0.6;
260 glEnable GL_BLEND;
261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
155 glBegin GL_QUADS; 262 glBegin GL_QUADS;
156 glVertex 0, 0; 263 glVertex 0, 0;
157 glVertex 0, $::HEIGHT; 264 glVertex 0, $::HEIGHT;
158 glVertex $::WIDTH, $::HEIGHT; 265 glVertex $::WIDTH, $::HEIGHT;
159 glVertex $::WIDTH, 0; 266 glVertex $::WIDTH, 0;
160 glEnd; 267 glEnd;
161 glDisable GL_COLOR_LOGIC_OP; 268 glDisable GL_BLEND;
162 }
163}
164 269
165my %DIR = ( 270# $self->{out_of_focus} ||= do {
166 CFClient::SDLK_KP8, [1, "north"], 271# my $label = new CFClient::UI::Label
167 CFClient::SDLK_KP9, [2, "northeast"], 272# x => 0,
168 CFClient::SDLK_KP6, [3, "east"], 273# y => 0,
169 CFClient::SDLK_KP3, [4, "southeast"], 274# z => 1,
170 CFClient::SDLK_KP2, [5, "south"], 275# ellipsise => 0,
171 CFClient::SDLK_KP1, [6, "southwest"], 276# text => "map out of focus (click map to play)";
172 CFClient::SDLK_KP4, [7, "west"], 277#
173 CFClient::SDLK_KP7, [8, "northwest"], 278# $label->show;
174 279# $label->update;
175 CFClient::SDLK_UP, [1, "north"], 280#
176 CFClient::SDLK_RIGHT, [3, "east"], 281# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
177 CFClient::SDLK_DOWN, [5, "south"], 282# $label->move (
178 CFClient::SDLK_LEFT, [7, "west"], 283# ($::WIDTH - $label->{w}) * 0.5,
179); 284# ($::HEIGHT - $label->{h}) * 0.5,
180 285# );
181sub key_down { 286# });
182 my ($self, $ev) = @_; 287#
183 288# $label
184 return unless $::CONN;
185
186 my $mod = $ev->{mod};
187 my $sym = $ev->{sym};
188 my $uni = $ev->{unicode};
189
190 if ($sym == CFClient::SDLK_KP5) {
191 $::CONN->user_send ("stay fire");
192 } elsif ($uni == ord ",") {
193 $::CONN->user_send ("take");
194 } elsif ($uni == ord "\t" or $uni == ord " ") {
195 $::CONN->user_send ("apply");
196 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
197 $::CONN->user_send ("rotateshoottype +");
198 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
199 $::CONN->user_send ("rotateshoottype -");
200 } elsif ($uni == ord "'") {
201 $self->emit ('activate_console');
202 } elsif ($uni == ord "/") {
203 $self->emit (activate_console => '/');
204 } elsif (exists $DIR{$sym}) {
205 if ($mod & CFClient::KMOD_SHIFT) {
206 $self->{shft}++;
207 $::CONN->user_send ("fire $DIR{$sym}[0]");
208 } elsif ($mod & CFClient::KMOD_CTRL) {
209 $self->{ctrl}++;
210 $::CONN->user_send ("run $DIR{$sym}[0]");
211 } else {
212 $::CONN->user_send ("$DIR{$sym}[1]");
213 } 289# };
214 } elsif ($ev->{unicode}) {
215 $self->{command_widget} ||=
216 new CFClient::MapWidget::Command::
217 command => $self->{command},
218 can_focus => 1,
219 connect_execute => sub {
220 # todo: support callback instead of user_send
221 $::CONN->user_send ($_[1]);
222 },
223 connect_close => sub {
224 (delete $self->{command_widget})->hide;
225 $self->focus_in;
226 },
227 ;
228 $self->{command_widget}->key_down ($ev)
229 unless $ev->{unicode} == 20;
230 return unless $self->{command_widget};
231 $self->{command_widget}->show;
232 $self->{command_widget}->focus_in;
233 } 290 }
234} 291}
235 292
236sub key_up { 293sub DESTROY {
237 my ($self, $ev) = @_;
238
239 my $mod = $ev->{mod};
240 my $sym = $ev->{sym};
241
242 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
243 $::CONN->user_send ("fire_stop");
244 }
245 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
246 $::CONN->user_send ("run_stop");
247 }
248}
249
250sub add_command {
251 my ($self, $command, $tooltip, $widget, $cb) = @_;
252
253 (my $data = $command) =~ s/\\//g;
254
255 $tooltip =~ s/^\s+//;
256
257 $tooltip = "<big>$data</big>\n\n$tooltip";
258
259 $tooltip =~ s/\s+$//;
260
261 $self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
262}
263
264sub clr_commands {
265 my ($self) = @_; 294 my $self = shift;
266 295
267 %{$self->{command}} = (); 296 glDeleteList $self->{list};
297
298 $self->SUPER::DESTROY;
268} 299}
269 300
270package CFClient::MapWidget::MapMap; 301package CFClient::MapWidget::MapMap;
271 302
272our @ISA = CFClient::UI::Base::; 303our @ISA = CFClient::UI::Base::;
… …
373 fontsize => $_, 404 fontsize => $_,
374 ), (0.8) x 16 405 ), (0.8) x 16
375 ]; 406 ];
376 407
377 $self->{entry} = new CFClient::UI::Entry 408 $self->{entry} = new CFClient::UI::Entry
378 connect_changed => sub { 409 on_changed => sub {
379 $self->update_labels; 410 $self->update_labels;
411 },
412 on_key_down => sub {
413 my ($entry, $ev) = @_;
414
415 my $self = $entry->{parent}{parent};
416
417 if ($ev->{sym} == 13) {
418 if (exists $self->{select}) {
419 $self->{last_command} = $self->{select};
420 $::CONN->user_send ($self->{select});
421 $self->hide;
422 }
423 } elsif ($ev->{sym} == 27) {
424 $self->hide;
425 return;
426 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
427 ++$self->{select_offset}
428 if $self->{select_offset} < $#{ $self->{last_match} || [] };
429 $self->update_labels;
430 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
431 --$self->{select_offset}
432 if $self->{select_offset};
433 $self->update_labels;
434 } else {
435 return 0;
436 }
437
438 1
380 }; 439 }
440 ;
381 441
382 $self->{vbox}->add ( 442 $self->{vbox}->add (
383 $self->{entry}, 443 $self->{entry},
384 @{$self->{label}}, 444 @{$self->{label}},
385 ); 445 );
386 446
387 $self 447 $self
388} 448}
389 449
450sub set_prefix {
451 my ($self, $prefix) = @_;
452
453 $self->{entry}->set_text ($prefix);
454 $self->show;
455}
456
390sub size_allocate { 457sub size_allocate {
391 my ($self, $w, $h) = @_; 458 my ($self, $w, $h) = @_;
392 459
393 $self->SUPER::size_allocate ($w, $h); 460 $self->SUPER::size_allocate ($w, $h);
394 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 461 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
395} 462}
396 463
464sub show {
465 my ($self) = @_;
466
467 $self->SUPER::show;
468 $self->{entry}->focus_in;
469}
470
471sub hide {
472 my ($self) = @_;
473
474 $self->SUPER::hide;
475 $self->{entry}->set_text ("");
476}
477
397sub key_down { 478sub key_down {
398 my ($self, $ev) = @_; 479 my ($self, $ev) = @_;
399 480
400 if ($ev->{sym} == 13) { 481 $self->{entry}->key_down ($ev);
401 if (exists $self->{select}) { 482}
402 $self->emit (execute => $self->{select}); 483
403 $self->emit ("close"); 484sub update_labels {
485 my ($self) = @_;
486
487 my $text = $self->{entry}->get_text;
488
489 length $text
490 or return $self->hide;
491
492 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
493
494 if ($text ne $self->{last_search}) {
495 my @match;
496
497 if ($text =~ /^(.*?)\s+$/) {
498 @match = [$cmd, "(appended whitespace suppresses completion)"];
499 } else {
500 my $regexp = do {
501 my ($beg, @chr) = split //, lc $cmd;
502
503 # the following regex is used to match our "completion entry"
504 # to an actual command - the parentheses match kind of "overhead"
505 # - the more characters the parentheses match, the less attractive
506 # is the match.
507 my $regexp = "^\Q$beg\E"
508 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
509 qr<$regexp>
510 };
511
512 my @penalty;
513
514 for (keys %{$self->{command}}) {
515 if (@penalty = $_ =~ $regexp) {
516 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
517 }
518 }
519
520 @match = map $self->{command}{$_->[0]},
521 sort {
522 $a->[1] <=> $b->[1]
523 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
524 or (length $b->[0]) <=> (length $a->[0])
525 } @match;
404 } 526 }
405 } elsif ($ev->{sym} == 27) {
406 $self->{entry}->set_text ("");
407 $self->emit ("close");
408 return;
409 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
410 ++$self->{select_offset}
411 if $self->{select_offset} < $#{ $self->{last_match} || [] };
412 $self->update_labels;
413 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
414 --$self->{select_offset}
415 if $self->{select_offset};
416 $self->update_labels;
417 } else {
418 #$self->{entry}{force_alloc} = 1;
419 $self->{entry}->key_down ($ev);
420 }
421}
422 527
423sub update_labels {
424 my ($self) = @_;
425
426 my $text = $self->{entry}->get_text;
427
428 length $text
429 or return $self->emit ("close");
430
431 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
432
433 if ($cmd ne $self->{last_search}) {
434 my $regexp = do {
435 my ($beg, @chr) = split //, lc $cmd;
436
437 # the following regex is used to match our "completion entry"
438 # to an actual command - the parentheses match kind of "overhead"
439 # - the more characters the parentheses match, the less attractive
440 # is the match.
441 my $regexp = "^\Q$beg\E"
442 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
443 qr<$regexp>
444 };
445
446 my @match;
447 my @penalty;
448
449 for (keys %{$self->{command}}) {
450 if (@penalty = $_ =~ $regexp) {
451 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
452 }
453 }
454
455 @match = map $self->{command}{$_->[0]},
456 sort {
457 $a->[1] <=> $b->[1]
458 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
459 } @match;
460
461 $self->{last_search} = $cmd; 528 $self->{last_search} = $text;
462 $self->{last_match} = \@match; 529 $self->{last_match} = \@match;
463 530
464 $self->{select_offset} = 0; 531 $self->{select_offset} = 0;
465 } 532 }
466 533

Diff Legend

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