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

Diff Legend

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