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