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

Diff Legend

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