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

Diff Legend

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