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