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

Diff Legend

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