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.12 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.82 by root, Fri Sep 29 00:56:06 2006 UTC

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

Diff Legend

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