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.36 by root, Thu May 25 00:26:19 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
22 $self->{completer} = new CFClient::MapWidget::Command:: 33 $self->{completer} = new CFClient::MapWidget::Command::
23 command => $self->{command}, 34 command => $self->{command},
24 can_focus => 1, 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.",
25 ; 44 ;
26 45
27 $self 46 $self
28} 47}
29 48
… …
31 my ($self, $command, $tooltip, $widget, $cb) = @_; 50 my ($self, $command, $tooltip, $widget, $cb) = @_;
32 51
33 (my $data = $command) =~ s/\\//g; 52 (my $data = $command) =~ s/\\//g;
34 53
35 $tooltip =~ s/^\s+//; 54 $tooltip =~ s/^\s+//;
36
37 $tooltip = "<big>$data</big>\n\n$tooltip"; 55 $tooltip = "<big>$data</big>\n\n$tooltip";
38
39 $tooltip =~ s/\s+$//; 56 $tooltip =~ s/\s+$//;
40 57
41 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 58 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
42} 59}
43 60
… …
45 my ($self) = @_; 62 my ($self) = @_;
46 63
47 %{$self->{completer}{command}} = (); 64 %{$self->{completer}{command}} = ();
48} 65}
49 66
50sub button_down { 67sub invoke_button_down {
51 my ($self, $ev, $x, $y) = @_; 68 my ($self, $ev, $x, $y) = @_;
52 69
70 return unless $::CONN;
71
53 $self->focus_in; 72 $self->grab_focus;
54 73
55 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) {
56 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 85 my ($ox, $oy) = ($ev->{x}, $ev->{y});
57 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
58 87
59 $self->{motion} = sub { 88 $self->{motion} = sub {
60 my ($ev, $x, $y) = @_; 89 my ($ev, $x, $y) = @_;
… …
65 $::CFG->{map_shift_y} = $bh + $y - $oy; 94 $::CFG->{map_shift_y} = $bh + $y - $oy;
66 95
67 $self->update; 96 $self->update;
68 }; 97 };
69 } 98 }
70}
71 99
100 1
101}
102
72sub button_up { 103sub invoke_button_up {
73 my ($self, $ev, $x, $y) = @_; 104 my ($self, $ev, $x, $y) = @_;
74 105
75 delete $self->{motion}; 106 delete $self->{motion};
76}
77 107
108 1
109}
110
78sub mouse_motion { 111sub invoke_mouse_motion {
79 my ($self, $ev, $x, $y) = @_; 112 my ($self, $ev, $x, $y) = @_;
80 113
114 if ($self->{motion}) {
81 $self->{motion}->($ev, $x, $y) if $self->{motion}; 115 $self->{motion}->($ev, $x, $y);
116 } else {
117 return 0;
118 }
119
120 1
82} 121}
83 122
84sub size_request { 123sub size_request {
85 ( 124 (
86 1 + 32 * int $::WIDTH / 32, 125 32 * CFClient::ceil $::WIDTH / 32,
87 1 + 32 * int $::HEIGHT / 32, 126 32 * CFClient::ceil $::HEIGHT / 32,
88 ) 127 )
89} 128}
90 129
91sub update { 130sub update {
92 my ($self) = @_; 131 my ($self) = @_;
… …
109 CFClient::SDLK_RIGHT, [3, "east"], 148 CFClient::SDLK_RIGHT, [3, "east"],
110 CFClient::SDLK_DOWN, [5, "south"], 149 CFClient::SDLK_DOWN, [5, "south"],
111 CFClient::SDLK_LEFT, [7, "west"], 150 CFClient::SDLK_LEFT, [7, "west"],
112); 151);
113 152
114sub key_down { 153sub invoke_key_down {
115 my ($self, $ev) = @_; 154 my ($self, $ev) = @_;
116 155
117 return unless $::CONN; 156 return 0 unless $::CONN;
118 157
119 my $mod = $ev->{mod}; 158 my $mod = $ev->{mod};
120 my $sym = $ev->{sym}; 159 my $sym = $ev->{sym};
121 my $uni = $ev->{unicode}; 160 my $uni = $ev->{unicode};
122 161
… …
124 $::CONN->user_send ("stay fire"); 163 $::CONN->user_send ("stay fire");
125 } elsif ($uni == ord ",") { 164 } elsif ($uni == ord ",") {
126 $::CONN->user_send ("take"); 165 $::CONN->user_send ("take");
127 } elsif ($uni == ord " ") { 166 } elsif ($uni == ord " ") {
128 $::CONN->user_send ("apply"); 167 $::CONN->user_send ("apply");
168 } elsif ($uni == ord ".") {
169 $::CONN->user_send ($self->{completer}{last_command})
170 if exists $self->{completer}{last_command};
129 } elsif ($uni == ord "\t") { 171 } elsif ($uni == ord "\t") {
130 # TODO: toggle inventory 172 $::PL_WINDOW->toggle_visibility;
173 $::PL_NOTEBOOK->set_current_page ("Inventory");
131 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 174 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
132 $::CONN->user_send ("rotateshoottype +"); 175 $::CONN->user_send ("rotateshoottype +");
133 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 176 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
134 $::CONN->user_send ("rotateshoottype -"); 177 $::CONN->user_send ("rotateshoottype -");
135 } elsif ($uni == ord '"') { 178 } elsif ($uni == ord '"') {
… …
139 $self->{completer}->set_prefix (""); 182 $self->{completer}->set_prefix ("");
140 $self->{completer}->show; 183 $self->{completer}->show;
141 } elsif (exists $DIR{$sym}) { 184 } elsif (exists $DIR{$sym}) {
142 if ($mod & CFClient::KMOD_SHIFT) { 185 if ($mod & CFClient::KMOD_SHIFT) {
143 $self->{shft}++; 186 $self->{shft}++;
187 if ($DIR{$sym}[0] != $self->{fire_dir}) {
144 $::CONN->user_send ("fire $DIR{$sym}[0]"); 188 $::CONN->user_send ("fire $DIR{$sym}[0]");
189 }
190 $self->{fire_dir} = $DIR{$sym}[0];
145 } elsif ($mod & CFClient::KMOD_CTRL) { 191 } elsif ($mod & CFClient::KMOD_CTRL) {
146 $self->{ctrl}++; 192 $self->{ctrl}++;
147 $::CONN->user_send ("run $DIR{$sym}[0]"); 193 $::CONN->user_send ("run $DIR{$sym}[0]");
148 } else { 194 } else {
149 $::CONN->user_send ("$DIR{$sym}[1]"); 195 $::CONN->user_send ("$DIR{$sym}[1]");
150 } 196 }
151 } elsif ($ev->{unicode}) { 197 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
198 $::BIND_EDITOR->set_binding (undef, undef, [],
199 sub {
200 my ($mod, $sym, $cmds) = @_;
201 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
202 });
203 $::BIND_EDITOR->start;
204 $::BIND_EDITOR->show;
205 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
206 $::BIND_EDITOR->stop;
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')) {
152 $self->{completer}->key_down ($ev); 212 $self->{completer}->invoke_key_down ($ev);
153 $self->{completer}->show; 213 $self->{completer}->show;
214 } else {
215 return 0;
216 }
217
154 } 218 1
155} 219}
156 220
157sub key_up { 221sub invoke_key_up {
158 my ($self, $ev) = @_; 222 my ($self, $ev) = @_;
159 223
224 my $res = 0;
160 my $mod = $ev->{mod}; 225 my $mod = $ev->{mod};
161 my $sym = $ev->{sym}; 226 my $sym = $ev->{sym};
162 227
228 if ($::CFG->{shift_fire_stop}) {
163 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 229 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
164 $::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 }
165 } 244 }
245
166 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 246 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
167 $::CONN->user_send ("run_stop"); 247 $::CONN->user_send ("run_stop");
248 $res = 1;
168 } 249 }
250
251 $res
252}
253
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;
169} 263}
170 264
171sub draw { 265sub draw {
172 my ($self) = @_; 266 my ($self) = @_;
267
268 return unless $::MAP;
173 269
174 my $focused = $CFClient::UI::FOCUS == $self 270 my $focused = $CFClient::UI::FOCUS == $self
175 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 271 || $CFClient::UI::FOCUS == $self->{completer}{entry};
176 272
177 return 273 return
178 unless $focused || !$::FAST; 274 unless $focused || !$::FAST;
179 275
180 if (delete $self->{need_update}) { 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
181 glNewList $self->{list}; 315 glNewList $self->{list};
182 316
183 if ($::MAP) {
184 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
185 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
186
187 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
188 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
189
190 glPushMatrix; 317 glPushMatrix;
318 glTranslate $sx0, $sy0;
191 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 319 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
192 320
193 glTranslate $sx0 - 32, $sy0 - 32, 0; 321 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
194 322
195 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 323 glScale 32, 32;
196 324
197 if ($::CFG->{fow_enable}) { 325 if (my $tex = $self->{fow_texture}) {
198 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
199 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
200 glConvolutionFilter2D (
201 GL_CONVOLUTION_2D,
202 GL_ALPHA,
203 3, 3,
204 GL_ALPHA, GL_FLOAT,
205 pack "f*",
206 0.05, 0.13, 0.05,
207 0.13, 0.30, 0.13,
208 0.05, 0.13, 0.05,
209 );
210 glEnable GL_CONVOLUTION_2D;
211 }
212
213 $self->{fow_texture_name} ||= glGenTexture;
214 # try to re-use the texture name: TODO improve texture class instead
215
216 $self->{fow_texture} = new CFClient::Texture
217 w => $w,
218 h => $h,
219 data => $data,
220 name => $self->{fow_texture_name},
221 internalformat => GL_ALPHA,
222 format => GL_ALPHA;
223
224 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
225
226 glEnable GL_TEXTURE_2D; 326 glEnable GL_TEXTURE_2D;
227 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 327 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
228 328
229 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 329 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
230 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 330 $self->{fow_texture}->draw_quad_alpha (0, 0);
231 331
232 glDisable GL_TEXTURE_2D; 332 glDisable GL_TEXTURE_2D;
233 } 333 }
234 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
235 glPopMatrix; 346 glPopMatrix;
236 }
237
238 glEndList; 347 glEndList;
239 } 348 }
240 349
241 glPushMatrix;
242 glCallList $self->{list}; 350 glCallList $self->{list};
243 glPopMatrix;
244 351
245 # TNT2 emulates logops in software (or worse :) 352 # TNT2 emulates logops in software (or worse :)
246 if ($focused) { 353 unless ($focused) {
247 (delete $self->{out_of_focus})->destroy
248 if $self->{out_of_focus};
249 } else {
250 glColor 0.4, 0.2, 0.2, 0.6; 354 glColor 0.4, 0.2, 0.2, 0.6;
251 glEnable GL_BLEND; 355 glEnable GL_BLEND;
252 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 356 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
253 glBegin GL_QUADS; 357 glBegin GL_QUADS;
254 glVertex 0, 0; 358 glVertex 0, 0;
255 glVertex 0, $::HEIGHT; 359 glVertex 0, $::HEIGHT;
256 glVertex $::WIDTH, $::HEIGHT; 360 glVertex $::WIDTH, $::HEIGHT;
257 glVertex $::WIDTH, 0; 361 glVertex $::WIDTH, 0;
258 glEnd; 362 glEnd;
259 glDisable GL_BLEND; 363 glDisable GL_BLEND;
260
261 $self->{out_of_focus} ||= do {
262 my $label = new CFClient::UI::Label
263 x => 0,
264 y => 0,
265 z => 1,
266 ellipsise => 0,
267 text => "map out of focus (click map to play)";
268
269 $label->show;
270 $label->update;
271
272 $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
273 $label->move (
274 ($::WIDTH - $label->{w}) * 0.5,
275 ($::HEIGHT - $label->{h}) * 0.5,
276 );
277 });
278
279 $label
280 };
281 } 364 }
282} 365}
283 366
284sub DESTROY { 367sub DESTROY {
285 my $self = shift; 368 my $self = shift;
… …
298 381
299sub size_request { 382sub size_request {
300 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 383 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
301} 384}
302 385
303sub size_allocate { 386sub invoke_size_allocate {
304 my ($self, $w, $h) = @_; 387 my ($self, $w, $h) = @_;
305 388
306 $self->SUPER::size_allocate ($w, $h);
307 $self->update; 389 $self->update;
390
391 1
308} 392}
309 393
310sub update { 394sub update {
311 my ($self) = @_; 395 my ($self) = @_;
312 396
… …
395 fontsize => $_, 479 fontsize => $_,
396 ), (0.8) x 16 480 ), (0.8) x 16
397 ]; 481 ];
398 482
399 $self->{entry} = new CFClient::UI::Entry 483 $self->{entry} = new CFClient::UI::Entry
400 connect_changed => sub { 484 on_changed => sub {
401 $self->update_labels; 485 $self->update_labels;
486 0
402 }, 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 },
403 connect_key_down => sub { 502 on_key_down => sub {
404 my ($entry, $ev) = @_; 503 my ($entry, $ev) = @_;
405 504
406 my $self = $entry->{parent}{parent}; 505 my $self = $entry->{parent}{parent};
407 506
408 if ($ev->{sym} == 13) { 507 if ($ev->{sym} == 13) {
409 if (exists $self->{select}) { 508 if (exists $self->{select}) {
509 $self->{last_command} = $self->{select};
410 $::CONN->user_send ($self->{select}); 510 $::CONN->user_send ($self->{select});
511
512 unshift @{$self->{history}}, $self->{entry}->get_text;
513 $self->{hist_ptr} = 0;
514
411 $self->hide; 515 $self->hide;
412 } 516 }
413 } elsif ($ev->{sym} == 27) { 517 } elsif ($ev->{sym} == 27) {
518 $self->{hist_ptr} = 0;
414 $self->hide; 519 $self->hide;
415 return;
416 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 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 {
417 ++$self->{select_offset} 528 ++$self->{select_offset}
418 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 529 if $self->{select_offset} < $#{ $self->{last_match} || [] };
530 }
419 $self->update_labels; 531 $self->update_labels;
420 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 532 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
533 if ($self->{select_offset}) {
421 --$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}}) {
422 if $self->{select_offset}; 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 }
423 $self->update_labels; 545 $self->update_labels;
424 } else { 546 } else {
425 return 0; 547 return 0;
426 } 548 }
427 549
… …
442 564
443 $self->{entry}->set_text ($prefix); 565 $self->{entry}->set_text ($prefix);
444 $self->show; 566 $self->show;
445} 567}
446 568
447sub size_allocate { 569sub invoke_size_allocate {
448 my ($self, $w, $h) = @_; 570 my ($self, $w, $h) = @_;
449 571
450 $self->SUPER::size_allocate ($w, $h);
451 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 572 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
573
574 $self->SUPER::invoke_size_allocate ($w, $h)
452} 575}
453 576
454sub show { 577sub show {
455 my ($self) = @_; 578 my ($self) = @_;
456 579
457 $self->SUPER::show; 580 $self->SUPER::show;
458 $self->{entry}->focus_in; 581 $self->{entry}->grab_focus;
459} 582}
460 583
461sub hide { 584sub hide {
462 my ($self) = @_; 585 my ($self) = @_;
463 586
464 $self->SUPER::hide; 587 $self->SUPER::hide;
465 $self->{entry}->set_text (""); 588 $self->{entry}->set_text ("");
466} 589}
467 590
468sub key_down { 591sub invoke_key_down {
469 my ($self, $ev) = @_; 592 my ($self, $ev) = @_;
470 593
471 $self->{entry}->key_down ($ev); 594 $self->{entry}->emit (key_down => $ev)
472} 595}
473 596
474sub update_labels { 597sub update_labels {
475 my ($self) = @_; 598 my ($self) = @_;
476 599
… …
509 632
510 @match = map $self->{command}{$_->[0]}, 633 @match = map $self->{command}{$_->[0]},
511 sort { 634 sort {
512 $a->[1] <=> $b->[1] 635 $a->[1] <=> $b->[1]
513 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 636 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
514 or (length $a->[0]) <=> (length $b->[0]) 637 or (length $b->[0]) <=> (length $a->[0])
515 } @match; 638 } @match;
516 } 639 }
517 640
518 $self->{last_search} = $cmd; 641 $self->{last_search} = $text;
519 $self->{last_match} = \@match; 642 $self->{last_match} = \@match;
520 643
521 $self->{select_offset} = 0; 644 $self->{select_offset} = 0;
522 } 645 }
523 646
… …
563 $label->set_text (""); 686 $label->set_text ("");
564 $label->set_tooltip (""); 687 $label->set_tooltip ("");
565 } 688 }
566 689
567 $self->update; 690 $self->update;
568 ###
569} 691}
570 692
571sub _draw { 693sub _draw {
572 my ($self) = @_; 694 my ($self) = @_;
573 695

Diff Legend

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