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.16 by root, Mon Apr 24 13:04:31 2006 UTC vs.
Revision 1.60 by root, Thu Jun 15 08:29:18 2006 UTC

… …
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 => 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}
22 28
23sub DESTROY { 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
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 {
24 my $self = shift; 58 my ($self) = @_;
25 59
26 glDeleteList $self->{list}; 60 %{$self->{completer}{command}} = ();
27
28 $self->SUPER::DESTROY;
29} 61}
30 62
31sub button_down { 63sub button_down {
32 my ($self, $ev, $x, $y) = @_; 64 my ($self, $ev, $x, $y) = @_;
33 65
66 return unless $::CONN;
67
34 $self->focus_in; 68 $self->focus_in;
35 69
36 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) {
37 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 81 my ($ox, $oy) = ($ev->{x}, $ev->{y});
38 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 82 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
39 83
40 $self->{motion} = sub { 84 $self->{motion} = sub {
41 my ($ev, $x, $y) = @_; 85 my ($ev, $x, $y) = @_;
… …
46 $::CFG->{map_shift_y} = $bh + $y - $oy; 90 $::CFG->{map_shift_y} = $bh + $y - $oy;
47 91
48 $self->update; 92 $self->update;
49 }; 93 };
50 } 94 }
95
96 1
51} 97}
52 98
53sub button_up { 99sub button_up {
54 my ($self, $ev, $x, $y) = @_; 100 my ($self, $ev, $x, $y) = @_;
55 101
56 delete $self->{motion}; 102 delete $self->{motion};
103
104 1
57} 105}
58 106
59sub mouse_motion { 107sub mouse_motion {
60 my ($self, $ev, $x, $y) = @_; 108 my ($self, $ev, $x, $y) = @_;
61 109
110 if ($self->{motion}) {
62 $self->{motion}->($ev, $x, $y) if $self->{motion}; 111 $self->{motion}->($ev, $x, $y);
112 } else {
113 return 0;
114 }
115
116 1
63} 117}
64 118
65sub size_request { 119sub size_request {
66 ( 120 (
67 1 + 32 * int $::WIDTH / 32, 121 1 + 32 * int $::WIDTH / 32,
… …
72sub update { 126sub update {
73 my ($self) = @_; 127 my ($self) = @_;
74 128
75 $self->{need_update} = 1; 129 $self->{need_update} = 1;
76 $self->SUPER::update; 130 $self->SUPER::update;
77}
78
79sub draw {
80 my ($self) = @_;
81
82 if (delete $self->{need_update}) {
83 glNewList $self->{list};
84
85 if ($::MAP) {
86 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale});
87 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale});
88
89 glPushMatrix;
90 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
91
92 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
93 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
94
95 glTranslate $sx0 - 32, $sy0 - 32, 0;
96
97 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
98
99 if ($::CFG->{fow_enable}) {
100 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
101 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
102 glConvolutionFilter2D (
103 GL_CONVOLUTION_2D,
104 GL_ALPHA,
105 3, 3,
106 GL_ALPHA, GL_FLOAT,
107 pack "f*",
108 0.05, 0.13, 0.05,
109 0.13, 0.30, 0.13,
110 0.05, 0.13, 0.05,
111 );
112 glEnable GL_CONVOLUTION_2D;
113 }
114
115 $self->{fow_texture} = new CFClient::Texture
116 w => $w,
117 h => $h,
118 data => $data,
119 internalformat => GL_ALPHA,
120 format => GL_ALPHA;
121
122 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
123
124 glEnable GL_BLEND;
125 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
126 glEnable GL_TEXTURE_2D;
127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
128
129 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
130 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
131
132 glDisable GL_TEXTURE_2D;
133 glDisable GL_BLEND;
134 }
135
136 # HACK BEGIN
137 {
138 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
139
140 glTranslate 0, 30;
141 my ($w, $h) = (250, 250);
142
143 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
144
145 glEnable GL_BLEND;
146 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
147 glEnable GL_TEXTURE_2D;
148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
149
150 glPopMatrix;
151
152 $self->{mapmap_texture} =
153 new CFClient::Texture
154 w => $w,
155 h => $h,
156 data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
157 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
158
159 $self->{mapmap_texture}->draw_quad (0, 0);
160
161 glDisable GL_TEXTURE_2D;
162
163 glTranslate 0.375, 0.375;
164
165 glColor 1, 1, 0, 1;
166 glBegin GL_LINE_LOOP;
167 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
168 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
169 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
170 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
171 glEnd;
172
173 glDisable GL_BLEND;
174 }
175 # HACK END
176 }
177
178 glEndList;
179 }
180
181 glPushMatrix;
182 glCallList $self->{list};
183 glPopMatrix;
184
185 if ($CFClient::UI::FOCUS != $self) {
186 glColor 64/255, 64/255, 64/255;
187 glLogicOp GL_AND;
188 glEnable GL_COLOR_LOGIC_OP;
189 glBegin GL_QUADS;
190 glVertex 0, 0;
191 glVertex 0, $::HEIGHT;
192 glVertex $::WIDTH, $::HEIGHT;
193 glVertex $::WIDTH, 0;
194 glEnd;
195 glDisable GL_COLOR_LOGIC_OP;
196 }
197} 131}
198 132
199my %DIR = ( 133my %DIR = (
200 CFClient::SDLK_KP8, [1, "north"], 134 CFClient::SDLK_KP8, [1, "north"],
201 CFClient::SDLK_KP9, [2, "northeast"], 135 CFClient::SDLK_KP9, [2, "northeast"],
… …
213); 147);
214 148
215sub key_down { 149sub key_down {
216 my ($self, $ev) = @_; 150 my ($self, $ev) = @_;
217 151
152 return 0 unless $::CONN;
153
218 my $mod = $ev->{mod}; 154 my $mod = $ev->{mod};
219 my $sym = $ev->{sym}; 155 my $sym = $ev->{sym};
156 my $uni = $ev->{unicode};
220 157
221 if ($sym == CFClient::SDLK_KP5) { 158 if ($sym == CFClient::SDLK_KP5) {
222 $::CONN->user_send ("stay fire"); 159 $::CONN->user_send ("stay fire");
223 } elsif ($sym == ord ",") { 160 } elsif ($uni == ord ",") {
224 $::CONN->user_send ("take"); 161 $::CONN->user_send ("take");
225 } elsif ($sym == ord "a") { 162 } elsif ($uni == ord " ") {
226 $::CONN->user_send ("apply"); 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;
227 } elsif ($sym == ord "'") { 176 } elsif ($uni == ord "'") {
228 $self->emit ('activate_console'); 177 $self->{completer}->set_prefix ("");
229 } elsif ($sym == ord "/") { 178 $self->{completer}->show;
230 $self->emit (activate_console => '/');
231 } elsif (exists $DIR{$sym}) { 179 } elsif (exists $DIR{$sym}) {
232 if ($mod & CFClient::KMOD_SHIFT) { 180 if ($mod & CFClient::KMOD_SHIFT) {
233 $self->{shft}++; 181 $self->{shft}++;
182 if ($DIR{$sym}[0] != $self->{fire_dir}) {
234 $::CONN->user_send ("fire $DIR{$sym}[0]"); 183 $::CONN->user_send ("fire $DIR{$sym}[0]");
184 }
185 $self->{fire_dir} = $DIR{$sym}[0];
235 } elsif ($mod & CFClient::KMOD_CTRL) { 186 } elsif ($mod & CFClient::KMOD_CTRL) {
236 $self->{ctrl}++; 187 $self->{ctrl}++;
237 $::CONN->user_send ("run $DIR{$sym}[0]"); 188 $::CONN->user_send ("run $DIR{$sym}[0]");
238 } else { 189 } else {
239 $::CONN->user_send ("$DIR{$sym}[1]"); 190 $::CONN->user_send ("$DIR{$sym}[1]");
240 } 191 }
241 } elsif ($ev->{unicode}) { 192 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
242 $self->{command_widget} ||= 193 $::BIND_EDITOR->set_binding (undef, undef, [],
243 new CFClient::MapWidget::Command:: 194 sub {
244 command => $self->{command}, 195 my ($mod, $sym, $cmds) = @_;
245 can_focus => 1, 196 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
246 connect_execute => sub {
247 # todo: support callback instead of user_send
248 $::CONN->user_send ($_[1][1]);
249 }, 197 });
250 connect_close => sub { 198 $::BIND_EDITOR->start;
251 (delete $self->{command_widget})->hide; 199 $::BIND_EDITOR->show;
252 $self->focus_in; 200 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
253 }, 201 $::BIND_EDITOR->stop;
254 ; 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')) {
255 $self->{command_widget}->key_down ($ev); 207 $self->{completer}->key_down ($ev);
256 return unless $self->{command_widget};
257 $self->{command_widget}->show; 208 $self->{completer}->show;
258 $self->{command_widget}->focus_in; 209 } else {
210 return 0;
211 }
212
259 } 213 1
260} 214}
261 215
262sub key_up { 216sub key_up {
263 my ($self, $ev) = @_; 217 my ($self, $ev) = @_;
264 218
219 my $res = 0;
265 my $mod = $ev->{mod}; 220 my $mod = $ev->{mod};
266 my $sym = $ev->{sym}; 221 my $sym = $ev->{sym};
267 222
223 if ($::CFG->{shift_fire_stop}) {
268 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 224 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
269 $::CONN->user_send ("fire_stop"); 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 }
270 } 239 }
240
271 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 241 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
272 $::CONN->user_send ("run_stop"); 242 $::CONN->user_send ("run_stop");
243 $res = 1;
244 }
245
246 $res
247}
248
249sub draw {
250 my ($self) = @_;
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
260 if (delete $self->{need_update}) {
261 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
262
263 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
264 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
265
266 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
267 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
268
269 my $sw = $self->{sw} = 1 + CFClient::ceil $::WIDTH / $tilesize;
270 my $sh = $self->{sh} = 1 + CFClient::ceil $::HEIGHT / $tilesize;
271
272 if ($::CFG->{fow_enable}) {
273 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
274
275 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
276 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
277 glConvolutionFilter2D (
278 GL_CONVOLUTION_2D,
279 GL_ALPHA,
280 3, 3,
281 GL_ALPHA, GL_FLOAT,
282 (pack "f*", @{ $self->{smooth_matrix} }),
283 );
284 glEnable GL_CONVOLUTION_2D;
285 }
286
287 $self->{fow_texture} = new CFClient::Texture
288 w => $w,
289 h => $h,
290 data => $data,
291 internalformat => GL_ALPHA,
292 format => GL_ALPHA;
293
294 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
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}) {
308 glEnable GL_TEXTURE_2D;
309 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
310
311 glScale 32, 32;
312 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
313 $self->{fow_texture}->draw_quad_alpha (0, 0);
314
315 glDisable GL_TEXTURE_2D;
316 }
317
318 glPopMatrix;
319
320 glEndList;
321 }
322
323 glPushMatrix;
324 glCallList $self->{list};
325 glPopMatrix;
326
327 # TNT2 emulates logops in software (or worse :)
328 unless ($focused) {
329 glColor 0.4, 0.2, 0.2, 0.6;
330 glEnable GL_BLEND;
331 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
332 glBegin GL_QUADS;
333 glVertex 0, 0;
334 glVertex 0, $::HEIGHT;
335 glVertex $::WIDTH, $::HEIGHT;
336 glVertex $::WIDTH, 0;
337 glEnd;
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;
273 } 425
274} 426 glDisable GL_BLEND;
275
276sub add_command {
277 my ($self, $command, $tooltip, $widget, $cb) = @_;
278
279 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
280
281 push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];
282} 427}
283 428
284package CFClient::MapWidget::Command; 429package CFClient::MapWidget::Command;
285 430
286use strict; 431use strict;
287 432
288use CFClient::OpenGL; 433use CFClient::OpenGL;
289 434
290our @ISA = CFClient::UI::VBox::; 435our @ISA = CFClient::UI::Frame::;
291 436
292sub new { 437sub new {
293 my $class = shift; 438 my $class = shift;
294 439
295 my $self = $class->SUPER::new ( 440 my $self = $class->SUPER::new (
441 bg => [0, 0, 0, 0.8],
296 @_, 442 @_,
297 children => [map 443 );
444
445 $self->add ($self->{vbox} = new CFClient::UI::VBox);
446
447 $self->{label} = [
448 map
298 CFClient::UI::Label->new ( 449 CFClient::UI::Label->new (
299 can_hover => 1, 450 can_hover => 1,
300 can_events => 1, 451 can_events => 1,
452 tooltip_width => 0.33,
301 fontsize => $_, 453 fontsize => $_,
302 ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8 454 ), (0.8) x 16
455 ];
456
457 $self->{entry} = new CFClient::UI::Entry
458 on_changed => sub {
459 $self->update_labels;
303 ], 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}},
304 ); 530 );
305 531
306 $self 532 $self
533}
534
535sub set_prefix {
536 my ($self, $prefix) = @_;
537
538 $self->{entry}->set_text ($prefix);
539 $self->show;
307} 540}
308 541
309sub size_allocate { 542sub size_allocate {
310 my ($self, $w, $h) = @_; 543 my ($self, $w, $h) = @_;
311 544
312 $self->SUPER::size_allocate ($w, $h); 545 $self->SUPER::size_allocate ($w, $h);
313 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 546 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
314} 547}
315 548
316sub update_labels { 549sub show {
317 my ($self) = @_; 550 my ($self) = @_;
318 551
319 my $command = $self->{command}; 552 $self->SUPER::show;
320 my $search_abbrev = qr/^\Q$self->{search}/; 553 $self->{entry}->focus_in;
321 my $search_full = qr/\Q$self->{search}/; 554}
322 555
323 my @found; 556sub hide {
557 my ($self) = @_;
324 558
325 for (@$command) { 559 $self->SUPER::hide;
326 if ($_->[0] =~ $search_abbrev) {
327 push @found, [$_->[0], $_];
328 } elsif ($_->[1] =~ $search_full) {
329 push @found, [$_->[1], $_];
330 }
331 }
332
333 @found = sort { $a->[0] cmp $b->[0] } @found;
334
335 $self->{children}[0]->set_text ("$self->{search}_");
336
337 for (0..5) {
338 $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
339 $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
340 }
341
342 $self->{select} = $found[0][1]
343 if @found;
344
345 if (@found > 6) {
346 $self->{children}[6]->set_text ("..."); 560 $self->{entry}->set_text ("");
347 }
348
349 $self->check_size;
350} 561}
351 562
352sub key_down { 563sub key_down {
353 my ($self, $ev) = @_; 564 my ($self, $ev) = @_;
354 565
355 if ($ev->{sym} == 8) { 566 $self->{entry}->key_down ($ev)
356 substr $self->{search}, -1, 1, ""; 567}
357 $self->update_labels; 568
358 } elsif ($ev->{sym} == 13) { 569sub update_labels {
359 if (exists $self->{select}) { 570 my ($self) = @_;
360 $self->emit (execute => $self->{select}); 571
361 $self->emit ("close"); 572 my $text = $self->{entry}->get_text;
573
574 length $text
575 or return $self->hide;
576
577 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
578
579 if ($text ne $self->{last_search}) {
580 my @match;
581
582 if ($text =~ /^(.*?)\s+$/) {
583 @match = [$cmd, "(appended whitespace suppresses completion)"];
584 } else {
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 }
362 } 603 }
363 } elsif ($ev->{sym} == 27) { 604
364 $self->emit ("close"); 605 @match = map $self->{command}{$_->[0]},
365 return; 606 sort {
366 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) { 607 $a->[1] <=> $b->[1]
367 $self->{search} .= chr $ev->{unicode}; 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
368 $self->update_labels; 662 $self->update;
369 } 663 ###
664}
370 665
371 length $self->{search} 666sub _draw {
372 or $self->emit ("close"); 667 my ($self) = @_;
668
669 # hack
670 local $CFClient::UI::FOCUS = $self->{entry};
671
672 $self->SUPER::_draw;
373} 673}
374 674
3751 6751

Diff Legend

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