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.38 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.72 by root, Wed Jul 5 01:53:24 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},
… …
27 . "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, "
28 . "followed by a space, and press return. " 39 . "followed by a space, and press return. "
29 . "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 "
30 . "for commands you might want to use.\n" 41 . "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" 42 . "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.", 43 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
33 ; 44 ;
34 45
35 $self 46 $self
36} 47}
37 48
… …
39 my ($self, $command, $tooltip, $widget, $cb) = @_; 50 my ($self, $command, $tooltip, $widget, $cb) = @_;
40 51
41 (my $data = $command) =~ s/\\//g; 52 (my $data = $command) =~ s/\\//g;
42 53
43 $tooltip =~ s/^\s+//; 54 $tooltip =~ s/^\s+//;
44
45 $tooltip = "<big>$data</big>\n\n$tooltip"; 55 $tooltip = "<big>$data</big>\n\n$tooltip";
46
47 $tooltip =~ s/\s+$//; 56 $tooltip =~ s/\s+$//;
48 57
49 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 58 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
50} 59}
51 60
… …
53 my ($self) = @_; 62 my ($self) = @_;
54 63
55 %{$self->{completer}{command}} = (); 64 %{$self->{completer}{command}} = ();
56} 65}
57 66
58sub button_down { 67sub invoke_button_down {
59 my ($self, $ev, $x, $y) = @_; 68 my ($self, $ev, $x, $y) = @_;
60 69
61 $self->focus_in;
62
63 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
64 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 87 my ($ox, $oy) = ($ev->{x}, $ev->{y});
65 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 88 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
66 89
67 $self->{motion} = sub { 90 $self->{motion} = sub {
68 my ($ev, $x, $y) = @_; 91 my ($ev, $x, $y) = @_;
… …
72 $::CFG->{map_shift_x} = $bw + $x - $ox; 95 $::CFG->{map_shift_x} = $bw + $x - $ox;
73 $::CFG->{map_shift_y} = $bh + $y - $oy; 96 $::CFG->{map_shift_y} = $bh + $y - $oy;
74 97
75 $self->update; 98 $self->update;
76 }; 99 };
100 } elsif ($ev->{button} == 3) {
101 (new CFClient::UI::Menu
102 items => [
103 ["Help Browser…\t(F1)", sub { $::HELP_WINDOW->toggle_visibility }],
104 ["Stats &amp; Skills…\t(F2)", sub { ::toggle_player_page ($::STATS_PAGE) }],
105 ["Inventory…\t(F3)", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
106 ["Spells…\t(F4)", sub { ::toggle_player_page ($::SPELL_PAGE) }],
107 ["Setup… \t(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
77 } 119 1
78} 120}
79 121
80sub button_up { 122sub invoke_button_up {
81 my ($self, $ev, $x, $y) = @_; 123 my ($self, $ev, $x, $y) = @_;
82 124
83 delete $self->{motion}; 125 delete $self->{motion};
84}
85 126
127 1
128}
129
86sub mouse_motion { 130sub invoke_mouse_motion {
87 my ($self, $ev, $x, $y) = @_; 131 my ($self, $ev, $x, $y) = @_;
88 132
133 if ($self->{motion}) {
89 $self->{motion}->($ev, $x, $y) if $self->{motion}; 134 $self->{motion}->($ev, $x, $y);
135 } else {
136 return 0;
137 }
138
139 1
90} 140}
91 141
92sub size_request { 142sub size_request {
93 ( 143 (
94 1 + 32 * int $::WIDTH / 32, 144 32 * CFClient::ceil $::WIDTH / 32,
95 1 + 32 * int $::HEIGHT / 32, 145 32 * CFClient::ceil $::HEIGHT / 32,
96 ) 146 )
97} 147}
98 148
99sub update { 149sub update {
100 my ($self) = @_; 150 my ($self) = @_;
… …
117 CFClient::SDLK_RIGHT, [3, "east"], 167 CFClient::SDLK_RIGHT, [3, "east"],
118 CFClient::SDLK_DOWN, [5, "south"], 168 CFClient::SDLK_DOWN, [5, "south"],
119 CFClient::SDLK_LEFT, [7, "west"], 169 CFClient::SDLK_LEFT, [7, "west"],
120); 170);
121 171
122sub key_down { 172sub invoke_key_down {
123 my ($self, $ev) = @_; 173 my ($self, $ev) = @_;
124
125 return unless $::CONN;
126 174
127 my $mod = $ev->{mod}; 175 my $mod = $ev->{mod};
128 my $sym = $ev->{sym}; 176 my $sym = $ev->{sym};
129 my $uni = $ev->{unicode}; 177 my $uni = $ev->{unicode};
130 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
131 if ($sym == CFClient::SDLK_KP5) { 208 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
132 $::CONN->user_send ("stay fire"); 209 $::CONN->user_send ("stay fire");
133 } elsif ($uni == ord ",") { 210 } elsif ($uni == ord ",") {
134 $::CONN->user_send ("take"); 211 $::CONN->user_send ("take");
135 } elsif ($uni == ord " ") { 212 } elsif ($uni == ord " ") {
136 $::CONN->user_send ("apply"); 213 $::CONN->user_send ("apply");
137 } elsif ($uni == ord ".") { 214 } elsif ($uni == ord ".") {
138 $::CONN->user_send ($self->{completer}{last_command}) 215 $::CONN->user_send ($self->{completer}{last_command})
139 if exists $self->{completer}{last_command}; 216 if exists $self->{completer}{last_command};
140 } elsif ($uni == ord "\t") { 217 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
141 # TODO: toggle inventory 218 $::CONN->user_send ($_) for @$bind_cmd;
142 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 219 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
143 $::CONN->user_send ("rotateshoottype +"); 220 $::CONN->user_send ("rotateshoottype +");
144 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 221 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
145 $::CONN->user_send ("rotateshoottype -"); 222 $::CONN->user_send ("rotateshoottype -");
146 } elsif ($uni == ord '"') { 223 } elsif ($uni == ord '"') {
147 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 224 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
148 $self->{completer}->show; 225 $self->{completer}->show;
149 } elsif ($uni == ord "'") { 226 } elsif ($uni == ord "'") {
150 $self->{completer}->set_prefix (""); 227 $self->{completer}->set_prefix ("");
151 $self->{completer}->show; 228 $self->{completer}->show;
152 } elsif (exists $DIR{$sym}) { 229 } elsif (exists $DIR{$sym}) {
153 if ($mod & CFClient::KMOD_SHIFT) { 230 if ($mod & CFClient::KMOD_SHIFT) {
154 $self->{shft}++; 231 $self->{shft}++;
232 if ($DIR{$sym}[0] != $self->{fire_dir}) {
155 $::CONN->user_send ("fire $DIR{$sym}[0]"); 233 $::CONN->user_send ("fire $DIR{$sym}[0]");
234 }
235 $self->{fire_dir} = $DIR{$sym}[0];
156 } elsif ($mod & CFClient::KMOD_CTRL) { 236 } elsif ($mod & CFClient::KMOD_CTRL) {
157 $self->{ctrl}++; 237 $self->{ctrl}++;
158 $::CONN->user_send ("run $DIR{$sym}[0]"); 238 $::CONN->user_send ("run $DIR{$sym}[0]");
159 } else { 239 } else {
160 $::CONN->user_send ("$DIR{$sym}[1]"); 240 $::CONN->user_send ("$DIR{$sym}[1]");
161 } 241 }
162 } elsif ($ev->{unicode}) { 242 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
163 $self->{completer}->key_down ($ev); 243 $self->{completer}->invoke_key_down ($ev);
164 $self->{completer}->show; 244 $self->{completer}->show;
245 } else {
246 return 0;
247 }
248
165 } 249 1
166} 250}
167 251
168sub key_up { 252sub invoke_key_up {
169 my ($self, $ev) = @_; 253 my ($self, $ev) = @_;
170 254
255 my $res = 0;
171 my $mod = $ev->{mod}; 256 my $mod = $ev->{mod};
172 my $sym = $ev->{sym}; 257 my $sym = $ev->{sym};
173 258
259 if ($::CFG->{shift_fire_stop}) {
174 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 260 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
175 $::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 }
176 } 275 }
276
177 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 277 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
178 $::CONN->user_send ("run_stop"); 278 $::CONN->user_send ("run_stop");
279 $res = 1;
179 } 280 }
281
282 $res
283}
284
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;
180} 294}
181 295
182sub draw { 296sub draw {
183 my ($self) = @_; 297 my ($self) = @_;
298
299 return unless $::MAP;
184 300
185 my $focused = $CFClient::UI::FOCUS == $self 301 my $focused = $CFClient::UI::FOCUS == $self
186 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 302 || $CFClient::UI::FOCUS == $self->{completer}{entry};
187 303
188 return 304 return
189 unless $focused || !$::FAST; 305 unless $focused || !$::FAST;
190 306
191 if (delete $self->{need_update}) { 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
192 glNewList $self->{list}; 346 glNewList $self->{list};
193 347
194 if ($::MAP) {
195 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
196 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
197
198 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
199 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
200
201 glPushMatrix; 348 glPushMatrix;
349 glTranslate $sx0, $sy0;
202 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 350 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
203 351
204 glTranslate $sx0 - 32, $sy0 - 32, 0; 352 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
205 353
206 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 354 glScale 32, 32;
207 355
208 if ($::CFG->{fow_enable}) { 356 if (my $tex = $self->{fow_texture}) {
209 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
210 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
211 glConvolutionFilter2D (
212 GL_CONVOLUTION_2D,
213 GL_ALPHA,
214 3, 3,
215 GL_ALPHA, GL_FLOAT,
216 pack "f*",
217 0.05, 0.13, 0.05,
218 0.13, 0.30, 0.13,
219 0.05, 0.13, 0.05,
220 );
221 glEnable GL_CONVOLUTION_2D;
222 }
223
224 $self->{fow_texture_name} ||= glGenTexture;
225 # try to re-use the texture name: TODO improve texture class instead
226
227 $self->{fow_texture} = new CFClient::Texture
228 w => $w,
229 h => $h,
230 data => $data,
231 name => $self->{fow_texture_name},
232 internalformat => GL_ALPHA,
233 format => GL_ALPHA;
234
235 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
236
237 glEnable GL_TEXTURE_2D; 357 glEnable GL_TEXTURE_2D;
238 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
239 359
240 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 360 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
241 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 361 $self->{fow_texture}->draw_quad_alpha (0, 0);
242 362
243 glDisable GL_TEXTURE_2D; 363 glDisable GL_TEXTURE_2D;
244 } 364 }
245 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
246 glPopMatrix; 377 glPopMatrix;
247 }
248
249 glEndList; 378 glEndList;
250 } 379 }
251 380
252 glPushMatrix;
253 glCallList $self->{list}; 381 glCallList $self->{list};
254 glPopMatrix;
255 382
256 # TNT2 emulates logops in software (or worse :) 383 # TNT2 emulates logops in software (or worse :)
257 if ($focused) { 384 unless ($focused) {
258 (delete $self->{out_of_focus})->destroy
259 if $self->{out_of_focus};
260 } else {
261 glColor 0.4, 0.2, 0.2, 0.6; 385 glColor 0.4, 0.2, 0.2, 0.6;
262 glEnable GL_BLEND; 386 glEnable GL_BLEND;
263 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 387 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
264 glBegin GL_QUADS; 388 glBegin GL_QUADS;
265 glVertex 0, 0; 389 glVertex 0, 0;
266 glVertex 0, $::HEIGHT; 390 glVertex 0, $::HEIGHT;
267 glVertex $::WIDTH, $::HEIGHT; 391 glVertex $::WIDTH, $::HEIGHT;
268 glVertex $::WIDTH, 0; 392 glVertex $::WIDTH, 0;
269 glEnd; 393 glEnd;
270 glDisable GL_BLEND; 394 glDisable GL_BLEND;
271
272# $self->{out_of_focus} ||= do {
273# my $label = new CFClient::UI::Label
274# x => 0,
275# y => 0,
276# z => 1,
277# ellipsise => 0,
278# text => "map out of focus (click map to play)";
279#
280# $label->show;
281# $label->update;
282#
283# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
284# $label->move (
285# ($::WIDTH - $label->{w}) * 0.5,
286# ($::HEIGHT - $label->{h}) * 0.5,
287# );
288# });
289#
290# $label
291# };
292 } 395 }
293} 396}
294 397
295sub DESTROY { 398sub DESTROY {
296 my $self = shift; 399 my $self = shift;
… …
309 412
310sub size_request { 413sub size_request {
311 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 414 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
312} 415}
313 416
314sub size_allocate { 417sub invoke_size_allocate {
315 my ($self, $w, $h) = @_; 418 my ($self, $w, $h) = @_;
316 419
317 $self->SUPER::size_allocate ($w, $h);
318 $self->update; 420 $self->update;
421
422 1
319} 423}
320 424
321sub update { 425sub update {
322 my ($self) = @_; 426 my ($self) = @_;
323 427
… …
406 fontsize => $_, 510 fontsize => $_,
407 ), (0.8) x 16 511 ), (0.8) x 16
408 ]; 512 ];
409 513
410 $self->{entry} = new CFClient::UI::Entry 514 $self->{entry} = new CFClient::UI::Entry
411 connect_changed => sub { 515 on_changed => sub {
412 $self->update_labels; 516 $self->update_labels;
517 0
413 }, 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 },
414 connect_key_down => sub { 533 on_key_down => sub {
415 my ($entry, $ev) = @_; 534 my ($entry, $ev) = @_;
416 535
417 my $self = $entry->{parent}{parent}; 536 my $self = $entry->{parent}{parent};
418 537
419 if ($ev->{sym} == 13) { 538 if ($ev->{sym} == 13) {
420 if (exists $self->{select}) { 539 if (exists $self->{select}) {
421 $self->{last_command} = $self->{select}; 540 $self->{last_command} = $self->{select};
422 $::CONN->user_send ($self->{select}); 541 $::CONN->user_send ($self->{select});
542
543 unshift @{$self->{history}}, $self->{entry}->get_text;
544 $self->{hist_ptr} = 0;
545
423 $self->hide; 546 $self->hide;
424 } 547 }
425 } elsif ($ev->{sym} == 27) { 548 } elsif ($ev->{sym} == 27) {
549 $self->{hist_ptr} = 0;
426 $self->hide; 550 $self->hide;
427 return;
428 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 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 {
429 ++$self->{select_offset} 559 ++$self->{select_offset}
430 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 560 if $self->{select_offset} < $#{ $self->{last_match} || [] };
561 }
431 $self->update_labels; 562 $self->update_labels;
432 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 563 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
564 if ($self->{select_offset}) {
433 --$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}}) {
434 if $self->{select_offset}; 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 }
435 $self->update_labels; 576 $self->update_labels;
436 } else { 577 } else {
437 return 0; 578 return 0;
438 } 579 }
439 580
… …
454 595
455 $self->{entry}->set_text ($prefix); 596 $self->{entry}->set_text ($prefix);
456 $self->show; 597 $self->show;
457} 598}
458 599
459sub size_allocate { 600sub invoke_size_allocate {
460 my ($self, $w, $h) = @_; 601 my ($self, $w, $h) = @_;
461 602
462 $self->SUPER::size_allocate ($w, $h);
463 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 603 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
604
605 $self->SUPER::invoke_size_allocate ($w, $h)
464} 606}
465 607
466sub show { 608sub show {
467 my ($self) = @_; 609 my ($self) = @_;
468 610
469 $self->SUPER::show; 611 $self->SUPER::show;
470 $self->{entry}->focus_in; 612 $self->{entry}->grab_focus;
471} 613}
472 614
473sub hide { 615sub hide {
474 my ($self) = @_; 616 my ($self) = @_;
475 617
476 $self->SUPER::hide; 618 $self->SUPER::hide;
477 $self->{entry}->set_text (""); 619 $self->{entry}->set_text ("");
478} 620}
479 621
480sub key_down { 622sub invoke_key_down {
481 my ($self, $ev) = @_; 623 my ($self, $ev) = @_;
482 624
483 $self->{entry}->key_down ($ev); 625 $self->{entry}->emit (key_down => $ev)
484} 626}
485 627
486sub update_labels { 628sub update_labels {
487 my ($self) = @_; 629 my ($self) = @_;
488 630
… …
521 663
522 @match = map $self->{command}{$_->[0]}, 664 @match = map $self->{command}{$_->[0]},
523 sort { 665 sort {
524 $a->[1] <=> $b->[1] 666 $a->[1] <=> $b->[1]
525 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 667 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
526 or (length $a->[0]) <=> (length $b->[0]) 668 or (length $b->[0]) <=> (length $a->[0])
527 } @match; 669 } @match;
528 } 670 }
529 671
530 $self->{last_search} = $cmd; 672 $self->{last_search} = $text;
531 $self->{last_match} = \@match; 673 $self->{last_match} = \@match;
532 674
533 $self->{select_offset} = 0; 675 $self->{select_offset} = 0;
534 } 676 }
535 677
… …
575 $label->set_text (""); 717 $label->set_text ("");
576 $label->set_tooltip (""); 718 $label->set_tooltip ("");
577 } 719 }
578 720
579 $self->update; 721 $self->update;
580 ###
581} 722}
582 723
583sub _draw { 724sub _draw {
584 my ($self) = @_; 725 my ($self) = @_;
585 726

Diff Legend

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