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.45 by elmex, Tue May 30 14:35:09 2006 UTC vs.
Revision 1.113 by elmex, Sat Jul 21 20:30:41 2007 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;
11use CFPlus::Macro;
9 12
10our @ISA = CFClient::UI::Base::; 13our @ISA = CFPlus::UI::Base::;
14
15my $magicmap_tex =
16 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11 18
12sub new { 19sub new {
13 my $class = shift; 20 my $class = shift;
14 21
15 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
16 z => -1, 23 z => -1,
17 can_focus => 1, 24 can_focus => 1,
18 list => glGenList, 25 list => glGenList,
26 tilesize => 32,
19 @_ 27 @_
20 ); 28 );
21 29
22 $self->{completer} = new CFClient::MapWidget::Command:: 30 $self->{completer} = new CFPlus::MapWidget::Command::
23 command => $self->{command}, 31 command => $self->{command},
24 can_focus => 1, 32 tooltip => "#completer_help",
25 tooltip => "<b>The Command Completer</b>\n\n"
26 . "This is your central interface to send text commands to the server. "
27 . "To enter a verbatim command to send to the server, just type the command, "
28 . "followed by a space, and press return. "
29 . "Typing the initial letters of words (or just any letters) displays guesses "
30 . "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"
32 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
33 ; 33 ;
34 34
35 $self 35 $self
36}
37
38sub set_tilesize {
39 my ($self, $tilesize) = @_;
40
41 $self->{tilesize} = $tilesize;
36} 42}
37 43
38sub add_command { 44sub add_command {
39 my ($self, $command, $tooltip, $widget, $cb) = @_; 45 my ($self, $command, $tooltip, $widget, $cb) = @_;
40 46
… …
49 55
50sub clr_commands { 56sub clr_commands {
51 my ($self) = @_; 57 my ($self) = @_;
52 58
53 %{$self->{completer}{command}} = (); 59 %{$self->{completer}{command}} = ();
54}
55 60
61 $self->{completer}->hide
62 if $self->{completer};
63}
64
65sub server_login {
66 my ($server) = @_;
67
68 ::stop_game ();
69 local $::PROFILE->{host} = $server;
70 ::start_game ();
71}
72
73sub editor_invoke {
74 my $editsup = $::CONN && $::CONN->{editor_support}
75 or return;
76
77 CFPlus::background {
78 print "preparing editor startup...\n";
79
80 my $server = $editsup->{gameserver} || "default";
81 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
82
83 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
84 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
85
86 print "map directory is $mapdir\n";
87 print "lib directory is $libdir\n";
88
89 my $ua = CFPlus::lwp_useragent;
90
91 for my $file (qw(archetypes crossfire.0)) {
92 my $url = "$editsup->{lib_root}$file";
93 print "mirroring $url...\n";
94 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
95 printf "%s size %d octets\n", $file, -s "$libdir/$file";
96 }
97
98 if (1) { # upload a map
99 my $mapname = $::CONN->{map_info}[0];
100
101 my $mappath = "$mapdir/$mapname";
102
103 -e $mappath and die "$mappath already exists\n";
104
105 print "getting map revision for $mapname...\n";
106
107 # try to get the most recent head revision, what a hack,
108 # this should have been returned while downloading *sigh*
109 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
110
111 if ($log =~ /\?rev=(\d+\.\d+)"/) {
112 my $rev = $1;
113
114 print "downloading revision $rev...\n";
115
116 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
117
118 my $meta = {
119 %$editsup,
120 path => $mapname,
121 revision => $rev,
122 cf_login => $::PROFILE->{user},
123 };
124
125 require File::Basename;
126 require File::Path;
127
128 File::Path::mkpath (File::Basename::dirname ($mappath));
129 open my $fh, ">:raw:perlio", "$mappath.meta"
130 or die "$mappath.meta: $!\n";
131 print $fh CFPlus::to_json $meta;
132 close $fh;
133 open my $fh, ">:raw:perlio:utf8", $mappath
134 or die "$mappath: $!\n";
135 print $fh $map;
136 close $fh;
137
138 print "saved as $mappath\n";
139
140 print "invoking editor...\n";
141 exec "/root/s2/gce $mappath";#d#
142
143 # now upload it
144# require HTTP::Request::Common;
145#
146# my $res = $ua->post (
147# $ENV{CFPLUS_UPLOAD},
148# Content_Type => 'multipart/form-data',
149# Content => [
150# path => $mapname,
151# mapdir => $ENV{CROSSFIRE_MAPDIR},
152# map => $map,
153# revision => $rev,
154# cf_login => $ENV{CFPLUS_LOGIN},
155# cf_password => $ENV{CFPLUS_PASSWORD},
156# comment => "",
157# ]
158# );
159#
160# if ($res->is_error) {
161# # fatal condition
162# warn $res->status_line;
163# } else {
164# # script replies are marked as {{..}}
165# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
166# warn map "$_\n", @msgs;
167# }
168 } else {
169 die "viewvc parse error, unable to detect revision\n";
170 }
171 }
172 }
173}
174
56sub button_down { 175sub invoke_button_down {
57 my ($self, $ev, $x, $y) = @_; 176 my ($self, $ev, $x, $y) = @_;
58 177
59 $self->focus_in;
60
61 if ($ev->{button} == 2) { 178 if ($ev->{button} == 1) {
179 $self->grab_focus;
180 return unless $::CONN;
181
182 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
183 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
184
185 $x -= CFPlus::floor $::MAP->w * 0.5;
186 $y -= CFPlus::floor $::MAP->h * 0.5;
187
188 if ($::CONN) {
189 if ($::IN_BUILD_MODE) {
190 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
191 } else {
192 $::CONN->lookat ($x, $y)
193 }
194 }
195
196 } elsif ($ev->{button} == 2) {
197 $self->grab_focus;
198 return unless $::CONN;
199
62 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 200 my ($ox, $oy) = ($ev->{x}, $ev->{y});
63 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 201 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
64 202
65 $self->{motion} = sub { 203 $self->{motion} = sub {
66 my ($ev, $x, $y) = @_; 204 my ($ev, $x, $y) = @_;
… …
70 $::CFG->{map_shift_x} = $bw + $x - $ox; 208 $::CFG->{map_shift_x} = $bw + $x - $ox;
71 $::CFG->{map_shift_y} = $bh + $y - $oy; 209 $::CFG->{map_shift_y} = $bh + $y - $oy;
72 210
73 $self->update; 211 $self->update;
74 }; 212 };
213 } elsif ($ev->{button} == 3) {
214 my @items = (
215 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
216 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
217 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
218 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
219 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
220 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
221 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
222 [
223 $::PICKUP_ENABLE->{state}
224 ? "Disable automatic pickup"
225 : "Enable automatic pickup",
226 sub { $::PICKUP_ENABLE->toggle }
227 ],
228 );
229
230 if ($::CONN && $::CONN->{editor_support}) {
231 push @items, [
232 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
233 \&editor_invoke,
234 ];
235
236 for my $type (qw(test name)) {
237 $::CONN->{editor_support}{type} ne $type
238 or next;
239 my $server = $::CONN->{editor_support}{"${type}server"}
240 or next;
241
242 push @items, [
243 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
244 sub { server_login $server },
245 ];
246 }
247 }
248
249 push @items,
250 ["Quit",
251 sub {
252 if ($::CONN) {
253 &::open_quit_dialog;
254 } else {
255 exit;
256 }
257 }
258 ],
259 ;
260
261 (new CFPlus::UI::Menu
262 items => \@items,
263 )->popup ($ev);
264 }
265
75 } 266 1
76} 267}
77 268
78sub button_up { 269sub invoke_button_up {
79 my ($self, $ev, $x, $y) = @_; 270 my ($self, $ev, $x, $y) = @_;
80 271
81 delete $self->{motion}; 272 delete $self->{motion};
82}
83 273
274 1
275}
276
84sub mouse_motion { 277sub invoke_mouse_motion {
85 my ($self, $ev, $x, $y) = @_; 278 my ($self, $ev, $x, $y) = @_;
86 279
280 if ($self->{motion}) {
87 $self->{motion}->($ev, $x, $y) if $self->{motion}; 281 $self->{motion}->($ev, $x, $y);
282 } else {
283 return 0;
284 }
285
286 1
88} 287}
89 288
90sub size_request { 289sub size_request {
290 my ($self) = @_;
291
91 ( 292 (
92 1 + 32 * int $::WIDTH / 32, 293 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
93 1 + 32 * int $::HEIGHT / 32, 294 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
94 ) 295 )
95} 296}
96 297
97sub update { 298sub update {
98 my ($self) = @_; 299 my ($self) = @_;
… …
100 $self->{need_update} = 1; 301 $self->{need_update} = 1;
101 $self->SUPER::update; 302 $self->SUPER::update;
102} 303}
103 304
104my %DIR = ( 305my %DIR = (
306 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
105 CFClient::SDLK_KP8, [1, "north"], 307 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
106 CFClient::SDLK_KP9, [2, "northeast"], 308 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
107 CFClient::SDLK_KP6, [3, "east"], 309 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
108 CFClient::SDLK_KP3, [4, "southeast"], 310 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
109 CFClient::SDLK_KP2, [5, "south"], 311 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
110 CFClient::SDLK_KP1, [6, "southwest"], 312 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
111 CFClient::SDLK_KP4, [7, "west"], 313 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
112 CFClient::SDLK_KP7, [8, "northwest"], 314 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
113 315
114 CFClient::SDLK_UP, [1, "north"], 316 ( "," . CFPlus::SDLK_UP ), [1, "north"],
317 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
115 CFClient::SDLK_RIGHT, [3, "east"], 318 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
319 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
116 CFClient::SDLK_DOWN, [5, "south"], 320 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
321 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
117 CFClient::SDLK_LEFT, [7, "west"], 322 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
323 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
118); 324);
119 325
120sub key_down { 326sub invoke_key_down {
121 my ($self, $ev) = @_; 327 my ($self, $ev) = @_;
122
123 return unless $::CONN;
124 328
125 my $mod = $ev->{mod}; 329 my $mod = $ev->{mod};
126 my $sym = $ev->{sym}; 330 my $sym = $ev->{sym};
127 my $uni = $ev->{unicode}; 331 my $uni = $ev->{unicode};
128 332
129 if ($sym == CFClient::SDLK_KP5) { 333 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
130 $::CONN->user_send ("stay fire"); 334
335 if ($sym == 9) {
336 ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
337 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
338 $::HELP_WINDOW->toggle_visibility;
339 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
340 ::toggle_player_page ($::STATS_PAGE);
341 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
342 ::toggle_player_page ($::SKILL_PAGE);
343 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
344 ::toggle_player_page ($::SPELL_PAGE);
345 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
346 ::toggle_player_page ($::INVENTORY_PAGE);
347 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
348 $::SETUP_DIALOG->toggle_visibility;
349 } elsif (!$::CONN) {
350 return 0; # bindings further down need a valid connection
351
131 } elsif ($uni == ord ",") { 352 } elsif ($uni == ord ",") {
132 $::CONN->user_send ("take"); 353 $::CONN->user_send ("take");
133 } elsif ($uni == ord " ") { 354 } elsif ($uni == ord " ") {
134 $::CONN->user_send ("apply"); 355 $::CONN->user_send ("apply");
356 } elsif ($uni == 13) {
357 $::CONN->user_send ("examine");
135 } elsif ($uni == ord ".") { 358 } elsif ($uni == ord ".") {
136 $::CONN->user_send ($self->{completer}{last_command}) 359 $::CONN->user_send ($self->{completer}{last_command})
137 if exists $self->{completer}{last_command}; 360 if exists $self->{completer}{last_command};
138 } elsif ($uni == ord "\t") { 361 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
139 $::INV_WINDOW->toggle_visibility; 362 $::CONN->macro_send ($_) for @macros;
140 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 363 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
141 $::CONN->user_send ("rotateshoottype +"); 364 $::CONN->user_send ("rotateshoottype +");
142 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 365 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
143 $::CONN->user_send ("rotateshoottype -"); 366 $::CONN->user_send ("rotateshoottype -");
367 } elsif ($uni == ord '!') {
368 $self->{completer}->set_prefix ("shout ");
369 $self->{completer}->show;
144 } elsif ($uni == ord '"') { 370 } elsif ($uni == ord '"') {
145 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 371 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
146 $self->{completer}->show; 372 $self->{completer}->show;
147 } elsif ($uni == ord "'") { 373 } elsif ($uni == ord "'") {
148 $self->{completer}->set_prefix (""); 374 $self->{completer}->set_prefix ("");
149 $self->{completer}->show; 375 $self->{completer}->show;
150 } elsif (exists $DIR{$sym}) { 376 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
151 if ($mod & CFClient::KMOD_SHIFT) { 377 if ($mod & CFPlus::KMOD_SHIFT) {
152 $self->{shft}++; 378 $self->{shft}++;
379 if ($dir->[0] != $self->{fire_dir}) {
153 $::CONN->user_send ("fire $DIR{$sym}[0]"); 380 $::CONN->user_send ("fire $dir->[0]");
381 }
382 $self->{fire_dir} = $DIR{$sym}[0];
154 } elsif ($mod & CFClient::KMOD_CTRL) { 383 } elsif ($mod & CFPlus::KMOD_CTRL) {
155 $self->{ctrl}++; 384 $self->{ctrl}++;
156 $::CONN->user_send ("run $DIR{$sym}[0]"); 385 $::CONN->user_send ("run $dir->[0]");
157 } else { 386 } else {
158 $::CONN->user_send ("$DIR{$sym}[1]"); 387 $::CONN->user_send ("$dir->[1]");
159 } 388 }
160 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
161 $::BIND_EDITOR->set_binding (undef, undef, [],
162 sub {
163 my ($mod, $sym, $cmds) = @_;
164 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
165 });
166 $::BIND_EDITOR->start;
167 $::BIND_EDITOR->show;
168 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
169 $::BIND_EDITOR->stop;
170 $::BIND_EDITOR->ask_for_bind (1);
171 $::BIND_EDITOR->hide;
172 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
173 $::CONN->user_send ($_) for @$bind_cmd;
174 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 389 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
175 $self->{completer}->key_down ($ev); 390 $self->{completer}->inject_key_down ($ev);
176 $self->{completer}->show; 391 $self->{completer}->show;
392 } else {
393 return 0;
394 }
395
177 } 396 1
178} 397}
179 398
180sub key_up { 399sub invoke_key_up {
181 my ($self, $ev) = @_; 400 my ($self, $ev) = @_;
182 401
402 my $res = 0;
183 my $mod = $ev->{mod}; 403 my $mod = $ev->{mod};
184 my $sym = $ev->{sym}; 404 my $sym = $ev->{sym};
185 405
406 if ($::CFG->{shift_fire_stop}) {
186 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 407 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
187 $::CONN->user_send ("fire_stop"); 408 $::CONN->user_send ("fire_stop");
409 delete $self->{fire_dir};
410 $res = 1;
411 }
412 } else {
413 if (exists $DIR{$sym} && delete $self->{shft}) {
414 $::CONN->user_send ("fire_stop");
415 delete $self->{fire_dir};
416 $res = 1;
417 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
418 $::CONN->user_send ("fire_stop");
419 delete $self->{fire_dir};
420 $res = 1;
421 }
188 } 422 }
423
189 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 424 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
190 $::CONN->user_send ("run_stop"); 425 $::CONN->user_send ("run_stop");
426 $res = 1;
427 }
428
429 $res
430}
431
432sub invoke_visibility_change {
433 my ($self) = @_;
434
435 $self->refresh_hook;
436
191 } 437 0
438}
439
440sub set_magicmap {
441 my ($self, $w, $h, $x, $y, $data) = @_;
442
443 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
444 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
445
446 $self->{magicmap} = [$x, $y, $w, $h, $data];
447
448 $self->update;
449}
450
451sub refresh_hook {
452 my ($self) = @_;
453
454 return unless $::MAP;
455
456 if (delete $self->{need_update}) {
457 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
458
459 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
460 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
461
462 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
463 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
464
465 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
466 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
467
468 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
469 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
470
471 if ($::CFG->{fow_enable}) {
472 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
473
474 $self->{fow_texture} = new CFPlus::Texture
475 w => $w,
476 h => $h,
477 data => $data,
478 internalformat => GL_ALPHA,
479 format => GL_ALPHA;
480 } else {
481 delete $self->{fow_texture};
482 }
483
484 glNewList $self->{list};
485
486 glPushMatrix;
487 glTranslate $sx0, $sy0;
488 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
489
490 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
491
492 glScale $self->{tilesize}, $self->{tilesize};
493
494 if (my $tex = $self->{fow_texture}) {
495 glPushMatrix;
496 glScale 1/3, 1/3;
497 glEnable GL_TEXTURE_2D;
498 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
499
500 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
501 $self->{fow_texture}->draw_quad_alpha (0, 0);
502
503 glDisable GL_TEXTURE_2D;
504 glPopMatrix;
505 }
506
507 if ($self->{magicmap}) {
508 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
509
510 $x += $::MAP->ox + $self->{dx};
511 $y += $::MAP->oy + $self->{dy};
512
513 glTranslate - $x - 1, - $y - 1;
514 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
515 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
516 }
517
518 glPopMatrix;
519 glEndList;
520 }
521
192} 522}
193 523
194sub draw { 524sub draw {
195 my ($self) = @_; 525 my ($self) = @_;
196 526
527 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
528
529 return unless $self->{list};
530
197 my $focused = $CFClient::UI::FOCUS == $self 531 my $focused = $CFPlus::UI::FOCUS == $self
198 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 532 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
199 533
200 return 534 return
201 unless $focused || !$::FAST; 535 unless $focused || !$::FAST;
202 536
203 if (delete $self->{need_update}) {
204 glNewList $self->{list};
205
206 if ($::MAP) {
207 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
208 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
209
210 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
211 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
212
213 glPushMatrix;
214 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
215
216 glTranslate $sx0 - 32, $sy0 - 32, 0;
217
218 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
219
220 if ($::CFG->{fow_enable}) {
221 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
222 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
223 glConvolutionFilter2D (
224 GL_CONVOLUTION_2D,
225 GL_ALPHA,
226 3, 3,
227 GL_ALPHA, GL_FLOAT,
228 pack "f*",
229 0.05, 0.13, 0.05,
230 0.13, 0.30, 0.13,
231 0.05, 0.13, 0.05,
232 );
233 glEnable GL_CONVOLUTION_2D;
234 }
235
236 $self->{fow_texture_name} ||= glGenTexture;
237 # try to re-use the texture name: TODO improve texture class instead
238
239 $self->{fow_texture} = new CFClient::Texture
240 w => $w,
241 h => $h,
242 data => $data,
243 name => $self->{fow_texture_name},
244 internalformat => GL_ALPHA,
245 format => GL_ALPHA;
246
247 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
248
249 glEnable GL_TEXTURE_2D;
250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
251
252 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
253 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
254
255 glDisable GL_TEXTURE_2D;
256 }
257
258 glPopMatrix;
259 }
260
261 glEndList;
262 }
263
264 glPushMatrix;
265 glCallList $self->{list}; 537 glCallList $self->{list};
266 glPopMatrix;
267 538
268 # TNT2 emulates logops in software (or worse :) 539 # TNT2 emulates logops in software (or worse :)
269 if ($focused) { 540 unless ($focused) {
270 (delete $self->{out_of_focus})->destroy
271 if $self->{out_of_focus};
272 } else {
273 glColor 0.4, 0.2, 0.2, 0.6; 541 glColor 0.4, 0.2, 0.2, 0.6;
274 glEnable GL_BLEND; 542 glEnable GL_BLEND;
275 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 543 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
276 glBegin GL_QUADS; 544 glBegin GL_QUADS;
277 glVertex 0, 0; 545 glVertex 0, 0;
278 glVertex 0, $::HEIGHT; 546 glVertex 0, $::HEIGHT;
279 glVertex $::WIDTH, $::HEIGHT; 547 glVertex $::WIDTH, $::HEIGHT;
280 glVertex $::WIDTH, 0; 548 glVertex $::WIDTH, 0;
281 glEnd; 549 glEnd;
282 glDisable GL_BLEND; 550 glDisable GL_BLEND;
283
284# $self->{out_of_focus} ||= do {
285# my $label = new CFClient::UI::Label
286# x => 0,
287# y => 0,
288# z => 1,
289# ellipsise => 0,
290# text => "map out of focus (click map to play)";
291#
292# $label->show;
293# $label->update;
294#
295# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
296# $label->move_abs (
297# ($::WIDTH - $label->{w}) * 0.5,
298# ($::HEIGHT - $label->{h}) * 0.5,
299# );
300# });
301#
302# $label
303# };
304 } 551 }
305} 552}
306 553
307sub DESTROY { 554sub DESTROY {
308 my $self = shift; 555 my $self = shift;
… …
310 glDeleteList $self->{list}; 557 glDeleteList $self->{list};
311 558
312 $self->SUPER::DESTROY; 559 $self->SUPER::DESTROY;
313} 560}
314 561
315package CFClient::MapWidget::MapMap; 562package CFPlus::MapWidget::MapMap;
316 563
564use strict;
565use utf8;
566
317our @ISA = CFClient::UI::Base::; 567our @ISA = CFPlus::UI::Base::;
318 568
319use Time::HiRes qw(time); 569use Time::HiRes qw(time);
320use CFClient::OpenGL; 570use CFPlus::OpenGL;
321 571
322sub size_request { 572sub size_request {
323 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 573 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
324} 574}
325 575
576sub refresh_hook {
577 my ($self) = @_;
578
579 if ($::MAP && $self->{texture_atime} < time) {
580 my ($w, $h) = @$self{qw(w h)};
581
582 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
583 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
584
585 my $ox = 0.5 * ($w - $sw);
586 my $oy = 0.5 * ($h - $sh);
587
588 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
589 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
590
591 #TODO: map scale is completely borked
592
593 my $x0 = int $ox - $sx + 0.5;
594 my $y0 = int $oy - $sy + 0.5;
595
596 $self->{sw} = $sw;
597 $self->{sh} = $sh;
598
599 $self->{x0} = $x0;
600 $self->{y0} = $y0;
601
602 $self->{texture_atime} = time + 1/3;
603
604 $self->{texture} =
605 new CFPlus::Texture
606 w => $w,
607 h => $h,
608 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
609 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
610 }
611}
612
613sub invoke_visibility_change {
614 my ($self) = @_;
615
616 $self->refresh_hook;
617
618 0
619}
620
326sub size_allocate { 621sub invoke_size_allocate {
327 my ($self, $w, $h) = @_; 622 my ($self, $w, $h) = @_;
328 623
329 $self->SUPER::size_allocate ($w, $h);
330 $self->update; 624 $self->update;
625
626 1
331} 627}
332 628
333sub update { 629sub update {
334 my ($self) = @_; 630 my ($self) = @_;
335 631
… …
338} 634}
339 635
340sub _draw { 636sub _draw {
341 my ($self) = @_; 637 my ($self) = @_;
342 638
343 $::MAP or return; 639 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
344 640
345 my ($w, $h) = @$self{qw(w h)}; 641 $self->{texture} or return;
346
347 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
348 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
349
350 my $sx = int $::CFG->{map_shift_x} / 32;
351 my $sy = int $::CFG->{map_shift_y} / 32;
352
353 my $ox = 0.5 * ($w - $sw);
354 my $oy = 0.5 * ($h - $sh);
355 642
356 glEnable GL_BLEND; 643 glEnable GL_BLEND;
357 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 644 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
358 glEnable GL_TEXTURE_2D; 645 glEnable GL_TEXTURE_2D;
359 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 646 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
360 647
361 if ($self->{texture_atime} < time) {
362 $self->{texture_atime} = time + 1/3;
363
364 $self->{texture} =
365 new CFClient::Texture
366 w => $w,
367 h => $h,
368 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
369 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
370 }
371
372 $self->{texture}->draw_quad (0, 0); 648 $self->{texture}->draw_quad (0, 0);
373 649
374 glDisable GL_TEXTURE_2D; 650 glDisable GL_TEXTURE_2D;
375 651
376 glTranslate 0.375, 0.375; 652 glTranslate 0.375, 0.375;
377
378 #TODO: map scale is completely borked
379
380 my $x0 = int $ox - $sx + 0.5;
381 my $y0 = int $oy - $sy + 0.5;
382 653
383 glColor 1, 1, 0, 1; 654 glColor 1, 1, 0, 1;
384 glBegin GL_LINE_LOOP; 655 glBegin GL_LINE_LOOP;
385 glVertex $x0 , $y0 ; 656 glVertex $self->{x0} , $self->{y0} ;
386 glVertex $x0 , $y0 + $sh; 657 glVertex $self->{x0} , $self->{y0} + $self->{sh};
387 glVertex $x0 + $sw, $y0 + $sh; 658 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
388 glVertex $x0 + $sw, $y0 ; 659 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
389 glEnd; 660 glEnd;
390 661
391 glDisable GL_BLEND; 662 glDisable GL_BLEND;
392} 663}
393 664
394package CFClient::MapWidget::Command; 665package CFPlus::MapWidget::Command;
395 666
396use strict; 667use strict;
397 668
398use CFClient::OpenGL; 669use CFPlus::OpenGL;
399 670
400our @ISA = CFClient::UI::Frame::; 671our @ISA = CFPlus::UI::Frame::;
401 672
402sub new { 673sub new {
403 my $class = shift; 674 my $class = shift;
404 675
405 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
406 bg => [0, 0, 0, 0.8], 677 bg => [0, 0, 0, 0.8],
407 @_, 678 @_,
408 ); 679 );
409 680
410 $self->add ($self->{vbox} = new CFClient::UI::VBox); 681 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
411 682
412 $self->{label} = [ 683 $self->{label} = [
413 map 684 map
414 CFClient::UI::Label->new ( 685 CFPlus::UI::Label->new (
415 can_hover => 1, 686 can_hover => 1,
416 can_events => 1, 687 can_events => 1,
417 tooltip_width => 0.33, 688 tooltip_width => 0.33,
418 fontsize => $_, 689 fontsize => $_,
419 ), (0.8) x 16 690 ), (0.8) x 16
420 ]; 691 ];
421 692
422 $self->{entry} = new CFClient::UI::Entry 693 $self->{entry} = new CFPlus::UI::Entry
423 on_changed => sub { 694 on_changed => sub {
424 $self->update_labels; 695 $self->update_labels;
696 0
697 },
698 on_button_down => sub {
699 my ($entry, $ev, $x, $y) = @_;
700
701 if ($ev->{button} == 3) {
702 (new CFPlus::UI::Menu
703 items => [
704 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
705 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
706 ],
707 )->popup ($ev);
708 return 1;
709 }
710 0
425 }, 711 },
426 on_key_down => sub { 712 on_key_down => sub {
427 my ($entry, $ev) = @_; 713 my ($entry, $ev) = @_;
428 714
429 my $self = $entry->{parent}{parent}; 715 my $self = $entry->{parent}{parent};
430 716
431 if ($ev->{sym} == 13) { 717 if ($ev->{sym} == 13) {
432 if (exists $self->{select}) { 718 if (exists $self->{select}) {
433 $self->{last_command} = $self->{select}; 719 $self->{last_command} = $self->{select};
434 $::CONN->user_send ($self->{select}); 720 $::CONN->user_send ($self->{select});
721
722 unshift @{$self->{history}}, $self->{entry}->get_text;
723 $self->{hist_ptr} = 0;
724
435 $self->hide; 725 $self->hide;
436 } 726 }
437 } elsif ($ev->{sym} == 27) { 727 } elsif ($ev->{sym} == 27) {
728 $self->{hist_ptr} = 0;
438 $self->hide; 729 $self->hide;
439 return;
440 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 730 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
731 if ($self->{hist_ptr} > 1) {
732 $self->{hist_ptr}--;
733 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
734 } elsif ($self->{hist_ptr} > 0) {
735 $self->{hist_ptr}--;
736 $self->{entry}->set_text ($self->{hist_saveback});
737 } else {
441 ++$self->{select_offset} 738 ++$self->{select_offset}
442 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 739 if $self->{select_offset} < $#{ $self->{last_match} || [] };
740 }
443 $self->update_labels; 741 $self->update_labels;
444 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 742 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
743 if ($self->{select_offset}) {
445 --$self->{select_offset} 744 --$self->{select_offset}
745 } else {
746 unless ($self->{hist_ptr}) {
747 $self->{hist_saveback} = $self->{entry}->get_text;
748 }
749 if ($self->{hist_ptr} <= $#{$self->{history}}) {
446 if $self->{select_offset}; 750 $self->{hist_ptr}++;
751 }
752 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
753 if exists $self->{history}->[$self->{hist_ptr} - 1];
754 }
447 $self->update_labels; 755 $self->update_labels;
448 } else { 756 } else {
449 return 0; 757 return 0;
450 } 758 }
451 759
… …
466 774
467 $self->{entry}->set_text ($prefix); 775 $self->{entry}->set_text ($prefix);
468 $self->show; 776 $self->show;
469} 777}
470 778
471sub size_allocate { 779sub invoke_size_allocate {
472 my ($self, $w, $h) = @_; 780 my ($self, $w, $h) = @_;
473 781
474 $self->SUPER::size_allocate ($w, $h);
475 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 782 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
783
784 $self->SUPER::invoke_size_allocate ($w, $h)
476} 785}
477 786
478sub show { 787sub show {
479 my ($self) = @_; 788 my ($self) = @_;
480 789
481 $self->SUPER::show; 790 $self->SUPER::show;
482 $self->{entry}->focus_in; 791 $self->{entry}->grab_focus;
483} 792}
484 793
485sub hide { 794sub hide {
486 my ($self) = @_; 795 my ($self) = @_;
796
797 $self->{hist_ptr} = 0;
487 798
488 $self->SUPER::hide; 799 $self->SUPER::hide;
489 $self->{entry}->set_text (""); 800 $self->{entry}->set_text ("");
490} 801}
491 802
492sub key_down { 803sub inject_key_down {
493 my ($self, $ev) = @_; 804 my ($self, $ev) = @_;
494 805
806 $self->{entry}->grab_focus;
495 $self->{entry}->key_down ($ev); 807 $self->{entry}->emit (key_down => $ev);
496} 808}
497 809
498sub update_labels { 810sub update_labels {
499 my ($self) = @_; 811 my ($self) = @_;
500 812
… …
587 $label->set_text (""); 899 $label->set_text ("");
588 $label->set_tooltip (""); 900 $label->set_tooltip ("");
589 } 901 }
590 902
591 $self->update; 903 $self->update;
592 ###
593} 904}
594 905
595sub _draw { 906sub _draw {
596 my ($self) = @_; 907 my ($self) = @_;
597 908
598 # hack 909 # hack
599 local $CFClient::UI::FOCUS = $self->{entry}; 910 local $CFPlus::UI::FOCUS = $self->{entry};
600 911
601 $self->SUPER::_draw; 912 $self->SUPER::_draw;
602} 913}
603 914
6041 9151
916

Diff Legend

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