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.75 by root, Tue Jul 18 06:56:35 2006 UTC vs.
Revision 1.80 by root, Sun Jul 30 13:16:44 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 can_focus => 1,
36 tooltip => "<b>The Command Completer</b>\n\n" 37 tooltip => "<b>The Command Completer</b>\n\n"
37 . "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. "
38 . "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, "
39 . "followed by a space, and press return. " 40 . "followed by a space, and press return. "
40 . "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 "
… …
60 61
61sub clr_commands { 62sub clr_commands {
62 my ($self) = @_; 63 my ($self) = @_;
63 64
64 %{$self->{completer}{command}} = (); 65 %{$self->{completer}{command}} = ();
66
67 $self->{completer}->hide
68 if $self->{completer};
65} 69}
66 70
67sub invoke_button_down { 71sub invoke_button_down {
68 my ($self, $ev, $x, $y) = @_; 72 my ($self, $ev, $x, $y) = @_;
69 73
70 if ($ev->{button} == 1) { 74 if ($ev->{button} == 1) {
71 $self->grab_focus; 75 $self->grab_focus;
72 return unless $::CONN; 76 return unless $::CONN;
73 77
74 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 78 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
75 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 79 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
76 80
77 $x -= int 0.5 * $self->{sw}; 81 $x -= int 0.5 * $self->{sw};
78 $y -= int 0.5 * $self->{sh}; 82 $y -= int 0.5 * $self->{sh};
79 83
80 $::CONN->lookat ($x, $y) 84 $::CONN->lookat ($x, $y)
… …
96 $::CFG->{map_shift_y} = $bh + $y - $oy; 100 $::CFG->{map_shift_y} = $bh + $y - $oy;
97 101
98 $self->update; 102 $self->update;
99 }; 103 };
100 } elsif ($ev->{button} == 3) { 104 } elsif ($ev->{button} == 3) {
101 (new CFClient::UI::Menu 105 (new CFPlus::UI::Menu
102 items => [ 106 items => [
103 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 107 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
104 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 108 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
105 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 109 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
106 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 110 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
… …
111 $::PICKUP_ENABLE->{state} 115 $::PICKUP_ENABLE->{state}
112 ? "Disable automatic pickup" 116 ? "Disable automatic pickup"
113 : "Enable automatic pickup", 117 : "Enable automatic pickup",
114 sub { $::PICKUP_ENABLE->toggle } 118 sub { $::PICKUP_ENABLE->toggle }
115 ], 119 ],
120 ["Quit",
121 sub {
122 if ($::CONN) {
123 &::open_quit_dialog;
124 } else {
125 exit;
126 }
127 }
128 ],
116 ], 129 ],
117 )->popup ($ev); 130 )->popup ($ev);
118 } 131 }
119 132
120 1 133 1
… …
140 1 153 1
141} 154}
142 155
143sub size_request { 156sub size_request {
144 ( 157 (
145 32 * CFClient::ceil $::WIDTH / 32, 158 32 * CFPlus::ceil $::WIDTH / 32,
146 32 * CFClient::ceil $::HEIGHT / 32, 159 32 * CFPlus::ceil $::HEIGHT / 32,
147 ) 160 )
148} 161}
149 162
150sub update { 163sub update {
151 my ($self) = @_; 164 my ($self) = @_;
… …
153 $self->{need_update} = 1; 166 $self->{need_update} = 1;
154 $self->SUPER::update; 167 $self->SUPER::update;
155} 168}
156 169
157my %DIR = ( 170my %DIR = (
158 CFClient::SDLK_KP8, [1, "north"], 171 CFPlus::SDLK_KP8, [1, "north"],
159 CFClient::SDLK_KP9, [2, "northeast"], 172 CFPlus::SDLK_KP9, [2, "northeast"],
160 CFClient::SDLK_KP6, [3, "east"], 173 CFPlus::SDLK_KP6, [3, "east"],
161 CFClient::SDLK_KP3, [4, "southeast"], 174 CFPlus::SDLK_KP3, [4, "southeast"],
162 CFClient::SDLK_KP2, [5, "south"], 175 CFPlus::SDLK_KP2, [5, "south"],
163 CFClient::SDLK_KP1, [6, "southwest"], 176 CFPlus::SDLK_KP1, [6, "southwest"],
164 CFClient::SDLK_KP4, [7, "west"], 177 CFPlus::SDLK_KP4, [7, "west"],
165 CFClient::SDLK_KP7, [8, "northwest"], 178 CFPlus::SDLK_KP7, [8, "northwest"],
166 179
167 CFClient::SDLK_UP, [1, "north"], 180 CFPlus::SDLK_UP, [1, "north"],
168 CFClient::SDLK_RIGHT, [3, "east"], 181 CFPlus::SDLK_RIGHT, [3, "east"],
169 CFClient::SDLK_DOWN, [5, "south"], 182 CFPlus::SDLK_DOWN, [5, "south"],
170 CFClient::SDLK_LEFT, [7, "west"], 183 CFPlus::SDLK_LEFT, [7, "west"],
171); 184);
172 185
173sub invoke_key_down { 186sub invoke_key_down {
174 my ($self, $ev) = @_; 187 my ($self, $ev) = @_;
175 188
176 my $mod = $ev->{mod}; 189 my $mod = $ev->{mod};
177 my $sym = $ev->{sym}; 190 my $sym = $ev->{sym};
178 my $uni = $ev->{unicode}; 191 my $uni = $ev->{unicode};
179 192
180 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; 193 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
181 194
182 if ($uni == ord "\t") { 195 if ($uni == ord "\t") {
183 $::PL_WINDOW->toggle_visibility; 196 $::PL_WINDOW->toggle_visibility;
184 } elsif ($sym == CFClient::SDLK_F1 && !$mod) { 197 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
185 $::HELP_WINDOW->toggle_visibility; 198 $::HELP_WINDOW->toggle_visibility;
186 } elsif ($sym == CFClient::SDLK_F2 && !$mod) { 199 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
187 ::toggle_player_page ($::STATS_PAGE); 200 ::toggle_player_page ($::STATS_PAGE);
188 } elsif ($sym == CFClient::SDLK_F3 && !$mod) { 201 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
189 ::toggle_player_page ($::SKILL_PAGE); 202 ::toggle_player_page ($::SKILL_PAGE);
190 } elsif ($sym == CFClient::SDLK_F4 && !$mod) { 203 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
191 ::toggle_player_page ($::SPELL_PAGE); 204 ::toggle_player_page ($::SPELL_PAGE);
192 } elsif ($sym == CFClient::SDLK_F5 && !$mod) { 205 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
193 ::toggle_player_page ($::INVENTORY_PAGE); 206 ::toggle_player_page ($::INVENTORY_PAGE);
194 } elsif ($sym == CFClient::SDLK_F9 && !$mod) { 207 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
195 $::SETUP_DIALOG->toggle_visibility; 208 $::SETUP_DIALOG->toggle_visibility;
196 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 209 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
197 $::BIND_EDITOR->set_binding (undef, undef, [], 210 $::BIND_EDITOR->set_binding (undef, undef, [],
198 sub { 211 sub {
199 my ($mod, $sym, $cmds) = @_; 212 my ($mod, $sym, $cmds) = @_;
200 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); 213 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
201 }); 214 });
202 $::BIND_EDITOR->start; 215 $::BIND_EDITOR->start;
203 $::BIND_EDITOR->show; 216 $::BIND_EDITOR->show;
204 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 217 } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
205 $::BIND_EDITOR->stop; 218 $::BIND_EDITOR->stop;
206 $::BIND_EDITOR->ask_for_bind_and_commit; 219 $::BIND_EDITOR->ask_for_bind_and_commit;
207 $::BIND_EDITOR->hide; 220 $::BIND_EDITOR->hide;
208 } elsif (!$::CONN) { 221 } elsif (!$::CONN) {
209 return 0; # bindings further down need a valid connection 222 return 0; # bindings further down need a valid connection
210 223
211 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { 224 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
212 $::CONN->user_send ("stay fire"); 225 $::CONN->user_send ("stay fire");
213 } elsif ($uni == ord ",") { 226 } elsif ($uni == ord ",") {
214 $::CONN->user_send ("take"); 227 $::CONN->user_send ("take");
215 } elsif ($uni == ord " ") { 228 } elsif ($uni == ord " ") {
216 $::CONN->user_send ("apply"); 229 $::CONN->user_send ("apply");
217 } elsif ($uni == ord ".") { 230 } elsif ($uni == ord ".") {
218 $::CONN->user_send ($self->{completer}{last_command}) 231 $::CONN->user_send ($self->{completer}{last_command})
219 if exists $self->{completer}{last_command}; 232 if exists $self->{completer}{last_command};
220 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 233 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
221 $::CONN->user_send ($_) for @$bind_cmd; 234 $::CONN->user_send ($_) for @$bind_cmd;
222 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 235 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
223 $::CONN->user_send ("rotateshoottype +"); 236 $::CONN->user_send ("rotateshoottype +");
224 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 237 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
225 $::CONN->user_send ("rotateshoottype -"); 238 $::CONN->user_send ("rotateshoottype -");
226 } elsif ($uni == ord '"') { 239 } elsif ($uni == ord '"') {
227 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 240 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
228 $self->{completer}->show; 241 $self->{completer}->show;
229 } elsif ($uni == ord "'") { 242 } elsif ($uni == ord "'") {
230 $self->{completer}->set_prefix (""); 243 $self->{completer}->set_prefix ("");
231 $self->{completer}->show; 244 $self->{completer}->show;
232 } elsif (exists $DIR{$sym}) { 245 } elsif (exists $DIR{$sym}) {
233 if ($mod & CFClient::KMOD_SHIFT) { 246 if ($mod & CFPlus::KMOD_SHIFT) {
234 $self->{shft}++; 247 $self->{shft}++;
235 if ($DIR{$sym}[0] != $self->{fire_dir}) { 248 if ($DIR{$sym}[0] != $self->{fire_dir}) {
236 $::CONN->user_send ("fire $DIR{$sym}[0]"); 249 $::CONN->user_send ("fire $DIR{$sym}[0]");
237 } 250 }
238 $self->{fire_dir} = $DIR{$sym}[0]; 251 $self->{fire_dir} = $DIR{$sym}[0];
239 } elsif ($mod & CFClient::KMOD_CTRL) { 252 } elsif ($mod & CFPlus::KMOD_CTRL) {
240 $self->{ctrl}++; 253 $self->{ctrl}++;
241 $::CONN->user_send ("run $DIR{$sym}[0]"); 254 $::CONN->user_send ("run $DIR{$sym}[0]");
242 } else { 255 } else {
243 $::CONN->user_send ("$DIR{$sym}[1]"); 256 $::CONN->user_send ("$DIR{$sym}[1]");
244 } 257 }
245 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 258 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
246 $self->{completer}->invoke_key_down ($ev); 259 $self->{completer}->inject_key_down ($ev);
247 $self->{completer}->show; 260 $self->{completer}->show;
248 } else { 261 } else {
249 return 0; 262 return 0;
250 } 263 }
251 264
… …
258 my $res = 0; 271 my $res = 0;
259 my $mod = $ev->{mod}; 272 my $mod = $ev->{mod};
260 my $sym = $ev->{sym}; 273 my $sym = $ev->{sym};
261 274
262 if ($::CFG->{shift_fire_stop}) { 275 if ($::CFG->{shift_fire_stop}) {
263 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 276 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
264 $::CONN->user_send ("fire_stop"); 277 $::CONN->user_send ("fire_stop");
265 delete $self->{fire_dir}; 278 delete $self->{fire_dir};
266 $res = 1; 279 $res = 1;
267 } 280 }
268 } else { 281 } else {
269 if (exists $DIR{$sym} && delete $self->{shft}) { 282 if (exists $DIR{$sym} && delete $self->{shft}) {
270 $::CONN->user_send ("fire_stop"); 283 $::CONN->user_send ("fire_stop");
271 delete $self->{fire_dir}; 284 delete $self->{fire_dir};
272 $res = 1; 285 $res = 1;
273 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 286 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
274 $::CONN->user_send ("fire_stop"); 287 $::CONN->user_send ("fire_stop");
275 delete $self->{fire_dir}; 288 delete $self->{fire_dir};
276 $res = 1; 289 $res = 1;
277 } 290 }
278 } 291 }
279 292
280 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 293 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
281 $::CONN->user_send ("run_stop"); 294 $::CONN->user_send ("run_stop");
282 $res = 1; 295 $res = 1;
283 } 296 }
284 297
285 $res 298 $res
… …
299sub draw { 312sub draw {
300 my ($self) = @_; 313 my ($self) = @_;
301 314
302 return unless $::MAP; 315 return unless $::MAP;
303 316
304 my $focused = $CFClient::UI::FOCUS == $self 317 my $focused = $CFPlus::UI::FOCUS == $self
305 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 318 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
306 319
307 return 320 return
308 unless $focused || !$::FAST; 321 unless $focused || !$::FAST;
309 322
310 if (delete $self->{need_update}) { 323 if (delete $self->{need_update}) {
311 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 324 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
312 325
313 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 326 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
314 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 327 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
315 328
316 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 329 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
317 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 330 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
318 331
319 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 332 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
320 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 333 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
321 334
322 if ($::CFG->{fow_enable}) { 335 if ($::CFG->{fow_enable}) {
323 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 336 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
324 337
325 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 338 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
326 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 339 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
327 glConvolutionFilter2D ( 340 glConvolutionFilter2D (
328 GL_CONVOLUTION_2D, 341 GL_CONVOLUTION_2D,
329 GL_ALPHA, 342 GL_ALPHA,
330 3, 3, 343 3, 3,
… …
332 (pack "f*", @{ $self->{smooth_matrix} }), 345 (pack "f*", @{ $self->{smooth_matrix} }),
333 ); 346 );
334 glEnable GL_CONVOLUTION_2D; 347 glEnable GL_CONVOLUTION_2D;
335 } 348 }
336 349
337 $self->{fow_texture} = new CFClient::Texture 350 $self->{fow_texture} = new CFPlus::Texture
338 w => $w, 351 w => $w,
339 h => $h, 352 h => $h,
340 data => $data, 353 data => $data,
341 internalformat => GL_ALPHA, 354 internalformat => GL_ALPHA,
342 format => GL_ALPHA; 355 format => GL_ALPHA;
… …
404 glDeleteList $self->{list}; 417 glDeleteList $self->{list};
405 418
406 $self->SUPER::DESTROY; 419 $self->SUPER::DESTROY;
407} 420}
408 421
409package CFClient::MapWidget::MapMap; 422package CFPlus::MapWidget::MapMap;
410 423
411our @ISA = CFClient::UI::Base::; 424our @ISA = CFPlus::UI::Base::;
412 425
413use Time::HiRes qw(time); 426use Time::HiRes qw(time);
414use CFClient::OpenGL; 427use CFPlus::OpenGL;
415 428
416sub size_request { 429sub size_request {
417 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 430 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
418} 431}
419 432
… …
455 468
456 if ($self->{texture_atime} < time) { 469 if ($self->{texture_atime} < time) {
457 $self->{texture_atime} = time + 1/3; 470 $self->{texture_atime} = time + 1/3;
458 471
459 $self->{texture} = 472 $self->{texture} =
460 new CFClient::Texture 473 new CFPlus::Texture
461 w => $w, 474 w => $w,
462 h => $h, 475 h => $h,
463 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 476 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
464 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 477 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
465 } 478 }
466 479
467 $self->{texture}->draw_quad (0, 0); 480 $self->{texture}->draw_quad (0, 0);
468 481
469 glDisable GL_TEXTURE_2D; 482 glDisable GL_TEXTURE_2D;
… …
484 glEnd; 497 glEnd;
485 498
486 glDisable GL_BLEND; 499 glDisable GL_BLEND;
487} 500}
488 501
489package CFClient::MapWidget::Command; 502package CFPlus::MapWidget::Command;
490 503
491use strict; 504use strict;
492 505
493use CFClient::OpenGL; 506use CFPlus::OpenGL;
494 507
495our @ISA = CFClient::UI::Frame::; 508our @ISA = CFPlus::UI::Frame::;
496 509
497sub new { 510sub new {
498 my $class = shift; 511 my $class = shift;
499 512
500 my $self = $class->SUPER::new ( 513 my $self = $class->SUPER::new (
501 bg => [0, 0, 0, 0.8], 514 bg => [0, 0, 0, 0.8],
502 @_, 515 @_,
503 ); 516 );
504 517
505 $self->add ($self->{vbox} = new CFClient::UI::VBox); 518 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
506 519
507 $self->{label} = [ 520 $self->{label} = [
508 map 521 map
509 CFClient::UI::Label->new ( 522 CFPlus::UI::Label->new (
510 can_hover => 1, 523 can_hover => 1,
511 can_events => 1, 524 can_events => 1,
512 tooltip_width => 0.33, 525 tooltip_width => 0.33,
513 fontsize => $_, 526 fontsize => $_,
514 ), (0.8) x 16 527 ), (0.8) x 16
515 ]; 528 ];
516 529
517 $self->{entry} = new CFClient::UI::Entry 530 $self->{entry} = new CFPlus::UI::Entry
518 on_changed => sub { 531 on_changed => sub {
519 $self->update_labels; 532 $self->update_labels;
520 0 533 0
521 }, 534 },
522 on_button_down => sub { 535 on_button_down => sub {
523 my ($entry, $ev, $x, $y) = @_; 536 my ($entry, $ev, $x, $y) = @_;
524 537
525 if ($ev->{button} == 3) { 538 if ($ev->{button} == 3) {
526 (new CFClient::UI::Menu 539 (new CFPlus::UI::Menu
527 items => [ 540 items => [
528 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 541 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
529 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 542 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
530 ], 543 ],
531 )->popup ($ev); 544 )->popup ($ev);
532 return 1; 545 return 1;
533 } 546 }
… …
549 $self->hide; 562 $self->hide;
550 } 563 }
551 } elsif ($ev->{sym} == 27) { 564 } elsif ($ev->{sym} == 27) {
552 $self->{hist_ptr} = 0; 565 $self->{hist_ptr} = 0;
553 $self->hide; 566 $self->hide;
554 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 567 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
555 if ($self->{hist_ptr} > 1) { 568 if ($self->{hist_ptr} > 1) {
556 $self->{hist_ptr}--; 569 $self->{hist_ptr}--;
557 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 570 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
558 } elsif ($self->{hist_ptr} > 0) { 571 } elsif ($self->{hist_ptr} > 0) {
559 $self->{hist_ptr}--; 572 $self->{hist_ptr}--;
… …
561 } else { 574 } else {
562 ++$self->{select_offset} 575 ++$self->{select_offset}
563 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 576 if $self->{select_offset} < $#{ $self->{last_match} || [] };
564 } 577 }
565 $self->update_labels; 578 $self->update_labels;
566 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 579 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
567 if ($self->{select_offset}) { 580 if ($self->{select_offset}) {
568 --$self->{select_offset} 581 --$self->{select_offset}
569 } else { 582 } else {
570 unless ($self->{hist_ptr}) { 583 unless ($self->{hist_ptr}) {
571 $self->{hist_saveback} = $self->{entry}->get_text; 584 $self->{hist_saveback} = $self->{entry}->get_text;
… …
616} 629}
617 630
618sub hide { 631sub hide {
619 my ($self) = @_; 632 my ($self) = @_;
620 633
634 $self->{hist_ptr} = 0;
635
621 $self->SUPER::hide; 636 $self->SUPER::hide;
622 $self->{entry}->set_text (""); 637 $self->{entry}->set_text ("");
623} 638}
624 639
625sub invoke_key_down { 640sub inject_key_down {
626 my ($self, $ev) = @_; 641 my ($self, $ev) = @_;
627 642
643 $self->{entry}->grab_focus;
628 $self->{entry}->emit (key_down => $ev) 644 $self->{entry}->emit (key_down => $ev);
629} 645}
630 646
631sub update_labels { 647sub update_labels {
632 my ($self) = @_; 648 my ($self) = @_;
633 649
… …
726 742
727sub _draw { 743sub _draw {
728 my ($self) = @_; 744 my ($self) = @_;
729 745
730 # hack 746 # hack
731 local $CFClient::UI::FOCUS = $self->{entry}; 747 local $CFPlus::UI::FOCUS = $self->{entry};
732 748
733 $self->SUPER::_draw; 749 $self->SUPER::_draw;
734} 750}
735 751
7361 7521

Diff Legend

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