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.47 by root, Fri Jun 2 22:13:47 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);
75 } 122 }
76 123
77 1 124 1
78} 125}
79 126
80sub button_up { 127sub invoke_button_up {
81 my ($self, $ev, $x, $y) = @_; 128 my ($self, $ev, $x, $y) = @_;
82 129
83 delete $self->{motion}; 130 delete $self->{motion};
84 131
85 1 132 1
86} 133}
87 134
88sub mouse_motion { 135sub invoke_mouse_motion {
89 my ($self, $ev, $x, $y) = @_; 136 my ($self, $ev, $x, $y) = @_;
90 137
91 if ($self->{motion}) { 138 if ($self->{motion}) {
92 $self->{motion}->($ev, $x, $y); 139 $self->{motion}->($ev, $x, $y);
93 } else { 140 } else {
… …
97 1 144 1
98} 145}
99 146
100sub size_request { 147sub size_request {
101 ( 148 (
102 1 + 32 * int $::WIDTH / 32, 149 32 * CFClient::ceil $::WIDTH / 32,
103 1 + 32 * int $::HEIGHT / 32, 150 32 * CFClient::ceil $::HEIGHT / 32,
104 ) 151 )
105} 152}
106 153
107sub update { 154sub update {
108 my ($self) = @_; 155 my ($self) = @_;
… …
125 CFClient::SDLK_RIGHT, [3, "east"], 172 CFClient::SDLK_RIGHT, [3, "east"],
126 CFClient::SDLK_DOWN, [5, "south"], 173 CFClient::SDLK_DOWN, [5, "south"],
127 CFClient::SDLK_LEFT, [7, "west"], 174 CFClient::SDLK_LEFT, [7, "west"],
128); 175);
129 176
130sub key_down { 177sub invoke_key_down {
131 my ($self, $ev) = @_; 178 my ($self, $ev) = @_;
132
133 return 0 unless $::CONN;
134 179
135 my $mod = $ev->{mod}; 180 my $mod = $ev->{mod};
136 my $sym = $ev->{sym}; 181 my $sym = $ev->{sym};
137 my $uni = $ev->{unicode}; 182 my $uni = $ev->{unicode};
138 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
139 if ($sym == CFClient::SDLK_KP5) { 215 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
140 $::CONN->user_send ("stay fire"); 216 $::CONN->user_send ("stay fire");
141 } elsif ($uni == ord ",") { 217 } elsif ($uni == ord ",") {
142 $::CONN->user_send ("take"); 218 $::CONN->user_send ("take");
143 } elsif ($uni == ord " ") { 219 } elsif ($uni == ord " ") {
144 $::CONN->user_send ("apply"); 220 $::CONN->user_send ("apply");
145 } elsif ($uni == ord ".") { 221 } elsif ($uni == ord ".") {
146 $::CONN->user_send ($self->{completer}{last_command}) 222 $::CONN->user_send ($self->{completer}{last_command})
147 if exists $self->{completer}{last_command}; 223 if exists $self->{completer}{last_command};
148 } elsif ($uni == ord "\t") { 224 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
149 $::INV_WINDOW->toggle_visibility; 225 $::CONN->user_send ($_) for @$bind_cmd;
150 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 226 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
151 $::CONN->user_send ("rotateshoottype +"); 227 $::CONN->user_send ("rotateshoottype +");
152 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 228 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
153 $::CONN->user_send ("rotateshoottype -"); 229 $::CONN->user_send ("rotateshoottype -");
154 } elsif ($uni == ord '"') { 230 } elsif ($uni == ord '"') {
155 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 231 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
156 $self->{completer}->show; 232 $self->{completer}->show;
157 } elsif ($uni == ord "'") { 233 } elsif ($uni == ord "'") {
158 $self->{completer}->set_prefix (""); 234 $self->{completer}->set_prefix ("");
159 $self->{completer}->show; 235 $self->{completer}->show;
160 } elsif (exists $DIR{$sym}) { 236 } elsif (exists $DIR{$sym}) {
161 if ($mod & CFClient::KMOD_SHIFT) { 237 if ($mod & CFClient::KMOD_SHIFT) {
162 $self->{shft}++; 238 $self->{shft}++;
239 if ($DIR{$sym}[0] != $self->{fire_dir}) {
163 $::CONN->user_send ("fire $DIR{$sym}[0]"); 240 $::CONN->user_send ("fire $DIR{$sym}[0]");
241 }
242 $self->{fire_dir} = $DIR{$sym}[0];
164 } elsif ($mod & CFClient::KMOD_CTRL) { 243 } elsif ($mod & CFClient::KMOD_CTRL) {
165 $self->{ctrl}++; 244 $self->{ctrl}++;
166 $::CONN->user_send ("run $DIR{$sym}[0]"); 245 $::CONN->user_send ("run $DIR{$sym}[0]");
167 } else { 246 } else {
168 $::CONN->user_send ("$DIR{$sym}[1]"); 247 $::CONN->user_send ("$DIR{$sym}[1]");
169 } 248 }
170 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
171 $::BIND_EDITOR->set_binding (undef, undef, [],
172 sub {
173 my ($mod, $sym, $cmds) = @_;
174 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
175 });
176 $::BIND_EDITOR->start;
177 $::BIND_EDITOR->show;
178 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
179 $::BIND_EDITOR->stop;
180 $::BIND_EDITOR->ask_for_bind_and_commit;
181 $::BIND_EDITOR->hide;
182 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
183 $::CONN->user_send ($_) for @$bind_cmd;
184 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 249 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
185 $self->{completer}->key_down ($ev); 250 $self->{completer}->inject_key_down ($ev);
186 $self->{completer}->show; 251 $self->{completer}->show;
187 } else { 252 } else {
188 return 0; 253 return 0;
189 } 254 }
190 255
191 1 256 1
192} 257}
193 258
194sub key_up { 259sub invoke_key_up {
195 my ($self, $ev) = @_; 260 my ($self, $ev) = @_;
196 261
197 my $res = 0; 262 my $res = 0;
198 my $mod = $ev->{mod}; 263 my $mod = $ev->{mod};
199 my $sym = $ev->{sym}; 264 my $sym = $ev->{sym};
200 265
266 if ($::CFG->{shift_fire_stop}) {
201 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 267 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
202 $::CONN->user_send ("fire_stop"); 268 $::CONN->user_send ("fire_stop");
269 delete $self->{fire_dir};
203 $res = 1; 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 }
204 } 282 }
205 283
206 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 284 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
207 $::CONN->user_send ("run_stop"); 285 $::CONN->user_send ("run_stop");
208 $res = 1; 286 $res = 1;
209 } 287 }
210 288
211 $res 289 $res
212} 290}
213 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;
301}
302
214sub draw { 303sub draw {
215 my ($self) = @_; 304 my ($self) = @_;
305
306 return unless $::MAP;
216 307
217 my $focused = $CFClient::UI::FOCUS == $self 308 my $focused = $CFClient::UI::FOCUS == $self
218 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 309 || $CFClient::UI::FOCUS == $self->{completer}{entry};
219 310
220 return 311 return
221 unless $focused || !$::FAST; 312 unless $focused || !$::FAST;
222 313
223 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
224 glNewList $self->{list}; 353 glNewList $self->{list};
225 354
226 if ($::MAP) {
227 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
228 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
229
230 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
231 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
232
233 glPushMatrix; 355 glPushMatrix;
356 glTranslate $sx0, $sy0;
234 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 357 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
235 358
236 glTranslate $sx0 - 32, $sy0 - 32, 0; 359 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
237 360
238 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 361 glScale 32, 32;
239 362
240 if ($::CFG->{fow_enable}) { 363 if (my $tex = $self->{fow_texture}) {
241 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
242 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
243 glConvolutionFilter2D (
244 GL_CONVOLUTION_2D,
245 GL_ALPHA,
246 3, 3,
247 GL_ALPHA, GL_FLOAT,
248 pack "f*",
249 0.05, 0.13, 0.05,
250 0.13, 0.30, 0.13,
251 0.05, 0.13, 0.05,
252 );
253 glEnable GL_CONVOLUTION_2D;
254 }
255
256 $self->{fow_texture_name} ||= glGenTexture;
257 # try to re-use the texture name: TODO improve texture class instead
258
259 $self->{fow_texture} = new CFClient::Texture
260 w => $w,
261 h => $h,
262 data => $data,
263 name => $self->{fow_texture_name},
264 internalformat => GL_ALPHA,
265 format => GL_ALPHA;
266
267 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
268
269 glEnable GL_TEXTURE_2D; 364 glEnable GL_TEXTURE_2D;
270 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 365 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
271 366
272 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 367 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
273 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 368 $self->{fow_texture}->draw_quad_alpha (0, 0);
274 369
275 glDisable GL_TEXTURE_2D; 370 glDisable GL_TEXTURE_2D;
276 } 371 }
277 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
278 glPopMatrix; 384 glPopMatrix;
279 }
280
281 glEndList; 385 glEndList;
282 } 386 }
283 387
284 glPushMatrix;
285 glCallList $self->{list}; 388 glCallList $self->{list};
286 glPopMatrix;
287 389
288 # TNT2 emulates logops in software (or worse :) 390 # TNT2 emulates logops in software (or worse :)
289 if ($focused) { 391 unless ($focused) {
290 (delete $self->{out_of_focus})->destroy
291 if $self->{out_of_focus};
292 } else {
293 glColor 0.4, 0.2, 0.2, 0.6; 392 glColor 0.4, 0.2, 0.2, 0.6;
294 glEnable GL_BLEND; 393 glEnable GL_BLEND;
295 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 394 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
296 glBegin GL_QUADS; 395 glBegin GL_QUADS;
297 glVertex 0, 0; 396 glVertex 0, 0;
298 glVertex 0, $::HEIGHT; 397 glVertex 0, $::HEIGHT;
299 glVertex $::WIDTH, $::HEIGHT; 398 glVertex $::WIDTH, $::HEIGHT;
300 glVertex $::WIDTH, 0; 399 glVertex $::WIDTH, 0;
301 glEnd; 400 glEnd;
302 glDisable GL_BLEND; 401 glDisable GL_BLEND;
303
304# $self->{out_of_focus} ||= do {
305# my $label = new CFClient::UI::Label
306# x => 0,
307# y => 0,
308# z => 1,
309# ellipsise => 0,
310# text => "map out of focus (click map to play)";
311#
312# $label->show;
313# $label->update;
314#
315# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
316# $label->move_abs (
317# ($::WIDTH - $label->{w}) * 0.5,
318# ($::HEIGHT - $label->{h}) * 0.5,
319# );
320# });
321#
322# $label
323# };
324 } 402 }
325} 403}
326 404
327sub DESTROY { 405sub DESTROY {
328 my $self = shift; 406 my $self = shift;
… …
341 419
342sub size_request { 420sub size_request {
343 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 421 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
344} 422}
345 423
346sub size_allocate { 424sub invoke_size_allocate {
347 my ($self, $w, $h) = @_; 425 my ($self, $w, $h) = @_;
348 426
349 $self->SUPER::size_allocate ($w, $h);
350 $self->update; 427 $self->update;
428
429 1
351} 430}
352 431
353sub update { 432sub update {
354 my ($self) = @_; 433 my ($self) = @_;
355 434
… …
440 ]; 519 ];
441 520
442 $self->{entry} = new CFClient::UI::Entry 521 $self->{entry} = new CFClient::UI::Entry
443 on_changed => sub { 522 on_changed => sub {
444 $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
445 }, 539 },
446 on_key_down => sub { 540 on_key_down => sub {
447 my ($entry, $ev) = @_; 541 my ($entry, $ev) = @_;
448 542
449 my $self = $entry->{parent}{parent}; 543 my $self = $entry->{parent}{parent};
450 544
451 if ($ev->{sym} == 13) { 545 if ($ev->{sym} == 13) {
452 if (exists $self->{select}) { 546 if (exists $self->{select}) {
453 $self->{last_command} = $self->{select}; 547 $self->{last_command} = $self->{select};
454 $::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
455 $self->hide; 553 $self->hide;
456 } 554 }
457 } elsif ($ev->{sym} == 27) { 555 } elsif ($ev->{sym} == 27) {
556 $self->{hist_ptr} = 0;
458 $self->hide; 557 $self->hide;
459 return;
460 } 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 {
461 ++$self->{select_offset} 566 ++$self->{select_offset}
462 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 567 if $self->{select_offset} < $#{ $self->{last_match} || [] };
568 }
463 $self->update_labels; 569 $self->update_labels;
464 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 570 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
571 if ($self->{select_offset}) {
465 --$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}}) {
466 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 }
467 $self->update_labels; 583 $self->update_labels;
468 } else { 584 } else {
469 return 0; 585 return 0;
470 } 586 }
471 587
… …
486 602
487 $self->{entry}->set_text ($prefix); 603 $self->{entry}->set_text ($prefix);
488 $self->show; 604 $self->show;
489} 605}
490 606
491sub size_allocate { 607sub invoke_size_allocate {
492 my ($self, $w, $h) = @_; 608 my ($self, $w, $h) = @_;
493 609
494 $self->SUPER::size_allocate ($w, $h);
495 $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)
496} 613}
497 614
498sub show { 615sub show {
499 my ($self) = @_; 616 my ($self) = @_;
500 617
501 $self->SUPER::show; 618 $self->SUPER::show;
502 $self->{entry}->focus_in; 619 $self->{entry}->grab_focus;
503} 620}
504 621
505sub hide { 622sub hide {
506 my ($self) = @_; 623 my ($self) = @_;
624
625 $self->{hist_ptr} = 0;
507 626
508 $self->SUPER::hide; 627 $self->SUPER::hide;
509 $self->{entry}->set_text (""); 628 $self->{entry}->set_text ("");
510} 629}
511 630
512sub key_down { 631sub inject_key_down {
513 my ($self, $ev) = @_; 632 my ($self, $ev) = @_;
514 633
634 $self->{entry}->grab_focus;
515 $self->{entry}->key_down ($ev) 635 $self->{entry}->emit (key_down => $ev);
516} 636}
517 637
518sub update_labels { 638sub update_labels {
519 my ($self) = @_; 639 my ($self) = @_;
520 640
… …
607 $label->set_text (""); 727 $label->set_text ("");
608 $label->set_tooltip (""); 728 $label->set_tooltip ("");
609 } 729 }
610 730
611 $self->update; 731 $self->update;
612 ###
613} 732}
614 733
615sub _draw { 734sub _draw {
616 my ($self) = @_; 735 my ($self) = @_;
617 736

Diff Legend

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