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.47 by root, Fri Jun 2 22:13:47 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
48 $::CFG->{map_shift_y} = $bh + $y - $oy; 71 $::CFG->{map_shift_y} = $bh + $y - $oy;
49 72
50 $self->update; 73 $self->update;
51 }; 74 };
52 } 75 }
76
77 1
53} 78}
54 79
55sub button_up { 80sub button_up {
56 my ($self, $ev, $x, $y) = @_; 81 my ($self, $ev, $x, $y) = @_;
57 82
58 delete $self->{motion}; 83 delete $self->{motion};
84
85 1
59} 86}
60 87
61sub mouse_motion { 88sub mouse_motion {
62 my ($self, $ev, $x, $y) = @_; 89 my ($self, $ev, $x, $y) = @_;
63 90
91 if ($self->{motion}) {
64 $self->{motion}->($ev, $x, $y) if $self->{motion}; 92 $self->{motion}->($ev, $x, $y);
93 } else {
94 return 0;
95 }
96
97 1
65} 98}
66 99
67sub size_request { 100sub size_request {
68 ( 101 (
69 1 + 32 * int $::WIDTH / 32, 102 1 + 32 * int $::WIDTH / 32,
76 109
77 $self->{need_update} = 1; 110 $self->{need_update} = 1;
78 $self->SUPER::update; 111 $self->SUPER::update;
79} 112}
80 113
114my %DIR = (
115 CFClient::SDLK_KP8, [1, "north"],
116 CFClient::SDLK_KP9, [2, "northeast"],
117 CFClient::SDLK_KP6, [3, "east"],
118 CFClient::SDLK_KP3, [4, "southeast"],
119 CFClient::SDLK_KP2, [5, "south"],
120 CFClient::SDLK_KP1, [6, "southwest"],
121 CFClient::SDLK_KP4, [7, "west"],
122 CFClient::SDLK_KP7, [8, "northwest"],
123
124 CFClient::SDLK_UP, [1, "north"],
125 CFClient::SDLK_RIGHT, [3, "east"],
126 CFClient::SDLK_DOWN, [5, "south"],
127 CFClient::SDLK_LEFT, [7, "west"],
128);
129
130sub key_down {
131 my ($self, $ev) = @_;
132
133 return 0 unless $::CONN;
134
135 my $mod = $ev->{mod};
136 my $sym = $ev->{sym};
137 my $uni = $ev->{unicode};
138
139 if ($sym == CFClient::SDLK_KP5) {
140 $::CONN->user_send ("stay fire");
141 } elsif ($uni == ord ",") {
142 $::CONN->user_send ("take");
143 } elsif ($uni == ord " ") {
144 $::CONN->user_send ("apply");
145 } elsif ($uni == ord ".") {
146 $::CONN->user_send ($self->{completer}{last_command})
147 if exists $self->{completer}{last_command};
148 } elsif ($uni == ord "\t") {
149 $::INV_WINDOW->toggle_visibility;
150 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
151 $::CONN->user_send ("rotateshoottype +");
152 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
153 $::CONN->user_send ("rotateshoottype -");
154 } elsif ($uni == ord '"') {
155 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
156 $self->{completer}->show;
157 } elsif ($uni == ord "'") {
158 $self->{completer}->set_prefix ("");
159 $self->{completer}->show;
160 } elsif (exists $DIR{$sym}) {
161 if ($mod & CFClient::KMOD_SHIFT) {
162 $self->{shft}++;
163 $::CONN->user_send ("fire $DIR{$sym}[0]");
164 } elsif ($mod & CFClient::KMOD_CTRL) {
165 $self->{ctrl}++;
166 $::CONN->user_send ("run $DIR{$sym}[0]");
167 } else {
168 $::CONN->user_send ("$DIR{$sym}[1]");
169 }
170 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
171 $::BIND_EDITOR->set_binding (undef, undef, [],
172 sub {
173 my ($mod, $sym, $cmds) = @_;
174 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
175 });
176 $::BIND_EDITOR->start;
177 $::BIND_EDITOR->show;
178 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
179 $::BIND_EDITOR->stop;
180 $::BIND_EDITOR->ask_for_bind_and_commit;
181 $::BIND_EDITOR->hide;
182 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
183 $::CONN->user_send ($_) for @$bind_cmd;
184 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
185 $self->{completer}->key_down ($ev);
186 $self->{completer}->show;
187 } else {
188 return 0;
189 }
190
191 1
192}
193
194sub key_up {
195 my ($self, $ev) = @_;
196
197 my $res = 0;
198 my $mod = $ev->{mod};
199 my $sym = $ev->{sym};
200
201 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
202 $::CONN->user_send ("fire_stop");
203 $res = 1;
204 }
205
206 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
207 $::CONN->user_send ("run_stop");
208 $res = 1;
209 }
210
211 $res
212}
213
81sub draw { 214sub draw {
82 my ($self) = @_; 215 my ($self) = @_;
83 216
217 my $focused = $CFClient::UI::FOCUS == $self
218 || $CFClient::UI::FOCUS == $self->{completer}{entry};
219
84 return 220 return
85 unless $CFClient::UI::FOCUS == $self || !$::FAST; 221 unless $focused || !$::FAST;
86 222
87 if (delete $self->{need_update}) { 223 if (delete $self->{need_update}) {
88 glNewList $self->{list}; 224 glNewList $self->{list};
89 225
90 if ($::MAP) { 226 if ($::MAP) {
100 glTranslate $sx0 - 32, $sy0 - 32, 0; 236 glTranslate $sx0 - 32, $sy0 - 32, 0;
101 237
102 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 238 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
103 239
104 if ($::CFG->{fow_enable}) { 240 if ($::CFG->{fow_enable}) {
105 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war 241 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); 242 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
107 glConvolutionFilter2D ( 243 glConvolutionFilter2D (
108 GL_CONVOLUTION_2D, 244 GL_CONVOLUTION_2D,
109 GL_ALPHA, 245 GL_ALPHA,
110 3, 3, 246 3, 3,
115 0.05, 0.13, 0.05, 251 0.05, 0.13, 0.05,
116 ); 252 );
117 glEnable GL_CONVOLUTION_2D; 253 glEnable GL_CONVOLUTION_2D;
118 } 254 }
119 255
256 $self->{fow_texture_name} ||= glGenTexture;
120 # try to re-use the texture name: TODO improve texture class instead 257 # try to re-use the texture name: TODO improve texture class instead
121 my $prev_name = ((delete $self->{fow_texture}) || {})->{name};
122 258
123 $self->{fow_texture} = new CFClient::Texture 259 $self->{fow_texture} = new CFClient::Texture
124 w => $w, 260 w => $w,
125 h => $h, 261 h => $h,
126 data => $data, 262 data => $data,
127 name => $prev_name, # a bit hackish 263 name => $self->{fow_texture_name},
128 internalformat => GL_ALPHA, 264 internalformat => GL_ALPHA,
129 format => GL_ALPHA; 265 format => GL_ALPHA;
130 266
131 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 267 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
132 268
148 glPushMatrix; 284 glPushMatrix;
149 glCallList $self->{list}; 285 glCallList $self->{list};
150 glPopMatrix; 286 glPopMatrix;
151 287
152 # TNT2 emulates logops in software (or worse :) 288 # TNT2 emulates logops in software (or worse :)
153 if ($CFClient::UI::FOCUS == $self) { 289 if ($focused) {
154 (delete $self->{out_of_focus})->destroy 290 (delete $self->{out_of_focus})->destroy
155 if $self->{out_of_focus}; 291 if $self->{out_of_focus};
156 } else { 292 } else {
157 glColor 0.4, 0.2, 0.2, 0.6; 293 glColor 0.4, 0.2, 0.2, 0.6;
158 glEnable GL_BLEND; 294 glEnable GL_BLEND;
163 glVertex $::WIDTH, $::HEIGHT; 299 glVertex $::WIDTH, $::HEIGHT;
164 glVertex $::WIDTH, 0; 300 glVertex $::WIDTH, 0;
165 glEnd; 301 glEnd;
166 glDisable GL_BLEND; 302 glDisable GL_BLEND;
167 303
168 $self->{out_of_focus} ||= do { 304# $self->{out_of_focus} ||= do {
169 my $label = new CFClient::UI::Label 305# my $label = new CFClient::UI::Label
170 x => 0, 306# x => 0,
171 y => 0, 307# y => 0,
172 z => 1, 308# z => 1,
173 ellipsise => 0, 309# ellipsise => 0,
174 text => "map out of focus (click map to play)"; 310# text => "map out of focus (click map to play)";
175 311#
176 $label->show; 312# $label->show;
177 $label->update; 313# $label->update;
178 314#
179 $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { 315# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
180 $label->move ( 316# $label->move_abs (
181 ($::WIDTH - $label->{w}) * 0.5, 317# ($::WIDTH - $label->{w}) * 0.5,
182 ($::HEIGHT - $label->{h}) * 0.5, 318# ($::HEIGHT - $label->{h}) * 0.5,
183 ); 319# );
184 }); 320# });
185 321#
186 $label 322# $label
187 }; 323# };
188 } 324 }
189} 325}
190 326
191my %DIR = ( 327sub 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) = @_; 328 my $self = shift;
292 329
293 %{$self->{command}} = (); 330 glDeleteList $self->{list};
331
332 $self->SUPER::DESTROY;
294} 333}
295 334
296package CFClient::MapWidget::MapMap; 335package CFClient::MapWidget::MapMap;
297 336
298our @ISA = CFClient::UI::Base::; 337our @ISA = CFClient::UI::Base::;
399 fontsize => $_, 438 fontsize => $_,
400 ), (0.8) x 16 439 ), (0.8) x 16
401 ]; 440 ];
402 441
403 $self->{entry} = new CFClient::UI::Entry 442 $self->{entry} = new CFClient::UI::Entry
404 connect_changed => sub { 443 on_changed => sub {
405 $self->update_labels; 444 $self->update_labels;
445 },
446 on_key_down => sub {
447 my ($entry, $ev) = @_;
448
449 my $self = $entry->{parent}{parent};
450
451 if ($ev->{sym} == 13) {
452 if (exists $self->{select}) {
453 $self->{last_command} = $self->{select};
454 $::CONN->user_send ($self->{select});
455 $self->hide;
456 }
457 } elsif ($ev->{sym} == 27) {
458 $self->hide;
459 return;
460 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
461 ++$self->{select_offset}
462 if $self->{select_offset} < $#{ $self->{last_match} || [] };
463 $self->update_labels;
464 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
465 --$self->{select_offset}
466 if $self->{select_offset};
467 $self->update_labels;
468 } else {
469 return 0;
470 }
471
472 1
406 }; 473 }
474 ;
407 475
408 $self->{vbox}->add ( 476 $self->{vbox}->add (
409 $self->{entry}, 477 $self->{entry},
410 @{$self->{label}}, 478 @{$self->{label}},
411 ); 479 );
412 480
413 $self 481 $self
414} 482}
415 483
484sub set_prefix {
485 my ($self, $prefix) = @_;
486
487 $self->{entry}->set_text ($prefix);
488 $self->show;
489}
490
416sub size_allocate { 491sub size_allocate {
417 my ($self, $w, $h) = @_; 492 my ($self, $w, $h) = @_;
418 493
419 $self->SUPER::size_allocate ($w, $h); 494 $self->SUPER::size_allocate ($w, $h);
420 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 495 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
496}
497
498sub show {
499 my ($self) = @_;
500
501 $self->SUPER::show;
502 $self->{entry}->focus_in;
503}
504
505sub hide {
506 my ($self) = @_;
507
508 $self->SUPER::hide;
509 $self->{entry}->set_text ("");
421} 510}
422 511
423sub key_down { 512sub key_down {
424 my ($self, $ev) = @_; 513 my ($self, $ev) = @_;
425 514
426 if ($ev->{sym} == 13) { 515 $self->{entry}->key_down ($ev)
427 if (exists $self->{select}) { 516}
428 $self->emit (execute => $self->{select}); 517
429 $self->emit ("close"); 518sub update_labels {
519 my ($self) = @_;
520
521 my $text = $self->{entry}->get_text;
522
523 length $text
524 or return $self->hide;
525
526 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
527
528 if ($text ne $self->{last_search}) {
529 my @match;
530
531 if ($text =~ /^(.*?)\s+$/) {
532 @match = [$cmd, "(appended whitespace suppresses completion)"];
533 } else {
534 my $regexp = do {
535 my ($beg, @chr) = split //, lc $cmd;
536
537 # the following regex is used to match our "completion entry"
538 # to an actual command - the parentheses match kind of "overhead"
539 # - the more characters the parentheses match, the less attractive
540 # is the match.
541 my $regexp = "^\Q$beg\E"
542 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
543 qr<$regexp>
544 };
545
546 my @penalty;
547
548 for (keys %{$self->{command}}) {
549 if (@penalty = $_ =~ $regexp) {
550 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
551 }
552 }
553
554 @match = map $self->{command}{$_->[0]},
555 sort {
556 $a->[1] <=> $b->[1]
557 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
558 or (length $b->[0]) <=> (length $a->[0])
559 } @match;
430 } 560 }
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 561
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; 562 $self->{last_search} = $text;
489 $self->{last_match} = \@match; 563 $self->{last_match} = \@match;
490 564
491 $self->{select_offset} = 0; 565 $self->{select_offset} = 0;
492 } 566 }
493 567

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines