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

Diff Legend

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