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

Diff Legend

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