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.34 by root, Tue May 23 21:14:41 2006 UTC vs.
Revision 1.69 by root, Mon Jun 26 21:59:04 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} 135}
80 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 invoke_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 $::BIND_EDITOR->cfg_bind ($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->{profile}{default}{bindings}{$mod}{$sym}) {
209 $::CONN->user_send ($_) for @$bind_cmd;
210 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
211 $self->{completer}->invoke_key_down ($ev);
212 $self->{completer}->show;
213 } else {
214 return 0;
215 }
216
217 1
218}
219
220sub invoke_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
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
81sub draw { 264sub draw {
82 my ($self) = @_; 265 my ($self) = @_;
83 266
267 return unless $::MAP;
268
269 my $focused = $CFClient::UI::FOCUS == $self
270 || $CFClient::UI::FOCUS == $self->{completer}{entry};
271
84 return 272 return
85 unless $CFClient::UI::FOCUS == $self || !$::FAST; 273 unless $focused || !$::FAST;
86 274
87 if (delete $self->{need_update}) { 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
88 glNewList $self->{list}; 314 glNewList $self->{list};
89 315
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; 316 glPushMatrix;
317 glTranslate $sx0, $sy0;
98 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 318 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
99 319
100 glTranslate $sx0 - 32, $sy0 - 32, 0; 320 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
101 321
102 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 322 glScale 32, 32;
103 323
104 if ($::CFG->{fow_enable}) { 324 if (my $tex = $self->{fow_texture}) {
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 # try to re-use the texture name: TODO improve texture class instead
121 my $prev_name = ((delete $self->{fow_texture}) || {})->{name};
122
123 $self->{fow_texture} = new CFClient::Texture
124 w => $w,
125 h => $h,
126 data => $data,
127 name => $prev_name, # a bit hackish
128 internalformat => GL_ALPHA,
129 format => GL_ALPHA;
130
131 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
132
133 glEnable GL_TEXTURE_2D; 325 glEnable GL_TEXTURE_2D;
134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 326 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
135 327
136 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 328 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
137 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 329 $self->{fow_texture}->draw_quad_alpha (0, 0);
138 330
139 glDisable GL_TEXTURE_2D; 331 glDisable GL_TEXTURE_2D;
140 } 332 }
141 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
142 glPopMatrix; 345 glPopMatrix;
143 }
144
145 glEndList; 346 glEndList;
146 } 347 }
147 348
148 glPushMatrix;
149 glCallList $self->{list}; 349 glCallList $self->{list};
150 glPopMatrix;
151 350
152 # TNT2 emulates logops in software (or worse :) 351 # TNT2 emulates logops in software (or worse :)
153 if ($CFClient::UI::FOCUS == $self) { 352 unless ($focused) {
154 (delete $self->{out_of_focus})->destroy
155 if $self->{out_of_focus};
156 } else {
157 glColor 0.4, 0.2, 0.2, 0.6; 353 glColor 0.4, 0.2, 0.2, 0.6;
158 glEnable GL_BLEND; 354 glEnable GL_BLEND;
159 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 355 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
160 glBegin GL_QUADS; 356 glBegin GL_QUADS;
161 glVertex 0, 0; 357 glVertex 0, 0;
162 glVertex 0, $::HEIGHT; 358 glVertex 0, $::HEIGHT;
163 glVertex $::WIDTH, $::HEIGHT; 359 glVertex $::WIDTH, $::HEIGHT;
164 glVertex $::WIDTH, 0; 360 glVertex $::WIDTH, 0;
165 glEnd; 361 glEnd;
166 glDisable GL_BLEND; 362 glDisable GL_BLEND;
167
168 $self->{out_of_focus} ||= do {
169 my $label = new CFClient::UI::Label
170 x => 0,
171 y => 0,
172 z => 1,
173 ellipsise => 0,
174 text => "map out of focus (click map to play)";
175
176 $label->show;
177 $label->update;
178
179 $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
180 $label->move (
181 ($::WIDTH - $label->{w}) * 0.5,
182 ($::HEIGHT - $label->{h}) * 0.5,
183 );
184 });
185
186 $label
187 };
188 } 363 }
189} 364}
190 365
191my %DIR = ( 366sub DESTROY {
192 CFClient::SDLK_KP8, [1, "north"],
193 CFClient::SDLK_KP9, [2, "northeast"],
194 CFClient::SDLK_KP6, [3, "east"],
195 CFClient::SDLK_KP3, [4, "southeast"],
196 CFClient::SDLK_KP2, [5, "south"],
197 CFClient::SDLK_KP1, [6, "southwest"],
198 CFClient::SDLK_KP4, [7, "west"],
199 CFClient::SDLK_KP7, [8, "northwest"],
200
201 CFClient::SDLK_UP, [1, "north"],
202 CFClient::SDLK_RIGHT, [3, "east"],
203 CFClient::SDLK_DOWN, [5, "south"],
204 CFClient::SDLK_LEFT, [7, "west"],
205);
206
207sub key_down {
208 my ($self, $ev) = @_;
209
210 return unless $::CONN;
211
212 my $mod = $ev->{mod};
213 my $sym = $ev->{sym};
214 my $uni = $ev->{unicode};
215
216 if ($sym == CFClient::SDLK_KP5) {
217 $::CONN->user_send ("stay fire");
218 } elsif ($uni == ord ",") {
219 $::CONN->user_send ("take");
220 } elsif ($uni == ord "\t" or $uni == ord " ") {
221 $::CONN->user_send ("apply");
222 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
223 $::CONN->user_send ("rotateshoottype +");
224 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
225 $::CONN->user_send ("rotateshoottype -");
226 } elsif ($uni == ord "'") {
227 $self->emit ('activate_console');
228 } elsif ($uni == ord "/") {
229 $self->emit (activate_console => '/');
230 } elsif (exists $DIR{$sym}) {
231 if ($mod & CFClient::KMOD_SHIFT) {
232 $self->{shft}++;
233 $::CONN->user_send ("fire $DIR{$sym}[0]");
234 } elsif ($mod & CFClient::KMOD_CTRL) {
235 $self->{ctrl}++;
236 $::CONN->user_send ("run $DIR{$sym}[0]");
237 } else {
238 $::CONN->user_send ("$DIR{$sym}[1]");
239 }
240 } elsif ($ev->{unicode}) {
241 $self->{command_widget} ||=
242 new CFClient::MapWidget::Command::
243 command => $self->{command},
244 can_focus => 1,
245 connect_execute => sub {
246 # todo: support callback instead of user_send
247 $::CONN->user_send ($_[1]);
248 },
249 connect_close => sub {
250 (delete $self->{command_widget})->hide;
251 $self->focus_in;
252 },
253 ;
254 $self->{command_widget}->key_down ($ev)
255 unless $ev->{unicode} == 20;
256 return unless $self->{command_widget};
257 $self->{command_widget}->show;
258 $self->{command_widget}->focus_in;
259 }
260}
261
262sub key_up {
263 my ($self, $ev) = @_;
264
265 my $mod = $ev->{mod};
266 my $sym = $ev->{sym};
267
268 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
269 $::CONN->user_send ("fire_stop");
270 }
271 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
272 $::CONN->user_send ("run_stop");
273 }
274}
275
276sub add_command {
277 my ($self, $command, $tooltip, $widget, $cb) = @_;
278
279 (my $data = $command) =~ s/\\//g;
280
281 $tooltip =~ s/^\s+//;
282
283 $tooltip = "<big>$data</big>\n\n$tooltip";
284
285 $tooltip =~ s/\s+$//;
286
287 $self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
288}
289
290sub clr_commands {
291 my ($self) = @_; 367 my $self = shift;
292 368
293 %{$self->{command}} = (); 369 glDeleteList $self->{list};
370
371 $self->SUPER::DESTROY;
294} 372}
295 373
296package CFClient::MapWidget::MapMap; 374package CFClient::MapWidget::MapMap;
297 375
298our @ISA = CFClient::UI::Base::; 376our @ISA = CFClient::UI::Base::;
… …
302 380
303sub size_request { 381sub size_request {
304 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 382 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
305} 383}
306 384
307sub size_allocate { 385sub invoke_size_allocate {
308 my ($self, $w, $h) = @_; 386 my ($self, $w, $h) = @_;
309 387
310 $self->SUPER::size_allocate ($w, $h);
311 $self->update; 388 $self->update;
389
390 1
312} 391}
313 392
314sub update { 393sub update {
315 my ($self) = @_; 394 my ($self) = @_;
316 395
… …
399 fontsize => $_, 478 fontsize => $_,
400 ), (0.8) x 16 479 ), (0.8) x 16
401 ]; 480 ];
402 481
403 $self->{entry} = new CFClient::UI::Entry 482 $self->{entry} = new CFClient::UI::Entry
404 connect_changed => sub { 483 on_changed => sub {
405 $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 <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key"
494 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
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->{entry}->get_text;
512 $self->{hist_ptr} = 0;
513
514 $self->hide;
515 }
516 } elsif ($ev->{sym} == 27) {
517 $self->{hist_ptr} = 0;
518 $self->hide;
519 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
520 if ($self->{hist_ptr} > 1) {
521 $self->{hist_ptr}--;
522 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
523 } elsif ($self->{hist_ptr} > 0) {
524 $self->{hist_ptr}--;
525 $self->{entry}->set_text ($self->{hist_saveback});
526 } else {
527 ++$self->{select_offset}
528 if $self->{select_offset} < $#{ $self->{last_match} || [] };
529 }
530 $self->update_labels;
531 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
532 if ($self->{select_offset}) {
533 --$self->{select_offset}
534 } else {
535 unless ($self->{hist_ptr}) {
536 $self->{hist_saveback} = $self->{entry}->get_text;
537 }
538 if ($self->{hist_ptr} <= $#{$self->{history}}) {
539 $self->{hist_ptr}++;
540 }
541 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
542 if exists $self->{history}->[$self->{hist_ptr} - 1];
543 }
544 $self->update_labels;
545 } else {
546 return 0;
547 }
548
549 1
406 }; 550 }
551 ;
407 552
408 $self->{vbox}->add ( 553 $self->{vbox}->add (
409 $self->{entry}, 554 $self->{entry},
410 @{$self->{label}}, 555 @{$self->{label}},
411 ); 556 );
412 557
413 $self 558 $self
414} 559}
415 560
561sub set_prefix {
562 my ($self, $prefix) = @_;
563
564 $self->{entry}->set_text ($prefix);
565 $self->show;
566}
567
416sub size_allocate { 568sub invoke_size_allocate {
417 my ($self, $w, $h) = @_; 569 my ($self, $w, $h) = @_;
418 570
419 $self->SUPER::size_allocate ($w, $h);
420 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 571 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
421}
422 572
573 $self->SUPER::invoke_size_allocate ($w, $h)
574}
575
576sub show {
577 my ($self) = @_;
578
579 $self->SUPER::show;
580 $self->{entry}->grab_focus;
581}
582
583sub hide {
584 my ($self) = @_;
585
586 $self->SUPER::hide;
587 $self->{entry}->set_text ("");
588}
589
423sub key_down { 590sub invoke_key_down {
424 my ($self, $ev) = @_; 591 my ($self, $ev) = @_;
425 592
426 if ($ev->{sym} == 13) {
427 if (exists $self->{select}) {
428 $self->emit (execute => $self->{select});
429 $self->emit ("close");
430 }
431 } elsif ($ev->{sym} == 27) {
432 $self->{entry}->set_text ("");
433 $self->emit ("close");
434 return;
435 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
436 ++$self->{select_offset}
437 if $self->{select_offset} < $#{ $self->{last_match} || [] };
438 $self->update_labels;
439 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
440 --$self->{select_offset}
441 if $self->{select_offset};
442 $self->update_labels;
443 } else {
444 #$self->{entry}{force_alloc} = 1;
445 $self->{entry}->key_down ($ev); 593 $self->{entry}->emit (key_down => $ev)
446 }
447} 594}
448 595
449sub update_labels { 596sub update_labels {
450 my ($self) = @_; 597 my ($self) = @_;
451 598
452 my $text = $self->{entry}->get_text; 599 my $text = $self->{entry}->get_text;
453 600
454 length $text 601 length $text
455 or return $self->emit ("close"); 602 or return $self->hide;
456 603
457 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; 604 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
458 605
459 if ($cmd ne $self->{last_search}) { 606 if ($text ne $self->{last_search}) {
460 my $regexp = do {
461 my ($beg, @chr) = split //, lc $cmd;
462
463 # the following regex is used to match our "completion entry"
464 # to an actual command - the parentheses match kind of "overhead"
465 # - the more characters the parentheses match, the less attractive
466 # is the match.
467 my $regexp = "^\Q$beg\E"
468 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
469 qr<$regexp>
470 };
471
472 my @match; 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
473 my @penalty; 624 my @penalty;
474 625
475 for (keys %{$self->{command}}) { 626 for (keys %{$self->{command}}) {
476 if (@penalty = $_ =~ $regexp) { 627 if (@penalty = $_ =~ $regexp) {
477 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 628 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
629 }
478 } 630 }
479 }
480 631
481 @match = map $self->{command}{$_->[0]}, 632 @match = map $self->{command}{$_->[0]},
482 sort { 633 sort {
483 $a->[1] <=> $b->[1] 634 $a->[1] <=> $b->[1]
484 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 635 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
485 or (length $a->[0]) <=> (length $b->[0]) 636 or (length $b->[0]) <=> (length $a->[0])
486 } @match; 637 } @match;
638 }
487 639
488 $self->{last_search} = $cmd; 640 $self->{last_search} = $text;
489 $self->{last_match} = \@match; 641 $self->{last_match} = \@match;
490 642
491 $self->{select_offset} = 0; 643 $self->{select_offset} = 0;
492 } 644 }
493 645
… …
533 $label->set_text (""); 685 $label->set_text ("");
534 $label->set_tooltip (""); 686 $label->set_tooltip ("");
535 } 687 }
536 688
537 $self->update; 689 $self->update;
538 ###
539} 690}
540 691
541sub _draw { 692sub _draw {
542 my ($self) = @_; 693 my ($self) = @_;
543 694

Diff Legend

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