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.79 by elmex, Mon Jul 24 12:25:09 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
… …
39 my ($self, $command, $tooltip, $widget, $cb) = @_; 51 my ($self, $command, $tooltip, $widget, $cb) = @_;
40 52
41 (my $data = $command) =~ s/\\//g; 53 (my $data = $command) =~ s/\\//g;
42 54
43 $tooltip =~ s/^\s+//; 55 $tooltip =~ s/^\s+//;
44
45 $tooltip = "<big>$data</big>\n\n$tooltip"; 56 $tooltip = "<big>$data</big>\n\n$tooltip";
46
47 $tooltip =~ s/\s+$//; 57 $tooltip =~ s/\s+$//;
48 58
49 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 59 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
50} 60}
51 61
52sub clr_commands { 62sub clr_commands {
53 my ($self) = @_; 63 my ($self) = @_;
54 64
55 %{$self->{completer}{command}} = (); 65 %{$self->{completer}{command}} = ();
56}
57 66
67 $self->{completer}->hide
68 if $self->{completer};
69}
70
58sub button_down { 71sub invoke_button_down {
59 my ($self, $ev, $x, $y) = @_; 72 my ($self, $ev, $x, $y) = @_;
60 73
61 $self->focus_in;
62
63 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
64 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 91 my ($ox, $oy) = ($ev->{x}, $ev->{y});
65 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 92 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
66 93
67 $self->{motion} = sub { 94 $self->{motion} = sub {
68 my ($ev, $x, $y) = @_; 95 my ($ev, $x, $y) = @_;
… …
72 $::CFG->{map_shift_x} = $bw + $x - $ox; 99 $::CFG->{map_shift_x} = $bw + $x - $ox;
73 $::CFG->{map_shift_y} = $bh + $y - $oy; 100 $::CFG->{map_shift_y} = $bh + $y - $oy;
74 101
75 $self->update; 102 $self->update;
76 }; 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 ["Quit",
121 sub {
122 if ($::CONN) {
123 &::open_quit_dialog;
124 } else {
125 exit;
126 }
127 }
128 ],
129 ],
130 )->popup ($ev);
131 }
132
77 } 133 1
78} 134}
79 135
80sub button_up { 136sub invoke_button_up {
81 my ($self, $ev, $x, $y) = @_; 137 my ($self, $ev, $x, $y) = @_;
82 138
83 delete $self->{motion}; 139 delete $self->{motion};
84}
85 140
141 1
142}
143
86sub mouse_motion { 144sub invoke_mouse_motion {
87 my ($self, $ev, $x, $y) = @_; 145 my ($self, $ev, $x, $y) = @_;
88 146
147 if ($self->{motion}) {
89 $self->{motion}->($ev, $x, $y) if $self->{motion}; 148 $self->{motion}->($ev, $x, $y);
149 } else {
150 return 0;
151 }
152
153 1
90} 154}
91 155
92sub size_request { 156sub size_request {
93 ( 157 (
94 1 + 32 * int $::WIDTH / 32, 158 32 * CFClient::ceil $::WIDTH / 32,
95 1 + 32 * int $::HEIGHT / 32, 159 32 * CFClient::ceil $::HEIGHT / 32,
96 ) 160 )
97} 161}
98 162
99sub update { 163sub update {
100 my ($self) = @_; 164 my ($self) = @_;
… …
117 CFClient::SDLK_RIGHT, [3, "east"], 181 CFClient::SDLK_RIGHT, [3, "east"],
118 CFClient::SDLK_DOWN, [5, "south"], 182 CFClient::SDLK_DOWN, [5, "south"],
119 CFClient::SDLK_LEFT, [7, "west"], 183 CFClient::SDLK_LEFT, [7, "west"],
120); 184);
121 185
122sub key_down { 186sub invoke_key_down {
123 my ($self, $ev) = @_; 187 my ($self, $ev) = @_;
124
125 return unless $::CONN;
126 188
127 my $mod = $ev->{mod}; 189 my $mod = $ev->{mod};
128 my $sym = $ev->{sym}; 190 my $sym = $ev->{sym};
129 my $uni = $ev->{unicode}; 191 my $uni = $ev->{unicode};
130 192
193 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT;
194
195 if ($uni == ord "\t") {
196 $::PL_WINDOW->toggle_visibility;
197 } elsif ($sym == CFClient::SDLK_F1 && !$mod) {
198 $::HELP_WINDOW->toggle_visibility;
199 } elsif ($sym == CFClient::SDLK_F2 && !$mod) {
200 ::toggle_player_page ($::STATS_PAGE);
201 } elsif ($sym == CFClient::SDLK_F3 && !$mod) {
202 ::toggle_player_page ($::SKILL_PAGE);
203 } elsif ($sym == CFClient::SDLK_F4 && !$mod) {
204 ::toggle_player_page ($::SPELL_PAGE);
205 } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
206 ::toggle_player_page ($::INVENTORY_PAGE);
207 } elsif ($sym == CFClient::SDLK_F9 && !$mod) {
208 $::SETUP_DIALOG->toggle_visibility;
209 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
210 $::BIND_EDITOR->set_binding (undef, undef, [],
211 sub {
212 my ($mod, $sym, $cmds) = @_;
213 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
214 });
215 $::BIND_EDITOR->start;
216 $::BIND_EDITOR->show;
217 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
218 $::BIND_EDITOR->stop;
219 $::BIND_EDITOR->ask_for_bind_and_commit;
220 $::BIND_EDITOR->hide;
221 } elsif (!$::CONN) {
222 return 0; # bindings further down need a valid connection
223
131 if ($sym == CFClient::SDLK_KP5) { 224 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
132 $::CONN->user_send ("stay fire"); 225 $::CONN->user_send ("stay fire");
133 } elsif ($uni == ord ",") { 226 } elsif ($uni == ord ",") {
134 $::CONN->user_send ("take"); 227 $::CONN->user_send ("take");
135 } elsif ($uni == ord " ") { 228 } elsif ($uni == ord " ") {
136 $::CONN->user_send ("apply"); 229 $::CONN->user_send ("apply");
137 } elsif ($uni == ord ".") { 230 } elsif ($uni == ord ".") {
138 $::CONN->user_send ($self->{completer}{last_command}) 231 $::CONN->user_send ($self->{completer}{last_command})
139 if exists $self->{completer}{last_command}; 232 if exists $self->{completer}{last_command};
140 } elsif ($uni == ord "\t") { 233 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
141 # TODO: toggle inventory 234 $::CONN->user_send ($_) for @$bind_cmd;
142 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 235 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
143 $::CONN->user_send ("rotateshoottype +"); 236 $::CONN->user_send ("rotateshoottype +");
144 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 237 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
145 $::CONN->user_send ("rotateshoottype -"); 238 $::CONN->user_send ("rotateshoottype -");
146 } elsif ($uni == ord '"') { 239 } elsif ($uni == ord '"') {
147 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 240 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
148 $self->{completer}->show; 241 $self->{completer}->show;
149 } elsif ($uni == ord "'") { 242 } elsif ($uni == ord "'") {
150 $self->{completer}->set_prefix (""); 243 $self->{completer}->set_prefix ("");
151 $self->{completer}->show; 244 $self->{completer}->show;
152 } elsif (exists $DIR{$sym}) { 245 } elsif (exists $DIR{$sym}) {
153 if ($mod & CFClient::KMOD_SHIFT) { 246 if ($mod & CFClient::KMOD_SHIFT) {
154 $self->{shft}++; 247 $self->{shft}++;
248 if ($DIR{$sym}[0] != $self->{fire_dir}) {
155 $::CONN->user_send ("fire $DIR{$sym}[0]"); 249 $::CONN->user_send ("fire $DIR{$sym}[0]");
250 }
251 $self->{fire_dir} = $DIR{$sym}[0];
156 } elsif ($mod & CFClient::KMOD_CTRL) { 252 } elsif ($mod & CFClient::KMOD_CTRL) {
157 $self->{ctrl}++; 253 $self->{ctrl}++;
158 $::CONN->user_send ("run $DIR{$sym}[0]"); 254 $::CONN->user_send ("run $DIR{$sym}[0]");
159 } else { 255 } else {
160 $::CONN->user_send ("$DIR{$sym}[1]"); 256 $::CONN->user_send ("$DIR{$sym}[1]");
161 } 257 }
162 } elsif ($ev->{unicode}) { 258 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
163 $self->{completer}->key_down ($ev); 259 $self->{completer}->inject_key_down ($ev);
164 $self->{completer}->show; 260 $self->{completer}->show;
261 } else {
262 return 0;
263 }
264
165 } 265 1
166} 266}
167 267
168sub key_up { 268sub invoke_key_up {
169 my ($self, $ev) = @_; 269 my ($self, $ev) = @_;
170 270
271 my $res = 0;
171 my $mod = $ev->{mod}; 272 my $mod = $ev->{mod};
172 my $sym = $ev->{sym}; 273 my $sym = $ev->{sym};
173 274
275 if ($::CFG->{shift_fire_stop}) {
174 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 276 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
175 $::CONN->user_send ("fire_stop"); 277 $::CONN->user_send ("fire_stop");
278 delete $self->{fire_dir};
279 $res = 1;
280 }
281 } else {
282 if (exists $DIR{$sym} && delete $self->{shft}) {
283 $::CONN->user_send ("fire_stop");
284 delete $self->{fire_dir};
285 $res = 1;
286 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
287 $::CONN->user_send ("fire_stop");
288 delete $self->{fire_dir};
289 $res = 1;
290 }
176 } 291 }
292
177 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 293 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
178 $::CONN->user_send ("run_stop"); 294 $::CONN->user_send ("run_stop");
295 $res = 1;
179 } 296 }
297
298 $res
299}
300
301sub set_magicmap {
302 my ($self, $w, $h, $x, $y, $data) = @_;
303
304 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
305 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
306
307 $self->{magicmap} = [$x, $y, $w, $h, $data];
308
309 $self->update;
180} 310}
181 311
182sub draw { 312sub draw {
183 my ($self) = @_; 313 my ($self) = @_;
314
315 return unless $::MAP;
184 316
185 my $focused = $CFClient::UI::FOCUS == $self 317 my $focused = $CFClient::UI::FOCUS == $self
186 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 318 || $CFClient::UI::FOCUS == $self->{completer}{entry};
187 319
188 return 320 return
189 unless $focused || !$::FAST; 321 unless $focused || !$::FAST;
190 322
191 if (delete $self->{need_update}) { 323 if (delete $self->{need_update}) {
324 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
325
326 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
327 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
328
329 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
330 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
331
332 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
333 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
334
335 if ($::CFG->{fow_enable}) {
336 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
337
338 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
339 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
340 glConvolutionFilter2D (
341 GL_CONVOLUTION_2D,
342 GL_ALPHA,
343 3, 3,
344 GL_ALPHA, GL_FLOAT,
345 (pack "f*", @{ $self->{smooth_matrix} }),
346 );
347 glEnable GL_CONVOLUTION_2D;
348 }
349
350 $self->{fow_texture} = new CFClient::Texture
351 w => $w,
352 h => $h,
353 data => $data,
354 internalformat => GL_ALPHA,
355 format => GL_ALPHA;
356
357 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
358 } else {
359 delete $self->{fow_texture};
360 }
361
192 glNewList $self->{list}; 362 glNewList $self->{list};
193 363
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; 364 glPushMatrix;
365 glTranslate $sx0, $sy0;
202 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 366 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
203 367
204 glTranslate $sx0 - 32, $sy0 - 32, 0; 368 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
205 369
206 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 370 glScale 32, 32;
207 371
208 if ($::CFG->{fow_enable}) { 372 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; 373 glEnable GL_TEXTURE_2D;
238 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 374 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
239 375
240 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 376 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
241 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 377 $self->{fow_texture}->draw_quad_alpha (0, 0);
242 378
243 glDisable GL_TEXTURE_2D; 379 glDisable GL_TEXTURE_2D;
244 } 380 }
245 381
382 if ($self->{magicmap}) {
383 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
384
385 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
386 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
387
388 glTranslate - $x - 1, - $y - 1;
389 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
390 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
391 }
392
246 glPopMatrix; 393 glPopMatrix;
247 }
248
249 glEndList; 394 glEndList;
250 } 395 }
251 396
252 glPushMatrix;
253 glCallList $self->{list}; 397 glCallList $self->{list};
254 glPopMatrix;
255 398
256 # TNT2 emulates logops in software (or worse :) 399 # TNT2 emulates logops in software (or worse :)
257 if ($focused) { 400 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; 401 glColor 0.4, 0.2, 0.2, 0.6;
262 glEnable GL_BLEND; 402 glEnable GL_BLEND;
263 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 403 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
264 glBegin GL_QUADS; 404 glBegin GL_QUADS;
265 glVertex 0, 0; 405 glVertex 0, 0;
266 glVertex 0, $::HEIGHT; 406 glVertex 0, $::HEIGHT;
267 glVertex $::WIDTH, $::HEIGHT; 407 glVertex $::WIDTH, $::HEIGHT;
268 glVertex $::WIDTH, 0; 408 glVertex $::WIDTH, 0;
269 glEnd; 409 glEnd;
270 glDisable GL_BLEND; 410 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 } 411 }
293} 412}
294 413
295sub DESTROY { 414sub DESTROY {
296 my $self = shift; 415 my $self = shift;
… …
309 428
310sub size_request { 429sub size_request {
311 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 430 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
312} 431}
313 432
314sub size_allocate { 433sub invoke_size_allocate {
315 my ($self, $w, $h) = @_; 434 my ($self, $w, $h) = @_;
316 435
317 $self->SUPER::size_allocate ($w, $h);
318 $self->update; 436 $self->update;
437
438 1
319} 439}
320 440
321sub update { 441sub update {
322 my ($self) = @_; 442 my ($self) = @_;
323 443
… …
406 fontsize => $_, 526 fontsize => $_,
407 ), (0.8) x 16 527 ), (0.8) x 16
408 ]; 528 ];
409 529
410 $self->{entry} = new CFClient::UI::Entry 530 $self->{entry} = new CFClient::UI::Entry
411 connect_changed => sub { 531 on_changed => sub {
412 $self->update_labels; 532 $self->update_labels;
533 0
413 }, 534 },
535 on_button_down => sub {
536 my ($entry, $ev, $x, $y) = @_;
537
538 if ($ev->{button} == 3) {
539 (new CFClient::UI::Menu
540 items => [
541 ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key"
542 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
543 ],
544 )->popup ($ev);
545 return 1;
546 }
547 0
548 },
414 connect_key_down => sub { 549 on_key_down => sub {
415 my ($entry, $ev) = @_; 550 my ($entry, $ev) = @_;
416 551
417 my $self = $entry->{parent}{parent}; 552 my $self = $entry->{parent}{parent};
418 553
419 if ($ev->{sym} == 13) { 554 if ($ev->{sym} == 13) {
420 if (exists $self->{select}) { 555 if (exists $self->{select}) {
421 $self->{last_command} = $self->{select}; 556 $self->{last_command} = $self->{select};
422 $::CONN->user_send ($self->{select}); 557 $::CONN->user_send ($self->{select});
558
559 unshift @{$self->{history}}, $self->{entry}->get_text;
560 $self->{hist_ptr} = 0;
561
423 $self->hide; 562 $self->hide;
424 } 563 }
425 } elsif ($ev->{sym} == 27) { 564 } elsif ($ev->{sym} == 27) {
565 $self->{hist_ptr} = 0;
426 $self->hide; 566 $self->hide;
427 return;
428 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 567 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
568 if ($self->{hist_ptr} > 1) {
569 $self->{hist_ptr}--;
570 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
571 } elsif ($self->{hist_ptr} > 0) {
572 $self->{hist_ptr}--;
573 $self->{entry}->set_text ($self->{hist_saveback});
574 } else {
429 ++$self->{select_offset} 575 ++$self->{select_offset}
430 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 576 if $self->{select_offset} < $#{ $self->{last_match} || [] };
577 }
431 $self->update_labels; 578 $self->update_labels;
432 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 579 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
580 if ($self->{select_offset}) {
433 --$self->{select_offset} 581 --$self->{select_offset}
582 } else {
583 unless ($self->{hist_ptr}) {
584 $self->{hist_saveback} = $self->{entry}->get_text;
585 }
586 if ($self->{hist_ptr} <= $#{$self->{history}}) {
434 if $self->{select_offset}; 587 $self->{hist_ptr}++;
588 }
589 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
590 if exists $self->{history}->[$self->{hist_ptr} - 1];
591 }
435 $self->update_labels; 592 $self->update_labels;
436 } else { 593 } else {
437 return 0; 594 return 0;
438 } 595 }
439 596
… …
454 611
455 $self->{entry}->set_text ($prefix); 612 $self->{entry}->set_text ($prefix);
456 $self->show; 613 $self->show;
457} 614}
458 615
459sub size_allocate { 616sub invoke_size_allocate {
460 my ($self, $w, $h) = @_; 617 my ($self, $w, $h) = @_;
461 618
462 $self->SUPER::size_allocate ($w, $h);
463 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 619 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
620
621 $self->SUPER::invoke_size_allocate ($w, $h)
464} 622}
465 623
466sub show { 624sub show {
467 my ($self) = @_; 625 my ($self) = @_;
468 626
469 $self->SUPER::show; 627 $self->SUPER::show;
470 $self->{entry}->focus_in; 628 $self->{entry}->grab_focus;
471} 629}
472 630
473sub hide { 631sub hide {
474 my ($self) = @_; 632 my ($self) = @_;
633
634 $self->{hist_ptr} = 0;
475 635
476 $self->SUPER::hide; 636 $self->SUPER::hide;
477 $self->{entry}->set_text (""); 637 $self->{entry}->set_text ("");
478} 638}
479 639
480sub key_down { 640sub inject_key_down {
481 my ($self, $ev) = @_; 641 my ($self, $ev) = @_;
482 642
643 $self->{entry}->grab_focus;
483 $self->{entry}->key_down ($ev); 644 $self->{entry}->emit (key_down => $ev);
484} 645}
485 646
486sub update_labels { 647sub update_labels {
487 my ($self) = @_; 648 my ($self) = @_;
488 649
… …
521 682
522 @match = map $self->{command}{$_->[0]}, 683 @match = map $self->{command}{$_->[0]},
523 sort { 684 sort {
524 $a->[1] <=> $b->[1] 685 $a->[1] <=> $b->[1]
525 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 686 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
526 or (length $a->[0]) <=> (length $b->[0]) 687 or (length $b->[0]) <=> (length $a->[0])
527 } @match; 688 } @match;
528 } 689 }
529 690
530 $self->{last_search} = $cmd; 691 $self->{last_search} = $text;
531 $self->{last_match} = \@match; 692 $self->{last_match} = \@match;
532 693
533 $self->{select_offset} = 0; 694 $self->{select_offset} = 0;
534 } 695 }
535 696
… …
575 $label->set_text (""); 736 $label->set_text ("");
576 $label->set_tooltip (""); 737 $label->set_tooltip ("");
577 } 738 }
578 739
579 $self->update; 740 $self->update;
580 ###
581} 741}
582 742
583sub _draw { 743sub _draw {
584 my ($self) = @_; 744 my ($self) = @_;
585 745

Diff Legend

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