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

Diff Legend

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