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.36 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.100 by pippijn, Tue Jan 2 14:45:22 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
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 ; 39 ;
26 40
27 $self 41 $self
28} 42}
29 43
… …
31 my ($self, $command, $tooltip, $widget, $cb) = @_; 45 my ($self, $command, $tooltip, $widget, $cb) = @_;
32 46
33 (my $data = $command) =~ s/\\//g; 47 (my $data = $command) =~ s/\\//g;
34 48
35 $tooltip =~ s/^\s+//; 49 $tooltip =~ s/^\s+//;
36
37 $tooltip = "<big>$data</big>\n\n$tooltip"; 50 $tooltip = "<big>$data</big>\n\n$tooltip";
38
39 $tooltip =~ s/\s+$//; 51 $tooltip =~ s/\s+$//;
40 52
41 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 53 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
42} 54}
43 55
44sub clr_commands { 56sub clr_commands {
45 my ($self) = @_; 57 my ($self) = @_;
46 58
47 %{$self->{completer}{command}} = (); 59 %{$self->{completer}{command}} = ();
48}
49 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
50sub button_down { 175sub invoke_button_down {
51 my ($self, $ev, $x, $y) = @_; 176 my ($self, $ev, $x, $y) = @_;
52 177
53 $self->focus_in;
54
55 if ($ev->{button} == 2) { 178 if ($ev->{button} == 1) {
179 $self->grab_focus;
180 return unless $::CONN;
181
182 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
183 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
184
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 }
195
196 } elsif ($ev->{button} == 2) {
197 $self->grab_focus;
198 return unless $::CONN;
199
56 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 200 my ($ox, $oy) = ($ev->{x}, $ev->{y});
57 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 201 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
58 202
59 $self->{motion} = sub { 203 $self->{motion} = sub {
60 my ($ev, $x, $y) = @_; 204 my ($ev, $x, $y) = @_;
… …
64 $::CFG->{map_shift_x} = $bw + $x - $ox; 208 $::CFG->{map_shift_x} = $bw + $x - $ox;
65 $::CFG->{map_shift_y} = $bh + $y - $oy; 209 $::CFG->{map_shift_y} = $bh + $y - $oy;
66 210
67 $self->update; 211 $self->update;
68 }; 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);
264 }
265
69 } 266 1
70} 267}
71 268
72sub button_up { 269sub invoke_button_up {
73 my ($self, $ev, $x, $y) = @_; 270 my ($self, $ev, $x, $y) = @_;
74 271
75 delete $self->{motion}; 272 delete $self->{motion};
76}
77 273
274 1
275}
276
78sub mouse_motion { 277sub invoke_mouse_motion {
79 my ($self, $ev, $x, $y) = @_; 278 my ($self, $ev, $x, $y) = @_;
80 279
280 if ($self->{motion}) {
81 $self->{motion}->($ev, $x, $y) if $self->{motion}; 281 $self->{motion}->($ev, $x, $y);
282 } else {
283 return 0;
284 }
285
286 1
82} 287}
83 288
84sub size_request { 289sub size_request {
85 ( 290 (
86 1 + 32 * int $::WIDTH / 32, 291 32 * CFPlus::ceil $::WIDTH / 32,
87 1 + 32 * int $::HEIGHT / 32, 292 32 * CFPlus::ceil $::HEIGHT / 32,
88 ) 293 )
89} 294}
90 295
91sub update { 296sub update {
92 my ($self) = @_; 297 my ($self) = @_;
… …
94 $self->{need_update} = 1; 299 $self->{need_update} = 1;
95 $self->SUPER::update; 300 $self->SUPER::update;
96} 301}
97 302
98my %DIR = ( 303my %DIR = (
99 CFClient::SDLK_KP8, [1, "north"], 304 CFPlus::SDLK_KP8, [1, "north"],
100 CFClient::SDLK_KP9, [2, "northeast"], 305 CFPlus::SDLK_KP9, [2, "northeast"],
101 CFClient::SDLK_KP6, [3, "east"], 306 CFPlus::SDLK_KP6, [3, "east"],
102 CFClient::SDLK_KP3, [4, "southeast"], 307 CFPlus::SDLK_KP3, [4, "southeast"],
103 CFClient::SDLK_KP2, [5, "south"], 308 CFPlus::SDLK_KP2, [5, "south"],
104 CFClient::SDLK_KP1, [6, "southwest"], 309 CFPlus::SDLK_KP1, [6, "southwest"],
105 CFClient::SDLK_KP4, [7, "west"], 310 CFPlus::SDLK_KP4, [7, "west"],
106 CFClient::SDLK_KP7, [8, "northwest"], 311 CFPlus::SDLK_KP7, [8, "northwest"],
107 312
108 CFClient::SDLK_UP, [1, "north"], 313 CFPlus::SDLK_UP, [1, "north"],
109 CFClient::SDLK_RIGHT, [3, "east"], 314 CFPlus::SDLK_RIGHT, [3, "east"],
110 CFClient::SDLK_DOWN, [5, "south"], 315 CFPlus::SDLK_DOWN, [5, "south"],
111 CFClient::SDLK_LEFT, [7, "west"], 316 CFPlus::SDLK_LEFT, [7, "west"],
112); 317);
113 318
114sub key_down { 319sub invoke_key_down {
115 my ($self, $ev) = @_; 320 my ($self, $ev) = @_;
116
117 return unless $::CONN;
118 321
119 my $mod = $ev->{mod}; 322 my $mod = $ev->{mod};
120 my $sym = $ev->{sym}; 323 my $sym = $ev->{sym};
121 my $uni = $ev->{unicode}; 324 my $uni = $ev->{unicode};
122 325
123 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) {
124 $::CONN->user_send ("stay fire"); 346 $::CONN->user_send ("stay fire");
125 } elsif ($uni == ord ",") { 347 } elsif ($uni == ord ",") {
126 $::CONN->user_send ("take"); 348 $::CONN->user_send ("take");
127 } elsif ($uni == ord " ") { 349 } elsif ($uni == ord " ") {
128 $::CONN->user_send ("apply"); 350 $::CONN->user_send ("apply");
351 } elsif ($uni == 13) {
352 $::CONN->user_send ("examine");
129 } elsif ($uni == ord "\t") { 353 } elsif ($uni == ord ".") {
130 # TODO: toggle inventory 354 $::CONN->user_send ($self->{completer}{last_command})
355 if exists $self->{completer}{last_command};
356 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
357 $::CONN->macro_send ($_) for @macros;
131 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 358 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
132 $::CONN->user_send ("rotateshoottype +"); 359 $::CONN->user_send ("rotateshoottype +");
133 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 360 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
134 $::CONN->user_send ("rotateshoottype -"); 361 $::CONN->user_send ("rotateshoottype -");
362 } elsif ($uni == ord '!') {
363 $self->{completer}->set_prefix ("shout ");
364 $self->{completer}->show;
135 } elsif ($uni == ord '"') { 365 } elsif ($uni == ord '"') {
136 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 366 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
137 $self->{completer}->show; 367 $self->{completer}->show;
138 } elsif ($uni == ord "'") { 368 } elsif ($uni == ord "'") {
139 $self->{completer}->set_prefix (""); 369 $self->{completer}->set_prefix ("");
140 $self->{completer}->show; 370 $self->{completer}->show;
141 } elsif (exists $DIR{$sym}) { 371 } elsif (exists $DIR{$sym}) {
142 if ($mod & CFClient::KMOD_SHIFT) { 372 if ($mod & CFPlus::KMOD_SHIFT) {
143 $self->{shft}++; 373 $self->{shft}++;
374 if ($DIR{$sym}[0] != $self->{fire_dir}) {
144 $::CONN->user_send ("fire $DIR{$sym}[0]"); 375 $::CONN->user_send ("fire $DIR{$sym}[0]");
376 }
377 $self->{fire_dir} = $DIR{$sym}[0];
145 } elsif ($mod & CFClient::KMOD_CTRL) { 378 } elsif ($mod & CFPlus::KMOD_CTRL) {
146 $self->{ctrl}++; 379 $self->{ctrl}++;
147 $::CONN->user_send ("run $DIR{$sym}[0]"); 380 $::CONN->user_send ("run $DIR{$sym}[0]");
148 } else { 381 } else {
149 $::CONN->user_send ("$DIR{$sym}[1]"); 382 $::CONN->user_send ("$DIR{$sym}[1]");
150 } 383 }
151 } elsif ($ev->{unicode}) { 384 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
152 $self->{completer}->key_down ($ev); 385 $self->{completer}->inject_key_down ($ev);
153 $self->{completer}->show; 386 $self->{completer}->show;
387 } else {
388 return 0;
389 }
390
154 } 391 1
155} 392}
156 393
157sub key_up { 394sub invoke_key_up {
158 my ($self, $ev) = @_; 395 my ($self, $ev) = @_;
159 396
397 my $res = 0;
160 my $mod = $ev->{mod}; 398 my $mod = $ev->{mod};
161 my $sym = $ev->{sym}; 399 my $sym = $ev->{sym};
162 400
401 if ($::CFG->{shift_fire_stop}) {
163 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 402 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
164 $::CONN->user_send ("fire_stop"); 403 $::CONN->user_send ("fire_stop");
404 delete $self->{fire_dir};
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 }
165 } 417 }
418
166 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 419 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
167 $::CONN->user_send ("run_stop"); 420 $::CONN->user_send ("run_stop");
421 $res = 1;
168 } 422 }
423
424 $res
425}
426
427sub set_magicmap {
428 my ($self, $w, $h, $x, $y, $data) = @_;
429
430 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
431 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
432
433 $self->{magicmap} = [$x, $y, $w, $h, $data];
434
435 $self->update;
169} 436}
170 437
171sub draw { 438sub draw {
172 my ($self) = @_; 439 my ($self) = @_;
173 440
441 return unless $::MAP;
442
174 my $focused = $CFClient::UI::FOCUS == $self 443 my $focused = $CFPlus::UI::FOCUS == $self
175 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 444 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
176 445
177 return 446 return
178 unless $focused || !$::FAST; 447 unless $focused || !$::FAST;
179 448
180 if (delete $self->{need_update}) { 449 if (delete $self->{need_update}) {
450 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
451
452 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
453 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
454
455 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
456 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
457
458 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
459 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
460
461 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
462 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
463
464 if ($::CFG->{fow_enable}) {
465 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
466
467 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
468 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
469 glConvolutionFilter2D (
470 GL_CONVOLUTION_2D,
471 GL_ALPHA,
472 3, 3,
473 GL_ALPHA, GL_FLOAT,
474 (pack "f*", @{ $self->{smooth_matrix} }),
475 );
476 glEnable GL_CONVOLUTION_2D;
477 }
478
479 $self->{fow_texture} = new CFPlus::Texture
480 w => $w,
481 h => $h,
482 data => $data,
483 internalformat => GL_ALPHA,
484 format => GL_ALPHA;
485
486 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
487 } else {
488 delete $self->{fow_texture};
489 }
490
181 glNewList $self->{list}; 491 glNewList $self->{list};
182 492
183 if ($::MAP) {
184 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
185 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
186
187 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
188 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
189
190 glPushMatrix; 493 glPushMatrix;
494 glTranslate $sx0, $sy0;
191 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 495 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
192 496
193 glTranslate $sx0 - 32, $sy0 - 32, 0; 497 $::MAP->draw ($dx, $dy, $sw, $sh);
194 498
195 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 499 glScale 32, 32;
196 500
197 if ($::CFG->{fow_enable}) { 501 if (my $tex = $self->{fow_texture}) {
198 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
199 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
200 glConvolutionFilter2D (
201 GL_CONVOLUTION_2D,
202 GL_ALPHA,
203 3, 3,
204 GL_ALPHA, GL_FLOAT,
205 pack "f*",
206 0.05, 0.13, 0.05,
207 0.13, 0.30, 0.13,
208 0.05, 0.13, 0.05,
209 );
210 glEnable GL_CONVOLUTION_2D;
211 }
212
213 $self->{fow_texture_name} ||= glGenTexture;
214 # try to re-use the texture name: TODO improve texture class instead
215
216 $self->{fow_texture} = new CFClient::Texture
217 w => $w,
218 h => $h,
219 data => $data,
220 name => $self->{fow_texture_name},
221 internalformat => GL_ALPHA,
222 format => GL_ALPHA;
223
224 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
225
226 glEnable GL_TEXTURE_2D; 502 glEnable GL_TEXTURE_2D;
227 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
228 504
229 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 505 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
230 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 506 $self->{fow_texture}->draw_quad_alpha (0, 0);
231 507
232 glDisable GL_TEXTURE_2D; 508 glDisable GL_TEXTURE_2D;
233 } 509 }
234 510
511 if ($self->{magicmap}) {
512 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
513
514 $x += $::MAP->ox + $self->{dx};
515 $y += $::MAP->oy + $self->{dy};
516
517 glTranslate - $x - 1, - $y - 1;
518 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
519 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
520 }
521
235 glPopMatrix; 522 glPopMatrix;
236 }
237
238 glEndList; 523 glEndList;
239 } 524 }
240 525
241 glPushMatrix;
242 glCallList $self->{list}; 526 glCallList $self->{list};
243 glPopMatrix;
244 527
245 # TNT2 emulates logops in software (or worse :) 528 # TNT2 emulates logops in software (or worse :)
246 if ($focused) { 529 unless ($focused) {
247 (delete $self->{out_of_focus})->destroy
248 if $self->{out_of_focus};
249 } else {
250 glColor 0.4, 0.2, 0.2, 0.6; 530 glColor 0.4, 0.2, 0.2, 0.6;
251 glEnable GL_BLEND; 531 glEnable GL_BLEND;
252 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 532 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
253 glBegin GL_QUADS; 533 glBegin GL_QUADS;
254 glVertex 0, 0; 534 glVertex 0, 0;
255 glVertex 0, $::HEIGHT; 535 glVertex 0, $::HEIGHT;
256 glVertex $::WIDTH, $::HEIGHT; 536 glVertex $::WIDTH, $::HEIGHT;
257 glVertex $::WIDTH, 0; 537 glVertex $::WIDTH, 0;
258 glEnd; 538 glEnd;
259 glDisable GL_BLEND; 539 glDisable GL_BLEND;
260
261 $self->{out_of_focus} ||= do {
262 my $label = new CFClient::UI::Label
263 x => 0,
264 y => 0,
265 z => 1,
266 ellipsise => 0,
267 text => "map out of focus (click map to play)";
268
269 $label->show;
270 $label->update;
271
272 $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
273 $label->move (
274 ($::WIDTH - $label->{w}) * 0.5,
275 ($::HEIGHT - $label->{h}) * 0.5,
276 );
277 });
278
279 $label
280 };
281 } 540 }
282} 541}
283 542
284sub DESTROY { 543sub DESTROY {
285 my $self = shift; 544 my $self = shift;
… …
287 glDeleteList $self->{list}; 546 glDeleteList $self->{list};
288 547
289 $self->SUPER::DESTROY; 548 $self->SUPER::DESTROY;
290} 549}
291 550
292package CFClient::MapWidget::MapMap; 551package CFPlus::MapWidget::MapMap;
293 552
294our @ISA = CFClient::UI::Base::; 553our @ISA = CFPlus::UI::Base::;
295 554
296use Time::HiRes qw(time); 555use Time::HiRes qw(time);
297use CFClient::OpenGL; 556use CFPlus::OpenGL;
298 557
299sub size_request { 558sub size_request {
300 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 559 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
301} 560}
302 561
303sub size_allocate { 562sub invoke_size_allocate {
304 my ($self, $w, $h) = @_; 563 my ($self, $w, $h) = @_;
305 564
306 $self->SUPER::size_allocate ($w, $h);
307 $self->update; 565 $self->update;
566
567 1
308} 568}
309 569
310sub update { 570sub update {
311 my ($self) = @_; 571 my ($self) = @_;
312 572
… …
337 597
338 if ($self->{texture_atime} < time) { 598 if ($self->{texture_atime} < time) {
339 $self->{texture_atime} = time + 1/3; 599 $self->{texture_atime} = time + 1/3;
340 600
341 $self->{texture} = 601 $self->{texture} =
342 new CFClient::Texture 602 new CFPlus::Texture
343 w => $w, 603 w => $w,
344 h => $h, 604 h => $h,
345 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 605 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
346 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 606 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
347 } 607 }
348 608
349 $self->{texture}->draw_quad (0, 0); 609 $self->{texture}->draw_quad (0, 0);
350 610
351 glDisable GL_TEXTURE_2D; 611 glDisable GL_TEXTURE_2D;
… …
366 glEnd; 626 glEnd;
367 627
368 glDisable GL_BLEND; 628 glDisable GL_BLEND;
369} 629}
370 630
371package CFClient::MapWidget::Command; 631package CFPlus::MapWidget::Command;
372 632
373use strict; 633use strict;
374 634
375use CFClient::OpenGL; 635use CFPlus::OpenGL;
376 636
377our @ISA = CFClient::UI::Frame::; 637our @ISA = CFPlus::UI::Frame::;
378 638
379sub new { 639sub new {
380 my $class = shift; 640 my $class = shift;
381 641
382 my $self = $class->SUPER::new ( 642 my $self = $class->SUPER::new (
383 bg => [0, 0, 0, 0.8], 643 bg => [0, 0, 0, 0.8],
384 @_, 644 @_,
385 ); 645 );
386 646
387 $self->add ($self->{vbox} = new CFClient::UI::VBox); 647 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
388 648
389 $self->{label} = [ 649 $self->{label} = [
390 map 650 map
391 CFClient::UI::Label->new ( 651 CFPlus::UI::Label->new (
392 can_hover => 1, 652 can_hover => 1,
393 can_events => 1, 653 can_events => 1,
394 tooltip_width => 0.33, 654 tooltip_width => 0.33,
395 fontsize => $_, 655 fontsize => $_,
396 ), (0.8) x 16 656 ), (0.8) x 16
397 ]; 657 ];
398 658
399 $self->{entry} = new CFClient::UI::Entry 659 $self->{entry} = new CFPlus::UI::Entry
400 connect_changed => sub { 660 on_changed => sub {
401 $self->update_labels; 661 $self->update_labels;
662 0
402 }, 663 },
664 on_button_down => sub {
665 my ($entry, $ev, $x, $y) = @_;
666
667 if ($ev->{button} == 3) {
668 (new CFPlus::UI::Menu
669 items => [
670 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
671 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
672 ],
673 )->popup ($ev);
674 return 1;
675 }
676 0
677 },
403 connect_key_down => sub { 678 on_key_down => sub {
404 my ($entry, $ev) = @_; 679 my ($entry, $ev) = @_;
405 680
406 my $self = $entry->{parent}{parent}; 681 my $self = $entry->{parent}{parent};
407 682
408 if ($ev->{sym} == 13) { 683 if ($ev->{sym} == 13) {
409 if (exists $self->{select}) { 684 if (exists $self->{select}) {
685 $self->{last_command} = $self->{select};
410 $::CONN->user_send ($self->{select}); 686 $::CONN->user_send ($self->{select});
687
688 unshift @{$self->{history}}, $self->{entry}->get_text;
689 $self->{hist_ptr} = 0;
690
411 $self->hide; 691 $self->hide;
412 } 692 }
413 } elsif ($ev->{sym} == 27) { 693 } elsif ($ev->{sym} == 27) {
694 $self->{hist_ptr} = 0;
414 $self->hide; 695 $self->hide;
415 return;
416 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 696 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
697 if ($self->{hist_ptr} > 1) {
698 $self->{hist_ptr}--;
699 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
700 } elsif ($self->{hist_ptr} > 0) {
701 $self->{hist_ptr}--;
702 $self->{entry}->set_text ($self->{hist_saveback});
703 } else {
417 ++$self->{select_offset} 704 ++$self->{select_offset}
418 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 705 if $self->{select_offset} < $#{ $self->{last_match} || [] };
706 }
419 $self->update_labels; 707 $self->update_labels;
420 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 708 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
709 if ($self->{select_offset}) {
421 --$self->{select_offset} 710 --$self->{select_offset}
711 } else {
712 unless ($self->{hist_ptr}) {
713 $self->{hist_saveback} = $self->{entry}->get_text;
714 }
715 if ($self->{hist_ptr} <= $#{$self->{history}}) {
422 if $self->{select_offset}; 716 $self->{hist_ptr}++;
717 }
718 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
719 if exists $self->{history}->[$self->{hist_ptr} - 1];
720 }
423 $self->update_labels; 721 $self->update_labels;
424 } else { 722 } else {
425 return 0; 723 return 0;
426 } 724 }
427 725
… …
442 740
443 $self->{entry}->set_text ($prefix); 741 $self->{entry}->set_text ($prefix);
444 $self->show; 742 $self->show;
445} 743}
446 744
447sub size_allocate { 745sub invoke_size_allocate {
448 my ($self, $w, $h) = @_; 746 my ($self, $w, $h) = @_;
449 747
450 $self->SUPER::size_allocate ($w, $h);
451 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 748 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
749
750 $self->SUPER::invoke_size_allocate ($w, $h)
452} 751}
453 752
454sub show { 753sub show {
455 my ($self) = @_; 754 my ($self) = @_;
456 755
457 $self->SUPER::show; 756 $self->SUPER::show;
458 $self->{entry}->focus_in; 757 $self->{entry}->grab_focus;
459} 758}
460 759
461sub hide { 760sub hide {
462 my ($self) = @_; 761 my ($self) = @_;
463 762
763 $self->{hist_ptr} = 0;
764
464 $self->SUPER::hide; 765 $self->SUPER::hide;
465 $self->{entry}->set_text (""); 766 $self->{entry}->set_text ("");
466} 767}
467 768
468sub key_down { 769sub inject_key_down {
469 my ($self, $ev) = @_; 770 my ($self, $ev) = @_;
470 771
772 $self->{entry}->grab_focus;
471 $self->{entry}->key_down ($ev); 773 $self->{entry}->emit (key_down => $ev);
472} 774}
473 775
474sub update_labels { 776sub update_labels {
475 my ($self) = @_; 777 my ($self) = @_;
476 778
… …
509 811
510 @match = map $self->{command}{$_->[0]}, 812 @match = map $self->{command}{$_->[0]},
511 sort { 813 sort {
512 $a->[1] <=> $b->[1] 814 $a->[1] <=> $b->[1]
513 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 815 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
514 or (length $a->[0]) <=> (length $b->[0]) 816 or (length $b->[0]) <=> (length $a->[0])
515 } @match; 817 } @match;
516 } 818 }
517 819
518 $self->{last_search} = $cmd; 820 $self->{last_search} = $text;
519 $self->{last_match} = \@match; 821 $self->{last_match} = \@match;
520 822
521 $self->{select_offset} = 0; 823 $self->{select_offset} = 0;
522 } 824 }
523 825
… …
563 $label->set_text (""); 865 $label->set_text ("");
564 $label->set_tooltip (""); 866 $label->set_tooltip ("");
565 } 867 }
566 868
567 $self->update; 869 $self->update;
568 ###
569} 870}
570 871
571sub _draw { 872sub _draw {
572 my ($self) = @_; 873 my ($self) = @_;
573 874
574 # hack 875 # hack
575 local $CFClient::UI::FOCUS = $self->{entry}; 876 local $CFPlus::UI::FOCUS = $self->{entry};
576 877
577 $self->SUPER::_draw; 878 $self->SUPER::_draw;
578} 879}
579 880
5801 8811
882

Diff Legend

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