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.76 by elmex, Sat Jul 22 12:36:17 2006 UTC vs.
Revision 1.83 by root, Sun Oct 1 14:48:51 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, 37 tooltip => "#completer_help",
36 tooltip => "<b>The Command Completer</b>\n\n"
37 . "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 . "followed by a space, and press return. "
40 . "Typing the initial letters of words (or just any letters) displays guesses "
41 . "for commands you might want to use.\n"
42 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
43 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
44 ; 38 ;
45 39
46 $self 40 $self
47} 41}
48 42
… …
65 59
66 $self->{completer}->hide 60 $self->{completer}->hide
67 if $self->{completer}; 61 if $self->{completer};
68} 62}
69 63
64sub test_server_login {
65 return unless
66 $::CONN && length $::CONN->{test_server};
67
68 my $server = $::CONN->{test_server};
69 ::stop_game ();
70 local $::PROFILE->{host} = $server;
71 ::start_game ();
72}
73
74sub editor_invoke {
75 return unless $::CONN;
76
77 # putting the password into the env is somewhat tasteless
78 local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user};
79 local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password};
80 local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload};
81 local $ENV{CROSSFIRE_MAPDIR} = $::CONN->{cvs_root};
82
83# CFPlus::set_proxy;
84
85 # TODO: move into editor
86 require LWP::Simple;
87}
88
70sub invoke_button_down { 89sub invoke_button_down {
71 my ($self, $ev, $x, $y) = @_; 90 my ($self, $ev, $x, $y) = @_;
72 91
73 if ($ev->{button} == 1) { 92 if ($ev->{button} == 1) {
74 $self->grab_focus; 93 $self->grab_focus;
75 return unless $::CONN; 94 return unless $::CONN;
76 95
77 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 96 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
78 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 97 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
79 98
80 $x -= int 0.5 * $self->{sw}; 99 $x -= int 0.5 * $self->{sw};
81 $y -= int 0.5 * $self->{sh}; 100 $y -= int 0.5 * $self->{sh};
82 101
83 $::CONN->lookat ($x, $y) 102 $::CONN->lookat ($x, $y)
… …
99 $::CFG->{map_shift_y} = $bh + $y - $oy; 118 $::CFG->{map_shift_y} = $bh + $y - $oy;
100 119
101 $self->update; 120 $self->update;
102 }; 121 };
103 } elsif ($ev->{button} == 3) { 122 } elsif ($ev->{button} == 3) {
104 (new CFClient::UI::Menu 123 (new CFPlus::UI::Menu
105 items => [ 124 items => [
106 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 125 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
107 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 126 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
108 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 127 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
109 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 128 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
… …
114 $::PICKUP_ENABLE->{state} 133 $::PICKUP_ENABLE->{state}
115 ? "Disable automatic pickup" 134 ? "Disable automatic pickup"
116 : "Enable automatic pickup", 135 : "Enable automatic pickup",
117 sub { $::PICKUP_ENABLE->toggle } 136 sub { $::PICKUP_ENABLE->toggle }
118 ], 137 ],
138 $::CONN && length $::CONN->{cvs_root}
139 ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", \&editor_invoke]
140 : (),
141 $::CONN && length $::CONN->{test_server}
142 ? ["Login on Test Server", \&test_server_login]
143 : (),
144 ["Quit",
145 sub {
146 if ($::CONN) {
147 &::open_quit_dialog;
148 } else {
149 exit;
150 }
151 }
152 ],
119 ], 153 ],
120 )->popup ($ev); 154 )->popup ($ev);
121 } 155 }
122 156
123 1 157 1
… …
143 1 177 1
144} 178}
145 179
146sub size_request { 180sub size_request {
147 ( 181 (
148 32 * CFClient::ceil $::WIDTH / 32, 182 32 * CFPlus::ceil $::WIDTH / 32,
149 32 * CFClient::ceil $::HEIGHT / 32, 183 32 * CFPlus::ceil $::HEIGHT / 32,
150 ) 184 )
151} 185}
152 186
153sub update { 187sub update {
154 my ($self) = @_; 188 my ($self) = @_;
… …
156 $self->{need_update} = 1; 190 $self->{need_update} = 1;
157 $self->SUPER::update; 191 $self->SUPER::update;
158} 192}
159 193
160my %DIR = ( 194my %DIR = (
161 CFClient::SDLK_KP8, [1, "north"], 195 CFPlus::SDLK_KP8, [1, "north"],
162 CFClient::SDLK_KP9, [2, "northeast"], 196 CFPlus::SDLK_KP9, [2, "northeast"],
163 CFClient::SDLK_KP6, [3, "east"], 197 CFPlus::SDLK_KP6, [3, "east"],
164 CFClient::SDLK_KP3, [4, "southeast"], 198 CFPlus::SDLK_KP3, [4, "southeast"],
165 CFClient::SDLK_KP2, [5, "south"], 199 CFPlus::SDLK_KP2, [5, "south"],
166 CFClient::SDLK_KP1, [6, "southwest"], 200 CFPlus::SDLK_KP1, [6, "southwest"],
167 CFClient::SDLK_KP4, [7, "west"], 201 CFPlus::SDLK_KP4, [7, "west"],
168 CFClient::SDLK_KP7, [8, "northwest"], 202 CFPlus::SDLK_KP7, [8, "northwest"],
169 203
170 CFClient::SDLK_UP, [1, "north"], 204 CFPlus::SDLK_UP, [1, "north"],
171 CFClient::SDLK_RIGHT, [3, "east"], 205 CFPlus::SDLK_RIGHT, [3, "east"],
172 CFClient::SDLK_DOWN, [5, "south"], 206 CFPlus::SDLK_DOWN, [5, "south"],
173 CFClient::SDLK_LEFT, [7, "west"], 207 CFPlus::SDLK_LEFT, [7, "west"],
174); 208);
175 209
176sub invoke_key_down { 210sub invoke_key_down {
177 my ($self, $ev) = @_; 211 my ($self, $ev) = @_;
178 212
179 my $mod = $ev->{mod}; 213 my $mod = $ev->{mod};
180 my $sym = $ev->{sym}; 214 my $sym = $ev->{sym};
181 my $uni = $ev->{unicode}; 215 my $uni = $ev->{unicode};
182 216
183 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; 217 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
184 218
185 if ($uni == ord "\t") { 219 if ($uni == ord "\t") {
186 $::PL_WINDOW->toggle_visibility; 220 $::PL_WINDOW->toggle_visibility;
187 } elsif ($sym == CFClient::SDLK_F1 && !$mod) { 221 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
188 $::HELP_WINDOW->toggle_visibility; 222 $::HELP_WINDOW->toggle_visibility;
189 } elsif ($sym == CFClient::SDLK_F2 && !$mod) { 223 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
190 ::toggle_player_page ($::STATS_PAGE); 224 ::toggle_player_page ($::STATS_PAGE);
191 } elsif ($sym == CFClient::SDLK_F3 && !$mod) { 225 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
192 ::toggle_player_page ($::SKILL_PAGE); 226 ::toggle_player_page ($::SKILL_PAGE);
193 } elsif ($sym == CFClient::SDLK_F4 && !$mod) { 227 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
194 ::toggle_player_page ($::SPELL_PAGE); 228 ::toggle_player_page ($::SPELL_PAGE);
195 } elsif ($sym == CFClient::SDLK_F5 && !$mod) { 229 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
196 ::toggle_player_page ($::INVENTORY_PAGE); 230 ::toggle_player_page ($::INVENTORY_PAGE);
197 } elsif ($sym == CFClient::SDLK_F9 && !$mod) { 231 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
198 $::SETUP_DIALOG->toggle_visibility; 232 $::SETUP_DIALOG->toggle_visibility;
199 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 233 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
200 $::BIND_EDITOR->set_binding (undef, undef, [], 234 $::BIND_EDITOR->set_binding (undef, undef, [],
201 sub { 235 sub {
202 my ($mod, $sym, $cmds) = @_; 236 my ($mod, $sym, $cmds) = @_;
203 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); 237 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
204 }); 238 });
205 $::BIND_EDITOR->start; 239 $::BIND_EDITOR->start;
206 $::BIND_EDITOR->show; 240 $::BIND_EDITOR->show;
241#TODO: elmex, what was this supposed to do? it currently crashes the client.
207 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 242# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
208 $::BIND_EDITOR->stop; 243# $::BIND_EDITOR->stop;
209 $::BIND_EDITOR->ask_for_bind_and_commit; 244# $::BIND_EDITOR->ask_for_bind_and_commit;
210 $::BIND_EDITOR->hide; 245# $::BIND_EDITOR->hide;
211 } elsif (!$::CONN) { 246 } elsif (!$::CONN) {
212 return 0; # bindings further down need a valid connection 247 return 0; # bindings further down need a valid connection
213 248
214 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { 249 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
215 $::CONN->user_send ("stay fire"); 250 $::CONN->user_send ("stay fire");
216 } elsif ($uni == ord ",") { 251 } elsif ($uni == ord ",") {
217 $::CONN->user_send ("take"); 252 $::CONN->user_send ("take");
218 } elsif ($uni == ord " ") { 253 } elsif ($uni == ord " ") {
219 $::CONN->user_send ("apply"); 254 $::CONN->user_send ("apply");
255 } elsif ($uni == 13) {
256 $::CONN->user_send ("examine");
220 } elsif ($uni == ord ".") { 257 } elsif ($uni == ord ".") {
221 $::CONN->user_send ($self->{completer}{last_command}) 258 $::CONN->user_send ($self->{completer}{last_command})
222 if exists $self->{completer}{last_command}; 259 if exists $self->{completer}{last_command};
223 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 260 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
224 $::CONN->user_send ($_) for @$bind_cmd; 261 $::CONN->user_send ($_) for @$bind_cmd;
225 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 262 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
226 $::CONN->user_send ("rotateshoottype +"); 263 $::CONN->user_send ("rotateshoottype +");
227 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 264 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
228 $::CONN->user_send ("rotateshoottype -"); 265 $::CONN->user_send ("rotateshoottype -");
229 } elsif ($uni == ord '"') { 266 } elsif ($uni == ord '"') {
230 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 267 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
231 $self->{completer}->show; 268 $self->{completer}->show;
232 } elsif ($uni == ord "'") { 269 } elsif ($uni == ord "'") {
233 $self->{completer}->set_prefix (""); 270 $self->{completer}->set_prefix ("");
234 $self->{completer}->show; 271 $self->{completer}->show;
235 } elsif (exists $DIR{$sym}) { 272 } elsif (exists $DIR{$sym}) {
236 if ($mod & CFClient::KMOD_SHIFT) { 273 if ($mod & CFPlus::KMOD_SHIFT) {
237 $self->{shft}++; 274 $self->{shft}++;
238 if ($DIR{$sym}[0] != $self->{fire_dir}) { 275 if ($DIR{$sym}[0] != $self->{fire_dir}) {
239 $::CONN->user_send ("fire $DIR{$sym}[0]"); 276 $::CONN->user_send ("fire $DIR{$sym}[0]");
240 } 277 }
241 $self->{fire_dir} = $DIR{$sym}[0]; 278 $self->{fire_dir} = $DIR{$sym}[0];
242 } elsif ($mod & CFClient::KMOD_CTRL) { 279 } elsif ($mod & CFPlus::KMOD_CTRL) {
243 $self->{ctrl}++; 280 $self->{ctrl}++;
244 $::CONN->user_send ("run $DIR{$sym}[0]"); 281 $::CONN->user_send ("run $DIR{$sym}[0]");
245 } else { 282 } else {
246 $::CONN->user_send ("$DIR{$sym}[1]"); 283 $::CONN->user_send ("$DIR{$sym}[1]");
247 } 284 }
248 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 285 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
249 $self->{completer}->invoke_key_down ($ev); 286 $self->{completer}->inject_key_down ($ev);
250 $self->{completer}->show; 287 $self->{completer}->show;
251 } else { 288 } else {
252 return 0; 289 return 0;
253 } 290 }
254 291
… …
261 my $res = 0; 298 my $res = 0;
262 my $mod = $ev->{mod}; 299 my $mod = $ev->{mod};
263 my $sym = $ev->{sym}; 300 my $sym = $ev->{sym};
264 301
265 if ($::CFG->{shift_fire_stop}) { 302 if ($::CFG->{shift_fire_stop}) {
266 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 303 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
267 $::CONN->user_send ("fire_stop"); 304 $::CONN->user_send ("fire_stop");
268 delete $self->{fire_dir}; 305 delete $self->{fire_dir};
269 $res = 1; 306 $res = 1;
270 } 307 }
271 } else { 308 } else {
272 if (exists $DIR{$sym} && delete $self->{shft}) { 309 if (exists $DIR{$sym} && delete $self->{shft}) {
273 $::CONN->user_send ("fire_stop"); 310 $::CONN->user_send ("fire_stop");
274 delete $self->{fire_dir}; 311 delete $self->{fire_dir};
275 $res = 1; 312 $res = 1;
276 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 313 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
277 $::CONN->user_send ("fire_stop"); 314 $::CONN->user_send ("fire_stop");
278 delete $self->{fire_dir}; 315 delete $self->{fire_dir};
279 $res = 1; 316 $res = 1;
280 } 317 }
281 } 318 }
282 319
283 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 320 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
284 $::CONN->user_send ("run_stop"); 321 $::CONN->user_send ("run_stop");
285 $res = 1; 322 $res = 1;
286 } 323 }
287 324
288 $res 325 $res
… …
302sub draw { 339sub draw {
303 my ($self) = @_; 340 my ($self) = @_;
304 341
305 return unless $::MAP; 342 return unless $::MAP;
306 343
307 my $focused = $CFClient::UI::FOCUS == $self 344 my $focused = $CFPlus::UI::FOCUS == $self
308 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 345 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
309 346
310 return 347 return
311 unless $focused || !$::FAST; 348 unless $focused || !$::FAST;
312 349
313 if (delete $self->{need_update}) { 350 if (delete $self->{need_update}) {
314 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 351 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
315 352
316 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 353 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
317 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 354 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
318 355
319 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 356 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
320 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 357 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
321 358
322 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 359 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
323 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 360 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
324 361
325 if ($::CFG->{fow_enable}) { 362 if ($::CFG->{fow_enable}) {
326 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 363 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
327 364
328 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 365 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
329 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 366 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
330 glConvolutionFilter2D ( 367 glConvolutionFilter2D (
331 GL_CONVOLUTION_2D, 368 GL_CONVOLUTION_2D,
332 GL_ALPHA, 369 GL_ALPHA,
333 3, 3, 370 3, 3,
… …
335 (pack "f*", @{ $self->{smooth_matrix} }), 372 (pack "f*", @{ $self->{smooth_matrix} }),
336 ); 373 );
337 glEnable GL_CONVOLUTION_2D; 374 glEnable GL_CONVOLUTION_2D;
338 } 375 }
339 376
340 $self->{fow_texture} = new CFClient::Texture 377 $self->{fow_texture} = new CFPlus::Texture
341 w => $w, 378 w => $w,
342 h => $h, 379 h => $h,
343 data => $data, 380 data => $data,
344 internalformat => GL_ALPHA, 381 internalformat => GL_ALPHA,
345 format => GL_ALPHA; 382 format => GL_ALPHA;
… …
407 glDeleteList $self->{list}; 444 glDeleteList $self->{list};
408 445
409 $self->SUPER::DESTROY; 446 $self->SUPER::DESTROY;
410} 447}
411 448
412package CFClient::MapWidget::MapMap; 449package CFPlus::MapWidget::MapMap;
413 450
414our @ISA = CFClient::UI::Base::; 451our @ISA = CFPlus::UI::Base::;
415 452
416use Time::HiRes qw(time); 453use Time::HiRes qw(time);
417use CFClient::OpenGL; 454use CFPlus::OpenGL;
418 455
419sub size_request { 456sub size_request {
420 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 457 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
421} 458}
422 459
… …
458 495
459 if ($self->{texture_atime} < time) { 496 if ($self->{texture_atime} < time) {
460 $self->{texture_atime} = time + 1/3; 497 $self->{texture_atime} = time + 1/3;
461 498
462 $self->{texture} = 499 $self->{texture} =
463 new CFClient::Texture 500 new CFPlus::Texture
464 w => $w, 501 w => $w,
465 h => $h, 502 h => $h,
466 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 503 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
467 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 504 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
468 } 505 }
469 506
470 $self->{texture}->draw_quad (0, 0); 507 $self->{texture}->draw_quad (0, 0);
471 508
472 glDisable GL_TEXTURE_2D; 509 glDisable GL_TEXTURE_2D;
… …
487 glEnd; 524 glEnd;
488 525
489 glDisable GL_BLEND; 526 glDisable GL_BLEND;
490} 527}
491 528
492package CFClient::MapWidget::Command; 529package CFPlus::MapWidget::Command;
493 530
494use strict; 531use strict;
495 532
496use CFClient::OpenGL; 533use CFPlus::OpenGL;
497 534
498our @ISA = CFClient::UI::Frame::; 535our @ISA = CFPlus::UI::Frame::;
499 536
500sub new { 537sub new {
501 my $class = shift; 538 my $class = shift;
502 539
503 my $self = $class->SUPER::new ( 540 my $self = $class->SUPER::new (
504 bg => [0, 0, 0, 0.8], 541 bg => [0, 0, 0, 0.8],
505 @_, 542 @_,
506 ); 543 );
507 544
508 $self->add ($self->{vbox} = new CFClient::UI::VBox); 545 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
509 546
510 $self->{label} = [ 547 $self->{label} = [
511 map 548 map
512 CFClient::UI::Label->new ( 549 CFPlus::UI::Label->new (
513 can_hover => 1, 550 can_hover => 1,
514 can_events => 1, 551 can_events => 1,
515 tooltip_width => 0.33, 552 tooltip_width => 0.33,
516 fontsize => $_, 553 fontsize => $_,
517 ), (0.8) x 16 554 ), (0.8) x 16
518 ]; 555 ];
519 556
520 $self->{entry} = new CFClient::UI::Entry 557 $self->{entry} = new CFPlus::UI::Entry
521 on_changed => sub { 558 on_changed => sub {
522 $self->update_labels; 559 $self->update_labels;
523 0 560 0
524 }, 561 },
525 on_button_down => sub { 562 on_button_down => sub {
526 my ($entry, $ev, $x, $y) = @_; 563 my ($entry, $ev, $x, $y) = @_;
527 564
528 if ($ev->{button} == 3) { 565 if ($ev->{button} == 3) {
529 (new CFClient::UI::Menu 566 (new CFPlus::UI::Menu
530 items => [ 567 items => [
531 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 568 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
532 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 569 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
533 ], 570 ],
534 )->popup ($ev); 571 )->popup ($ev);
535 return 1; 572 return 1;
536 } 573 }
… …
552 $self->hide; 589 $self->hide;
553 } 590 }
554 } elsif ($ev->{sym} == 27) { 591 } elsif ($ev->{sym} == 27) {
555 $self->{hist_ptr} = 0; 592 $self->{hist_ptr} = 0;
556 $self->hide; 593 $self->hide;
557 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 594 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
558 if ($self->{hist_ptr} > 1) { 595 if ($self->{hist_ptr} > 1) {
559 $self->{hist_ptr}--; 596 $self->{hist_ptr}--;
560 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 597 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
561 } elsif ($self->{hist_ptr} > 0) { 598 } elsif ($self->{hist_ptr} > 0) {
562 $self->{hist_ptr}--; 599 $self->{hist_ptr}--;
… …
564 } else { 601 } else {
565 ++$self->{select_offset} 602 ++$self->{select_offset}
566 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 603 if $self->{select_offset} < $#{ $self->{last_match} || [] };
567 } 604 }
568 $self->update_labels; 605 $self->update_labels;
569 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 606 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
570 if ($self->{select_offset}) { 607 if ($self->{select_offset}) {
571 --$self->{select_offset} 608 --$self->{select_offset}
572 } else { 609 } else {
573 unless ($self->{hist_ptr}) { 610 unless ($self->{hist_ptr}) {
574 $self->{hist_saveback} = $self->{entry}->get_text; 611 $self->{hist_saveback} = $self->{entry}->get_text;
… …
625 662
626 $self->SUPER::hide; 663 $self->SUPER::hide;
627 $self->{entry}->set_text (""); 664 $self->{entry}->set_text ("");
628} 665}
629 666
630sub invoke_key_down { 667sub inject_key_down {
631 my ($self, $ev) = @_; 668 my ($self, $ev) = @_;
632 669
670 $self->{entry}->grab_focus;
633 $self->{entry}->emit (key_down => $ev) 671 $self->{entry}->emit (key_down => $ev);
634} 672}
635 673
636sub update_labels { 674sub update_labels {
637 my ($self) = @_; 675 my ($self) = @_;
638 676
… …
731 769
732sub _draw { 770sub _draw {
733 my ($self) = @_; 771 my ($self) = @_;
734 772
735 # hack 773 # hack
736 local $CFClient::UI::FOCUS = $self->{entry}; 774 local $CFPlus::UI::FOCUS = $self->{entry};
737 775
738 $self->SUPER::_draw; 776 $self->SUPER::_draw;
739} 777}
740 778
7411 7791

Diff Legend

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