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