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.25 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.67 by elmex, Wed Jun 21 12:59:23 2006 UTC

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

Diff Legend

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