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.51 by root, Thu Jun 8 01:51:32 2006 UTC vs.
Revision 1.71 by root, Sun Jul 2 21:07:26 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 (
… …
34 . "To enter a verbatim command to send to the server, just type the command, " 38 . "To enter a verbatim command to send to the server, just type the command, "
35 . "followed by a space, and press return. " 39 . "followed by a space, and press return. "
36 . "Typing the initial letters of words (or just any letters) displays guesses " 40 . "Typing the initial letters of words (or just any letters) displays guesses "
37 . "for commands you might want to use.\n" 41 . "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" 42 . "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.", 43 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
40 ; 44 ;
41 45
42 $self 46 $self
43} 47}
44 48
… …
58 my ($self) = @_; 62 my ($self) = @_;
59 63
60 %{$self->{completer}{command}} = (); 64 %{$self->{completer}{command}} = ();
61} 65}
62 66
63sub button_down { 67sub invoke_button_down {
64 my ($self, $ev, $x, $y) = @_; 68 my ($self, $ev, $x, $y) = @_;
65 69
66 $self->focus_in;
67
68 if ($ev->{button} == 1) { 70 if ($ev->{button} == 1) {
69 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 71 $self->grab_focus;
70 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 72 return unless $::CONN;
71 73
72 my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99; 74 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
73 my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99; 75 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
74 76
75 $::CONN->send (sprintf "lookat %d %d", $fx, $fy); 77 $x -= int 0.5 * $self->{sw};
78 $y -= int 0.5 * $self->{sh};
79
80 $::CONN->lookat ($x, $y)
81 if $::CONN;
76 82
77 } elsif ($ev->{button} == 2) { 83 } elsif ($ev->{button} == 2) {
84 $self->grab_focus;
85 return unless $::CONN;
86
78 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 87 my ($ox, $oy) = ($ev->{x}, $ev->{y});
79 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 88 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
80 89
81 $self->{motion} = sub { 90 $self->{motion} = sub {
82 my ($ev, $x, $y) = @_; 91 my ($ev, $x, $y) = @_;
… …
86 $::CFG->{map_shift_x} = $bw + $x - $ox; 95 $::CFG->{map_shift_x} = $bw + $x - $ox;
87 $::CFG->{map_shift_y} = $bh + $y - $oy; 96 $::CFG->{map_shift_y} = $bh + $y - $oy;
88 97
89 $self->update; 98 $self->update;
90 }; 99 };
100 } elsif ($ev->{button} == 3) {
101 (new CFClient::UI::Menu
102 items => [
103 ["Help Browser… (F1)", sub { $::HELP_WINDOW->toggle_visibility }],
104 ["Stats &amp; Skills… (F2)", sub { ::toggle_player_page ($::STATS_PAGE) }],
105 ["Inventory… (F3)", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
106 ["Spells… (F4)", sub { ::toggle_player_page ($::SPELL_PAGE) }],
107 ["Setup… (F5)", sub { $::SETUP_DIALOG->toggle_visibility }],
108 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
109 [
110 $::PICKUP_ENABLE->{state}
111 ? "Disable automatic pickup"
112 : "Enable automatic pickup",
113 sub { $::PICKUP_ENABLE->toggle }
114 ],
115 ],
116 )->popup ($ev);
91 } 117 }
92 118
93 1 119 1
94} 120}
95 121
96sub button_up { 122sub invoke_button_up {
97 my ($self, $ev, $x, $y) = @_; 123 my ($self, $ev, $x, $y) = @_;
98 124
99 delete $self->{motion}; 125 delete $self->{motion};
100 126
101 1 127 1
102} 128}
103 129
104sub mouse_motion { 130sub invoke_mouse_motion {
105 my ($self, $ev, $x, $y) = @_; 131 my ($self, $ev, $x, $y) = @_;
106 132
107 if ($self->{motion}) { 133 if ($self->{motion}) {
108 $self->{motion}->($ev, $x, $y); 134 $self->{motion}->($ev, $x, $y);
109 } else { 135 } else {
… …
113 1 139 1
114} 140}
115 141
116sub size_request { 142sub size_request {
117 ( 143 (
118 1 + 32 * int $::WIDTH / 32, 144 32 * CFClient::ceil $::WIDTH / 32,
119 1 + 32 * int $::HEIGHT / 32, 145 32 * CFClient::ceil $::HEIGHT / 32,
120 ) 146 )
121} 147}
122 148
123sub update { 149sub update {
124 my ($self) = @_; 150 my ($self) = @_;
… …
141 CFClient::SDLK_RIGHT, [3, "east"], 167 CFClient::SDLK_RIGHT, [3, "east"],
142 CFClient::SDLK_DOWN, [5, "south"], 168 CFClient::SDLK_DOWN, [5, "south"],
143 CFClient::SDLK_LEFT, [7, "west"], 169 CFClient::SDLK_LEFT, [7, "west"],
144); 170);
145 171
146sub key_down { 172sub invoke_key_down {
147 my ($self, $ev) = @_; 173 my ($self, $ev) = @_;
148
149 return 0 unless $::CONN;
150 174
151 my $mod = $ev->{mod}; 175 my $mod = $ev->{mod};
152 my $sym = $ev->{sym}; 176 my $sym = $ev->{sym};
153 my $uni = $ev->{unicode}; 177 my $uni = $ev->{unicode};
154 178
179 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT;
180
181 if ($uni == ord "\t") {
182 $::PL_WINDOW->toggle_visibility;
183 } elsif ($sym == CFClient::SDLK_F1 && !$mod) {
184 $::HELP_WINDOW->toggle_visibility;
185 } elsif ($sym == CFClient::SDLK_F2 && !$mod) {
186 ::toggle_player_page ($::STATS_PAGE);
187 } elsif ($sym == CFClient::SDLK_F3 && !$mod) {
188 ::toggle_player_page ($::INVENTORY_PAGE);
189 } elsif ($sym == CFClient::SDLK_F4 && !$mod) {
190 ::toggle_player_page ($::SPELL_PAGE);
191 } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
192 $::SETUP_DIALOG->toggle_visibility;
193 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
194 $::BIND_EDITOR->set_binding (undef, undef, [],
195 sub {
196 my ($mod, $sym, $cmds) = @_;
197 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
198 });
199 $::BIND_EDITOR->start;
200 $::BIND_EDITOR->show;
201 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
202 $::BIND_EDITOR->stop;
203 $::BIND_EDITOR->ask_for_bind_and_commit;
204 $::BIND_EDITOR->hide;
205 } elsif (!$::CONN) {
206 return 0; # bindings further down need a valid connection
207
155 if ($sym == CFClient::SDLK_KP5) { 208 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
156 $::CONN->user_send ("stay fire"); 209 $::CONN->user_send ("stay fire");
157 } elsif ($uni == ord ",") { 210 } elsif ($uni == ord ",") {
158 $::CONN->user_send ("take"); 211 $::CONN->user_send ("take");
159 } elsif ($uni == ord " ") { 212 } elsif ($uni == ord " ") {
160 $::CONN->user_send ("apply"); 213 $::CONN->user_send ("apply");
161 } elsif ($uni == ord ".") { 214 } elsif ($uni == ord ".") {
162 $::CONN->user_send ($self->{completer}{last_command}) 215 $::CONN->user_send ($self->{completer}{last_command})
163 if exists $self->{completer}{last_command}; 216 if exists $self->{completer}{last_command};
164 } elsif ($uni == ord "\t") { 217 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
165 $::INV_WINDOW->toggle_visibility; 218 $::CONN->user_send ($_) for @$bind_cmd;
166 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 219 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
167 $::CONN->user_send ("rotateshoottype +"); 220 $::CONN->user_send ("rotateshoottype +");
168 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 221 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
169 $::CONN->user_send ("rotateshoottype -"); 222 $::CONN->user_send ("rotateshoottype -");
170 } elsif ($uni == ord '"') { 223 } elsif ($uni == ord '"') {
171 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 224 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
172 $self->{completer}->show; 225 $self->{completer}->show;
173 } elsif ($uni == ord "'") { 226 } elsif ($uni == ord "'") {
174 $self->{completer}->set_prefix (""); 227 $self->{completer}->set_prefix ("");
175 $self->{completer}->show; 228 $self->{completer}->show;
176 } elsif (exists $DIR{$sym}) { 229 } elsif (exists $DIR{$sym}) {
177 if ($mod & CFClient::KMOD_SHIFT) { 230 if ($mod & CFClient::KMOD_SHIFT) {
178 $self->{shft}++; 231 $self->{shft}++;
232 if ($DIR{$sym}[0] != $self->{fire_dir}) {
179 $::CONN->user_send ("fire $DIR{$sym}[0]"); 233 $::CONN->user_send ("fire $DIR{$sym}[0]");
234 }
235 $self->{fire_dir} = $DIR{$sym}[0];
180 } elsif ($mod & CFClient::KMOD_CTRL) { 236 } elsif ($mod & CFClient::KMOD_CTRL) {
181 $self->{ctrl}++; 237 $self->{ctrl}++;
182 $::CONN->user_send ("run $DIR{$sym}[0]"); 238 $::CONN->user_send ("run $DIR{$sym}[0]");
183 } else { 239 } else {
184 $::CONN->user_send ("$DIR{$sym}[1]"); 240 $::CONN->user_send ("$DIR{$sym}[1]");
185 } 241 }
186 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
187 $::BIND_EDITOR->set_binding (undef, undef, [],
188 sub {
189 my ($mod, $sym, $cmds) = @_;
190 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
191 });
192 $::BIND_EDITOR->start;
193 $::BIND_EDITOR->show;
194 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
195 $::BIND_EDITOR->stop;
196 $::BIND_EDITOR->ask_for_bind_and_commit;
197 $::BIND_EDITOR->hide;
198 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
199 $::CONN->user_send ($_) for @$bind_cmd;
200 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 242 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
201 $self->{completer}->key_down ($ev); 243 $self->{completer}->invoke_key_down ($ev);
202 $self->{completer}->show; 244 $self->{completer}->show;
203 } else { 245 } else {
204 return 0; 246 return 0;
205 } 247 }
206 248
207 1 249 1
208} 250}
209 251
210sub key_up { 252sub invoke_key_up {
211 my ($self, $ev) = @_; 253 my ($self, $ev) = @_;
212 254
213 my $res = 0; 255 my $res = 0;
214 my $mod = $ev->{mod}; 256 my $mod = $ev->{mod};
215 my $sym = $ev->{sym}; 257 my $sym = $ev->{sym};
216 258
259 if ($::CFG->{shift_fire_stop}) {
217 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 260 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
218 $::CONN->user_send ("fire_stop"); 261 $::CONN->user_send ("fire_stop");
262 delete $self->{fire_dir};
219 $res = 1; 263 $res = 1;
264 }
265 } else {
266 if (exists $DIR{$sym} && delete $self->{shft}) {
267 $::CONN->user_send ("fire_stop");
268 delete $self->{fire_dir};
269 $res = 1;
270 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
271 $::CONN->user_send ("fire_stop");
272 delete $self->{fire_dir};
273 $res = 1;
274 }
220 } 275 }
221 276
222 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 277 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
223 $::CONN->user_send ("run_stop"); 278 $::CONN->user_send ("run_stop");
224 $res = 1; 279 $res = 1;
225 } 280 }
226 281
227 $res 282 $res
228} 283}
229 284
285sub set_magicmap {
286 my ($self, $w, $h, $x, $y, $data) = @_;
287
288 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
289 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
290
291 $self->{magicmap} = [$x, $y, $w, $h, $data];
292
293 $self->update;
294}
295
230sub draw { 296sub draw {
231 my ($self) = @_; 297 my ($self) = @_;
298
299 return unless $::MAP;
232 300
233 my $focused = $CFClient::UI::FOCUS == $self 301 my $focused = $CFClient::UI::FOCUS == $self
234 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 302 || $CFClient::UI::FOCUS == $self->{completer}{entry};
235 303
236 return 304 return
237 unless $focused || !$::FAST; 305 unless $focused || !$::FAST;
238 306
239 if (delete $self->{need_update}) { 307 if (delete $self->{need_update}) {
308 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
309
310 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
311 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
312
313 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
314 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
315
316 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
317 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
318
319 if ($::CFG->{fow_enable}) {
320 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
321
322 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
323 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
324 glConvolutionFilter2D (
325 GL_CONVOLUTION_2D,
326 GL_ALPHA,
327 3, 3,
328 GL_ALPHA, GL_FLOAT,
329 (pack "f*", @{ $self->{smooth_matrix} }),
330 );
331 glEnable GL_CONVOLUTION_2D;
332 }
333
334 $self->{fow_texture} = new CFClient::Texture
335 w => $w,
336 h => $h,
337 data => $data,
338 internalformat => GL_ALPHA,
339 format => GL_ALPHA;
340
341 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
342 } else {
343 delete $self->{fow_texture};
344 }
345
240 glNewList $self->{list}; 346 glNewList $self->{list};
241 347
242 if ($::MAP) {
243 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
244 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
245
246 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
247 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
248
249 glPushMatrix; 348 glPushMatrix;
349 glTranslate $sx0, $sy0;
250 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 350 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
251 351
252 glTranslate $sx0 - 32, $sy0 - 32, 0; 352 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
253 353
254 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 354 glScale 32, 32;
255 355
256 if ($::CFG->{fow_enable}) { 356 if (my $tex = $self->{fow_texture}) {
257 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
258 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
259 glConvolutionFilter2D (
260 GL_CONVOLUTION_2D,
261 GL_ALPHA,
262 3, 3,
263 GL_ALPHA, GL_FLOAT,
264 (pack "f*", @{ $self->{smooth_matrix} }),
265 );
266 glEnable GL_CONVOLUTION_2D;
267 }
268
269 $self->{fow_texture_name} ||= glGenTexture;
270 # try to re-use the texture name: TODO improve texture class instead
271
272 $self->{fow_texture} = new CFClient::Texture
273 w => $w,
274 h => $h,
275 data => $data,
276 name => $self->{fow_texture_name},
277 internalformat => GL_ALPHA,
278 format => GL_ALPHA;
279
280 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
281
282 glEnable GL_TEXTURE_2D; 357 glEnable GL_TEXTURE_2D;
283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
284 359
285 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 360 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
286 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 361 $self->{fow_texture}->draw_quad_alpha (0, 0);
287 362
288 glDisable GL_TEXTURE_2D; 363 glDisable GL_TEXTURE_2D;
289 } 364 }
290 365
366 if ($self->{magicmap}) {
367 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
368
369 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
370 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
371
372 glTranslate - $x - 1, - $y - 1;
373 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
374 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
375 }
376
291 glPopMatrix; 377 glPopMatrix;
292 }
293
294 glEndList; 378 glEndList;
295 } 379 }
296 380
297 glPushMatrix;
298 glCallList $self->{list}; 381 glCallList $self->{list};
299 glPopMatrix;
300 382
301 # TNT2 emulates logops in software (or worse :) 383 # TNT2 emulates logops in software (or worse :)
302 if ($focused) { 384 unless ($focused) {
303 (delete $self->{out_of_focus})->destroy
304 if $self->{out_of_focus};
305 } else {
306 glColor 0.4, 0.2, 0.2, 0.6; 385 glColor 0.4, 0.2, 0.2, 0.6;
307 glEnable GL_BLEND; 386 glEnable GL_BLEND;
308 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 387 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
309 glBegin GL_QUADS; 388 glBegin GL_QUADS;
310 glVertex 0, 0; 389 glVertex 0, 0;
311 glVertex 0, $::HEIGHT; 390 glVertex 0, $::HEIGHT;
312 glVertex $::WIDTH, $::HEIGHT; 391 glVertex $::WIDTH, $::HEIGHT;
313 glVertex $::WIDTH, 0; 392 glVertex $::WIDTH, 0;
314 glEnd; 393 glEnd;
315 glDisable GL_BLEND; 394 glDisable GL_BLEND;
316
317# $self->{out_of_focus} ||= do {
318# my $label = new CFClient::UI::Label
319# x => 0,
320# y => 0,
321# z => 1,
322# ellipsise => 0,
323# text => "map out of focus (click map to play)";
324#
325# $label->show;
326# $label->update;
327#
328# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
329# $label->move_abs (
330# ($::WIDTH - $label->{w}) * 0.5,
331# ($::HEIGHT - $label->{h}) * 0.5,
332# );
333# });
334#
335# $label
336# };
337 } 395 }
338} 396}
339 397
340sub DESTROY { 398sub DESTROY {
341 my $self = shift; 399 my $self = shift;
… …
354 412
355sub size_request { 413sub size_request {
356 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 414 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
357} 415}
358 416
359sub size_allocate { 417sub invoke_size_allocate {
360 my ($self, $w, $h) = @_; 418 my ($self, $w, $h) = @_;
361 419
362 $self->SUPER::size_allocate ($w, $h);
363 $self->update; 420 $self->update;
421
422 1
364} 423}
365 424
366sub update { 425sub update {
367 my ($self) = @_; 426 my ($self) = @_;
368 427
… …
453 ]; 512 ];
454 513
455 $self->{entry} = new CFClient::UI::Entry 514 $self->{entry} = new CFClient::UI::Entry
456 on_changed => sub { 515 on_changed => sub {
457 $self->update_labels; 516 $self->update_labels;
517 0
518 },
519 on_button_down => sub {
520 my ($entry, $ev, $x, $y) = @_;
521
522 if ($ev->{button} == 3) {
523 (new CFClient::UI::Menu
524 items => [
525 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key"
526 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
527 ],
528 )->popup ($ev);
529 return 1;
530 }
531 0
458 }, 532 },
459 on_key_down => sub { 533 on_key_down => sub {
460 my ($entry, $ev) = @_; 534 my ($entry, $ev) = @_;
461 535
462 my $self = $entry->{parent}{parent}; 536 my $self = $entry->{parent}{parent};
463 537
464 if ($ev->{sym} == 13) { 538 if ($ev->{sym} == 13) {
465 if (exists $self->{select}) { 539 if (exists $self->{select}) {
466 $self->{last_command} = $self->{select}; 540 $self->{last_command} = $self->{select};
467 $::CONN->user_send ($self->{select}); 541 $::CONN->user_send ($self->{select});
542
543 unshift @{$self->{history}}, $self->{entry}->get_text;
544 $self->{hist_ptr} = 0;
545
468 $self->hide; 546 $self->hide;
469 } 547 }
470 } elsif ($ev->{sym} == 27) { 548 } elsif ($ev->{sym} == 27) {
549 $self->{hist_ptr} = 0;
471 $self->hide; 550 $self->hide;
472 return;
473 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 551 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
552 if ($self->{hist_ptr} > 1) {
553 $self->{hist_ptr}--;
554 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
555 } elsif ($self->{hist_ptr} > 0) {
556 $self->{hist_ptr}--;
557 $self->{entry}->set_text ($self->{hist_saveback});
558 } else {
474 ++$self->{select_offset} 559 ++$self->{select_offset}
475 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 560 if $self->{select_offset} < $#{ $self->{last_match} || [] };
561 }
476 $self->update_labels; 562 $self->update_labels;
477 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 563 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
564 if ($self->{select_offset}) {
478 --$self->{select_offset} 565 --$self->{select_offset}
566 } else {
567 unless ($self->{hist_ptr}) {
568 $self->{hist_saveback} = $self->{entry}->get_text;
569 }
570 if ($self->{hist_ptr} <= $#{$self->{history}}) {
479 if $self->{select_offset}; 571 $self->{hist_ptr}++;
572 }
573 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
574 if exists $self->{history}->[$self->{hist_ptr} - 1];
575 }
480 $self->update_labels; 576 $self->update_labels;
481 } else { 577 } else {
482 return 0; 578 return 0;
483 } 579 }
484 580
… …
499 595
500 $self->{entry}->set_text ($prefix); 596 $self->{entry}->set_text ($prefix);
501 $self->show; 597 $self->show;
502} 598}
503 599
504sub size_allocate { 600sub invoke_size_allocate {
505 my ($self, $w, $h) = @_; 601 my ($self, $w, $h) = @_;
506 602
507 $self->SUPER::size_allocate ($w, $h);
508 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 603 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
604
605 $self->SUPER::invoke_size_allocate ($w, $h)
509} 606}
510 607
511sub show { 608sub show {
512 my ($self) = @_; 609 my ($self) = @_;
513 610
514 $self->SUPER::show; 611 $self->SUPER::show;
515 $self->{entry}->focus_in; 612 $self->{entry}->grab_focus;
516} 613}
517 614
518sub hide { 615sub hide {
519 my ($self) = @_; 616 my ($self) = @_;
520 617
521 $self->SUPER::hide; 618 $self->SUPER::hide;
522 $self->{entry}->set_text (""); 619 $self->{entry}->set_text ("");
523} 620}
524 621
525sub key_down { 622sub invoke_key_down {
526 my ($self, $ev) = @_; 623 my ($self, $ev) = @_;
527 624
528 $self->{entry}->key_down ($ev) 625 $self->{entry}->emit (key_down => $ev)
529} 626}
530 627
531sub update_labels { 628sub update_labels {
532 my ($self) = @_; 629 my ($self) = @_;
533 630
… …
620 $label->set_text (""); 717 $label->set_text ("");
621 $label->set_tooltip (""); 718 $label->set_tooltip ("");
622 } 719 }
623 720
624 $self->update; 721 $self->update;
625 ###
626} 722}
627 723
628sub _draw { 724sub _draw {
629 my ($self) = @_; 725 my ($self) = @_;
630 726

Diff Legend

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