ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.36 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.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 (
16 z => -1, 22 z => -1,
17 can_focus => 1, 23 can_focus => 1,
18 list => glGenList, 24 list => glGenList,
25
26 smooth_matrix => [
27 0.05, 0.13, 0.05,
28 0.13, 0.30, 0.13,
29 0.05, 0.13, 0.05,
30 ],
31
19 @_ 32 @_
20 ); 33 );
21 34
22 $self->{completer} = new CFClient::MapWidget::Command:: 35 $self->{completer} = new CFPlus::MapWidget::Command::
23 command => $self->{command}, 36 command => $self->{command},
24 can_focus => 1, 37 tooltip => "#completer_help",
25 ; 38 ;
26 39
27 $self 40 $self
28} 41}
29 42
… …
31 my ($self, $command, $tooltip, $widget, $cb) = @_; 44 my ($self, $command, $tooltip, $widget, $cb) = @_;
32 45
33 (my $data = $command) =~ s/\\//g; 46 (my $data = $command) =~ s/\\//g;
34 47
35 $tooltip =~ s/^\s+//; 48 $tooltip =~ s/^\s+//;
36
37 $tooltip = "<big>$data</big>\n\n$tooltip"; 49 $tooltip = "<big>$data</big>\n\n$tooltip";
38
39 $tooltip =~ s/\s+$//; 50 $tooltip =~ s/\s+$//;
40 51
41 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 52 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
42} 53}
43 54
44sub clr_commands { 55sub clr_commands {
45 my ($self) = @_; 56 my ($self) = @_;
46 57
47 %{$self->{completer}{command}} = (); 58 %{$self->{completer}{command}} = ();
48}
49 59
60 $self->{completer}->hide
61 if $self->{completer};
62}
63
64sub 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
50sub button_down { 148sub invoke_button_down {
51 my ($self, $ev, $x, $y) = @_; 149 my ($self, $ev, $x, $y) = @_;
52 150
53 $self->focus_in;
54
55 if ($ev->{button} == 2) { 151 if ($ev->{button} == 1) {
152 $self->grab_focus;
153 return unless $::CONN;
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
158 $x -= int 0.5 * $self->{sw};
159 $y -= int 0.5 * $self->{sh};
160
161 $::CONN->lookat ($x, $y)
162 if $::CONN;
163
164 } elsif ($ev->{button} == 2) {
165 $self->grab_focus;
166 return unless $::CONN;
167
56 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 168 my ($ox, $oy) = ($ev->{x}, $ev->{y});
57 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 169 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
58 170
59 $self->{motion} = sub { 171 $self->{motion} = sub {
60 my ($ev, $x, $y) = @_; 172 my ($ev, $x, $y) = @_;
… …
64 $::CFG->{map_shift_x} = $bw + $x - $ox; 176 $::CFG->{map_shift_x} = $bw + $x - $ox;
65 $::CFG->{map_shift_y} = $bh + $y - $oy; 177 $::CFG->{map_shift_y} = $bh + $y - $oy;
66 178
67 $self->update; 179 $self->update;
68 }; 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);
216 }
217
69 } 218 1
70} 219}
71 220
72sub button_up { 221sub invoke_button_up {
73 my ($self, $ev, $x, $y) = @_; 222 my ($self, $ev, $x, $y) = @_;
74 223
75 delete $self->{motion}; 224 delete $self->{motion};
76}
77 225
226 1
227}
228
78sub mouse_motion { 229sub invoke_mouse_motion {
79 my ($self, $ev, $x, $y) = @_; 230 my ($self, $ev, $x, $y) = @_;
80 231
232 if ($self->{motion}) {
81 $self->{motion}->($ev, $x, $y) if $self->{motion}; 233 $self->{motion}->($ev, $x, $y);
234 } else {
235 return 0;
236 }
237
238 1
82} 239}
83 240
84sub size_request { 241sub size_request {
85 ( 242 (
86 1 + 32 * int $::WIDTH / 32, 243 32 * CFPlus::ceil $::WIDTH / 32,
87 1 + 32 * int $::HEIGHT / 32, 244 32 * CFPlus::ceil $::HEIGHT / 32,
88 ) 245 )
89} 246}
90 247
91sub update { 248sub update {
92 my ($self) = @_; 249 my ($self) = @_;
… …
94 $self->{need_update} = 1; 251 $self->{need_update} = 1;
95 $self->SUPER::update; 252 $self->SUPER::update;
96} 253}
97 254
98my %DIR = ( 255my %DIR = (
99 CFClient::SDLK_KP8, [1, "north"], 256 CFPlus::SDLK_KP8, [1, "north"],
100 CFClient::SDLK_KP9, [2, "northeast"], 257 CFPlus::SDLK_KP9, [2, "northeast"],
101 CFClient::SDLK_KP6, [3, "east"], 258 CFPlus::SDLK_KP6, [3, "east"],
102 CFClient::SDLK_KP3, [4, "southeast"], 259 CFPlus::SDLK_KP3, [4, "southeast"],
103 CFClient::SDLK_KP2, [5, "south"], 260 CFPlus::SDLK_KP2, [5, "south"],
104 CFClient::SDLK_KP1, [6, "southwest"], 261 CFPlus::SDLK_KP1, [6, "southwest"],
105 CFClient::SDLK_KP4, [7, "west"], 262 CFPlus::SDLK_KP4, [7, "west"],
106 CFClient::SDLK_KP7, [8, "northwest"], 263 CFPlus::SDLK_KP7, [8, "northwest"],
107 264
108 CFClient::SDLK_UP, [1, "north"], 265 CFPlus::SDLK_UP, [1, "north"],
109 CFClient::SDLK_RIGHT, [3, "east"], 266 CFPlus::SDLK_RIGHT, [3, "east"],
110 CFClient::SDLK_DOWN, [5, "south"], 267 CFPlus::SDLK_DOWN, [5, "south"],
111 CFClient::SDLK_LEFT, [7, "west"], 268 CFPlus::SDLK_LEFT, [7, "west"],
112); 269);
113 270
114sub key_down { 271sub invoke_key_down {
115 my ($self, $ev) = @_; 272 my ($self, $ev) = @_;
116
117 return unless $::CONN;
118 273
119 my $mod = $ev->{mod}; 274 my $mod = $ev->{mod};
120 my $sym = $ev->{sym}; 275 my $sym = $ev->{sym};
121 my $uni = $ev->{unicode}; 276 my $uni = $ev->{unicode};
122 277
123 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) {
124 $::CONN->user_send ("stay fire"); 311 $::CONN->user_send ("stay fire");
125 } elsif ($uni == ord ",") { 312 } elsif ($uni == ord ",") {
126 $::CONN->user_send ("take"); 313 $::CONN->user_send ("take");
127 } elsif ($uni == ord " ") { 314 } elsif ($uni == ord " ") {
128 $::CONN->user_send ("apply"); 315 $::CONN->user_send ("apply");
316 } elsif ($uni == 13) {
317 $::CONN->user_send ("examine");
129 } elsif ($uni == ord "\t") { 318 } elsif ($uni == ord ".") {
130 # TODO: toggle inventory 319 $::CONN->user_send ($self->{completer}{last_command})
320 if exists $self->{completer}{last_command};
321 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
322 $::CONN->user_send ($_) for @$bind_cmd;
131 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 323 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
132 $::CONN->user_send ("rotateshoottype +"); 324 $::CONN->user_send ("rotateshoottype +");
133 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 325 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
134 $::CONN->user_send ("rotateshoottype -"); 326 $::CONN->user_send ("rotateshoottype -");
135 } elsif ($uni == ord '"') { 327 } elsif ($uni == ord '"') {
136 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 328 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
137 $self->{completer}->show; 329 $self->{completer}->show;
138 } elsif ($uni == ord "'") { 330 } elsif ($uni == ord "'") {
139 $self->{completer}->set_prefix (""); 331 $self->{completer}->set_prefix ("");
140 $self->{completer}->show; 332 $self->{completer}->show;
141 } elsif (exists $DIR{$sym}) { 333 } elsif (exists $DIR{$sym}) {
142 if ($mod & CFClient::KMOD_SHIFT) { 334 if ($mod & CFPlus::KMOD_SHIFT) {
143 $self->{shft}++; 335 $self->{shft}++;
336 if ($DIR{$sym}[0] != $self->{fire_dir}) {
144 $::CONN->user_send ("fire $DIR{$sym}[0]"); 337 $::CONN->user_send ("fire $DIR{$sym}[0]");
338 }
339 $self->{fire_dir} = $DIR{$sym}[0];
145 } elsif ($mod & CFClient::KMOD_CTRL) { 340 } elsif ($mod & CFPlus::KMOD_CTRL) {
146 $self->{ctrl}++; 341 $self->{ctrl}++;
147 $::CONN->user_send ("run $DIR{$sym}[0]"); 342 $::CONN->user_send ("run $DIR{$sym}[0]");
148 } else { 343 } else {
149 $::CONN->user_send ("$DIR{$sym}[1]"); 344 $::CONN->user_send ("$DIR{$sym}[1]");
150 } 345 }
151 } elsif ($ev->{unicode}) { 346 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
152 $self->{completer}->key_down ($ev); 347 $self->{completer}->inject_key_down ($ev);
153 $self->{completer}->show; 348 $self->{completer}->show;
349 } else {
350 return 0;
351 }
352
154 } 353 1
155} 354}
156 355
157sub key_up { 356sub invoke_key_up {
158 my ($self, $ev) = @_; 357 my ($self, $ev) = @_;
159 358
359 my $res = 0;
160 my $mod = $ev->{mod}; 360 my $mod = $ev->{mod};
161 my $sym = $ev->{sym}; 361 my $sym = $ev->{sym};
162 362
363 if ($::CFG->{shift_fire_stop}) {
163 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 364 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
164 $::CONN->user_send ("fire_stop"); 365 $::CONN->user_send ("fire_stop");
366 delete $self->{fire_dir};
367 $res = 1;
368 }
369 } else {
370 if (exists $DIR{$sym} && delete $self->{shft}) {
371 $::CONN->user_send ("fire_stop");
372 delete $self->{fire_dir};
373 $res = 1;
374 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
375 $::CONN->user_send ("fire_stop");
376 delete $self->{fire_dir};
377 $res = 1;
378 }
165 } 379 }
380
166 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 381 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
167 $::CONN->user_send ("run_stop"); 382 $::CONN->user_send ("run_stop");
383 $res = 1;
168 } 384 }
385
386 $res
387}
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;
169} 398}
170 399
171sub draw { 400sub draw {
172 my ($self) = @_; 401 my ($self) = @_;
173 402
403 return unless $::MAP;
404
174 my $focused = $CFClient::UI::FOCUS == $self 405 my $focused = $CFPlus::UI::FOCUS == $self
175 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 406 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
176 407
177 return 408 return
178 unless $focused || !$::FAST; 409 unless $focused || !$::FAST;
179 410
180 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
181 glNewList $self->{list}; 450 glNewList $self->{list};
182 451
183 if ($::MAP) {
184 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
185 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
186
187 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
188 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
189
190 glPushMatrix; 452 glPushMatrix;
453 glTranslate $sx0, $sy0;
191 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 454 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
192 455
193 glTranslate $sx0 - 32, $sy0 - 32, 0; 456 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
194 457
195 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 458 glScale 32, 32;
196 459
197 if ($::CFG->{fow_enable}) { 460 if (my $tex = $self->{fow_texture}) {
198 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
199 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
200 glConvolutionFilter2D (
201 GL_CONVOLUTION_2D,
202 GL_ALPHA,
203 3, 3,
204 GL_ALPHA, GL_FLOAT,
205 pack "f*",
206 0.05, 0.13, 0.05,
207 0.13, 0.30, 0.13,
208 0.05, 0.13, 0.05,
209 );
210 glEnable GL_CONVOLUTION_2D;
211 }
212
213 $self->{fow_texture_name} ||= glGenTexture;
214 # try to re-use the texture name: TODO improve texture class instead
215
216 $self->{fow_texture} = new CFClient::Texture
217 w => $w,
218 h => $h,
219 data => $data,
220 name => $self->{fow_texture_name},
221 internalformat => GL_ALPHA,
222 format => GL_ALPHA;
223
224 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
225
226 glEnable GL_TEXTURE_2D; 461 glEnable GL_TEXTURE_2D;
227 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 462 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
228 463
229 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 464 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
230 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 465 $self->{fow_texture}->draw_quad_alpha (0, 0);
231 466
232 glDisable GL_TEXTURE_2D; 467 glDisable GL_TEXTURE_2D;
233 } 468 }
234 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
235 glPopMatrix; 481 glPopMatrix;
236 }
237
238 glEndList; 482 glEndList;
239 } 483 }
240 484
241 glPushMatrix;
242 glCallList $self->{list}; 485 glCallList $self->{list};
243 glPopMatrix;
244 486
245 # TNT2 emulates logops in software (or worse :) 487 # TNT2 emulates logops in software (or worse :)
246 if ($focused) { 488 unless ($focused) {
247 (delete $self->{out_of_focus})->destroy
248 if $self->{out_of_focus};
249 } else {
250 glColor 0.4, 0.2, 0.2, 0.6; 489 glColor 0.4, 0.2, 0.2, 0.6;
251 glEnable GL_BLEND; 490 glEnable GL_BLEND;
252 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
253 glBegin GL_QUADS; 492 glBegin GL_QUADS;
254 glVertex 0, 0; 493 glVertex 0, 0;
255 glVertex 0, $::HEIGHT; 494 glVertex 0, $::HEIGHT;
256 glVertex $::WIDTH, $::HEIGHT; 495 glVertex $::WIDTH, $::HEIGHT;
257 glVertex $::WIDTH, 0; 496 glVertex $::WIDTH, 0;
258 glEnd; 497 glEnd;
259 glDisable GL_BLEND; 498 glDisable GL_BLEND;
260
261 $self->{out_of_focus} ||= do {
262 my $label = new CFClient::UI::Label
263 x => 0,
264 y => 0,
265 z => 1,
266 ellipsise => 0,
267 text => "map out of focus (click map to play)";
268
269 $label->show;
270 $label->update;
271
272 $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
273 $label->move (
274 ($::WIDTH - $label->{w}) * 0.5,
275 ($::HEIGHT - $label->{h}) * 0.5,
276 );
277 });
278
279 $label
280 };
281 } 499 }
282} 500}
283 501
284sub DESTROY { 502sub DESTROY {
285 my $self = shift; 503 my $self = shift;
… …
287 glDeleteList $self->{list}; 505 glDeleteList $self->{list};
288 506
289 $self->SUPER::DESTROY; 507 $self->SUPER::DESTROY;
290} 508}
291 509
292package CFClient::MapWidget::MapMap; 510package CFPlus::MapWidget::MapMap;
293 511
294our @ISA = CFClient::UI::Base::; 512our @ISA = CFPlus::UI::Base::;
295 513
296use Time::HiRes qw(time); 514use Time::HiRes qw(time);
297use CFClient::OpenGL; 515use CFPlus::OpenGL;
298 516
299sub size_request { 517sub size_request {
300 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 518 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
301} 519}
302 520
303sub size_allocate { 521sub invoke_size_allocate {
304 my ($self, $w, $h) = @_; 522 my ($self, $w, $h) = @_;
305 523
306 $self->SUPER::size_allocate ($w, $h);
307 $self->update; 524 $self->update;
525
526 1
308} 527}
309 528
310sub update { 529sub update {
311 my ($self) = @_; 530 my ($self) = @_;
312 531
… …
337 556
338 if ($self->{texture_atime} < time) { 557 if ($self->{texture_atime} < time) {
339 $self->{texture_atime} = time + 1/3; 558 $self->{texture_atime} = time + 1/3;
340 559
341 $self->{texture} = 560 $self->{texture} =
342 new CFClient::Texture 561 new CFPlus::Texture
343 w => $w, 562 w => $w,
344 h => $h, 563 h => $h,
345 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 564 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
346 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 565 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
347 } 566 }
348 567
349 $self->{texture}->draw_quad (0, 0); 568 $self->{texture}->draw_quad (0, 0);
350 569
351 glDisable GL_TEXTURE_2D; 570 glDisable GL_TEXTURE_2D;
… …
366 glEnd; 585 glEnd;
367 586
368 glDisable GL_BLEND; 587 glDisable GL_BLEND;
369} 588}
370 589
371package CFClient::MapWidget::Command; 590package CFPlus::MapWidget::Command;
372 591
373use strict; 592use strict;
374 593
375use CFClient::OpenGL; 594use CFPlus::OpenGL;
376 595
377our @ISA = CFClient::UI::Frame::; 596our @ISA = CFPlus::UI::Frame::;
378 597
379sub new { 598sub new {
380 my $class = shift; 599 my $class = shift;
381 600
382 my $self = $class->SUPER::new ( 601 my $self = $class->SUPER::new (
383 bg => [0, 0, 0, 0.8], 602 bg => [0, 0, 0, 0.8],
384 @_, 603 @_,
385 ); 604 );
386 605
387 $self->add ($self->{vbox} = new CFClient::UI::VBox); 606 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
388 607
389 $self->{label} = [ 608 $self->{label} = [
390 map 609 map
391 CFClient::UI::Label->new ( 610 CFPlus::UI::Label->new (
392 can_hover => 1, 611 can_hover => 1,
393 can_events => 1, 612 can_events => 1,
394 tooltip_width => 0.33, 613 tooltip_width => 0.33,
395 fontsize => $_, 614 fontsize => $_,
396 ), (0.8) x 16 615 ), (0.8) x 16
397 ]; 616 ];
398 617
399 $self->{entry} = new CFClient::UI::Entry 618 $self->{entry} = new CFPlus::UI::Entry
400 connect_changed => sub { 619 on_changed => sub {
401 $self->update_labels; 620 $self->update_labels;
621 0
402 }, 622 },
623 on_button_down => sub {
624 my ($entry, $ev, $x, $y) = @_;
625
626 if ($ev->{button} == 3) {
627 (new CFPlus::UI::Menu
628 items => [
629 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
630 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
631 ],
632 )->popup ($ev);
633 return 1;
634 }
635 0
636 },
403 connect_key_down => sub { 637 on_key_down => sub {
404 my ($entry, $ev) = @_; 638 my ($entry, $ev) = @_;
405 639
406 my $self = $entry->{parent}{parent}; 640 my $self = $entry->{parent}{parent};
407 641
408 if ($ev->{sym} == 13) { 642 if ($ev->{sym} == 13) {
409 if (exists $self->{select}) { 643 if (exists $self->{select}) {
644 $self->{last_command} = $self->{select};
410 $::CONN->user_send ($self->{select}); 645 $::CONN->user_send ($self->{select});
646
647 unshift @{$self->{history}}, $self->{entry}->get_text;
648 $self->{hist_ptr} = 0;
649
411 $self->hide; 650 $self->hide;
412 } 651 }
413 } elsif ($ev->{sym} == 27) { 652 } elsif ($ev->{sym} == 27) {
653 $self->{hist_ptr} = 0;
414 $self->hide; 654 $self->hide;
415 return;
416 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 655 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
656 if ($self->{hist_ptr} > 1) {
657 $self->{hist_ptr}--;
658 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
659 } elsif ($self->{hist_ptr} > 0) {
660 $self->{hist_ptr}--;
661 $self->{entry}->set_text ($self->{hist_saveback});
662 } else {
417 ++$self->{select_offset} 663 ++$self->{select_offset}
418 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 664 if $self->{select_offset} < $#{ $self->{last_match} || [] };
665 }
419 $self->update_labels; 666 $self->update_labels;
420 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 667 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
668 if ($self->{select_offset}) {
421 --$self->{select_offset} 669 --$self->{select_offset}
670 } else {
671 unless ($self->{hist_ptr}) {
672 $self->{hist_saveback} = $self->{entry}->get_text;
673 }
674 if ($self->{hist_ptr} <= $#{$self->{history}}) {
422 if $self->{select_offset}; 675 $self->{hist_ptr}++;
676 }
677 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
678 if exists $self->{history}->[$self->{hist_ptr} - 1];
679 }
423 $self->update_labels; 680 $self->update_labels;
424 } else { 681 } else {
425 return 0; 682 return 0;
426 } 683 }
427 684
… …
442 699
443 $self->{entry}->set_text ($prefix); 700 $self->{entry}->set_text ($prefix);
444 $self->show; 701 $self->show;
445} 702}
446 703
447sub size_allocate { 704sub invoke_size_allocate {
448 my ($self, $w, $h) = @_; 705 my ($self, $w, $h) = @_;
449 706
450 $self->SUPER::size_allocate ($w, $h);
451 $self->move (($::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)
452} 710}
453 711
454sub show { 712sub show {
455 my ($self) = @_; 713 my ($self) = @_;
456 714
457 $self->SUPER::show; 715 $self->SUPER::show;
458 $self->{entry}->focus_in; 716 $self->{entry}->grab_focus;
459} 717}
460 718
461sub hide { 719sub hide {
462 my ($self) = @_; 720 my ($self) = @_;
463 721
722 $self->{hist_ptr} = 0;
723
464 $self->SUPER::hide; 724 $self->SUPER::hide;
465 $self->{entry}->set_text (""); 725 $self->{entry}->set_text ("");
466} 726}
467 727
468sub key_down { 728sub inject_key_down {
469 my ($self, $ev) = @_; 729 my ($self, $ev) = @_;
470 730
731 $self->{entry}->grab_focus;
471 $self->{entry}->key_down ($ev); 732 $self->{entry}->emit (key_down => $ev);
472} 733}
473 734
474sub update_labels { 735sub update_labels {
475 my ($self) = @_; 736 my ($self) = @_;
476 737
… …
509 770
510 @match = map $self->{command}{$_->[0]}, 771 @match = map $self->{command}{$_->[0]},
511 sort { 772 sort {
512 $a->[1] <=> $b->[1] 773 $a->[1] <=> $b->[1]
513 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 774 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
514 or (length $a->[0]) <=> (length $b->[0]) 775 or (length $b->[0]) <=> (length $a->[0])
515 } @match; 776 } @match;
516 } 777 }
517 778
518 $self->{last_search} = $cmd; 779 $self->{last_search} = $text;
519 $self->{last_match} = \@match; 780 $self->{last_match} = \@match;
520 781
521 $self->{select_offset} = 0; 782 $self->{select_offset} = 0;
522 } 783 }
523 784
… …
563 $label->set_text (""); 824 $label->set_text ("");
564 $label->set_tooltip (""); 825 $label->set_tooltip ("");
565 } 826 }
566 827
567 $self->update; 828 $self->update;
568 ###
569} 829}
570 830
571sub _draw { 831sub _draw {
572 my ($self) = @_; 832 my ($self) = @_;
573 833
574 # hack 834 # hack
575 local $CFClient::UI::FOCUS = $self->{entry}; 835 local $CFPlus::UI::FOCUS = $self->{entry};
576 836
577 $self->SUPER::_draw; 837 $self->SUPER::_draw;
578} 838}
579 839
5801 8401

Diff Legend

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