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.59 by root, Wed Jun 14 16:20:22 2006 UTC vs.
Revision 1.78 by root, Sun Jul 23 16:11:12 2006 UTC

… …
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFClient;
8use CFClient::OpenGL; 9use CFClient::OpenGL;
10use CFClient::UI;
9 11
10our @ISA = CFClient::UI::Base::; 12our @ISA = CFClient::UI::Base::;
13
14my $magicmap_tex =
15 new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png",
16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11 17
12sub new { 18sub new {
13 my $class = shift; 19 my $class = shift;
14 20
15 my $self = $class->SUPER::new ( 21 my $self = $class->SUPER::new (
… …
26 @_ 32 @_
27 ); 33 );
28 34
29 $self->{completer} = new CFClient::MapWidget::Command:: 35 $self->{completer} = new CFClient::MapWidget::Command::
30 command => $self->{command}, 36 command => $self->{command},
31 can_focus => 1,
32 tooltip => "<b>The Command Completer</b>\n\n" 37 tooltip => "<b>The Command Completer</b>\n\n"
33 . "This is your central interface to send text commands to the server. " 38 . "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, " 39 . "To enter a verbatim command to send to the server, just type the command, "
35 . "followed by a space, and press return. " 40 . "followed by a space, and press return. "
36 . "Typing the initial letters of words (or just any letters) displays guesses " 41 . "Typing the initial letters of words (or just any letters) displays guesses "
37 . "for commands you might want to use.\n" 42 . "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" 43 . "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.", 44 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
40 ; 45 ;
41 46
42 $self 47 $self
43} 48}
44 49
… …
56 61
57sub clr_commands { 62sub clr_commands {
58 my ($self) = @_; 63 my ($self) = @_;
59 64
60 %{$self->{completer}{command}} = (); 65 %{$self->{completer}{command}} = ();
61}
62 66
67 $self->{completer}->hide
68 if $self->{completer};
69}
70
63sub button_down { 71sub invoke_button_down {
64 my ($self, $ev, $x, $y) = @_; 72 my ($self, $ev, $x, $y) = @_;
65 73
66 return unless $::CONN;
67
68 $self->focus_in;
69
70 if ($ev->{button} == 1) { 74 if ($ev->{button} == 1) {
71 my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}); 75 $self->grab_focus;
72 my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}); 76 return unless $::CONN;
73
74 $x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
75 $y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
76 77
78 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
79 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
80
77 $x -= int 0.5 * $::MAP->w; 81 $x -= int 0.5 * $self->{sw};
78 $y -= int 0.5 * $::MAP->h; 82 $y -= int 0.5 * $self->{sh};
79
80 $x += 1;
81 $y += 1;
82 83
83 $::CONN->lookat ($x, $y) 84 $::CONN->lookat ($x, $y)
84 if $::CONN; 85 if $::CONN;
85 86
86 } elsif ($ev->{button} == 2) { 87 } elsif ($ev->{button} == 2) {
88 $self->grab_focus;
89 return unless $::CONN;
90
87 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 91 my ($ox, $oy) = ($ev->{x}, $ev->{y});
88 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 92 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
89 93
90 $self->{motion} = sub { 94 $self->{motion} = sub {
91 my ($ev, $x, $y) = @_; 95 my ($ev, $x, $y) = @_;
… …
95 $::CFG->{map_shift_x} = $bw + $x - $ox; 99 $::CFG->{map_shift_x} = $bw + $x - $ox;
96 $::CFG->{map_shift_y} = $bh + $y - $oy; 100 $::CFG->{map_shift_y} = $bh + $y - $oy;
97 101
98 $self->update; 102 $self->update;
99 }; 103 };
104 } elsif ($ev->{button} == 3) {
105 (new CFClient::UI::Menu
106 items => [
107 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
108 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
109 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
110 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
111 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
112 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
113 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
114 [
115 $::PICKUP_ENABLE->{state}
116 ? "Disable automatic pickup"
117 : "Enable automatic pickup",
118 sub { $::PICKUP_ENABLE->toggle }
119 ],
120 ],
121 )->popup ($ev);
100 } 122 }
101 123
102 1 124 1
103} 125}
104 126
105sub button_up { 127sub invoke_button_up {
106 my ($self, $ev, $x, $y) = @_; 128 my ($self, $ev, $x, $y) = @_;
107 129
108 delete $self->{motion}; 130 delete $self->{motion};
109 131
110 1 132 1
111} 133}
112 134
113sub mouse_motion { 135sub invoke_mouse_motion {
114 my ($self, $ev, $x, $y) = @_; 136 my ($self, $ev, $x, $y) = @_;
115 137
116 if ($self->{motion}) { 138 if ($self->{motion}) {
117 $self->{motion}->($ev, $x, $y); 139 $self->{motion}->($ev, $x, $y);
118 } else { 140 } else {
… …
122 1 144 1
123} 145}
124 146
125sub size_request { 147sub size_request {
126 ( 148 (
127 1 + 32 * int $::WIDTH / 32, 149 32 * CFClient::ceil $::WIDTH / 32,
128 1 + 32 * int $::HEIGHT / 32, 150 32 * CFClient::ceil $::HEIGHT / 32,
129 ) 151 )
130} 152}
131 153
132sub update { 154sub update {
133 my ($self) = @_; 155 my ($self) = @_;
… …
150 CFClient::SDLK_RIGHT, [3, "east"], 172 CFClient::SDLK_RIGHT, [3, "east"],
151 CFClient::SDLK_DOWN, [5, "south"], 173 CFClient::SDLK_DOWN, [5, "south"],
152 CFClient::SDLK_LEFT, [7, "west"], 174 CFClient::SDLK_LEFT, [7, "west"],
153); 175);
154 176
155sub key_down { 177sub invoke_key_down {
156 my ($self, $ev) = @_; 178 my ($self, $ev) = @_;
157
158 return 0 unless $::CONN;
159 179
160 my $mod = $ev->{mod}; 180 my $mod = $ev->{mod};
161 my $sym = $ev->{sym}; 181 my $sym = $ev->{sym};
162 my $uni = $ev->{unicode}; 182 my $uni = $ev->{unicode};
163 183
184 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT;
185
186 if ($uni == ord "\t") {
187 $::PL_WINDOW->toggle_visibility;
188 } elsif ($sym == CFClient::SDLK_F1 && !$mod) {
189 $::HELP_WINDOW->toggle_visibility;
190 } elsif ($sym == CFClient::SDLK_F2 && !$mod) {
191 ::toggle_player_page ($::STATS_PAGE);
192 } elsif ($sym == CFClient::SDLK_F3 && !$mod) {
193 ::toggle_player_page ($::SKILL_PAGE);
194 } elsif ($sym == CFClient::SDLK_F4 && !$mod) {
195 ::toggle_player_page ($::SPELL_PAGE);
196 } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
197 ::toggle_player_page ($::INVENTORY_PAGE);
198 } elsif ($sym == CFClient::SDLK_F9 && !$mod) {
199 $::SETUP_DIALOG->toggle_visibility;
200 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
201 $::BIND_EDITOR->set_binding (undef, undef, [],
202 sub {
203 my ($mod, $sym, $cmds) = @_;
204 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
205 });
206 $::BIND_EDITOR->start;
207 $::BIND_EDITOR->show;
208 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
209 $::BIND_EDITOR->stop;
210 $::BIND_EDITOR->ask_for_bind_and_commit;
211 $::BIND_EDITOR->hide;
212 } elsif (!$::CONN) {
213 return 0; # bindings further down need a valid connection
214
164 if ($sym == CFClient::SDLK_KP5) { 215 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
165 $::CONN->user_send ("stay fire"); 216 $::CONN->user_send ("stay fire");
166 } elsif ($uni == ord ",") { 217 } elsif ($uni == ord ",") {
167 $::CONN->user_send ("take"); 218 $::CONN->user_send ("take");
168 } elsif ($uni == ord " ") { 219 } elsif ($uni == ord " ") {
169 $::CONN->user_send ("apply"); 220 $::CONN->user_send ("apply");
170 } elsif ($uni == ord ".") { 221 } elsif ($uni == ord ".") {
171 $::CONN->user_send ($self->{completer}{last_command}) 222 $::CONN->user_send ($self->{completer}{last_command})
172 if exists $self->{completer}{last_command}; 223 if exists $self->{completer}{last_command};
173 } elsif ($uni == ord "\t") { 224 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
174 $::INV_WINDOW->toggle_visibility; 225 $::CONN->user_send ($_) for @$bind_cmd;
175 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 226 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
176 $::CONN->user_send ("rotateshoottype +"); 227 $::CONN->user_send ("rotateshoottype +");
177 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 228 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
178 $::CONN->user_send ("rotateshoottype -"); 229 $::CONN->user_send ("rotateshoottype -");
179 } elsif ($uni == ord '"') { 230 } elsif ($uni == ord '"') {
180 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 231 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
181 $self->{completer}->show; 232 $self->{completer}->show;
182 } elsif ($uni == ord "'") { 233 } elsif ($uni == ord "'") {
… …
193 $self->{ctrl}++; 244 $self->{ctrl}++;
194 $::CONN->user_send ("run $DIR{$sym}[0]"); 245 $::CONN->user_send ("run $DIR{$sym}[0]");
195 } else { 246 } else {
196 $::CONN->user_send ("$DIR{$sym}[1]"); 247 $::CONN->user_send ("$DIR{$sym}[1]");
197 } 248 }
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')) { 249 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
213 $self->{completer}->key_down ($ev); 250 $self->{completer}->inject_key_down ($ev);
214 $self->{completer}->show; 251 $self->{completer}->show;
215 } else { 252 } else {
216 return 0; 253 return 0;
217 } 254 }
218 255
219 1 256 1
220} 257}
221 258
222sub key_up { 259sub invoke_key_up {
223 my ($self, $ev) = @_; 260 my ($self, $ev) = @_;
224 261
225 my $res = 0; 262 my $res = 0;
226 my $mod = $ev->{mod}; 263 my $mod = $ev->{mod};
227 my $sym = $ev->{sym}; 264 my $sym = $ev->{sym};
… …
250 } 287 }
251 288
252 $res 289 $res
253} 290}
254 291
292sub set_magicmap {
293 my ($self, $w, $h, $x, $y, $data) = @_;
294
295 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
296 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
297
298 $self->{magicmap} = [$x, $y, $w, $h, $data];
299
300 $self->update;
301}
302
255sub draw { 303sub draw {
256 my ($self) = @_; 304 my ($self) = @_;
305
306 return unless $::MAP;
257 307
258 my $focused = $CFClient::UI::FOCUS == $self 308 my $focused = $CFClient::UI::FOCUS == $self
259 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 309 || $CFClient::UI::FOCUS == $self->{completer}{entry};
260 310
261 return 311 return
262 unless $::CONN && ($focused || !$::FAST); 312 unless $focused || !$::FAST;
263 313
264 if (delete $self->{need_update}) { 314 if (delete $self->{need_update}) {
315 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
316
317 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
318 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
319
320 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
321 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
322
323 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
324 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
325
326 if ($::CFG->{fow_enable}) {
327 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
328
329 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
330 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
331 glConvolutionFilter2D (
332 GL_CONVOLUTION_2D,
333 GL_ALPHA,
334 3, 3,
335 GL_ALPHA, GL_FLOAT,
336 (pack "f*", @{ $self->{smooth_matrix} }),
337 );
338 glEnable GL_CONVOLUTION_2D;
339 }
340
265 $self->{fow_texture} ||= glGenTexture; 341 $self->{fow_texture} = new CFClient::Texture
342 w => $w,
343 h => $h,
344 data => $data,
345 internalformat => GL_ALPHA,
346 format => GL_ALPHA;
347
348 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
349 } else {
350 delete $self->{fow_texture};
351 }
266 352
267 glNewList $self->{list}; 353 glNewList $self->{list};
268 354
269 if ($::MAP) {
270 my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
271 my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
272
273 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};
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;
277
278 glPushMatrix; 355 glPushMatrix;
356 glTranslate $sx0, $sy0;
279 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 357 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
280 358
281 glTranslate $sx0, $sy0; 359 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
282 360
283 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 361 glScale 32, 32;
284 362
285 if ($::CFG->{fow_enable}) { 363 if (my $tex = $self->{fow_texture}) {
286 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
287 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
288 glConvolutionFilter2D (
289 GL_CONVOLUTION_2D,
290 GL_ALPHA,
291 3, 3,
292 GL_ALPHA, GL_FLOAT,
293 (pack "f*", @{ $self->{smooth_matrix} }),
294 );
295 glEnable GL_CONVOLUTION_2D;
296 }
297
298 $self->{fow_texture_name} ||= glGenTexture;
299 # try to re-use the texture name: TODO improve texture class instead
300
301 $self->{fow_texture} = new CFClient::Texture
302 w => $w,
303 h => $h,
304 data => $data,
305 name => $self->{fow_texture_name},
306 internalformat => GL_ALPHA,
307 format => GL_ALPHA;
308
309 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
310
311 glEnable GL_TEXTURE_2D; 364 glEnable GL_TEXTURE_2D;
312 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 365 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
313 366
314 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 367 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
315 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 368 $self->{fow_texture}->draw_quad_alpha (0, 0);
316 369
317 glDisable GL_TEXTURE_2D; 370 glDisable GL_TEXTURE_2D;
318 } 371 }
319 372
373 if ($self->{magicmap}) {
374 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
375
376 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
377 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
378
379 glTranslate - $x - 1, - $y - 1;
380 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
381 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
382 }
383
320 glPopMatrix; 384 glPopMatrix;
321 }
322
323 glEndList; 385 glEndList;
324 } 386 }
325 387
326 glPushMatrix;
327 glCallList $self->{list}; 388 glCallList $self->{list};
328 glPopMatrix;
329 389
330 # TNT2 emulates logops in software (or worse :) 390 # TNT2 emulates logops in software (or worse :)
331 if ($focused) { 391 unless ($focused) {
332 (delete $self->{out_of_focus})->destroy
333 if $self->{out_of_focus};
334 } else {
335 glColor 0.4, 0.2, 0.2, 0.6; 392 glColor 0.4, 0.2, 0.2, 0.6;
336 glEnable GL_BLEND; 393 glEnable GL_BLEND;
337 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 394 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
338 glBegin GL_QUADS; 395 glBegin GL_QUADS;
339 glVertex 0, 0; 396 glVertex 0, 0;
340 glVertex 0, $::HEIGHT; 397 glVertex 0, $::HEIGHT;
341 glVertex $::WIDTH, $::HEIGHT; 398 glVertex $::WIDTH, $::HEIGHT;
342 glVertex $::WIDTH, 0; 399 glVertex $::WIDTH, 0;
343 glEnd; 400 glEnd;
344 glDisable GL_BLEND; 401 glDisable GL_BLEND;
345
346# $self->{out_of_focus} ||= do {
347# my $label = new CFClient::UI::Label
348# x => 0,
349# y => 0,
350# z => 1,
351# ellipsise => 0,
352# text => "map out of focus (click map to play)";
353#
354# $label->show;
355# $label->update;
356#
357# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
358# $label->move_abs (
359# ($::WIDTH - $label->{w}) * 0.5,
360# ($::HEIGHT - $label->{h}) * 0.5,
361# );
362# });
363#
364# $label
365# };
366 } 402 }
367} 403}
368 404
369sub DESTROY { 405sub DESTROY {
370 my $self = shift; 406 my $self = shift;
… …
383 419
384sub size_request { 420sub size_request {
385 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 421 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
386} 422}
387 423
388sub size_allocate { 424sub invoke_size_allocate {
389 my ($self, $w, $h) = @_; 425 my ($self, $w, $h) = @_;
390 426
391 $self->SUPER::size_allocate ($w, $h);
392 $self->update; 427 $self->update;
428
429 1
393} 430}
394 431
395sub update { 432sub update {
396 my ($self) = @_; 433 my ($self) = @_;
397 434
… …
482 ]; 519 ];
483 520
484 $self->{entry} = new CFClient::UI::Entry 521 $self->{entry} = new CFClient::UI::Entry
485 on_changed => sub { 522 on_changed => sub {
486 $self->update_labels; 523 $self->update_labels;
524 0
487 }, 525 },
488 on_button_down => sub { 526 on_button_down => sub {
489 my ($entry, $ev, $x, $y) = @_; 527 my ($entry, $ev, $x, $y) = @_;
490 528
491 if ($ev->{button} == 3) { 529 if ($ev->{button} == 3) {
492 (new CFClient::UI::Menu 530 (new CFClient::UI::Menu
493 items => [ 531 items => [
532 ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key"
494 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }] 533 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
495 ], 534 ],
496 )->popup ($ev); 535 )->popup ($ev);
497 return 1; 536 return 1;
498 } 537 }
499 0 538 0
… …
506 if ($ev->{sym} == 13) { 545 if ($ev->{sym} == 13) {
507 if (exists $self->{select}) { 546 if (exists $self->{select}) {
508 $self->{last_command} = $self->{select}; 547 $self->{last_command} = $self->{select};
509 $::CONN->user_send ($self->{select}); 548 $::CONN->user_send ($self->{select});
510 549
511 unshift @{$self->{history}}, $self->{select}; 550 unshift @{$self->{history}}, $self->{entry}->get_text;
512 $self->{hist_ptr} = 0; 551 $self->{hist_ptr} = 0;
513 552
514 $self->hide; 553 $self->hide;
515 } 554 }
516 } elsif ($ev->{sym} == 27) { 555 } elsif ($ev->{sym} == 27) {
517 $self->{hist_ptr} = 0; 556 $self->{hist_ptr} = 0;
518 $self->hide; 557 $self->hide;
519 return;
520 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 558 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
521 if ($self->{hist_ptr} > 1) { 559 if ($self->{hist_ptr} > 1) {
522 $self->{hist_ptr}--; 560 $self->{hist_ptr}--;
523 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 561 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524 } elsif ($self->{hist_ptr} > 0) { 562 } elsif ($self->{hist_ptr} > 0) {
… …
564 602
565 $self->{entry}->set_text ($prefix); 603 $self->{entry}->set_text ($prefix);
566 $self->show; 604 $self->show;
567} 605}
568 606
569sub size_allocate { 607sub invoke_size_allocate {
570 my ($self, $w, $h) = @_; 608 my ($self, $w, $h) = @_;
571 609
572 $self->SUPER::size_allocate ($w, $h);
573 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 610 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
611
612 $self->SUPER::invoke_size_allocate ($w, $h)
574} 613}
575 614
576sub show { 615sub show {
577 my ($self) = @_; 616 my ($self) = @_;
578 617
579 $self->SUPER::show; 618 $self->SUPER::show;
580 $self->{entry}->focus_in; 619 $self->{entry}->grab_focus;
581} 620}
582 621
583sub hide { 622sub hide {
584 my ($self) = @_; 623 my ($self) = @_;
624
625 $self->{hist_ptr} = 0;
585 626
586 $self->SUPER::hide; 627 $self->SUPER::hide;
587 $self->{entry}->set_text (""); 628 $self->{entry}->set_text ("");
588} 629}
589 630
590sub key_down { 631sub inject_key_down {
591 my ($self, $ev) = @_; 632 my ($self, $ev) = @_;
592 633
634 $self->{entry}->grab_focus;
593 $self->{entry}->key_down ($ev) 635 $self->{entry}->emit (key_down => $ev);
594} 636}
595 637
596sub update_labels { 638sub update_labels {
597 my ($self) = @_; 639 my ($self) = @_;
598 640
… …
685 $label->set_text (""); 727 $label->set_text ("");
686 $label->set_tooltip (""); 728 $label->set_tooltip ("");
687 } 729 }
688 730
689 $self->update; 731 $self->update;
690 ###
691} 732}
692 733
693sub _draw { 734sub _draw {
694 my ($self) = @_; 735 my ($self) = @_;
695 736

Diff Legend

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