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.44 by root, Tue May 30 07:13:08 2006 UTC vs.
Revision 1.78 by root, Sun Jul 23 16:11:12 2006 UTC

… …
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 CFClient;
8use CFClient::OpenGL; 9use CFClient::OpenGL;
10use CFClient::UI;
9 11
10our @ISA = CFClient::UI::Base::; 12our @ISA = CFClient::UI::Base::;
13
14my $magicmap_tex =
15 new_from_file CFClient::Texture CFClient::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->{completer} = new CFClient::MapWidget::Command:: 35 $self->{completer} = new CFClient::MapWidget::Command::
23 command => $self->{command}, 36 command => $self->{command},
24 can_focus => 1,
25 tooltip => "<b>The Command Completer</b>\n\n" 37 tooltip => "<b>The Command Completer</b>\n\n"
26 . "This is your central interface to send text commands to the server. " 38 . "This is your central interface to send text commands to the server. "
27 . "To enter a verbatim command to send to the server, just type the command, " 39 . "To enter a verbatim command to send to the server, just type the command, "
28 . "followed by a space, and press return. " 40 . "followed by a space, and press return. "
29 . "Typing the initial letters of words (or just any letters) displays guesses " 41 . "Typing the initial letters of words (or just any letters) displays guesses "
30 . "for commands you might want to use.\n" 42 . "for commands you might want to use.\n"
31 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n" 43 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
32 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.", 44 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
33 ; 45 ;
34 46
35 $self 47 $self
36} 48}
37 49
… …
49 61
50sub clr_commands { 62sub clr_commands {
51 my ($self) = @_; 63 my ($self) = @_;
52 64
53 %{$self->{completer}{command}} = (); 65 %{$self->{completer}{command}} = ();
54}
55 66
67 $self->{completer}->hide
68 if $self->{completer};
69}
70
56sub button_down { 71sub invoke_button_down {
57 my ($self, $ev, $x, $y) = @_; 72 my ($self, $ev, $x, $y) = @_;
58 73
59 $self->focus_in;
60
61 if ($ev->{button} == 2) { 74 if ($ev->{button} == 1) {
75 $self->grab_focus;
76 return unless $::CONN;
77
78 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
79 my $y = 1 + CFClient::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
62 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 91 my ($ox, $oy) = ($ev->{x}, $ev->{y});
63 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 92 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
64 93
65 $self->{motion} = sub { 94 $self->{motion} = sub {
66 my ($ev, $x, $y) = @_; 95 my ($ev, $x, $y) = @_;
… …
70 $::CFG->{map_shift_x} = $bw + $x - $ox; 99 $::CFG->{map_shift_x} = $bw + $x - $ox;
71 $::CFG->{map_shift_y} = $bh + $y - $oy; 100 $::CFG->{map_shift_y} = $bh + $y - $oy;
72 101
73 $self->update; 102 $self->update;
74 }; 103 };
104 } elsif ($ev->{button} == 3) {
105 (new CFClient::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 ],
121 )->popup ($ev);
122 }
123
75 } 124 1
76} 125}
77 126
78sub button_up { 127sub invoke_button_up {
79 my ($self, $ev, $x, $y) = @_; 128 my ($self, $ev, $x, $y) = @_;
80 129
81 delete $self->{motion}; 130 delete $self->{motion};
82}
83 131
132 1
133}
134
84sub mouse_motion { 135sub invoke_mouse_motion {
85 my ($self, $ev, $x, $y) = @_; 136 my ($self, $ev, $x, $y) = @_;
86 137
138 if ($self->{motion}) {
87 $self->{motion}->($ev, $x, $y) if $self->{motion}; 139 $self->{motion}->($ev, $x, $y);
140 } else {
141 return 0;
142 }
143
144 1
88} 145}
89 146
90sub size_request { 147sub size_request {
91 ( 148 (
92 1 + 32 * int $::WIDTH / 32, 149 32 * CFClient::ceil $::WIDTH / 32,
93 1 + 32 * int $::HEIGHT / 32, 150 32 * CFClient::ceil $::HEIGHT / 32,
94 ) 151 )
95} 152}
96 153
97sub update { 154sub update {
98 my ($self) = @_; 155 my ($self) = @_;
… …
115 CFClient::SDLK_RIGHT, [3, "east"], 172 CFClient::SDLK_RIGHT, [3, "east"],
116 CFClient::SDLK_DOWN, [5, "south"], 173 CFClient::SDLK_DOWN, [5, "south"],
117 CFClient::SDLK_LEFT, [7, "west"], 174 CFClient::SDLK_LEFT, [7, "west"],
118); 175);
119 176
120sub key_down { 177sub invoke_key_down {
121 my ($self, $ev) = @_; 178 my ($self, $ev) = @_;
122
123 return unless $::CONN;
124 179
125 my $mod = $ev->{mod}; 180 my $mod = $ev->{mod};
126 my $sym = $ev->{sym}; 181 my $sym = $ev->{sym};
127 my $uni = $ev->{unicode}; 182 my $uni = $ev->{unicode};
128 183
184 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT;
185
186 if ($uni == ord "\t") {
187 $::PL_WINDOW->toggle_visibility;
188 } elsif ($sym == CFClient::SDLK_F1 && !$mod) {
189 $::HELP_WINDOW->toggle_visibility;
190 } elsif ($sym == CFClient::SDLK_F2 && !$mod) {
191 ::toggle_player_page ($::STATS_PAGE);
192 } elsif ($sym == CFClient::SDLK_F3 && !$mod) {
193 ::toggle_player_page ($::SKILL_PAGE);
194 } elsif ($sym == CFClient::SDLK_F4 && !$mod) {
195 ::toggle_player_page ($::SPELL_PAGE);
196 } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
197 ::toggle_player_page ($::INVENTORY_PAGE);
198 } elsif ($sym == CFClient::SDLK_F9 && !$mod) {
199 $::SETUP_DIALOG->toggle_visibility;
200 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
201 $::BIND_EDITOR->set_binding (undef, undef, [],
202 sub {
203 my ($mod, $sym, $cmds) = @_;
204 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
205 });
206 $::BIND_EDITOR->start;
207 $::BIND_EDITOR->show;
208 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
209 $::BIND_EDITOR->stop;
210 $::BIND_EDITOR->ask_for_bind_and_commit;
211 $::BIND_EDITOR->hide;
212 } elsif (!$::CONN) {
213 return 0; # bindings further down need a valid connection
214
129 if ($sym == CFClient::SDLK_KP5) { 215 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
130 $::CONN->user_send ("stay fire"); 216 $::CONN->user_send ("stay fire");
131 } elsif ($uni == ord ",") { 217 } elsif ($uni == ord ",") {
132 $::CONN->user_send ("take"); 218 $::CONN->user_send ("take");
133 } elsif ($uni == ord " ") { 219 } elsif ($uni == ord " ") {
134 $::CONN->user_send ("apply"); 220 $::CONN->user_send ("apply");
135 } elsif ($uni == ord ".") { 221 } elsif ($uni == ord ".") {
136 $::CONN->user_send ($self->{completer}{last_command}) 222 $::CONN->user_send ($self->{completer}{last_command})
137 if exists $self->{completer}{last_command}; 223 if exists $self->{completer}{last_command};
138 } elsif ($uni == ord "\t") { 224 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
139 $::INV_WINDOW->toggle_visibility; 225 $::CONN->user_send ($_) for @$bind_cmd;
140 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 226 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
141 $::CONN->user_send ("rotateshoottype +"); 227 $::CONN->user_send ("rotateshoottype +");
142 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 228 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
143 $::CONN->user_send ("rotateshoottype -"); 229 $::CONN->user_send ("rotateshoottype -");
144 } elsif ($uni == ord '"') { 230 } elsif ($uni == ord '"') {
145 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 231 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
146 $self->{completer}->show; 232 $self->{completer}->show;
147 } elsif ($uni == ord "'") { 233 } elsif ($uni == ord "'") {
148 $self->{completer}->set_prefix (""); 234 $self->{completer}->set_prefix ("");
149 $self->{completer}->show; 235 $self->{completer}->show;
150 } elsif (exists $DIR{$sym}) { 236 } elsif (exists $DIR{$sym}) {
151 if ($mod & CFClient::KMOD_SHIFT) { 237 if ($mod & CFClient::KMOD_SHIFT) {
152 $self->{shft}++; 238 $self->{shft}++;
239 if ($DIR{$sym}[0] != $self->{fire_dir}) {
153 $::CONN->user_send ("fire $DIR{$sym}[0]"); 240 $::CONN->user_send ("fire $DIR{$sym}[0]");
241 }
242 $self->{fire_dir} = $DIR{$sym}[0];
154 } elsif ($mod & CFClient::KMOD_CTRL) { 243 } elsif ($mod & CFClient::KMOD_CTRL) {
155 $self->{ctrl}++; 244 $self->{ctrl}++;
156 $::CONN->user_send ("run $DIR{$sym}[0]"); 245 $::CONN->user_send ("run $DIR{$sym}[0]");
157 } else { 246 } else {
158 $::CONN->user_send ("$DIR{$sym}[1]"); 247 $::CONN->user_send ("$DIR{$sym}[1]");
159 } 248 }
160 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
161 CFClient::Recorder::start (1);
162 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
163 CFClient::Recorder::stop (1);
164 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
165 $::CONN->user_send ($_) for @$bind_cmd;
166 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 249 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
167 $self->{completer}->key_down ($ev); 250 $self->{completer}->inject_key_down ($ev);
168 $self->{completer}->show; 251 $self->{completer}->show;
252 } else {
253 return 0;
254 }
255
169 } 256 1
170} 257}
171 258
172sub key_up { 259sub invoke_key_up {
173 my ($self, $ev) = @_; 260 my ($self, $ev) = @_;
174 261
262 my $res = 0;
175 my $mod = $ev->{mod}; 263 my $mod = $ev->{mod};
176 my $sym = $ev->{sym}; 264 my $sym = $ev->{sym};
177 265
266 if ($::CFG->{shift_fire_stop}) {
178 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 267 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
179 $::CONN->user_send ("fire_stop"); 268 $::CONN->user_send ("fire_stop");
269 delete $self->{fire_dir};
270 $res = 1;
271 }
272 } else {
273 if (exists $DIR{$sym} && delete $self->{shft}) {
274 $::CONN->user_send ("fire_stop");
275 delete $self->{fire_dir};
276 $res = 1;
277 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
278 $::CONN->user_send ("fire_stop");
279 delete $self->{fire_dir};
280 $res = 1;
281 }
180 } 282 }
283
181 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 284 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
182 $::CONN->user_send ("run_stop"); 285 $::CONN->user_send ("run_stop");
286 $res = 1;
183 } 287 }
288
289 $res
290}
291
292sub set_magicmap {
293 my ($self, $w, $h, $x, $y, $data) = @_;
294
295 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
296 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
297
298 $self->{magicmap} = [$x, $y, $w, $h, $data];
299
300 $self->update;
184} 301}
185 302
186sub draw { 303sub draw {
187 my ($self) = @_; 304 my ($self) = @_;
305
306 return unless $::MAP;
188 307
189 my $focused = $CFClient::UI::FOCUS == $self 308 my $focused = $CFClient::UI::FOCUS == $self
190 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 309 || $CFClient::UI::FOCUS == $self->{completer}{entry};
191 310
192 return 311 return
193 unless $focused || !$::FAST; 312 unless $focused || !$::FAST;
194 313
195 if (delete $self->{need_update}) { 314 if (delete $self->{need_update}) {
315 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
316
317 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
318 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
319
320 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
321 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
322
323 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
324 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
325
326 if ($::CFG->{fow_enable}) {
327 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
328
329 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
330 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
331 glConvolutionFilter2D (
332 GL_CONVOLUTION_2D,
333 GL_ALPHA,
334 3, 3,
335 GL_ALPHA, GL_FLOAT,
336 (pack "f*", @{ $self->{smooth_matrix} }),
337 );
338 glEnable GL_CONVOLUTION_2D;
339 }
340
341 $self->{fow_texture} = new CFClient::Texture
342 w => $w,
343 h => $h,
344 data => $data,
345 internalformat => GL_ALPHA,
346 format => GL_ALPHA;
347
348 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
349 } else {
350 delete $self->{fow_texture};
351 }
352
196 glNewList $self->{list}; 353 glNewList $self->{list};
197 354
198 if ($::MAP) {
199 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
200 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
201
202 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
203 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
204
205 glPushMatrix; 355 glPushMatrix;
356 glTranslate $sx0, $sy0;
206 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 357 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
207 358
208 glTranslate $sx0 - 32, $sy0 - 32, 0; 359 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
209 360
210 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 361 glScale 32, 32;
211 362
212 if ($::CFG->{fow_enable}) { 363 if (my $tex = $self->{fow_texture}) {
213 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
214 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
215 glConvolutionFilter2D (
216 GL_CONVOLUTION_2D,
217 GL_ALPHA,
218 3, 3,
219 GL_ALPHA, GL_FLOAT,
220 pack "f*",
221 0.05, 0.13, 0.05,
222 0.13, 0.30, 0.13,
223 0.05, 0.13, 0.05,
224 );
225 glEnable GL_CONVOLUTION_2D;
226 }
227
228 $self->{fow_texture_name} ||= glGenTexture;
229 # try to re-use the texture name: TODO improve texture class instead
230
231 $self->{fow_texture} = new CFClient::Texture
232 w => $w,
233 h => $h,
234 data => $data,
235 name => $self->{fow_texture_name},
236 internalformat => GL_ALPHA,
237 format => GL_ALPHA;
238
239 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
240
241 glEnable GL_TEXTURE_2D; 364 glEnable GL_TEXTURE_2D;
242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 365 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
243 366
244 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 367 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
245 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 368 $self->{fow_texture}->draw_quad_alpha (0, 0);
246 369
247 glDisable GL_TEXTURE_2D; 370 glDisable GL_TEXTURE_2D;
248 } 371 }
249 372
373 if ($self->{magicmap}) {
374 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
375
376 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
377 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
378
379 glTranslate - $x - 1, - $y - 1;
380 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
381 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
382 }
383
250 glPopMatrix; 384 glPopMatrix;
251 }
252
253 glEndList; 385 glEndList;
254 } 386 }
255 387
256 glPushMatrix;
257 glCallList $self->{list}; 388 glCallList $self->{list};
258 glPopMatrix;
259 389
260 # TNT2 emulates logops in software (or worse :) 390 # TNT2 emulates logops in software (or worse :)
261 if ($focused) { 391 unless ($focused) {
262 (delete $self->{out_of_focus})->destroy
263 if $self->{out_of_focus};
264 } else {
265 glColor 0.4, 0.2, 0.2, 0.6; 392 glColor 0.4, 0.2, 0.2, 0.6;
266 glEnable GL_BLEND; 393 glEnable GL_BLEND;
267 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 394 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
268 glBegin GL_QUADS; 395 glBegin GL_QUADS;
269 glVertex 0, 0; 396 glVertex 0, 0;
270 glVertex 0, $::HEIGHT; 397 glVertex 0, $::HEIGHT;
271 glVertex $::WIDTH, $::HEIGHT; 398 glVertex $::WIDTH, $::HEIGHT;
272 glVertex $::WIDTH, 0; 399 glVertex $::WIDTH, 0;
273 glEnd; 400 glEnd;
274 glDisable GL_BLEND; 401 glDisable GL_BLEND;
275
276# $self->{out_of_focus} ||= do {
277# my $label = new CFClient::UI::Label
278# x => 0,
279# y => 0,
280# z => 1,
281# ellipsise => 0,
282# text => "map out of focus (click map to play)";
283#
284# $label->show;
285# $label->update;
286#
287# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
288# $label->move_abs (
289# ($::WIDTH - $label->{w}) * 0.5,
290# ($::HEIGHT - $label->{h}) * 0.5,
291# );
292# });
293#
294# $label
295# };
296 } 402 }
297} 403}
298 404
299sub DESTROY { 405sub DESTROY {
300 my $self = shift; 406 my $self = shift;
… …
313 419
314sub size_request { 420sub size_request {
315 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 421 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
316} 422}
317 423
318sub size_allocate { 424sub invoke_size_allocate {
319 my ($self, $w, $h) = @_; 425 my ($self, $w, $h) = @_;
320 426
321 $self->SUPER::size_allocate ($w, $h);
322 $self->update; 427 $self->update;
428
429 1
323} 430}
324 431
325sub update { 432sub update {
326 my ($self) = @_; 433 my ($self) = @_;
327 434
… …
412 ]; 519 ];
413 520
414 $self->{entry} = new CFClient::UI::Entry 521 $self->{entry} = new CFClient::UI::Entry
415 on_changed => sub { 522 on_changed => sub {
416 $self->update_labels; 523 $self->update_labels;
524 0
525 },
526 on_button_down => sub {
527 my ($entry, $ev, $x, $y) = @_;
528
529 if ($ev->{button} == 3) {
530 (new CFClient::UI::Menu
531 items => [
532 ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key"
533 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
534 ],
535 )->popup ($ev);
536 return 1;
537 }
538 0
417 }, 539 },
418 on_key_down => sub { 540 on_key_down => sub {
419 my ($entry, $ev) = @_; 541 my ($entry, $ev) = @_;
420 542
421 my $self = $entry->{parent}{parent}; 543 my $self = $entry->{parent}{parent};
422 544
423 if ($ev->{sym} == 13) { 545 if ($ev->{sym} == 13) {
424 if (exists $self->{select}) { 546 if (exists $self->{select}) {
425 $self->{last_command} = $self->{select}; 547 $self->{last_command} = $self->{select};
426 $::CONN->user_send ($self->{select}); 548 $::CONN->user_send ($self->{select});
549
550 unshift @{$self->{history}}, $self->{entry}->get_text;
551 $self->{hist_ptr} = 0;
552
427 $self->hide; 553 $self->hide;
428 } 554 }
429 } elsif ($ev->{sym} == 27) { 555 } elsif ($ev->{sym} == 27) {
556 $self->{hist_ptr} = 0;
430 $self->hide; 557 $self->hide;
431 return;
432 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 558 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
559 if ($self->{hist_ptr} > 1) {
560 $self->{hist_ptr}--;
561 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
562 } elsif ($self->{hist_ptr} > 0) {
563 $self->{hist_ptr}--;
564 $self->{entry}->set_text ($self->{hist_saveback});
565 } else {
433 ++$self->{select_offset} 566 ++$self->{select_offset}
434 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 567 if $self->{select_offset} < $#{ $self->{last_match} || [] };
568 }
435 $self->update_labels; 569 $self->update_labels;
436 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 570 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
571 if ($self->{select_offset}) {
437 --$self->{select_offset} 572 --$self->{select_offset}
573 } else {
574 unless ($self->{hist_ptr}) {
575 $self->{hist_saveback} = $self->{entry}->get_text;
576 }
577 if ($self->{hist_ptr} <= $#{$self->{history}}) {
438 if $self->{select_offset}; 578 $self->{hist_ptr}++;
579 }
580 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
581 if exists $self->{history}->[$self->{hist_ptr} - 1];
582 }
439 $self->update_labels; 583 $self->update_labels;
440 } else { 584 } else {
441 return 0; 585 return 0;
442 } 586 }
443 587
… …
458 602
459 $self->{entry}->set_text ($prefix); 603 $self->{entry}->set_text ($prefix);
460 $self->show; 604 $self->show;
461} 605}
462 606
463sub size_allocate { 607sub invoke_size_allocate {
464 my ($self, $w, $h) = @_; 608 my ($self, $w, $h) = @_;
465 609
466 $self->SUPER::size_allocate ($w, $h);
467 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 610 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
611
612 $self->SUPER::invoke_size_allocate ($w, $h)
468} 613}
469 614
470sub show { 615sub show {
471 my ($self) = @_; 616 my ($self) = @_;
472 617
473 $self->SUPER::show; 618 $self->SUPER::show;
474 $self->{entry}->focus_in; 619 $self->{entry}->grab_focus;
475} 620}
476 621
477sub hide { 622sub hide {
478 my ($self) = @_; 623 my ($self) = @_;
624
625 $self->{hist_ptr} = 0;
479 626
480 $self->SUPER::hide; 627 $self->SUPER::hide;
481 $self->{entry}->set_text (""); 628 $self->{entry}->set_text ("");
482} 629}
483 630
484sub key_down { 631sub inject_key_down {
485 my ($self, $ev) = @_; 632 my ($self, $ev) = @_;
486 633
634 $self->{entry}->grab_focus;
487 $self->{entry}->key_down ($ev); 635 $self->{entry}->emit (key_down => $ev);
488} 636}
489 637
490sub update_labels { 638sub update_labels {
491 my ($self) = @_; 639 my ($self) = @_;
492 640
… …
579 $label->set_text (""); 727 $label->set_text ("");
580 $label->set_tooltip (""); 728 $label->set_tooltip ("");
581 } 729 }
582 730
583 $self->update; 731 $self->update;
584 ###
585} 732}
586 733
587sub _draw { 734sub _draw {
588 my ($self) = @_; 735 my ($self) = @_;
589 736

Diff Legend

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