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

Diff Legend

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