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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.38 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.100 by pippijn, Tue Jan 2 14:45:22 2007 UTC

1package CFClient::MapWidget; 1package CFPlus::MapWidget;
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus;
8use CFClient::OpenGL; 9use CFPlus::OpenGL;
10use CFPlus::UI;
11use CFPlus::Macro;
9 12
10our @ISA = CFClient::UI::Base::; 13our @ISA = CFPlus::UI::Base::;
14
15my $magicmap_tex =
16 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11 18
12sub new { 19sub new {
13 my $class = shift; 20 my $class = shift;
14 21
15 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
16 z => -1, 23 z => -1,
17 can_focus => 1, 24 can_focus => 1,
18 list => glGenList, 25 list => glGenList,
26
27 smooth_matrix => [
28 0.05, 0.13, 0.05,
29 0.13, 0.30, 0.13,
30 0.05, 0.13, 0.05,
31 ],
32
19 @_ 33 @_
20 ); 34 );
21 35
22 $self->{completer} = new CFClient::MapWidget::Command:: 36 $self->{completer} = new CFPlus::MapWidget::Command::
23 command => $self->{command}, 37 command => $self->{command},
24 can_focus => 1, 38 tooltip => "#completer_help",
25 tooltip => "<b>The Command Completer</b>\n\n"
26 . "This is your central interface to send text commands to the server. "
27 . "To enter a verbatim command to send to the server, just type the command, "
28 . "followed by a space, and press return. "
29 . "Typing the initial letters of words (or just any letters) displays guesses "
30 . "for commands you might want to use.\n"
31 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
32 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
33 ; 39 ;
34 40
35 $self 41 $self
36} 42}
37 43
… …
39 my ($self, $command, $tooltip, $widget, $cb) = @_; 45 my ($self, $command, $tooltip, $widget, $cb) = @_;
40 46
41 (my $data = $command) =~ s/\\//g; 47 (my $data = $command) =~ s/\\//g;
42 48
43 $tooltip =~ s/^\s+//; 49 $tooltip =~ s/^\s+//;
44
45 $tooltip = "<big>$data</big>\n\n$tooltip"; 50 $tooltip = "<big>$data</big>\n\n$tooltip";
46
47 $tooltip =~ s/\s+$//; 51 $tooltip =~ s/\s+$//;
48 52
49 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 53 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
50} 54}
51 55
52sub clr_commands { 56sub clr_commands {
53 my ($self) = @_; 57 my ($self) = @_;
54 58
55 %{$self->{completer}{command}} = (); 59 %{$self->{completer}{command}} = ();
56}
57 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 }
173}
174
58sub button_down { 175sub invoke_button_down {
59 my ($self, $ev, $x, $y) = @_; 176 my ($self, $ev, $x, $y) = @_;
60 177
61 $self->focus_in;
62
63 if ($ev->{button} == 2) { 178 if ($ev->{button} == 1) {
179 $self->grab_focus;
180 return unless $::CONN;
181
182 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
183 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
184
185 $x -= CFPlus::floor $::MAP->w * 0.5;
186 $y -= CFPlus::floor $::MAP->h * 0.5;
187
188 if ($::CONN) {
189 if ($::IN_BUILD_MODE) {
190 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
191 } else {
192 $::CONN->lookat ($x, $y)
193 }
194 }
195
196 } elsif ($ev->{button} == 2) {
197 $self->grab_focus;
198 return unless $::CONN;
199
64 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 200 my ($ox, $oy) = ($ev->{x}, $ev->{y});
65 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 201 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
66 202
67 $self->{motion} = sub { 203 $self->{motion} = sub {
68 my ($ev, $x, $y) = @_; 204 my ($ev, $x, $y) = @_;
… …
72 $::CFG->{map_shift_x} = $bw + $x - $ox; 208 $::CFG->{map_shift_x} = $bw + $x - $ox;
73 $::CFG->{map_shift_y} = $bh + $y - $oy; 209 $::CFG->{map_shift_y} = $bh + $y - $oy;
74 210
75 $self->update; 211 $self->update;
76 }; 212 };
213 } elsif ($ev->{button} == 3) {
214 my @items = (
215 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
216 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
217 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
218 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
219 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
220 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
221 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
222 [
223 $::PICKUP_ENABLE->{state}
224 ? "Disable automatic pickup"
225 : "Enable automatic pickup",
226 sub { $::PICKUP_ENABLE->toggle }
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 }
258 ],
259 ;
260
261 (new CFPlus::UI::Menu
262 items => \@items,
263 )->popup ($ev);
264 }
265
77 } 266 1
78} 267}
79 268
80sub button_up { 269sub invoke_button_up {
81 my ($self, $ev, $x, $y) = @_; 270 my ($self, $ev, $x, $y) = @_;
82 271
83 delete $self->{motion}; 272 delete $self->{motion};
84}
85 273
274 1
275}
276
86sub mouse_motion { 277sub invoke_mouse_motion {
87 my ($self, $ev, $x, $y) = @_; 278 my ($self, $ev, $x, $y) = @_;
88 279
280 if ($self->{motion}) {
89 $self->{motion}->($ev, $x, $y) if $self->{motion}; 281 $self->{motion}->($ev, $x, $y);
282 } else {
283 return 0;
284 }
285
286 1
90} 287}
91 288
92sub size_request { 289sub size_request {
93 ( 290 (
94 1 + 32 * int $::WIDTH / 32, 291 32 * CFPlus::ceil $::WIDTH / 32,
95 1 + 32 * int $::HEIGHT / 32, 292 32 * CFPlus::ceil $::HEIGHT / 32,
96 ) 293 )
97} 294}
98 295
99sub update { 296sub update {
100 my ($self) = @_; 297 my ($self) = @_;
… …
102 $self->{need_update} = 1; 299 $self->{need_update} = 1;
103 $self->SUPER::update; 300 $self->SUPER::update;
104} 301}
105 302
106my %DIR = ( 303my %DIR = (
107 CFClient::SDLK_KP8, [1, "north"], 304 CFPlus::SDLK_KP8, [1, "north"],
108 CFClient::SDLK_KP9, [2, "northeast"], 305 CFPlus::SDLK_KP9, [2, "northeast"],
109 CFClient::SDLK_KP6, [3, "east"], 306 CFPlus::SDLK_KP6, [3, "east"],
110 CFClient::SDLK_KP3, [4, "southeast"], 307 CFPlus::SDLK_KP3, [4, "southeast"],
111 CFClient::SDLK_KP2, [5, "south"], 308 CFPlus::SDLK_KP2, [5, "south"],
112 CFClient::SDLK_KP1, [6, "southwest"], 309 CFPlus::SDLK_KP1, [6, "southwest"],
113 CFClient::SDLK_KP4, [7, "west"], 310 CFPlus::SDLK_KP4, [7, "west"],
114 CFClient::SDLK_KP7, [8, "northwest"], 311 CFPlus::SDLK_KP7, [8, "northwest"],
115 312
116 CFClient::SDLK_UP, [1, "north"], 313 CFPlus::SDLK_UP, [1, "north"],
117 CFClient::SDLK_RIGHT, [3, "east"], 314 CFPlus::SDLK_RIGHT, [3, "east"],
118 CFClient::SDLK_DOWN, [5, "south"], 315 CFPlus::SDLK_DOWN, [5, "south"],
119 CFClient::SDLK_LEFT, [7, "west"], 316 CFPlus::SDLK_LEFT, [7, "west"],
120); 317);
121 318
122sub key_down { 319sub invoke_key_down {
123 my ($self, $ev) = @_; 320 my ($self, $ev) = @_;
124
125 return unless $::CONN;
126 321
127 my $mod = $ev->{mod}; 322 my $mod = $ev->{mod};
128 my $sym = $ev->{sym}; 323 my $sym = $ev->{sym};
129 my $uni = $ev->{unicode}; 324 my $uni = $ev->{unicode};
130 325
131 if ($sym == CFClient::SDLK_KP5) { 326 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
327
328 if ($sym == 9) {
329 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
330 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
331 $::HELP_WINDOW->toggle_visibility;
332 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
333 ::toggle_player_page ($::STATS_PAGE);
334 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
335 ::toggle_player_page ($::SKILL_PAGE);
336 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
337 ::toggle_player_page ($::SPELL_PAGE);
338 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
339 ::toggle_player_page ($::INVENTORY_PAGE);
340 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
341 $::SETUP_DIALOG->toggle_visibility;
342 } elsif (!$::CONN) {
343 return 0; # bindings further down need a valid connection
344
345 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
132 $::CONN->user_send ("stay fire"); 346 $::CONN->user_send ("stay fire");
133 } elsif ($uni == ord ",") { 347 } elsif ($uni == ord ",") {
134 $::CONN->user_send ("take"); 348 $::CONN->user_send ("take");
135 } elsif ($uni == ord " ") { 349 } elsif ($uni == ord " ") {
136 $::CONN->user_send ("apply"); 350 $::CONN->user_send ("apply");
351 } elsif ($uni == 13) {
352 $::CONN->user_send ("examine");
137 } elsif ($uni == ord ".") { 353 } elsif ($uni == ord ".") {
138 $::CONN->user_send ($self->{completer}{last_command}) 354 $::CONN->user_send ($self->{completer}{last_command})
139 if exists $self->{completer}{last_command}; 355 if exists $self->{completer}{last_command};
140 } elsif ($uni == ord "\t") { 356 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
141 # TODO: toggle inventory 357 $::CONN->macro_send ($_) for @macros;
142 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 358 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
143 $::CONN->user_send ("rotateshoottype +"); 359 $::CONN->user_send ("rotateshoottype +");
144 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 360 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
145 $::CONN->user_send ("rotateshoottype -"); 361 $::CONN->user_send ("rotateshoottype -");
362 } elsif ($uni == ord '!') {
363 $self->{completer}->set_prefix ("shout ");
364 $self->{completer}->show;
146 } elsif ($uni == ord '"') { 365 } elsif ($uni == ord '"') {
147 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 366 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
148 $self->{completer}->show; 367 $self->{completer}->show;
149 } elsif ($uni == ord "'") { 368 } elsif ($uni == ord "'") {
150 $self->{completer}->set_prefix (""); 369 $self->{completer}->set_prefix ("");
151 $self->{completer}->show; 370 $self->{completer}->show;
152 } elsif (exists $DIR{$sym}) { 371 } elsif (exists $DIR{$sym}) {
153 if ($mod & CFClient::KMOD_SHIFT) { 372 if ($mod & CFPlus::KMOD_SHIFT) {
154 $self->{shft}++; 373 $self->{shft}++;
374 if ($DIR{$sym}[0] != $self->{fire_dir}) {
155 $::CONN->user_send ("fire $DIR{$sym}[0]"); 375 $::CONN->user_send ("fire $DIR{$sym}[0]");
376 }
377 $self->{fire_dir} = $DIR{$sym}[0];
156 } elsif ($mod & CFClient::KMOD_CTRL) { 378 } elsif ($mod & CFPlus::KMOD_CTRL) {
157 $self->{ctrl}++; 379 $self->{ctrl}++;
158 $::CONN->user_send ("run $DIR{$sym}[0]"); 380 $::CONN->user_send ("run $DIR{$sym}[0]");
159 } else { 381 } else {
160 $::CONN->user_send ("$DIR{$sym}[1]"); 382 $::CONN->user_send ("$DIR{$sym}[1]");
161 } 383 }
162 } elsif ($ev->{unicode}) { 384 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
163 $self->{completer}->key_down ($ev); 385 $self->{completer}->inject_key_down ($ev);
164 $self->{completer}->show; 386 $self->{completer}->show;
387 } else {
388 return 0;
389 }
390
165 } 391 1
166} 392}
167 393
168sub key_up { 394sub invoke_key_up {
169 my ($self, $ev) = @_; 395 my ($self, $ev) = @_;
170 396
397 my $res = 0;
171 my $mod = $ev->{mod}; 398 my $mod = $ev->{mod};
172 my $sym = $ev->{sym}; 399 my $sym = $ev->{sym};
173 400
401 if ($::CFG->{shift_fire_stop}) {
174 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 402 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
175 $::CONN->user_send ("fire_stop"); 403 $::CONN->user_send ("fire_stop");
404 delete $self->{fire_dir};
405 $res = 1;
406 }
407 } else {
408 if (exists $DIR{$sym} && delete $self->{shft}) {
409 $::CONN->user_send ("fire_stop");
410 delete $self->{fire_dir};
411 $res = 1;
412 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
413 $::CONN->user_send ("fire_stop");
414 delete $self->{fire_dir};
415 $res = 1;
416 }
176 } 417 }
418
177 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 419 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
178 $::CONN->user_send ("run_stop"); 420 $::CONN->user_send ("run_stop");
421 $res = 1;
179 } 422 }
423
424 $res
425}
426
427sub set_magicmap {
428 my ($self, $w, $h, $x, $y, $data) = @_;
429
430 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
431 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
432
433 $self->{magicmap} = [$x, $y, $w, $h, $data];
434
435 $self->update;
180} 436}
181 437
182sub draw { 438sub draw {
183 my ($self) = @_; 439 my ($self) = @_;
184 440
441 return unless $::MAP;
442
185 my $focused = $CFClient::UI::FOCUS == $self 443 my $focused = $CFPlus::UI::FOCUS == $self
186 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 444 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
187 445
188 return 446 return
189 unless $focused || !$::FAST; 447 unless $focused || !$::FAST;
190 448
191 if (delete $self->{need_update}) { 449 if (delete $self->{need_update}) {
450 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
451
452 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
453 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
454
455 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
456 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
457
458 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
459 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
460
461 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
462 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
463
464 if ($::CFG->{fow_enable}) {
465 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
466
467 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
468 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
469 glConvolutionFilter2D (
470 GL_CONVOLUTION_2D,
471 GL_ALPHA,
472 3, 3,
473 GL_ALPHA, GL_FLOAT,
474 (pack "f*", @{ $self->{smooth_matrix} }),
475 );
476 glEnable GL_CONVOLUTION_2D;
477 }
478
479 $self->{fow_texture} = new CFPlus::Texture
480 w => $w,
481 h => $h,
482 data => $data,
483 internalformat => GL_ALPHA,
484 format => GL_ALPHA;
485
486 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
487 } else {
488 delete $self->{fow_texture};
489 }
490
192 glNewList $self->{list}; 491 glNewList $self->{list};
193 492
194 if ($::MAP) {
195 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
196 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
197
198 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
199 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
200
201 glPushMatrix; 493 glPushMatrix;
494 glTranslate $sx0, $sy0;
202 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 495 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
203 496
204 glTranslate $sx0 - 32, $sy0 - 32, 0; 497 $::MAP->draw ($dx, $dy, $sw, $sh);
205 498
206 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 499 glScale 32, 32;
207 500
208 if ($::CFG->{fow_enable}) { 501 if (my $tex = $self->{fow_texture}) {
209 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
210 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
211 glConvolutionFilter2D (
212 GL_CONVOLUTION_2D,
213 GL_ALPHA,
214 3, 3,
215 GL_ALPHA, GL_FLOAT,
216 pack "f*",
217 0.05, 0.13, 0.05,
218 0.13, 0.30, 0.13,
219 0.05, 0.13, 0.05,
220 );
221 glEnable GL_CONVOLUTION_2D;
222 }
223
224 $self->{fow_texture_name} ||= glGenTexture;
225 # try to re-use the texture name: TODO improve texture class instead
226
227 $self->{fow_texture} = new CFClient::Texture
228 w => $w,
229 h => $h,
230 data => $data,
231 name => $self->{fow_texture_name},
232 internalformat => GL_ALPHA,
233 format => GL_ALPHA;
234
235 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
236
237 glEnable GL_TEXTURE_2D; 502 glEnable GL_TEXTURE_2D;
238 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
239 504
240 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 505 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
241 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 506 $self->{fow_texture}->draw_quad_alpha (0, 0);
242 507
243 glDisable GL_TEXTURE_2D; 508 glDisable GL_TEXTURE_2D;
244 } 509 }
245 510
511 if ($self->{magicmap}) {
512 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
513
514 $x += $::MAP->ox + $self->{dx};
515 $y += $::MAP->oy + $self->{dy};
516
517 glTranslate - $x - 1, - $y - 1;
518 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
519 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
520 }
521
246 glPopMatrix; 522 glPopMatrix;
247 }
248
249 glEndList; 523 glEndList;
250 } 524 }
251 525
252 glPushMatrix;
253 glCallList $self->{list}; 526 glCallList $self->{list};
254 glPopMatrix;
255 527
256 # TNT2 emulates logops in software (or worse :) 528 # TNT2 emulates logops in software (or worse :)
257 if ($focused) { 529 unless ($focused) {
258 (delete $self->{out_of_focus})->destroy
259 if $self->{out_of_focus};
260 } else {
261 glColor 0.4, 0.2, 0.2, 0.6; 530 glColor 0.4, 0.2, 0.2, 0.6;
262 glEnable GL_BLEND; 531 glEnable GL_BLEND;
263 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 532 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
264 glBegin GL_QUADS; 533 glBegin GL_QUADS;
265 glVertex 0, 0; 534 glVertex 0, 0;
266 glVertex 0, $::HEIGHT; 535 glVertex 0, $::HEIGHT;
267 glVertex $::WIDTH, $::HEIGHT; 536 glVertex $::WIDTH, $::HEIGHT;
268 glVertex $::WIDTH, 0; 537 glVertex $::WIDTH, 0;
269 glEnd; 538 glEnd;
270 glDisable GL_BLEND; 539 glDisable GL_BLEND;
271
272# $self->{out_of_focus} ||= do {
273# my $label = new CFClient::UI::Label
274# x => 0,
275# y => 0,
276# z => 1,
277# ellipsise => 0,
278# text => "map out of focus (click map to play)";
279#
280# $label->show;
281# $label->update;
282#
283# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
284# $label->move (
285# ($::WIDTH - $label->{w}) * 0.5,
286# ($::HEIGHT - $label->{h}) * 0.5,
287# );
288# });
289#
290# $label
291# };
292 } 540 }
293} 541}
294 542
295sub DESTROY { 543sub DESTROY {
296 my $self = shift; 544 my $self = shift;
… …
298 glDeleteList $self->{list}; 546 glDeleteList $self->{list};
299 547
300 $self->SUPER::DESTROY; 548 $self->SUPER::DESTROY;
301} 549}
302 550
303package CFClient::MapWidget::MapMap; 551package CFPlus::MapWidget::MapMap;
304 552
305our @ISA = CFClient::UI::Base::; 553our @ISA = CFPlus::UI::Base::;
306 554
307use Time::HiRes qw(time); 555use Time::HiRes qw(time);
308use CFClient::OpenGL; 556use CFPlus::OpenGL;
309 557
310sub size_request { 558sub size_request {
311 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 559 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
312} 560}
313 561
314sub size_allocate { 562sub invoke_size_allocate {
315 my ($self, $w, $h) = @_; 563 my ($self, $w, $h) = @_;
316 564
317 $self->SUPER::size_allocate ($w, $h);
318 $self->update; 565 $self->update;
566
567 1
319} 568}
320 569
321sub update { 570sub update {
322 my ($self) = @_; 571 my ($self) = @_;
323 572
… …
348 597
349 if ($self->{texture_atime} < time) { 598 if ($self->{texture_atime} < time) {
350 $self->{texture_atime} = time + 1/3; 599 $self->{texture_atime} = time + 1/3;
351 600
352 $self->{texture} = 601 $self->{texture} =
353 new CFClient::Texture 602 new CFPlus::Texture
354 w => $w, 603 w => $w,
355 h => $h, 604 h => $h,
356 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 605 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
357 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 606 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
358 } 607 }
359 608
360 $self->{texture}->draw_quad (0, 0); 609 $self->{texture}->draw_quad (0, 0);
361 610
362 glDisable GL_TEXTURE_2D; 611 glDisable GL_TEXTURE_2D;
… …
377 glEnd; 626 glEnd;
378 627
379 glDisable GL_BLEND; 628 glDisable GL_BLEND;
380} 629}
381 630
382package CFClient::MapWidget::Command; 631package CFPlus::MapWidget::Command;
383 632
384use strict; 633use strict;
385 634
386use CFClient::OpenGL; 635use CFPlus::OpenGL;
387 636
388our @ISA = CFClient::UI::Frame::; 637our @ISA = CFPlus::UI::Frame::;
389 638
390sub new { 639sub new {
391 my $class = shift; 640 my $class = shift;
392 641
393 my $self = $class->SUPER::new ( 642 my $self = $class->SUPER::new (
394 bg => [0, 0, 0, 0.8], 643 bg => [0, 0, 0, 0.8],
395 @_, 644 @_,
396 ); 645 );
397 646
398 $self->add ($self->{vbox} = new CFClient::UI::VBox); 647 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
399 648
400 $self->{label} = [ 649 $self->{label} = [
401 map 650 map
402 CFClient::UI::Label->new ( 651 CFPlus::UI::Label->new (
403 can_hover => 1, 652 can_hover => 1,
404 can_events => 1, 653 can_events => 1,
405 tooltip_width => 0.33, 654 tooltip_width => 0.33,
406 fontsize => $_, 655 fontsize => $_,
407 ), (0.8) x 16 656 ), (0.8) x 16
408 ]; 657 ];
409 658
410 $self->{entry} = new CFClient::UI::Entry 659 $self->{entry} = new CFPlus::UI::Entry
411 connect_changed => sub { 660 on_changed => sub {
412 $self->update_labels; 661 $self->update_labels;
662 0
413 }, 663 },
664 on_button_down => sub {
665 my ($entry, $ev, $x, $y) = @_;
666
667 if ($ev->{button} == 3) {
668 (new CFPlus::UI::Menu
669 items => [
670 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
671 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
672 ],
673 )->popup ($ev);
674 return 1;
675 }
676 0
677 },
414 connect_key_down => sub { 678 on_key_down => sub {
415 my ($entry, $ev) = @_; 679 my ($entry, $ev) = @_;
416 680
417 my $self = $entry->{parent}{parent}; 681 my $self = $entry->{parent}{parent};
418 682
419 if ($ev->{sym} == 13) { 683 if ($ev->{sym} == 13) {
420 if (exists $self->{select}) { 684 if (exists $self->{select}) {
421 $self->{last_command} = $self->{select}; 685 $self->{last_command} = $self->{select};
422 $::CONN->user_send ($self->{select}); 686 $::CONN->user_send ($self->{select});
687
688 unshift @{$self->{history}}, $self->{entry}->get_text;
689 $self->{hist_ptr} = 0;
690
423 $self->hide; 691 $self->hide;
424 } 692 }
425 } elsif ($ev->{sym} == 27) { 693 } elsif ($ev->{sym} == 27) {
694 $self->{hist_ptr} = 0;
426 $self->hide; 695 $self->hide;
427 return;
428 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 696 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
697 if ($self->{hist_ptr} > 1) {
698 $self->{hist_ptr}--;
699 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
700 } elsif ($self->{hist_ptr} > 0) {
701 $self->{hist_ptr}--;
702 $self->{entry}->set_text ($self->{hist_saveback});
703 } else {
429 ++$self->{select_offset} 704 ++$self->{select_offset}
430 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 705 if $self->{select_offset} < $#{ $self->{last_match} || [] };
706 }
431 $self->update_labels; 707 $self->update_labels;
432 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 708 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
709 if ($self->{select_offset}) {
433 --$self->{select_offset} 710 --$self->{select_offset}
711 } else {
712 unless ($self->{hist_ptr}) {
713 $self->{hist_saveback} = $self->{entry}->get_text;
714 }
715 if ($self->{hist_ptr} <= $#{$self->{history}}) {
434 if $self->{select_offset}; 716 $self->{hist_ptr}++;
717 }
718 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
719 if exists $self->{history}->[$self->{hist_ptr} - 1];
720 }
435 $self->update_labels; 721 $self->update_labels;
436 } else { 722 } else {
437 return 0; 723 return 0;
438 } 724 }
439 725
… …
454 740
455 $self->{entry}->set_text ($prefix); 741 $self->{entry}->set_text ($prefix);
456 $self->show; 742 $self->show;
457} 743}
458 744
459sub size_allocate { 745sub invoke_size_allocate {
460 my ($self, $w, $h) = @_; 746 my ($self, $w, $h) = @_;
461 747
462 $self->SUPER::size_allocate ($w, $h);
463 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 748 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
749
750 $self->SUPER::invoke_size_allocate ($w, $h)
464} 751}
465 752
466sub show { 753sub show {
467 my ($self) = @_; 754 my ($self) = @_;
468 755
469 $self->SUPER::show; 756 $self->SUPER::show;
470 $self->{entry}->focus_in; 757 $self->{entry}->grab_focus;
471} 758}
472 759
473sub hide { 760sub hide {
474 my ($self) = @_; 761 my ($self) = @_;
475 762
763 $self->{hist_ptr} = 0;
764
476 $self->SUPER::hide; 765 $self->SUPER::hide;
477 $self->{entry}->set_text (""); 766 $self->{entry}->set_text ("");
478} 767}
479 768
480sub key_down { 769sub inject_key_down {
481 my ($self, $ev) = @_; 770 my ($self, $ev) = @_;
482 771
772 $self->{entry}->grab_focus;
483 $self->{entry}->key_down ($ev); 773 $self->{entry}->emit (key_down => $ev);
484} 774}
485 775
486sub update_labels { 776sub update_labels {
487 my ($self) = @_; 777 my ($self) = @_;
488 778
… …
521 811
522 @match = map $self->{command}{$_->[0]}, 812 @match = map $self->{command}{$_->[0]},
523 sort { 813 sort {
524 $a->[1] <=> $b->[1] 814 $a->[1] <=> $b->[1]
525 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 815 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
526 or (length $a->[0]) <=> (length $b->[0]) 816 or (length $b->[0]) <=> (length $a->[0])
527 } @match; 817 } @match;
528 } 818 }
529 819
530 $self->{last_search} = $cmd; 820 $self->{last_search} = $text;
531 $self->{last_match} = \@match; 821 $self->{last_match} = \@match;
532 822
533 $self->{select_offset} = 0; 823 $self->{select_offset} = 0;
534 } 824 }
535 825
… …
575 $label->set_text (""); 865 $label->set_text ("");
576 $label->set_tooltip (""); 866 $label->set_tooltip ("");
577 } 867 }
578 868
579 $self->update; 869 $self->update;
580 ###
581} 870}
582 871
583sub _draw { 872sub _draw {
584 my ($self) = @_; 873 my ($self) = @_;
585 874
586 # hack 875 # hack
587 local $CFClient::UI::FOCUS = $self->{entry}; 876 local $CFPlus::UI::FOCUS = $self->{entry};
588 877
589 $self->SUPER::_draw; 878 $self->SUPER::_draw;
590} 879}
591 880
5921 8811
882

Diff Legend

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