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.116 by root, Mon Aug 6 05:06:33 2007 UTC

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

Diff Legend

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