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

Diff Legend

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