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.97 by root, Sat Dec 9 22:28:11 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 ; 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 ($uni == ord "\t") {
329 $::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 warn "<@macros>\n";#d#
358 $::CONN->macro_send ($_) for @macros;
131 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 359 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
132 $::CONN->user_send ("rotateshoottype +"); 360 $::CONN->user_send ("rotateshoottype +");
133 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 361 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
134 $::CONN->user_send ("rotateshoottype -"); 362 $::CONN->user_send ("rotateshoottype -");
135 } elsif ($uni == ord '"') { 363 } elsif ($uni == ord '"') {
136 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 364 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
137 $self->{completer}->show; 365 $self->{completer}->show;
138 } elsif ($uni == ord "'") { 366 } elsif ($uni == ord "'") {
139 $self->{completer}->set_prefix (""); 367 $self->{completer}->set_prefix ("");
140 $self->{completer}->show; 368 $self->{completer}->show;
141 } elsif (exists $DIR{$sym}) { 369 } elsif (exists $DIR{$sym}) {
142 if ($mod & CFClient::KMOD_SHIFT) { 370 if ($mod & CFPlus::KMOD_SHIFT) {
143 $self->{shft}++; 371 $self->{shft}++;
372 if ($DIR{$sym}[0] != $self->{fire_dir}) {
144 $::CONN->user_send ("fire $DIR{$sym}[0]"); 373 $::CONN->user_send ("fire $DIR{$sym}[0]");
374 }
375 $self->{fire_dir} = $DIR{$sym}[0];
145 } elsif ($mod & CFClient::KMOD_CTRL) { 376 } elsif ($mod & CFPlus::KMOD_CTRL) {
146 $self->{ctrl}++; 377 $self->{ctrl}++;
147 $::CONN->user_send ("run $DIR{$sym}[0]"); 378 $::CONN->user_send ("run $DIR{$sym}[0]");
148 } else { 379 } else {
149 $::CONN->user_send ("$DIR{$sym}[1]"); 380 $::CONN->user_send ("$DIR{$sym}[1]");
150 } 381 }
151 } elsif ($ev->{unicode}) { 382 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
152 $self->{completer}->key_down ($ev); 383 $self->{completer}->inject_key_down ($ev);
153 $self->{completer}->show; 384 $self->{completer}->show;
385 } else {
386 return 0;
387 }
388
154 } 389 1
155} 390}
156 391
157sub key_up { 392sub invoke_key_up {
158 my ($self, $ev) = @_; 393 my ($self, $ev) = @_;
159 394
395 my $res = 0;
160 my $mod = $ev->{mod}; 396 my $mod = $ev->{mod};
161 my $sym = $ev->{sym}; 397 my $sym = $ev->{sym};
162 398
399 if ($::CFG->{shift_fire_stop}) {
163 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 400 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
164 $::CONN->user_send ("fire_stop"); 401 $::CONN->user_send ("fire_stop");
402 delete $self->{fire_dir};
403 $res = 1;
404 }
405 } else {
406 if (exists $DIR{$sym} && delete $self->{shft}) {
407 $::CONN->user_send ("fire_stop");
408 delete $self->{fire_dir};
409 $res = 1;
410 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
411 $::CONN->user_send ("fire_stop");
412 delete $self->{fire_dir};
413 $res = 1;
414 }
165 } 415 }
416
166 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 417 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
167 $::CONN->user_send ("run_stop"); 418 $::CONN->user_send ("run_stop");
419 $res = 1;
168 } 420 }
421
422 $res
423}
424
425sub set_magicmap {
426 my ($self, $w, $h, $x, $y, $data) = @_;
427
428 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
429 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
430
431 $self->{magicmap} = [$x, $y, $w, $h, $data];
432
433 $self->update;
169} 434}
170 435
171sub draw { 436sub draw {
172 my ($self) = @_; 437 my ($self) = @_;
173 438
439 return unless $::MAP;
440
174 my $focused = $CFClient::UI::FOCUS == $self 441 my $focused = $CFPlus::UI::FOCUS == $self
175 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 442 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
176 443
177 return 444 return
178 unless $focused || !$::FAST; 445 unless $focused || !$::FAST;
179 446
180 if (delete $self->{need_update}) { 447 if (delete $self->{need_update}) {
448 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
449
450 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
451 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
452
453 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
454 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
455
456 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
457 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
458
459 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
460 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
461
462 if ($::CFG->{fow_enable}) {
463 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
464
465 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
466 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
467 glConvolutionFilter2D (
468 GL_CONVOLUTION_2D,
469 GL_ALPHA,
470 3, 3,
471 GL_ALPHA, GL_FLOAT,
472 (pack "f*", @{ $self->{smooth_matrix} }),
473 );
474 glEnable GL_CONVOLUTION_2D;
475 }
476
477 $self->{fow_texture} = new CFPlus::Texture
478 w => $w,
479 h => $h,
480 data => $data,
481 internalformat => GL_ALPHA,
482 format => GL_ALPHA;
483
484 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
485 } else {
486 delete $self->{fow_texture};
487 }
488
181 glNewList $self->{list}; 489 glNewList $self->{list};
182 490
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; 491 glPushMatrix;
492 glTranslate $sx0, $sy0;
191 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 493 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
192 494
193 glTranslate $sx0 - 32, $sy0 - 32, 0; 495 $::MAP->draw ($dx, $dy, $sw, $sh);
194 496
195 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 497 glScale 32, 32;
196 498
197 if ($::CFG->{fow_enable}) { 499 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; 500 glEnable GL_TEXTURE_2D;
227 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 501 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
228 502
229 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 503 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
230 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 504 $self->{fow_texture}->draw_quad_alpha (0, 0);
231 505
232 glDisable GL_TEXTURE_2D; 506 glDisable GL_TEXTURE_2D;
233 } 507 }
234 508
509 if ($self->{magicmap}) {
510 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
511
512 $x += $::MAP->ox + $self->{dx};
513 $y += $::MAP->oy + $self->{dy};
514
515 glTranslate - $x - 1, - $y - 1;
516 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
517 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
518 }
519
235 glPopMatrix; 520 glPopMatrix;
236 }
237
238 glEndList; 521 glEndList;
239 } 522 }
240 523
241 glPushMatrix;
242 glCallList $self->{list}; 524 glCallList $self->{list};
243 glPopMatrix;
244 525
245 # TNT2 emulates logops in software (or worse :) 526 # TNT2 emulates logops in software (or worse :)
246 if ($focused) { 527 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; 528 glColor 0.4, 0.2, 0.2, 0.6;
251 glEnable GL_BLEND; 529 glEnable GL_BLEND;
252 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 530 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
253 glBegin GL_QUADS; 531 glBegin GL_QUADS;
254 glVertex 0, 0; 532 glVertex 0, 0;
255 glVertex 0, $::HEIGHT; 533 glVertex 0, $::HEIGHT;
256 glVertex $::WIDTH, $::HEIGHT; 534 glVertex $::WIDTH, $::HEIGHT;
257 glVertex $::WIDTH, 0; 535 glVertex $::WIDTH, 0;
258 glEnd; 536 glEnd;
259 glDisable GL_BLEND; 537 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 } 538 }
282} 539}
283 540
284sub DESTROY { 541sub DESTROY {
285 my $self = shift; 542 my $self = shift;
… …
287 glDeleteList $self->{list}; 544 glDeleteList $self->{list};
288 545
289 $self->SUPER::DESTROY; 546 $self->SUPER::DESTROY;
290} 547}
291 548
292package CFClient::MapWidget::MapMap; 549package CFPlus::MapWidget::MapMap;
293 550
294our @ISA = CFClient::UI::Base::; 551our @ISA = CFPlus::UI::Base::;
295 552
296use Time::HiRes qw(time); 553use Time::HiRes qw(time);
297use CFClient::OpenGL; 554use CFPlus::OpenGL;
298 555
299sub size_request { 556sub size_request {
300 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 557 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
301} 558}
302 559
303sub size_allocate { 560sub invoke_size_allocate {
304 my ($self, $w, $h) = @_; 561 my ($self, $w, $h) = @_;
305 562
306 $self->SUPER::size_allocate ($w, $h);
307 $self->update; 563 $self->update;
564
565 1
308} 566}
309 567
310sub update { 568sub update {
311 my ($self) = @_; 569 my ($self) = @_;
312 570
… …
337 595
338 if ($self->{texture_atime} < time) { 596 if ($self->{texture_atime} < time) {
339 $self->{texture_atime} = time + 1/3; 597 $self->{texture_atime} = time + 1/3;
340 598
341 $self->{texture} = 599 $self->{texture} =
342 new CFClient::Texture 600 new CFPlus::Texture
343 w => $w, 601 w => $w,
344 h => $h, 602 h => $h,
345 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 603 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; 604 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
347 } 605 }
348 606
349 $self->{texture}->draw_quad (0, 0); 607 $self->{texture}->draw_quad (0, 0);
350 608
351 glDisable GL_TEXTURE_2D; 609 glDisable GL_TEXTURE_2D;
… …
366 glEnd; 624 glEnd;
367 625
368 glDisable GL_BLEND; 626 glDisable GL_BLEND;
369} 627}
370 628
371package CFClient::MapWidget::Command; 629package CFPlus::MapWidget::Command;
372 630
373use strict; 631use strict;
374 632
375use CFClient::OpenGL; 633use CFPlus::OpenGL;
376 634
377our @ISA = CFClient::UI::Frame::; 635our @ISA = CFPlus::UI::Frame::;
378 636
379sub new { 637sub new {
380 my $class = shift; 638 my $class = shift;
381 639
382 my $self = $class->SUPER::new ( 640 my $self = $class->SUPER::new (
383 bg => [0, 0, 0, 0.8], 641 bg => [0, 0, 0, 0.8],
384 @_, 642 @_,
385 ); 643 );
386 644
387 $self->add ($self->{vbox} = new CFClient::UI::VBox); 645 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
388 646
389 $self->{label} = [ 647 $self->{label} = [
390 map 648 map
391 CFClient::UI::Label->new ( 649 CFPlus::UI::Label->new (
392 can_hover => 1, 650 can_hover => 1,
393 can_events => 1, 651 can_events => 1,
394 tooltip_width => 0.33, 652 tooltip_width => 0.33,
395 fontsize => $_, 653 fontsize => $_,
396 ), (0.8) x 16 654 ), (0.8) x 16
397 ]; 655 ];
398 656
399 $self->{entry} = new CFClient::UI::Entry 657 $self->{entry} = new CFPlus::UI::Entry
400 connect_changed => sub { 658 on_changed => sub {
401 $self->update_labels; 659 $self->update_labels;
660 0
402 }, 661 },
662 on_button_down => sub {
663 my ($entry, $ev, $x, $y) = @_;
664
665 if ($ev->{button} == 3) {
666 (new CFPlus::UI::Menu
667 items => [
668 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
669 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
670 ],
671 )->popup ($ev);
672 return 1;
673 }
674 0
675 },
403 connect_key_down => sub { 676 on_key_down => sub {
404 my ($entry, $ev) = @_; 677 my ($entry, $ev) = @_;
405 678
406 my $self = $entry->{parent}{parent}; 679 my $self = $entry->{parent}{parent};
407 680
408 if ($ev->{sym} == 13) { 681 if ($ev->{sym} == 13) {
409 if (exists $self->{select}) { 682 if (exists $self->{select}) {
683 $self->{last_command} = $self->{select};
410 $::CONN->user_send ($self->{select}); 684 $::CONN->user_send ($self->{select});
685
686 unshift @{$self->{history}}, $self->{entry}->get_text;
687 $self->{hist_ptr} = 0;
688
411 $self->hide; 689 $self->hide;
412 } 690 }
413 } elsif ($ev->{sym} == 27) { 691 } elsif ($ev->{sym} == 27) {
692 $self->{hist_ptr} = 0;
414 $self->hide; 693 $self->hide;
415 return;
416 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 694 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
695 if ($self->{hist_ptr} > 1) {
696 $self->{hist_ptr}--;
697 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
698 } elsif ($self->{hist_ptr} > 0) {
699 $self->{hist_ptr}--;
700 $self->{entry}->set_text ($self->{hist_saveback});
701 } else {
417 ++$self->{select_offset} 702 ++$self->{select_offset}
418 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 703 if $self->{select_offset} < $#{ $self->{last_match} || [] };
704 }
419 $self->update_labels; 705 $self->update_labels;
420 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 706 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
707 if ($self->{select_offset}) {
421 --$self->{select_offset} 708 --$self->{select_offset}
709 } else {
710 unless ($self->{hist_ptr}) {
711 $self->{hist_saveback} = $self->{entry}->get_text;
712 }
713 if ($self->{hist_ptr} <= $#{$self->{history}}) {
422 if $self->{select_offset}; 714 $self->{hist_ptr}++;
715 }
716 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
717 if exists $self->{history}->[$self->{hist_ptr} - 1];
718 }
423 $self->update_labels; 719 $self->update_labels;
424 } else { 720 } else {
425 return 0; 721 return 0;
426 } 722 }
427 723
… …
442 738
443 $self->{entry}->set_text ($prefix); 739 $self->{entry}->set_text ($prefix);
444 $self->show; 740 $self->show;
445} 741}
446 742
447sub size_allocate { 743sub invoke_size_allocate {
448 my ($self, $w, $h) = @_; 744 my ($self, $w, $h) = @_;
449 745
450 $self->SUPER::size_allocate ($w, $h);
451 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 746 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
747
748 $self->SUPER::invoke_size_allocate ($w, $h)
452} 749}
453 750
454sub show { 751sub show {
455 my ($self) = @_; 752 my ($self) = @_;
456 753
457 $self->SUPER::show; 754 $self->SUPER::show;
458 $self->{entry}->focus_in; 755 $self->{entry}->grab_focus;
459} 756}
460 757
461sub hide { 758sub hide {
462 my ($self) = @_; 759 my ($self) = @_;
463 760
761 $self->{hist_ptr} = 0;
762
464 $self->SUPER::hide; 763 $self->SUPER::hide;
465 $self->{entry}->set_text (""); 764 $self->{entry}->set_text ("");
466} 765}
467 766
468sub key_down { 767sub inject_key_down {
469 my ($self, $ev) = @_; 768 my ($self, $ev) = @_;
470 769
770 $self->{entry}->grab_focus;
471 $self->{entry}->key_down ($ev); 771 $self->{entry}->emit (key_down => $ev);
472} 772}
473 773
474sub update_labels { 774sub update_labels {
475 my ($self) = @_; 775 my ($self) = @_;
476 776
… …
509 809
510 @match = map $self->{command}{$_->[0]}, 810 @match = map $self->{command}{$_->[0]},
511 sort { 811 sort {
512 $a->[1] <=> $b->[1] 812 $a->[1] <=> $b->[1]
513 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 813 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
514 or (length $a->[0]) <=> (length $b->[0]) 814 or (length $b->[0]) <=> (length $a->[0])
515 } @match; 815 } @match;
516 } 816 }
517 817
518 $self->{last_search} = $cmd; 818 $self->{last_search} = $text;
519 $self->{last_match} = \@match; 819 $self->{last_match} = \@match;
520 820
521 $self->{select_offset} = 0; 821 $self->{select_offset} = 0;
522 } 822 }
523 823
… …
563 $label->set_text (""); 863 $label->set_text ("");
564 $label->set_tooltip (""); 864 $label->set_tooltip ("");
565 } 865 }
566 866
567 $self->update; 867 $self->update;
568 ###
569} 868}
570 869
571sub _draw { 870sub _draw {
572 my ($self) = @_; 871 my ($self) = @_;
573 872
574 # hack 873 # hack
575 local $CFClient::UI::FOCUS = $self->{entry}; 874 local $CFPlus::UI::FOCUS = $self->{entry};
576 875
577 $self->SUPER::_draw; 876 $self->SUPER::_draw;
578} 877}
579 878
5801 8791
880

Diff Legend

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