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.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 (
… …
26 @_ 32 @_
27 ); 33 );
28 34
29 $self->{completer} = new CFClient::MapWidget::Command:: 35 $self->{completer} = new CFClient::MapWidget::Command::
30 command => $self->{command}, 36 command => $self->{command},
31 can_focus => 1,
32 tooltip => "<b>The Command Completer</b>\n\n" 37 tooltip => "<b>The Command Completer</b>\n\n"
33 . "This is your central interface to send text commands to the server. " 38 . "This is your central interface to send text commands to the server. "
34 . "To enter a verbatim command to send to the server, just type the command, " 39 . "To enter a verbatim command to send to the server, just type the command, "
35 . "followed by a space, and press return. " 40 . "followed by a space, and press return. "
36 . "Typing the initial letters of words (or just any letters) displays guesses " 41 . "Typing the initial letters of words (or just any letters) displays guesses "
37 . "for commands you might want to use.\n" 42 . "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" 43 . "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.", 44 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
40 ; 45 ;
41 46
42 $self 47 $self
43} 48}
44 49
… …
56 61
57sub clr_commands { 62sub clr_commands {
58 my ($self) = @_; 63 my ($self) = @_;
59 64
60 %{$self->{completer}{command}} = (); 65 %{$self->{completer}{command}} = ();
61}
62 66
67 $self->{completer}->hide
68 if $self->{completer};
69}
70
63sub button_down { 71sub invoke_button_down {
64 my ($self, $ev, $x, $y) = @_; 72 my ($self, $ev, $x, $y) = @_;
65 73
66 $self->focus_in;
67
68 if ($ev->{button} == 1) { 74 if ($ev->{button} == 1) {
69 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 75 $self->grab_focus;
70 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 76 return unless $::CONN;
71 77
72 my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99; 78 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; 79 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
74 80
75 $::CONN->send (sprintf "lookat %d %d", $fx, $fy) 81 $x -= int 0.5 * $self->{sw};
82 $y -= int 0.5 * $self->{sh};
83
84 $::CONN->lookat ($x, $y)
76 if $::CONN; 85 if $::CONN;
77 86
78 } elsif ($ev->{button} == 2) { 87 } elsif ($ev->{button} == 2) {
88 $self->grab_focus;
89 return unless $::CONN;
90
79 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 91 my ($ox, $oy) = ($ev->{x}, $ev->{y});
80 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 92 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
81 93
82 $self->{motion} = sub { 94 $self->{motion} = sub {
83 my ($ev, $x, $y) = @_; 95 my ($ev, $x, $y) = @_;
… …
87 $::CFG->{map_shift_x} = $bw + $x - $ox; 99 $::CFG->{map_shift_x} = $bw + $x - $ox;
88 $::CFG->{map_shift_y} = $bh + $y - $oy; 100 $::CFG->{map_shift_y} = $bh + $y - $oy;
89 101
90 $self->update; 102 $self->update;
91 }; 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);
92 } 122 }
93 123
94 1 124 1
95} 125}
96 126
97sub button_up { 127sub invoke_button_up {
98 my ($self, $ev, $x, $y) = @_; 128 my ($self, $ev, $x, $y) = @_;
99 129
100 delete $self->{motion}; 130 delete $self->{motion};
101 131
102 1 132 1
103} 133}
104 134
105sub mouse_motion { 135sub invoke_mouse_motion {
106 my ($self, $ev, $x, $y) = @_; 136 my ($self, $ev, $x, $y) = @_;
107 137
108 if ($self->{motion}) { 138 if ($self->{motion}) {
109 $self->{motion}->($ev, $x, $y); 139 $self->{motion}->($ev, $x, $y);
110 } else { 140 } else {
… …
114 1 144 1
115} 145}
116 146
117sub size_request { 147sub size_request {
118 ( 148 (
119 1 + 32 * int $::WIDTH / 32, 149 32 * CFClient::ceil $::WIDTH / 32,
120 1 + 32 * int $::HEIGHT / 32, 150 32 * CFClient::ceil $::HEIGHT / 32,
121 ) 151 )
122} 152}
123 153
124sub update { 154sub update {
125 my ($self) = @_; 155 my ($self) = @_;
… …
142 CFClient::SDLK_RIGHT, [3, "east"], 172 CFClient::SDLK_RIGHT, [3, "east"],
143 CFClient::SDLK_DOWN, [5, "south"], 173 CFClient::SDLK_DOWN, [5, "south"],
144 CFClient::SDLK_LEFT, [7, "west"], 174 CFClient::SDLK_LEFT, [7, "west"],
145); 175);
146 176
147sub key_down { 177sub invoke_key_down {
148 my ($self, $ev) = @_; 178 my ($self, $ev) = @_;
149
150 return 0 unless $::CONN;
151 179
152 my $mod = $ev->{mod}; 180 my $mod = $ev->{mod};
153 my $sym = $ev->{sym}; 181 my $sym = $ev->{sym};
154 my $uni = $ev->{unicode}; 182 my $uni = $ev->{unicode};
155 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
156 if ($sym == CFClient::SDLK_KP5) { 215 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
157 $::CONN->user_send ("stay fire"); 216 $::CONN->user_send ("stay fire");
158 } elsif ($uni == ord ",") { 217 } elsif ($uni == ord ",") {
159 $::CONN->user_send ("take"); 218 $::CONN->user_send ("take");
160 } elsif ($uni == ord " ") { 219 } elsif ($uni == ord " ") {
161 $::CONN->user_send ("apply"); 220 $::CONN->user_send ("apply");
162 } elsif ($uni == ord ".") { 221 } elsif ($uni == ord ".") {
163 $::CONN->user_send ($self->{completer}{last_command}) 222 $::CONN->user_send ($self->{completer}{last_command})
164 if exists $self->{completer}{last_command}; 223 if exists $self->{completer}{last_command};
165 } elsif ($uni == ord "\t") { 224 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
166 $::INV_WINDOW->toggle_visibility; 225 $::CONN->user_send ($_) for @$bind_cmd;
167 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 226 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
168 $::CONN->user_send ("rotateshoottype +"); 227 $::CONN->user_send ("rotateshoottype +");
169 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 228 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
170 $::CONN->user_send ("rotateshoottype -"); 229 $::CONN->user_send ("rotateshoottype -");
171 } elsif ($uni == ord '"') { 230 } elsif ($uni == ord '"') {
172 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 231 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
173 $self->{completer}->show; 232 $self->{completer}->show;
174 } elsif ($uni == ord "'") { 233 } elsif ($uni == ord "'") {
175 $self->{completer}->set_prefix (""); 234 $self->{completer}->set_prefix ("");
176 $self->{completer}->show; 235 $self->{completer}->show;
177 } elsif (exists $DIR{$sym}) { 236 } elsif (exists $DIR{$sym}) {
178 if ($mod & CFClient::KMOD_SHIFT) { 237 if ($mod & CFClient::KMOD_SHIFT) {
179 $self->{shft}++; 238 $self->{shft}++;
239 if ($DIR{$sym}[0] != $self->{fire_dir}) {
180 $::CONN->user_send ("fire $DIR{$sym}[0]"); 240 $::CONN->user_send ("fire $DIR{$sym}[0]");
241 }
242 $self->{fire_dir} = $DIR{$sym}[0];
181 } elsif ($mod & CFClient::KMOD_CTRL) { 243 } elsif ($mod & CFClient::KMOD_CTRL) {
182 $self->{ctrl}++; 244 $self->{ctrl}++;
183 $::CONN->user_send ("run $DIR{$sym}[0]"); 245 $::CONN->user_send ("run $DIR{$sym}[0]");
184 } else { 246 } else {
185 $::CONN->user_send ("$DIR{$sym}[1]"); 247 $::CONN->user_send ("$DIR{$sym}[1]");
186 } 248 }
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')) { 249 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
202 $self->{completer}->key_down ($ev); 250 $self->{completer}->inject_key_down ($ev);
203 $self->{completer}->show; 251 $self->{completer}->show;
204 } else { 252 } else {
205 return 0; 253 return 0;
206 } 254 }
207 255
208 1 256 1
209} 257}
210 258
211sub key_up { 259sub invoke_key_up {
212 my ($self, $ev) = @_; 260 my ($self, $ev) = @_;
213 261
214 my $res = 0; 262 my $res = 0;
215 my $mod = $ev->{mod}; 263 my $mod = $ev->{mod};
216 my $sym = $ev->{sym}; 264 my $sym = $ev->{sym};
217 265
266 if ($::CFG->{shift_fire_stop}) {
218 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 267 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
219 $::CONN->user_send ("fire_stop"); 268 $::CONN->user_send ("fire_stop");
269 delete $self->{fire_dir};
220 $res = 1; 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 }
221 } 282 }
222 283
223 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 284 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
224 $::CONN->user_send ("run_stop"); 285 $::CONN->user_send ("run_stop");
225 $res = 1; 286 $res = 1;
226 } 287 }
227 288
228 $res 289 $res
229} 290}
230 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;
301}
302
231sub draw { 303sub draw {
232 my ($self) = @_; 304 my ($self) = @_;
305
306 return unless $::MAP;
233 307
234 my $focused = $CFClient::UI::FOCUS == $self 308 my $focused = $CFClient::UI::FOCUS == $self
235 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 309 || $CFClient::UI::FOCUS == $self->{completer}{entry};
236 310
237 return 311 return
238 unless $focused || !$::FAST; 312 unless $focused || !$::FAST;
239 313
240 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
241 glNewList $self->{list}; 353 glNewList $self->{list};
242 354
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; 355 glPushMatrix;
356 glTranslate $sx0, $sy0;
251 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 357 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
252 358
253 glTranslate $sx0 - 32, $sy0 - 32, 0; 359 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
254 360
255 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 361 glScale 32, 32;
256 362
257 if ($::CFG->{fow_enable}) { 363 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; 364 glEnable GL_TEXTURE_2D;
284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 365 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
285 366
286 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 367 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
287 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 368 $self->{fow_texture}->draw_quad_alpha (0, 0);
288 369
289 glDisable GL_TEXTURE_2D; 370 glDisable GL_TEXTURE_2D;
290 } 371 }
291 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
292 glPopMatrix; 384 glPopMatrix;
293 }
294
295 glEndList; 385 glEndList;
296 } 386 }
297 387
298 glPushMatrix;
299 glCallList $self->{list}; 388 glCallList $self->{list};
300 glPopMatrix;
301 389
302 # TNT2 emulates logops in software (or worse :) 390 # TNT2 emulates logops in software (or worse :)
303 if ($focused) { 391 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; 392 glColor 0.4, 0.2, 0.2, 0.6;
308 glEnable GL_BLEND; 393 glEnable GL_BLEND;
309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 394 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
310 glBegin GL_QUADS; 395 glBegin GL_QUADS;
311 glVertex 0, 0; 396 glVertex 0, 0;
312 glVertex 0, $::HEIGHT; 397 glVertex 0, $::HEIGHT;
313 glVertex $::WIDTH, $::HEIGHT; 398 glVertex $::WIDTH, $::HEIGHT;
314 glVertex $::WIDTH, 0; 399 glVertex $::WIDTH, 0;
315 glEnd; 400 glEnd;
316 glDisable GL_BLEND; 401 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 } 402 }
339} 403}
340 404
341sub DESTROY { 405sub DESTROY {
342 my $self = shift; 406 my $self = shift;
… …
355 419
356sub size_request { 420sub size_request {
357 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 421 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
358} 422}
359 423
360sub size_allocate { 424sub invoke_size_allocate {
361 my ($self, $w, $h) = @_; 425 my ($self, $w, $h) = @_;
362 426
363 $self->SUPER::size_allocate ($w, $h);
364 $self->update; 427 $self->update;
428
429 1
365} 430}
366 431
367sub update { 432sub update {
368 my ($self) = @_; 433 my ($self) = @_;
369 434
… …
454 ]; 519 ];
455 520
456 $self->{entry} = new CFClient::UI::Entry 521 $self->{entry} = new CFClient::UI::Entry
457 on_changed => sub { 522 on_changed => sub {
458 $self->update_labels; 523 $self->update_labels;
524 0
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
459 }, 539 },
460 on_key_down => sub { 540 on_key_down => sub {
461 my ($entry, $ev) = @_; 541 my ($entry, $ev) = @_;
462 542
463 my $self = $entry->{parent}{parent}; 543 my $self = $entry->{parent}{parent};
… …
465 if ($ev->{sym} == 13) { 545 if ($ev->{sym} == 13) {
466 if (exists $self->{select}) { 546 if (exists $self->{select}) {
467 $self->{last_command} = $self->{select}; 547 $self->{last_command} = $self->{select};
468 $::CONN->user_send ($self->{select}); 548 $::CONN->user_send ($self->{select});
469 549
470 unshift @{$self->{history}}, $self->{select}; 550 unshift @{$self->{history}}, $self->{entry}->get_text;
471 $self->{hist_ptr} = 0; 551 $self->{hist_ptr} = 0;
472 552
473 $self->hide; 553 $self->hide;
474 } 554 }
475 } elsif ($ev->{sym} == 27) { 555 } elsif ($ev->{sym} == 27) {
476 $self->{hist_ptr} = 0; 556 $self->{hist_ptr} = 0;
477 $self->hide; 557 $self->hide;
478 return;
479 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 558 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
480 if ($self->{hist_ptr} > 1) { 559 if ($self->{hist_ptr} > 1) {
481 $self->{hist_ptr}--; 560 $self->{hist_ptr}--;
482 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 561 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
483 } elsif ($self->{hist_ptr} > 0) { 562 } elsif ($self->{hist_ptr} > 0) {
… …
523 602
524 $self->{entry}->set_text ($prefix); 603 $self->{entry}->set_text ($prefix);
525 $self->show; 604 $self->show;
526} 605}
527 606
528sub size_allocate { 607sub invoke_size_allocate {
529 my ($self, $w, $h) = @_; 608 my ($self, $w, $h) = @_;
530 609
531 $self->SUPER::size_allocate ($w, $h);
532 $self->move_abs (($::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)
533} 613}
534 614
535sub show { 615sub show {
536 my ($self) = @_; 616 my ($self) = @_;
537 617
538 $self->SUPER::show; 618 $self->SUPER::show;
539 $self->{entry}->focus_in; 619 $self->{entry}->grab_focus;
540} 620}
541 621
542sub hide { 622sub hide {
543 my ($self) = @_; 623 my ($self) = @_;
624
625 $self->{hist_ptr} = 0;
544 626
545 $self->SUPER::hide; 627 $self->SUPER::hide;
546 $self->{entry}->set_text (""); 628 $self->{entry}->set_text ("");
547} 629}
548 630
549sub key_down { 631sub inject_key_down {
550 my ($self, $ev) = @_; 632 my ($self, $ev) = @_;
551 633
634 $self->{entry}->grab_focus;
552 $self->{entry}->key_down ($ev) 635 $self->{entry}->emit (key_down => $ev);
553} 636}
554 637
555sub update_labels { 638sub update_labels {
556 my ($self) = @_; 639 my ($self) = @_;
557 640
… …
644 $label->set_text (""); 727 $label->set_text ("");
645 $label->set_tooltip (""); 728 $label->set_tooltip ("");
646 } 729 }
647 730
648 $self->update; 731 $self->update;
649 ###
650} 732}
651 733
652sub _draw { 734sub _draw {
653 my ($self) = @_; 735 my ($self) = @_;
654 736

Diff Legend

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