ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

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

Diff Legend

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