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.49 by root, Sat Jun 3 22:50:48 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 (
16 z => -1, 20 z => -1,
17 can_focus => 1, 21 can_focus => 1,
18 list => glGenList, 22 list => glGenList,
23
24 smooth_matrix => [
25 0.05, 0.13, 0.05,
26 0.13, 0.30, 0.13,
27 0.05, 0.13, 0.05,
28 ],
29
19 @_ 30 @_
20 ); 31 );
21 32
22 $self->{completer} = new CFClient::MapWidget::Command:: 33 $self->{completer} = new CFClient::MapWidget::Command::
23 command => $self->{command}, 34 command => $self->{command},
… …
27 . "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, "
28 . "followed by a space, and press return. " 39 . "followed by a space, and press return. "
29 . "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 "
30 . "for commands you might want to use.\n" 41 . "for commands you might want to use.\n"
31 . "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"
32 . "<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.",
33 ; 44 ;
34 45
35 $self 46 $self
36} 47}
37 48
… …
49 60
50sub clr_commands { 61sub clr_commands {
51 my ($self) = @_; 62 my ($self) = @_;
52 63
53 %{$self->{completer}{command}} = (); 64 %{$self->{completer}{command}} = ();
54}
55 65
66 $self->{completer}->hide
67 if $self->{completer};
68}
69
56sub button_down { 70sub invoke_button_down {
57 my ($self, $ev, $x, $y) = @_; 71 my ($self, $ev, $x, $y) = @_;
58 72
59 $self->focus_in;
60
61 if ($ev->{button} == 1) { 73 if ($ev->{button} == 1) {
62 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 74 $self->grab_focus;
75 return unless $::CONN;
63 76
64 my $fx = int ((($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale})) + 0.99); 77 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
65 my $fy = int ((($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale})) + 0.99); 78 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
66 $fx += $::MAP->x;
67 $fy += $::MAP->y;
68 79
69 $::CONN->send (sprintf "lookat %d %d", $fx, $fy); 80 $x -= int 0.5 * $self->{sw};
81 $y -= int 0.5 * $self->{sh};
70 82
71 warn "FOOX: $fx (".$::MAP->ox.")\n"; 83 $::CONN->lookat ($x, $y)
72 warn "FOOY: $fy (".$::MAP->oy.")\n"; 84 if $::CONN;
85
73 } elsif ($ev->{button} == 2) { 86 } elsif ($ev->{button} == 2) {
87 $self->grab_focus;
88 return unless $::CONN;
89
74 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 90 my ($ox, $oy) = ($ev->{x}, $ev->{y});
75 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 91 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
76 92
77 $self->{motion} = sub { 93 $self->{motion} = sub {
78 my ($ev, $x, $y) = @_; 94 my ($ev, $x, $y) = @_;
… …
82 $::CFG->{map_shift_x} = $bw + $x - $ox; 98 $::CFG->{map_shift_x} = $bw + $x - $ox;
83 $::CFG->{map_shift_y} = $bh + $y - $oy; 99 $::CFG->{map_shift_y} = $bh + $y - $oy;
84 100
85 $self->update; 101 $self->update;
86 }; 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);
87 } 121 }
88 122
89 1 123 1
90} 124}
91 125
92sub button_up { 126sub invoke_button_up {
93 my ($self, $ev, $x, $y) = @_; 127 my ($self, $ev, $x, $y) = @_;
94 128
95 delete $self->{motion}; 129 delete $self->{motion};
96 130
97 1 131 1
98} 132}
99 133
100sub mouse_motion { 134sub invoke_mouse_motion {
101 my ($self, $ev, $x, $y) = @_; 135 my ($self, $ev, $x, $y) = @_;
102 136
103 if ($self->{motion}) { 137 if ($self->{motion}) {
104 $self->{motion}->($ev, $x, $y); 138 $self->{motion}->($ev, $x, $y);
105 } else { 139 } else {
… …
109 1 143 1
110} 144}
111 145
112sub size_request { 146sub size_request {
113 ( 147 (
114 1 + 32 * int $::WIDTH / 32, 148 32 * CFClient::ceil $::WIDTH / 32,
115 1 + 32 * int $::HEIGHT / 32, 149 32 * CFClient::ceil $::HEIGHT / 32,
116 ) 150 )
117} 151}
118 152
119sub update { 153sub update {
120 my ($self) = @_; 154 my ($self) = @_;
… …
137 CFClient::SDLK_RIGHT, [3, "east"], 171 CFClient::SDLK_RIGHT, [3, "east"],
138 CFClient::SDLK_DOWN, [5, "south"], 172 CFClient::SDLK_DOWN, [5, "south"],
139 CFClient::SDLK_LEFT, [7, "west"], 173 CFClient::SDLK_LEFT, [7, "west"],
140); 174);
141 175
142sub key_down { 176sub invoke_key_down {
143 my ($self, $ev) = @_; 177 my ($self, $ev) = @_;
144
145 return 0 unless $::CONN;
146 178
147 my $mod = $ev->{mod}; 179 my $mod = $ev->{mod};
148 my $sym = $ev->{sym}; 180 my $sym = $ev->{sym};
149 my $uni = $ev->{unicode}; 181 my $uni = $ev->{unicode};
150 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
151 if ($sym == CFClient::SDLK_KP5) { 214 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
152 $::CONN->user_send ("stay fire"); 215 $::CONN->user_send ("stay fire");
153 } elsif ($uni == ord ",") { 216 } elsif ($uni == ord ",") {
154 $::CONN->user_send ("take"); 217 $::CONN->user_send ("take");
155 } elsif ($uni == ord " ") { 218 } elsif ($uni == ord " ") {
156 $::CONN->user_send ("apply"); 219 $::CONN->user_send ("apply");
157 } elsif ($uni == ord ".") { 220 } elsif ($uni == ord ".") {
158 $::CONN->user_send ($self->{completer}{last_command}) 221 $::CONN->user_send ($self->{completer}{last_command})
159 if exists $self->{completer}{last_command}; 222 if exists $self->{completer}{last_command};
160 } elsif ($uni == ord "\t") { 223 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
161 $::INV_WINDOW->toggle_visibility; 224 $::CONN->user_send ($_) for @$bind_cmd;
162 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 225 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
163 $::CONN->user_send ("rotateshoottype +"); 226 $::CONN->user_send ("rotateshoottype +");
164 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 227 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
165 $::CONN->user_send ("rotateshoottype -"); 228 $::CONN->user_send ("rotateshoottype -");
166 } elsif ($uni == ord '"') { 229 } elsif ($uni == ord '"') {
167 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 230 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
168 $self->{completer}->show; 231 $self->{completer}->show;
169 } elsif ($uni == ord "'") { 232 } elsif ($uni == ord "'") {
170 $self->{completer}->set_prefix (""); 233 $self->{completer}->set_prefix ("");
171 $self->{completer}->show; 234 $self->{completer}->show;
172 } elsif (exists $DIR{$sym}) { 235 } elsif (exists $DIR{$sym}) {
173 if ($mod & CFClient::KMOD_SHIFT) { 236 if ($mod & CFClient::KMOD_SHIFT) {
174 $self->{shft}++; 237 $self->{shft}++;
238 if ($DIR{$sym}[0] != $self->{fire_dir}) {
175 $::CONN->user_send ("fire $DIR{$sym}[0]"); 239 $::CONN->user_send ("fire $DIR{$sym}[0]");
240 }
241 $self->{fire_dir} = $DIR{$sym}[0];
176 } elsif ($mod & CFClient::KMOD_CTRL) { 242 } elsif ($mod & CFClient::KMOD_CTRL) {
177 $self->{ctrl}++; 243 $self->{ctrl}++;
178 $::CONN->user_send ("run $DIR{$sym}[0]"); 244 $::CONN->user_send ("run $DIR{$sym}[0]");
179 } else { 245 } else {
180 $::CONN->user_send ("$DIR{$sym}[1]"); 246 $::CONN->user_send ("$DIR{$sym}[1]");
181 } 247 }
182 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
183 $::BIND_EDITOR->set_binding (undef, undef, [],
184 sub {
185 my ($mod, $sym, $cmds) = @_;
186 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
187 });
188 $::BIND_EDITOR->start;
189 $::BIND_EDITOR->show;
190 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
191 $::BIND_EDITOR->stop;
192 $::BIND_EDITOR->ask_for_bind_and_commit;
193 $::BIND_EDITOR->hide;
194 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
195 $::CONN->user_send ($_) for @$bind_cmd;
196 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 248 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
197 $self->{completer}->key_down ($ev); 249 $self->{completer}->invoke_key_down ($ev);
198 $self->{completer}->show; 250 $self->{completer}->show;
199 } else { 251 } else {
200 return 0; 252 return 0;
201 } 253 }
202 254
203 1 255 1
204} 256}
205 257
206sub key_up { 258sub invoke_key_up {
207 my ($self, $ev) = @_; 259 my ($self, $ev) = @_;
208 260
209 my $res = 0; 261 my $res = 0;
210 my $mod = $ev->{mod}; 262 my $mod = $ev->{mod};
211 my $sym = $ev->{sym}; 263 my $sym = $ev->{sym};
212 264
265 if ($::CFG->{shift_fire_stop}) {
213 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 266 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
214 $::CONN->user_send ("fire_stop"); 267 $::CONN->user_send ("fire_stop");
268 delete $self->{fire_dir};
215 $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 }
216 } 281 }
217 282
218 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 283 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
219 $::CONN->user_send ("run_stop"); 284 $::CONN->user_send ("run_stop");
220 $res = 1; 285 $res = 1;
221 } 286 }
222 287
223 $res 288 $res
224} 289}
225 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
226sub draw { 302sub draw {
227 my ($self) = @_; 303 my ($self) = @_;
304
305 return unless $::MAP;
228 306
229 my $focused = $CFClient::UI::FOCUS == $self 307 my $focused = $CFClient::UI::FOCUS == $self
230 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 308 || $CFClient::UI::FOCUS == $self->{completer}{entry};
231 309
232 return 310 return
233 unless $focused || !$::FAST; 311 unless $focused || !$::FAST;
234 312
235 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
236 glNewList $self->{list}; 352 glNewList $self->{list};
237 353
238 if ($::MAP) {
239 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
240 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
241
242 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
243 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
244
245 glPushMatrix; 354 glPushMatrix;
355 glTranslate $sx0, $sy0;
246 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 356 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
247 357
248 glTranslate $sx0 - 32, $sy0 - 32, 0; 358 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
249 359
250 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 360 glScale 32, 32;
251 361
252 if ($::CFG->{fow_enable}) { 362 if (my $tex = $self->{fow_texture}) {
253 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
254 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
255 glConvolutionFilter2D (
256 GL_CONVOLUTION_2D,
257 GL_ALPHA,
258 3, 3,
259 GL_ALPHA, GL_FLOAT,
260 pack "f*",
261 0.05, 0.13, 0.05,
262 0.13, 0.30, 0.13,
263 0.05, 0.13, 0.05,
264 );
265 glEnable GL_CONVOLUTION_2D;
266 }
267
268 $self->{fow_texture_name} ||= glGenTexture;
269 # try to re-use the texture name: TODO improve texture class instead
270
271 $self->{fow_texture} = new CFClient::Texture
272 w => $w,
273 h => $h,
274 data => $data,
275 name => $self->{fow_texture_name},
276 internalformat => GL_ALPHA,
277 format => GL_ALPHA;
278
279 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
280
281 glEnable GL_TEXTURE_2D; 363 glEnable GL_TEXTURE_2D;
282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 364 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
283 365
284 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 366 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
285 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 367 $self->{fow_texture}->draw_quad_alpha (0, 0);
286 368
287 glDisable GL_TEXTURE_2D; 369 glDisable GL_TEXTURE_2D;
288 } 370 }
289 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
290 glPopMatrix; 383 glPopMatrix;
291 }
292
293 glEndList; 384 glEndList;
294 } 385 }
295 386
296 glPushMatrix;
297 glCallList $self->{list}; 387 glCallList $self->{list};
298 glPopMatrix;
299 388
300 # TNT2 emulates logops in software (or worse :) 389 # TNT2 emulates logops in software (or worse :)
301 if ($focused) { 390 unless ($focused) {
302 (delete $self->{out_of_focus})->destroy
303 if $self->{out_of_focus};
304 } else {
305 glColor 0.4, 0.2, 0.2, 0.6; 391 glColor 0.4, 0.2, 0.2, 0.6;
306 glEnable GL_BLEND; 392 glEnable GL_BLEND;
307 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
308 glBegin GL_QUADS; 394 glBegin GL_QUADS;
309 glVertex 0, 0; 395 glVertex 0, 0;
310 glVertex 0, $::HEIGHT; 396 glVertex 0, $::HEIGHT;
311 glVertex $::WIDTH, $::HEIGHT; 397 glVertex $::WIDTH, $::HEIGHT;
312 glVertex $::WIDTH, 0; 398 glVertex $::WIDTH, 0;
313 glEnd; 399 glEnd;
314 glDisable GL_BLEND; 400 glDisable GL_BLEND;
315
316# $self->{out_of_focus} ||= do {
317# my $label = new CFClient::UI::Label
318# x => 0,
319# y => 0,
320# z => 1,
321# ellipsise => 0,
322# text => "map out of focus (click map to play)";
323#
324# $label->show;
325# $label->update;
326#
327# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
328# $label->move_abs (
329# ($::WIDTH - $label->{w}) * 0.5,
330# ($::HEIGHT - $label->{h}) * 0.5,
331# );
332# });
333#
334# $label
335# };
336 } 401 }
337} 402}
338 403
339sub DESTROY { 404sub DESTROY {
340 my $self = shift; 405 my $self = shift;
… …
353 418
354sub size_request { 419sub size_request {
355 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 420 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
356} 421}
357 422
358sub size_allocate { 423sub invoke_size_allocate {
359 my ($self, $w, $h) = @_; 424 my ($self, $w, $h) = @_;
360 425
361 $self->SUPER::size_allocate ($w, $h);
362 $self->update; 426 $self->update;
427
428 1
363} 429}
364 430
365sub update { 431sub update {
366 my ($self) = @_; 432 my ($self) = @_;
367 433
… …
452 ]; 518 ];
453 519
454 $self->{entry} = new CFClient::UI::Entry 520 $self->{entry} = new CFClient::UI::Entry
455 on_changed => sub { 521 on_changed => sub {
456 $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
457 }, 538 },
458 on_key_down => sub { 539 on_key_down => sub {
459 my ($entry, $ev) = @_; 540 my ($entry, $ev) = @_;
460 541
461 my $self = $entry->{parent}{parent}; 542 my $self = $entry->{parent}{parent};
462 543
463 if ($ev->{sym} == 13) { 544 if ($ev->{sym} == 13) {
464 if (exists $self->{select}) { 545 if (exists $self->{select}) {
465 $self->{last_command} = $self->{select}; 546 $self->{last_command} = $self->{select};
466 $::CONN->user_send ($self->{select}); 547 $::CONN->user_send ($self->{select});
548
549 unshift @{$self->{history}}, $self->{entry}->get_text;
550 $self->{hist_ptr} = 0;
551
467 $self->hide; 552 $self->hide;
468 } 553 }
469 } elsif ($ev->{sym} == 27) { 554 } elsif ($ev->{sym} == 27) {
555 $self->{hist_ptr} = 0;
470 $self->hide; 556 $self->hide;
471 return;
472 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 557 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
558 if ($self->{hist_ptr} > 1) {
559 $self->{hist_ptr}--;
560 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
561 } elsif ($self->{hist_ptr} > 0) {
562 $self->{hist_ptr}--;
563 $self->{entry}->set_text ($self->{hist_saveback});
564 } else {
473 ++$self->{select_offset} 565 ++$self->{select_offset}
474 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 566 if $self->{select_offset} < $#{ $self->{last_match} || [] };
567 }
475 $self->update_labels; 568 $self->update_labels;
476 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 569 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
570 if ($self->{select_offset}) {
477 --$self->{select_offset} 571 --$self->{select_offset}
572 } else {
573 unless ($self->{hist_ptr}) {
574 $self->{hist_saveback} = $self->{entry}->get_text;
575 }
576 if ($self->{hist_ptr} <= $#{$self->{history}}) {
478 if $self->{select_offset}; 577 $self->{hist_ptr}++;
578 }
579 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
580 if exists $self->{history}->[$self->{hist_ptr} - 1];
581 }
479 $self->update_labels; 582 $self->update_labels;
480 } else { 583 } else {
481 return 0; 584 return 0;
482 } 585 }
483 586
… …
498 601
499 $self->{entry}->set_text ($prefix); 602 $self->{entry}->set_text ($prefix);
500 $self->show; 603 $self->show;
501} 604}
502 605
503sub size_allocate { 606sub invoke_size_allocate {
504 my ($self, $w, $h) = @_; 607 my ($self, $w, $h) = @_;
505 608
506 $self->SUPER::size_allocate ($w, $h);
507 $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)
508} 612}
509 613
510sub show { 614sub show {
511 my ($self) = @_; 615 my ($self) = @_;
512 616
513 $self->SUPER::show; 617 $self->SUPER::show;
514 $self->{entry}->focus_in; 618 $self->{entry}->grab_focus;
515} 619}
516 620
517sub hide { 621sub hide {
518 my ($self) = @_; 622 my ($self) = @_;
623
624 $self->{hist_ptr} = 0;
519 625
520 $self->SUPER::hide; 626 $self->SUPER::hide;
521 $self->{entry}->set_text (""); 627 $self->{entry}->set_text ("");
522} 628}
523 629
524sub key_down { 630sub invoke_key_down {
525 my ($self, $ev) = @_; 631 my ($self, $ev) = @_;
526 632
527 $self->{entry}->key_down ($ev) 633 $self->{entry}->emit (key_down => $ev)
528} 634}
529 635
530sub update_labels { 636sub update_labels {
531 my ($self) = @_; 637 my ($self) = @_;
532 638
… …
619 $label->set_text (""); 725 $label->set_text ("");
620 $label->set_tooltip (""); 726 $label->set_tooltip ("");
621 } 727 }
622 728
623 $self->update; 729 $self->update;
624 ###
625} 730}
626 731
627sub _draw { 732sub _draw {
628 my ($self) = @_; 733 my ($self) = @_;
629 734

Diff Legend

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