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.77 by root, Sun Jul 23 02:44:05 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 tooltip => "<b>The Command Completer</b>\n\n" 39 tooltip => "#completer_help",
36 . "This is your central interface to send text commands to the server. "
37 . "To enter a verbatim command to send to the server, just type the command, "
38 . "followed by a space, and press return. "
39 . "Typing the initial letters of words (or just any letters) displays guesses "
40 . "for commands you might want to use.\n"
41 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
42 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
43 ; 40 ;
44 41
45 $self 42 $self
43}
44
45sub set_tilesize {
46 my ($self, $tilesize) = @_;
47
48 $self->{tilesize} = $tilesize;
46} 49}
47 50
48sub add_command { 51sub add_command {
49 my ($self, $command, $tooltip, $widget, $cb) = @_; 52 my ($self, $command, $tooltip, $widget, $cb) = @_;
50 53
… …
64 67
65 $self->{completer}->hide 68 $self->{completer}->hide
66 if $self->{completer}; 69 if $self->{completer};
67} 70}
68 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 }
180}
181
69sub invoke_button_down { 182sub invoke_button_down {
70 my ($self, $ev, $x, $y) = @_; 183 my ($self, $ev, $x, $y) = @_;
71 184
72 if ($ev->{button} == 1) { 185 if ($ev->{button} == 1) {
73 $self->grab_focus; 186 $self->grab_focus;
74 return unless $::CONN; 187 return unless $::CONN;
75 188
76 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};
77 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};
78 191
79 $x -= int 0.5 * $self->{sw}; 192 $x -= CFPlus::floor $::MAP->w * 0.5;
80 $y -= int 0.5 * $self->{sh}; 193 $y -= CFPlus::floor $::MAP->h * 0.5;
81 194
195 if ($::CONN) {
196 if ($::IN_BUILD_MODE) {
197 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
198 } else {
82 $::CONN->lookat ($x, $y) 199 $::CONN->lookat ($x, $y)
83 if $::CONN; 200 }
201 }
84 202
85 } elsif ($ev->{button} == 2) { 203 } elsif ($ev->{button} == 2) {
86 $self->grab_focus; 204 $self->grab_focus;
87 return unless $::CONN; 205 return unless $::CONN;
88 206
… …
98 $::CFG->{map_shift_y} = $bh + $y - $oy; 216 $::CFG->{map_shift_y} = $bh + $y - $oy;
99 217
100 $self->update; 218 $self->update;
101 }; 219 };
102 } elsif ($ev->{button} == 3) { 220 } elsif ($ev->{button} == 3) {
103 (new CFClient::UI::Menu 221 my @items = (
104 items => [
105 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 222 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
106 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 223 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
107 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 224 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
108 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 225 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
109 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 226 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
113 $::PICKUP_ENABLE->{state} 230 $::PICKUP_ENABLE->{state}
114 ? "Disable automatic pickup" 231 ? "Disable automatic pickup"
115 : "Enable automatic pickup", 232 : "Enable automatic pickup",
116 sub { $::PICKUP_ENABLE->toggle } 233 sub { $::PICKUP_ENABLE->toggle }
117 ], 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 }
118 ], 265 ],
266 ;
267
268 (new CFPlus::UI::Menu
269 items => \@items,
119 )->popup ($ev); 270 )->popup ($ev);
120 } 271 }
121 272
122 1 273 1
123} 274}
… …
141 292
142 1 293 1
143} 294}
144 295
145sub size_request { 296sub size_request {
297 my ($self) = @_;
298
146 ( 299 (
147 32 * CFClient::ceil $::WIDTH / 32, 300 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
148 32 * CFClient::ceil $::HEIGHT / 32, 301 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
149 ) 302 )
150} 303}
151 304
152sub update { 305sub update {
153 my ($self) = @_; 306 my ($self) = @_;
… …
155 $self->{need_update} = 1; 308 $self->{need_update} = 1;
156 $self->SUPER::update; 309 $self->SUPER::update;
157} 310}
158 311
159my %DIR = ( 312my %DIR = (
313 CFPlus::SDLK_KP5, [0, "stay fire"],
160 CFClient::SDLK_KP8, [1, "north"], 314 CFPlus::SDLK_KP8, [1, "north"],
161 CFClient::SDLK_KP9, [2, "northeast"], 315 CFPlus::SDLK_KP9, [2, "northeast"],
162 CFClient::SDLK_KP6, [3, "east"], 316 CFPlus::SDLK_KP6, [3, "east"],
163 CFClient::SDLK_KP3, [4, "southeast"], 317 CFPlus::SDLK_KP3, [4, "southeast"],
164 CFClient::SDLK_KP2, [5, "south"], 318 CFPlus::SDLK_KP2, [5, "south"],
165 CFClient::SDLK_KP1, [6, "southwest"], 319 CFPlus::SDLK_KP1, [6, "southwest"],
166 CFClient::SDLK_KP4, [7, "west"], 320 CFPlus::SDLK_KP4, [7, "west"],
167 CFClient::SDLK_KP7, [8, "northwest"], 321 CFPlus::SDLK_KP7, [8, "northwest"],
168 322
169 CFClient::SDLK_UP, [1, "north"], 323 CFPlus::SDLK_UP, [1, "north"],
170 CFClient::SDLK_RIGHT, [3, "east"], 324 CFPlus::SDLK_RIGHT, [3, "east"],
171 CFClient::SDLK_DOWN, [5, "south"], 325 CFPlus::SDLK_DOWN, [5, "south"],
172 CFClient::SDLK_LEFT, [7, "west"], 326 CFPlus::SDLK_LEFT, [7, "west"],
173); 327);
174 328
175sub invoke_key_down { 329sub invoke_key_down {
176 my ($self, $ev) = @_; 330 my ($self, $ev) = @_;
177 331
178 my $mod = $ev->{mod}; 332 my $mod = $ev->{mod};
179 my $sym = $ev->{sym}; 333 my $sym = $ev->{sym};
180 my $uni = $ev->{unicode}; 334 my $uni = $ev->{unicode};
181 335
182 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; 336 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
183 337
184 if ($uni == ord "\t") { 338 if ($sym == 9) {
185 $::PL_WINDOW->toggle_visibility; 339 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
186 } elsif ($sym == CFClient::SDLK_F1 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
187 $::HELP_WINDOW->toggle_visibility; 341 $::HELP_WINDOW->toggle_visibility;
188 } elsif ($sym == CFClient::SDLK_F2 && !$mod) { 342 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
189 ::toggle_player_page ($::STATS_PAGE); 343 ::toggle_player_page ($::STATS_PAGE);
190 } elsif ($sym == CFClient::SDLK_F3 && !$mod) { 344 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
191 ::toggle_player_page ($::SKILL_PAGE); 345 ::toggle_player_page ($::SKILL_PAGE);
192 } elsif ($sym == CFClient::SDLK_F4 && !$mod) { 346 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
193 ::toggle_player_page ($::SPELL_PAGE); 347 ::toggle_player_page ($::SPELL_PAGE);
194 } elsif ($sym == CFClient::SDLK_F5 && !$mod) { 348 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
195 ::toggle_player_page ($::INVENTORY_PAGE); 349 ::toggle_player_page ($::INVENTORY_PAGE);
196 } elsif ($sym == CFClient::SDLK_F9 && !$mod) { 350 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
197 $::SETUP_DIALOG->toggle_visibility; 351 $::SETUP_DIALOG->toggle_visibility;
198 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
199 $::BIND_EDITOR->set_binding (undef, undef, [],
200 sub {
201 my ($mod, $sym, $cmds) = @_;
202 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
203 });
204 $::BIND_EDITOR->start;
205 $::BIND_EDITOR->show;
206 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
207 $::BIND_EDITOR->stop;
208 $::BIND_EDITOR->ask_for_bind_and_commit;
209 $::BIND_EDITOR->hide;
210 } elsif (!$::CONN) { 352 } elsif (!$::CONN) {
211 return 0; # bindings further down need a valid connection 353 return 0; # bindings further down need a valid connection
212 354
213 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
214 $::CONN->user_send ("stay fire");
215 } elsif ($uni == ord ",") { 355 } elsif ($uni == ord ",") {
216 $::CONN->user_send ("take"); 356 $::CONN->user_send ("take");
217 } elsif ($uni == ord " ") { 357 } elsif ($uni == ord " ") {
218 $::CONN->user_send ("apply"); 358 $::CONN->user_send ("apply");
359 } elsif ($uni == 13) {
360 $::CONN->user_send ("examine");
219 } elsif ($uni == ord ".") { 361 } elsif ($uni == ord ".") {
220 $::CONN->user_send ($self->{completer}{last_command}) 362 $::CONN->user_send ($self->{completer}{last_command})
221 if exists $self->{completer}{last_command}; 363 if exists $self->{completer}{last_command};
222 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 364 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
223 $::CONN->user_send ($_) for @$bind_cmd; 365 $::CONN->macro_send ($_) for @macros;
224 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 366 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
225 $::CONN->user_send ("rotateshoottype +"); 367 $::CONN->user_send ("rotateshoottype +");
226 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 368 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
227 $::CONN->user_send ("rotateshoottype -"); 369 $::CONN->user_send ("rotateshoottype -");
370 } elsif ($uni == ord '!') {
371 $self->{completer}->set_prefix ("shout ");
372 $self->{completer}->show;
228 } elsif ($uni == ord '"') { 373 } elsif ($uni == ord '"') {
229 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 374 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
230 $self->{completer}->show; 375 $self->{completer}->show;
231 } elsif ($uni == ord "'") { 376 } elsif ($uni == ord "'") {
232 $self->{completer}->set_prefix (""); 377 $self->{completer}->set_prefix ("");
233 $self->{completer}->show; 378 $self->{completer}->show;
234 } elsif (exists $DIR{$sym}) { 379 } elsif (exists $DIR{$sym}) {
235 if ($mod & CFClient::KMOD_SHIFT) { 380 if ($mod & CFPlus::KMOD_SHIFT) {
236 $self->{shft}++; 381 $self->{shft}++;
237 if ($DIR{$sym}[0] != $self->{fire_dir}) { 382 if ($DIR{$sym}[0] != $self->{fire_dir}) {
238 $::CONN->user_send ("fire $DIR{$sym}[0]"); 383 $::CONN->user_send ("fire $DIR{$sym}[0]");
239 } 384 }
240 $self->{fire_dir} = $DIR{$sym}[0]; 385 $self->{fire_dir} = $DIR{$sym}[0];
241 } elsif ($mod & CFClient::KMOD_CTRL) { 386 } elsif ($mod & CFPlus::KMOD_CTRL) {
242 $self->{ctrl}++; 387 $self->{ctrl}++;
243 $::CONN->user_send ("run $DIR{$sym}[0]"); 388 $::CONN->user_send ("run $DIR{$sym}[0]");
244 } else { 389 } else {
245 $::CONN->user_send ("$DIR{$sym}[1]"); 390 $::CONN->user_send ("$DIR{$sym}[1]");
246 } 391 }
… …
260 my $res = 0; 405 my $res = 0;
261 my $mod = $ev->{mod}; 406 my $mod = $ev->{mod};
262 my $sym = $ev->{sym}; 407 my $sym = $ev->{sym};
263 408
264 if ($::CFG->{shift_fire_stop}) { 409 if ($::CFG->{shift_fire_stop}) {
265 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 410 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
266 $::CONN->user_send ("fire_stop"); 411 $::CONN->user_send ("fire_stop");
267 delete $self->{fire_dir}; 412 delete $self->{fire_dir};
268 $res = 1; 413 $res = 1;
269 } 414 }
270 } else { 415 } else {
271 if (exists $DIR{$sym} && delete $self->{shft}) { 416 if (exists $DIR{$sym} && delete $self->{shft}) {
272 $::CONN->user_send ("fire_stop"); 417 $::CONN->user_send ("fire_stop");
273 delete $self->{fire_dir}; 418 delete $self->{fire_dir};
274 $res = 1; 419 $res = 1;
275 } 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?
276 $::CONN->user_send ("fire_stop"); 421 $::CONN->user_send ("fire_stop");
277 delete $self->{fire_dir}; 422 delete $self->{fire_dir};
278 $res = 1; 423 $res = 1;
279 } 424 }
280 } 425 }
281 426
282 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 427 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
283 $::CONN->user_send ("run_stop"); 428 $::CONN->user_send ("run_stop");
284 $res = 1; 429 $res = 1;
285 } 430 }
286 431
287 $res 432 $res
288} 433}
289 434
435sub invoke_visibility_change {
436 my ($self) = @_;
437
438 $self->refresh_hook;
439
440 0
441}
442
290sub set_magicmap { 443sub set_magicmap {
291 my ($self, $w, $h, $x, $y, $data) = @_; 444 my ($self, $w, $h, $x, $y, $data) = @_;
292 445
293 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 446 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
294 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 447 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
295 448
296 $self->{magicmap} = [$x, $y, $w, $h, $data]; 449 $self->{magicmap} = [$x, $y, $w, $h, $data];
297 450
298 $self->update; 451 $self->update;
299} 452}
300 453
301sub draw { 454sub refresh_hook {
302 my ($self) = @_; 455 my ($self) = @_;
303 456
304 return unless $::MAP; 457 return unless $::MAP;
305 458
306 my $focused = $CFClient::UI::FOCUS == $self
307 || $CFClient::UI::FOCUS == $self->{completer}{entry};
308
309 return
310 unless $focused || !$::FAST;
311
312 if (delete $self->{need_update}) { 459 if (delete $self->{need_update}) {
313 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 460 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
314 461
462 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
463 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
464
315 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 465 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
316 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 466 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
317 467
318 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 468 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
319 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 469 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
320 470
321 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 471 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
322 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 472 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
323 473
324 if ($::CFG->{fow_enable}) { 474 if ($::CFG->{fow_enable}) {
325 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 475 my ($w, $h, $data) = $::MAP->fow_texture (
326 476 $dx, $dy, $sw, $sh,
327 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 477 $::CFG->{fow_smooth},
328 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
329 glConvolutionFilter2D (
330 GL_CONVOLUTION_2D,
331 GL_ALPHA,
332 3, 3,
333 GL_ALPHA, GL_FLOAT,
334 (pack "f*", @{ $self->{smooth_matrix} }), 478 pack "f*", @{ $self->{smooth_matrix} },
335 ); 479 );
336 glEnable GL_CONVOLUTION_2D;
337 }
338 480
339 $self->{fow_texture} = new CFClient::Texture 481 $self->{fow_texture} = new CFPlus::Texture
340 w => $w, 482 w => $w,
341 h => $h, 483 h => $h,
342 data => $data, 484 data => $data,
343 internalformat => GL_ALPHA, 485 internalformat => GL_ALPHA,
344 format => GL_ALPHA; 486 format => GL_ALPHA;
345
346 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
347 } else { 487 } else {
348 delete $self->{fow_texture}; 488 delete $self->{fow_texture};
349 } 489 }
350 490
351 glNewList $self->{list}; 491 glNewList $self->{list};
352 492
353 glPushMatrix; 493 glPushMatrix;
354 glTranslate $sx0, $sy0; 494 glTranslate $sx0, $sy0;
355 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 495 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
356 496
357 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 497 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
358 498
359 glScale 32, 32; 499 glScale $self->{tilesize}, $self->{tilesize};
360 500
361 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};
362 glEnable GL_TEXTURE_2D; 504 glEnable GL_TEXTURE_2D;
363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 505 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
364 506
365 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 507 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
366 $self->{fow_texture}->draw_quad_alpha (0, 0); 508 $self->{fow_texture}->draw_quad_alpha (0, 0);
367 509
368 glDisable GL_TEXTURE_2D; 510 glDisable GL_TEXTURE_2D;
511 glPopMatrix;
369 } 512 }
370 513
371 if ($self->{magicmap}) { 514 if ($self->{magicmap}) {
372 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 515 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
373 516
374 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 517 $x += $::MAP->ox + $self->{dx};
375 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 518 $y += $::MAP->oy + $self->{dy};
376 519
377 glTranslate - $x - 1, - $y - 1; 520 glTranslate - $x - 1, - $y - 1;
378 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 521 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
379 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 522 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
380 } 523 }
381 524
382 glPopMatrix; 525 glPopMatrix;
383 glEndList; 526 glEndList;
384 } 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;
385 543
386 glCallList $self->{list}; 544 glCallList $self->{list};
387 545
388 # TNT2 emulates logops in software (or worse :) 546 # TNT2 emulates logops in software (or worse :)
389 unless ($focused) { 547 unless ($focused) {
… …
406 glDeleteList $self->{list}; 564 glDeleteList $self->{list};
407 565
408 $self->SUPER::DESTROY; 566 $self->SUPER::DESTROY;
409} 567}
410 568
411package CFClient::MapWidget::MapMap; 569package CFPlus::MapWidget::MapMap;
412 570
571use strict;
572use utf8;
573
413our @ISA = CFClient::UI::Base::; 574our @ISA = CFPlus::UI::Base::;
414 575
415use Time::HiRes qw(time); 576use Time::HiRes qw(time);
416use CFClient::OpenGL; 577use CFPlus::OpenGL;
417 578
418sub size_request { 579sub size_request {
419 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 580 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
420} 581}
421 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
422sub invoke_size_allocate { 628sub invoke_size_allocate {
423 my ($self, $w, $h) = @_; 629 my ($self, $w, $h) = @_;
424 630
425 $self->update; 631 $self->update;
426 632
… …
435} 641}
436 642
437sub _draw { 643sub _draw {
438 my ($self) = @_; 644 my ($self) = @_;
439 645
440 $::MAP or return; 646 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
441 647
442 my ($w, $h) = @$self{qw(w h)}; 648 $self->{texture} or return;
443
444 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
445 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
446
447 my $sx = int $::CFG->{map_shift_x} / 32;
448 my $sy = int $::CFG->{map_shift_y} / 32;
449
450 my $ox = 0.5 * ($w - $sw);
451 my $oy = 0.5 * ($h - $sh);
452 649
453 glEnable GL_BLEND; 650 glEnable GL_BLEND;
454 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
455 glEnable GL_TEXTURE_2D; 652 glEnable GL_TEXTURE_2D;
456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
457 654
458 if ($self->{texture_atime} < time) {
459 $self->{texture_atime} = time + 1/3;
460
461 $self->{texture} =
462 new CFClient::Texture
463 w => $w,
464 h => $h,
465 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
466 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
467 }
468
469 $self->{texture}->draw_quad (0, 0); 655 $self->{texture}->draw_quad (0, 0);
470 656
471 glDisable GL_TEXTURE_2D; 657 glDisable GL_TEXTURE_2D;
472 658
473 glTranslate 0.375, 0.375; 659 glTranslate 0.375, 0.375;
474
475 #TODO: map scale is completely borked
476
477 my $x0 = int $ox - $sx + 0.5;
478 my $y0 = int $oy - $sy + 0.5;
479 660
480 glColor 1, 1, 0, 1; 661 glColor 1, 1, 0, 1;
481 glBegin GL_LINE_LOOP; 662 glBegin GL_LINE_LOOP;
482 glVertex $x0 , $y0 ; 663 glVertex $self->{x0} , $self->{y0} ;
483 glVertex $x0 , $y0 + $sh; 664 glVertex $self->{x0} , $self->{y0} + $self->{sh};
484 glVertex $x0 + $sw, $y0 + $sh; 665 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
485 glVertex $x0 + $sw, $y0 ; 666 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
486 glEnd; 667 glEnd;
487 668
488 glDisable GL_BLEND; 669 glDisable GL_BLEND;
489} 670}
490 671
491package CFClient::MapWidget::Command; 672package CFPlus::MapWidget::Command;
492 673
493use strict; 674use strict;
494 675
495use CFClient::OpenGL; 676use CFPlus::OpenGL;
496 677
497our @ISA = CFClient::UI::Frame::; 678our @ISA = CFPlus::UI::Frame::;
498 679
499sub new { 680sub new {
500 my $class = shift; 681 my $class = shift;
501 682
502 my $self = $class->SUPER::new ( 683 my $self = $class->SUPER::new (
503 bg => [0, 0, 0, 0.8], 684 bg => [0, 0, 0, 0.8],
504 @_, 685 @_,
505 ); 686 );
506 687
507 $self->add ($self->{vbox} = new CFClient::UI::VBox); 688 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
508 689
509 $self->{label} = [ 690 $self->{label} = [
510 map 691 map
511 CFClient::UI::Label->new ( 692 CFPlus::UI::Label->new (
512 can_hover => 1, 693 can_hover => 1,
513 can_events => 1, 694 can_events => 1,
514 tooltip_width => 0.33, 695 tooltip_width => 0.33,
515 fontsize => $_, 696 fontsize => $_,
516 ), (0.8) x 16 697 ), (0.8) x 16
517 ]; 698 ];
518 699
519 $self->{entry} = new CFClient::UI::Entry 700 $self->{entry} = new CFPlus::UI::Entry
520 on_changed => sub { 701 on_changed => sub {
521 $self->update_labels; 702 $self->update_labels;
522 0 703 0
523 }, 704 },
524 on_button_down => sub { 705 on_button_down => sub {
525 my ($entry, $ev, $x, $y) = @_; 706 my ($entry, $ev, $x, $y) = @_;
526 707
527 if ($ev->{button} == 3) { 708 if ($ev->{button} == 3) {
528 (new CFClient::UI::Menu 709 (new CFPlus::UI::Menu
529 items => [ 710 items => [
530 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 711 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
531 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 712 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
532 ], 713 ],
533 )->popup ($ev); 714 )->popup ($ev);
534 return 1; 715 return 1;
535 } 716 }
536 0 717 0
… …
551 $self->hide; 732 $self->hide;
552 } 733 }
553 } elsif ($ev->{sym} == 27) { 734 } elsif ($ev->{sym} == 27) {
554 $self->{hist_ptr} = 0; 735 $self->{hist_ptr} = 0;
555 $self->hide; 736 $self->hide;
556 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 737 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
557 if ($self->{hist_ptr} > 1) { 738 if ($self->{hist_ptr} > 1) {
558 $self->{hist_ptr}--; 739 $self->{hist_ptr}--;
559 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 740 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
560 } elsif ($self->{hist_ptr} > 0) { 741 } elsif ($self->{hist_ptr} > 0) {
561 $self->{hist_ptr}--; 742 $self->{hist_ptr}--;
… …
563 } else { 744 } else {
564 ++$self->{select_offset} 745 ++$self->{select_offset}
565 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 746 if $self->{select_offset} < $#{ $self->{last_match} || [] };
566 } 747 }
567 $self->update_labels; 748 $self->update_labels;
568 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 749 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
569 if ($self->{select_offset}) { 750 if ($self->{select_offset}) {
570 --$self->{select_offset} 751 --$self->{select_offset}
571 } else { 752 } else {
572 unless ($self->{hist_ptr}) { 753 unless ($self->{hist_ptr}) {
573 $self->{hist_saveback} = $self->{entry}->get_text; 754 $self->{hist_saveback} = $self->{entry}->get_text;
… …
731 912
732sub _draw { 913sub _draw {
733 my ($self) = @_; 914 my ($self) = @_;
734 915
735 # hack 916 # hack
736 local $CFClient::UI::FOCUS = $self->{entry}; 917 local $CFPlus::UI::FOCUS = $self->{entry};
737 918
738 $self->SUPER::_draw; 919 $self->SUPER::_draw;
739} 920}
740 921
7411 9221
923

Diff Legend

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