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.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 (
16 z => -1, 22 z => -1,
17 can_focus => 1, 23 can_focus => 1,
18 list => glGenList, 24 list => glGenList,
25
26 smooth_matrix => [
27 0.05, 0.13, 0.05,
28 0.13, 0.30, 0.13,
29 0.05, 0.13, 0.05,
30 ],
31
19 @_ 32 @_
20 ); 33 );
21 34
22 $self->{completer} = new CFClient::MapWidget::Command:: 35 $self->{completer} = new CFClient::MapWidget::Command::
23 command => $self->{command}, 36 command => $self->{command},
24 can_focus => 1, 37 tooltip => "<b>The Command Completer</b>\n\n"
38 . "This is your central interface to send text commands to the server. "
39 . "To enter a verbatim command to send to the server, just type the command, "
40 . "followed by a space, and press return. "
41 . "Typing the initial letters of words (or just any letters) displays guesses "
42 . "for commands you might want to use.\n"
43 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
44 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
25 ; 45 ;
26 46
27 $self 47 $self
28} 48}
29 49
… …
31 my ($self, $command, $tooltip, $widget, $cb) = @_; 51 my ($self, $command, $tooltip, $widget, $cb) = @_;
32 52
33 (my $data = $command) =~ s/\\//g; 53 (my $data = $command) =~ s/\\//g;
34 54
35 $tooltip =~ s/^\s+//; 55 $tooltip =~ s/^\s+//;
36
37 $tooltip = "<big>$data</big>\n\n$tooltip"; 56 $tooltip = "<big>$data</big>\n\n$tooltip";
38
39 $tooltip =~ s/\s+$//; 57 $tooltip =~ s/\s+$//;
40 58
41 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 59 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
42} 60}
43 61
44sub clr_commands { 62sub clr_commands {
45 my ($self) = @_; 63 my ($self) = @_;
46 64
47 %{$self->{completer}{command}} = (); 65 %{$self->{completer}{command}} = ();
48}
49 66
67 $self->{completer}->hide
68 if $self->{completer};
69}
70
50sub button_down { 71sub invoke_button_down {
51 my ($self, $ev, $x, $y) = @_; 72 my ($self, $ev, $x, $y) = @_;
52 73
53 $self->focus_in;
54
55 if ($ev->{button} == 2) { 74 if ($ev->{button} == 1) {
75 $self->grab_focus;
76 return unless $::CONN;
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
81 $x -= int 0.5 * $self->{sw};
82 $y -= int 0.5 * $self->{sh};
83
84 $::CONN->lookat ($x, $y)
85 if $::CONN;
86
87 } elsif ($ev->{button} == 2) {
88 $self->grab_focus;
89 return unless $::CONN;
90
56 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 91 my ($ox, $oy) = ($ev->{x}, $ev->{y});
57 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 92 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
58 93
59 $self->{motion} = sub { 94 $self->{motion} = sub {
60 my ($ev, $x, $y) = @_; 95 my ($ev, $x, $y) = @_;
… …
64 $::CFG->{map_shift_x} = $bw + $x - $ox; 99 $::CFG->{map_shift_x} = $bw + $x - $ox;
65 $::CFG->{map_shift_y} = $bh + $y - $oy; 100 $::CFG->{map_shift_y} = $bh + $y - $oy;
66 101
67 $self->update; 102 $self->update;
68 }; 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);
122 }
123
69 } 124 1
70} 125}
71 126
72sub button_up { 127sub invoke_button_up {
73 my ($self, $ev, $x, $y) = @_; 128 my ($self, $ev, $x, $y) = @_;
74 129
75 delete $self->{motion}; 130 delete $self->{motion};
76}
77 131
132 1
133}
134
78sub mouse_motion { 135sub invoke_mouse_motion {
79 my ($self, $ev, $x, $y) = @_; 136 my ($self, $ev, $x, $y) = @_;
80 137
138 if ($self->{motion}) {
81 $self->{motion}->($ev, $x, $y) if $self->{motion}; 139 $self->{motion}->($ev, $x, $y);
140 } else {
141 return 0;
142 }
143
144 1
82} 145}
83 146
84sub size_request { 147sub size_request {
85 ( 148 (
86 1 + 32 * int $::WIDTH / 32, 149 32 * CFClient::ceil $::WIDTH / 32,
87 1 + 32 * int $::HEIGHT / 32, 150 32 * CFClient::ceil $::HEIGHT / 32,
88 ) 151 )
89} 152}
90 153
91sub update { 154sub update {
92 my ($self) = @_; 155 my ($self) = @_;
… …
109 CFClient::SDLK_RIGHT, [3, "east"], 172 CFClient::SDLK_RIGHT, [3, "east"],
110 CFClient::SDLK_DOWN, [5, "south"], 173 CFClient::SDLK_DOWN, [5, "south"],
111 CFClient::SDLK_LEFT, [7, "west"], 174 CFClient::SDLK_LEFT, [7, "west"],
112); 175);
113 176
114sub key_down { 177sub invoke_key_down {
115 my ($self, $ev) = @_; 178 my ($self, $ev) = @_;
116
117 return unless $::CONN;
118 179
119 my $mod = $ev->{mod}; 180 my $mod = $ev->{mod};
120 my $sym = $ev->{sym}; 181 my $sym = $ev->{sym};
121 my $uni = $ev->{unicode}; 182 my $uni = $ev->{unicode};
122 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
123 if ($sym == CFClient::SDLK_KP5) { 215 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
124 $::CONN->user_send ("stay fire"); 216 $::CONN->user_send ("stay fire");
125 } elsif ($uni == ord ",") { 217 } elsif ($uni == ord ",") {
126 $::CONN->user_send ("take"); 218 $::CONN->user_send ("take");
127 } elsif ($uni == ord " ") { 219 } elsif ($uni == ord " ") {
128 $::CONN->user_send ("apply"); 220 $::CONN->user_send ("apply");
129 } elsif ($uni == ord "\t") { 221 } elsif ($uni == ord ".") {
130 # TODO: toggle inventory 222 $::CONN->user_send ($self->{completer}{last_command})
223 if exists $self->{completer}{last_command};
224 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
225 $::CONN->user_send ($_) for @$bind_cmd;
131 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 226 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
132 $::CONN->user_send ("rotateshoottype +"); 227 $::CONN->user_send ("rotateshoottype +");
133 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 228 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
134 $::CONN->user_send ("rotateshoottype -"); 229 $::CONN->user_send ("rotateshoottype -");
135 } elsif ($uni == ord '"') { 230 } elsif ($uni == ord '"') {
136 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 231 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
137 $self->{completer}->show; 232 $self->{completer}->show;
138 } elsif ($uni == ord "'") { 233 } elsif ($uni == ord "'") {
139 $self->{completer}->set_prefix (""); 234 $self->{completer}->set_prefix ("");
140 $self->{completer}->show; 235 $self->{completer}->show;
141 } elsif (exists $DIR{$sym}) { 236 } elsif (exists $DIR{$sym}) {
142 if ($mod & CFClient::KMOD_SHIFT) { 237 if ($mod & CFClient::KMOD_SHIFT) {
143 $self->{shft}++; 238 $self->{shft}++;
239 if ($DIR{$sym}[0] != $self->{fire_dir}) {
144 $::CONN->user_send ("fire $DIR{$sym}[0]"); 240 $::CONN->user_send ("fire $DIR{$sym}[0]");
241 }
242 $self->{fire_dir} = $DIR{$sym}[0];
145 } elsif ($mod & CFClient::KMOD_CTRL) { 243 } elsif ($mod & CFClient::KMOD_CTRL) {
146 $self->{ctrl}++; 244 $self->{ctrl}++;
147 $::CONN->user_send ("run $DIR{$sym}[0]"); 245 $::CONN->user_send ("run $DIR{$sym}[0]");
148 } else { 246 } else {
149 $::CONN->user_send ("$DIR{$sym}[1]"); 247 $::CONN->user_send ("$DIR{$sym}[1]");
150 } 248 }
151 } elsif ($ev->{unicode}) { 249 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
152 $self->{completer}->key_down ($ev); 250 $self->{completer}->inject_key_down ($ev);
153 $self->{completer}->show; 251 $self->{completer}->show;
252 } else {
253 return 0;
254 }
255
154 } 256 1
155} 257}
156 258
157sub key_up { 259sub invoke_key_up {
158 my ($self, $ev) = @_; 260 my ($self, $ev) = @_;
159 261
262 my $res = 0;
160 my $mod = $ev->{mod}; 263 my $mod = $ev->{mod};
161 my $sym = $ev->{sym}; 264 my $sym = $ev->{sym};
162 265
266 if ($::CFG->{shift_fire_stop}) {
163 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 267 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
164 $::CONN->user_send ("fire_stop"); 268 $::CONN->user_send ("fire_stop");
269 delete $self->{fire_dir};
270 $res = 1;
271 }
272 } else {
273 if (exists $DIR{$sym} && delete $self->{shft}) {
274 $::CONN->user_send ("fire_stop");
275 delete $self->{fire_dir};
276 $res = 1;
277 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
278 $::CONN->user_send ("fire_stop");
279 delete $self->{fire_dir};
280 $res = 1;
281 }
165 } 282 }
283
166 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 284 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
167 $::CONN->user_send ("run_stop"); 285 $::CONN->user_send ("run_stop");
286 $res = 1;
168 } 287 }
288
289 $res
290}
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;
169} 301}
170 302
171sub draw { 303sub draw {
172 my ($self) = @_; 304 my ($self) = @_;
305
306 return unless $::MAP;
173 307
174 my $focused = $CFClient::UI::FOCUS == $self 308 my $focused = $CFClient::UI::FOCUS == $self
175 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 309 || $CFClient::UI::FOCUS == $self->{completer}{entry};
176 310
177 return 311 return
178 unless $focused || !$::FAST; 312 unless $focused || !$::FAST;
179 313
180 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
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 }
352
181 glNewList $self->{list}; 353 glNewList $self->{list};
182 354
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; 355 glPushMatrix;
356 glTranslate $sx0, $sy0;
191 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 357 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
192 358
193 glTranslate $sx0 - 32, $sy0 - 32, 0; 359 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
194 360
195 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 361 glScale 32, 32;
196 362
197 if ($::CFG->{fow_enable}) { 363 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; 364 glEnable GL_TEXTURE_2D;
227 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 365 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
228 366
229 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 367 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
230 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 368 $self->{fow_texture}->draw_quad_alpha (0, 0);
231 369
232 glDisable GL_TEXTURE_2D; 370 glDisable GL_TEXTURE_2D;
233 } 371 }
234 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
235 glPopMatrix; 384 glPopMatrix;
236 }
237
238 glEndList; 385 glEndList;
239 } 386 }
240 387
241 glPushMatrix;
242 glCallList $self->{list}; 388 glCallList $self->{list};
243 glPopMatrix;
244 389
245 # TNT2 emulates logops in software (or worse :) 390 # TNT2 emulates logops in software (or worse :)
246 if ($focused) { 391 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; 392 glColor 0.4, 0.2, 0.2, 0.6;
251 glEnable GL_BLEND; 393 glEnable GL_BLEND;
252 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 394 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
253 glBegin GL_QUADS; 395 glBegin GL_QUADS;
254 glVertex 0, 0; 396 glVertex 0, 0;
255 glVertex 0, $::HEIGHT; 397 glVertex 0, $::HEIGHT;
256 glVertex $::WIDTH, $::HEIGHT; 398 glVertex $::WIDTH, $::HEIGHT;
257 glVertex $::WIDTH, 0; 399 glVertex $::WIDTH, 0;
258 glEnd; 400 glEnd;
259 glDisable GL_BLEND; 401 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 } 402 }
282} 403}
283 404
284sub DESTROY { 405sub DESTROY {
285 my $self = shift; 406 my $self = shift;
… …
298 419
299sub size_request { 420sub size_request {
300 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 421 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
301} 422}
302 423
303sub size_allocate { 424sub invoke_size_allocate {
304 my ($self, $w, $h) = @_; 425 my ($self, $w, $h) = @_;
305 426
306 $self->SUPER::size_allocate ($w, $h);
307 $self->update; 427 $self->update;
428
429 1
308} 430}
309 431
310sub update { 432sub update {
311 my ($self) = @_; 433 my ($self) = @_;
312 434
… …
395 fontsize => $_, 517 fontsize => $_,
396 ), (0.8) x 16 518 ), (0.8) x 16
397 ]; 519 ];
398 520
399 $self->{entry} = new CFClient::UI::Entry 521 $self->{entry} = new CFClient::UI::Entry
400 connect_changed => sub { 522 on_changed => sub {
401 $self->update_labels; 523 $self->update_labels;
524 0
402 }, 525 },
526 on_button_down => sub {
527 my ($entry, $ev, $x, $y) = @_;
528
529 if ($ev->{button} == 3) {
530 (new CFClient::UI::Menu
531 items => [
532 ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key"
533 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
534 ],
535 )->popup ($ev);
536 return 1;
537 }
538 0
539 },
403 connect_key_down => sub { 540 on_key_down => sub {
404 my ($entry, $ev) = @_; 541 my ($entry, $ev) = @_;
405 542
406 my $self = $entry->{parent}{parent}; 543 my $self = $entry->{parent}{parent};
407 544
408 if ($ev->{sym} == 13) { 545 if ($ev->{sym} == 13) {
409 if (exists $self->{select}) { 546 if (exists $self->{select}) {
547 $self->{last_command} = $self->{select};
410 $::CONN->user_send ($self->{select}); 548 $::CONN->user_send ($self->{select});
549
550 unshift @{$self->{history}}, $self->{entry}->get_text;
551 $self->{hist_ptr} = 0;
552
411 $self->hide; 553 $self->hide;
412 } 554 }
413 } elsif ($ev->{sym} == 27) { 555 } elsif ($ev->{sym} == 27) {
556 $self->{hist_ptr} = 0;
414 $self->hide; 557 $self->hide;
415 return;
416 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 558 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
559 if ($self->{hist_ptr} > 1) {
560 $self->{hist_ptr}--;
561 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
562 } elsif ($self->{hist_ptr} > 0) {
563 $self->{hist_ptr}--;
564 $self->{entry}->set_text ($self->{hist_saveback});
565 } else {
417 ++$self->{select_offset} 566 ++$self->{select_offset}
418 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 567 if $self->{select_offset} < $#{ $self->{last_match} || [] };
568 }
419 $self->update_labels; 569 $self->update_labels;
420 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 570 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
571 if ($self->{select_offset}) {
421 --$self->{select_offset} 572 --$self->{select_offset}
573 } else {
574 unless ($self->{hist_ptr}) {
575 $self->{hist_saveback} = $self->{entry}->get_text;
576 }
577 if ($self->{hist_ptr} <= $#{$self->{history}}) {
422 if $self->{select_offset}; 578 $self->{hist_ptr}++;
579 }
580 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
581 if exists $self->{history}->[$self->{hist_ptr} - 1];
582 }
423 $self->update_labels; 583 $self->update_labels;
424 } else { 584 } else {
425 return 0; 585 return 0;
426 } 586 }
427 587
… …
442 602
443 $self->{entry}->set_text ($prefix); 603 $self->{entry}->set_text ($prefix);
444 $self->show; 604 $self->show;
445} 605}
446 606
447sub size_allocate { 607sub invoke_size_allocate {
448 my ($self, $w, $h) = @_; 608 my ($self, $w, $h) = @_;
449 609
450 $self->SUPER::size_allocate ($w, $h);
451 $self->move (($::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)
452} 613}
453 614
454sub show { 615sub show {
455 my ($self) = @_; 616 my ($self) = @_;
456 617
457 $self->SUPER::show; 618 $self->SUPER::show;
458 $self->{entry}->focus_in; 619 $self->{entry}->grab_focus;
459} 620}
460 621
461sub hide { 622sub hide {
462 my ($self) = @_; 623 my ($self) = @_;
624
625 $self->{hist_ptr} = 0;
463 626
464 $self->SUPER::hide; 627 $self->SUPER::hide;
465 $self->{entry}->set_text (""); 628 $self->{entry}->set_text ("");
466} 629}
467 630
468sub key_down { 631sub inject_key_down {
469 my ($self, $ev) = @_; 632 my ($self, $ev) = @_;
470 633
634 $self->{entry}->grab_focus;
471 $self->{entry}->key_down ($ev); 635 $self->{entry}->emit (key_down => $ev);
472} 636}
473 637
474sub update_labels { 638sub update_labels {
475 my ($self) = @_; 639 my ($self) = @_;
476 640
… …
509 673
510 @match = map $self->{command}{$_->[0]}, 674 @match = map $self->{command}{$_->[0]},
511 sort { 675 sort {
512 $a->[1] <=> $b->[1] 676 $a->[1] <=> $b->[1]
513 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 677 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
514 or (length $a->[0]) <=> (length $b->[0]) 678 or (length $b->[0]) <=> (length $a->[0])
515 } @match; 679 } @match;
516 } 680 }
517 681
518 $self->{last_search} = $cmd; 682 $self->{last_search} = $text;
519 $self->{last_match} = \@match; 683 $self->{last_match} = \@match;
520 684
521 $self->{select_offset} = 0; 685 $self->{select_offset} = 0;
522 } 686 }
523 687
… …
563 $label->set_text (""); 727 $label->set_text ("");
564 $label->set_tooltip (""); 728 $label->set_tooltip ("");
565 } 729 }
566 730
567 $self->update; 731 $self->update;
568 ###
569} 732}
570 733
571sub _draw { 734sub _draw {
572 my ($self) = @_; 735 my ($self) = @_;
573 736

Diff Legend

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