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

Diff Legend

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