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

Diff Legend

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