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 test_server_login { |
|
|
65 | return unless |
|
|
66 | $::CONN && length $::CONN->{test_server}; |
|
|
67 | |
|
|
68 | my $server = $::CONN->{test_server}; |
|
|
69 | ::stop_game (); |
|
|
70 | local $::PROFILE->{host} = $server; |
|
|
71 | ::start_game (); |
|
|
72 | } |
|
|
73 | |
|
|
74 | sub editor_invoke { |
|
|
75 | return unless $::CONN; |
|
|
76 | |
|
|
77 | # putting the password into the env is somewhat tasteless |
|
|
78 | local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user}; |
|
|
79 | local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password}; |
|
|
80 | local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload}; |
|
|
81 | local $ENV{CROSSFIRE_MAPDIR} = $::CONN->{cvs_root}; |
|
|
82 | |
|
|
83 | CFPlus::set_proxy; |
|
|
84 | |
|
|
85 | my $map = "map:$::CONN->{map_info}[0]"; |
|
|
86 | |
|
|
87 | if (fork == 0) { |
|
|
88 | $SIG{__DIE__} = sub { |
|
|
89 | warn "@_"; |
|
|
90 | CFPlus::_exit 99; |
|
|
91 | }; |
|
|
92 | |
|
|
93 | # TODO: move into editor |
|
|
94 | require LWP::UserAgent; |
|
|
95 | |
|
|
96 | my $ua = LWP::UserAgent->new ( |
|
|
97 | agent => "cfplus $CFPlus::VERSION", |
|
|
98 | keep_alive => 1, |
|
|
99 | env_proxy => 1, |
|
|
100 | ); |
|
|
101 | |
|
|
102 | if ($map =~ /^map:(.*)/) { |
|
|
103 | my $mapname = $1; |
|
|
104 | # try to get the most recent head revision, what a hack |
|
|
105 | my $log = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?view=log&logsort=rev")->decoded_content; |
|
|
106 | |
|
|
107 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
|
|
108 | my $rev = $1; |
|
|
109 | my $map = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?rev=$rev")->decoded_content; |
|
|
110 | warn "revision is $rev " .(length $map)."\n";#d# |
|
|
111 | |
|
|
112 | # now upload it |
|
|
113 | my $comment = "some comment"; |
|
|
114 | |
|
|
115 | require HTTP::Request::Common; |
|
|
116 | |
|
|
117 | my $res = $ua->post ( |
|
|
118 | $ENV{CFPLUS_UPLOAD}, |
|
|
119 | Content_Type => 'multipart/form-data', |
|
|
120 | Content => [ |
|
|
121 | path => $mapname, |
|
|
122 | mapdir => $ENV{CROSSFIRE_MAPDIR}, |
|
|
123 | map => $map, |
|
|
124 | revision => $rev, |
|
|
125 | cf_login => $ENV{CFPLUS_LOGIN}, |
|
|
126 | cf_password => $ENV{CFPLUS_PASSWORD}, |
|
|
127 | comment => "", |
|
|
128 | ] |
|
|
129 | ); |
|
|
130 | |
|
|
131 | if ($res->is_error) { |
|
|
132 | # fatal condition |
|
|
133 | warn $res->status_line; |
|
|
134 | } else { |
|
|
135 | # script replies are marked as {{..}} |
|
|
136 | my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; |
|
|
137 | warn map "$_\n", @msgs; |
|
|
138 | } |
|
|
139 | } else { |
|
|
140 | # error, could not detect revision |
|
|
141 | } |
|
|
142 | } |
|
|
143 | |
|
|
144 | CFPlus::_exit; |
|
|
145 | } |
|
|
146 | } |
|
|
147 | |
63 | sub button_down { |
148 | sub invoke_button_down { |
64 | my ($self, $ev, $x, $y) = @_; |
149 | my ($self, $ev, $x, $y) = @_; |
65 | |
150 | |
66 | $self->focus_in; |
|
|
67 | |
|
|
68 | if ($ev->{button} == 1) { |
151 | if ($ev->{button} == 1) { |
69 | my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}); |
152 | $self->grab_focus; |
70 | my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}); |
153 | return unless $::CONN; |
|
|
154 | |
|
|
155 | my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
|
|
156 | my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
|
|
157 | |
|
|
158 | $x -= int 0.5 * $self->{sw}; |
|
|
159 | $y -= int 0.5 * $self->{sh}; |
|
|
160 | |
|
|
161 | $::CONN->lookat ($x, $y) |
|
|
162 | if $::CONN; |
|
|
163 | |
|
|
164 | } elsif ($ev->{button} == 2) { |
|
|
165 | $self->grab_focus; |
|
|
166 | return unless $::CONN; |
71 | |
167 | |
72 | $x += int 0.5 * ($::MAP->w - $self->{sw} - 1); |
|
|
73 | $y += int 0.5 * ($::MAP->h - $self->{sh} - 1); |
|
|
74 | |
|
|
75 | $x -= int 0.5 * $::MAP->w; |
|
|
76 | $y -= int 0.5 * $::MAP->h; |
|
|
77 | |
|
|
78 | $x += 1; |
|
|
79 | $y += 1; |
|
|
80 | |
|
|
81 | $::CONN->send (sprintf "lookat %d %d", $x, $y) |
|
|
82 | if $::CONN; |
|
|
83 | |
|
|
84 | } elsif ($ev->{button} == 2) { |
|
|
85 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
168 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
86 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
169 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
87 | |
170 | |
88 | $self->{motion} = sub { |
171 | $self->{motion} = sub { |
89 | my ($ev, $x, $y) = @_; |
172 | my ($ev, $x, $y) = @_; |
… | |
… | |
93 | $::CFG->{map_shift_x} = $bw + $x - $ox; |
176 | $::CFG->{map_shift_x} = $bw + $x - $ox; |
94 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
177 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
95 | |
178 | |
96 | $self->update; |
179 | $self->update; |
97 | }; |
180 | }; |
|
|
181 | } elsif ($ev->{button} == 3) { |
|
|
182 | (new CFPlus::UI::Menu |
|
|
183 | items => [ |
|
|
184 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
|
|
185 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
|
|
186 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
|
|
187 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
|
|
188 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
|
|
189 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
|
|
190 | ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
|
|
191 | [ |
|
|
192 | $::PICKUP_ENABLE->{state} |
|
|
193 | ? "Disable automatic pickup" |
|
|
194 | : "Enable automatic pickup", |
|
|
195 | sub { $::PICKUP_ENABLE->toggle } |
|
|
196 | ], |
|
|
197 | $::CONN && length $::CONN->{cvs_root} |
|
|
198 | ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
|
|
199 | \&editor_invoke] |
|
|
200 | : (), |
|
|
201 | $::CONN && length $::CONN->{test_server} |
|
|
202 | ? ["Login on Test Server <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{test_server}) . ")</span>", |
|
|
203 | \&test_server_login] |
|
|
204 | : (), |
|
|
205 | ["Quit", |
|
|
206 | sub { |
|
|
207 | if ($::CONN) { |
|
|
208 | &::open_quit_dialog; |
|
|
209 | } else { |
|
|
210 | exit; |
|
|
211 | } |
|
|
212 | } |
|
|
213 | ], |
|
|
214 | ], |
|
|
215 | )->popup ($ev); |
98 | } |
216 | } |
99 | |
217 | |
100 | 1 |
218 | 1 |
101 | } |
219 | } |
102 | |
220 | |
103 | sub button_up { |
221 | sub invoke_button_up { |
104 | my ($self, $ev, $x, $y) = @_; |
222 | my ($self, $ev, $x, $y) = @_; |
105 | |
223 | |
106 | delete $self->{motion}; |
224 | delete $self->{motion}; |
107 | |
225 | |
108 | 1 |
226 | 1 |
109 | } |
227 | } |
110 | |
228 | |
111 | sub mouse_motion { |
229 | sub invoke_mouse_motion { |
112 | my ($self, $ev, $x, $y) = @_; |
230 | my ($self, $ev, $x, $y) = @_; |
113 | |
231 | |
114 | if ($self->{motion}) { |
232 | if ($self->{motion}) { |
115 | $self->{motion}->($ev, $x, $y); |
233 | $self->{motion}->($ev, $x, $y); |
116 | } else { |
234 | } else { |
… | |
… | |
120 | 1 |
238 | 1 |
121 | } |
239 | } |
122 | |
240 | |
123 | sub size_request { |
241 | sub size_request { |
124 | ( |
242 | ( |
125 | 1 + 32 * int $::WIDTH / 32, |
243 | 32 * CFPlus::ceil $::WIDTH / 32, |
126 | 1 + 32 * int $::HEIGHT / 32, |
244 | 32 * CFPlus::ceil $::HEIGHT / 32, |
127 | ) |
245 | ) |
128 | } |
246 | } |
129 | |
247 | |
130 | sub update { |
248 | sub update { |
131 | my ($self) = @_; |
249 | my ($self) = @_; |
… | |
… | |
133 | $self->{need_update} = 1; |
251 | $self->{need_update} = 1; |
134 | $self->SUPER::update; |
252 | $self->SUPER::update; |
135 | } |
253 | } |
136 | |
254 | |
137 | my %DIR = ( |
255 | my %DIR = ( |
138 | CFClient::SDLK_KP8, [1, "north"], |
256 | CFPlus::SDLK_KP8, [1, "north"], |
139 | CFClient::SDLK_KP9, [2, "northeast"], |
257 | CFPlus::SDLK_KP9, [2, "northeast"], |
140 | CFClient::SDLK_KP6, [3, "east"], |
258 | CFPlus::SDLK_KP6, [3, "east"], |
141 | CFClient::SDLK_KP3, [4, "southeast"], |
259 | CFPlus::SDLK_KP3, [4, "southeast"], |
142 | CFClient::SDLK_KP2, [5, "south"], |
260 | CFPlus::SDLK_KP2, [5, "south"], |
143 | CFClient::SDLK_KP1, [6, "southwest"], |
261 | CFPlus::SDLK_KP1, [6, "southwest"], |
144 | CFClient::SDLK_KP4, [7, "west"], |
262 | CFPlus::SDLK_KP4, [7, "west"], |
145 | CFClient::SDLK_KP7, [8, "northwest"], |
263 | CFPlus::SDLK_KP7, [8, "northwest"], |
146 | |
264 | |
147 | CFClient::SDLK_UP, [1, "north"], |
265 | CFPlus::SDLK_UP, [1, "north"], |
148 | CFClient::SDLK_RIGHT, [3, "east"], |
266 | CFPlus::SDLK_RIGHT, [3, "east"], |
149 | CFClient::SDLK_DOWN, [5, "south"], |
267 | CFPlus::SDLK_DOWN, [5, "south"], |
150 | CFClient::SDLK_LEFT, [7, "west"], |
268 | CFPlus::SDLK_LEFT, [7, "west"], |
151 | ); |
269 | ); |
152 | |
270 | |
153 | sub key_down { |
271 | sub invoke_key_down { |
154 | my ($self, $ev) = @_; |
272 | my ($self, $ev) = @_; |
155 | |
|
|
156 | return 0 unless $::CONN; |
|
|
157 | |
273 | |
158 | my $mod = $ev->{mod}; |
274 | my $mod = $ev->{mod}; |
159 | my $sym = $ev->{sym}; |
275 | my $sym = $ev->{sym}; |
160 | my $uni = $ev->{unicode}; |
276 | my $uni = $ev->{unicode}; |
161 | |
277 | |
162 | if ($sym == CFClient::SDLK_KP5) { |
278 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
|
|
279 | |
|
|
280 | if ($uni == ord "\t") { |
|
|
281 | $::PL_WINDOW->toggle_visibility; |
|
|
282 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
|
|
283 | $::HELP_WINDOW->toggle_visibility; |
|
|
284 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
|
|
285 | ::toggle_player_page ($::STATS_PAGE); |
|
|
286 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
|
|
287 | ::toggle_player_page ($::SKILL_PAGE); |
|
|
288 | } elsif ($sym == CFPlus::SDLK_F4 && !$mod) { |
|
|
289 | ::toggle_player_page ($::SPELL_PAGE); |
|
|
290 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
|
|
291 | ::toggle_player_page ($::INVENTORY_PAGE); |
|
|
292 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
|
|
293 | $::SETUP_DIALOG->toggle_visibility; |
|
|
294 | } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { |
|
|
295 | $::BIND_EDITOR->set_binding (undef, undef, [], |
|
|
296 | sub { |
|
|
297 | my ($mod, $sym, $cmds) = @_; |
|
|
298 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
|
|
299 | }); |
|
|
300 | $::BIND_EDITOR->start; |
|
|
301 | $::BIND_EDITOR->show; |
|
|
302 | #TODO: elmex, what was this supposed to do? it currently crashes the client. |
|
|
303 | # } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) { |
|
|
304 | # $::BIND_EDITOR->stop; |
|
|
305 | # $::BIND_EDITOR->ask_for_bind_and_commit; |
|
|
306 | # $::BIND_EDITOR->hide; |
|
|
307 | } elsif (!$::CONN) { |
|
|
308 | return 0; # bindings further down need a valid connection |
|
|
309 | |
|
|
310 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
163 | $::CONN->user_send ("stay fire"); |
311 | $::CONN->user_send ("stay fire"); |
164 | } elsif ($uni == ord ",") { |
312 | } elsif ($uni == ord ",") { |
165 | $::CONN->user_send ("take"); |
313 | $::CONN->user_send ("take"); |
166 | } elsif ($uni == ord " ") { |
314 | } elsif ($uni == ord " ") { |
167 | $::CONN->user_send ("apply"); |
315 | $::CONN->user_send ("apply"); |
|
|
316 | } elsif ($uni == 13) { |
|
|
317 | $::CONN->user_send ("examine"); |
168 | } elsif ($uni == ord ".") { |
318 | } elsif ($uni == ord ".") { |
169 | $::CONN->user_send ($self->{completer}{last_command}) |
319 | $::CONN->user_send ($self->{completer}{last_command}) |
170 | if exists $self->{completer}{last_command}; |
320 | if exists $self->{completer}{last_command}; |
171 | } elsif ($uni == ord "\t") { |
321 | } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { |
172 | $::INV_WINDOW->toggle_visibility; |
322 | $::CONN->user_send ($_) for @$bind_cmd; |
173 | } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { |
323 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
174 | $::CONN->user_send ("rotateshoottype +"); |
324 | $::CONN->user_send ("rotateshoottype +"); |
175 | } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { |
325 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
176 | $::CONN->user_send ("rotateshoottype -"); |
326 | $::CONN->user_send ("rotateshoottype -"); |
177 | } elsif ($uni == ord '"') { |
327 | } elsif ($uni == ord '"') { |
178 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
328 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
179 | $self->{completer}->show; |
329 | $self->{completer}->show; |
180 | } elsif ($uni == ord "'") { |
330 | } elsif ($uni == ord "'") { |
181 | $self->{completer}->set_prefix (""); |
331 | $self->{completer}->set_prefix (""); |
182 | $self->{completer}->show; |
332 | $self->{completer}->show; |
183 | } elsif (exists $DIR{$sym}) { |
333 | } elsif (exists $DIR{$sym}) { |
184 | if ($mod & CFClient::KMOD_SHIFT) { |
334 | if ($mod & CFPlus::KMOD_SHIFT) { |
185 | $self->{shft}++; |
335 | $self->{shft}++; |
|
|
336 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
186 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
337 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
|
|
338 | } |
|
|
339 | $self->{fire_dir} = $DIR{$sym}[0]; |
187 | } elsif ($mod & CFClient::KMOD_CTRL) { |
340 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
188 | $self->{ctrl}++; |
341 | $self->{ctrl}++; |
189 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
342 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
190 | } else { |
343 | } else { |
191 | $::CONN->user_send ("$DIR{$sym}[1]"); |
344 | $::CONN->user_send ("$DIR{$sym}[1]"); |
192 | } |
345 | } |
193 | } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { |
|
|
194 | $::BIND_EDITOR->set_binding (undef, undef, [], |
|
|
195 | sub { |
|
|
196 | my ($mod, $sym, $cmds) = @_; |
|
|
197 | $::CFG->{bindings}->{$mod}->{$sym} = $cmds; |
|
|
198 | }); |
|
|
199 | $::BIND_EDITOR->start; |
|
|
200 | $::BIND_EDITOR->show; |
|
|
201 | } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { |
|
|
202 | $::BIND_EDITOR->stop; |
|
|
203 | $::BIND_EDITOR->ask_for_bind_and_commit; |
|
|
204 | $::BIND_EDITOR->hide; |
|
|
205 | } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { |
|
|
206 | $::CONN->user_send ($_) for @$bind_cmd; |
|
|
207 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
346 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
208 | $self->{completer}->key_down ($ev); |
347 | $self->{completer}->inject_key_down ($ev); |
209 | $self->{completer}->show; |
348 | $self->{completer}->show; |
210 | } else { |
349 | } else { |
211 | return 0; |
350 | return 0; |
212 | } |
351 | } |
213 | |
352 | |
214 | 1 |
353 | 1 |
215 | } |
354 | } |
216 | |
355 | |
217 | sub key_up { |
356 | sub invoke_key_up { |
218 | my ($self, $ev) = @_; |
357 | my ($self, $ev) = @_; |
219 | |
358 | |
220 | my $res = 0; |
359 | my $res = 0; |
221 | my $mod = $ev->{mod}; |
360 | my $mod = $ev->{mod}; |
222 | my $sym = $ev->{sym}; |
361 | my $sym = $ev->{sym}; |
223 | |
362 | |
|
|
363 | if ($::CFG->{shift_fire_stop}) { |
224 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
364 | if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { |
225 | $::CONN->user_send ("fire_stop"); |
365 | $::CONN->user_send ("fire_stop"); |
|
|
366 | delete $self->{fire_dir}; |
226 | $res = 1; |
367 | $res = 1; |
|
|
368 | } |
|
|
369 | } else { |
|
|
370 | if (exists $DIR{$sym} && delete $self->{shft}) { |
|
|
371 | $::CONN->user_send ("fire_stop"); |
|
|
372 | delete $self->{fire_dir}; |
|
|
373 | $res = 1; |
|
|
374 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
|
|
375 | $::CONN->user_send ("fire_stop"); |
|
|
376 | delete $self->{fire_dir}; |
|
|
377 | $res = 1; |
|
|
378 | } |
227 | } |
379 | } |
228 | |
380 | |
229 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
381 | if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { |
230 | $::CONN->user_send ("run_stop"); |
382 | $::CONN->user_send ("run_stop"); |
231 | $res = 1; |
383 | $res = 1; |
232 | } |
384 | } |
233 | |
385 | |
234 | $res |
386 | $res |
235 | } |
387 | } |
236 | |
388 | |
|
|
389 | sub set_magicmap { |
|
|
390 | my ($self, $w, $h, $x, $y, $data) = @_; |
|
|
391 | |
|
|
392 | $x -= $::MAP->ox + int 0.5 * $::MAP->w; |
|
|
393 | $y -= $::MAP->oy + int 0.5 * $::MAP->h; |
|
|
394 | |
|
|
395 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
|
|
396 | |
|
|
397 | $self->update; |
|
|
398 | } |
|
|
399 | |
237 | sub draw { |
400 | sub draw { |
238 | my ($self) = @_; |
401 | my ($self) = @_; |
239 | |
402 | |
|
|
403 | return unless $::MAP; |
|
|
404 | |
240 | my $focused = $CFClient::UI::FOCUS == $self |
405 | my $focused = $CFPlus::UI::FOCUS == $self |
241 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
406 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
242 | |
407 | |
243 | return |
408 | return |
244 | unless $focused || !$::FAST; |
409 | unless $focused || !$::FAST; |
245 | |
410 | |
246 | if (delete $self->{need_update}) { |
411 | if (delete $self->{need_update}) { |
|
|
412 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
|
|
413 | |
|
|
414 | my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
|
|
415 | my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
|
|
416 | |
|
|
417 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
|
|
418 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
|
|
419 | |
|
|
420 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
|
|
421 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
|
|
422 | |
|
|
423 | if ($::CFG->{fow_enable}) { |
|
|
424 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
|
|
425 | |
|
|
426 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
|
|
427 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
|
|
428 | glConvolutionFilter2D ( |
|
|
429 | GL_CONVOLUTION_2D, |
|
|
430 | GL_ALPHA, |
|
|
431 | 3, 3, |
|
|
432 | GL_ALPHA, GL_FLOAT, |
|
|
433 | (pack "f*", @{ $self->{smooth_matrix} }), |
|
|
434 | ); |
|
|
435 | glEnable GL_CONVOLUTION_2D; |
|
|
436 | } |
|
|
437 | |
|
|
438 | $self->{fow_texture} = new CFPlus::Texture |
|
|
439 | w => $w, |
|
|
440 | h => $h, |
|
|
441 | data => $data, |
|
|
442 | internalformat => GL_ALPHA, |
|
|
443 | format => GL_ALPHA; |
|
|
444 | |
|
|
445 | glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; |
|
|
446 | } else { |
|
|
447 | delete $self->{fow_texture}; |
|
|
448 | } |
|
|
449 | |
247 | glNewList $self->{list}; |
450 | glNewList $self->{list}; |
248 | |
451 | |
249 | if ($::MAP) { |
|
|
250 | my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
251 | my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
252 | |
|
|
253 | my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; |
|
|
254 | my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; |
|
|
255 | my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32; |
|
|
256 | my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32; |
|
|
257 | |
|
|
258 | glPushMatrix; |
452 | glPushMatrix; |
|
|
453 | glTranslate $sx0, $sy0; |
259 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
454 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
260 | |
455 | |
261 | glTranslate $sx0, $sy0; |
456 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
262 | |
457 | |
263 | my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); |
458 | glScale 32, 32; |
264 | |
459 | |
265 | if ($::CFG->{fow_enable}) { |
460 | if (my $tex = $self->{fow_texture}) { |
266 | if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
|
|
267 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
|
|
268 | glConvolutionFilter2D ( |
|
|
269 | GL_CONVOLUTION_2D, |
|
|
270 | GL_ALPHA, |
|
|
271 | 3, 3, |
|
|
272 | GL_ALPHA, GL_FLOAT, |
|
|
273 | (pack "f*", @{ $self->{smooth_matrix} }), |
|
|
274 | ); |
|
|
275 | glEnable GL_CONVOLUTION_2D; |
|
|
276 | } |
|
|
277 | |
|
|
278 | $self->{fow_texture_name} ||= glGenTexture; |
|
|
279 | # try to re-use the texture name: TODO improve texture class instead |
|
|
280 | |
|
|
281 | $self->{fow_texture} = new CFClient::Texture |
|
|
282 | w => $w, |
|
|
283 | h => $h, |
|
|
284 | data => $data, |
|
|
285 | name => $self->{fow_texture_name}, |
|
|
286 | internalformat => GL_ALPHA, |
|
|
287 | format => GL_ALPHA; |
|
|
288 | |
|
|
289 | glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; |
|
|
290 | |
|
|
291 | glEnable GL_TEXTURE_2D; |
461 | glEnable GL_TEXTURE_2D; |
292 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
462 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
293 | |
463 | |
294 | glColor +($::CFG->{fow_intensity}) x 3, 0.8; |
464 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
295 | $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); |
465 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
296 | |
466 | |
297 | glDisable GL_TEXTURE_2D; |
467 | glDisable GL_TEXTURE_2D; |
298 | } |
468 | } |
299 | |
469 | |
|
|
470 | if ($self->{magicmap}) { |
|
|
471 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
|
|
472 | |
|
|
473 | $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); |
|
|
474 | $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); |
|
|
475 | |
|
|
476 | glTranslate - $x - 1, - $y - 1; |
|
|
477 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
|
|
478 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
|
|
479 | } |
|
|
480 | |
300 | glPopMatrix; |
481 | glPopMatrix; |
301 | } |
|
|
302 | |
|
|
303 | glEndList; |
482 | glEndList; |
304 | } |
483 | } |
305 | |
484 | |
306 | glPushMatrix; |
|
|
307 | glCallList $self->{list}; |
485 | glCallList $self->{list}; |
308 | glPopMatrix; |
|
|
309 | |
486 | |
310 | # TNT2 emulates logops in software (or worse :) |
487 | # TNT2 emulates logops in software (or worse :) |
311 | if ($focused) { |
488 | unless ($focused) { |
312 | (delete $self->{out_of_focus})->destroy |
|
|
313 | if $self->{out_of_focus}; |
|
|
314 | } else { |
|
|
315 | glColor 0.4, 0.2, 0.2, 0.6; |
489 | glColor 0.4, 0.2, 0.2, 0.6; |
316 | glEnable GL_BLEND; |
490 | glEnable GL_BLEND; |
317 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
491 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
318 | glBegin GL_QUADS; |
492 | glBegin GL_QUADS; |
319 | glVertex 0, 0; |
493 | glVertex 0, 0; |
320 | glVertex 0, $::HEIGHT; |
494 | glVertex 0, $::HEIGHT; |
321 | glVertex $::WIDTH, $::HEIGHT; |
495 | glVertex $::WIDTH, $::HEIGHT; |
322 | glVertex $::WIDTH, 0; |
496 | glVertex $::WIDTH, 0; |
323 | glEnd; |
497 | glEnd; |
324 | glDisable GL_BLEND; |
498 | glDisable GL_BLEND; |
325 | |
|
|
326 | # $self->{out_of_focus} ||= do { |
|
|
327 | # my $label = new CFClient::UI::Label |
|
|
328 | # x => 0, |
|
|
329 | # y => 0, |
|
|
330 | # z => 1, |
|
|
331 | # ellipsise => 0, |
|
|
332 | # text => "map out of focus (click map to play)"; |
|
|
333 | # |
|
|
334 | # $label->show; |
|
|
335 | # $label->update; |
|
|
336 | # |
|
|
337 | # $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { |
|
|
338 | # $label->move_abs ( |
|
|
339 | # ($::WIDTH - $label->{w}) * 0.5, |
|
|
340 | # ($::HEIGHT - $label->{h}) * 0.5, |
|
|
341 | # ); |
|
|
342 | # }); |
|
|
343 | # |
|
|
344 | # $label |
|
|
345 | # }; |
|
|
346 | } |
499 | } |
347 | } |
500 | } |
348 | |
501 | |
349 | sub DESTROY { |
502 | sub DESTROY { |
350 | my $self = shift; |
503 | my $self = shift; |
… | |
… | |
352 | glDeleteList $self->{list}; |
505 | glDeleteList $self->{list}; |
353 | |
506 | |
354 | $self->SUPER::DESTROY; |
507 | $self->SUPER::DESTROY; |
355 | } |
508 | } |
356 | |
509 | |
357 | package CFClient::MapWidget::MapMap; |
510 | package CFPlus::MapWidget::MapMap; |
358 | |
511 | |
359 | our @ISA = CFClient::UI::Base::; |
512 | our @ISA = CFPlus::UI::Base::; |
360 | |
513 | |
361 | use Time::HiRes qw(time); |
514 | use Time::HiRes qw(time); |
362 | use CFClient::OpenGL; |
515 | use CFPlus::OpenGL; |
363 | |
516 | |
364 | sub size_request { |
517 | sub size_request { |
365 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
518 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
366 | } |
519 | } |
367 | |
520 | |
368 | sub size_allocate { |
521 | sub invoke_size_allocate { |
369 | my ($self, $w, $h) = @_; |
522 | my ($self, $w, $h) = @_; |
370 | |
523 | |
371 | $self->SUPER::size_allocate ($w, $h); |
|
|
372 | $self->update; |
524 | $self->update; |
|
|
525 | |
|
|
526 | 1 |
373 | } |
527 | } |
374 | |
528 | |
375 | sub update { |
529 | sub update { |
376 | my ($self) = @_; |
530 | my ($self) = @_; |
377 | |
531 | |
… | |
… | |
402 | |
556 | |
403 | if ($self->{texture_atime} < time) { |
557 | if ($self->{texture_atime} < time) { |
404 | $self->{texture_atime} = time + 1/3; |
558 | $self->{texture_atime} = time + 1/3; |
405 | |
559 | |
406 | $self->{texture} = |
560 | $self->{texture} = |
407 | new CFClient::Texture |
561 | new CFPlus::Texture |
408 | w => $w, |
562 | w => $w, |
409 | h => $h, |
563 | h => $h, |
410 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
564 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
411 | type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
565 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
412 | } |
566 | } |
413 | |
567 | |
414 | $self->{texture}->draw_quad (0, 0); |
568 | $self->{texture}->draw_quad (0, 0); |
415 | |
569 | |
416 | glDisable GL_TEXTURE_2D; |
570 | glDisable GL_TEXTURE_2D; |
… | |
… | |
431 | glEnd; |
585 | glEnd; |
432 | |
586 | |
433 | glDisable GL_BLEND; |
587 | glDisable GL_BLEND; |
434 | } |
588 | } |
435 | |
589 | |
436 | package CFClient::MapWidget::Command; |
590 | package CFPlus::MapWidget::Command; |
437 | |
591 | |
438 | use strict; |
592 | use strict; |
439 | |
593 | |
440 | use CFClient::OpenGL; |
594 | use CFPlus::OpenGL; |
441 | |
595 | |
442 | our @ISA = CFClient::UI::Frame::; |
596 | our @ISA = CFPlus::UI::Frame::; |
443 | |
597 | |
444 | sub new { |
598 | sub new { |
445 | my $class = shift; |
599 | my $class = shift; |
446 | |
600 | |
447 | my $self = $class->SUPER::new ( |
601 | my $self = $class->SUPER::new ( |
448 | bg => [0, 0, 0, 0.8], |
602 | bg => [0, 0, 0, 0.8], |
449 | @_, |
603 | @_, |
450 | ); |
604 | ); |
451 | |
605 | |
452 | $self->add ($self->{vbox} = new CFClient::UI::VBox); |
606 | $self->add ($self->{vbox} = new CFPlus::UI::VBox); |
453 | |
607 | |
454 | $self->{label} = [ |
608 | $self->{label} = [ |
455 | map |
609 | map |
456 | CFClient::UI::Label->new ( |
610 | CFPlus::UI::Label->new ( |
457 | can_hover => 1, |
611 | can_hover => 1, |
458 | can_events => 1, |
612 | can_events => 1, |
459 | tooltip_width => 0.33, |
613 | tooltip_width => 0.33, |
460 | fontsize => $_, |
614 | fontsize => $_, |
461 | ), (0.8) x 16 |
615 | ), (0.8) x 16 |
462 | ]; |
616 | ]; |
463 | |
617 | |
464 | $self->{entry} = new CFClient::UI::Entry |
618 | $self->{entry} = new CFPlus::UI::Entry |
465 | on_changed => sub { |
619 | on_changed => sub { |
466 | $self->update_labels; |
620 | $self->update_labels; |
|
|
621 | 0 |
|
|
622 | }, |
|
|
623 | on_button_down => sub { |
|
|
624 | my ($entry, $ev, $x, $y) = @_; |
|
|
625 | |
|
|
626 | if ($ev->{button} == 3) { |
|
|
627 | (new CFPlus::UI::Menu |
|
|
628 | items => [ |
|
|
629 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
|
|
630 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
|
|
631 | ], |
|
|
632 | )->popup ($ev); |
|
|
633 | return 1; |
|
|
634 | } |
|
|
635 | 0 |
467 | }, |
636 | }, |
468 | on_key_down => sub { |
637 | on_key_down => sub { |
469 | my ($entry, $ev) = @_; |
638 | my ($entry, $ev) = @_; |
470 | |
639 | |
471 | my $self = $entry->{parent}{parent}; |
640 | my $self = $entry->{parent}{parent}; |
… | |
… | |
473 | if ($ev->{sym} == 13) { |
642 | if ($ev->{sym} == 13) { |
474 | if (exists $self->{select}) { |
643 | if (exists $self->{select}) { |
475 | $self->{last_command} = $self->{select}; |
644 | $self->{last_command} = $self->{select}; |
476 | $::CONN->user_send ($self->{select}); |
645 | $::CONN->user_send ($self->{select}); |
477 | |
646 | |
478 | unshift @{$self->{history}}, $self->{select}; |
647 | unshift @{$self->{history}}, $self->{entry}->get_text; |
479 | $self->{hist_ptr} = 0; |
648 | $self->{hist_ptr} = 0; |
480 | |
649 | |
481 | $self->hide; |
650 | $self->hide; |
482 | } |
651 | } |
483 | } elsif ($ev->{sym} == 27) { |
652 | } elsif ($ev->{sym} == 27) { |
484 | $self->{hist_ptr} = 0; |
653 | $self->{hist_ptr} = 0; |
485 | $self->hide; |
654 | $self->hide; |
486 | return; |
|
|
487 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
655 | } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { |
488 | if ($self->{hist_ptr} > 1) { |
656 | if ($self->{hist_ptr} > 1) { |
489 | $self->{hist_ptr}--; |
657 | $self->{hist_ptr}--; |
490 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
658 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
491 | } elsif ($self->{hist_ptr} > 0) { |
659 | } elsif ($self->{hist_ptr} > 0) { |
492 | $self->{hist_ptr}--; |
660 | $self->{hist_ptr}--; |
… | |
… | |
494 | } else { |
662 | } else { |
495 | ++$self->{select_offset} |
663 | ++$self->{select_offset} |
496 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
664 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
497 | } |
665 | } |
498 | $self->update_labels; |
666 | $self->update_labels; |
499 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
667 | } elsif ($ev->{sym} == CFPlus::SDLK_UP) { |
500 | if ($self->{select_offset}) { |
668 | if ($self->{select_offset}) { |
501 | --$self->{select_offset} |
669 | --$self->{select_offset} |
502 | } else { |
670 | } else { |
503 | unless ($self->{hist_ptr}) { |
671 | unless ($self->{hist_ptr}) { |
504 | $self->{hist_saveback} = $self->{entry}->get_text; |
672 | $self->{hist_saveback} = $self->{entry}->get_text; |
… | |
… | |
531 | |
699 | |
532 | $self->{entry}->set_text ($prefix); |
700 | $self->{entry}->set_text ($prefix); |
533 | $self->show; |
701 | $self->show; |
534 | } |
702 | } |
535 | |
703 | |
536 | sub size_allocate { |
704 | sub invoke_size_allocate { |
537 | my ($self, $w, $h) = @_; |
705 | my ($self, $w, $h) = @_; |
538 | |
706 | |
539 | $self->SUPER::size_allocate ($w, $h); |
|
|
540 | $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); |
707 | $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); |
|
|
708 | |
|
|
709 | $self->SUPER::invoke_size_allocate ($w, $h) |
541 | } |
710 | } |
542 | |
711 | |
543 | sub show { |
712 | sub show { |
544 | my ($self) = @_; |
713 | my ($self) = @_; |
545 | |
714 | |
546 | $self->SUPER::show; |
715 | $self->SUPER::show; |
547 | $self->{entry}->focus_in; |
716 | $self->{entry}->grab_focus; |
548 | } |
717 | } |
549 | |
718 | |
550 | sub hide { |
719 | sub hide { |
551 | my ($self) = @_; |
720 | my ($self) = @_; |
552 | |
721 | |
|
|
722 | $self->{hist_ptr} = 0; |
|
|
723 | |
553 | $self->SUPER::hide; |
724 | $self->SUPER::hide; |
554 | $self->{entry}->set_text (""); |
725 | $self->{entry}->set_text (""); |
555 | } |
726 | } |
556 | |
727 | |
557 | sub key_down { |
728 | sub inject_key_down { |
558 | my ($self, $ev) = @_; |
729 | my ($self, $ev) = @_; |
559 | |
730 | |
|
|
731 | $self->{entry}->grab_focus; |
560 | $self->{entry}->key_down ($ev) |
732 | $self->{entry}->emit (key_down => $ev); |
561 | } |
733 | } |
562 | |
734 | |
563 | sub update_labels { |
735 | sub update_labels { |
564 | my ($self) = @_; |
736 | my ($self) = @_; |
565 | |
737 | |
… | |
… | |
652 | $label->set_text (""); |
824 | $label->set_text (""); |
653 | $label->set_tooltip (""); |
825 | $label->set_tooltip (""); |
654 | } |
826 | } |
655 | |
827 | |
656 | $self->update; |
828 | $self->update; |
657 | ### |
|
|
658 | } |
829 | } |
659 | |
830 | |
660 | sub _draw { |
831 | sub _draw { |
661 | my ($self) = @_; |
832 | my ($self) = @_; |
662 | |
833 | |
663 | # hack |
834 | # hack |
664 | local $CFClient::UI::FOCUS = $self->{entry}; |
835 | local $CFPlus::UI::FOCUS = $self->{entry}; |
665 | |
836 | |
666 | $self->SUPER::_draw; |
837 | $self->SUPER::_draw; |
667 | } |
838 | } |
668 | |
839 | |
669 | 1 |
840 | 1 |