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.2 by root, Wed Apr 19 09:40:00 2006 UTC vs.
Revision 1.56 by root, Mon Jun 12 13:26:14 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 SDL; 8use CFClient::OpenGL;
8use SDL::OpenGL;
9 9
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 => (glGenLists 1), 18 list => glGenList,
19
20 smooth_matrix => [
21 0.05, 0.13, 0.05,
22 0.13, 0.30, 0.13,
23 0.05, 0.13, 0.05,
24 ],
25
19 @_ 26 @_
20 ) 27 );
21}
22 28
23sub key_down { 29 $self->{completer} = new CFClient::MapWidget::Command::
24 print "MAPKEYDOWN\n"; 30 command => $self->{command},
25} 31 can_focus => 1,
32 tooltip => "<b>The Command Completer</b>\n\n"
33 . "This is your central interface to send text commands to the server. "
34 . "To enter a verbatim command to send to the server, just type the command, "
35 . "followed by a space, and press return. "
36 . "Typing the initial letters of words (or just any letters) displays guesses "
37 . "for commands you might want to use.\n"
38 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
39 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
40 ;
26 41
27sub key_up { 42 $self
43}
44
45sub add_command {
46 my ($self, $command, $tooltip, $widget, $cb) = @_;
47
48 (my $data = $command) =~ s/\\//g;
49
50 $tooltip =~ s/^\s+//;
51 $tooltip = "<big>$data</big>\n\n$tooltip";
52 $tooltip =~ s/\s+$//;
53
54 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
55}
56
57sub clr_commands {
58 my ($self) = @_;
59
60 %{$self->{completer}{command}} = ();
28} 61}
29 62
30sub button_down { 63sub button_down {
31 my ($self, $ev, $x, $y) = @_; 64 my ($self, $ev, $x, $y) = @_;
32 65
33 $self->focus_in; 66 $self->focus_in;
34 67
35 if ($ev->button == 2) { 68 if ($ev->{button} == 1) {
69 my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale});
70 my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale});
71
72 $x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
73 $y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
74
75 $x -= int 0.5 * $::MAP->w;
76 $y -= int 0.5 * $::MAP->h;
77
78 $x += 1;
79 $y += 1;
80
81 $::CONN->lookat ($x, $y)
82 if $::CONN;
83
84 } elsif ($ev->{button} == 2) {
36 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 85 my ($ox, $oy) = ($ev->{x}, $ev->{y});
37 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
38 87
39 $self->{motion} = sub { 88 $self->{motion} = sub {
40 my ($ev, $x, $y) = @_; 89 my ($ev, $x, $y) = @_;
41 90
42 ($x, $y) = ($ev->motion_x, $ev->motion_y); 91 ($x, $y) = ($ev->{x}, $ev->{y});
43 92
44 $::CFG->{map_shift_x} = $bw + $x - $ox; 93 $::CFG->{map_shift_x} = $bw + $x - $ox;
45 $::CFG->{map_shift_y} = $bh + $y - $oy; 94 $::CFG->{map_shift_y} = $bh + $y - $oy;
46 95
47 $self->update; 96 $self->update;
48 }; 97 };
49 } 98 }
99
100 1
50} 101}
51 102
52sub button_up { 103sub button_up {
53 my ($self, $ev, $x, $y) = @_; 104 my ($self, $ev, $x, $y) = @_;
54 105
55 delete $self->{motion}; 106 delete $self->{motion};
107
108 1
56} 109}
57 110
58sub mouse_motion { 111sub mouse_motion {
59 my ($self, $ev, $x, $y) = @_; 112 my ($self, $ev, $x, $y) = @_;
60 113
114 if ($self->{motion}) {
61 $self->{motion}->($ev, $x, $y) if $self->{motion}; 115 $self->{motion}->($ev, $x, $y);
116 } else {
117 return 0;
118 }
119
120 1
62} 121}
63 122
64sub size_request { 123sub size_request {
65 ( 124 (
66 1 + 32 * int $::WIDTH / 32, 125 1 + 32 * int $::WIDTH / 32,
… …
73 132
74 $self->{need_update} = 1; 133 $self->{need_update} = 1;
75 $self->SUPER::update; 134 $self->SUPER::update;
76} 135}
77 136
137my %DIR = (
138 CFClient::SDLK_KP8, [1, "north"],
139 CFClient::SDLK_KP9, [2, "northeast"],
140 CFClient::SDLK_KP6, [3, "east"],
141 CFClient::SDLK_KP3, [4, "southeast"],
142 CFClient::SDLK_KP2, [5, "south"],
143 CFClient::SDLK_KP1, [6, "southwest"],
144 CFClient::SDLK_KP4, [7, "west"],
145 CFClient::SDLK_KP7, [8, "northwest"],
146
147 CFClient::SDLK_UP, [1, "north"],
148 CFClient::SDLK_RIGHT, [3, "east"],
149 CFClient::SDLK_DOWN, [5, "south"],
150 CFClient::SDLK_LEFT, [7, "west"],
151);
152
153sub key_down {
154 my ($self, $ev) = @_;
155
156 return 0 unless $::CONN;
157
158 my $mod = $ev->{mod};
159 my $sym = $ev->{sym};
160 my $uni = $ev->{unicode};
161
162 if ($sym == CFClient::SDLK_KP5) {
163 $::CONN->user_send ("stay fire");
164 } elsif ($uni == ord ",") {
165 $::CONN->user_send ("take");
166 } elsif ($uni == ord " ") {
167 $::CONN->user_send ("apply");
168 } elsif ($uni == ord ".") {
169 $::CONN->user_send ($self->{completer}{last_command})
170 if exists $self->{completer}{last_command};
171 } elsif ($uni == ord "\t") {
172 $::INV_WINDOW->toggle_visibility;
173 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
174 $::CONN->user_send ("rotateshoottype +");
175 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
176 $::CONN->user_send ("rotateshoottype -");
177 } elsif ($uni == ord '"') {
178 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
179 $self->{completer}->show;
180 } elsif ($uni == ord "'") {
181 $self->{completer}->set_prefix ("");
182 $self->{completer}->show;
183 } elsif (exists $DIR{$sym}) {
184 if ($mod & CFClient::KMOD_SHIFT) {
185 $self->{shft}++;
186 $::CONN->user_send ("fire $DIR{$sym}[0]");
187 } elsif ($mod & CFClient::KMOD_CTRL) {
188 $self->{ctrl}++;
189 $::CONN->user_send ("run $DIR{$sym}[0]");
190 } else {
191 $::CONN->user_send ("$DIR{$sym}[1]");
192 }
193 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
194 $::BIND_EDITOR->set_binding (undef, undef, [],
195 sub {
196 my ($mod, $sym, $cmds) = @_;
197 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
198 });
199 $::BIND_EDITOR->start;
200 $::BIND_EDITOR->show;
201 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
202 $::BIND_EDITOR->stop;
203 $::BIND_EDITOR->ask_for_bind_and_commit;
204 $::BIND_EDITOR->hide;
205 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
206 $::CONN->user_send ($_) for @$bind_cmd;
207 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
208 $self->{completer}->key_down ($ev);
209 $self->{completer}->show;
210 } else {
211 return 0;
212 }
213
214 1
215}
216
217sub key_up {
218 my ($self, $ev) = @_;
219
220 my $res = 0;
221 my $mod = $ev->{mod};
222 my $sym = $ev->{sym};
223
224 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
225 $::CONN->user_send ("fire_stop");
226 $res = 1;
227 }
228
229 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
230 $::CONN->user_send ("run_stop");
231 $res = 1;
232 }
233
234 $res
235}
236
78sub draw { 237sub draw {
79 my ($self) = @_; 238 my ($self) = @_;
80 239
240 my $focused = $CFClient::UI::FOCUS == $self
241 || $CFClient::UI::FOCUS == $self->{completer}{entry};
242
243 return
244 unless $focused || !$::FAST;
245
81 if (delete $self->{need_update}) { 246 if (delete $self->{need_update}) {
82 glNewList $self->{list}, GL_COMPILE; 247 glNewList $self->{list};
83 248
84 if ($::MAP) { 249 if ($::MAP) {
85 my $sw = int $::WIDTH / 32; 250 my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
86 my $sh = int $::HEIGHT / 32; 251 my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
87 252
88 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; 253 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};
89 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; 254 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale};
255 my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;
256 my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
90 257
258 glPushMatrix;
259 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
260
91 glTranslate $sx0 - 32, $sy0 - 32, 0; 261 glTranslate $sx0, $sy0;
92 262
93 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 263 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
94 264
95 if ($::CFG->{fow_enable}) { 265 if ($::CFG->{fow_enable}) {
96 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war 266 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
97 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 267 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
98 glConvolutionFilter2D ( 268 glConvolutionFilter2D (
99 GL_CONVOLUTION_2D, 269 GL_CONVOLUTION_2D,
100 GL_ALPHA, 270 GL_ALPHA,
101 3, 3, 271 3, 3,
102 GL_ALPHA, GL_FLOAT, 272 GL_ALPHA, GL_FLOAT,
103 pack "f*", 273 (pack "f*", @{ $self->{smooth_matrix} }),
104 0.1, 0.1, 0.1,
105 0.1, 0.2, 0.1,
106 0.1, 0.1, 0.1,
107 ); 274 );
108 glEnable GL_CONVOLUTION_2D; 275 glEnable GL_CONVOLUTION_2D;
109 } 276 }
277
278 $self->{fow_texture_name} ||= glGenTexture;
279 # try to re-use the texture name: TODO improve texture class instead
110 280
111 $self->{fow_texture} = new CFClient::Texture 281 $self->{fow_texture} = new CFClient::Texture
112 w => $w, 282 w => $w,
113 h => $h, 283 h => $h,
114 data => $data, 284 data => $data,
285 name => $self->{fow_texture_name},
115 internalformat => GL_ALPHA, 286 internalformat => GL_ALPHA,
116 format => GL_ALPHA; 287 format => GL_ALPHA;
117 288
118 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 289 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
119 290
120 glEnable GL_BLEND;
121 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
122 glEnable GL_TEXTURE_2D; 291 glEnable GL_TEXTURE_2D;
123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 292 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
124 293
125 glColor +($::CFG->{fow_intensity}) x 3, 1; 294 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
126 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 295 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
127 296
128 glDisable GL_TEXTURE_2D; 297 glDisable GL_TEXTURE_2D;
129 glDisable GL_BLEND;
130 } 298 }
131 299
132 # HACK BEGIN 300 glPopMatrix;
133 {
134 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
135 my ($w, $h) = (250, 250);
136
137 glEnable GL_BLEND;
138 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
139 glEnable GL_TEXTURE_2D;
140 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
141
142 $self->{mapmap_texture} =
143 new CFClient::Texture
144 w => $w,
145 h => $h,
146 data => $::MAP->mapmap ($w, $h),
147 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
148
149 $self->{mapmap_texture}->draw_quad (100, 100);
150
151 glDisable GL_TEXTURE_2D;
152 glDisable GL_BLEND;
153 }
154 # HACK END
155 } 301 }
156 302
157 glEndList; 303 glEndList;
158 } 304 }
159 305
160 glPushMatrix; 306 glPushMatrix;
161 glCallList $self->{list}; 307 glCallList $self->{list};
162 glPopMatrix; 308 glPopMatrix;
163 309
164 if ($CFClient::UI::FOCUS != $self) { 310 # TNT2 emulates logops in software (or worse :)
165 glColor 64/255, 64/255, 64/255; 311 if ($focused) {
166 glLogicOp GL_AND; 312 (delete $self->{out_of_focus})->destroy
167 glEnable GL_COLOR_LOGIC_OP; 313 if $self->{out_of_focus};
314 } else {
315 glColor 0.4, 0.2, 0.2, 0.6;
316 glEnable GL_BLEND;
317 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
168 glBegin GL_QUADS; 318 glBegin GL_QUADS;
169 glVertex 0, 0; 319 glVertex 0, 0;
170 glVertex 0, $::HEIGHT; 320 glVertex 0, $::HEIGHT;
171 glVertex $::WIDTH, $::HEIGHT; 321 glVertex $::WIDTH, $::HEIGHT;
172 glVertex $::WIDTH, 0; 322 glVertex $::WIDTH, 0;
173 glEnd; 323 glEnd;
174 glDisable GL_COLOR_LOGIC_OP; 324 glDisable GL_BLEND;
325
326# $self->{out_of_focus} ||= do {
327# my $label = new CFClient::UI::Label
328# x => 0,
329# y => 0,
330# z => 1,
331# ellipsise => 0,
332# text => "map out of focus (click map to play)";
333#
334# $label->show;
335# $label->update;
336#
337# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
338# $label->move_abs (
339# ($::WIDTH - $label->{w}) * 0.5,
340# ($::HEIGHT - $label->{h}) * 0.5,
341# );
342# });
343#
344# $label
345# };
346 }
347}
348
349sub DESTROY {
350 my $self = shift;
351
352 glDeleteList $self->{list};
353
354 $self->SUPER::DESTROY;
355}
356
357package CFClient::MapWidget::MapMap;
358
359our @ISA = CFClient::UI::Base::;
360
361use Time::HiRes qw(time);
362use CFClient::OpenGL;
363
364sub size_request {
365 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
366}
367
368sub size_allocate {
369 my ($self, $w, $h) = @_;
370
371 $self->SUPER::size_allocate ($w, $h);
372 $self->update;
373}
374
375sub update {
376 my ($self) = @_;
377
378 delete $self->{texture_atime};
379 $self->SUPER::update;
380}
381
382sub _draw {
383 my ($self) = @_;
384
385 $::MAP or return;
386
387 my ($w, $h) = @$self{qw(w h)};
388
389 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
390 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
391
392 my $sx = int $::CFG->{map_shift_x} / 32;
393 my $sy = int $::CFG->{map_shift_y} / 32;
394
395 my $ox = 0.5 * ($w - $sw);
396 my $oy = 0.5 * ($h - $sh);
397
398 glEnable GL_BLEND;
399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
400 glEnable GL_TEXTURE_2D;
401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
402
403 if ($self->{texture_atime} < time) {
404 $self->{texture_atime} = time + 1/3;
405
406 $self->{texture} =
407 new CFClient::Texture
408 w => $w,
409 h => $h,
410 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
411 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
412 }
413
414 $self->{texture}->draw_quad (0, 0);
415
416 glDisable GL_TEXTURE_2D;
417
418 glTranslate 0.375, 0.375;
419
420 #TODO: map scale is completely borked
421
422 my $x0 = int $ox - $sx + 0.5;
423 my $y0 = int $oy - $sy + 0.5;
424
425 glColor 1, 1, 0, 1;
426 glBegin GL_LINE_LOOP;
427 glVertex $x0 , $y0 ;
428 glVertex $x0 , $y0 + $sh;
429 glVertex $x0 + $sw, $y0 + $sh;
430 glVertex $x0 + $sw, $y0 ;
431 glEnd;
175 } 432
433 glDisable GL_BLEND;
176} 434}
177 435
178my %DIR = ( 436package CFClient::MapWidget::Command;
179 SDLK_KP8, [1, "north"],
180 SDLK_KP9, [2, "northeast"],
181 SDLK_KP6, [3, "east"],
182 SDLK_KP3, [4, "southeast"],
183 SDLK_KP2, [5, "south"],
184 SDLK_KP1, [6, "southwest"],
185 SDLK_KP4, [7, "west"],
186 SDLK_KP7, [8, "northwest"],
187 437
188 SDLK_UP, [1, "north"], 438use strict;
189 SDLK_RIGHT, [3, "east"], 439
190 SDLK_DOWN, [5, "south"], 440use CFClient::OpenGL;
191 SDLK_LEFT, [7, "west"], 441
192); 442our @ISA = CFClient::UI::Frame::;
443
444sub new {
445 my $class = shift;
446
447 my $self = $class->SUPER::new (
448 bg => [0, 0, 0, 0.8],
449 @_,
450 );
451
452 $self->add ($self->{vbox} = new CFClient::UI::VBox);
453
454 $self->{label} = [
455 map
456 CFClient::UI::Label->new (
457 can_hover => 1,
458 can_events => 1,
459 tooltip_width => 0.33,
460 fontsize => $_,
461 ), (0.8) x 16
462 ];
463
464 $self->{entry} = new CFClient::UI::Entry
465 on_changed => sub {
466 $self->update_labels;
467 },
468 on_key_down => sub {
469 my ($entry, $ev) = @_;
470
471 my $self = $entry->{parent}{parent};
472
473 if ($ev->{sym} == 13) {
474 if (exists $self->{select}) {
475 $self->{last_command} = $self->{select};
476 $::CONN->user_send ($self->{select});
477
478 unshift @{$self->{history}}, $self->{select};
479 $self->{hist_ptr} = 0;
480
481 $self->hide;
482 }
483 } elsif ($ev->{sym} == 27) {
484 $self->{hist_ptr} = 0;
485 $self->hide;
486 return;
487 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
488 if ($self->{hist_ptr} > 1) {
489 $self->{hist_ptr}--;
490 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
491 } elsif ($self->{hist_ptr} > 0) {
492 $self->{hist_ptr}--;
493 $self->{entry}->set_text ($self->{hist_saveback});
494 } else {
495 ++$self->{select_offset}
496 if $self->{select_offset} < $#{ $self->{last_match} || [] };
497 }
498 $self->update_labels;
499 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
500 if ($self->{select_offset}) {
501 --$self->{select_offset}
502 } else {
503 unless ($self->{hist_ptr}) {
504 $self->{hist_saveback} = $self->{entry}->get_text;
505 }
506 if ($self->{hist_ptr} <= $#{$self->{history}}) {
507 $self->{hist_ptr}++;
508 }
509 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
510 if exists $self->{history}->[$self->{hist_ptr} - 1];
511 }
512 $self->update_labels;
513 } else {
514 return 0;
515 }
516
517 1
518 }
519 ;
520
521 $self->{vbox}->add (
522 $self->{entry},
523 @{$self->{label}},
524 );
525
526 $self
527}
528
529sub set_prefix {
530 my ($self, $prefix) = @_;
531
532 $self->{entry}->set_text ($prefix);
533 $self->show;
534}
535
536sub size_allocate {
537 my ($self, $w, $h) = @_;
538
539 $self->SUPER::size_allocate ($w, $h);
540 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
541}
542
543sub show {
544 my ($self) = @_;
545
546 $self->SUPER::show;
547 $self->{entry}->focus_in;
548}
549
550sub hide {
551 my ($self) = @_;
552
553 $self->SUPER::hide;
554 $self->{entry}->set_text ("");
555}
193 556
194sub key_down { 557sub key_down {
195 my ($self, $ev) = @_; 558 my ($self, $ev) = @_;
196 559
197 my $mod = $ev->key_mod; 560 $self->{entry}->key_down ($ev)
198 my $sym = $ev->key_sym; 561}
199 562
200 if ($sym == SDLK_KP5) { 563sub update_labels {
201 $::CONN->user_send ("stay fire"); 564 my ($self) = @_;
202 } elsif ($sym == SDLK_a) { 565
203 $::CONN->user_send ("apply"); 566 my $text = $self->{entry}->get_text;
204 } elsif ($sym == SDLK_QUOTE) { 567
205 $self->emit ('activate_console'); 568 length $text
206 } elsif ($sym == SDLK_SLASH) { 569 or return $self->hide;
207 $self->emit ('activate_console' => '/'); 570
208 } elsif (exists $DIR{$sym}) { 571 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
209 if ($mod & KMOD_SHIFT) { 572
210 $self->{shft}++; 573 if ($text ne $self->{last_search}) {
211 $::CONN->user_send ("fire $DIR{$sym}[0]"); 574 my @match;
212 } elsif ($mod & KMOD_CTRL) { 575
213 $self->{ctrl}++; 576 if ($text =~ /^(.*?)\s+$/) {
214 $::CONN->user_send ("run $DIR{$sym}[0]"); 577 @match = [$cmd, "(appended whitespace suppresses completion)"];
215 } else { 578 } else {
216 $::CONN->user_send ("$DIR{$sym}[1]"); 579 my $regexp = do {
580 my ($beg, @chr) = split //, lc $cmd;
581
582 # the following regex is used to match our "completion entry"
583 # to an actual command - the parentheses match kind of "overhead"
584 # - the more characters the parentheses match, the less attractive
585 # is the match.
586 my $regexp = "^\Q$beg\E"
587 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
588 qr<$regexp>
589 };
590
591 my @penalty;
592
593 for (keys %{$self->{command}}) {
594 if (@penalty = $_ =~ $regexp) {
595 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
596 }
597 }
598
599 @match = map $self->{command}{$_->[0]},
600 sort {
601 $a->[1] <=> $b->[1]
602 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
603 or (length $b->[0]) <=> (length $a->[0])
604 } @match;
217 } 605 }
218 }
219}
220 606
221sub key_up { 607 $self->{last_search} = $text;
608 $self->{last_match} = \@match;
609
610 $self->{select_offset} = 0;
611 }
612
613 my @labels = @{ $self->{label} };
614 my @matches = @{ $self->{last_match} || [] };
615
616 if ($self->{select_offset}) {
617 splice @matches, 0, $self->{select_offset}, ();
618
619 my $label = shift @labels;
620 $label->set_text ("...");
621 $label->set_tooltip ("Use Cursor-Up to view previous matches");
622 }
623
624 for my $label (@labels) {
625 $label->{fg} = [1, 1, 1, 1];
626 $label->{bg} = [0, 0, 0, 0];
627 }
628
629 if (@matches) {
630 $self->{select} = "$matches[0][0]$arg";
631
632 $labels[0]->{fg} = [0, 0, 0, 1];
633 $labels[0]->{bg} = [1, 1, 1, 0.8];
634 } else {
635 $self->{select} = "$cmd$arg";
636 }
637
638 for my $match (@matches) {
639 my $label = shift @labels;
640
641 if (@labels) {
642 $label->set_text ("$match->[0]$arg");
643 $label->set_tooltip ($match->[1]);
644 } else {
645 $label->set_text ("...");
646 $label->set_tooltip ("Use Cursor-Down to view more matches");
647 last;
648 }
649 }
650
651 for my $label (@labels) {
652 $label->set_text ("");
653 $label->set_tooltip ("");
654 }
655
656 $self->update;
657 ###
658}
659
660sub _draw {
222 my ($self, $ev) = @_; 661 my ($self) = @_;
223 662
224 my $mod = $ev->key_mod; 663 # hack
225 my $sym = $ev->key_sym; 664 local $CFClient::UI::FOCUS = $self->{entry};
226 665
227 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 666 $self->SUPER::_draw;
228 $::CONN->user_send ("fire_stop");
229 }
230 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
231 $::CONN->user_send ("run_stop");
232 }
233}
234
235sub add_command {
236 my ($self, $command, $widget, $cb) = @_;
237
238 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]*/$1/g;
239 warn "$command|$abbrev|$widget\n";#d#
240} 667}
241 668
2421 6691

Diff Legend

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