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

Diff Legend

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