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

Diff Legend

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