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.6 by root, Thu Apr 20 08:11:57 2006 UTC vs.
Revision 1.125 by root, Wed Dec 26 20:46:39 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines