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.65 by root, Sun Jun 18 17:39:36 2006 UTC vs.
Revision 1.111 by root, Thu Jul 19 14:54:50 2007 UTC

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

Diff Legend

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