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

Diff Legend

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