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