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

Diff Legend

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