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.70 by elmex, Sun Jul 2 19:32:55 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 return unless $::CONN;
71
72 $self->grab_focus;
73
74 if ($ev->{button} == 1) { 74 if ($ev->{button} == 1) {
75 $self->grab_focus;
76 return unless $::CONN;
77
75 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};
76 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};
77 80
78 $x -= int 0.5 * $self->{sw}; 81 $x -= int 0.5 * $self->{sw};
79 $y -= int 0.5 * $self->{sh}; 82 $y -= int 0.5 * $self->{sh};
80 83
81 $::CONN->lookat ($x, $y) 84 $::CONN->lookat ($x, $y)
82 if $::CONN; 85 if $::CONN;
83 86
84 } elsif ($ev->{button} == 2) { 87 } elsif ($ev->{button} == 2) {
88 $self->grab_focus;
89 return unless $::CONN;
90
85 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 91 my ($ox, $oy) = ($ev->{x}, $ev->{y});
86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 92 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87 93
88 $self->{motion} = sub { 94 $self->{motion} = sub {
89 my ($ev, $x, $y) = @_; 95 my ($ev, $x, $y) = @_;
… …
93 $::CFG->{map_shift_x} = $bw + $x - $ox; 99 $::CFG->{map_shift_x} = $bw + $x - $ox;
94 $::CFG->{map_shift_y} = $bh + $y - $oy; 100 $::CFG->{map_shift_y} = $bh + $y - $oy;
95 101
96 $self->update; 102 $self->update;
97 }; 103 };
104 } elsif ($ev->{button} == 3) {
105 (new CFPlus::UI::Menu
106 items => [
107 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
108 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
109 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
110 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
111 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
112 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
113 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
114 [
115 $::PICKUP_ENABLE->{state}
116 ? "Disable automatic pickup"
117 : "Enable automatic pickup",
118 sub { $::PICKUP_ENABLE->toggle }
119 ],
120 ["Quit",
121 sub {
122 if ($::CONN) {
123 &::open_quit_dialog;
124 } else {
125 exit;
126 }
127 }
128 ],
129 ],
130 )->popup ($ev);
98 } 131 }
99 132
100 1 133 1
101} 134}
102 135
… …
120 1 153 1
121} 154}
122 155
123sub size_request { 156sub size_request {
124 ( 157 (
125 32 * CFClient::ceil $::WIDTH / 32, 158 32 * CFPlus::ceil $::WIDTH / 32,
126 32 * CFClient::ceil $::HEIGHT / 32, 159 32 * CFPlus::ceil $::HEIGHT / 32,
127 ) 160 )
128} 161}
129 162
130sub update { 163sub update {
131 my ($self) = @_; 164 my ($self) = @_;
… …
133 $self->{need_update} = 1; 166 $self->{need_update} = 1;
134 $self->SUPER::update; 167 $self->SUPER::update;
135} 168}
136 169
137my %DIR = ( 170my %DIR = (
138 CFClient::SDLK_KP8, [1, "north"], 171 CFPlus::SDLK_KP8, [1, "north"],
139 CFClient::SDLK_KP9, [2, "northeast"], 172 CFPlus::SDLK_KP9, [2, "northeast"],
140 CFClient::SDLK_KP6, [3, "east"], 173 CFPlus::SDLK_KP6, [3, "east"],
141 CFClient::SDLK_KP3, [4, "southeast"], 174 CFPlus::SDLK_KP3, [4, "southeast"],
142 CFClient::SDLK_KP2, [5, "south"], 175 CFPlus::SDLK_KP2, [5, "south"],
143 CFClient::SDLK_KP1, [6, "southwest"], 176 CFPlus::SDLK_KP1, [6, "southwest"],
144 CFClient::SDLK_KP4, [7, "west"], 177 CFPlus::SDLK_KP4, [7, "west"],
145 CFClient::SDLK_KP7, [8, "northwest"], 178 CFPlus::SDLK_KP7, [8, "northwest"],
146 179
147 CFClient::SDLK_UP, [1, "north"], 180 CFPlus::SDLK_UP, [1, "north"],
148 CFClient::SDLK_RIGHT, [3, "east"], 181 CFPlus::SDLK_RIGHT, [3, "east"],
149 CFClient::SDLK_DOWN, [5, "south"], 182 CFPlus::SDLK_DOWN, [5, "south"],
150 CFClient::SDLK_LEFT, [7, "west"], 183 CFPlus::SDLK_LEFT, [7, "west"],
151); 184);
152 185
153sub invoke_key_down { 186sub invoke_key_down {
154 my ($self, $ev) = @_; 187 my ($self, $ev) = @_;
155
156 return 0 unless $::CONN;
157 188
158 my $mod = $ev->{mod}; 189 my $mod = $ev->{mod};
159 my $sym = $ev->{sym}; 190 my $sym = $ev->{sym};
160 my $uni = $ev->{unicode}; 191 my $uni = $ev->{unicode};
161 192
162 if ($sym == CFClient::SDLK_KP5) { 193 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
194
195 if ($uni == ord "\t") {
196 $::PL_WINDOW->toggle_visibility;
197 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
198 $::HELP_WINDOW->toggle_visibility;
199 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
200 ::toggle_player_page ($::STATS_PAGE);
201 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
202 ::toggle_player_page ($::SKILL_PAGE);
203 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
204 ::toggle_player_page ($::SPELL_PAGE);
205 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
206 ::toggle_player_page ($::INVENTORY_PAGE);
207 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
208 $::SETUP_DIALOG->toggle_visibility;
209 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
210 $::BIND_EDITOR->set_binding (undef, undef, [],
211 sub {
212 my ($mod, $sym, $cmds) = @_;
213 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
214 });
215 $::BIND_EDITOR->start;
216 $::BIND_EDITOR->show;
217 } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
218 $::BIND_EDITOR->stop;
219 $::BIND_EDITOR->ask_for_bind_and_commit;
220 $::BIND_EDITOR->hide;
221 } elsif (!$::CONN) {
222 return 0; # bindings further down need a valid connection
223
224 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
163 $::CONN->user_send ("stay fire"); 225 $::CONN->user_send ("stay fire");
164 } elsif ($uni == ord ",") { 226 } elsif ($uni == ord ",") {
165 $::CONN->user_send ("take"); 227 $::CONN->user_send ("take");
166 } elsif ($uni == ord " ") { 228 } elsif ($uni == ord " ") {
167 $::CONN->user_send ("apply"); 229 $::CONN->user_send ("apply");
168 } elsif ($uni == ord ".") { 230 } elsif ($uni == ord ".") {
169 $::CONN->user_send ($self->{completer}{last_command}) 231 $::CONN->user_send ($self->{completer}{last_command})
170 if exists $self->{completer}{last_command}; 232 if exists $self->{completer}{last_command};
171 } elsif ($uni == ord "\t") { 233 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
172 $::PL_WINDOW->toggle_visibility; 234 $::CONN->user_send ($_) for @$bind_cmd;
173 $::PL_NOTEBOOK->set_current_page ("Inventory");
174 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 235 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
175 $::CONN->user_send ("rotateshoottype +"); 236 $::CONN->user_send ("rotateshoottype +");
176 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 237 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
177 $::CONN->user_send ("rotateshoottype -"); 238 $::CONN->user_send ("rotateshoottype -");
178 } elsif ($uni == ord '"') { 239 } elsif ($uni == ord '"') {
179 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 240 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
180 $self->{completer}->show; 241 $self->{completer}->show;
181 } elsif ($uni == ord "'") { 242 } elsif ($uni == ord "'") {
182 $self->{completer}->set_prefix (""); 243 $self->{completer}->set_prefix ("");
183 $self->{completer}->show; 244 $self->{completer}->show;
184 } elsif (exists $DIR{$sym}) { 245 } elsif (exists $DIR{$sym}) {
185 if ($mod & CFClient::KMOD_SHIFT) { 246 if ($mod & CFPlus::KMOD_SHIFT) {
186 $self->{shft}++; 247 $self->{shft}++;
187 if ($DIR{$sym}[0] != $self->{fire_dir}) { 248 if ($DIR{$sym}[0] != $self->{fire_dir}) {
188 $::CONN->user_send ("fire $DIR{$sym}[0]"); 249 $::CONN->user_send ("fire $DIR{$sym}[0]");
189 } 250 }
190 $self->{fire_dir} = $DIR{$sym}[0]; 251 $self->{fire_dir} = $DIR{$sym}[0];
191 } elsif ($mod & CFClient::KMOD_CTRL) { 252 } elsif ($mod & CFPlus::KMOD_CTRL) {
192 $self->{ctrl}++; 253 $self->{ctrl}++;
193 $::CONN->user_send ("run $DIR{$sym}[0]"); 254 $::CONN->user_send ("run $DIR{$sym}[0]");
194 } else { 255 } else {
195 $::CONN->user_send ("$DIR{$sym}[1]"); 256 $::CONN->user_send ("$DIR{$sym}[1]");
196 } 257 }
197 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
198 $::BIND_EDITOR->set_binding (undef, undef, [],
199 sub {
200 my ($mod, $sym, $cmds) = @_;
201 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
202 });
203 $::BIND_EDITOR->start;
204 $::BIND_EDITOR->show;
205 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
206 $::BIND_EDITOR->stop;
207 $::BIND_EDITOR->ask_for_bind_and_commit;
208 $::BIND_EDITOR->hide;
209 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
210 $::CONN->user_send ($_) for @$bind_cmd;
211 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 258 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
212 $self->{completer}->invoke_key_down ($ev); 259 $self->{completer}->inject_key_down ($ev);
213 $self->{completer}->show; 260 $self->{completer}->show;
214 } else { 261 } else {
215 return 0; 262 return 0;
216 } 263 }
217 264
… …
224 my $res = 0; 271 my $res = 0;
225 my $mod = $ev->{mod}; 272 my $mod = $ev->{mod};
226 my $sym = $ev->{sym}; 273 my $sym = $ev->{sym};
227 274
228 if ($::CFG->{shift_fire_stop}) { 275 if ($::CFG->{shift_fire_stop}) {
229 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 276 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
230 $::CONN->user_send ("fire_stop"); 277 $::CONN->user_send ("fire_stop");
231 delete $self->{fire_dir}; 278 delete $self->{fire_dir};
232 $res = 1; 279 $res = 1;
233 } 280 }
234 } else { 281 } else {
235 if (exists $DIR{$sym} && delete $self->{shft}) { 282 if (exists $DIR{$sym} && delete $self->{shft}) {
236 $::CONN->user_send ("fire_stop"); 283 $::CONN->user_send ("fire_stop");
237 delete $self->{fire_dir}; 284 delete $self->{fire_dir};
238 $res = 1; 285 $res = 1;
239 } 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?
240 $::CONN->user_send ("fire_stop"); 287 $::CONN->user_send ("fire_stop");
241 delete $self->{fire_dir}; 288 delete $self->{fire_dir};
242 $res = 1; 289 $res = 1;
243 } 290 }
244 } 291 }
245 292
246 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 293 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
247 $::CONN->user_send ("run_stop"); 294 $::CONN->user_send ("run_stop");
248 $res = 1; 295 $res = 1;
249 } 296 }
250 297
251 $res 298 $res
… …
265sub draw { 312sub draw {
266 my ($self) = @_; 313 my ($self) = @_;
267 314
268 return unless $::MAP; 315 return unless $::MAP;
269 316
270 my $focused = $CFClient::UI::FOCUS == $self 317 my $focused = $CFPlus::UI::FOCUS == $self
271 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 318 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
272 319
273 return 320 return
274 unless $focused || !$::FAST; 321 unless $focused || !$::FAST;
275 322
276 if (delete $self->{need_update}) { 323 if (delete $self->{need_update}) {
277 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 324 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
278 325
279 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 326 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
280 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 327 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
281 328
282 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 329 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
283 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 330 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
284 331
285 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 332 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
286 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 333 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
287 334
288 if ($::CFG->{fow_enable}) { 335 if ($::CFG->{fow_enable}) {
289 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);
290 337
291 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
292 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 339 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
293 glConvolutionFilter2D ( 340 glConvolutionFilter2D (
294 GL_CONVOLUTION_2D, 341 GL_CONVOLUTION_2D,
295 GL_ALPHA, 342 GL_ALPHA,
296 3, 3, 343 3, 3,
… …
298 (pack "f*", @{ $self->{smooth_matrix} }), 345 (pack "f*", @{ $self->{smooth_matrix} }),
299 ); 346 );
300 glEnable GL_CONVOLUTION_2D; 347 glEnable GL_CONVOLUTION_2D;
301 } 348 }
302 349
303 $self->{fow_texture} = new CFClient::Texture 350 $self->{fow_texture} = new CFPlus::Texture
304 w => $w, 351 w => $w,
305 h => $h, 352 h => $h,
306 data => $data, 353 data => $data,
307 internalformat => GL_ALPHA, 354 internalformat => GL_ALPHA,
308 format => GL_ALPHA; 355 format => GL_ALPHA;
… …
370 glDeleteList $self->{list}; 417 glDeleteList $self->{list};
371 418
372 $self->SUPER::DESTROY; 419 $self->SUPER::DESTROY;
373} 420}
374 421
375package CFClient::MapWidget::MapMap; 422package CFPlus::MapWidget::MapMap;
376 423
377our @ISA = CFClient::UI::Base::; 424our @ISA = CFPlus::UI::Base::;
378 425
379use Time::HiRes qw(time); 426use Time::HiRes qw(time);
380use CFClient::OpenGL; 427use CFPlus::OpenGL;
381 428
382sub size_request { 429sub size_request {
383 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 430 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
384} 431}
385 432
… …
421 468
422 if ($self->{texture_atime} < time) { 469 if ($self->{texture_atime} < time) {
423 $self->{texture_atime} = time + 1/3; 470 $self->{texture_atime} = time + 1/3;
424 471
425 $self->{texture} = 472 $self->{texture} =
426 new CFClient::Texture 473 new CFPlus::Texture
427 w => $w, 474 w => $w,
428 h => $h, 475 h => $h,
429 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 476 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
430 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;
431 } 478 }
432 479
433 $self->{texture}->draw_quad (0, 0); 480 $self->{texture}->draw_quad (0, 0);
434 481
435 glDisable GL_TEXTURE_2D; 482 glDisable GL_TEXTURE_2D;
… …
450 glEnd; 497 glEnd;
451 498
452 glDisable GL_BLEND; 499 glDisable GL_BLEND;
453} 500}
454 501
455package CFClient::MapWidget::Command; 502package CFPlus::MapWidget::Command;
456 503
457use strict; 504use strict;
458 505
459use CFClient::OpenGL; 506use CFPlus::OpenGL;
460 507
461our @ISA = CFClient::UI::Frame::; 508our @ISA = CFPlus::UI::Frame::;
462 509
463sub new { 510sub new {
464 my $class = shift; 511 my $class = shift;
465 512
466 my $self = $class->SUPER::new ( 513 my $self = $class->SUPER::new (
467 bg => [0, 0, 0, 0.8], 514 bg => [0, 0, 0, 0.8],
468 @_, 515 @_,
469 ); 516 );
470 517
471 $self->add ($self->{vbox} = new CFClient::UI::VBox); 518 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
472 519
473 $self->{label} = [ 520 $self->{label} = [
474 map 521 map
475 CFClient::UI::Label->new ( 522 CFPlus::UI::Label->new (
476 can_hover => 1, 523 can_hover => 1,
477 can_events => 1, 524 can_events => 1,
478 tooltip_width => 0.33, 525 tooltip_width => 0.33,
479 fontsize => $_, 526 fontsize => $_,
480 ), (0.8) x 16 527 ), (0.8) x 16
481 ]; 528 ];
482 529
483 $self->{entry} = new CFClient::UI::Entry 530 $self->{entry} = new CFPlus::UI::Entry
484 on_changed => sub { 531 on_changed => sub {
485 $self->update_labels; 532 $self->update_labels;
486 0 533 0
487 }, 534 },
488 on_button_down => sub { 535 on_button_down => sub {
489 my ($entry, $ev, $x, $y) = @_; 536 my ($entry, $ev, $x, $y) = @_;
490 537
491 if ($ev->{button} == 3) { 538 if ($ev->{button} == 3) {
492 (new CFClient::UI::Menu 539 (new CFPlus::UI::Menu
493 items => [ 540 items => [
494 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 541 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
495 => 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 }) }]
496 ], 543 ],
497 )->popup ($ev); 544 )->popup ($ev);
498 return 1; 545 return 1;
499 } 546 }
… …
515 $self->hide; 562 $self->hide;
516 } 563 }
517 } elsif ($ev->{sym} == 27) { 564 } elsif ($ev->{sym} == 27) {
518 $self->{hist_ptr} = 0; 565 $self->{hist_ptr} = 0;
519 $self->hide; 566 $self->hide;
520 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 567 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
521 if ($self->{hist_ptr} > 1) { 568 if ($self->{hist_ptr} > 1) {
522 $self->{hist_ptr}--; 569 $self->{hist_ptr}--;
523 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 570 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524 } elsif ($self->{hist_ptr} > 0) { 571 } elsif ($self->{hist_ptr} > 0) {
525 $self->{hist_ptr}--; 572 $self->{hist_ptr}--;
… …
527 } else { 574 } else {
528 ++$self->{select_offset} 575 ++$self->{select_offset}
529 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 576 if $self->{select_offset} < $#{ $self->{last_match} || [] };
530 } 577 }
531 $self->update_labels; 578 $self->update_labels;
532 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 579 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
533 if ($self->{select_offset}) { 580 if ($self->{select_offset}) {
534 --$self->{select_offset} 581 --$self->{select_offset}
535 } else { 582 } else {
536 unless ($self->{hist_ptr}) { 583 unless ($self->{hist_ptr}) {
537 $self->{hist_saveback} = $self->{entry}->get_text; 584 $self->{hist_saveback} = $self->{entry}->get_text;
… …
582} 629}
583 630
584sub hide { 631sub hide {
585 my ($self) = @_; 632 my ($self) = @_;
586 633
634 $self->{hist_ptr} = 0;
635
587 $self->SUPER::hide; 636 $self->SUPER::hide;
588 $self->{entry}->set_text (""); 637 $self->{entry}->set_text ("");
589} 638}
590 639
591sub invoke_key_down { 640sub inject_key_down {
592 my ($self, $ev) = @_; 641 my ($self, $ev) = @_;
593 642
643 $self->{entry}->grab_focus;
594 $self->{entry}->emit (key_down => $ev) 644 $self->{entry}->emit (key_down => $ev);
595} 645}
596 646
597sub update_labels { 647sub update_labels {
598 my ($self) = @_; 648 my ($self) = @_;
599 649
… …
692 742
693sub _draw { 743sub _draw {
694 my ($self) = @_; 744 my ($self) = @_;
695 745
696 # hack 746 # hack
697 local $CFClient::UI::FOCUS = $self->{entry}; 747 local $CFPlus::UI::FOCUS = $self->{entry};
698 748
699 $self->SUPER::_draw; 749 $self->SUPER::_draw;
700} 750}
701 751
7021 7521

Diff Legend

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