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

Diff Legend

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