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.28 by root, Wed May 17 20:50:19 2006 UTC vs.
Revision 1.121 by root, Tue Aug 28 16:26:13 2007 UTC

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

Diff Legend

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