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.77 by root, Sun Jul 23 02:44:05 2006 UTC vs.
Revision 1.82 by root, Fri Sep 29 00:56:06 2006 UTC

1package CFClient::MapWidget; 1package CFPlus::MapWidget;
2 2
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 CFPlus;
8use CFClient::OpenGL; 9use CFPlus::OpenGL;
10use CFPlus::UI;
9 11
10our @ISA = CFClient::UI::Base::; 12our @ISA = CFPlus::UI::Base::;
11 13
12my $magicmap_tex = 14my $magicmap_tex =
13 new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", 15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
14 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
15 17
16sub new { 18sub new {
17 my $class = shift; 19 my $class = shift;
18 20
… …
28 ], 30 ],
29 31
30 @_ 32 @_
31 ); 33 );
32 34
33 $self->{completer} = new CFClient::MapWidget::Command:: 35 $self->{completer} = new CFPlus::MapWidget::Command::
34 command => $self->{command}, 36 command => $self->{command},
35 tooltip => "<b>The Command Completer</b>\n\n" 37 tooltip => "#completer_help",
36 . "This is your central interface to send text commands to the server. "
37 . "To enter a verbatim command to send to the server, just type the command, "
38 . "followed by a space, and press return. "
39 . "Typing the initial letters of words (or just any letters) displays guesses "
40 . "for commands you might want to use.\n"
41 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
42 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
43 ; 38 ;
44 39
45 $self 40 $self
46} 41}
47 42
… …
71 66
72 if ($ev->{button} == 1) { 67 if ($ev->{button} == 1) {
73 $self->grab_focus; 68 $self->grab_focus;
74 return unless $::CONN; 69 return unless $::CONN;
75 70
76 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 71 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
77 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 72 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
78 73
79 $x -= int 0.5 * $self->{sw}; 74 $x -= int 0.5 * $self->{sw};
80 $y -= int 0.5 * $self->{sh}; 75 $y -= int 0.5 * $self->{sh};
81 76
82 $::CONN->lookat ($x, $y) 77 $::CONN->lookat ($x, $y)
… …
98 $::CFG->{map_shift_y} = $bh + $y - $oy; 93 $::CFG->{map_shift_y} = $bh + $y - $oy;
99 94
100 $self->update; 95 $self->update;
101 }; 96 };
102 } elsif ($ev->{button} == 3) { 97 } elsif ($ev->{button} == 3) {
103 (new CFClient::UI::Menu 98 (new CFPlus::UI::Menu
104 items => [ 99 items => [
105 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 100 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
106 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 101 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
107 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 102 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
108 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 103 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
… …
113 $::PICKUP_ENABLE->{state} 108 $::PICKUP_ENABLE->{state}
114 ? "Disable automatic pickup" 109 ? "Disable automatic pickup"
115 : "Enable automatic pickup", 110 : "Enable automatic pickup",
116 sub { $::PICKUP_ENABLE->toggle } 111 sub { $::PICKUP_ENABLE->toggle }
117 ], 112 ],
113 ["Quit",
114 sub {
115 if ($::CONN) {
116 &::open_quit_dialog;
117 } else {
118 exit;
119 }
120 }
121 ],
118 ], 122 ],
119 )->popup ($ev); 123 )->popup ($ev);
120 } 124 }
121 125
122 1 126 1
… …
142 1 146 1
143} 147}
144 148
145sub size_request { 149sub size_request {
146 ( 150 (
147 32 * CFClient::ceil $::WIDTH / 32, 151 32 * CFPlus::ceil $::WIDTH / 32,
148 32 * CFClient::ceil $::HEIGHT / 32, 152 32 * CFPlus::ceil $::HEIGHT / 32,
149 ) 153 )
150} 154}
151 155
152sub update { 156sub update {
153 my ($self) = @_; 157 my ($self) = @_;
… …
155 $self->{need_update} = 1; 159 $self->{need_update} = 1;
156 $self->SUPER::update; 160 $self->SUPER::update;
157} 161}
158 162
159my %DIR = ( 163my %DIR = (
160 CFClient::SDLK_KP8, [1, "north"], 164 CFPlus::SDLK_KP8, [1, "north"],
161 CFClient::SDLK_KP9, [2, "northeast"], 165 CFPlus::SDLK_KP9, [2, "northeast"],
162 CFClient::SDLK_KP6, [3, "east"], 166 CFPlus::SDLK_KP6, [3, "east"],
163 CFClient::SDLK_KP3, [4, "southeast"], 167 CFPlus::SDLK_KP3, [4, "southeast"],
164 CFClient::SDLK_KP2, [5, "south"], 168 CFPlus::SDLK_KP2, [5, "south"],
165 CFClient::SDLK_KP1, [6, "southwest"], 169 CFPlus::SDLK_KP1, [6, "southwest"],
166 CFClient::SDLK_KP4, [7, "west"], 170 CFPlus::SDLK_KP4, [7, "west"],
167 CFClient::SDLK_KP7, [8, "northwest"], 171 CFPlus::SDLK_KP7, [8, "northwest"],
168 172
169 CFClient::SDLK_UP, [1, "north"], 173 CFPlus::SDLK_UP, [1, "north"],
170 CFClient::SDLK_RIGHT, [3, "east"], 174 CFPlus::SDLK_RIGHT, [3, "east"],
171 CFClient::SDLK_DOWN, [5, "south"], 175 CFPlus::SDLK_DOWN, [5, "south"],
172 CFClient::SDLK_LEFT, [7, "west"], 176 CFPlus::SDLK_LEFT, [7, "west"],
173); 177);
174 178
175sub invoke_key_down { 179sub invoke_key_down {
176 my ($self, $ev) = @_; 180 my ($self, $ev) = @_;
177 181
178 my $mod = $ev->{mod}; 182 my $mod = $ev->{mod};
179 my $sym = $ev->{sym}; 183 my $sym = $ev->{sym};
180 my $uni = $ev->{unicode}; 184 my $uni = $ev->{unicode};
181 185
182 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; 186 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
183 187
184 if ($uni == ord "\t") { 188 if ($uni == ord "\t") {
185 $::PL_WINDOW->toggle_visibility; 189 $::PL_WINDOW->toggle_visibility;
186 } elsif ($sym == CFClient::SDLK_F1 && !$mod) { 190 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
187 $::HELP_WINDOW->toggle_visibility; 191 $::HELP_WINDOW->toggle_visibility;
188 } elsif ($sym == CFClient::SDLK_F2 && !$mod) { 192 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
189 ::toggle_player_page ($::STATS_PAGE); 193 ::toggle_player_page ($::STATS_PAGE);
190 } elsif ($sym == CFClient::SDLK_F3 && !$mod) { 194 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
191 ::toggle_player_page ($::SKILL_PAGE); 195 ::toggle_player_page ($::SKILL_PAGE);
192 } elsif ($sym == CFClient::SDLK_F4 && !$mod) { 196 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
193 ::toggle_player_page ($::SPELL_PAGE); 197 ::toggle_player_page ($::SPELL_PAGE);
194 } elsif ($sym == CFClient::SDLK_F5 && !$mod) { 198 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
195 ::toggle_player_page ($::INVENTORY_PAGE); 199 ::toggle_player_page ($::INVENTORY_PAGE);
196 } elsif ($sym == CFClient::SDLK_F9 && !$mod) { 200 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
197 $::SETUP_DIALOG->toggle_visibility; 201 $::SETUP_DIALOG->toggle_visibility;
198 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 202 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
199 $::BIND_EDITOR->set_binding (undef, undef, [], 203 $::BIND_EDITOR->set_binding (undef, undef, [],
200 sub { 204 sub {
201 my ($mod, $sym, $cmds) = @_; 205 my ($mod, $sym, $cmds) = @_;
202 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); 206 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
203 }); 207 });
204 $::BIND_EDITOR->start; 208 $::BIND_EDITOR->start;
205 $::BIND_EDITOR->show; 209 $::BIND_EDITOR->show;
210#TODO: elmex, what was this supposed to do? it currently crashes the client.
206 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 211# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
207 $::BIND_EDITOR->stop; 212# $::BIND_EDITOR->stop;
208 $::BIND_EDITOR->ask_for_bind_and_commit; 213# $::BIND_EDITOR->ask_for_bind_and_commit;
209 $::BIND_EDITOR->hide; 214# $::BIND_EDITOR->hide;
210 } elsif (!$::CONN) { 215 } elsif (!$::CONN) {
211 return 0; # bindings further down need a valid connection 216 return 0; # bindings further down need a valid connection
212 217
213 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { 218 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
214 $::CONN->user_send ("stay fire"); 219 $::CONN->user_send ("stay fire");
215 } elsif ($uni == ord ",") { 220 } elsif ($uni == ord ",") {
216 $::CONN->user_send ("take"); 221 $::CONN->user_send ("take");
217 } elsif ($uni == ord " ") { 222 } elsif ($uni == ord " ") {
218 $::CONN->user_send ("apply"); 223 $::CONN->user_send ("apply");
224 } elsif ($uni == 13) {
225 $::CONN->user_send ("examine");
219 } elsif ($uni == ord ".") { 226 } elsif ($uni == ord ".") {
220 $::CONN->user_send ($self->{completer}{last_command}) 227 $::CONN->user_send ($self->{completer}{last_command})
221 if exists $self->{completer}{last_command}; 228 if exists $self->{completer}{last_command};
222 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 229 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
223 $::CONN->user_send ($_) for @$bind_cmd; 230 $::CONN->user_send ($_) for @$bind_cmd;
224 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 231 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
225 $::CONN->user_send ("rotateshoottype +"); 232 $::CONN->user_send ("rotateshoottype +");
226 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 233 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
227 $::CONN->user_send ("rotateshoottype -"); 234 $::CONN->user_send ("rotateshoottype -");
228 } elsif ($uni == ord '"') { 235 } elsif ($uni == ord '"') {
229 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 236 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
230 $self->{completer}->show; 237 $self->{completer}->show;
231 } elsif ($uni == ord "'") { 238 } elsif ($uni == ord "'") {
232 $self->{completer}->set_prefix (""); 239 $self->{completer}->set_prefix ("");
233 $self->{completer}->show; 240 $self->{completer}->show;
234 } elsif (exists $DIR{$sym}) { 241 } elsif (exists $DIR{$sym}) {
235 if ($mod & CFClient::KMOD_SHIFT) { 242 if ($mod & CFPlus::KMOD_SHIFT) {
236 $self->{shft}++; 243 $self->{shft}++;
237 if ($DIR{$sym}[0] != $self->{fire_dir}) { 244 if ($DIR{$sym}[0] != $self->{fire_dir}) {
238 $::CONN->user_send ("fire $DIR{$sym}[0]"); 245 $::CONN->user_send ("fire $DIR{$sym}[0]");
239 } 246 }
240 $self->{fire_dir} = $DIR{$sym}[0]; 247 $self->{fire_dir} = $DIR{$sym}[0];
241 } elsif ($mod & CFClient::KMOD_CTRL) { 248 } elsif ($mod & CFPlus::KMOD_CTRL) {
242 $self->{ctrl}++; 249 $self->{ctrl}++;
243 $::CONN->user_send ("run $DIR{$sym}[0]"); 250 $::CONN->user_send ("run $DIR{$sym}[0]");
244 } else { 251 } else {
245 $::CONN->user_send ("$DIR{$sym}[1]"); 252 $::CONN->user_send ("$DIR{$sym}[1]");
246 } 253 }
… …
260 my $res = 0; 267 my $res = 0;
261 my $mod = $ev->{mod}; 268 my $mod = $ev->{mod};
262 my $sym = $ev->{sym}; 269 my $sym = $ev->{sym};
263 270
264 if ($::CFG->{shift_fire_stop}) { 271 if ($::CFG->{shift_fire_stop}) {
265 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 272 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
266 $::CONN->user_send ("fire_stop"); 273 $::CONN->user_send ("fire_stop");
267 delete $self->{fire_dir}; 274 delete $self->{fire_dir};
268 $res = 1; 275 $res = 1;
269 } 276 }
270 } else { 277 } else {
271 if (exists $DIR{$sym} && delete $self->{shft}) { 278 if (exists $DIR{$sym} && delete $self->{shft}) {
272 $::CONN->user_send ("fire_stop"); 279 $::CONN->user_send ("fire_stop");
273 delete $self->{fire_dir}; 280 delete $self->{fire_dir};
274 $res = 1; 281 $res = 1;
275 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 282 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
276 $::CONN->user_send ("fire_stop"); 283 $::CONN->user_send ("fire_stop");
277 delete $self->{fire_dir}; 284 delete $self->{fire_dir};
278 $res = 1; 285 $res = 1;
279 } 286 }
280 } 287 }
281 288
282 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 289 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
283 $::CONN->user_send ("run_stop"); 290 $::CONN->user_send ("run_stop");
284 $res = 1; 291 $res = 1;
285 } 292 }
286 293
287 $res 294 $res
… …
301sub draw { 308sub draw {
302 my ($self) = @_; 309 my ($self) = @_;
303 310
304 return unless $::MAP; 311 return unless $::MAP;
305 312
306 my $focused = $CFClient::UI::FOCUS == $self 313 my $focused = $CFPlus::UI::FOCUS == $self
307 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 314 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
308 315
309 return 316 return
310 unless $focused || !$::FAST; 317 unless $focused || !$::FAST;
311 318
312 if (delete $self->{need_update}) { 319 if (delete $self->{need_update}) {
313 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 320 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
314 321
315 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 322 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
316 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 323 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
317 324
318 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 325 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
319 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 326 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
320 327
321 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 328 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
322 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 329 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
323 330
324 if ($::CFG->{fow_enable}) { 331 if ($::CFG->{fow_enable}) {
325 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 332 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
326 333
327 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 334 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
328 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 335 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
329 glConvolutionFilter2D ( 336 glConvolutionFilter2D (
330 GL_CONVOLUTION_2D, 337 GL_CONVOLUTION_2D,
331 GL_ALPHA, 338 GL_ALPHA,
332 3, 3, 339 3, 3,
… …
334 (pack "f*", @{ $self->{smooth_matrix} }), 341 (pack "f*", @{ $self->{smooth_matrix} }),
335 ); 342 );
336 glEnable GL_CONVOLUTION_2D; 343 glEnable GL_CONVOLUTION_2D;
337 } 344 }
338 345
339 $self->{fow_texture} = new CFClient::Texture 346 $self->{fow_texture} = new CFPlus::Texture
340 w => $w, 347 w => $w,
341 h => $h, 348 h => $h,
342 data => $data, 349 data => $data,
343 internalformat => GL_ALPHA, 350 internalformat => GL_ALPHA,
344 format => GL_ALPHA; 351 format => GL_ALPHA;
… …
406 glDeleteList $self->{list}; 413 glDeleteList $self->{list};
407 414
408 $self->SUPER::DESTROY; 415 $self->SUPER::DESTROY;
409} 416}
410 417
411package CFClient::MapWidget::MapMap; 418package CFPlus::MapWidget::MapMap;
412 419
413our @ISA = CFClient::UI::Base::; 420our @ISA = CFPlus::UI::Base::;
414 421
415use Time::HiRes qw(time); 422use Time::HiRes qw(time);
416use CFClient::OpenGL; 423use CFPlus::OpenGL;
417 424
418sub size_request { 425sub size_request {
419 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 426 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
420} 427}
421 428
… …
457 464
458 if ($self->{texture_atime} < time) { 465 if ($self->{texture_atime} < time) {
459 $self->{texture_atime} = time + 1/3; 466 $self->{texture_atime} = time + 1/3;
460 467
461 $self->{texture} = 468 $self->{texture} =
462 new CFClient::Texture 469 new CFPlus::Texture
463 w => $w, 470 w => $w,
464 h => $h, 471 h => $h,
465 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 472 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
466 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 473 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
467 } 474 }
468 475
469 $self->{texture}->draw_quad (0, 0); 476 $self->{texture}->draw_quad (0, 0);
470 477
471 glDisable GL_TEXTURE_2D; 478 glDisable GL_TEXTURE_2D;
… …
486 glEnd; 493 glEnd;
487 494
488 glDisable GL_BLEND; 495 glDisable GL_BLEND;
489} 496}
490 497
491package CFClient::MapWidget::Command; 498package CFPlus::MapWidget::Command;
492 499
493use strict; 500use strict;
494 501
495use CFClient::OpenGL; 502use CFPlus::OpenGL;
496 503
497our @ISA = CFClient::UI::Frame::; 504our @ISA = CFPlus::UI::Frame::;
498 505
499sub new { 506sub new {
500 my $class = shift; 507 my $class = shift;
501 508
502 my $self = $class->SUPER::new ( 509 my $self = $class->SUPER::new (
503 bg => [0, 0, 0, 0.8], 510 bg => [0, 0, 0, 0.8],
504 @_, 511 @_,
505 ); 512 );
506 513
507 $self->add ($self->{vbox} = new CFClient::UI::VBox); 514 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
508 515
509 $self->{label} = [ 516 $self->{label} = [
510 map 517 map
511 CFClient::UI::Label->new ( 518 CFPlus::UI::Label->new (
512 can_hover => 1, 519 can_hover => 1,
513 can_events => 1, 520 can_events => 1,
514 tooltip_width => 0.33, 521 tooltip_width => 0.33,
515 fontsize => $_, 522 fontsize => $_,
516 ), (0.8) x 16 523 ), (0.8) x 16
517 ]; 524 ];
518 525
519 $self->{entry} = new CFClient::UI::Entry 526 $self->{entry} = new CFPlus::UI::Entry
520 on_changed => sub { 527 on_changed => sub {
521 $self->update_labels; 528 $self->update_labels;
522 0 529 0
523 }, 530 },
524 on_button_down => sub { 531 on_button_down => sub {
525 my ($entry, $ev, $x, $y) = @_; 532 my ($entry, $ev, $x, $y) = @_;
526 533
527 if ($ev->{button} == 3) { 534 if ($ev->{button} == 3) {
528 (new CFClient::UI::Menu 535 (new CFPlus::UI::Menu
529 items => [ 536 items => [
530 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 537 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
531 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 538 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
532 ], 539 ],
533 )->popup ($ev); 540 )->popup ($ev);
534 return 1; 541 return 1;
535 } 542 }
… …
551 $self->hide; 558 $self->hide;
552 } 559 }
553 } elsif ($ev->{sym} == 27) { 560 } elsif ($ev->{sym} == 27) {
554 $self->{hist_ptr} = 0; 561 $self->{hist_ptr} = 0;
555 $self->hide; 562 $self->hide;
556 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 563 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
557 if ($self->{hist_ptr} > 1) { 564 if ($self->{hist_ptr} > 1) {
558 $self->{hist_ptr}--; 565 $self->{hist_ptr}--;
559 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 566 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
560 } elsif ($self->{hist_ptr} > 0) { 567 } elsif ($self->{hist_ptr} > 0) {
561 $self->{hist_ptr}--; 568 $self->{hist_ptr}--;
… …
563 } else { 570 } else {
564 ++$self->{select_offset} 571 ++$self->{select_offset}
565 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 572 if $self->{select_offset} < $#{ $self->{last_match} || [] };
566 } 573 }
567 $self->update_labels; 574 $self->update_labels;
568 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 575 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
569 if ($self->{select_offset}) { 576 if ($self->{select_offset}) {
570 --$self->{select_offset} 577 --$self->{select_offset}
571 } else { 578 } else {
572 unless ($self->{hist_ptr}) { 579 unless ($self->{hist_ptr}) {
573 $self->{hist_saveback} = $self->{entry}->get_text; 580 $self->{hist_saveback} = $self->{entry}->get_text;
… …
731 738
732sub _draw { 739sub _draw {
733 my ($self) = @_; 740 my ($self) = @_;
734 741
735 # hack 742 # hack
736 local $CFClient::UI::FOCUS = $self->{entry}; 743 local $CFPlus::UI::FOCUS = $self->{entry};
737 744
738 $self->SUPER::_draw; 745 $self->SUPER::_draw;
739} 746}
740 747
7411 7481

Diff Legend

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