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.37 by root, Thu May 25 01:26:53 2006 UTC vs.
Revision 1.107 by root, Sat Apr 14 06:51:45 2007 UTC

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

Diff Legend

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