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