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.53 by root, Sun Jun 11 17:30:53 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)
76 if $::CONN; 81 if $::CONN;
77 82
78 } elsif ($ev->{button} == 2) { 83 } elsif ($ev->{button} == 2) {
84 $self->grab_focus;
85 return unless $::CONN;
86
79 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 87 my ($ox, $oy) = ($ev->{x}, $ev->{y});
80 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 88 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
81 89
82 $self->{motion} = sub { 90 $self->{motion} = sub {
83 my ($ev, $x, $y) = @_; 91 my ($ev, $x, $y) = @_;
… …
87 $::CFG->{map_shift_x} = $bw + $x - $ox; 95 $::CFG->{map_shift_x} = $bw + $x - $ox;
88 $::CFG->{map_shift_y} = $bh + $y - $oy; 96 $::CFG->{map_shift_y} = $bh + $y - $oy;
89 97
90 $self->update; 98 $self->update;
91 }; 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);
92 } 117 }
93 118
94 1 119 1
95} 120}
96 121
97sub button_up { 122sub invoke_button_up {
98 my ($self, $ev, $x, $y) = @_; 123 my ($self, $ev, $x, $y) = @_;
99 124
100 delete $self->{motion}; 125 delete $self->{motion};
101 126
102 1 127 1
103} 128}
104 129
105sub mouse_motion { 130sub invoke_mouse_motion {
106 my ($self, $ev, $x, $y) = @_; 131 my ($self, $ev, $x, $y) = @_;
107 132
108 if ($self->{motion}) { 133 if ($self->{motion}) {
109 $self->{motion}->($ev, $x, $y); 134 $self->{motion}->($ev, $x, $y);
110 } else { 135 } else {
… …
114 1 139 1
115} 140}
116 141
117sub size_request { 142sub size_request {
118 ( 143 (
119 1 + 32 * int $::WIDTH / 32, 144 32 * CFClient::ceil $::WIDTH / 32,
120 1 + 32 * int $::HEIGHT / 32, 145 32 * CFClient::ceil $::HEIGHT / 32,
121 ) 146 )
122} 147}
123 148
124sub update { 149sub update {
125 my ($self) = @_; 150 my ($self) = @_;
… …
142 CFClient::SDLK_RIGHT, [3, "east"], 167 CFClient::SDLK_RIGHT, [3, "east"],
143 CFClient::SDLK_DOWN, [5, "south"], 168 CFClient::SDLK_DOWN, [5, "south"],
144 CFClient::SDLK_LEFT, [7, "west"], 169 CFClient::SDLK_LEFT, [7, "west"],
145); 170);
146 171
147sub key_down { 172sub invoke_key_down {
148 my ($self, $ev) = @_; 173 my ($self, $ev) = @_;
149
150 return 0 unless $::CONN;
151 174
152 my $mod = $ev->{mod}; 175 my $mod = $ev->{mod};
153 my $sym = $ev->{sym}; 176 my $sym = $ev->{sym};
154 my $uni = $ev->{unicode}; 177 my $uni = $ev->{unicode};
155 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
156 if ($sym == CFClient::SDLK_KP5) { 208 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
157 $::CONN->user_send ("stay fire"); 209 $::CONN->user_send ("stay fire");
158 } elsif ($uni == ord ",") { 210 } elsif ($uni == ord ",") {
159 $::CONN->user_send ("take"); 211 $::CONN->user_send ("take");
160 } elsif ($uni == ord " ") { 212 } elsif ($uni == ord " ") {
161 $::CONN->user_send ("apply"); 213 $::CONN->user_send ("apply");
162 } elsif ($uni == ord ".") { 214 } elsif ($uni == ord ".") {
163 $::CONN->user_send ($self->{completer}{last_command}) 215 $::CONN->user_send ($self->{completer}{last_command})
164 if exists $self->{completer}{last_command}; 216 if exists $self->{completer}{last_command};
165 } elsif ($uni == ord "\t") { 217 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
166 $::INV_WINDOW->toggle_visibility; 218 $::CONN->user_send ($_) for @$bind_cmd;
167 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 219 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
168 $::CONN->user_send ("rotateshoottype +"); 220 $::CONN->user_send ("rotateshoottype +");
169 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 221 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
170 $::CONN->user_send ("rotateshoottype -"); 222 $::CONN->user_send ("rotateshoottype -");
171 } elsif ($uni == ord '"') { 223 } elsif ($uni == ord '"') {
172 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 224 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
173 $self->{completer}->show; 225 $self->{completer}->show;
174 } elsif ($uni == ord "'") { 226 } elsif ($uni == ord "'") {
175 $self->{completer}->set_prefix (""); 227 $self->{completer}->set_prefix ("");
176 $self->{completer}->show; 228 $self->{completer}->show;
177 } elsif (exists $DIR{$sym}) { 229 } elsif (exists $DIR{$sym}) {
178 if ($mod & CFClient::KMOD_SHIFT) { 230 if ($mod & CFClient::KMOD_SHIFT) {
179 $self->{shft}++; 231 $self->{shft}++;
232 if ($DIR{$sym}[0] != $self->{fire_dir}) {
180 $::CONN->user_send ("fire $DIR{$sym}[0]"); 233 $::CONN->user_send ("fire $DIR{$sym}[0]");
234 }
235 $self->{fire_dir} = $DIR{$sym}[0];
181 } elsif ($mod & CFClient::KMOD_CTRL) { 236 } elsif ($mod & CFClient::KMOD_CTRL) {
182 $self->{ctrl}++; 237 $self->{ctrl}++;
183 $::CONN->user_send ("run $DIR{$sym}[0]"); 238 $::CONN->user_send ("run $DIR{$sym}[0]");
184 } else { 239 } else {
185 $::CONN->user_send ("$DIR{$sym}[1]"); 240 $::CONN->user_send ("$DIR{$sym}[1]");
186 } 241 }
187 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
188 $::BIND_EDITOR->set_binding (undef, undef, [],
189 sub {
190 my ($mod, $sym, $cmds) = @_;
191 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
192 });
193 $::BIND_EDITOR->start;
194 $::BIND_EDITOR->show;
195 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
196 $::BIND_EDITOR->stop;
197 $::BIND_EDITOR->ask_for_bind_and_commit;
198 $::BIND_EDITOR->hide;
199 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
200 $::CONN->user_send ($_) for @$bind_cmd;
201 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 242 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
202 $self->{completer}->key_down ($ev); 243 $self->{completer}->invoke_key_down ($ev);
203 $self->{completer}->show; 244 $self->{completer}->show;
204 } else { 245 } else {
205 return 0; 246 return 0;
206 } 247 }
207 248
208 1 249 1
209} 250}
210 251
211sub key_up { 252sub invoke_key_up {
212 my ($self, $ev) = @_; 253 my ($self, $ev) = @_;
213 254
214 my $res = 0; 255 my $res = 0;
215 my $mod = $ev->{mod}; 256 my $mod = $ev->{mod};
216 my $sym = $ev->{sym}; 257 my $sym = $ev->{sym};
217 258
259 if ($::CFG->{shift_fire_stop}) {
218 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 260 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
219 $::CONN->user_send ("fire_stop"); 261 $::CONN->user_send ("fire_stop");
262 delete $self->{fire_dir};
220 $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 }
221 } 275 }
222 276
223 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 277 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
224 $::CONN->user_send ("run_stop"); 278 $::CONN->user_send ("run_stop");
225 $res = 1; 279 $res = 1;
226 } 280 }
227 281
228 $res 282 $res
229} 283}
230 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
231sub draw { 296sub draw {
232 my ($self) = @_; 297 my ($self) = @_;
298
299 return unless $::MAP;
233 300
234 my $focused = $CFClient::UI::FOCUS == $self 301 my $focused = $CFClient::UI::FOCUS == $self
235 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 302 || $CFClient::UI::FOCUS == $self->{completer}{entry};
236 303
237 return 304 return
238 unless $focused || !$::FAST; 305 unless $focused || !$::FAST;
239 306
240 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
241 glNewList $self->{list}; 346 glNewList $self->{list};
242 347
243 if ($::MAP) {
244 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
245 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
246
247 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
248 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
249
250 glPushMatrix; 348 glPushMatrix;
349 glTranslate $sx0, $sy0;
251 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 350 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
252 351
253 glTranslate $sx0 - 32, $sy0 - 32, 0; 352 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
254 353
255 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 354 glScale 32, 32;
256 355
257 if ($::CFG->{fow_enable}) { 356 if (my $tex = $self->{fow_texture}) {
258 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
259 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
260 glConvolutionFilter2D (
261 GL_CONVOLUTION_2D,
262 GL_ALPHA,
263 3, 3,
264 GL_ALPHA, GL_FLOAT,
265 (pack "f*", @{ $self->{smooth_matrix} }),
266 );
267 glEnable GL_CONVOLUTION_2D;
268 }
269
270 $self->{fow_texture_name} ||= glGenTexture;
271 # try to re-use the texture name: TODO improve texture class instead
272
273 $self->{fow_texture} = new CFClient::Texture
274 w => $w,
275 h => $h,
276 data => $data,
277 name => $self->{fow_texture_name},
278 internalformat => GL_ALPHA,
279 format => GL_ALPHA;
280
281 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
282
283 glEnable GL_TEXTURE_2D; 357 glEnable GL_TEXTURE_2D;
284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
285 359
286 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 360 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
287 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 361 $self->{fow_texture}->draw_quad_alpha (0, 0);
288 362
289 glDisable GL_TEXTURE_2D; 363 glDisable GL_TEXTURE_2D;
290 } 364 }
291 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
292 glPopMatrix; 377 glPopMatrix;
293 }
294
295 glEndList; 378 glEndList;
296 } 379 }
297 380
298 glPushMatrix;
299 glCallList $self->{list}; 381 glCallList $self->{list};
300 glPopMatrix;
301 382
302 # TNT2 emulates logops in software (or worse :) 383 # TNT2 emulates logops in software (or worse :)
303 if ($focused) { 384 unless ($focused) {
304 (delete $self->{out_of_focus})->destroy
305 if $self->{out_of_focus};
306 } else {
307 glColor 0.4, 0.2, 0.2, 0.6; 385 glColor 0.4, 0.2, 0.2, 0.6;
308 glEnable GL_BLEND; 386 glEnable GL_BLEND;
309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 387 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
310 glBegin GL_QUADS; 388 glBegin GL_QUADS;
311 glVertex 0, 0; 389 glVertex 0, 0;
312 glVertex 0, $::HEIGHT; 390 glVertex 0, $::HEIGHT;
313 glVertex $::WIDTH, $::HEIGHT; 391 glVertex $::WIDTH, $::HEIGHT;
314 glVertex $::WIDTH, 0; 392 glVertex $::WIDTH, 0;
315 glEnd; 393 glEnd;
316 glDisable GL_BLEND; 394 glDisable GL_BLEND;
317
318# $self->{out_of_focus} ||= do {
319# my $label = new CFClient::UI::Label
320# x => 0,
321# y => 0,
322# z => 1,
323# ellipsise => 0,
324# text => "map out of focus (click map to play)";
325#
326# $label->show;
327# $label->update;
328#
329# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
330# $label->move_abs (
331# ($::WIDTH - $label->{w}) * 0.5,
332# ($::HEIGHT - $label->{h}) * 0.5,
333# );
334# });
335#
336# $label
337# };
338 } 395 }
339} 396}
340 397
341sub DESTROY { 398sub DESTROY {
342 my $self = shift; 399 my $self = shift;
… …
355 412
356sub size_request { 413sub size_request {
357 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 414 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
358} 415}
359 416
360sub size_allocate { 417sub invoke_size_allocate {
361 my ($self, $w, $h) = @_; 418 my ($self, $w, $h) = @_;
362 419
363 $self->SUPER::size_allocate ($w, $h);
364 $self->update; 420 $self->update;
421
422 1
365} 423}
366 424
367sub update { 425sub update {
368 my ($self) = @_; 426 my ($self) = @_;
369 427
… …
454 ]; 512 ];
455 513
456 $self->{entry} = new CFClient::UI::Entry 514 $self->{entry} = new CFClient::UI::Entry
457 on_changed => sub { 515 on_changed => sub {
458 $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
459 }, 532 },
460 on_key_down => sub { 533 on_key_down => sub {
461 my ($entry, $ev) = @_; 534 my ($entry, $ev) = @_;
462 535
463 my $self = $entry->{parent}{parent}; 536 my $self = $entry->{parent}{parent};
… …
465 if ($ev->{sym} == 13) { 538 if ($ev->{sym} == 13) {
466 if (exists $self->{select}) { 539 if (exists $self->{select}) {
467 $self->{last_command} = $self->{select}; 540 $self->{last_command} = $self->{select};
468 $::CONN->user_send ($self->{select}); 541 $::CONN->user_send ($self->{select});
469 542
470 unshift @{$self->{history}}, $self->{select}; 543 unshift @{$self->{history}}, $self->{entry}->get_text;
471 $self->{hist_ptr} = 0; 544 $self->{hist_ptr} = 0;
472 545
473 $self->hide; 546 $self->hide;
474 } 547 }
475 } elsif ($ev->{sym} == 27) { 548 } elsif ($ev->{sym} == 27) {
476 $self->{hist_ptr} = 0; 549 $self->{hist_ptr} = 0;
477 $self->hide; 550 $self->hide;
478 return;
479 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 551 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
480 if ($self->{hist_ptr} > 1) { 552 if ($self->{hist_ptr} > 1) {
481 $self->{hist_ptr}--; 553 $self->{hist_ptr}--;
482 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 554 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
483 } elsif ($self->{hist_ptr} > 0) { 555 } elsif ($self->{hist_ptr} > 0) {
… …
523 595
524 $self->{entry}->set_text ($prefix); 596 $self->{entry}->set_text ($prefix);
525 $self->show; 597 $self->show;
526} 598}
527 599
528sub size_allocate { 600sub invoke_size_allocate {
529 my ($self, $w, $h) = @_; 601 my ($self, $w, $h) = @_;
530 602
531 $self->SUPER::size_allocate ($w, $h);
532 $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)
533} 606}
534 607
535sub show { 608sub show {
536 my ($self) = @_; 609 my ($self) = @_;
537 610
538 $self->SUPER::show; 611 $self->SUPER::show;
539 $self->{entry}->focus_in; 612 $self->{entry}->grab_focus;
540} 613}
541 614
542sub hide { 615sub hide {
543 my ($self) = @_; 616 my ($self) = @_;
544 617
545 $self->SUPER::hide; 618 $self->SUPER::hide;
546 $self->{entry}->set_text (""); 619 $self->{entry}->set_text ("");
547} 620}
548 621
549sub key_down { 622sub invoke_key_down {
550 my ($self, $ev) = @_; 623 my ($self, $ev) = @_;
551 624
552 $self->{entry}->key_down ($ev) 625 $self->{entry}->emit (key_down => $ev)
553} 626}
554 627
555sub update_labels { 628sub update_labels {
556 my ($self) = @_; 629 my ($self) = @_;
557 630
… …
644 $label->set_text (""); 717 $label->set_text ("");
645 $label->set_tooltip (""); 718 $label->set_tooltip ("");
646 } 719 }
647 720
648 $self->update; 721 $self->update;
649 ###
650} 722}
651 723
652sub _draw { 724sub _draw {
653 my ($self) = @_; 725 my ($self) = @_;
654 726

Diff Legend

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