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.38 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.117 by root, Fri Aug 10 04:02:13 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 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 ; 32 ;
34 33
35 $self 34 $self
35}
36
37sub set_tilesize {
38 my ($self, $tilesize) = @_;
39
40 $self->{tilesize} = $tilesize;
36} 41}
37 42
38sub add_command { 43sub add_command {
39 my ($self, $command, $tooltip, $widget, $cb) = @_; 44 my ($self, $command, $tooltip, $widget, $cb) = @_;
40 45
41 (my $data = $command) =~ s/\\//g; 46 (my $data = $command) =~ s/\\//g;
42 47
43 $tooltip =~ s/^\s+//; 48 $tooltip =~ s/^\s+//;
44
45 $tooltip = "<big>$data</big>\n\n$tooltip"; 49 $tooltip = "<big>$data</big>\n\n$tooltip";
46
47 $tooltip =~ s/\s+$//; 50 $tooltip =~ s/\s+$//;
48 51
49 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 52 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
50} 53}
51 54
52sub clr_commands { 55sub clr_commands {
53 my ($self) = @_; 56 my ($self) = @_;
54 57
55 %{$self->{completer}{command}} = (); 58 %{$self->{completer}{command}} = ();
56}
57 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
58sub button_down { 174sub invoke_button_down {
59 my ($self, $ev, $x, $y) = @_; 175 my ($self, $ev, $x, $y) = @_;
60 176
61 $self->focus_in;
62
63 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
64 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 195 my ($ox, $oy) = ($ev->{x}, $ev->{y});
65 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 196 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
66 197
67 $self->{motion} = sub { 198 $self->{motion} = sub {
68 my ($ev, $x, $y) = @_; 199 my ($ev, $x, $y) = @_;
… …
72 $::CFG->{map_shift_x} = $bw + $x - $ox; 203 $::CFG->{map_shift_x} = $bw + $x - $ox;
73 $::CFG->{map_shift_y} = $bh + $y - $oy; 204 $::CFG->{map_shift_y} = $bh + $y - $oy;
74 205
75 $self->update; 206 $self->update;
76 }; 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
77 } 261 1
78} 262}
79 263
80sub button_up { 264sub invoke_button_up {
81 my ($self, $ev, $x, $y) = @_; 265 my ($self, $ev, $x, $y) = @_;
82 266
83 delete $self->{motion}; 267 delete $self->{motion};
84}
85 268
269 1
270}
271
86sub mouse_motion { 272sub invoke_mouse_motion {
87 my ($self, $ev, $x, $y) = @_; 273 my ($self, $ev, $x, $y) = @_;
88 274
275 if ($self->{motion}) {
89 $self->{motion}->($ev, $x, $y) if $self->{motion}; 276 $self->{motion}->($ev, $x, $y);
277 } else {
278 return 0;
279 }
280
281 1
90} 282}
91 283
92sub size_request { 284sub size_request {
285 my ($self) = @_;
286
93 ( 287 (
94 1 + 32 * int $::WIDTH / 32, 288 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
95 1 + 32 * int $::HEIGHT / 32, 289 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
96 ) 290 )
97} 291}
98 292
99sub update { 293sub update {
100 my ($self) = @_; 294 my ($self) = @_;
… …
102 $self->{need_update} = 1; 296 $self->{need_update} = 1;
103 $self->SUPER::update; 297 $self->SUPER::update;
104} 298}
105 299
106my %DIR = ( 300my %DIR = (
301 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
107 CFClient::SDLK_KP8, [1, "north"], 302 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
108 CFClient::SDLK_KP9, [2, "northeast"], 303 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
109 CFClient::SDLK_KP6, [3, "east"], 304 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
110 CFClient::SDLK_KP3, [4, "southeast"], 305 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
111 CFClient::SDLK_KP2, [5, "south"], 306 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
112 CFClient::SDLK_KP1, [6, "southwest"], 307 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
113 CFClient::SDLK_KP4, [7, "west"], 308 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
114 CFClient::SDLK_KP7, [8, "northwest"], 309 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
115 310
116 CFClient::SDLK_UP, [1, "north"], 311 ( "," . CFPlus::SDLK_UP ), [1, "north"],
312 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
117 CFClient::SDLK_RIGHT, [3, "east"], 313 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
314 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
118 CFClient::SDLK_DOWN, [5, "south"], 315 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
316 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
119 CFClient::SDLK_LEFT, [7, "west"], 317 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
318 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
120); 319);
121 320
122sub key_down { 321sub invoke_key_down {
123 my ($self, $ev) = @_; 322 my ($self, $ev) = @_;
124
125 return unless $::CONN;
126 323
127 my $mod = $ev->{mod}; 324 my $mod = $ev->{mod};
128 my $sym = $ev->{sym}; 325 my $sym = $ev->{sym};
129 my $uni = $ev->{unicode}; 326 my $uni = $ev->{unicode};
130 327
131 if ($sym == CFClient::SDLK_KP5) { 328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
132 $::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
133 } elsif ($uni == ord ",") { 347 } elsif ($uni == ord ",") {
134 $::CONN->user_send ("take"); 348 $::CONN->user_send ("take");
135 } elsif ($uni == ord " ") { 349 } elsif ($uni == ord " ") {
136 $::CONN->user_send ("apply"); 350 $::CONN->user_send ("apply");
351 } elsif ($uni == 13) {
352 $::CONN->user_send ("examine");
137 } elsif ($uni == ord ".") { 353 } elsif ($uni == ord ".") {
138 $::CONN->user_send ($self->{completer}{last_command}) 354 $::CONN->user_send ($self->{completer}{last_command})
139 if exists $self->{completer}{last_command}; 355 if exists $self->{completer}{last_command};
140 } elsif ($uni == ord "\t") { 356 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
141 # TODO: toggle inventory 357 $::CONN->macro_send ($_) for @macros;
142 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 358 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
143 $::CONN->user_send ("rotateshoottype +"); 359 $::CONN->user_send ("rotateshoottype +");
144 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 360 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
145 $::CONN->user_send ("rotateshoottype -"); 361 $::CONN->user_send ("rotateshoottype -");
362 } elsif ($uni == ord '!') {
363 $self->{completer}->set_prefix ("shout ");
364 $self->{completer}->show;
146 } elsif ($uni == ord '"') { 365 } elsif ($uni == ord '"') {
147 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 366 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
148 $self->{completer}->show; 367 $self->{completer}->show;
149 } elsif ($uni == ord "'") { 368 } elsif ($uni == ord "'") {
150 $self->{completer}->set_prefix (""); 369 $self->{completer}->set_prefix ("");
151 $self->{completer}->show; 370 $self->{completer}->show;
152 } elsif (exists $DIR{$sym}) { 371 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
153 if ($mod & CFClient::KMOD_SHIFT) { 372 if ($mod & CFPlus::KMOD_SHIFT) {
154 $self->{shft}++; 373 $self->{shft}++;
374 if ($dir->[0] != $self->{fire_dir}) {
155 $::CONN->user_send ("fire $DIR{$sym}[0]"); 375 $::CONN->user_send ("fire $dir->[0]");
376 }
377 $self->{fire_dir} = $DIR{$sym}[0];
156 } elsif ($mod & CFClient::KMOD_CTRL) { 378 } elsif ($mod & CFPlus::KMOD_CTRL) {
157 $self->{ctrl}++; 379 $self->{ctrl}++;
158 $::CONN->user_send ("run $DIR{$sym}[0]"); 380 $::CONN->user_send ("run $dir->[0]");
159 } else { 381 } else {
160 $::CONN->user_send ("$DIR{$sym}[1]"); 382 $::CONN->user_send ("$dir->[1]");
161 } 383 }
162 } elsif ($ev->{unicode}) { 384 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
163 $self->{completer}->key_down ($ev); 385 $self->{completer}->inject_key_down ($ev);
164 $self->{completer}->show; 386 $self->{completer}->show;
387 } else {
388 return 0;
389 }
390
165 } 391 1
166} 392}
167 393
168sub key_up { 394sub invoke_key_up {
169 my ($self, $ev) = @_; 395 my ($self, $ev) = @_;
170 396
397 my $res = 0;
171 my $mod = $ev->{mod}; 398 my $mod = $ev->{mod};
172 my $sym = $ev->{sym}; 399 my $sym = $ev->{sym};
173 400
401 if ($::CFG->{shift_fire_stop}) {
174 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 402 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
175 $::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 }
176 } 417 }
418
177 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 419 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
178 $::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
179 } 432 0
180} 433}
181 434
182sub draw { 435sub set_magicmap {
183 my ($self) = @_; 436 my ($self, $w, $h, $x, $y, $data) = @_;
184 437
185 my $focused = $CFClient::UI::FOCUS == $self 438 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
186 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 439 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
187 440
188 return 441 $self->{magicmap} = [$x, $y, $w, $h, $data];
189 unless $focused || !$::FAST;
190 442
443 $self->update;
444}
445
446sub refresh_hook {
447 my ($self) = @_;
448
449 if ($::MAP && $::CONN) {
191 if (delete $self->{need_update}) { 450 if (delete $self->{need_update}) {
192 glNewList $self->{list}; 451 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
193 452
194 if ($::MAP) { 453 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
195 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 454 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
196 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
197 455
198 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;
199 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;
200 458
201 glPushMatrix; 459 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
202 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 460 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
203 461
204 glTranslate $sx0 - 32, $sy0 - 32, 0; 462 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
205 463 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
206 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
207 464
208 if ($::CFG->{fow_enable}) { 465 if ($::CFG->{fow_enable}) {
209 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);
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 467
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 468 $self->{fow_texture} = new CFPlus::Texture
228 w => $w, 469 w => $w,
229 h => $h, 470 h => $h,
230 data => $data, 471 data => $data,
231 name => $self->{fow_texture_name},
232 internalformat => GL_ALPHA, 472 internalformat => GL_ALPHA,
233 format => GL_ALPHA; 473 format => GL_ALPHA;
474 } else {
475 delete $self->{fow_texture};
476 }
234 477
235 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 478 glNewList ($self->{list} ||= glGenList);
236 479
480 glPushMatrix;
481 glTranslate $sx0, $sy0;
482 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
483
484 $::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;
237 glEnable GL_TEXTURE_2D; 491 glEnable GL_TEXTURE_2D;
238 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
239 493
240 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 494 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
241 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 495 $self->{fow_texture}->draw_quad_alpha (0, 0);
242 496
243 glDisable GL_TEXTURE_2D; 497 glDisable GL_TEXTURE_2D;
498 glPopMatrix;
244 } 499 }
245 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
246 glPopMatrix; 512 glPopMatrix;
247 }
248
249 glEndList; 513 glEndList;
514 }
515 } else {
516 glDeleteList delete $self->{list}
517 if $self->{list};
250 } 518 }
519}
251 520
252 glPushMatrix; 521sub draw {
522 my ($self) = @_;
523
524 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
525
526 return unless $self->{list};
527
528 my $focused = $CFPlus::UI::FOCUS == $self
529 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
530
531 return
532 unless $focused || !$::FAST;
533
253 glCallList $self->{list}; 534 glCallList $self->{list};
254 glPopMatrix;
255 535
256 # TNT2 emulates logops in software (or worse :) 536 # TNT2 emulates logops in software (or worse :)
257 if ($focused) { 537 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; 538 glColor 0.4, 0.2, 0.2, 0.6;
262 glEnable GL_BLEND; 539 glEnable GL_BLEND;
263 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 540 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
264 glBegin GL_QUADS; 541 glBegin GL_QUADS;
265 glVertex 0, 0; 542 glVertex 0, 0;
266 glVertex 0, $::HEIGHT; 543 glVertex 0, $::HEIGHT;
267 glVertex $::WIDTH, $::HEIGHT; 544 glVertex $::WIDTH, $::HEIGHT;
268 glVertex $::WIDTH, 0; 545 glVertex $::WIDTH, 0;
269 glEnd; 546 glEnd;
270 glDisable GL_BLEND; 547 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 } 548 }
293} 549}
294 550
295sub DESTROY { 551sub DESTROY {
296 my $self = shift; 552 my $self = shift;
… …
298 glDeleteList $self->{list}; 554 glDeleteList $self->{list};
299 555
300 $self->SUPER::DESTROY; 556 $self->SUPER::DESTROY;
301} 557}
302 558
303package CFClient::MapWidget::MapMap; 559package CFPlus::MapWidget::MapMap;
304 560
561use strict;
562use utf8;
563
305our @ISA = CFClient::UI::Base::; 564our @ISA = CFPlus::UI::Base::;
306 565
307use Time::HiRes qw(time); 566use Time::HiRes qw(time);
308use CFClient::OpenGL; 567use CFPlus::OpenGL;
309 568
310sub size_request { 569sub size_request {
311 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 570 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
312} 571}
313 572
573sub refresh_hook {
574 my ($self) = @_;
575
576 if ($::MAP && $self->{texture_atime} < time) {
577 my ($w, $h) = @$self{qw(w h)};
578
579 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
580 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
581
582 my $ox = 0.5 * ($w - $sw);
583 my $oy = 0.5 * ($h - $sh);
584
585 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
586 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
587
588 #TODO: map scale is completely borked
589
590 my $x0 = int $ox - $sx + 0.5;
591 my $y0 = int $oy - $sy + 0.5;
592
593 $self->{sw} = $sw;
594 $self->{sh} = $sh;
595
596 $self->{x0} = $x0;
597 $self->{y0} = $y0;
598
599 $self->{texture_atime} = time + 1/3;
600
601 $self->{texture} =
602 new CFPlus::Texture
603 w => $w,
604 h => $h,
605 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
606 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
607 }
608}
609
610sub invoke_visibility_change {
611 my ($self) = @_;
612
613 $self->refresh_hook;
614
615 0
616}
617
314sub size_allocate { 618sub invoke_size_allocate {
315 my ($self, $w, $h) = @_; 619 my ($self, $w, $h) = @_;
316 620
317 $self->SUPER::size_allocate ($w, $h);
318 $self->update; 621 $self->update;
622
623 1
319} 624}
320 625
321sub update { 626sub update {
322 my ($self) = @_; 627 my ($self) = @_;
323 628
… …
326} 631}
327 632
328sub _draw { 633sub _draw {
329 my ($self) = @_; 634 my ($self) = @_;
330 635
331 $::MAP or return; 636 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
332 637
333 my ($w, $h) = @$self{qw(w h)}; 638 $self->{texture} or return;
334
335 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
336 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
337
338 my $sx = int $::CFG->{map_shift_x} / 32;
339 my $sy = int $::CFG->{map_shift_y} / 32;
340
341 my $ox = 0.5 * ($w - $sw);
342 my $oy = 0.5 * ($h - $sh);
343 639
344 glEnable GL_BLEND; 640 glEnable GL_BLEND;
345 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
346 glEnable GL_TEXTURE_2D; 642 glEnable GL_TEXTURE_2D;
347 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
348 644
349 if ($self->{texture_atime} < time) {
350 $self->{texture_atime} = time + 1/3;
351
352 $self->{texture} =
353 new CFClient::Texture
354 w => $w,
355 h => $h,
356 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;
358 }
359
360 $self->{texture}->draw_quad (0, 0); 645 $self->{texture}->draw_quad (0, 0);
361 646
362 glDisable GL_TEXTURE_2D; 647 glDisable GL_TEXTURE_2D;
363 648
364 glTranslate 0.375, 0.375; 649 glTranslate 0.375, 0.375;
365
366 #TODO: map scale is completely borked
367
368 my $x0 = int $ox - $sx + 0.5;
369 my $y0 = int $oy - $sy + 0.5;
370 650
371 glColor 1, 1, 0, 1; 651 glColor 1, 1, 0, 1;
372 glBegin GL_LINE_LOOP; 652 glBegin GL_LINE_LOOP;
373 glVertex $x0 , $y0 ; 653 glVertex $self->{x0} , $self->{y0} ;
374 glVertex $x0 , $y0 + $sh; 654 glVertex $self->{x0} , $self->{y0} + $self->{sh};
375 glVertex $x0 + $sw, $y0 + $sh; 655 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
376 glVertex $x0 + $sw, $y0 ; 656 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
377 glEnd; 657 glEnd;
378 658
379 glDisable GL_BLEND; 659 glDisable GL_BLEND;
380} 660}
381 661
382package CFClient::MapWidget::Command; 662package CFPlus::MapWidget::Command;
383 663
384use strict; 664use strict;
385 665
386use CFClient::OpenGL; 666use CFPlus::OpenGL;
387 667
388our @ISA = CFClient::UI::Frame::; 668our @ISA = CFPlus::UI::Frame::;
389 669
390sub new { 670sub new {
391 my $class = shift; 671 my $class = shift;
392 672
393 my $self = $class->SUPER::new ( 673 my $self = $class->SUPER::new (
394 bg => [0, 0, 0, 0.8], 674 bg => [0, 0, 0, 0.8],
395 @_, 675 @_,
396 ); 676 );
397 677
398 $self->add ($self->{vbox} = new CFClient::UI::VBox); 678 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
399 679
400 $self->{label} = [ 680 $self->{label} = [
401 map 681 map
402 CFClient::UI::Label->new ( 682 CFPlus::UI::Label->new (
403 can_hover => 1, 683 can_hover => 1,
404 can_events => 1, 684 can_events => 1,
405 tooltip_width => 0.33, 685 tooltip_width => 0.33,
406 fontsize => $_, 686 fontsize => $_,
407 ), (0.8) x 16 687 ), (0.8) x 16
408 ]; 688 ];
409 689
410 $self->{entry} = new CFClient::UI::Entry 690 $self->{entry} = new CFPlus::UI::Entry
411 connect_changed => sub { 691 on_changed => sub {
412 $self->update_labels; 692 $self->update_labels;
693 0
413 }, 694 },
695 on_button_down => sub {
696 my ($entry, $ev, $x, $y) = @_;
697
698 if ($ev->{button} == 3) {
699 (new CFPlus::UI::Menu
700 items => [
701 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
702 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
703 ],
704 )->popup ($ev);
705 return 1;
706 }
707 0
708 },
414 connect_key_down => sub { 709 on_key_down => sub {
415 my ($entry, $ev) = @_; 710 my ($entry, $ev) = @_;
416 711
417 my $self = $entry->{parent}{parent}; 712 my $self = $entry->{parent}{parent};
418 713
419 if ($ev->{sym} == 13) { 714 if ($ev->{sym} == 13) {
420 if (exists $self->{select}) { 715 if (exists $self->{select}) {
421 $self->{last_command} = $self->{select}; 716 $self->{last_command} = $self->{select};
422 $::CONN->user_send ($self->{select}); 717 $::CONN->user_send ($self->{select});
718
719 unshift @{$self->{history}}, $self->{entry}->get_text;
720 $self->{hist_ptr} = 0;
721
423 $self->hide; 722 $self->hide;
424 } 723 }
425 } elsif ($ev->{sym} == 27) { 724 } elsif ($ev->{sym} == 27) {
725 $self->{hist_ptr} = 0;
426 $self->hide; 726 $self->hide;
427 return;
428 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 727 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
728 if ($self->{hist_ptr} > 1) {
729 $self->{hist_ptr}--;
730 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
731 } elsif ($self->{hist_ptr} > 0) {
732 $self->{hist_ptr}--;
733 $self->{entry}->set_text ($self->{hist_saveback});
734 } else {
429 ++$self->{select_offset} 735 ++$self->{select_offset}
430 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 736 if $self->{select_offset} < $#{ $self->{last_match} || [] };
737 }
431 $self->update_labels; 738 $self->update_labels;
432 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 739 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
740 if ($self->{select_offset}) {
433 --$self->{select_offset} 741 --$self->{select_offset}
742 } else {
743 unless ($self->{hist_ptr}) {
744 $self->{hist_saveback} = $self->{entry}->get_text;
745 }
746 if ($self->{hist_ptr} <= $#{$self->{history}}) {
434 if $self->{select_offset}; 747 $self->{hist_ptr}++;
748 }
749 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
750 if exists $self->{history}->[$self->{hist_ptr} - 1];
751 }
435 $self->update_labels; 752 $self->update_labels;
436 } else { 753 } else {
437 return 0; 754 return 0;
438 } 755 }
439 756
… …
454 771
455 $self->{entry}->set_text ($prefix); 772 $self->{entry}->set_text ($prefix);
456 $self->show; 773 $self->show;
457} 774}
458 775
459sub size_allocate { 776sub invoke_size_allocate {
460 my ($self, $w, $h) = @_; 777 my ($self, $w, $h) = @_;
461 778
462 $self->SUPER::size_allocate ($w, $h);
463 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 779 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
780
781 $self->SUPER::invoke_size_allocate ($w, $h)
464} 782}
465 783
466sub show { 784sub show {
467 my ($self) = @_; 785 my ($self) = @_;
468 786
469 $self->SUPER::show; 787 $self->SUPER::show;
470 $self->{entry}->focus_in; 788 $self->{entry}->grab_focus;
471} 789}
472 790
473sub hide { 791sub hide {
474 my ($self) = @_; 792 my ($self) = @_;
793
794 $self->{hist_ptr} = 0;
475 795
476 $self->SUPER::hide; 796 $self->SUPER::hide;
477 $self->{entry}->set_text (""); 797 $self->{entry}->set_text ("");
478} 798}
479 799
480sub key_down { 800sub inject_key_down {
481 my ($self, $ev) = @_; 801 my ($self, $ev) = @_;
482 802
803 $self->{entry}->grab_focus;
483 $self->{entry}->key_down ($ev); 804 $self->{entry}->emit (key_down => $ev);
484} 805}
485 806
486sub update_labels { 807sub update_labels {
487 my ($self) = @_; 808 my ($self) = @_;
488 809
… …
521 842
522 @match = map $self->{command}{$_->[0]}, 843 @match = map $self->{command}{$_->[0]},
523 sort { 844 sort {
524 $a->[1] <=> $b->[1] 845 $a->[1] <=> $b->[1]
525 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 846 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
526 or (length $a->[0]) <=> (length $b->[0]) 847 or (length $b->[0]) <=> (length $a->[0])
527 } @match; 848 } @match;
528 } 849 }
529 850
530 $self->{last_search} = $cmd; 851 $self->{last_search} = $text;
531 $self->{last_match} = \@match; 852 $self->{last_match} = \@match;
532 853
533 $self->{select_offset} = 0; 854 $self->{select_offset} = 0;
534 } 855 }
535 856
… …
575 $label->set_text (""); 896 $label->set_text ("");
576 $label->set_tooltip (""); 897 $label->set_tooltip ("");
577 } 898 }
578 899
579 $self->update; 900 $self->update;
580 ###
581} 901}
582 902
583sub _draw { 903sub _draw {
584 my ($self) = @_; 904 my ($self) = @_;
585 905
586 # hack 906 # hack
587 local $CFClient::UI::FOCUS = $self->{entry}; 907 local $CFPlus::UI::FOCUS = $self->{entry};
588 908
589 $self->SUPER::_draw; 909 $self->SUPER::_draw;
590} 910}
591 911
5921 9121
913

Diff Legend

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