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.37 by root, Thu May 25 01:26:53 2006 UTC vs.
Revision 1.74 by root, Sun Jul 16 23:30:08 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…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
104 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
105 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
106 ["Inventory…\tF4", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
107 ["Spells…\tF5", sub { ::toggle_player_page ($::SPELL_PAGE) }],
108 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
109 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
110 [
111 $::PICKUP_ENABLE->{state}
112 ? "Disable automatic pickup"
113 : "Enable automatic pickup",
114 sub { $::PICKUP_ENABLE->toggle }
115 ],
116 ],
117 )->popup ($ev);
118 }
119
77 } 120 1
78} 121}
79 122
80sub button_up { 123sub invoke_button_up {
81 my ($self, $ev, $x, $y) = @_; 124 my ($self, $ev, $x, $y) = @_;
82 125
83 delete $self->{motion}; 126 delete $self->{motion};
84}
85 127
128 1
129}
130
86sub mouse_motion { 131sub invoke_mouse_motion {
87 my ($self, $ev, $x, $y) = @_; 132 my ($self, $ev, $x, $y) = @_;
88 133
134 if ($self->{motion}) {
89 $self->{motion}->($ev, $x, $y) if $self->{motion}; 135 $self->{motion}->($ev, $x, $y);
136 } else {
137 return 0;
138 }
139
140 1
90} 141}
91 142
92sub size_request { 143sub size_request {
93 ( 144 (
94 1 + 32 * int $::WIDTH / 32, 145 32 * CFClient::ceil $::WIDTH / 32,
95 1 + 32 * int $::HEIGHT / 32, 146 32 * CFClient::ceil $::HEIGHT / 32,
96 ) 147 )
97} 148}
98 149
99sub update { 150sub update {
100 my ($self) = @_; 151 my ($self) = @_;
… …
117 CFClient::SDLK_RIGHT, [3, "east"], 168 CFClient::SDLK_RIGHT, [3, "east"],
118 CFClient::SDLK_DOWN, [5, "south"], 169 CFClient::SDLK_DOWN, [5, "south"],
119 CFClient::SDLK_LEFT, [7, "west"], 170 CFClient::SDLK_LEFT, [7, "west"],
120); 171);
121 172
122sub key_down { 173sub invoke_key_down {
123 my ($self, $ev) = @_; 174 my ($self, $ev) = @_;
124
125 return unless $::CONN;
126 175
127 my $mod = $ev->{mod}; 176 my $mod = $ev->{mod};
128 my $sym = $ev->{sym}; 177 my $sym = $ev->{sym};
129 my $uni = $ev->{unicode}; 178 my $uni = $ev->{unicode};
130 179
180 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT;
181
182 if ($uni == ord "\t") {
183 $::PL_WINDOW->toggle_visibility;
184 } elsif ($sym == CFClient::SDLK_F1 && !$mod) {
185 $::HELP_WINDOW->toggle_visibility;
186 } elsif ($sym == CFClient::SDLK_F2 && !$mod) {
187 ::toggle_player_page ($::STATS_PAGE);
188 } elsif ($sym == CFClient::SDLK_F3 && !$mod) {
189 ::toggle_player_page ($::SKILL_PAGE);
190 } elsif ($sym == CFClient::SDLK_F4 && !$mod) {
191 ::toggle_player_page ($::INVENTORY_PAGE);
192 } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
193 ::toggle_player_page ($::SPELL_PAGE);
194 } elsif ($sym == CFClient::SDLK_F9 && !$mod) {
195 $::SETUP_DIALOG->toggle_visibility;
196 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
197 $::BIND_EDITOR->set_binding (undef, undef, [],
198 sub {
199 my ($mod, $sym, $cmds) = @_;
200 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
201 });
202 $::BIND_EDITOR->start;
203 $::BIND_EDITOR->show;
204 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
205 $::BIND_EDITOR->stop;
206 $::BIND_EDITOR->ask_for_bind_and_commit;
207 $::BIND_EDITOR->hide;
208 } elsif (!$::CONN) {
209 return 0; # bindings further down need a valid connection
210
131 if ($sym == CFClient::SDLK_KP5) { 211 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
132 $::CONN->user_send ("stay fire"); 212 $::CONN->user_send ("stay fire");
133 } elsif ($uni == ord ",") { 213 } elsif ($uni == ord ",") {
134 $::CONN->user_send ("take"); 214 $::CONN->user_send ("take");
135 } elsif ($uni == ord " ") { 215 } elsif ($uni == ord " ") {
136 $::CONN->user_send ("apply"); 216 $::CONN->user_send ("apply");
137 } elsif ($uni == ord ".") { 217 } elsif ($uni == ord ".") {
138 $::CONN->user_send ($self->{completer}{last_command}) 218 $::CONN->user_send ($self->{completer}{last_command})
139 if exists $self->{completer}{last_command}; 219 if exists $self->{completer}{last_command};
140 } elsif ($uni == ord "\t") { 220 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
141 # TODO: toggle inventory 221 $::CONN->user_send ($_) for @$bind_cmd;
142 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 222 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
143 $::CONN->user_send ("rotateshoottype +"); 223 $::CONN->user_send ("rotateshoottype +");
144 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 224 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
145 $::CONN->user_send ("rotateshoottype -"); 225 $::CONN->user_send ("rotateshoottype -");
146 } elsif ($uni == ord '"') { 226 } elsif ($uni == ord '"') {
147 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 227 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
148 $self->{completer}->show; 228 $self->{completer}->show;
149 } elsif ($uni == ord "'") { 229 } elsif ($uni == ord "'") {
150 $self->{completer}->set_prefix (""); 230 $self->{completer}->set_prefix ("");
151 $self->{completer}->show; 231 $self->{completer}->show;
152 } elsif (exists $DIR{$sym}) { 232 } elsif (exists $DIR{$sym}) {
153 if ($mod & CFClient::KMOD_SHIFT) { 233 if ($mod & CFClient::KMOD_SHIFT) {
154 $self->{shft}++; 234 $self->{shft}++;
235 if ($DIR{$sym}[0] != $self->{fire_dir}) {
155 $::CONN->user_send ("fire $DIR{$sym}[0]"); 236 $::CONN->user_send ("fire $DIR{$sym}[0]");
237 }
238 $self->{fire_dir} = $DIR{$sym}[0];
156 } elsif ($mod & CFClient::KMOD_CTRL) { 239 } elsif ($mod & CFClient::KMOD_CTRL) {
157 $self->{ctrl}++; 240 $self->{ctrl}++;
158 $::CONN->user_send ("run $DIR{$sym}[0]"); 241 $::CONN->user_send ("run $DIR{$sym}[0]");
159 } else { 242 } else {
160 $::CONN->user_send ("$DIR{$sym}[1]"); 243 $::CONN->user_send ("$DIR{$sym}[1]");
161 } 244 }
162 } elsif ($ev->{unicode}) { 245 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
163 $self->{completer}->key_down ($ev); 246 $self->{completer}->invoke_key_down ($ev);
164 $self->{completer}->show; 247 $self->{completer}->show;
248 } else {
249 return 0;
250 }
251
165 } 252 1
166} 253}
167 254
168sub key_up { 255sub invoke_key_up {
169 my ($self, $ev) = @_; 256 my ($self, $ev) = @_;
170 257
258 my $res = 0;
171 my $mod = $ev->{mod}; 259 my $mod = $ev->{mod};
172 my $sym = $ev->{sym}; 260 my $sym = $ev->{sym};
173 261
262 if ($::CFG->{shift_fire_stop}) {
174 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 263 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
175 $::CONN->user_send ("fire_stop"); 264 $::CONN->user_send ("fire_stop");
265 delete $self->{fire_dir};
266 $res = 1;
267 }
268 } else {
269 if (exists $DIR{$sym} && delete $self->{shft}) {
270 $::CONN->user_send ("fire_stop");
271 delete $self->{fire_dir};
272 $res = 1;
273 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
274 $::CONN->user_send ("fire_stop");
275 delete $self->{fire_dir};
276 $res = 1;
277 }
176 } 278 }
279
177 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 280 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
178 $::CONN->user_send ("run_stop"); 281 $::CONN->user_send ("run_stop");
282 $res = 1;
179 } 283 }
284
285 $res
286}
287
288sub set_magicmap {
289 my ($self, $w, $h, $x, $y, $data) = @_;
290
291 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
292 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
293
294 $self->{magicmap} = [$x, $y, $w, $h, $data];
295
296 $self->update;
180} 297}
181 298
182sub draw { 299sub draw {
183 my ($self) = @_; 300 my ($self) = @_;
301
302 return unless $::MAP;
184 303
185 my $focused = $CFClient::UI::FOCUS == $self 304 my $focused = $CFClient::UI::FOCUS == $self
186 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 305 || $CFClient::UI::FOCUS == $self->{completer}{entry};
187 306
188 return 307 return
189 unless $focused || !$::FAST; 308 unless $focused || !$::FAST;
190 309
191 if (delete $self->{need_update}) { 310 if (delete $self->{need_update}) {
311 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
312
313 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
314 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
315
316 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
317 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
318
319 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
320 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
321
322 if ($::CFG->{fow_enable}) {
323 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
324
325 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
326 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
327 glConvolutionFilter2D (
328 GL_CONVOLUTION_2D,
329 GL_ALPHA,
330 3, 3,
331 GL_ALPHA, GL_FLOAT,
332 (pack "f*", @{ $self->{smooth_matrix} }),
333 );
334 glEnable GL_CONVOLUTION_2D;
335 }
336
337 $self->{fow_texture} = new CFClient::Texture
338 w => $w,
339 h => $h,
340 data => $data,
341 internalformat => GL_ALPHA,
342 format => GL_ALPHA;
343
344 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
345 } else {
346 delete $self->{fow_texture};
347 }
348
192 glNewList $self->{list}; 349 glNewList $self->{list};
193 350
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; 351 glPushMatrix;
352 glTranslate $sx0, $sy0;
202 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 353 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
203 354
204 glTranslate $sx0 - 32, $sy0 - 32, 0; 355 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
205 356
206 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 357 glScale 32, 32;
207 358
208 if ($::CFG->{fow_enable}) { 359 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; 360 glEnable GL_TEXTURE_2D;
238 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 361 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
239 362
240 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 363 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
241 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 364 $self->{fow_texture}->draw_quad_alpha (0, 0);
242 365
243 glDisable GL_TEXTURE_2D; 366 glDisable GL_TEXTURE_2D;
244 } 367 }
245 368
369 if ($self->{magicmap}) {
370 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
371
372 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
373 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
374
375 glTranslate - $x - 1, - $y - 1;
376 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
377 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
378 }
379
246 glPopMatrix; 380 glPopMatrix;
247 }
248
249 glEndList; 381 glEndList;
250 } 382 }
251 383
252 glPushMatrix;
253 glCallList $self->{list}; 384 glCallList $self->{list};
254 glPopMatrix;
255 385
256 # TNT2 emulates logops in software (or worse :) 386 # TNT2 emulates logops in software (or worse :)
257 if ($focused) { 387 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; 388 glColor 0.4, 0.2, 0.2, 0.6;
262 glEnable GL_BLEND; 389 glEnable GL_BLEND;
263 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 390 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
264 glBegin GL_QUADS; 391 glBegin GL_QUADS;
265 glVertex 0, 0; 392 glVertex 0, 0;
266 glVertex 0, $::HEIGHT; 393 glVertex 0, $::HEIGHT;
267 glVertex $::WIDTH, $::HEIGHT; 394 glVertex $::WIDTH, $::HEIGHT;
268 glVertex $::WIDTH, 0; 395 glVertex $::WIDTH, 0;
269 glEnd; 396 glEnd;
270 glDisable GL_BLEND; 397 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 } 398 }
293} 399}
294 400
295sub DESTROY { 401sub DESTROY {
296 my $self = shift; 402 my $self = shift;
… …
309 415
310sub size_request { 416sub size_request {
311 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 417 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
312} 418}
313 419
314sub size_allocate { 420sub invoke_size_allocate {
315 my ($self, $w, $h) = @_; 421 my ($self, $w, $h) = @_;
316 422
317 $self->SUPER::size_allocate ($w, $h);
318 $self->update; 423 $self->update;
424
425 1
319} 426}
320 427
321sub update { 428sub update {
322 my ($self) = @_; 429 my ($self) = @_;
323 430
… …
406 fontsize => $_, 513 fontsize => $_,
407 ), (0.8) x 16 514 ), (0.8) x 16
408 ]; 515 ];
409 516
410 $self->{entry} = new CFClient::UI::Entry 517 $self->{entry} = new CFClient::UI::Entry
411 connect_changed => sub { 518 on_changed => sub {
412 $self->update_labels; 519 $self->update_labels;
520 0
413 }, 521 },
522 on_button_down => sub {
523 my ($entry, $ev, $x, $y) = @_;
524
525 if ($ev->{button} == 3) {
526 (new CFClient::UI::Menu
527 items => [
528 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key"
529 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
530 ],
531 )->popup ($ev);
532 return 1;
533 }
534 0
535 },
414 connect_key_down => sub { 536 on_key_down => sub {
415 my ($entry, $ev) = @_; 537 my ($entry, $ev) = @_;
416 538
417 my $self = $entry->{parent}{parent}; 539 my $self = $entry->{parent}{parent};
418 540
419 if ($ev->{sym} == 13) { 541 if ($ev->{sym} == 13) {
420 if (exists $self->{select}) { 542 if (exists $self->{select}) {
421 $self->{last_command} = $self->{select}; 543 $self->{last_command} = $self->{select};
422 $::CONN->user_send ($self->{select}); 544 $::CONN->user_send ($self->{select});
545
546 unshift @{$self->{history}}, $self->{entry}->get_text;
547 $self->{hist_ptr} = 0;
548
423 $self->hide; 549 $self->hide;
424 } 550 }
425 } elsif ($ev->{sym} == 27) { 551 } elsif ($ev->{sym} == 27) {
552 $self->{hist_ptr} = 0;
426 $self->hide; 553 $self->hide;
427 return;
428 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 554 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
555 if ($self->{hist_ptr} > 1) {
556 $self->{hist_ptr}--;
557 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
558 } elsif ($self->{hist_ptr} > 0) {
559 $self->{hist_ptr}--;
560 $self->{entry}->set_text ($self->{hist_saveback});
561 } else {
429 ++$self->{select_offset} 562 ++$self->{select_offset}
430 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 563 if $self->{select_offset} < $#{ $self->{last_match} || [] };
564 }
431 $self->update_labels; 565 $self->update_labels;
432 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 566 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
567 if ($self->{select_offset}) {
433 --$self->{select_offset} 568 --$self->{select_offset}
569 } else {
570 unless ($self->{hist_ptr}) {
571 $self->{hist_saveback} = $self->{entry}->get_text;
572 }
573 if ($self->{hist_ptr} <= $#{$self->{history}}) {
434 if $self->{select_offset}; 574 $self->{hist_ptr}++;
575 }
576 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
577 if exists $self->{history}->[$self->{hist_ptr} - 1];
578 }
435 $self->update_labels; 579 $self->update_labels;
436 } else { 580 } else {
437 return 0; 581 return 0;
438 } 582 }
439 583
… …
454 598
455 $self->{entry}->set_text ($prefix); 599 $self->{entry}->set_text ($prefix);
456 $self->show; 600 $self->show;
457} 601}
458 602
459sub size_allocate { 603sub invoke_size_allocate {
460 my ($self, $w, $h) = @_; 604 my ($self, $w, $h) = @_;
461 605
462 $self->SUPER::size_allocate ($w, $h);
463 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 606 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
607
608 $self->SUPER::invoke_size_allocate ($w, $h)
464} 609}
465 610
466sub show { 611sub show {
467 my ($self) = @_; 612 my ($self) = @_;
468 613
469 $self->SUPER::show; 614 $self->SUPER::show;
470 $self->{entry}->focus_in; 615 $self->{entry}->grab_focus;
471} 616}
472 617
473sub hide { 618sub hide {
474 my ($self) = @_; 619 my ($self) = @_;
475 620
476 $self->SUPER::hide; 621 $self->SUPER::hide;
477 $self->{entry}->set_text (""); 622 $self->{entry}->set_text ("");
478} 623}
479 624
480sub key_down { 625sub invoke_key_down {
481 my ($self, $ev) = @_; 626 my ($self, $ev) = @_;
482 627
483 $self->{entry}->key_down ($ev); 628 $self->{entry}->emit (key_down => $ev)
484} 629}
485 630
486sub update_labels { 631sub update_labels {
487 my ($self) = @_; 632 my ($self) = @_;
488 633
… …
521 666
522 @match = map $self->{command}{$_->[0]}, 667 @match = map $self->{command}{$_->[0]},
523 sort { 668 sort {
524 $a->[1] <=> $b->[1] 669 $a->[1] <=> $b->[1]
525 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 670 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
526 or (length $a->[0]) <=> (length $b->[0]) 671 or (length $b->[0]) <=> (length $a->[0])
527 } @match; 672 } @match;
528 } 673 }
529 674
530 $self->{last_search} = $cmd; 675 $self->{last_search} = $text;
531 $self->{last_match} = \@match; 676 $self->{last_match} = \@match;
532 677
533 $self->{select_offset} = 0; 678 $self->{select_offset} = 0;
534 } 679 }
535 680
… …
575 $label->set_text (""); 720 $label->set_text ("");
576 $label->set_tooltip (""); 721 $label->set_tooltip ("");
577 } 722 }
578 723
579 $self->update; 724 $self->update;
580 ###
581} 725}
582 726
583sub _draw { 727sub _draw {
584 my ($self) = @_; 728 my ($self) = @_;
585 729

Diff Legend

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