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.50 by root, Sat Jun 3 23:47:47 2006 UTC vs.
Revision 1.99 by root, Sat Dec 23 08:07:56 2006 UTC

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

Diff Legend

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