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.36 by root, Thu May 25 00:26: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
22 $self->{completer} = new CFClient::MapWidget::Command:: 33 $self->{completer} = new CFClient::MapWidget::Command::
23 command => $self->{command}, 34 command => $self->{command},
24 can_focus => 1, 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.",
25 ; 44 ;
26 45
27 $self 46 $self
28} 47}
29 48
… …
31 my ($self, $command, $tooltip, $widget, $cb) = @_; 50 my ($self, $command, $tooltip, $widget, $cb) = @_;
32 51
33 (my $data = $command) =~ s/\\//g; 52 (my $data = $command) =~ s/\\//g;
34 53
35 $tooltip =~ s/^\s+//; 54 $tooltip =~ s/^\s+//;
36
37 $tooltip = "<big>$data</big>\n\n$tooltip"; 55 $tooltip = "<big>$data</big>\n\n$tooltip";
38
39 $tooltip =~ s/\s+$//; 56 $tooltip =~ s/\s+$//;
40 57
41 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 58 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
42} 59}
43 60
44sub clr_commands { 61sub clr_commands {
45 my ($self) = @_; 62 my ($self) = @_;
46 63
47 %{$self->{completer}{command}} = (); 64 %{$self->{completer}{command}} = ();
48}
49 65
66 $self->{completer}->hide
67 if $self->{completer};
68}
69
50sub button_down { 70sub invoke_button_down {
51 my ($self, $ev, $x, $y) = @_; 71 my ($self, $ev, $x, $y) = @_;
52 72
53 $self->focus_in;
54
55 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
56 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 90 my ($ox, $oy) = ($ev->{x}, $ev->{y});
57 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 91 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
58 92
59 $self->{motion} = sub { 93 $self->{motion} = sub {
60 my ($ev, $x, $y) = @_; 94 my ($ev, $x, $y) = @_;
… …
64 $::CFG->{map_shift_x} = $bw + $x - $ox; 98 $::CFG->{map_shift_x} = $bw + $x - $ox;
65 $::CFG->{map_shift_y} = $bh + $y - $oy; 99 $::CFG->{map_shift_y} = $bh + $y - $oy;
66 100
67 $self->update; 101 $self->update;
68 }; 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
69 } 123 1
70} 124}
71 125
72sub button_up { 126sub invoke_button_up {
73 my ($self, $ev, $x, $y) = @_; 127 my ($self, $ev, $x, $y) = @_;
74 128
75 delete $self->{motion}; 129 delete $self->{motion};
76}
77 130
131 1
132}
133
78sub mouse_motion { 134sub invoke_mouse_motion {
79 my ($self, $ev, $x, $y) = @_; 135 my ($self, $ev, $x, $y) = @_;
80 136
137 if ($self->{motion}) {
81 $self->{motion}->($ev, $x, $y) if $self->{motion}; 138 $self->{motion}->($ev, $x, $y);
139 } else {
140 return 0;
141 }
142
143 1
82} 144}
83 145
84sub size_request { 146sub size_request {
85 ( 147 (
86 1 + 32 * int $::WIDTH / 32, 148 32 * CFClient::ceil $::WIDTH / 32,
87 1 + 32 * int $::HEIGHT / 32, 149 32 * CFClient::ceil $::HEIGHT / 32,
88 ) 150 )
89} 151}
90 152
91sub update { 153sub update {
92 my ($self) = @_; 154 my ($self) = @_;
… …
109 CFClient::SDLK_RIGHT, [3, "east"], 171 CFClient::SDLK_RIGHT, [3, "east"],
110 CFClient::SDLK_DOWN, [5, "south"], 172 CFClient::SDLK_DOWN, [5, "south"],
111 CFClient::SDLK_LEFT, [7, "west"], 173 CFClient::SDLK_LEFT, [7, "west"],
112); 174);
113 175
114sub key_down { 176sub invoke_key_down {
115 my ($self, $ev) = @_; 177 my ($self, $ev) = @_;
116
117 return unless $::CONN;
118 178
119 my $mod = $ev->{mod}; 179 my $mod = $ev->{mod};
120 my $sym = $ev->{sym}; 180 my $sym = $ev->{sym};
121 my $uni = $ev->{unicode}; 181 my $uni = $ev->{unicode};
122 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
123 if ($sym == CFClient::SDLK_KP5) { 214 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
124 $::CONN->user_send ("stay fire"); 215 $::CONN->user_send ("stay fire");
125 } elsif ($uni == ord ",") { 216 } elsif ($uni == ord ",") {
126 $::CONN->user_send ("take"); 217 $::CONN->user_send ("take");
127 } elsif ($uni == ord " ") { 218 } elsif ($uni == ord " ") {
128 $::CONN->user_send ("apply"); 219 $::CONN->user_send ("apply");
129 } elsif ($uni == ord "\t") { 220 } elsif ($uni == ord ".") {
130 # TODO: toggle inventory 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;
131 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 225 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
132 $::CONN->user_send ("rotateshoottype +"); 226 $::CONN->user_send ("rotateshoottype +");
133 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 227 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
134 $::CONN->user_send ("rotateshoottype -"); 228 $::CONN->user_send ("rotateshoottype -");
135 } elsif ($uni == ord '"') { 229 } elsif ($uni == ord '"') {
136 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 230 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
137 $self->{completer}->show; 231 $self->{completer}->show;
138 } elsif ($uni == ord "'") { 232 } elsif ($uni == ord "'") {
139 $self->{completer}->set_prefix (""); 233 $self->{completer}->set_prefix ("");
140 $self->{completer}->show; 234 $self->{completer}->show;
141 } elsif (exists $DIR{$sym}) { 235 } elsif (exists $DIR{$sym}) {
142 if ($mod & CFClient::KMOD_SHIFT) { 236 if ($mod & CFClient::KMOD_SHIFT) {
143 $self->{shft}++; 237 $self->{shft}++;
238 if ($DIR{$sym}[0] != $self->{fire_dir}) {
144 $::CONN->user_send ("fire $DIR{$sym}[0]"); 239 $::CONN->user_send ("fire $DIR{$sym}[0]");
240 }
241 $self->{fire_dir} = $DIR{$sym}[0];
145 } elsif ($mod & CFClient::KMOD_CTRL) { 242 } elsif ($mod & CFClient::KMOD_CTRL) {
146 $self->{ctrl}++; 243 $self->{ctrl}++;
147 $::CONN->user_send ("run $DIR{$sym}[0]"); 244 $::CONN->user_send ("run $DIR{$sym}[0]");
148 } else { 245 } else {
149 $::CONN->user_send ("$DIR{$sym}[1]"); 246 $::CONN->user_send ("$DIR{$sym}[1]");
150 } 247 }
151 } elsif ($ev->{unicode}) { 248 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
152 $self->{completer}->key_down ($ev); 249 $self->{completer}->invoke_key_down ($ev);
153 $self->{completer}->show; 250 $self->{completer}->show;
251 } else {
252 return 0;
253 }
254
154 } 255 1
155} 256}
156 257
157sub key_up { 258sub invoke_key_up {
158 my ($self, $ev) = @_; 259 my ($self, $ev) = @_;
159 260
261 my $res = 0;
160 my $mod = $ev->{mod}; 262 my $mod = $ev->{mod};
161 my $sym = $ev->{sym}; 263 my $sym = $ev->{sym};
162 264
265 if ($::CFG->{shift_fire_stop}) {
163 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 266 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
164 $::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 }
165 } 281 }
282
166 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 283 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
167 $::CONN->user_send ("run_stop"); 284 $::CONN->user_send ("run_stop");
285 $res = 1;
168 } 286 }
287
288 $res
289}
290
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;
169} 300}
170 301
171sub draw { 302sub draw {
172 my ($self) = @_; 303 my ($self) = @_;
304
305 return unless $::MAP;
173 306
174 my $focused = $CFClient::UI::FOCUS == $self 307 my $focused = $CFClient::UI::FOCUS == $self
175 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 308 || $CFClient::UI::FOCUS == $self->{completer}{entry};
176 309
177 return 310 return
178 unless $focused || !$::FAST; 311 unless $focused || !$::FAST;
179 312
180 if (delete $self->{need_update}) { 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
181 glNewList $self->{list}; 352 glNewList $self->{list};
182 353
183 if ($::MAP) {
184 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
185 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
186
187 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
188 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
189
190 glPushMatrix; 354 glPushMatrix;
355 glTranslate $sx0, $sy0;
191 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 356 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
192 357
193 glTranslate $sx0 - 32, $sy0 - 32, 0; 358 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
194 359
195 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 360 glScale 32, 32;
196 361
197 if ($::CFG->{fow_enable}) { 362 if (my $tex = $self->{fow_texture}) {
198 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
199 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
200 glConvolutionFilter2D (
201 GL_CONVOLUTION_2D,
202 GL_ALPHA,
203 3, 3,
204 GL_ALPHA, GL_FLOAT,
205 pack "f*",
206 0.05, 0.13, 0.05,
207 0.13, 0.30, 0.13,
208 0.05, 0.13, 0.05,
209 );
210 glEnable GL_CONVOLUTION_2D;
211 }
212
213 $self->{fow_texture_name} ||= glGenTexture;
214 # try to re-use the texture name: TODO improve texture class instead
215
216 $self->{fow_texture} = new CFClient::Texture
217 w => $w,
218 h => $h,
219 data => $data,
220 name => $self->{fow_texture_name},
221 internalformat => GL_ALPHA,
222 format => GL_ALPHA;
223
224 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
225
226 glEnable GL_TEXTURE_2D; 363 glEnable GL_TEXTURE_2D;
227 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 364 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
228 365
229 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 366 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
230 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 367 $self->{fow_texture}->draw_quad_alpha (0, 0);
231 368
232 glDisable GL_TEXTURE_2D; 369 glDisable GL_TEXTURE_2D;
233 } 370 }
234 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
235 glPopMatrix; 383 glPopMatrix;
236 }
237
238 glEndList; 384 glEndList;
239 } 385 }
240 386
241 glPushMatrix;
242 glCallList $self->{list}; 387 glCallList $self->{list};
243 glPopMatrix;
244 388
245 # TNT2 emulates logops in software (or worse :) 389 # TNT2 emulates logops in software (or worse :)
246 if ($focused) { 390 unless ($focused) {
247 (delete $self->{out_of_focus})->destroy
248 if $self->{out_of_focus};
249 } else {
250 glColor 0.4, 0.2, 0.2, 0.6; 391 glColor 0.4, 0.2, 0.2, 0.6;
251 glEnable GL_BLEND; 392 glEnable GL_BLEND;
252 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
253 glBegin GL_QUADS; 394 glBegin GL_QUADS;
254 glVertex 0, 0; 395 glVertex 0, 0;
255 glVertex 0, $::HEIGHT; 396 glVertex 0, $::HEIGHT;
256 glVertex $::WIDTH, $::HEIGHT; 397 glVertex $::WIDTH, $::HEIGHT;
257 glVertex $::WIDTH, 0; 398 glVertex $::WIDTH, 0;
258 glEnd; 399 glEnd;
259 glDisable GL_BLEND; 400 glDisable GL_BLEND;
260
261 $self->{out_of_focus} ||= do {
262 my $label = new CFClient::UI::Label
263 x => 0,
264 y => 0,
265 z => 1,
266 ellipsise => 0,
267 text => "map out of focus (click map to play)";
268
269 $label->show;
270 $label->update;
271
272 $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
273 $label->move (
274 ($::WIDTH - $label->{w}) * 0.5,
275 ($::HEIGHT - $label->{h}) * 0.5,
276 );
277 });
278
279 $label
280 };
281 } 401 }
282} 402}
283 403
284sub DESTROY { 404sub DESTROY {
285 my $self = shift; 405 my $self = shift;
… …
298 418
299sub size_request { 419sub size_request {
300 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 420 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
301} 421}
302 422
303sub size_allocate { 423sub invoke_size_allocate {
304 my ($self, $w, $h) = @_; 424 my ($self, $w, $h) = @_;
305 425
306 $self->SUPER::size_allocate ($w, $h);
307 $self->update; 426 $self->update;
427
428 1
308} 429}
309 430
310sub update { 431sub update {
311 my ($self) = @_; 432 my ($self) = @_;
312 433
… …
395 fontsize => $_, 516 fontsize => $_,
396 ), (0.8) x 16 517 ), (0.8) x 16
397 ]; 518 ];
398 519
399 $self->{entry} = new CFClient::UI::Entry 520 $self->{entry} = new CFClient::UI::Entry
400 connect_changed => sub { 521 on_changed => sub {
401 $self->update_labels; 522 $self->update_labels;
523 0
402 }, 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 },
403 connect_key_down => sub { 539 on_key_down => sub {
404 my ($entry, $ev) = @_; 540 my ($entry, $ev) = @_;
405 541
406 my $self = $entry->{parent}{parent}; 542 my $self = $entry->{parent}{parent};
407 543
408 if ($ev->{sym} == 13) { 544 if ($ev->{sym} == 13) {
409 if (exists $self->{select}) { 545 if (exists $self->{select}) {
546 $self->{last_command} = $self->{select};
410 $::CONN->user_send ($self->{select}); 547 $::CONN->user_send ($self->{select});
548
549 unshift @{$self->{history}}, $self->{entry}->get_text;
550 $self->{hist_ptr} = 0;
551
411 $self->hide; 552 $self->hide;
412 } 553 }
413 } elsif ($ev->{sym} == 27) { 554 } elsif ($ev->{sym} == 27) {
555 $self->{hist_ptr} = 0;
414 $self->hide; 556 $self->hide;
415 return;
416 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 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 {
417 ++$self->{select_offset} 565 ++$self->{select_offset}
418 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 566 if $self->{select_offset} < $#{ $self->{last_match} || [] };
567 }
419 $self->update_labels; 568 $self->update_labels;
420 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 569 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
570 if ($self->{select_offset}) {
421 --$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}}) {
422 if $self->{select_offset}; 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 }
423 $self->update_labels; 582 $self->update_labels;
424 } else { 583 } else {
425 return 0; 584 return 0;
426 } 585 }
427 586
… …
442 601
443 $self->{entry}->set_text ($prefix); 602 $self->{entry}->set_text ($prefix);
444 $self->show; 603 $self->show;
445} 604}
446 605
447sub size_allocate { 606sub invoke_size_allocate {
448 my ($self, $w, $h) = @_; 607 my ($self, $w, $h) = @_;
449 608
450 $self->SUPER::size_allocate ($w, $h);
451 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 609 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
610
611 $self->SUPER::invoke_size_allocate ($w, $h)
452} 612}
453 613
454sub show { 614sub show {
455 my ($self) = @_; 615 my ($self) = @_;
456 616
457 $self->SUPER::show; 617 $self->SUPER::show;
458 $self->{entry}->focus_in; 618 $self->{entry}->grab_focus;
459} 619}
460 620
461sub hide { 621sub hide {
462 my ($self) = @_; 622 my ($self) = @_;
623
624 $self->{hist_ptr} = 0;
463 625
464 $self->SUPER::hide; 626 $self->SUPER::hide;
465 $self->{entry}->set_text (""); 627 $self->{entry}->set_text ("");
466} 628}
467 629
468sub key_down { 630sub invoke_key_down {
469 my ($self, $ev) = @_; 631 my ($self, $ev) = @_;
470 632
471 $self->{entry}->key_down ($ev); 633 $self->{entry}->emit (key_down => $ev)
472} 634}
473 635
474sub update_labels { 636sub update_labels {
475 my ($self) = @_; 637 my ($self) = @_;
476 638
… …
509 671
510 @match = map $self->{command}{$_->[0]}, 672 @match = map $self->{command}{$_->[0]},
511 sort { 673 sort {
512 $a->[1] <=> $b->[1] 674 $a->[1] <=> $b->[1]
513 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 675 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
514 or (length $a->[0]) <=> (length $b->[0]) 676 or (length $b->[0]) <=> (length $a->[0])
515 } @match; 677 } @match;
516 } 678 }
517 679
518 $self->{last_search} = $cmd; 680 $self->{last_search} = $text;
519 $self->{last_match} = \@match; 681 $self->{last_match} = \@match;
520 682
521 $self->{select_offset} = 0; 683 $self->{select_offset} = 0;
522 } 684 }
523 685
… …
563 $label->set_text (""); 725 $label->set_text ("");
564 $label->set_tooltip (""); 726 $label->set_tooltip ("");
565 } 727 }
566 728
567 $self->update; 729 $self->update;
568 ###
569} 730}
570 731
571sub _draw { 732sub _draw {
572 my ($self) = @_; 733 my ($self) = @_;
573 734

Diff Legend

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