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

Diff Legend

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