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.24 by root, Wed May 17 10:14:52 2006 UTC vs.
Revision 1.75 by root, Tue Jul 18 06:56:35 2006 UTC

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

Diff Legend

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