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.56 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.117 by root, Fri Aug 10 04:02:13 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 tilesize => 32,
19
20 smooth_matrix => [
21 0.05, 0.13, 0.05,
22 0.13, 0.30, 0.13,
23 0.05, 0.13, 0.05,
24 ],
25
26 @_ 26 @_
27 ); 27 );
28 28
29 $self->{completer} = new CFClient::MapWidget::Command:: 29 $self->{completer} = new CFPlus::MapWidget::Command::
30 command => $self->{command}, 30 command => $self->{command},
31 can_focus => 1, 31 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 ; 32 ;
41 33
42 $self 34 $self
35}
36
37sub set_tilesize {
38 my ($self, $tilesize) = @_;
39
40 $self->{tilesize} = $tilesize;
43} 41}
44 42
45sub add_command { 43sub add_command {
46 my ($self, $command, $tooltip, $widget, $cb) = @_; 44 my ($self, $command, $tooltip, $widget, $cb) = @_;
47 45
… …
56 54
57sub clr_commands { 55sub clr_commands {
58 my ($self) = @_; 56 my ($self) = @_;
59 57
60 %{$self->{completer}{command}} = (); 58 %{$self->{completer}{command}} = ();
61}
62 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 }
172}
173
63sub button_down { 174sub invoke_button_down {
64 my ($self, $ev, $x, $y) = @_; 175 my ($self, $ev, $x, $y) = @_;
65 176
66 $self->focus_in;
67
68 if ($ev->{button} == 1) { 177 if ($ev->{button} == 1) {
69 my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}); 178 $self->grab_focus;
70 my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}); 179 return unless $::CONN;
180
181 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
182 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
183
184 $x -= CFPlus::floor $::MAP->w * 0.5;
185 $y -= CFPlus::floor $::MAP->h * 0.5;
186
187 if ($::CONN) {
188 $::CONN->lookat ($x, $y)
189 }
190
191 } elsif ($ev->{button} == 2) {
192 $self->grab_focus;
193 return unless $::CONN;
71 194
72 $x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
73 $y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
74
75 $x -= int 0.5 * $::MAP->w;
76 $y -= int 0.5 * $::MAP->h;
77
78 $x += 1;
79 $y += 1;
80
81 $::CONN->lookat ($x, $y)
82 if $::CONN;
83
84 } elsif ($ev->{button} == 2) {
85 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 195 my ($ox, $oy) = ($ev->{x}, $ev->{y});
86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 196 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87 197
88 $self->{motion} = sub { 198 $self->{motion} = sub {
89 my ($ev, $x, $y) = @_; 199 my ($ev, $x, $y) = @_;
… …
93 $::CFG->{map_shift_x} = $bw + $x - $ox; 203 $::CFG->{map_shift_x} = $bw + $x - $ox;
94 $::CFG->{map_shift_y} = $bh + $y - $oy; 204 $::CFG->{map_shift_y} = $bh + $y - $oy;
95 205
96 $self->update; 206 $self->update;
97 }; 207 };
208 } elsif ($ev->{button} == 3) {
209 my @items = (
210 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
211 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
212 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
213 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
214 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
215 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
216 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
217 [
218 $::PICKUP_ENABLE->{state}
219 ? "Disable automatic pickup"
220 : "Enable automatic pickup",
221 sub { $::PICKUP_ENABLE->toggle }
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 }
253 ],
254 ;
255
256 (new CFPlus::UI::Menu
257 items => \@items,
258 )->popup ($ev);
98 } 259 }
99 260
100 1 261 1
101} 262}
102 263
103sub button_up { 264sub invoke_button_up {
104 my ($self, $ev, $x, $y) = @_; 265 my ($self, $ev, $x, $y) = @_;
105 266
106 delete $self->{motion}; 267 delete $self->{motion};
107 268
108 1 269 1
109} 270}
110 271
111sub mouse_motion { 272sub invoke_mouse_motion {
112 my ($self, $ev, $x, $y) = @_; 273 my ($self, $ev, $x, $y) = @_;
113 274
114 if ($self->{motion}) { 275 if ($self->{motion}) {
115 $self->{motion}->($ev, $x, $y); 276 $self->{motion}->($ev, $x, $y);
116 } else { 277 } else {
… …
119 280
120 1 281 1
121} 282}
122 283
123sub size_request { 284sub size_request {
285 my ($self) = @_;
286
124 ( 287 (
125 1 + 32 * int $::WIDTH / 32, 288 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
126 1 + 32 * int $::HEIGHT / 32, 289 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
127 ) 290 )
128} 291}
129 292
130sub update { 293sub update {
131 my ($self) = @_; 294 my ($self) = @_;
… …
133 $self->{need_update} = 1; 296 $self->{need_update} = 1;
134 $self->SUPER::update; 297 $self->SUPER::update;
135} 298}
136 299
137my %DIR = ( 300my %DIR = (
301 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
138 CFClient::SDLK_KP8, [1, "north"], 302 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
139 CFClient::SDLK_KP9, [2, "northeast"], 303 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
140 CFClient::SDLK_KP6, [3, "east"], 304 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
141 CFClient::SDLK_KP3, [4, "southeast"], 305 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
142 CFClient::SDLK_KP2, [5, "south"], 306 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
143 CFClient::SDLK_KP1, [6, "southwest"], 307 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
144 CFClient::SDLK_KP4, [7, "west"], 308 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
145 CFClient::SDLK_KP7, [8, "northwest"], 309 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
146 310
147 CFClient::SDLK_UP, [1, "north"], 311 ( "," . CFPlus::SDLK_UP ), [1, "north"],
312 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
148 CFClient::SDLK_RIGHT, [3, "east"], 313 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
314 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
149 CFClient::SDLK_DOWN, [5, "south"], 315 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
316 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
150 CFClient::SDLK_LEFT, [7, "west"], 317 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
318 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
151); 319);
152 320
153sub key_down { 321sub invoke_key_down {
154 my ($self, $ev) = @_; 322 my ($self, $ev) = @_;
155
156 return 0 unless $::CONN;
157 323
158 my $mod = $ev->{mod}; 324 my $mod = $ev->{mod};
159 my $sym = $ev->{sym}; 325 my $sym = $ev->{sym};
160 my $uni = $ev->{unicode}; 326 my $uni = $ev->{unicode};
161 327
162 if ($sym == CFClient::SDLK_KP5) { 328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
163 $::CONN->user_send ("stay fire"); 329
330 if ($sym == 9) {
331 ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
333 $::HELP_WINDOW->toggle_visibility;
334 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
335 ::toggle_player_page ($::STATS_PAGE);
336 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
337 ::toggle_player_page ($::SKILL_PAGE);
338 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
339 ::toggle_player_page ($::SPELL_PAGE);
340 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
341 ::toggle_player_page ($::INVENTORY_PAGE);
342 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
343 $::SETUP_DIALOG->toggle_visibility;
344 } elsif (!$::CONN) {
345 return 0; # bindings further down need a valid connection
346
164 } elsif ($uni == ord ",") { 347 } elsif ($uni == ord ",") {
165 $::CONN->user_send ("take"); 348 $::CONN->user_send ("take");
166 } elsif ($uni == ord " ") { 349 } elsif ($uni == ord " ") {
167 $::CONN->user_send ("apply"); 350 $::CONN->user_send ("apply");
351 } elsif ($uni == 13) {
352 $::CONN->user_send ("examine");
168 } elsif ($uni == ord ".") { 353 } elsif ($uni == ord ".") {
169 $::CONN->user_send ($self->{completer}{last_command}) 354 $::CONN->user_send ($self->{completer}{last_command})
170 if exists $self->{completer}{last_command}; 355 if exists $self->{completer}{last_command};
171 } elsif ($uni == ord "\t") { 356 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
172 $::INV_WINDOW->toggle_visibility; 357 $::CONN->macro_send ($_) for @macros;
173 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 358 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
174 $::CONN->user_send ("rotateshoottype +"); 359 $::CONN->user_send ("rotateshoottype +");
175 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 360 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
176 $::CONN->user_send ("rotateshoottype -"); 361 $::CONN->user_send ("rotateshoottype -");
362 } elsif ($uni == ord '!') {
363 $self->{completer}->set_prefix ("shout ");
364 $self->{completer}->show;
177 } elsif ($uni == ord '"') { 365 } elsif ($uni == ord '"') {
178 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 366 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
179 $self->{completer}->show; 367 $self->{completer}->show;
180 } elsif ($uni == ord "'") { 368 } elsif ($uni == ord "'") {
181 $self->{completer}->set_prefix (""); 369 $self->{completer}->set_prefix ("");
182 $self->{completer}->show; 370 $self->{completer}->show;
183 } elsif (exists $DIR{$sym}) { 371 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
184 if ($mod & CFClient::KMOD_SHIFT) { 372 if ($mod & CFPlus::KMOD_SHIFT) {
185 $self->{shft}++; 373 $self->{shft}++;
374 if ($dir->[0] != $self->{fire_dir}) {
186 $::CONN->user_send ("fire $DIR{$sym}[0]"); 375 $::CONN->user_send ("fire $dir->[0]");
376 }
377 $self->{fire_dir} = $DIR{$sym}[0];
187 } elsif ($mod & CFClient::KMOD_CTRL) { 378 } elsif ($mod & CFPlus::KMOD_CTRL) {
188 $self->{ctrl}++; 379 $self->{ctrl}++;
189 $::CONN->user_send ("run $DIR{$sym}[0]"); 380 $::CONN->user_send ("run $dir->[0]");
190 } else { 381 } else {
191 $::CONN->user_send ("$DIR{$sym}[1]"); 382 $::CONN->user_send ("$dir->[1]");
192 } 383 }
193 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
194 $::BIND_EDITOR->set_binding (undef, undef, [],
195 sub {
196 my ($mod, $sym, $cmds) = @_;
197 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
198 });
199 $::BIND_EDITOR->start;
200 $::BIND_EDITOR->show;
201 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
202 $::BIND_EDITOR->stop;
203 $::BIND_EDITOR->ask_for_bind_and_commit;
204 $::BIND_EDITOR->hide;
205 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
206 $::CONN->user_send ($_) for @$bind_cmd;
207 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 384 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
208 $self->{completer}->key_down ($ev); 385 $self->{completer}->inject_key_down ($ev);
209 $self->{completer}->show; 386 $self->{completer}->show;
210 } else { 387 } else {
211 return 0; 388 return 0;
212 } 389 }
213 390
214 1 391 1
215} 392}
216 393
217sub key_up { 394sub invoke_key_up {
218 my ($self, $ev) = @_; 395 my ($self, $ev) = @_;
219 396
220 my $res = 0; 397 my $res = 0;
221 my $mod = $ev->{mod}; 398 my $mod = $ev->{mod};
222 my $sym = $ev->{sym}; 399 my $sym = $ev->{sym};
223 400
401 if ($::CFG->{shift_fire_stop}) {
224 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 402 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
225 $::CONN->user_send ("fire_stop"); 403 $::CONN->user_send ("fire_stop");
404 delete $self->{fire_dir};
226 $res = 1; 405 $res = 1;
406 }
407 } else {
408 if (exists $DIR{$sym} && delete $self->{shft}) {
409 $::CONN->user_send ("fire_stop");
410 delete $self->{fire_dir};
411 $res = 1;
412 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
413 $::CONN->user_send ("fire_stop");
414 delete $self->{fire_dir};
415 $res = 1;
416 }
227 } 417 }
228 418
229 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 419 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
230 $::CONN->user_send ("run_stop"); 420 $::CONN->user_send ("run_stop");
231 $res = 1; 421 $res = 1;
232 } 422 }
233 423
234 $res 424 $res
235} 425}
236 426
237sub draw { 427sub invoke_visibility_change {
238 my ($self) = @_; 428 my ($self) = @_;
239 429
240 my $focused = $CFClient::UI::FOCUS == $self 430 $self->refresh_hook;
241 || $CFClient::UI::FOCUS == $self->{completer}{entry};
242 431
243 return 432 0
244 unless $focused || !$::FAST; 433}
245 434
435sub set_magicmap {
436 my ($self, $w, $h, $x, $y, $data) = @_;
437
438 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
439 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
440
441 $self->{magicmap} = [$x, $y, $w, $h, $data];
442
443 $self->update;
444}
445
446sub refresh_hook {
447 my ($self) = @_;
448
449 if ($::MAP && $::CONN) {
246 if (delete $self->{need_update}) { 450 if (delete $self->{need_update}) {
247 glNewList $self->{list}; 451 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
248 452
249 if ($::MAP) { 453 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
250 my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 454 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
251 my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
252 455
253 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; 456 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
254 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; 457 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
255 my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;
256 my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
257 458
258 glPushMatrix; 459 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
259 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 460 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
260 461
261 glTranslate $sx0, $sy0; 462 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
262 463 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
263 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
264 464
265 if ($::CFG->{fow_enable}) { 465 if ($::CFG->{fow_enable}) {
266 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 466 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
267 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
268 glConvolutionFilter2D (
269 GL_CONVOLUTION_2D,
270 GL_ALPHA,
271 3, 3,
272 GL_ALPHA, GL_FLOAT,
273 (pack "f*", @{ $self->{smooth_matrix} }),
274 );
275 glEnable GL_CONVOLUTION_2D;
276 }
277 467
278 $self->{fow_texture_name} ||= glGenTexture;
279 # try to re-use the texture name: TODO improve texture class instead
280
281 $self->{fow_texture} = new CFClient::Texture 468 $self->{fow_texture} = new CFPlus::Texture
282 w => $w, 469 w => $w,
283 h => $h, 470 h => $h,
284 data => $data, 471 data => $data,
285 name => $self->{fow_texture_name},
286 internalformat => GL_ALPHA, 472 internalformat => GL_ALPHA,
287 format => GL_ALPHA; 473 format => GL_ALPHA;
474 } else {
475 delete $self->{fow_texture};
476 }
288 477
289 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 478 glNewList ($self->{list} ||= glGenList);
290 479
480 glPushMatrix;
481 glTranslate $sx0, $sy0;
482 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
483
484 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
485
486 glScale $self->{tilesize}, $self->{tilesize};
487
488 if (my $tex = $self->{fow_texture}) {
489 glPushMatrix;
490 glScale 1/3, 1/3;
291 glEnable GL_TEXTURE_2D; 491 glEnable GL_TEXTURE_2D;
292 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
293 493
294 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 494 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
295 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 495 $self->{fow_texture}->draw_quad_alpha (0, 0);
296 496
297 glDisable GL_TEXTURE_2D; 497 glDisable GL_TEXTURE_2D;
498 glPopMatrix;
298 } 499 }
299 500
501 if ($self->{magicmap}) {
502 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
503
504 $x += $::MAP->ox + $self->{dx};
505 $y += $::MAP->oy + $self->{dy};
506
507 glTranslate - $x - 1, - $y - 1;
508 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
509 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
510 }
511
300 glPopMatrix; 512 glPopMatrix;
301 }
302
303 glEndList; 513 glEndList;
514 }
515 } else {
516 glDeleteList delete $self->{list}
517 if $self->{list};
304 } 518 }
519}
305 520
306 glPushMatrix; 521sub draw {
522 my ($self) = @_;
523
524 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
525
526 return unless $self->{list};
527
528 my $focused = $CFPlus::UI::FOCUS == $self
529 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
530
531 return
532 unless $focused || !$::FAST;
533
307 glCallList $self->{list}; 534 glCallList $self->{list};
308 glPopMatrix;
309 535
310 # TNT2 emulates logops in software (or worse :) 536 # TNT2 emulates logops in software (or worse :)
311 if ($focused) { 537 unless ($focused) {
312 (delete $self->{out_of_focus})->destroy
313 if $self->{out_of_focus};
314 } else {
315 glColor 0.4, 0.2, 0.2, 0.6; 538 glColor 0.4, 0.2, 0.2, 0.6;
316 glEnable GL_BLEND; 539 glEnable GL_BLEND;
317 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 540 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
318 glBegin GL_QUADS; 541 glBegin GL_QUADS;
319 glVertex 0, 0; 542 glVertex 0, 0;
320 glVertex 0, $::HEIGHT; 543 glVertex 0, $::HEIGHT;
321 glVertex $::WIDTH, $::HEIGHT; 544 glVertex $::WIDTH, $::HEIGHT;
322 glVertex $::WIDTH, 0; 545 glVertex $::WIDTH, 0;
323 glEnd; 546 glEnd;
324 glDisable GL_BLEND; 547 glDisable GL_BLEND;
325
326# $self->{out_of_focus} ||= do {
327# my $label = new CFClient::UI::Label
328# x => 0,
329# y => 0,
330# z => 1,
331# ellipsise => 0,
332# text => "map out of focus (click map to play)";
333#
334# $label->show;
335# $label->update;
336#
337# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
338# $label->move_abs (
339# ($::WIDTH - $label->{w}) * 0.5,
340# ($::HEIGHT - $label->{h}) * 0.5,
341# );
342# });
343#
344# $label
345# };
346 } 548 }
347} 549}
348 550
349sub DESTROY { 551sub DESTROY {
350 my $self = shift; 552 my $self = shift;
… …
352 glDeleteList $self->{list}; 554 glDeleteList $self->{list};
353 555
354 $self->SUPER::DESTROY; 556 $self->SUPER::DESTROY;
355} 557}
356 558
357package CFClient::MapWidget::MapMap; 559package CFPlus::MapWidget::MapMap;
358 560
561use strict;
562use utf8;
563
359our @ISA = CFClient::UI::Base::; 564our @ISA = CFPlus::UI::Base::;
360 565
361use Time::HiRes qw(time); 566use Time::HiRes qw(time);
362use CFClient::OpenGL; 567use CFPlus::OpenGL;
363 568
364sub size_request { 569sub size_request {
365 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 570 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
366} 571}
367 572
573sub refresh_hook {
574 my ($self) = @_;
575
576 if ($::MAP && $self->{texture_atime} < time) {
577 my ($w, $h) = @$self{qw(w h)};
578
579 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
580 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
581
582 my $ox = 0.5 * ($w - $sw);
583 my $oy = 0.5 * ($h - $sh);
584
585 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
586 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
587
588 #TODO: map scale is completely borked
589
590 my $x0 = int $ox - $sx + 0.5;
591 my $y0 = int $oy - $sy + 0.5;
592
593 $self->{sw} = $sw;
594 $self->{sh} = $sh;
595
596 $self->{x0} = $x0;
597 $self->{y0} = $y0;
598
599 $self->{texture_atime} = time + 1/3;
600
601 $self->{texture} =
602 new CFPlus::Texture
603 w => $w,
604 h => $h,
605 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
606 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
607 }
608}
609
610sub invoke_visibility_change {
611 my ($self) = @_;
612
613 $self->refresh_hook;
614
615 0
616}
617
368sub size_allocate { 618sub invoke_size_allocate {
369 my ($self, $w, $h) = @_; 619 my ($self, $w, $h) = @_;
370 620
371 $self->SUPER::size_allocate ($w, $h);
372 $self->update; 621 $self->update;
622
623 1
373} 624}
374 625
375sub update { 626sub update {
376 my ($self) = @_; 627 my ($self) = @_;
377 628
… …
380} 631}
381 632
382sub _draw { 633sub _draw {
383 my ($self) = @_; 634 my ($self) = @_;
384 635
385 $::MAP or return; 636 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
386 637
387 my ($w, $h) = @$self{qw(w h)}; 638 $self->{texture} or return;
388
389 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
390 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
391
392 my $sx = int $::CFG->{map_shift_x} / 32;
393 my $sy = int $::CFG->{map_shift_y} / 32;
394
395 my $ox = 0.5 * ($w - $sw);
396 my $oy = 0.5 * ($h - $sh);
397 639
398 glEnable GL_BLEND; 640 glEnable GL_BLEND;
399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
400 glEnable GL_TEXTURE_2D; 642 glEnable GL_TEXTURE_2D;
401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
402 644
403 if ($self->{texture_atime} < time) {
404 $self->{texture_atime} = time + 1/3;
405
406 $self->{texture} =
407 new CFClient::Texture
408 w => $w,
409 h => $h,
410 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
411 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
412 }
413
414 $self->{texture}->draw_quad (0, 0); 645 $self->{texture}->draw_quad (0, 0);
415 646
416 glDisable GL_TEXTURE_2D; 647 glDisable GL_TEXTURE_2D;
417 648
418 glTranslate 0.375, 0.375; 649 glTranslate 0.375, 0.375;
419
420 #TODO: map scale is completely borked
421
422 my $x0 = int $ox - $sx + 0.5;
423 my $y0 = int $oy - $sy + 0.5;
424 650
425 glColor 1, 1, 0, 1; 651 glColor 1, 1, 0, 1;
426 glBegin GL_LINE_LOOP; 652 glBegin GL_LINE_LOOP;
427 glVertex $x0 , $y0 ; 653 glVertex $self->{x0} , $self->{y0} ;
428 glVertex $x0 , $y0 + $sh; 654 glVertex $self->{x0} , $self->{y0} + $self->{sh};
429 glVertex $x0 + $sw, $y0 + $sh; 655 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
430 glVertex $x0 + $sw, $y0 ; 656 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
431 glEnd; 657 glEnd;
432 658
433 glDisable GL_BLEND; 659 glDisable GL_BLEND;
434} 660}
435 661
436package CFClient::MapWidget::Command; 662package CFPlus::MapWidget::Command;
437 663
438use strict; 664use strict;
439 665
440use CFClient::OpenGL; 666use CFPlus::OpenGL;
441 667
442our @ISA = CFClient::UI::Frame::; 668our @ISA = CFPlus::UI::Frame::;
443 669
444sub new { 670sub new {
445 my $class = shift; 671 my $class = shift;
446 672
447 my $self = $class->SUPER::new ( 673 my $self = $class->SUPER::new (
448 bg => [0, 0, 0, 0.8], 674 bg => [0, 0, 0, 0.8],
449 @_, 675 @_,
450 ); 676 );
451 677
452 $self->add ($self->{vbox} = new CFClient::UI::VBox); 678 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
453 679
454 $self->{label} = [ 680 $self->{label} = [
455 map 681 map
456 CFClient::UI::Label->new ( 682 CFPlus::UI::Label->new (
457 can_hover => 1, 683 can_hover => 1,
458 can_events => 1, 684 can_events => 1,
459 tooltip_width => 0.33, 685 tooltip_width => 0.33,
460 fontsize => $_, 686 fontsize => $_,
461 ), (0.8) x 16 687 ), (0.8) x 16
462 ]; 688 ];
463 689
464 $self->{entry} = new CFClient::UI::Entry 690 $self->{entry} = new CFPlus::UI::Entry
465 on_changed => sub { 691 on_changed => sub {
466 $self->update_labels; 692 $self->update_labels;
693 0
694 },
695 on_button_down => sub {
696 my ($entry, $ev, $x, $y) = @_;
697
698 if ($ev->{button} == 3) {
699 (new CFPlus::UI::Menu
700 items => [
701 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
702 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
703 ],
704 )->popup ($ev);
705 return 1;
706 }
707 0
467 }, 708 },
468 on_key_down => sub { 709 on_key_down => sub {
469 my ($entry, $ev) = @_; 710 my ($entry, $ev) = @_;
470 711
471 my $self = $entry->{parent}{parent}; 712 my $self = $entry->{parent}{parent};
… …
473 if ($ev->{sym} == 13) { 714 if ($ev->{sym} == 13) {
474 if (exists $self->{select}) { 715 if (exists $self->{select}) {
475 $self->{last_command} = $self->{select}; 716 $self->{last_command} = $self->{select};
476 $::CONN->user_send ($self->{select}); 717 $::CONN->user_send ($self->{select});
477 718
478 unshift @{$self->{history}}, $self->{select}; 719 unshift @{$self->{history}}, $self->{entry}->get_text;
479 $self->{hist_ptr} = 0; 720 $self->{hist_ptr} = 0;
480 721
481 $self->hide; 722 $self->hide;
482 } 723 }
483 } elsif ($ev->{sym} == 27) { 724 } elsif ($ev->{sym} == 27) {
484 $self->{hist_ptr} = 0; 725 $self->{hist_ptr} = 0;
485 $self->hide; 726 $self->hide;
486 return;
487 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 727 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
488 if ($self->{hist_ptr} > 1) { 728 if ($self->{hist_ptr} > 1) {
489 $self->{hist_ptr}--; 729 $self->{hist_ptr}--;
490 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 730 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
491 } elsif ($self->{hist_ptr} > 0) { 731 } elsif ($self->{hist_ptr} > 0) {
492 $self->{hist_ptr}--; 732 $self->{hist_ptr}--;
… …
494 } else { 734 } else {
495 ++$self->{select_offset} 735 ++$self->{select_offset}
496 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 736 if $self->{select_offset} < $#{ $self->{last_match} || [] };
497 } 737 }
498 $self->update_labels; 738 $self->update_labels;
499 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 739 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
500 if ($self->{select_offset}) { 740 if ($self->{select_offset}) {
501 --$self->{select_offset} 741 --$self->{select_offset}
502 } else { 742 } else {
503 unless ($self->{hist_ptr}) { 743 unless ($self->{hist_ptr}) {
504 $self->{hist_saveback} = $self->{entry}->get_text; 744 $self->{hist_saveback} = $self->{entry}->get_text;
… …
531 771
532 $self->{entry}->set_text ($prefix); 772 $self->{entry}->set_text ($prefix);
533 $self->show; 773 $self->show;
534} 774}
535 775
536sub size_allocate { 776sub invoke_size_allocate {
537 my ($self, $w, $h) = @_; 777 my ($self, $w, $h) = @_;
538 778
539 $self->SUPER::size_allocate ($w, $h);
540 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 779 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
780
781 $self->SUPER::invoke_size_allocate ($w, $h)
541} 782}
542 783
543sub show { 784sub show {
544 my ($self) = @_; 785 my ($self) = @_;
545 786
546 $self->SUPER::show; 787 $self->SUPER::show;
547 $self->{entry}->focus_in; 788 $self->{entry}->grab_focus;
548} 789}
549 790
550sub hide { 791sub hide {
551 my ($self) = @_; 792 my ($self) = @_;
793
794 $self->{hist_ptr} = 0;
552 795
553 $self->SUPER::hide; 796 $self->SUPER::hide;
554 $self->{entry}->set_text (""); 797 $self->{entry}->set_text ("");
555} 798}
556 799
557sub key_down { 800sub inject_key_down {
558 my ($self, $ev) = @_; 801 my ($self, $ev) = @_;
559 802
803 $self->{entry}->grab_focus;
560 $self->{entry}->key_down ($ev) 804 $self->{entry}->emit (key_down => $ev);
561} 805}
562 806
563sub update_labels { 807sub update_labels {
564 my ($self) = @_; 808 my ($self) = @_;
565 809
… …
652 $label->set_text (""); 896 $label->set_text ("");
653 $label->set_tooltip (""); 897 $label->set_tooltip ("");
654 } 898 }
655 899
656 $self->update; 900 $self->update;
657 ###
658} 901}
659 902
660sub _draw { 903sub _draw {
661 my ($self) = @_; 904 my ($self) = @_;
662 905
663 # hack 906 # hack
664 local $CFClient::UI::FOCUS = $self->{entry}; 907 local $CFPlus::UI::FOCUS = $self->{entry};
665 908
666 $self->SUPER::_draw; 909 $self->SUPER::_draw;
667} 910}
668 911
6691 9121
913

Diff Legend

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