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.58 by elmex, Tue Jun 13 14:35:17 2006 UTC vs.
Revision 1.84 by root, Sun Oct 1 18:17:38 2006 UTC

1package CFClient::MapWidget; 1package CFPlus::MapWidget;
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus;
8use CFClient::OpenGL; 9use CFPlus::OpenGL;
10use CFPlus::UI;
9 11
10our @ISA = CFClient::UI::Base::; 12our @ISA = CFPlus::UI::Base::;
13
14my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11 17
12sub new { 18sub new {
13 my $class = shift; 19 my $class = shift;
14 20
15 my $self = $class->SUPER::new ( 21 my $self = $class->SUPER::new (
… …
24 ], 30 ],
25 31
26 @_ 32 @_
27 ); 33 );
28 34
29 $self->{completer} = new CFClient::MapWidget::Command:: 35 $self->{completer} = new CFPlus::MapWidget::Command::
30 command => $self->{command}, 36 command => $self->{command},
31 can_focus => 1, 37 tooltip => "#completer_help",
32 tooltip => "<b>The Command Completer</b>\n\n"
33 . "This is your central interface to send text commands to the server. "
34 . "To enter a verbatim command to send to the server, just type the command, "
35 . "followed by a space, and press return. "
36 . "Typing the initial letters of words (or just any letters) displays guesses "
37 . "for commands you might want to use.\n"
38 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
39 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
40 ; 38 ;
41 39
42 $self 40 $self
43} 41}
44 42
… …
56 54
57sub clr_commands { 55sub clr_commands {
58 my ($self) = @_; 56 my ($self) = @_;
59 57
60 %{$self->{completer}{command}} = (); 58 %{$self->{completer}{command}} = ();
61}
62 59
60 $self->{completer}->hide
61 if $self->{completer};
62}
63
64sub test_server_login {
65 return unless
66 $::CONN && length $::CONN->{test_server};
67
68 my $server = $::CONN->{test_server};
69 ::stop_game ();
70 local $::PROFILE->{host} = $server;
71 ::start_game ();
72}
73
74sub editor_invoke {
75 return unless $::CONN;
76
77 # putting the password into the env is somewhat tasteless
78 local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user};
79 local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password};
80 local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload};
81 local $ENV{CROSSFIRE_MAPDIR} = $::CONN->{cvs_root};
82
83 CFPlus::set_proxy;
84
85 my $map = "map:$::CONN->{map_info}[0]";
86
87 if (fork == 0) {
88 $SIG{__DIE__} = sub {
89 warn "@_";
90 CFPlus::_exit 99;
91 };
92
93 # TODO: move into editor
94 require LWP::UserAgent;
95
96 my $ua = LWP::UserAgent->new (
97 agent => "cfplus $CFPlus::VERSION",
98 keep_alive => 1,
99 env_proxy => 1,
100 );
101
102 if ($map =~ /^map:(.*)/) {
103 my $mapname = $1;
104 # try to get the most recent head revision, what a hack
105 my $log = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?view=log&logsort=rev")->decoded_content;
106
107 if ($log =~ /\?rev=(\d+\.\d+)"/) {
108 my $rev = $1;
109 my $map = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?rev=$rev")->decoded_content;
110 warn "revision is $rev " .(length $map)."\n";#d#
111
112 # now upload it
113 my $comment = "some comment";
114
115 require HTTP::Request::Common;
116
117 my $res = $ua->post (
118 $ENV{CFPLUS_UPLOAD},
119 Content_Type => 'multipart/form-data',
120 Content => [
121 path => $mapname,
122 mapdir => $ENV{CROSSFIRE_MAPDIR},
123 map => $map,
124 revision => $rev,
125 cf_login => $ENV{CFPLUS_LOGIN},
126 cf_password => $ENV{CFPLUS_PASSWORD},
127 comment => "",
128 ]
129 );
130
131 if ($res->is_error) {
132 # fatal condition
133 warn $res->status_line;
134 } else {
135 # script replies are marked as {{..}}
136 my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
137 warn map "$_\n", @msgs;
138 }
139 } else {
140 # error, could not detect revision
141 }
142 }
143
144 CFPlus::_exit;
145 }
146}
147
63sub button_down { 148sub invoke_button_down {
64 my ($self, $ev, $x, $y) = @_; 149 my ($self, $ev, $x, $y) = @_;
65 150
66 $self->focus_in;
67
68 if ($ev->{button} == 1) { 151 if ($ev->{button} == 1) {
69 my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}); 152 $self->grab_focus;
70 my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}); 153 return unless $::CONN;
71
72 $x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
73 $y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
74 154
155 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
156 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
157
75 $x -= int 0.5 * $::MAP->w; 158 $x -= int 0.5 * $self->{sw};
76 $y -= int 0.5 * $::MAP->h; 159 $y -= int 0.5 * $self->{sh};
77
78 $x += 1;
79 $y += 1;
80 160
81 $::CONN->lookat ($x, $y) 161 $::CONN->lookat ($x, $y)
82 if $::CONN; 162 if $::CONN;
83 163
84 } elsif ($ev->{button} == 2) { 164 } elsif ($ev->{button} == 2) {
165 $self->grab_focus;
166 return unless $::CONN;
167
85 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 168 my ($ox, $oy) = ($ev->{x}, $ev->{y});
86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 169 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87 170
88 $self->{motion} = sub { 171 $self->{motion} = sub {
89 my ($ev, $x, $y) = @_; 172 my ($ev, $x, $y) = @_;
… …
93 $::CFG->{map_shift_x} = $bw + $x - $ox; 176 $::CFG->{map_shift_x} = $bw + $x - $ox;
94 $::CFG->{map_shift_y} = $bh + $y - $oy; 177 $::CFG->{map_shift_y} = $bh + $y - $oy;
95 178
96 $self->update; 179 $self->update;
97 }; 180 };
181 } elsif ($ev->{button} == 3) {
182 (new CFPlus::UI::Menu
183 items => [
184 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
185 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
186 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
187 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
188 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
189 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
190 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
191 [
192 $::PICKUP_ENABLE->{state}
193 ? "Disable automatic pickup"
194 : "Enable automatic pickup",
195 sub { $::PICKUP_ENABLE->toggle }
196 ],
197 $::CONN && length $::CONN->{cvs_root}
198 ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
199 \&editor_invoke]
200 : (),
201 $::CONN && length $::CONN->{test_server}
202 ? ["Login on Test Server <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{test_server}) . ")</span>",
203 \&test_server_login]
204 : (),
205 ["Quit",
206 sub {
207 if ($::CONN) {
208 &::open_quit_dialog;
209 } else {
210 exit;
211 }
212 }
213 ],
214 ],
215 )->popup ($ev);
98 } 216 }
99 217
100 1 218 1
101} 219}
102 220
103sub button_up { 221sub invoke_button_up {
104 my ($self, $ev, $x, $y) = @_; 222 my ($self, $ev, $x, $y) = @_;
105 223
106 delete $self->{motion}; 224 delete $self->{motion};
107 225
108 1 226 1
109} 227}
110 228
111sub mouse_motion { 229sub invoke_mouse_motion {
112 my ($self, $ev, $x, $y) = @_; 230 my ($self, $ev, $x, $y) = @_;
113 231
114 if ($self->{motion}) { 232 if ($self->{motion}) {
115 $self->{motion}->($ev, $x, $y); 233 $self->{motion}->($ev, $x, $y);
116 } else { 234 } else {
… …
120 1 238 1
121} 239}
122 240
123sub size_request { 241sub size_request {
124 ( 242 (
125 1 + 32 * int $::WIDTH / 32, 243 32 * CFPlus::ceil $::WIDTH / 32,
126 1 + 32 * int $::HEIGHT / 32, 244 32 * CFPlus::ceil $::HEIGHT / 32,
127 ) 245 )
128} 246}
129 247
130sub update { 248sub update {
131 my ($self) = @_; 249 my ($self) = @_;
… …
133 $self->{need_update} = 1; 251 $self->{need_update} = 1;
134 $self->SUPER::update; 252 $self->SUPER::update;
135} 253}
136 254
137my %DIR = ( 255my %DIR = (
138 CFClient::SDLK_KP8, [1, "north"], 256 CFPlus::SDLK_KP8, [1, "north"],
139 CFClient::SDLK_KP9, [2, "northeast"], 257 CFPlus::SDLK_KP9, [2, "northeast"],
140 CFClient::SDLK_KP6, [3, "east"], 258 CFPlus::SDLK_KP6, [3, "east"],
141 CFClient::SDLK_KP3, [4, "southeast"], 259 CFPlus::SDLK_KP3, [4, "southeast"],
142 CFClient::SDLK_KP2, [5, "south"], 260 CFPlus::SDLK_KP2, [5, "south"],
143 CFClient::SDLK_KP1, [6, "southwest"], 261 CFPlus::SDLK_KP1, [6, "southwest"],
144 CFClient::SDLK_KP4, [7, "west"], 262 CFPlus::SDLK_KP4, [7, "west"],
145 CFClient::SDLK_KP7, [8, "northwest"], 263 CFPlus::SDLK_KP7, [8, "northwest"],
146 264
147 CFClient::SDLK_UP, [1, "north"], 265 CFPlus::SDLK_UP, [1, "north"],
148 CFClient::SDLK_RIGHT, [3, "east"], 266 CFPlus::SDLK_RIGHT, [3, "east"],
149 CFClient::SDLK_DOWN, [5, "south"], 267 CFPlus::SDLK_DOWN, [5, "south"],
150 CFClient::SDLK_LEFT, [7, "west"], 268 CFPlus::SDLK_LEFT, [7, "west"],
151); 269);
152 270
153sub key_down { 271sub invoke_key_down {
154 my ($self, $ev) = @_; 272 my ($self, $ev) = @_;
155
156 return 0 unless $::CONN;
157 273
158 my $mod = $ev->{mod}; 274 my $mod = $ev->{mod};
159 my $sym = $ev->{sym}; 275 my $sym = $ev->{sym};
160 my $uni = $ev->{unicode}; 276 my $uni = $ev->{unicode};
161 277
162 if ($sym == CFClient::SDLK_KP5) { 278 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
279
280 if ($uni == ord "\t") {
281 $::PL_WINDOW->toggle_visibility;
282 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
283 $::HELP_WINDOW->toggle_visibility;
284 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
285 ::toggle_player_page ($::STATS_PAGE);
286 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
287 ::toggle_player_page ($::SKILL_PAGE);
288 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
289 ::toggle_player_page ($::SPELL_PAGE);
290 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
291 ::toggle_player_page ($::INVENTORY_PAGE);
292 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
293 $::SETUP_DIALOG->toggle_visibility;
294 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
295 $::BIND_EDITOR->set_binding (undef, undef, [],
296 sub {
297 my ($mod, $sym, $cmds) = @_;
298 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
299 });
300 $::BIND_EDITOR->start;
301 $::BIND_EDITOR->show;
302#TODO: elmex, what was this supposed to do? it currently crashes the client.
303# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
304# $::BIND_EDITOR->stop;
305# $::BIND_EDITOR->ask_for_bind_and_commit;
306# $::BIND_EDITOR->hide;
307 } elsif (!$::CONN) {
308 return 0; # bindings further down need a valid connection
309
310 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
163 $::CONN->user_send ("stay fire"); 311 $::CONN->user_send ("stay fire");
164 } elsif ($uni == ord ",") { 312 } elsif ($uni == ord ",") {
165 $::CONN->user_send ("take"); 313 $::CONN->user_send ("take");
166 } elsif ($uni == ord " ") { 314 } elsif ($uni == ord " ") {
167 $::CONN->user_send ("apply"); 315 $::CONN->user_send ("apply");
316 } elsif ($uni == 13) {
317 $::CONN->user_send ("examine");
168 } elsif ($uni == ord ".") { 318 } elsif ($uni == ord ".") {
169 $::CONN->user_send ($self->{completer}{last_command}) 319 $::CONN->user_send ($self->{completer}{last_command})
170 if exists $self->{completer}{last_command}; 320 if exists $self->{completer}{last_command};
171 } elsif ($uni == ord "\t") { 321 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
172 $::INV_WINDOW->toggle_visibility; 322 $::CONN->user_send ($_) for @$bind_cmd;
173 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 323 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
174 $::CONN->user_send ("rotateshoottype +"); 324 $::CONN->user_send ("rotateshoottype +");
175 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 325 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
176 $::CONN->user_send ("rotateshoottype -"); 326 $::CONN->user_send ("rotateshoottype -");
177 } elsif ($uni == ord '"') { 327 } elsif ($uni == ord '"') {
178 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 328 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
179 $self->{completer}->show; 329 $self->{completer}->show;
180 } elsif ($uni == ord "'") { 330 } elsif ($uni == ord "'") {
181 $self->{completer}->set_prefix (""); 331 $self->{completer}->set_prefix ("");
182 $self->{completer}->show; 332 $self->{completer}->show;
183 } elsif (exists $DIR{$sym}) { 333 } elsif (exists $DIR{$sym}) {
184 if ($mod & CFClient::KMOD_SHIFT) { 334 if ($mod & CFPlus::KMOD_SHIFT) {
185 $self->{shft}++; 335 $self->{shft}++;
186 if ($DIR{$sym}[0] != $self->{fire_dir}) { 336 if ($DIR{$sym}[0] != $self->{fire_dir}) {
187 $::CONN->user_send ("fire $DIR{$sym}[0]"); 337 $::CONN->user_send ("fire $DIR{$sym}[0]");
188 } 338 }
189 $self->{fire_dir} = $DIR{$sym}[0]; 339 $self->{fire_dir} = $DIR{$sym}[0];
190 } elsif ($mod & CFClient::KMOD_CTRL) { 340 } elsif ($mod & CFPlus::KMOD_CTRL) {
191 $self->{ctrl}++; 341 $self->{ctrl}++;
192 $::CONN->user_send ("run $DIR{$sym}[0]"); 342 $::CONN->user_send ("run $DIR{$sym}[0]");
193 } else { 343 } else {
194 $::CONN->user_send ("$DIR{$sym}[1]"); 344 $::CONN->user_send ("$DIR{$sym}[1]");
195 } 345 }
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 $::CFG->{bindings}->{$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 (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
209 $::CONN->user_send ($_) for @$bind_cmd;
210 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 346 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
211 $self->{completer}->key_down ($ev); 347 $self->{completer}->inject_key_down ($ev);
212 $self->{completer}->show; 348 $self->{completer}->show;
213 } else { 349 } else {
214 return 0; 350 return 0;
215 } 351 }
216 352
217 1 353 1
218} 354}
219 355
220sub key_up { 356sub invoke_key_up {
221 my ($self, $ev) = @_; 357 my ($self, $ev) = @_;
222 358
223 my $res = 0; 359 my $res = 0;
224 my $mod = $ev->{mod}; 360 my $mod = $ev->{mod};
225 my $sym = $ev->{sym}; 361 my $sym = $ev->{sym};
226 362
227 if ($::CFG->{shift_fire_stop}) { 363 if ($::CFG->{shift_fire_stop}) {
228 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 364 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
229 $::CONN->user_send ("fire_stop"); 365 $::CONN->user_send ("fire_stop");
230 delete $self->{fire_dir}; 366 delete $self->{fire_dir};
231 $res = 1; 367 $res = 1;
232 } 368 }
233 } else { 369 } else {
234 if (exists $DIR{$sym} && delete $self->{shft}) { 370 if (exists $DIR{$sym} && delete $self->{shft}) {
235 $::CONN->user_send ("fire_stop"); 371 $::CONN->user_send ("fire_stop");
236 delete $self->{fire_dir}; 372 delete $self->{fire_dir};
237 $res = 1; 373 $res = 1;
238 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 374 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
239 $::CONN->user_send ("fire_stop"); 375 $::CONN->user_send ("fire_stop");
240 delete $self->{fire_dir}; 376 delete $self->{fire_dir};
241 $res = 1; 377 $res = 1;
242 } 378 }
243 } 379 }
244 380
245 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 381 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
246 $::CONN->user_send ("run_stop"); 382 $::CONN->user_send ("run_stop");
247 $res = 1; 383 $res = 1;
248 } 384 }
249 385
250 $res 386 $res
251} 387}
252 388
389sub set_magicmap {
390 my ($self, $w, $h, $x, $y, $data) = @_;
391
392 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
393 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
394
395 $self->{magicmap} = [$x, $y, $w, $h, $data];
396
397 $self->update;
398}
399
253sub draw { 400sub draw {
254 my ($self) = @_; 401 my ($self) = @_;
255 402
403 return unless $::MAP;
404
256 my $focused = $CFClient::UI::FOCUS == $self 405 my $focused = $CFPlus::UI::FOCUS == $self
257 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 406 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
258 407
259 return 408 return
260 unless $focused || !$::FAST; 409 unless $focused || !$::FAST;
261 410
262 if (delete $self->{need_update}) { 411 if (delete $self->{need_update}) {
412 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
413
414 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
415 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
416
417 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
418 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
419
420 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
421 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
422
423 if ($::CFG->{fow_enable}) {
424 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
425
426 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
427 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
428 glConvolutionFilter2D (
429 GL_CONVOLUTION_2D,
430 GL_ALPHA,
431 3, 3,
432 GL_ALPHA, GL_FLOAT,
433 (pack "f*", @{ $self->{smooth_matrix} }),
434 );
435 glEnable GL_CONVOLUTION_2D;
436 }
437
438 $self->{fow_texture} = new CFPlus::Texture
439 w => $w,
440 h => $h,
441 data => $data,
442 internalformat => GL_ALPHA,
443 format => GL_ALPHA;
444
445 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
446 } else {
447 delete $self->{fow_texture};
448 }
449
263 glNewList $self->{list}; 450 glNewList $self->{list};
264 451
265 if ($::MAP) {
266 my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
267 my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
268
269 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};
270 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale};
271 my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;
272 my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
273
274 glPushMatrix; 452 glPushMatrix;
453 glTranslate $sx0, $sy0;
275 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 454 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
276 455
277 glTranslate $sx0, $sy0; 456 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
278 457
279 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 458 glScale 32, 32;
280 459
281 if ($::CFG->{fow_enable}) { 460 if (my $tex = $self->{fow_texture}) {
282 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
283 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
284 glConvolutionFilter2D (
285 GL_CONVOLUTION_2D,
286 GL_ALPHA,
287 3, 3,
288 GL_ALPHA, GL_FLOAT,
289 (pack "f*", @{ $self->{smooth_matrix} }),
290 );
291 glEnable GL_CONVOLUTION_2D;
292 }
293
294 $self->{fow_texture_name} ||= glGenTexture;
295 # try to re-use the texture name: TODO improve texture class instead
296
297 $self->{fow_texture} = new CFClient::Texture
298 w => $w,
299 h => $h,
300 data => $data,
301 name => $self->{fow_texture_name},
302 internalformat => GL_ALPHA,
303 format => GL_ALPHA;
304
305 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
306
307 glEnable GL_TEXTURE_2D; 461 glEnable GL_TEXTURE_2D;
308 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 462 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
309 463
310 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 464 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
311 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 465 $self->{fow_texture}->draw_quad_alpha (0, 0);
312 466
313 glDisable GL_TEXTURE_2D; 467 glDisable GL_TEXTURE_2D;
314 } 468 }
315 469
470 if ($self->{magicmap}) {
471 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
472
473 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
474 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
475
476 glTranslate - $x - 1, - $y - 1;
477 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
478 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
479 }
480
316 glPopMatrix; 481 glPopMatrix;
317 }
318
319 glEndList; 482 glEndList;
320 } 483 }
321 484
322 glPushMatrix;
323 glCallList $self->{list}; 485 glCallList $self->{list};
324 glPopMatrix;
325 486
326 # TNT2 emulates logops in software (or worse :) 487 # TNT2 emulates logops in software (or worse :)
327 if ($focused) { 488 unless ($focused) {
328 (delete $self->{out_of_focus})->destroy
329 if $self->{out_of_focus};
330 } else {
331 glColor 0.4, 0.2, 0.2, 0.6; 489 glColor 0.4, 0.2, 0.2, 0.6;
332 glEnable GL_BLEND; 490 glEnable GL_BLEND;
333 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
334 glBegin GL_QUADS; 492 glBegin GL_QUADS;
335 glVertex 0, 0; 493 glVertex 0, 0;
336 glVertex 0, $::HEIGHT; 494 glVertex 0, $::HEIGHT;
337 glVertex $::WIDTH, $::HEIGHT; 495 glVertex $::WIDTH, $::HEIGHT;
338 glVertex $::WIDTH, 0; 496 glVertex $::WIDTH, 0;
339 glEnd; 497 glEnd;
340 glDisable GL_BLEND; 498 glDisable GL_BLEND;
341
342# $self->{out_of_focus} ||= do {
343# my $label = new CFClient::UI::Label
344# x => 0,
345# y => 0,
346# z => 1,
347# ellipsise => 0,
348# text => "map out of focus (click map to play)";
349#
350# $label->show;
351# $label->update;
352#
353# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
354# $label->move_abs (
355# ($::WIDTH - $label->{w}) * 0.5,
356# ($::HEIGHT - $label->{h}) * 0.5,
357# );
358# });
359#
360# $label
361# };
362 } 499 }
363} 500}
364 501
365sub DESTROY { 502sub DESTROY {
366 my $self = shift; 503 my $self = shift;
… …
368 glDeleteList $self->{list}; 505 glDeleteList $self->{list};
369 506
370 $self->SUPER::DESTROY; 507 $self->SUPER::DESTROY;
371} 508}
372 509
373package CFClient::MapWidget::MapMap; 510package CFPlus::MapWidget::MapMap;
374 511
375our @ISA = CFClient::UI::Base::; 512our @ISA = CFPlus::UI::Base::;
376 513
377use Time::HiRes qw(time); 514use Time::HiRes qw(time);
378use CFClient::OpenGL; 515use CFPlus::OpenGL;
379 516
380sub size_request { 517sub size_request {
381 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 518 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
382} 519}
383 520
384sub size_allocate { 521sub invoke_size_allocate {
385 my ($self, $w, $h) = @_; 522 my ($self, $w, $h) = @_;
386 523
387 $self->SUPER::size_allocate ($w, $h);
388 $self->update; 524 $self->update;
525
526 1
389} 527}
390 528
391sub update { 529sub update {
392 my ($self) = @_; 530 my ($self) = @_;
393 531
… …
418 556
419 if ($self->{texture_atime} < time) { 557 if ($self->{texture_atime} < time) {
420 $self->{texture_atime} = time + 1/3; 558 $self->{texture_atime} = time + 1/3;
421 559
422 $self->{texture} = 560 $self->{texture} =
423 new CFClient::Texture 561 new CFPlus::Texture
424 w => $w, 562 w => $w,
425 h => $h, 563 h => $h,
426 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 564 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
427 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 565 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
428 } 566 }
429 567
430 $self->{texture}->draw_quad (0, 0); 568 $self->{texture}->draw_quad (0, 0);
431 569
432 glDisable GL_TEXTURE_2D; 570 glDisable GL_TEXTURE_2D;
… …
447 glEnd; 585 glEnd;
448 586
449 glDisable GL_BLEND; 587 glDisable GL_BLEND;
450} 588}
451 589
452package CFClient::MapWidget::Command; 590package CFPlus::MapWidget::Command;
453 591
454use strict; 592use strict;
455 593
456use CFClient::OpenGL; 594use CFPlus::OpenGL;
457 595
458our @ISA = CFClient::UI::Frame::; 596our @ISA = CFPlus::UI::Frame::;
459 597
460sub new { 598sub new {
461 my $class = shift; 599 my $class = shift;
462 600
463 my $self = $class->SUPER::new ( 601 my $self = $class->SUPER::new (
464 bg => [0, 0, 0, 0.8], 602 bg => [0, 0, 0, 0.8],
465 @_, 603 @_,
466 ); 604 );
467 605
468 $self->add ($self->{vbox} = new CFClient::UI::VBox); 606 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
469 607
470 $self->{label} = [ 608 $self->{label} = [
471 map 609 map
472 CFClient::UI::Label->new ( 610 CFPlus::UI::Label->new (
473 can_hover => 1, 611 can_hover => 1,
474 can_events => 1, 612 can_events => 1,
475 tooltip_width => 0.33, 613 tooltip_width => 0.33,
476 fontsize => $_, 614 fontsize => $_,
477 ), (0.8) x 16 615 ), (0.8) x 16
478 ]; 616 ];
479 617
480 $self->{entry} = new CFClient::UI::Entry 618 $self->{entry} = new CFPlus::UI::Entry
481 on_changed => sub { 619 on_changed => sub {
482 $self->update_labels; 620 $self->update_labels;
621 0
483 }, 622 },
484 on_button_down => sub { 623 on_button_down => sub {
485 my ($entry, $ev, $x, $y) = @_; 624 my ($entry, $ev, $x, $y) = @_;
486 625
487 if ($ev->{button} == 3) { 626 if ($ev->{button} == 3) {
488 (new CFClient::UI::Menu 627 (new CFPlus::UI::Menu
489 items => [ 628 items => [
629 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
490 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }] 630 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
491 ], 631 ],
492 )->popup ($ev); 632 )->popup ($ev);
493 return 1; 633 return 1;
494 } 634 }
495 0 635 0
… …
502 if ($ev->{sym} == 13) { 642 if ($ev->{sym} == 13) {
503 if (exists $self->{select}) { 643 if (exists $self->{select}) {
504 $self->{last_command} = $self->{select}; 644 $self->{last_command} = $self->{select};
505 $::CONN->user_send ($self->{select}); 645 $::CONN->user_send ($self->{select});
506 646
507 unshift @{$self->{history}}, $self->{select}; 647 unshift @{$self->{history}}, $self->{entry}->get_text;
508 $self->{hist_ptr} = 0; 648 $self->{hist_ptr} = 0;
509 649
510 $self->hide; 650 $self->hide;
511 } 651 }
512 } elsif ($ev->{sym} == 27) { 652 } elsif ($ev->{sym} == 27) {
513 $self->{hist_ptr} = 0; 653 $self->{hist_ptr} = 0;
514 $self->hide; 654 $self->hide;
515 return;
516 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 655 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
517 if ($self->{hist_ptr} > 1) { 656 if ($self->{hist_ptr} > 1) {
518 $self->{hist_ptr}--; 657 $self->{hist_ptr}--;
519 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 658 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
520 } elsif ($self->{hist_ptr} > 0) { 659 } elsif ($self->{hist_ptr} > 0) {
521 $self->{hist_ptr}--; 660 $self->{hist_ptr}--;
… …
523 } else { 662 } else {
524 ++$self->{select_offset} 663 ++$self->{select_offset}
525 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 664 if $self->{select_offset} < $#{ $self->{last_match} || [] };
526 } 665 }
527 $self->update_labels; 666 $self->update_labels;
528 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 667 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
529 if ($self->{select_offset}) { 668 if ($self->{select_offset}) {
530 --$self->{select_offset} 669 --$self->{select_offset}
531 } else { 670 } else {
532 unless ($self->{hist_ptr}) { 671 unless ($self->{hist_ptr}) {
533 $self->{hist_saveback} = $self->{entry}->get_text; 672 $self->{hist_saveback} = $self->{entry}->get_text;
… …
560 699
561 $self->{entry}->set_text ($prefix); 700 $self->{entry}->set_text ($prefix);
562 $self->show; 701 $self->show;
563} 702}
564 703
565sub size_allocate { 704sub invoke_size_allocate {
566 my ($self, $w, $h) = @_; 705 my ($self, $w, $h) = @_;
567 706
568 $self->SUPER::size_allocate ($w, $h);
569 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 707 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
708
709 $self->SUPER::invoke_size_allocate ($w, $h)
570} 710}
571 711
572sub show { 712sub show {
573 my ($self) = @_; 713 my ($self) = @_;
574 714
575 $self->SUPER::show; 715 $self->SUPER::show;
576 $self->{entry}->focus_in; 716 $self->{entry}->grab_focus;
577} 717}
578 718
579sub hide { 719sub hide {
580 my ($self) = @_; 720 my ($self) = @_;
581 721
722 $self->{hist_ptr} = 0;
723
582 $self->SUPER::hide; 724 $self->SUPER::hide;
583 $self->{entry}->set_text (""); 725 $self->{entry}->set_text ("");
584} 726}
585 727
586sub key_down { 728sub inject_key_down {
587 my ($self, $ev) = @_; 729 my ($self, $ev) = @_;
588 730
731 $self->{entry}->grab_focus;
589 $self->{entry}->key_down ($ev) 732 $self->{entry}->emit (key_down => $ev);
590} 733}
591 734
592sub update_labels { 735sub update_labels {
593 my ($self) = @_; 736 my ($self) = @_;
594 737
… …
681 $label->set_text (""); 824 $label->set_text ("");
682 $label->set_tooltip (""); 825 $label->set_tooltip ("");
683 } 826 }
684 827
685 $self->update; 828 $self->update;
686 ###
687} 829}
688 830
689sub _draw { 831sub _draw {
690 my ($self) = @_; 832 my ($self) = @_;
691 833
692 # hack 834 # hack
693 local $CFClient::UI::FOCUS = $self->{entry}; 835 local $CFPlus::UI::FOCUS = $self->{entry};
694 836
695 $self->SUPER::_draw; 837 $self->SUPER::_draw;
696} 838}
697 839
6981 8401

Diff Legend

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