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.60 by root, Thu Jun 15 08:29:18 2006 UTC vs.
Revision 1.131 by root, Thu May 8 19:00:37 2008 UTC

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

Diff Legend

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