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.16 by root, Mon Apr 24 13:04:31 2006 UTC vs.
Revision 1.47 by root, Fri Jun 2 22:13:47 2006 UTC

… …
10our @ISA = CFClient::UI::Base::; 10our @ISA = CFClient::UI::Base::;
11 11
12sub new { 12sub new {
13 my $class = shift; 13 my $class = shift;
14 14
15 $class->SUPER::new ( 15 my $self = $class->SUPER::new (
16 z => -1, 16 z => -1,
17 can_focus => 1, 17 can_focus => 1,
18 list => glGenList, 18 list => glGenList,
19 @_ 19 @_
20 ) 20 );
21}
22 21
23sub DESTROY { 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
35 $self
36}
37
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 {
24 my $self = shift; 51 my ($self) = @_;
25 52
26 glDeleteList $self->{list}; 53 %{$self->{completer}{command}} = ();
27
28 $self->SUPER::DESTROY;
29} 54}
30 55
31sub button_down { 56sub button_down {
32 my ($self, $ev, $x, $y) = @_; 57 my ($self, $ev, $x, $y) = @_;
33 58
… …
46 $::CFG->{map_shift_y} = $bh + $y - $oy; 71 $::CFG->{map_shift_y} = $bh + $y - $oy;
47 72
48 $self->update; 73 $self->update;
49 }; 74 };
50 } 75 }
76
77 1
51} 78}
52 79
53sub button_up { 80sub button_up {
54 my ($self, $ev, $x, $y) = @_; 81 my ($self, $ev, $x, $y) = @_;
55 82
56 delete $self->{motion}; 83 delete $self->{motion};
84
85 1
57} 86}
58 87
59sub mouse_motion { 88sub mouse_motion {
60 my ($self, $ev, $x, $y) = @_; 89 my ($self, $ev, $x, $y) = @_;
61 90
91 if ($self->{motion}) {
62 $self->{motion}->($ev, $x, $y) if $self->{motion}; 92 $self->{motion}->($ev, $x, $y);
93 } else {
94 return 0;
95 }
96
97 1
63} 98}
64 99
65sub size_request { 100sub size_request {
66 ( 101 (
67 1 + 32 * int $::WIDTH / 32, 102 1 + 32 * int $::WIDTH / 32,
… …
74 109
75 $self->{need_update} = 1; 110 $self->{need_update} = 1;
76 $self->SUPER::update; 111 $self->SUPER::update;
77} 112}
78 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
79sub draw { 214sub draw {
80 my ($self) = @_; 215 my ($self) = @_;
216
217 my $focused = $CFClient::UI::FOCUS == $self
218 || $CFClient::UI::FOCUS == $self->{completer}{entry};
219
220 return
221 unless $focused || !$::FAST;
81 222
82 if (delete $self->{need_update}) { 223 if (delete $self->{need_update}) {
83 glNewList $self->{list}; 224 glNewList $self->{list};
84 225
85 if ($::MAP) { 226 if ($::MAP) {
86 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}); 227 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
87 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}); 228 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
229
230 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
231 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
88 232
89 glPushMatrix; 233 glPushMatrix;
90 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 234 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
91 235
92 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
93 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
94
95 glTranslate $sx0 - 32, $sy0 - 32, 0; 236 glTranslate $sx0 - 32, $sy0 - 32, 0;
96 237
97 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);
98 239
99 if ($::CFG->{fow_enable}) { 240 if ($::CFG->{fow_enable}) {
100 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
101 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 242 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
102 glConvolutionFilter2D ( 243 glConvolutionFilter2D (
103 GL_CONVOLUTION_2D, 244 GL_CONVOLUTION_2D,
104 GL_ALPHA, 245 GL_ALPHA,
105 3, 3, 246 3, 3,
… …
110 0.05, 0.13, 0.05, 251 0.05, 0.13, 0.05,
111 ); 252 );
112 glEnable GL_CONVOLUTION_2D; 253 glEnable GL_CONVOLUTION_2D;
113 } 254 }
114 255
256 $self->{fow_texture_name} ||= glGenTexture;
257 # try to re-use the texture name: TODO improve texture class instead
258
115 $self->{fow_texture} = new CFClient::Texture 259 $self->{fow_texture} = new CFClient::Texture
116 w => $w, 260 w => $w,
117 h => $h, 261 h => $h,
118 data => $data, 262 data => $data,
263 name => $self->{fow_texture_name},
119 internalformat => GL_ALPHA, 264 internalformat => GL_ALPHA,
120 format => GL_ALPHA; 265 format => GL_ALPHA;
121 266
122 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 267 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
123 268
124 glEnable GL_BLEND;
125 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
126 glEnable GL_TEXTURE_2D; 269 glEnable GL_TEXTURE_2D;
127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 270 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
128 271
129 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 272 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
130 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 273 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
131 274
132 glDisable GL_TEXTURE_2D; 275 glDisable GL_TEXTURE_2D;
133 glDisable GL_BLEND;
134 } 276 }
135 277
136 # HACK BEGIN
137 {
138 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
139
140 glTranslate 0, 30;
141 my ($w, $h) = (250, 250);
142
143 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
144
145 glEnable GL_BLEND;
146 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
147 glEnable GL_TEXTURE_2D;
148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
149
150 glPopMatrix; 278 glPopMatrix;
151
152 $self->{mapmap_texture} =
153 new CFClient::Texture
154 w => $w,
155 h => $h,
156 data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
157 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
158
159 $self->{mapmap_texture}->draw_quad (0, 0);
160
161 glDisable GL_TEXTURE_2D;
162
163 glTranslate 0.375, 0.375;
164
165 glColor 1, 1, 0, 1;
166 glBegin GL_LINE_LOOP;
167 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
168 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
169 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
170 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
171 glEnd;
172
173 glDisable GL_BLEND;
174 }
175 # HACK END
176 } 279 }
177 280
178 glEndList; 281 glEndList;
179 } 282 }
180 283
181 glPushMatrix; 284 glPushMatrix;
182 glCallList $self->{list}; 285 glCallList $self->{list};
183 glPopMatrix; 286 glPopMatrix;
184 287
185 if ($CFClient::UI::FOCUS != $self) { 288 # TNT2 emulates logops in software (or worse :)
186 glColor 64/255, 64/255, 64/255; 289 if ($focused) {
187 glLogicOp GL_AND; 290 (delete $self->{out_of_focus})->destroy
188 glEnable GL_COLOR_LOGIC_OP; 291 if $self->{out_of_focus};
292 } else {
293 glColor 0.4, 0.2, 0.2, 0.6;
294 glEnable GL_BLEND;
295 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
189 glBegin GL_QUADS; 296 glBegin GL_QUADS;
190 glVertex 0, 0; 297 glVertex 0, 0;
191 glVertex 0, $::HEIGHT; 298 glVertex 0, $::HEIGHT;
192 glVertex $::WIDTH, $::HEIGHT; 299 glVertex $::WIDTH, $::HEIGHT;
193 glVertex $::WIDTH, 0; 300 glVertex $::WIDTH, 0;
194 glEnd; 301 glEnd;
195 glDisable GL_COLOR_LOGIC_OP; 302 glDisable GL_BLEND;
303
304# $self->{out_of_focus} ||= do {
305# my $label = new CFClient::UI::Label
306# x => 0,
307# y => 0,
308# z => 1,
309# ellipsise => 0,
310# text => "map out of focus (click map to play)";
311#
312# $label->show;
313# $label->update;
314#
315# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
316# $label->move_abs (
317# ($::WIDTH - $label->{w}) * 0.5,
318# ($::HEIGHT - $label->{h}) * 0.5,
319# );
320# });
321#
322# $label
323# };
324 }
325}
326
327sub DESTROY {
328 my $self = shift;
329
330 glDeleteList $self->{list};
331
332 $self->SUPER::DESTROY;
333}
334
335package CFClient::MapWidget::MapMap;
336
337our @ISA = CFClient::UI::Base::;
338
339use Time::HiRes qw(time);
340use CFClient::OpenGL;
341
342sub size_request {
343 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
344}
345
346sub size_allocate {
347 my ($self, $w, $h) = @_;
348
349 $self->SUPER::size_allocate ($w, $h);
350 $self->update;
351}
352
353sub update {
354 my ($self) = @_;
355
356 delete $self->{texture_atime};
357 $self->SUPER::update;
358}
359
360sub _draw {
361 my ($self) = @_;
362
363 $::MAP or return;
364
365 my ($w, $h) = @$self{qw(w h)};
366
367 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
368 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
369
370 my $sx = int $::CFG->{map_shift_x} / 32;
371 my $sy = int $::CFG->{map_shift_y} / 32;
372
373 my $ox = 0.5 * ($w - $sw);
374 my $oy = 0.5 * ($h - $sh);
375
376 glEnable GL_BLEND;
377 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
378 glEnable GL_TEXTURE_2D;
379 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
380
381 if ($self->{texture_atime} < time) {
382 $self->{texture_atime} = time + 1/3;
383
384 $self->{texture} =
385 new CFClient::Texture
386 w => $w,
387 h => $h,
388 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
389 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
390 }
391
392 $self->{texture}->draw_quad (0, 0);
393
394 glDisable GL_TEXTURE_2D;
395
396 glTranslate 0.375, 0.375;
397
398 #TODO: map scale is completely borked
399
400 my $x0 = int $ox - $sx + 0.5;
401 my $y0 = int $oy - $sy + 0.5;
402
403 glColor 1, 1, 0, 1;
404 glBegin GL_LINE_LOOP;
405 glVertex $x0 , $y0 ;
406 glVertex $x0 , $y0 + $sh;
407 glVertex $x0 + $sw, $y0 + $sh;
408 glVertex $x0 + $sw, $y0 ;
409 glEnd;
196 } 410
411 glDisable GL_BLEND;
197} 412}
198 413
199my %DIR = ( 414package CFClient::MapWidget::Command;
200 CFClient::SDLK_KP8, [1, "north"],
201 CFClient::SDLK_KP9, [2, "northeast"],
202 CFClient::SDLK_KP6, [3, "east"],
203 CFClient::SDLK_KP3, [4, "southeast"],
204 CFClient::SDLK_KP2, [5, "south"],
205 CFClient::SDLK_KP1, [6, "southwest"],
206 CFClient::SDLK_KP4, [7, "west"],
207 CFClient::SDLK_KP7, [8, "northwest"],
208 415
209 CFClient::SDLK_UP, [1, "north"], 416use strict;
210 CFClient::SDLK_RIGHT, [3, "east"], 417
211 CFClient::SDLK_DOWN, [5, "south"], 418use CFClient::OpenGL;
212 CFClient::SDLK_LEFT, [7, "west"], 419
213); 420our @ISA = CFClient::UI::Frame::;
421
422sub new {
423 my $class = shift;
424
425 my $self = $class->SUPER::new (
426 bg => [0, 0, 0, 0.8],
427 @_,
428 );
429
430 $self->add ($self->{vbox} = new CFClient::UI::VBox);
431
432 $self->{label} = [
433 map
434 CFClient::UI::Label->new (
435 can_hover => 1,
436 can_events => 1,
437 tooltip_width => 0.33,
438 fontsize => $_,
439 ), (0.8) x 16
440 ];
441
442 $self->{entry} = new CFClient::UI::Entry
443 on_changed => sub {
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
473 }
474 ;
475
476 $self->{vbox}->add (
477 $self->{entry},
478 @{$self->{label}},
479 );
480
481 $self
482}
483
484sub set_prefix {
485 my ($self, $prefix) = @_;
486
487 $self->{entry}->set_text ($prefix);
488 $self->show;
489}
490
491sub size_allocate {
492 my ($self, $w, $h) = @_;
493
494 $self->SUPER::size_allocate ($w, $h);
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 ("");
510}
214 511
215sub key_down { 512sub key_down {
216 my ($self, $ev) = @_; 513 my ($self, $ev) = @_;
217 514
218 my $mod = $ev->{mod}; 515 $self->{entry}->key_down ($ev)
219 my $sym = $ev->{sym}; 516}
220 517
221 if ($sym == CFClient::SDLK_KP5) { 518sub update_labels {
222 $::CONN->user_send ("stay fire"); 519 my ($self) = @_;
223 } elsif ($sym == ord ",") { 520
224 $::CONN->user_send ("take"); 521 my $text = $self->{entry}->get_text;
225 } elsif ($sym == ord "a") { 522
226 $::CONN->user_send ("apply"); 523 length $text
227 } elsif ($sym == ord "'") { 524 or return $self->hide;
228 $self->emit ('activate_console'); 525
229 } elsif ($sym == ord "/") { 526 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
230 $self->emit (activate_console => '/'); 527
231 } elsif (exists $DIR{$sym}) { 528 if ($text ne $self->{last_search}) {
232 if ($mod & CFClient::KMOD_SHIFT) { 529 my @match;
233 $self->{shft}++; 530
234 $::CONN->user_send ("fire $DIR{$sym}[0]"); 531 if ($text =~ /^(.*?)\s+$/) {
235 } elsif ($mod & CFClient::KMOD_CTRL) { 532 @match = [$cmd, "(appended whitespace suppresses completion)"];
236 $self->{ctrl}++;
237 $::CONN->user_send ("run $DIR{$sym}[0]");
238 } else { 533 } else {
239 $::CONN->user_send ("$DIR{$sym}[1]"); 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;
240 } 560 }
241 } elsif ($ev->{unicode}) {
242 $self->{command_widget} ||=
243 new CFClient::MapWidget::Command::
244 command => $self->{command},
245 can_focus => 1,
246 connect_execute => sub {
247 # todo: support callback instead of user_send
248 $::CONN->user_send ($_[1][1]);
249 },
250 connect_close => sub {
251 (delete $self->{command_widget})->hide;
252 $self->focus_in;
253 },
254 ;
255 $self->{command_widget}->key_down ($ev);
256 return unless $self->{command_widget};
257 $self->{command_widget}->show;
258 $self->{command_widget}->focus_in;
259 }
260}
261 561
262sub key_up { 562 $self->{last_search} = $text;
263 my ($self, $ev) = @_; 563 $self->{last_match} = \@match;
264 564
265 my $mod = $ev->{mod}; 565 $self->{select_offset} = 0;
266 my $sym = $ev->{sym};
267
268 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
269 $::CONN->user_send ("fire_stop");
270 } 566 }
271 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
272 $::CONN->user_send ("run_stop");
273 }
274}
275 567
276sub add_command { 568 my @labels = @{ $self->{label} };
277 my ($self, $command, $tooltip, $widget, $cb) = @_; 569 my @matches = @{ $self->{last_match} || [] };
278 570
279 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; 571 if ($self->{select_offset}) {
572 splice @matches, 0, $self->{select_offset}, ();
280 573
281 push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb]; 574 my $label = shift @labels;
282} 575 $label->set_text ("...");
576 $label->set_tooltip ("Use Cursor-Up to view previous matches");
577 }
283 578
284package CFClient::MapWidget::Command; 579 for my $label (@labels) {
580 $label->{fg} = [1, 1, 1, 1];
581 $label->{bg} = [0, 0, 0, 0];
582 }
285 583
286use strict; 584 if (@matches) {
585 $self->{select} = "$matches[0][0]$arg";
287 586
288use CFClient::OpenGL; 587 $labels[0]->{fg} = [0, 0, 0, 1];
588 $labels[0]->{bg} = [1, 1, 1, 0.8];
589 } else {
590 $self->{select} = "$cmd$arg";
591 }
289 592
290our @ISA = CFClient::UI::VBox::; 593 for my $match (@matches) {
594 my $label = shift @labels;
291 595
292sub new { 596 if (@labels) {
293 my $class = shift; 597 $label->set_text ("$match->[0]$arg");
294 598 $label->set_tooltip ($match->[1]);
295 my $self = $class->SUPER::new ( 599 } else {
296 @_, 600 $label->set_text ("...");
297 children => [map 601 $label->set_tooltip ("Use Cursor-Down to view more matches");
298 CFClient::UI::Label->new ( 602 last;
299 can_hover => 1,
300 can_events => 1,
301 fontsize => $_,
302 ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8
303 ],
304 );
305
306 $self
307}
308
309sub size_allocate {
310 my ($self, $w, $h) = @_;
311
312 $self->SUPER::size_allocate ($w, $h);
313 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
314}
315
316sub update_labels {
317 my ($self) = @_;
318
319 my $command = $self->{command};
320 my $search_abbrev = qr/^\Q$self->{search}/;
321 my $search_full = qr/\Q$self->{search}/;
322
323 my @found;
324
325 for (@$command) {
326 if ($_->[0] =~ $search_abbrev) {
327 push @found, [$_->[0], $_];
328 } elsif ($_->[1] =~ $search_full) {
329 push @found, [$_->[1], $_];
330 } 603 }
331 } 604 }
332 605
333 @found = sort { $a->[0] cmp $b->[0] } @found; 606 for my $label (@labels) {
334 607 $label->set_text ("");
335 $self->{children}[0]->set_text ("$self->{search}_"); 608 $label->set_tooltip ("");
336
337 for (0..5) {
338 $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
339 $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
340 } 609 }
341 610
342 $self->{select} = $found[0][1] 611 $self->update;
343 if @found; 612 ###
344
345 if (@found > 6) {
346 $self->{children}[6]->set_text ("...");
347 }
348
349 $self->check_size;
350} 613}
351 614
352sub key_down { 615sub _draw {
353 my ($self, $ev) = @_; 616 my ($self) = @_;
354 617
355 if ($ev->{sym} == 8) { 618 # hack
356 substr $self->{search}, -1, 1, ""; 619 local $CFClient::UI::FOCUS = $self->{entry};
357 $self->update_labels;
358 } elsif ($ev->{sym} == 13) {
359 if (exists $self->{select}) {
360 $self->emit (execute => $self->{select});
361 $self->emit ("close");
362 }
363 } elsif ($ev->{sym} == 27) {
364 $self->emit ("close");
365 return;
366 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
367 $self->{search} .= chr $ev->{unicode};
368 $self->update_labels;
369 }
370 620
371 length $self->{search} 621 $self->SUPER::_draw;
372 or $self->emit ("close");
373} 622}
374 623
3751 6241

Diff Legend

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