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

Diff Legend

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