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

Diff Legend

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