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.57 by elmex, Tue Jun 13 11:01:04 2006 UTC vs.
Revision 1.133 by root, Sat Jul 19 20:33:47 2008 UTC

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

Diff Legend

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