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

Diff Legend

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