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.30 by root, Fri May 19 18:39:08 2006 UTC vs.
Revision 1.59 by root, Wed Jun 14 16:20:22 2006 UTC

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

Diff Legend

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