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

Diff Legend

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