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.50 by root, Sat Jun 3 23:47:47 2006 UTC vs.
Revision 1.139 by root, Sun Jul 20 15:05:13 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 @_ 26 @_
20 ); 27 );
21
22 $self->{completer} = new CFClient::MapWidget::Command::
23 command => $self->{command},
24 can_focus => 1,
25 tooltip => "<b>The Command Completer</b>\n\n"
26 . "This is your central interface to send text commands to the server. "
27 . "To enter a verbatim command to send to the server, just type the command, "
28 . "followed by a space, and press return. "
29 . "Typing the initial letters of words (or just any letters) displays guesses "
30 . "for commands you might want to use.\n"
31 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
32 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
33 ;
34 28
35 $self 29 $self
36} 30}
37 31
38sub add_command { 32sub add_command {
… …
42 36
43 $tooltip =~ s/^\s+//; 37 $tooltip =~ s/^\s+//;
44 $tooltip = "<big>$data</big>\n\n$tooltip"; 38 $tooltip = "<big>$data</big>\n\n$tooltip";
45 $tooltip =~ s/\s+$//; 39 $tooltip =~ s/\s+$//;
46 40
47 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 41 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
48} 42}
49 43
50sub clr_commands { 44sub clr_commands {
51 my ($self) = @_; 45 my ($self) = @_;
52 46
53 %{$self->{completer}{command}} = (); 47 %{$::COMPLETER->{command}} = ();
54}
55 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
56sub button_down { 163sub invoke_button_down {
57 my ($self, $ev, $x, $y) = @_; 164 my ($self, $ev, $x, $y) = @_;
58 165
59 $self->focus_in;
60
61 if ($ev->{button} == 1) { 166 if ($ev->{button} == 1) {
62 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 167 $self->grab_focus;
63 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 168 return unless $::CONN;
64 169
65 my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99; 170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
66 my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99; 171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
67 172
68 $::CONN->send (sprintf "lookat %d %d", $fx, $fy); 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 }
69 179
70 } elsif ($ev->{button} == 2) { 180 } elsif ($ev->{button} == 2) {
181 $self->grab_focus;
182 return unless $::CONN;
183
71 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 184 my ($ox, $oy) = ($ev->{x}, $ev->{y});
72 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 185 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
73 186
74 $self->{motion} = sub { 187 $self->{motion} = sub {
75 my ($ev, $x, $y) = @_; 188 my ($ev, $x, $y) = @_;
… …
79 $::CFG->{map_shift_x} = $bw + $x - $ox; 192 $::CFG->{map_shift_x} = $bw + $x - $ox;
80 $::CFG->{map_shift_y} = $bh + $y - $oy; 193 $::CFG->{map_shift_y} = $bh + $y - $oy;
81 194
82 $self->update; 195 $self->update;
83 }; 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);
84 } 248 }
85 249
86 1 250 1
87} 251}
88 252
89sub button_up { 253sub invoke_button_up {
90 my ($self, $ev, $x, $y) = @_; 254 my ($self, $ev, $x, $y) = @_;
91 255
92 delete $self->{motion}; 256 delete $self->{motion};
93 257
94 1 258 1
95} 259}
96 260
97sub mouse_motion { 261sub invoke_mouse_motion {
98 my ($self, $ev, $x, $y) = @_; 262 my ($self, $ev, $x, $y) = @_;
99 263
100 if ($self->{motion}) { 264 if ($self->{motion}) {
101 $self->{motion}->($ev, $x, $y); 265 $self->{motion}->($ev, $x, $y);
102 } else { 266 } else {
… …
105 269
106 1 270 1
107} 271}
108 272
109sub size_request { 273sub size_request {
274 my ($self) = @_;
275
110 ( 276 (
111 1 + 32 * int $::WIDTH / 32, 277 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
112 1 + 32 * int $::HEIGHT / 32, 278 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
113 ) 279 )
114} 280}
115 281
116sub update { 282sub update {
117 my ($self) = @_; 283 my ($self) = @_;
… …
119 $self->{need_update} = 1; 285 $self->{need_update} = 1;
120 $self->SUPER::update; 286 $self->SUPER::update;
121} 287}
122 288
123my %DIR = ( 289my %DIR = (
290 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
124 CFClient::SDLK_KP8, [1, "north"], 291 ( "," . DC::SDLK_KP8 ), [1, "north"],
125 CFClient::SDLK_KP9, [2, "northeast"], 292 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
126 CFClient::SDLK_KP6, [3, "east"], 293 ( "," . DC::SDLK_KP6 ), [3, "east"],
127 CFClient::SDLK_KP3, [4, "southeast"], 294 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
128 CFClient::SDLK_KP2, [5, "south"], 295 ( "," . DC::SDLK_KP2 ), [5, "south"],
129 CFClient::SDLK_KP1, [6, "southwest"], 296 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
130 CFClient::SDLK_KP4, [7, "west"], 297 ( "," . DC::SDLK_KP4 ), [7, "west"],
131 CFClient::SDLK_KP7, [8, "northwest"], 298 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
132 299
133 CFClient::SDLK_UP, [1, "north"], 300 ( "," . DC::SDLK_UP ), [1, "north"],
301 ("1," . DC::SDLK_UP ), [2, "northeast"],
134 CFClient::SDLK_RIGHT, [3, "east"], 302 ( "," . DC::SDLK_RIGHT), [3, "east"],
303 ("1," . DC::SDLK_RIGHT), [4, "southeast"],
135 CFClient::SDLK_DOWN, [5, "south"], 304 ( "," . DC::SDLK_DOWN ), [5, "south"],
305 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
136 CFClient::SDLK_LEFT, [7, "west"], 306 ( "," . DC::SDLK_LEFT ), [7, "west"],
307 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
137); 308);
138 309
139sub key_down { 310sub invoke_key_down {
140 my ($self, $ev) = @_; 311 my ($self, $ev) = @_;
141
142 return 0 unless $::CONN;
143 312
144 my $mod = $ev->{mod}; 313 my $mod = $ev->{mod};
145 my $sym = $ev->{sym}; 314 my $sym = $ev->{sym};
146 my $uni = $ev->{unicode}; 315 my $uni = $ev->{unicode};
147 316
148 if ($sym == CFClient::SDLK_KP5) { 317 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT;
149 $::CONN->user_send ("stay fire"); 318
150 } elsif ($uni == ord ",") { 319 # ignore repeated keypresses
151 $::CONN->user_send ("take"); 320 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
152 } elsif ($uni == ord " ") { 321 $self->{last_mod} = $mod;
153 $::CONN->user_send ("apply"); 322 $self->{last_sym} = $sym;
154 } elsif ($uni == ord ".") { 323
155 $::CONN->user_send ($self->{completer}{last_command}) 324 if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
156 if exists $self->{completer}{last_command};
157 } elsif ($uni == ord "\t") {
158 $::INV_WINDOW->toggle_visibility;
159 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
160 $::CONN->user_send ("rotateshoottype +");
161 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
162 $::CONN->user_send ("rotateshoottype -");
163 } elsif ($uni == ord '"') {
164 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
165 $self->{completer}->show;
166 } elsif ($uni == ord "'") {
167 $self->{completer}->set_prefix ("");
168 $self->{completer}->show;
169 } elsif (exists $DIR{$sym}) {
170 if ($mod & CFClient::KMOD_SHIFT) { 325 if ($mod & DC::KMOD_SHIFT) {
171 $self->{shft}++; 326 $self->{shft}++;
327 if ($dir->[0] != $self->{fire_dir}) {
172 $::CONN->user_send ("fire $DIR{$sym}[0]"); 328 $::CONN->user_send ("fire $dir->[0]");
329 }
330 $self->{fire_dir} = $dir->[0];
173 } elsif ($mod & CFClient::KMOD_CTRL) { 331 } elsif ($mod & DC::KMOD_CTRL) {
174 $self->{ctrl}++; 332 $self->{ctrl}++;
175 $::CONN->user_send ("run $DIR{$sym}[0]"); 333 $::CONN->user_send ("run $dir->[0]");
176 } else { 334 } else {
177 $::CONN->user_send ("$DIR{$sym}[1]"); 335 $::CONN->user_send ("$dir->[1]");
178 } 336 }
179 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 337
180 $::BIND_EDITOR->set_binding (undef, undef, [],
181 sub {
182 my ($mod, $sym, $cmds) = @_;
183 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
184 });
185 $::BIND_EDITOR->start;
186 $::BIND_EDITOR->show;
187 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
188 $::BIND_EDITOR->stop;
189 $::BIND_EDITOR->ask_for_bind_and_commit;
190 $::BIND_EDITOR->hide;
191 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
192 $::CONN->user_send ($_) for @$bind_cmd;
193 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
194 $self->{completer}->key_down ($ev);
195 $self->{completer}->show;
196 } else {
197 return 0; 338 return 1;
198 }
199
200 1 339 }
201}
202 340
341 0
342}
343
203sub key_up { 344sub invoke_key_up {
204 my ($self, $ev) = @_; 345 my ($self, $ev) = @_;
205 346
206 my $res = 0; 347 my $res = 0;
207 my $mod = $ev->{mod}; 348 my $mod = $ev->{mod};
208 my $sym = $ev->{sym}; 349 my $sym = $ev->{sym};
209 350
351 delete $self->{last_mod};
352 delete $self->{last_sym};
353
354 if ($::CFG->{shift_fire_stop}) {
210 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 355 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
211 $::CONN->user_send ("fire_stop"); 356 $::CONN->user_send ("fire_stop");
357 delete $self->{fire_dir};
212 $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 }
213 } 371 }
214 372
215 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 373 if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {
216 $::CONN->user_send ("run_stop"); 374 $::CONN->user_send ("run_stop");
217 $res = 1; 375 $res = 1;
218 } 376 }
219 377
220 $res 378 $res
221} 379}
222 380
223sub 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 {
224 my ($self) = @_; 396 my ($self, $dx, $dy) = @_;
225 397
226 my $focused = $CFClient::UI::FOCUS == $self 398 $::MAP->scroll ($dx, $dy);
227 || $CFClient::UI::FOCUS == $self->{completer}{entry};
228 399
229 return 400 $self->movement_update;
230 unless $focused || !$::FAST;
231 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 $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
437
438 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
439 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
440
441 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
442 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
443
444 $self->update;
445 }
446 }
447 } else {
448 $self->{sdx} = $self->{sdy} = 0;
449 }
450
451 $self->{last_update} = EV::time;
452}
453
454sub refresh_hook {
455 my ($self) = @_;
456
457 if ($::MAP && $::CONN) {
232 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
233 glNewList $self->{list}; 459 $self->movement_update;
234 460
235 if ($::MAP) { 461 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
236 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
237 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
238 462
239 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; 463 my $sdx_t = DC::ceilabs $self->{sdx} / $tilesize;
240 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; 464 my $sdy_t = DC::ceilabs $self->{sdy} / $tilesize;
241 465
242 glPushMatrix; 466 # width/height of map, in tiles
243 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 467 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
468 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
244 469
245 glTranslate $sx0 - 32, $sy0 - 32, 0; 470 # the map displacement, in tiles
471 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
472 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
246 473
247 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 474 # the upper left "visible" corner, in pixels
475 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
476 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
477
478 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
479 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
248 480
249 if ($::CFG->{fow_enable}) { 481 if ($::CFG->{fow_enable}) {
250 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 482 $sdx_t = $sdy_t = 0;#d#
251 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 483 my ($w, $h, $data) = $::MAP->fow_texture (
252 glConvolutionFilter2D ( 484 $dx + (min 0, $sdx_t),
253 GL_CONVOLUTION_2D, 485 $dy + (min 0, $sdy_t),
254 GL_ALPHA, 486 $sw + abs $sdx_t,
255 3, 3, 487 $sh + abs $sdy_t
256 GL_ALPHA, GL_FLOAT,
257 pack "f*",
258 0.05, 0.13, 0.05,
259 0.13, 0.30, 0.13,
260 0.05, 0.13, 0.05,
261 ); 488 );
262 glEnable GL_CONVOLUTION_2D;
263 }
264 489
265 $self->{fow_texture_name} ||= glGenTexture;
266 # try to re-use the texture name: TODO improve texture class instead
267
268 $self->{fow_texture} = new CFClient::Texture 490 $self->{fow_texture} = new DC::Texture
269 w => $w, 491 w => $w,
270 h => $h, 492 h => $h,
271 data => $data, 493 data => $data,
272 name => $self->{fow_texture_name},
273 internalformat => GL_ALPHA, 494 internalformat => GL_ALPHA,
274 format => GL_ALPHA; 495 format => GL_ALPHA;
496 } else {
497 delete $self->{fow_texture};
498 }
275 499
276 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 500 glNewList ($self->{list} ||= glGenList);
277 501
502 glPushMatrix;
503 glTranslate $sx0, $sy0;
504 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
505 glTranslate $self->{sdx}, $self->{sdy};
506
507 $::MAP->draw ($dx, $dy, $sw, $sh,
508 $self->{tilesize},
509 $::CONN->{player}{tag},
510 -$self->{sdx}, -$self->{sdy});
511
512 #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player
513 glScale $self->{tilesize}, $self->{tilesize};
514
515 if (my $tex = $self->{fow_texture}) {
516 glPushMatrix;
517 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
518 glScale 1/3, 1/3;
278 glEnable GL_TEXTURE_2D; 519 glEnable GL_TEXTURE_2D;
279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
280 521
281 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 522 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
282 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 523 $self->{fow_texture}->draw_quad_alpha (0, 0);
283 524
284 glDisable GL_TEXTURE_2D; 525 glDisable GL_TEXTURE_2D;
526 glPopMatrix;
285 } 527 }
286 528
529 if ($self->{magicmap}) {
530 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
531
532 $x += $::MAP->ox + $self->{dx};
533 $y += $::MAP->oy + $self->{dy};
534
535 glTranslate - $x - 1, - $y - 1;
536 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
537 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
538 }
539
287 glPopMatrix; 540 glPopMatrix;
288 }
289
290 glEndList; 541 glEndList;
542 }
543 } else {
544 glDeleteList delete $self->{list}
545 if $self->{list};
291 } 546 }
547}
292 548
293 glPushMatrix; 549sub draw {
550 my ($self) = @_;
551
552 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
553
554 return unless $self->{list};
555
556 my $focused = $DC::UI::FOCUS == $self
557 || $DC::UI::FOCUS == $::COMPLETER->{entry};
558
559 return
560 unless $focused || !$::FAST;
561
294 glCallList $self->{list}; 562 glCallList $self->{list};
295 glPopMatrix;
296 563
297 # TNT2 emulates logops in software (or worse :) 564 # TNT2 emulates logops in software (or worse :)
298 if ($focused) { 565 unless ($focused) {
299 (delete $self->{out_of_focus})->destroy 566 glColor_premultiply 0, 0, 1, 0.25;
300 if $self->{out_of_focus};
301 } else {
302 glColor 0.4, 0.2, 0.2, 0.6;
303 glEnable GL_BLEND; 567 glEnable GL_BLEND;
304 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 568 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
305 glBegin GL_QUADS; 569 glBegin GL_QUADS;
306 glVertex 0, 0; 570 glVertex 0, 0;
307 glVertex 0, $::HEIGHT; 571 glVertex 0, $::HEIGHT;
308 glVertex $::WIDTH, $::HEIGHT; 572 glVertex $::WIDTH, $::HEIGHT;
309 glVertex $::WIDTH, 0; 573 glVertex $::WIDTH, 0;
310 glEnd; 574 glEnd;
311 glDisable GL_BLEND; 575 glDisable GL_BLEND;
312
313# $self->{out_of_focus} ||= do {
314# my $label = new CFClient::UI::Label
315# x => 0,
316# y => 0,
317# z => 1,
318# ellipsise => 0,
319# text => "map out of focus (click map to play)";
320#
321# $label->show;
322# $label->update;
323#
324# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
325# $label->move_abs (
326# ($::WIDTH - $label->{w}) * 0.5,
327# ($::HEIGHT - $label->{h}) * 0.5,
328# );
329# });
330#
331# $label
332# };
333 } 576 }
334} 577}
335 578
336sub DESTROY { 579sub DESTROY {
337 my $self = shift; 580 my $self = shift;
… …
339 glDeleteList $self->{list}; 582 glDeleteList $self->{list};
340 583
341 $self->SUPER::DESTROY; 584 $self->SUPER::DESTROY;
342} 585}
343 586
344package CFClient::MapWidget::MapMap; 587package DC::MapWidget::MapMap;
345 588
589use strict;
590use utf8;
591
346our @ISA = CFClient::UI::Base::; 592our @ISA = DC::UI::Base::;
347 593
348use Time::HiRes qw(time); 594use Time::HiRes qw(time);
349use CFClient::OpenGL; 595use DC::OpenGL;
350 596
351sub size_request { 597sub size_request {
352 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 598 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
353} 599}
354 600
601sub refresh_hook {
602 my ($self) = @_;
603
604 if ($::MAP && $self->{texture_atime} < time) {
605 my ($w, $h) = @$self{qw(w h)};
606
607 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
608 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
609
610 my $ox = 0.5 * ($w - $sw);
611 my $oy = 0.5 * ($h - $sh);
612
613 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
614 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
615
616 #TODO: map scale is completely borked
617
618 my $x0 = int $ox - $sx + 0.5;
619 my $y0 = int $oy - $sy + 0.5;
620
621 $self->{sw} = $sw;
622 $self->{sh} = $sh;
623
624 $self->{x0} = $x0;
625 $self->{y0} = $y0;
626
627 $self->{texture_atime} = time + 1/3;
628
629 $self->{texture} =
630 new DC::Texture
631 w => $w,
632 h => $h,
633 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
634 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
635 }
636}
637
638sub invoke_visibility_change {
639 my ($self) = @_;
640
641 $self->refresh_hook;
642
643 0
644}
645
355sub size_allocate { 646sub invoke_size_allocate {
356 my ($self, $w, $h) = @_; 647 my ($self, $w, $h) = @_;
357 648
358 $self->SUPER::size_allocate ($w, $h);
359 $self->update; 649 $self->update;
650
651 1
360} 652}
361 653
362sub update { 654sub update {
363 my ($self) = @_; 655 my ($self) = @_;
364 656
… …
367} 659}
368 660
369sub _draw { 661sub _draw {
370 my ($self) = @_; 662 my ($self) = @_;
371 663
372 $::MAP or return; 664 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
373 665
374 my ($w, $h) = @$self{qw(w h)}; 666 $self->{texture} or return;
375
376 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
377 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
378
379 my $sx = int $::CFG->{map_shift_x} / 32;
380 my $sy = int $::CFG->{map_shift_y} / 32;
381
382 my $ox = 0.5 * ($w - $sw);
383 my $oy = 0.5 * ($h - $sh);
384 667
385 glEnable GL_BLEND; 668 glEnable GL_BLEND;
386 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 669 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
387 glEnable GL_TEXTURE_2D; 670 glEnable GL_TEXTURE_2D;
388 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
389 672
390 if ($self->{texture_atime} < time) {
391 $self->{texture_atime} = time + 1/3;
392
393 $self->{texture} =
394 new CFClient::Texture
395 w => $w,
396 h => $h,
397 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
398 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
399 }
400
401 $self->{texture}->draw_quad (0, 0); 673 $self->{texture}->draw_quad (0, 0);
402 674
403 glDisable GL_TEXTURE_2D; 675 glDisable GL_TEXTURE_2D;
404 676
405 glTranslate 0.375, 0.375; 677 glTranslate 0.375, 0.375;
406
407 #TODO: map scale is completely borked
408
409 my $x0 = int $ox - $sx + 0.5;
410 my $y0 = int $oy - $sy + 0.5;
411 678
412 glColor 1, 1, 0, 1; 679 glColor 1, 1, 0, 1;
413 glBegin GL_LINE_LOOP; 680 glBegin GL_LINE_LOOP;
414 glVertex $x0 , $y0 ; 681 glVertex $self->{x0} , $self->{y0} ;
415 glVertex $x0 , $y0 + $sh; 682 glVertex $self->{x0} , $self->{y0} + $self->{sh};
416 glVertex $x0 + $sw, $y0 + $sh; 683 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
417 glVertex $x0 + $sw, $y0 ; 684 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
418 glEnd; 685 glEnd;
419 686
420 glDisable GL_BLEND; 687 glDisable GL_BLEND;
421} 688}
422 689
423package CFClient::MapWidget::Command; 690package DC::MapWidget::Command;
424 691
425use strict; 692use strict;
426 693
427use CFClient::OpenGL; 694use DC::OpenGL;
428 695
429our @ISA = CFClient::UI::Frame::; 696our @ISA = DC::UI::Frame::;
430 697
431sub new { 698sub new {
432 my $class = shift; 699 my $class = shift;
433 700
434 my $self = $class->SUPER::new ( 701 my $self = $class->SUPER::new (
435 bg => [0, 0, 0, 0.8], 702 bg => [0, 0, 0, 0.8],
436 @_, 703 @_,
437 ); 704 );
438 705
439 $self->add ($self->{vbox} = new CFClient::UI::VBox); 706 $self->add ($self->{vbox} = new DC::UI::VBox);
440 707
441 $self->{label} = [ 708 $self->{label} = [
442 map 709 map
443 CFClient::UI::Label->new ( 710 DC::UI::Label->new (
711 align => 0,
444 can_hover => 1, 712 can_hover => 1,
445 can_events => 1, 713 can_events => 1,
446 tooltip_width => 0.33, 714 tooltip_width => 0.33,
447 fontsize => $_, 715 fontsize => $_,
448 ), (0.8) x 16 716 ), (0.8) x 16
449 ]; 717 ];
450 718
451 $self->{entry} = new CFClient::UI::Entry 719 $self->{entry} = new DC::UI::Entry
452 on_changed => sub { 720 on_changed => sub {
453 $self->update_labels; 721 $self->update_labels;
722 0
723 },
724 on_button_down => sub {
725 my ($entry, $ev, $x, $y) = @_;
726
727 if ($ev->{button} == 3) {
728 (new DC::UI::Menu
729 items => [
730 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
731 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
732 ],
733 )->popup ($ev);
734 return 1;
735 }
736 0
454 }, 737 },
455 on_key_down => sub { 738 on_key_down => sub {
456 my ($entry, $ev) = @_; 739 my ($entry, $ev) = @_;
457 740
458 my $self = $entry->{parent}{parent}; 741 my $self = $entry->{parent}{parent};
459 742
460 if ($ev->{sym} == 13) { 743 if ($ev->{sym} == 13) {
461 if (exists $self->{select}) { 744 if (exists $self->{select}) {
462 $self->{last_command} = $self->{select}; 745 $self->{last_command} = $self->{select};
463 $::CONN->user_send ($self->{select}); 746 $::CONN->user_send ($self->{select});
747
748 unshift @{$self->{history}}, $self->{entry}->get_text;
749 $self->{hist_ptr} = 0;
750
464 $self->hide; 751 $self->hide;
465 } 752 }
466 } elsif ($ev->{sym} == 27) { 753 } elsif ($ev->{sym} == 27) {
754 $self->{hist_ptr} = 0;
467 $self->hide; 755 $self->hide;
468 return;
469 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 756 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
757 if ($self->{hist_ptr} > 1) {
758 $self->{hist_ptr}--;
759 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
760 } elsif ($self->{hist_ptr} > 0) {
761 $self->{hist_ptr}--;
762 $self->{entry}->set_text ($self->{hist_saveback});
763 } else {
470 ++$self->{select_offset} 764 ++$self->{select_offset}
471 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 765 if $self->{select_offset} < $#{ $self->{last_match} || [] };
766 }
472 $self->update_labels; 767 $self->update_labels;
473 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 768 } elsif ($ev->{sym} == DC::SDLK_UP) {
769 if ($self->{select_offset}) {
474 --$self->{select_offset} 770 --$self->{select_offset}
771 } else {
772 unless ($self->{hist_ptr}) {
773 $self->{hist_saveback} = $self->{entry}->get_text;
774 }
775 if ($self->{hist_ptr} <= $#{$self->{history}}) {
475 if $self->{select_offset}; 776 $self->{hist_ptr}++;
777 }
778 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
779 if exists $self->{history}->[$self->{hist_ptr} - 1];
780 }
476 $self->update_labels; 781 $self->update_labels;
477 } else { 782 } else {
478 return 0; 783 return 0;
479 } 784 }
480 785
… …
495 800
496 $self->{entry}->set_text ($prefix); 801 $self->{entry}->set_text ($prefix);
497 $self->show; 802 $self->show;
498} 803}
499 804
500sub size_allocate { 805sub invoke_size_allocate {
501 my ($self, $w, $h) = @_; 806 my ($self, $w, $h) = @_;
502 807
503 $self->SUPER::size_allocate ($w, $h);
504 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 808 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
809
810 $self->SUPER::invoke_size_allocate ($w, $h)
505} 811}
506 812
507sub show { 813sub show {
508 my ($self) = @_; 814 my ($self) = @_;
509 815
510 $self->SUPER::show; 816 $self->SUPER::show;
511 $self->{entry}->focus_in; 817 $self->{entry}->grab_focus;
512} 818}
513 819
514sub hide { 820sub hide {
515 my ($self) = @_; 821 my ($self) = @_;
822
823 $self->{hist_ptr} = 0;
516 824
517 $self->SUPER::hide; 825 $self->SUPER::hide;
518 $self->{entry}->set_text (""); 826 $self->{entry}->set_text ("");
519} 827}
520 828
521sub key_down { 829sub inject_key_down {
522 my ($self, $ev) = @_; 830 my ($self, $ev) = @_;
523 831
832 $self->{entry}->grab_focus;
524 $self->{entry}->key_down ($ev) 833 $self->{entry}->emit (key_down => $ev);
525} 834}
526 835
527sub update_labels { 836sub update_labels {
528 my ($self) = @_; 837 my ($self) = @_;
529 838
… …
616 $label->set_text (""); 925 $label->set_text ("");
617 $label->set_tooltip (""); 926 $label->set_tooltip ("");
618 } 927 }
619 928
620 $self->update; 929 $self->update;
621 ###
622} 930}
623 931
624sub _draw { 932sub _draw {
625 my ($self) = @_; 933 my ($self) = @_;
626 934
627 # hack 935 # hack
628 local $CFClient::UI::FOCUS = $self->{entry}; 936 local $DC::UI::FOCUS = $self->{entry};
629 937
630 $self->SUPER::_draw; 938 $self->SUPER::_draw;
631} 939}
632 940
6331 9411
942

Diff Legend

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