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