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

Diff Legend

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