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