1 | package CFClient::MapWidget; |
1 | package CFPlus::MapWidget; |
2 | |
2 | |
3 | use strict; |
3 | use strict; |
4 | use utf8; |
4 | use utf8; |
5 | |
5 | |
6 | use List::Util qw(min max); |
6 | use List::Util qw(min max); |
7 | |
7 | |
|
|
8 | use CFPlus; |
8 | use CFClient::OpenGL; |
9 | use CFPlus::OpenGL; |
|
|
10 | use CFPlus::UI; |
9 | |
11 | |
10 | our @ISA = CFClient::UI::Base::; |
12 | our @ISA = CFPlus::UI::Base::; |
|
|
13 | |
|
|
14 | my $magicmap_tex = |
|
|
15 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
|
|
16 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
11 | |
17 | |
12 | sub new { |
18 | sub new { |
13 | my $class = shift; |
19 | my $class = shift; |
14 | |
20 | |
15 | my $self = $class->SUPER::new ( |
21 | my $self = $class->SUPER::new ( |
… | |
… | |
24 | ], |
30 | ], |
25 | |
31 | |
26 | @_ |
32 | @_ |
27 | ); |
33 | ); |
28 | |
34 | |
29 | $self->{completer} = new CFClient::MapWidget::Command:: |
35 | $self->{completer} = new CFPlus::MapWidget::Command:: |
30 | command => $self->{command}, |
36 | command => $self->{command}, |
31 | can_focus => 1, |
37 | tooltip => "#completer_help", |
32 | tooltip => "<b>The Command Completer</b>\n\n" |
|
|
33 | . "This is your central interface to send text commands to the server. " |
|
|
34 | . "To enter a verbatim command to send to the server, just type the command, " |
|
|
35 | . "followed by a space, and press return. " |
|
|
36 | . "Typing the initial letters of words (or just any letters) displays guesses " |
|
|
37 | . "for commands you might want to use.\n" |
|
|
38 | . "You can use the cursor-up and cursor-down keys to select between those guesses.\n" |
|
|
39 | . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.", |
|
|
40 | ; |
38 | ; |
41 | |
39 | |
42 | $self |
40 | $self |
43 | } |
41 | } |
44 | |
42 | |
… | |
… | |
56 | |
54 | |
57 | sub clr_commands { |
55 | sub clr_commands { |
58 | my ($self) = @_; |
56 | my ($self) = @_; |
59 | |
57 | |
60 | %{$self->{completer}{command}} = (); |
58 | %{$self->{completer}{command}} = (); |
61 | } |
|
|
62 | |
59 | |
|
|
60 | $self->{completer}->hide |
|
|
61 | if $self->{completer}; |
|
|
62 | } |
|
|
63 | |
|
|
64 | sub server_login { |
|
|
65 | my ($server) = @_; |
|
|
66 | |
|
|
67 | ::stop_game (); |
|
|
68 | local $::PROFILE->{host} = $server; |
|
|
69 | ::start_game (); |
|
|
70 | } |
|
|
71 | |
|
|
72 | sub check_lwp($) { |
|
|
73 | my ($res) = @_; |
|
|
74 | |
|
|
75 | $res->is_error |
|
|
76 | and die $res->status_line; |
|
|
77 | |
|
|
78 | $res |
|
|
79 | } |
|
|
80 | |
|
|
81 | sub editor_invoke { |
|
|
82 | my $editsup = $::CONN && $::CONN->{editor_support} |
|
|
83 | or return; |
|
|
84 | |
|
|
85 | my ($pid, $fh); |
|
|
86 | unless ($pid = open $fh, "-|:utf8", "-") { |
|
|
87 | $SIG{__DIE__} = sub { |
|
|
88 | warn "FATAL: @_\n"; |
|
|
89 | CFPlus::_exit 99; |
|
|
90 | }; |
|
|
91 | |
|
|
92 | open STDERR, ">&STDOUT"; |
|
|
93 | binmode STDOUT, ":utf8"; |
|
|
94 | binmode STDERR, ":utf8"; |
|
|
95 | close $fh; |
|
|
96 | |
|
|
97 | $| = 1; |
|
|
98 | print "preparing editor startup...\n"; |
|
|
99 | CFPlus::set_proxy; |
|
|
100 | |
|
|
101 | my $server = $editsup->{gameserver} || "default"; |
|
|
102 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
|
|
103 | |
|
|
104 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; |
|
|
105 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; |
|
|
106 | |
|
|
107 | print "map directory is $mapdir\n"; |
|
|
108 | print "lib directory is $libdir\n"; |
|
|
109 | |
|
|
110 | require LWP::UserAgent; |
|
|
111 | |
|
|
112 | my $ua = LWP::UserAgent->new ( |
|
|
113 | agent => "cfplus $CFPlus::VERSION", |
|
|
114 | keep_alive => 1, |
|
|
115 | env_proxy => 1, |
|
|
116 | timeout => 30, |
|
|
117 | ); |
|
|
118 | |
|
|
119 | for my $file (qw(archetypes crossfire.0)) { |
|
|
120 | my $url = "$editsup->{lib_root}$file"; |
|
|
121 | print "mirroring $url...\n"; |
|
|
122 | check_lwp $ua->mirror ($url, "$libdir/$file"); |
|
|
123 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
|
|
124 | } |
|
|
125 | |
|
|
126 | if (1) { # upload a map |
|
|
127 | my $mapname = $::CONN->{map_info}[0]; |
|
|
128 | |
|
|
129 | print "getting map revision for $mapname...\n"; |
|
|
130 | |
|
|
131 | # try to get the most recent head revision, what a hack, |
|
|
132 | # this should have been returned while downloading *sigh* |
|
|
133 | my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
|
|
134 | |
|
|
135 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
|
|
136 | my $rev = $1; |
|
|
137 | |
|
|
138 | print "downloading revision $rev...\n"; |
|
|
139 | |
|
|
140 | my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
|
|
141 | |
|
|
142 | my $meta = { |
|
|
143 | %$editsup, |
|
|
144 | path => $mapname, |
|
|
145 | revision => $rev, |
|
|
146 | cf_login => $::PROFILE->{user}, |
|
|
147 | }; |
|
|
148 | |
|
|
149 | my $mappath = "$mapdir/$mapname"; |
|
|
150 | |
|
|
151 | require File::Basename; |
|
|
152 | require File::Path; |
|
|
153 | |
|
|
154 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
|
|
155 | open my $fh, ">:raw:perlio", "$mappath.meta" |
|
|
156 | or die "$mappath.meta: $!"; |
|
|
157 | print $fh CFPlus::to_json $meta; |
|
|
158 | close $fh; |
|
|
159 | open my $fh, ">:raw:perlio:utf8", $mappath |
|
|
160 | or die "$mappath: $!"; |
|
|
161 | print $fh $map; |
|
|
162 | close $fh; |
|
|
163 | |
|
|
164 | print "saved as $mappath\n"; |
|
|
165 | |
|
|
166 | print "invoking editor...\n"; |
|
|
167 | exec "/root/s2/gce $mappath";#d# |
|
|
168 | |
|
|
169 | # now upload it |
|
|
170 | # require HTTP::Request::Common; |
|
|
171 | # |
|
|
172 | # my $res = $ua->post ( |
|
|
173 | # $ENV{CFPLUS_UPLOAD}, |
|
|
174 | # Content_Type => 'multipart/form-data', |
|
|
175 | # Content => [ |
|
|
176 | # path => $mapname, |
|
|
177 | # mapdir => $ENV{CROSSFIRE_MAPDIR}, |
|
|
178 | # map => $map, |
|
|
179 | # revision => $rev, |
|
|
180 | # cf_login => $ENV{CFPLUS_LOGIN}, |
|
|
181 | # cf_password => $ENV{CFPLUS_PASSWORD}, |
|
|
182 | # comment => "", |
|
|
183 | # ] |
|
|
184 | # ); |
|
|
185 | # |
|
|
186 | # if ($res->is_error) { |
|
|
187 | # # fatal condition |
|
|
188 | # warn $res->status_line; |
|
|
189 | # } else { |
|
|
190 | # # script replies are marked as {{..}} |
|
|
191 | # my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; |
|
|
192 | # warn map "$_\n", @msgs; |
|
|
193 | # } |
|
|
194 | } else { |
|
|
195 | die "viewvc parse error, unable to detect revision\n"; |
|
|
196 | } |
|
|
197 | } |
|
|
198 | |
|
|
199 | CFPlus::_exit; |
|
|
200 | } |
|
|
201 | |
|
|
202 | my $buffer; |
|
|
203 | |
|
|
204 | Event->io (fd => $fh, poll => 'r', cb => sub { |
|
|
205 | unless (sysread $fh, $buffer, 4096, length $buffer) { |
|
|
206 | $_[0]->w->cancel; |
|
|
207 | $buffer .= "done\n"; |
|
|
208 | } |
|
|
209 | |
|
|
210 | while ($buffer =~ s/^(.*)\n//) { |
|
|
211 | ::message ({ |
|
|
212 | markup => "editor($pid): " . CFPlus::asxml $1, |
|
|
213 | }); |
|
|
214 | } |
|
|
215 | }); |
|
|
216 | } |
|
|
217 | |
63 | sub button_down { |
218 | sub invoke_button_down { |
64 | my ($self, $ev, $x, $y) = @_; |
219 | my ($self, $ev, $x, $y) = @_; |
65 | |
220 | |
66 | return unless $::CONN; |
|
|
67 | |
|
|
68 | $self->focus_in; |
|
|
69 | |
|
|
70 | if ($ev->{button} == 1) { |
221 | if ($ev->{button} == 1) { |
|
|
222 | $self->grab_focus; |
|
|
223 | return unless $::CONN; |
|
|
224 | |
71 | my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
225 | my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
72 | my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
226 | my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
73 | |
227 | |
74 | $x -= int 0.5 * $self->{sw}; |
228 | $x -= int 0.5 * $self->{sw}; |
75 | $y -= int 0.5 * $self->{sh}; |
229 | $y -= int 0.5 * $self->{sh}; |
76 | |
230 | |
77 | $::CONN->lookat ($x, $y) |
231 | $::CONN->lookat ($x, $y) |
78 | if $::CONN; |
232 | if $::CONN; |
79 | |
233 | |
80 | } elsif ($ev->{button} == 2) { |
234 | } elsif ($ev->{button} == 2) { |
|
|
235 | $self->grab_focus; |
|
|
236 | return unless $::CONN; |
|
|
237 | |
81 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
238 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
82 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
239 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
83 | |
240 | |
84 | $self->{motion} = sub { |
241 | $self->{motion} = sub { |
85 | my ($ev, $x, $y) = @_; |
242 | my ($ev, $x, $y) = @_; |
… | |
… | |
89 | $::CFG->{map_shift_x} = $bw + $x - $ox; |
246 | $::CFG->{map_shift_x} = $bw + $x - $ox; |
90 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
247 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
91 | |
248 | |
92 | $self->update; |
249 | $self->update; |
93 | }; |
250 | }; |
|
|
251 | } elsif ($ev->{button} == 3) { |
|
|
252 | my @items = ( |
|
|
253 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
|
|
254 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
|
|
255 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
|
|
256 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
|
|
257 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
|
|
258 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
|
|
259 | ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
|
|
260 | [ |
|
|
261 | $::PICKUP_ENABLE->{state} |
|
|
262 | ? "Disable automatic pickup" |
|
|
263 | : "Enable automatic pickup", |
|
|
264 | sub { $::PICKUP_ENABLE->toggle } |
|
|
265 | ], |
|
|
266 | ); |
|
|
267 | |
|
|
268 | if ($::CONN && $::CONN->{editor_support}) { |
|
|
269 | push @items, [ |
|
|
270 | "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
|
|
271 | \&editor_invoke, |
|
|
272 | ]; |
|
|
273 | |
|
|
274 | for my $type (qw(test name)) { |
|
|
275 | $::CONN->{editor_support}{type} ne $type |
|
|
276 | or next; |
|
|
277 | my $server = $::CONN->{editor_support}{"${type}server"} |
|
|
278 | or next; |
|
|
279 | |
|
|
280 | push @items, [ |
|
|
281 | "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", |
|
|
282 | sub { server_login $server }, |
|
|
283 | ]; |
|
|
284 | } |
|
|
285 | } |
|
|
286 | |
|
|
287 | push @items, |
|
|
288 | ["Quit", |
|
|
289 | sub { |
|
|
290 | if ($::CONN) { |
|
|
291 | &::open_quit_dialog; |
|
|
292 | } else { |
|
|
293 | exit; |
|
|
294 | } |
|
|
295 | } |
|
|
296 | ], |
|
|
297 | ; |
|
|
298 | |
|
|
299 | (new CFPlus::UI::Menu |
|
|
300 | items => \@items, |
|
|
301 | )->popup ($ev); |
94 | } |
302 | } |
95 | |
303 | |
96 | 1 |
304 | 1 |
97 | } |
305 | } |
98 | |
306 | |
99 | sub button_up { |
307 | sub invoke_button_up { |
100 | my ($self, $ev, $x, $y) = @_; |
308 | my ($self, $ev, $x, $y) = @_; |
101 | |
309 | |
102 | delete $self->{motion}; |
310 | delete $self->{motion}; |
103 | |
311 | |
104 | 1 |
312 | 1 |
105 | } |
313 | } |
106 | |
314 | |
107 | sub mouse_motion { |
315 | sub invoke_mouse_motion { |
108 | my ($self, $ev, $x, $y) = @_; |
316 | my ($self, $ev, $x, $y) = @_; |
109 | |
317 | |
110 | if ($self->{motion}) { |
318 | if ($self->{motion}) { |
111 | $self->{motion}->($ev, $x, $y); |
319 | $self->{motion}->($ev, $x, $y); |
112 | } else { |
320 | } else { |
… | |
… | |
116 | 1 |
324 | 1 |
117 | } |
325 | } |
118 | |
326 | |
119 | sub size_request { |
327 | sub size_request { |
120 | ( |
328 | ( |
121 | 1 + 32 * int $::WIDTH / 32, |
329 | 32 * CFPlus::ceil $::WIDTH / 32, |
122 | 1 + 32 * int $::HEIGHT / 32, |
330 | 32 * CFPlus::ceil $::HEIGHT / 32, |
123 | ) |
331 | ) |
124 | } |
332 | } |
125 | |
333 | |
126 | sub update { |
334 | sub update { |
127 | my ($self) = @_; |
335 | my ($self) = @_; |
… | |
… | |
129 | $self->{need_update} = 1; |
337 | $self->{need_update} = 1; |
130 | $self->SUPER::update; |
338 | $self->SUPER::update; |
131 | } |
339 | } |
132 | |
340 | |
133 | my %DIR = ( |
341 | my %DIR = ( |
134 | CFClient::SDLK_KP8, [1, "north"], |
342 | CFPlus::SDLK_KP8, [1, "north"], |
135 | CFClient::SDLK_KP9, [2, "northeast"], |
343 | CFPlus::SDLK_KP9, [2, "northeast"], |
136 | CFClient::SDLK_KP6, [3, "east"], |
344 | CFPlus::SDLK_KP6, [3, "east"], |
137 | CFClient::SDLK_KP3, [4, "southeast"], |
345 | CFPlus::SDLK_KP3, [4, "southeast"], |
138 | CFClient::SDLK_KP2, [5, "south"], |
346 | CFPlus::SDLK_KP2, [5, "south"], |
139 | CFClient::SDLK_KP1, [6, "southwest"], |
347 | CFPlus::SDLK_KP1, [6, "southwest"], |
140 | CFClient::SDLK_KP4, [7, "west"], |
348 | CFPlus::SDLK_KP4, [7, "west"], |
141 | CFClient::SDLK_KP7, [8, "northwest"], |
349 | CFPlus::SDLK_KP7, [8, "northwest"], |
142 | |
350 | |
143 | CFClient::SDLK_UP, [1, "north"], |
351 | CFPlus::SDLK_UP, [1, "north"], |
144 | CFClient::SDLK_RIGHT, [3, "east"], |
352 | CFPlus::SDLK_RIGHT, [3, "east"], |
145 | CFClient::SDLK_DOWN, [5, "south"], |
353 | CFPlus::SDLK_DOWN, [5, "south"], |
146 | CFClient::SDLK_LEFT, [7, "west"], |
354 | CFPlus::SDLK_LEFT, [7, "west"], |
147 | ); |
355 | ); |
148 | |
356 | |
149 | sub key_down { |
357 | sub invoke_key_down { |
150 | my ($self, $ev) = @_; |
358 | my ($self, $ev) = @_; |
151 | |
|
|
152 | return 0 unless $::CONN; |
|
|
153 | |
359 | |
154 | my $mod = $ev->{mod}; |
360 | my $mod = $ev->{mod}; |
155 | my $sym = $ev->{sym}; |
361 | my $sym = $ev->{sym}; |
156 | my $uni = $ev->{unicode}; |
362 | my $uni = $ev->{unicode}; |
157 | |
363 | |
158 | if ($sym == CFClient::SDLK_KP5) { |
364 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
|
|
365 | |
|
|
366 | if ($uni == ord "\t") { |
|
|
367 | $::PL_WINDOW->toggle_visibility; |
|
|
368 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
|
|
369 | $::HELP_WINDOW->toggle_visibility; |
|
|
370 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
|
|
371 | ::toggle_player_page ($::STATS_PAGE); |
|
|
372 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
|
|
373 | ::toggle_player_page ($::SKILL_PAGE); |
|
|
374 | } elsif ($sym == CFPlus::SDLK_F4 && !$mod) { |
|
|
375 | ::toggle_player_page ($::SPELL_PAGE); |
|
|
376 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
|
|
377 | ::toggle_player_page ($::INVENTORY_PAGE); |
|
|
378 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
|
|
379 | $::SETUP_DIALOG->toggle_visibility; |
|
|
380 | } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { |
|
|
381 | $::BIND_EDITOR->set_binding (undef, undef, [], |
|
|
382 | sub { |
|
|
383 | my ($mod, $sym, $cmds) = @_; |
|
|
384 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
|
|
385 | }); |
|
|
386 | $::BIND_EDITOR->start; |
|
|
387 | $::BIND_EDITOR->show; |
|
|
388 | #TODO: elmex, what was this supposed to do? it currently crashes the client. |
|
|
389 | # } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) { |
|
|
390 | # $::BIND_EDITOR->stop; |
|
|
391 | # $::BIND_EDITOR->ask_for_bind_and_commit; |
|
|
392 | # $::BIND_EDITOR->hide; |
|
|
393 | } elsif (!$::CONN) { |
|
|
394 | return 0; # bindings further down need a valid connection |
|
|
395 | |
|
|
396 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
159 | $::CONN->user_send ("stay fire"); |
397 | $::CONN->user_send ("stay fire"); |
160 | } elsif ($uni == ord ",") { |
398 | } elsif ($uni == ord ",") { |
161 | $::CONN->user_send ("take"); |
399 | $::CONN->user_send ("take"); |
162 | } elsif ($uni == ord " ") { |
400 | } elsif ($uni == ord " ") { |
163 | $::CONN->user_send ("apply"); |
401 | $::CONN->user_send ("apply"); |
|
|
402 | } elsif ($uni == 13) { |
|
|
403 | $::CONN->user_send ("examine"); |
164 | } elsif ($uni == ord ".") { |
404 | } elsif ($uni == ord ".") { |
165 | $::CONN->user_send ($self->{completer}{last_command}) |
405 | $::CONN->user_send ($self->{completer}{last_command}) |
166 | if exists $self->{completer}{last_command}; |
406 | if exists $self->{completer}{last_command}; |
167 | } elsif ($uni == ord "\t") { |
407 | } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { |
168 | $::INV_WINDOW->toggle_visibility; |
408 | $::CONN->user_send ($_) for @$bind_cmd; |
169 | } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { |
409 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
170 | $::CONN->user_send ("rotateshoottype +"); |
410 | $::CONN->user_send ("rotateshoottype +"); |
171 | } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { |
411 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
172 | $::CONN->user_send ("rotateshoottype -"); |
412 | $::CONN->user_send ("rotateshoottype -"); |
173 | } elsif ($uni == ord '"') { |
413 | } elsif ($uni == ord '"') { |
174 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
414 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
175 | $self->{completer}->show; |
415 | $self->{completer}->show; |
176 | } elsif ($uni == ord "'") { |
416 | } elsif ($uni == ord "'") { |
177 | $self->{completer}->set_prefix (""); |
417 | $self->{completer}->set_prefix (""); |
178 | $self->{completer}->show; |
418 | $self->{completer}->show; |
179 | } elsif (exists $DIR{$sym}) { |
419 | } elsif (exists $DIR{$sym}) { |
180 | if ($mod & CFClient::KMOD_SHIFT) { |
420 | if ($mod & CFPlus::KMOD_SHIFT) { |
181 | $self->{shft}++; |
421 | $self->{shft}++; |
182 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
422 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
183 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
423 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
184 | } |
424 | } |
185 | $self->{fire_dir} = $DIR{$sym}[0]; |
425 | $self->{fire_dir} = $DIR{$sym}[0]; |
186 | } elsif ($mod & CFClient::KMOD_CTRL) { |
426 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
187 | $self->{ctrl}++; |
427 | $self->{ctrl}++; |
188 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
428 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
189 | } else { |
429 | } else { |
190 | $::CONN->user_send ("$DIR{$sym}[1]"); |
430 | $::CONN->user_send ("$DIR{$sym}[1]"); |
191 | } |
431 | } |
192 | } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { |
|
|
193 | $::BIND_EDITOR->set_binding (undef, undef, [], |
|
|
194 | sub { |
|
|
195 | my ($mod, $sym, $cmds) = @_; |
|
|
196 | $::CFG->{bindings}->{$mod}->{$sym} = $cmds; |
|
|
197 | }); |
|
|
198 | $::BIND_EDITOR->start; |
|
|
199 | $::BIND_EDITOR->show; |
|
|
200 | } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { |
|
|
201 | $::BIND_EDITOR->stop; |
|
|
202 | $::BIND_EDITOR->ask_for_bind_and_commit; |
|
|
203 | $::BIND_EDITOR->hide; |
|
|
204 | } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { |
|
|
205 | $::CONN->user_send ($_) for @$bind_cmd; |
|
|
206 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
432 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
207 | $self->{completer}->key_down ($ev); |
433 | $self->{completer}->inject_key_down ($ev); |
208 | $self->{completer}->show; |
434 | $self->{completer}->show; |
209 | } else { |
435 | } else { |
210 | return 0; |
436 | return 0; |
211 | } |
437 | } |
212 | |
438 | |
213 | 1 |
439 | 1 |
214 | } |
440 | } |
215 | |
441 | |
216 | sub key_up { |
442 | sub invoke_key_up { |
217 | my ($self, $ev) = @_; |
443 | my ($self, $ev) = @_; |
218 | |
444 | |
219 | my $res = 0; |
445 | my $res = 0; |
220 | my $mod = $ev->{mod}; |
446 | my $mod = $ev->{mod}; |
221 | my $sym = $ev->{sym}; |
447 | my $sym = $ev->{sym}; |
222 | |
448 | |
223 | if ($::CFG->{shift_fire_stop}) { |
449 | if ($::CFG->{shift_fire_stop}) { |
224 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
450 | if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { |
225 | $::CONN->user_send ("fire_stop"); |
451 | $::CONN->user_send ("fire_stop"); |
226 | delete $self->{fire_dir}; |
452 | delete $self->{fire_dir}; |
227 | $res = 1; |
453 | $res = 1; |
228 | } |
454 | } |
229 | } else { |
455 | } else { |
230 | if (exists $DIR{$sym} && delete $self->{shft}) { |
456 | if (exists $DIR{$sym} && delete $self->{shft}) { |
231 | $::CONN->user_send ("fire_stop"); |
457 | $::CONN->user_send ("fire_stop"); |
232 | delete $self->{fire_dir}; |
458 | delete $self->{fire_dir}; |
233 | $res = 1; |
459 | $res = 1; |
234 | } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
460 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
235 | $::CONN->user_send ("fire_stop"); |
461 | $::CONN->user_send ("fire_stop"); |
236 | delete $self->{fire_dir}; |
462 | delete $self->{fire_dir}; |
237 | $res = 1; |
463 | $res = 1; |
238 | } |
464 | } |
239 | } |
465 | } |
240 | |
466 | |
241 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
467 | if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { |
242 | $::CONN->user_send ("run_stop"); |
468 | $::CONN->user_send ("run_stop"); |
243 | $res = 1; |
469 | $res = 1; |
244 | } |
470 | } |
245 | |
471 | |
246 | $res |
472 | $res |
247 | } |
473 | } |
248 | |
474 | |
|
|
475 | sub set_magicmap { |
|
|
476 | my ($self, $w, $h, $x, $y, $data) = @_; |
|
|
477 | |
|
|
478 | $x -= $::MAP->ox + int 0.5 * $::MAP->w; |
|
|
479 | $y -= $::MAP->oy + int 0.5 * $::MAP->h; |
|
|
480 | |
|
|
481 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
|
|
482 | |
|
|
483 | $self->update; |
|
|
484 | } |
|
|
485 | |
249 | sub draw { |
486 | sub draw { |
250 | my ($self) = @_; |
487 | my ($self) = @_; |
251 | |
488 | |
252 | return unless $::MAP; |
489 | return unless $::MAP; |
253 | |
490 | |
254 | my $focused = $CFClient::UI::FOCUS == $self |
491 | my $focused = $CFPlus::UI::FOCUS == $self |
255 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
492 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
256 | |
493 | |
257 | return |
494 | return |
258 | unless $focused || !$::FAST; |
495 | unless $focused || !$::FAST; |
259 | |
496 | |
260 | if (delete $self->{need_update}) { |
497 | if (delete $self->{need_update}) { |
261 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
498 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
262 | |
499 | |
263 | my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; |
500 | my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
264 | my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; |
501 | my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
265 | |
502 | |
266 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
503 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
267 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
504 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
268 | |
505 | |
269 | my $sw = $self->{sw} = 1 + CFClient::ceil $::WIDTH / $tilesize; |
506 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
270 | my $sh = $self->{sh} = 1 + CFClient::ceil $::HEIGHT / $tilesize; |
507 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
271 | |
508 | |
272 | if ($::CFG->{fow_enable}) { |
509 | if ($::CFG->{fow_enable}) { |
273 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
510 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
274 | |
511 | |
275 | if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
512 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
276 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
513 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
277 | glConvolutionFilter2D ( |
514 | glConvolutionFilter2D ( |
278 | GL_CONVOLUTION_2D, |
515 | GL_CONVOLUTION_2D, |
279 | GL_ALPHA, |
516 | GL_ALPHA, |
280 | 3, 3, |
517 | 3, 3, |
… | |
… | |
282 | (pack "f*", @{ $self->{smooth_matrix} }), |
519 | (pack "f*", @{ $self->{smooth_matrix} }), |
283 | ); |
520 | ); |
284 | glEnable GL_CONVOLUTION_2D; |
521 | glEnable GL_CONVOLUTION_2D; |
285 | } |
522 | } |
286 | |
523 | |
287 | $self->{fow_texture} = new CFClient::Texture |
524 | $self->{fow_texture} = new CFPlus::Texture |
288 | w => $w, |
525 | w => $w, |
289 | h => $h, |
526 | h => $h, |
290 | data => $data, |
527 | data => $data, |
291 | internalformat => GL_ALPHA, |
528 | internalformat => GL_ALPHA, |
292 | format => GL_ALPHA; |
529 | format => GL_ALPHA; |
… | |
… | |
302 | glTranslate $sx0, $sy0; |
539 | glTranslate $sx0, $sy0; |
303 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
540 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
304 | |
541 | |
305 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
542 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
306 | |
543 | |
|
|
544 | glScale 32, 32; |
|
|
545 | |
307 | if (my $tex = $self->{fow_texture}) { |
546 | if (my $tex = $self->{fow_texture}) { |
308 | glEnable GL_TEXTURE_2D; |
547 | glEnable GL_TEXTURE_2D; |
309 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
548 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
310 | |
549 | |
311 | glScale 32, 32; |
|
|
312 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
550 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
313 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
551 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
314 | |
552 | |
315 | glDisable GL_TEXTURE_2D; |
553 | glDisable GL_TEXTURE_2D; |
316 | } |
554 | } |
317 | |
555 | |
|
|
556 | if ($self->{magicmap}) { |
|
|
557 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
|
|
558 | |
|
|
559 | $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); |
|
|
560 | $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); |
|
|
561 | |
|
|
562 | glTranslate - $x - 1, - $y - 1; |
|
|
563 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
|
|
564 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
|
|
565 | } |
|
|
566 | |
318 | glPopMatrix; |
567 | glPopMatrix; |
319 | |
|
|
320 | glEndList; |
568 | glEndList; |
321 | } |
569 | } |
322 | |
570 | |
323 | glPushMatrix; |
|
|
324 | glCallList $self->{list}; |
571 | glCallList $self->{list}; |
325 | glPopMatrix; |
|
|
326 | |
572 | |
327 | # TNT2 emulates logops in software (or worse :) |
573 | # TNT2 emulates logops in software (or worse :) |
328 | unless ($focused) { |
574 | unless ($focused) { |
329 | glColor 0.4, 0.2, 0.2, 0.6; |
575 | glColor 0.4, 0.2, 0.2, 0.6; |
330 | glEnable GL_BLEND; |
576 | glEnable GL_BLEND; |
… | |
… | |
345 | glDeleteList $self->{list}; |
591 | glDeleteList $self->{list}; |
346 | |
592 | |
347 | $self->SUPER::DESTROY; |
593 | $self->SUPER::DESTROY; |
348 | } |
594 | } |
349 | |
595 | |
350 | package CFClient::MapWidget::MapMap; |
596 | package CFPlus::MapWidget::MapMap; |
351 | |
597 | |
352 | our @ISA = CFClient::UI::Base::; |
598 | our @ISA = CFPlus::UI::Base::; |
353 | |
599 | |
354 | use Time::HiRes qw(time); |
600 | use Time::HiRes qw(time); |
355 | use CFClient::OpenGL; |
601 | use CFPlus::OpenGL; |
356 | |
602 | |
357 | sub size_request { |
603 | sub size_request { |
358 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
604 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
359 | } |
605 | } |
360 | |
606 | |
361 | sub size_allocate { |
607 | sub invoke_size_allocate { |
362 | my ($self, $w, $h) = @_; |
608 | my ($self, $w, $h) = @_; |
363 | |
609 | |
364 | $self->SUPER::size_allocate ($w, $h); |
|
|
365 | $self->update; |
610 | $self->update; |
|
|
611 | |
|
|
612 | 1 |
366 | } |
613 | } |
367 | |
614 | |
368 | sub update { |
615 | sub update { |
369 | my ($self) = @_; |
616 | my ($self) = @_; |
370 | |
617 | |
… | |
… | |
395 | |
642 | |
396 | if ($self->{texture_atime} < time) { |
643 | if ($self->{texture_atime} < time) { |
397 | $self->{texture_atime} = time + 1/3; |
644 | $self->{texture_atime} = time + 1/3; |
398 | |
645 | |
399 | $self->{texture} = |
646 | $self->{texture} = |
400 | new CFClient::Texture |
647 | new CFPlus::Texture |
401 | w => $w, |
648 | w => $w, |
402 | h => $h, |
649 | h => $h, |
403 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
650 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
404 | type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
651 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
405 | } |
652 | } |
406 | |
653 | |
407 | $self->{texture}->draw_quad (0, 0); |
654 | $self->{texture}->draw_quad (0, 0); |
408 | |
655 | |
409 | glDisable GL_TEXTURE_2D; |
656 | glDisable GL_TEXTURE_2D; |
… | |
… | |
424 | glEnd; |
671 | glEnd; |
425 | |
672 | |
426 | glDisable GL_BLEND; |
673 | glDisable GL_BLEND; |
427 | } |
674 | } |
428 | |
675 | |
429 | package CFClient::MapWidget::Command; |
676 | package CFPlus::MapWidget::Command; |
430 | |
677 | |
431 | use strict; |
678 | use strict; |
432 | |
679 | |
433 | use CFClient::OpenGL; |
680 | use CFPlus::OpenGL; |
434 | |
681 | |
435 | our @ISA = CFClient::UI::Frame::; |
682 | our @ISA = CFPlus::UI::Frame::; |
436 | |
683 | |
437 | sub new { |
684 | sub new { |
438 | my $class = shift; |
685 | my $class = shift; |
439 | |
686 | |
440 | my $self = $class->SUPER::new ( |
687 | my $self = $class->SUPER::new ( |
441 | bg => [0, 0, 0, 0.8], |
688 | bg => [0, 0, 0, 0.8], |
442 | @_, |
689 | @_, |
443 | ); |
690 | ); |
444 | |
691 | |
445 | $self->add ($self->{vbox} = new CFClient::UI::VBox); |
692 | $self->add ($self->{vbox} = new CFPlus::UI::VBox); |
446 | |
693 | |
447 | $self->{label} = [ |
694 | $self->{label} = [ |
448 | map |
695 | map |
449 | CFClient::UI::Label->new ( |
696 | CFPlus::UI::Label->new ( |
450 | can_hover => 1, |
697 | can_hover => 1, |
451 | can_events => 1, |
698 | can_events => 1, |
452 | tooltip_width => 0.33, |
699 | tooltip_width => 0.33, |
453 | fontsize => $_, |
700 | fontsize => $_, |
454 | ), (0.8) x 16 |
701 | ), (0.8) x 16 |
455 | ]; |
702 | ]; |
456 | |
703 | |
457 | $self->{entry} = new CFClient::UI::Entry |
704 | $self->{entry} = new CFPlus::UI::Entry |
458 | on_changed => sub { |
705 | on_changed => sub { |
459 | $self->update_labels; |
706 | $self->update_labels; |
|
|
707 | 0 |
460 | }, |
708 | }, |
461 | on_button_down => sub { |
709 | on_button_down => sub { |
462 | my ($entry, $ev, $x, $y) = @_; |
710 | my ($entry, $ev, $x, $y) = @_; |
463 | |
711 | |
464 | if ($ev->{button} == 3) { |
712 | if ($ev->{button} == 3) { |
465 | (new CFClient::UI::Menu |
713 | (new CFPlus::UI::Menu |
466 | items => [ |
714 | items => [ |
|
|
715 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
467 | ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }] |
716 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
468 | ], |
717 | ], |
469 | )->popup ($ev); |
718 | )->popup ($ev); |
470 | return 1; |
719 | return 1; |
471 | } |
720 | } |
472 | 0 |
721 | 0 |
… | |
… | |
479 | if ($ev->{sym} == 13) { |
728 | if ($ev->{sym} == 13) { |
480 | if (exists $self->{select}) { |
729 | if (exists $self->{select}) { |
481 | $self->{last_command} = $self->{select}; |
730 | $self->{last_command} = $self->{select}; |
482 | $::CONN->user_send ($self->{select}); |
731 | $::CONN->user_send ($self->{select}); |
483 | |
732 | |
484 | unshift @{$self->{history}}, $self->{select}; |
733 | unshift @{$self->{history}}, $self->{entry}->get_text; |
485 | $self->{hist_ptr} = 0; |
734 | $self->{hist_ptr} = 0; |
486 | |
735 | |
487 | $self->hide; |
736 | $self->hide; |
488 | } |
737 | } |
489 | } elsif ($ev->{sym} == 27) { |
738 | } elsif ($ev->{sym} == 27) { |
490 | $self->{hist_ptr} = 0; |
739 | $self->{hist_ptr} = 0; |
491 | $self->hide; |
740 | $self->hide; |
492 | return; |
|
|
493 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
741 | } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { |
494 | if ($self->{hist_ptr} > 1) { |
742 | if ($self->{hist_ptr} > 1) { |
495 | $self->{hist_ptr}--; |
743 | $self->{hist_ptr}--; |
496 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
744 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
497 | } elsif ($self->{hist_ptr} > 0) { |
745 | } elsif ($self->{hist_ptr} > 0) { |
498 | $self->{hist_ptr}--; |
746 | $self->{hist_ptr}--; |
… | |
… | |
500 | } else { |
748 | } else { |
501 | ++$self->{select_offset} |
749 | ++$self->{select_offset} |
502 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
750 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
503 | } |
751 | } |
504 | $self->update_labels; |
752 | $self->update_labels; |
505 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
753 | } elsif ($ev->{sym} == CFPlus::SDLK_UP) { |
506 | if ($self->{select_offset}) { |
754 | if ($self->{select_offset}) { |
507 | --$self->{select_offset} |
755 | --$self->{select_offset} |
508 | } else { |
756 | } else { |
509 | unless ($self->{hist_ptr}) { |
757 | unless ($self->{hist_ptr}) { |
510 | $self->{hist_saveback} = $self->{entry}->get_text; |
758 | $self->{hist_saveback} = $self->{entry}->get_text; |
… | |
… | |
537 | |
785 | |
538 | $self->{entry}->set_text ($prefix); |
786 | $self->{entry}->set_text ($prefix); |
539 | $self->show; |
787 | $self->show; |
540 | } |
788 | } |
541 | |
789 | |
542 | sub size_allocate { |
790 | sub invoke_size_allocate { |
543 | my ($self, $w, $h) = @_; |
791 | my ($self, $w, $h) = @_; |
544 | |
792 | |
545 | $self->SUPER::size_allocate ($w, $h); |
|
|
546 | $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); |
793 | $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); |
|
|
794 | |
|
|
795 | $self->SUPER::invoke_size_allocate ($w, $h) |
547 | } |
796 | } |
548 | |
797 | |
549 | sub show { |
798 | sub show { |
550 | my ($self) = @_; |
799 | my ($self) = @_; |
551 | |
800 | |
552 | $self->SUPER::show; |
801 | $self->SUPER::show; |
553 | $self->{entry}->focus_in; |
802 | $self->{entry}->grab_focus; |
554 | } |
803 | } |
555 | |
804 | |
556 | sub hide { |
805 | sub hide { |
557 | my ($self) = @_; |
806 | my ($self) = @_; |
558 | |
807 | |
|
|
808 | $self->{hist_ptr} = 0; |
|
|
809 | |
559 | $self->SUPER::hide; |
810 | $self->SUPER::hide; |
560 | $self->{entry}->set_text (""); |
811 | $self->{entry}->set_text (""); |
561 | } |
812 | } |
562 | |
813 | |
563 | sub key_down { |
814 | sub inject_key_down { |
564 | my ($self, $ev) = @_; |
815 | my ($self, $ev) = @_; |
565 | |
816 | |
|
|
817 | $self->{entry}->grab_focus; |
566 | $self->{entry}->key_down ($ev) |
818 | $self->{entry}->emit (key_down => $ev); |
567 | } |
819 | } |
568 | |
820 | |
569 | sub update_labels { |
821 | sub update_labels { |
570 | my ($self) = @_; |
822 | my ($self) = @_; |
571 | |
823 | |
… | |
… | |
658 | $label->set_text (""); |
910 | $label->set_text (""); |
659 | $label->set_tooltip (""); |
911 | $label->set_tooltip (""); |
660 | } |
912 | } |
661 | |
913 | |
662 | $self->update; |
914 | $self->update; |
663 | ### |
|
|
664 | } |
915 | } |
665 | |
916 | |
666 | sub _draw { |
917 | sub _draw { |
667 | my ($self) = @_; |
918 | my ($self) = @_; |
668 | |
919 | |
669 | # hack |
920 | # hack |
670 | local $CFClient::UI::FOCUS = $self->{entry}; |
921 | local $CFPlus::UI::FOCUS = $self->{entry}; |
671 | |
922 | |
672 | $self->SUPER::_draw; |
923 | $self->SUPER::_draw; |
673 | } |
924 | } |
674 | |
925 | |
675 | 1 |
926 | 1 |
|
|
927 | |