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

Diff Legend

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