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

Diff Legend

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