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

Diff Legend

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