1 | package CFClient::MapWidget; |
1 | package DC::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 DC; |
8 | use CFClient::OpenGL; |
9 | use DC::OpenGL; |
|
|
10 | use DC::UI; |
|
|
11 | use DC::Macro; |
9 | |
12 | |
10 | our @ISA = CFClient::UI::Base::; |
13 | our @ISA = DC::UI::Base::; |
|
|
14 | |
|
|
15 | my $magicmap_tex = |
|
|
16 | new_from_resource DC::Texture "magicmap.png", |
|
|
17 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
11 | |
18 | |
12 | sub new { |
19 | sub new { |
13 | my $class = shift; |
20 | my $class = shift; |
14 | |
21 | |
15 | my $self = $class->SUPER::new ( |
22 | my $self = $class->SUPER::new ( |
16 | z => -1, |
23 | z => -1, |
17 | can_focus => 1, |
24 | can_focus => 1, |
18 | list => glGenList, |
25 | tilesize => 32, |
19 | @_ |
26 | @_ |
20 | ); |
27 | ); |
21 | |
|
|
22 | $self->{completer} = new CFClient::MapWidget::Command:: |
|
|
23 | command => $self->{command}, |
|
|
24 | can_focus => 1, |
|
|
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 | ; |
|
|
34 | |
28 | |
35 | $self |
29 | $self |
36 | } |
30 | } |
37 | |
31 | |
38 | sub add_command { |
32 | sub add_command { |
… | |
… | |
42 | |
36 | |
43 | $tooltip =~ s/^\s+//; |
37 | $tooltip =~ s/^\s+//; |
44 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
38 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
45 | $tooltip =~ s/\s+$//; |
39 | $tooltip =~ s/\s+$//; |
46 | |
40 | |
47 | $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
41 | $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
48 | } |
42 | } |
49 | |
43 | |
50 | sub clr_commands { |
44 | sub clr_commands { |
51 | my ($self) = @_; |
45 | my ($self) = @_; |
52 | |
46 | |
53 | %{$self->{completer}{command}} = (); |
47 | %{$::COMPLETER->{command}} = (); |
54 | } |
|
|
55 | |
48 | |
|
|
49 | $::COMPLETER->hide |
|
|
50 | if $::COMPLETER; |
|
|
51 | } |
|
|
52 | |
|
|
53 | sub server_login { |
|
|
54 | my ($server) = @_; |
|
|
55 | |
|
|
56 | ::stop_game (); |
|
|
57 | local $::PROFILE->{host} = $server; |
|
|
58 | ::start_game (); |
|
|
59 | } |
|
|
60 | |
|
|
61 | sub editor_invoke { |
|
|
62 | my $editsup = $::CONN && $::CONN->{editor_support} |
|
|
63 | or return; |
|
|
64 | |
|
|
65 | DC::background { |
|
|
66 | print "preparing editor startup...\n"; |
|
|
67 | |
|
|
68 | my $server = $editsup->{gameserver} || "default"; |
|
|
69 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
|
|
70 | |
|
|
71 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir; |
|
|
72 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir; |
|
|
73 | |
|
|
74 | print "map directory is $mapdir\n"; |
|
|
75 | print "lib directory is $libdir\n"; |
|
|
76 | |
|
|
77 | my $ua = DC::lwp_useragent; |
|
|
78 | |
|
|
79 | for my $file (qw(archetypes crossfire.0)) { |
|
|
80 | my $url = "$editsup->{lib_root}$file"; |
|
|
81 | print "mirroring $url...\n"; |
|
|
82 | DC::lwp_check $ua->mirror ($url, "$libdir/$file"); |
|
|
83 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
|
|
84 | } |
|
|
85 | |
|
|
86 | if (1) { # upload a map |
|
|
87 | my $mapname = $::CONN->{map_info}[0]; |
|
|
88 | |
|
|
89 | my $mappath = "$mapdir/$mapname"; |
|
|
90 | |
|
|
91 | -e $mappath and die "$mappath already exists\n"; |
|
|
92 | |
|
|
93 | print "getting map revision for $mapname...\n"; |
|
|
94 | |
|
|
95 | # try to get the most recent head revision, what a hack, |
|
|
96 | # this should have been returned while downloading *sigh* |
|
|
97 | my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
|
|
98 | |
|
|
99 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
|
|
100 | my $rev = $1; |
|
|
101 | |
|
|
102 | print "downloading revision $rev...\n"; |
|
|
103 | |
|
|
104 | my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
|
|
105 | |
|
|
106 | my $meta = { |
|
|
107 | %$editsup, |
|
|
108 | path => $mapname, |
|
|
109 | revision => $rev, |
|
|
110 | cf_login => $::PROFILE->{user}, |
|
|
111 | }; |
|
|
112 | |
|
|
113 | require File::Basename; |
|
|
114 | require File::Path; |
|
|
115 | |
|
|
116 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
|
|
117 | open my $fh, ">:raw:perlio", "$mappath.meta" |
|
|
118 | or die "$mappath.meta: $!\n"; |
|
|
119 | print $fh DC::encode_json $meta; |
|
|
120 | close $fh; |
|
|
121 | open my $fh, ">:raw:perlio:utf8", $mappath |
|
|
122 | or die "$mappath: $!\n"; |
|
|
123 | print $fh $map; |
|
|
124 | close $fh; |
|
|
125 | |
|
|
126 | print "saved as $mappath\n"; |
|
|
127 | |
|
|
128 | print "invoking editor...\n"; |
|
|
129 | exec "/root/s2/gce $mappath";#d# |
|
|
130 | |
|
|
131 | # now upload it |
|
|
132 | # require HTTP::Request::Common; |
|
|
133 | # |
|
|
134 | # my $res = $ua->post ( |
|
|
135 | # $ENV{CFPLUS_UPLOAD}, |
|
|
136 | # Content_Type => 'multipart/form-data', |
|
|
137 | # Content => [ |
|
|
138 | # path => $mapname, |
|
|
139 | # mapdir => $ENV{CROSSFIRE_MAPDIR}, |
|
|
140 | # map => $map, |
|
|
141 | # revision => $rev, |
|
|
142 | # cf_login => $ENV{CFPLUS_LOGIN}, |
|
|
143 | # cf_password => $ENV{CFPLUS_PASSWORD}, |
|
|
144 | # comment => "", |
|
|
145 | # ] |
|
|
146 | # ); |
|
|
147 | # |
|
|
148 | # if ($res->is_error) { |
|
|
149 | # # fatal condition |
|
|
150 | # warn $res->status_line; |
|
|
151 | # } else { |
|
|
152 | # # script replies are marked as {{..}} |
|
|
153 | # my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; |
|
|
154 | # warn map "$_\n", @msgs; |
|
|
155 | # } |
|
|
156 | } else { |
|
|
157 | die "viewvc parse error, unable to detect revision\n"; |
|
|
158 | } |
|
|
159 | } |
|
|
160 | } |
|
|
161 | } |
|
|
162 | |
56 | sub button_down { |
163 | sub invoke_button_down { |
57 | my ($self, $ev, $x, $y) = @_; |
164 | my ($self, $ev, $x, $y) = @_; |
58 | |
165 | |
59 | $self->focus_in; |
|
|
60 | |
|
|
61 | if ($ev->{button} == 2) { |
166 | if ($ev->{button} == 1) { |
|
|
167 | $self->grab_focus; |
|
|
168 | return unless $::CONN && $self->{ctilesize}; |
|
|
169 | |
|
|
170 | my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; |
|
|
171 | my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; |
|
|
172 | |
|
|
173 | $x -= DC::floor $::MAP->w * 0.5; |
|
|
174 | $y -= DC::floor $::MAP->h * 0.5; |
|
|
175 | |
|
|
176 | if ($::CONN) { |
|
|
177 | $::CONN->lookat ($x, $y) |
|
|
178 | } |
|
|
179 | |
|
|
180 | } elsif ($ev->{button} == 2) { |
|
|
181 | $self->grab_focus; |
|
|
182 | return unless $::CONN; |
|
|
183 | |
62 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
184 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
63 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
185 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
64 | |
186 | |
65 | $self->{motion} = sub { |
187 | $self->{motion} = sub { |
66 | my ($ev, $x, $y) = @_; |
188 | my ($ev, $x, $y) = @_; |
… | |
… | |
70 | $::CFG->{map_shift_x} = $bw + $x - $ox; |
192 | $::CFG->{map_shift_x} = $bw + $x - $ox; |
71 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
193 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
72 | |
194 | |
73 | $self->update; |
195 | $self->update; |
74 | }; |
196 | }; |
75 | } elsif ($ev->{button} == 1) { |
197 | } elsif ($ev->{button} == 3) { |
76 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
198 | my @items = ( |
|
|
199 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
|
|
200 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
|
|
201 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
|
|
202 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
|
|
203 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
|
|
204 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
|
|
205 | # ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
|
|
206 | ); |
77 | |
207 | |
78 | my $fx = int ((($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale})) + 0.99); |
208 | if ($::CONN && $::CONN->{editor_support}) { |
79 | my $fy = int ((($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale})) + 0.99); |
209 | # push @items, [ |
80 | $fx += $::MAP->x; |
210 | # "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", |
81 | $fy += $::MAP->y; |
211 | # \&editor_invoke, |
|
|
212 | # ]; |
82 | |
213 | |
83 | $::CONN->send (sprintf "lookat %d %d", $fx, $fy); |
214 | for my $type (qw(test name)) { |
|
|
215 | $::CONN->{editor_support}{type} ne $type |
|
|
216 | or next; |
|
|
217 | my $server = $::CONN->{editor_support}{"${type}server"} |
|
|
218 | or next; |
84 | |
219 | |
85 | warn "FOOX: $fx (".$::MAP->ox.")\n"; |
220 | push @items, [ |
86 | warn "FOOY: $fy (".$::MAP->oy.")\n"; |
221 | "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>", |
|
|
222 | sub { server_login $server }, |
|
|
223 | ]; |
|
|
224 | } |
|
|
225 | } |
|
|
226 | |
|
|
227 | push @items, |
|
|
228 | ["Quit", |
|
|
229 | sub { |
|
|
230 | if ($::CONN) { |
|
|
231 | &::open_quit_dialog; |
|
|
232 | } else { |
|
|
233 | exit; |
|
|
234 | } |
|
|
235 | } |
|
|
236 | ], |
|
|
237 | ; |
|
|
238 | |
|
|
239 | (new DC::UI::Menu |
|
|
240 | items => \@items, |
|
|
241 | )->popup ($ev); |
87 | } |
242 | } |
88 | |
243 | |
89 | 1 |
244 | 1 |
90 | } |
245 | } |
91 | |
246 | |
92 | sub button_up { |
247 | sub invoke_button_up { |
93 | my ($self, $ev, $x, $y) = @_; |
248 | my ($self, $ev, $x, $y) = @_; |
94 | |
249 | |
95 | delete $self->{motion}; |
250 | delete $self->{motion}; |
96 | |
251 | |
97 | 1 |
252 | 1 |
98 | } |
253 | } |
99 | |
254 | |
100 | sub mouse_motion { |
255 | sub invoke_mouse_motion { |
101 | my ($self, $ev, $x, $y) = @_; |
256 | my ($self, $ev, $x, $y) = @_; |
102 | |
257 | |
103 | if ($self->{motion}) { |
258 | if ($self->{motion}) { |
104 | $self->{motion}->($ev, $x, $y); |
259 | $self->{motion}->($ev, $x, $y); |
105 | } else { |
260 | } else { |
… | |
… | |
108 | |
263 | |
109 | 1 |
264 | 1 |
110 | } |
265 | } |
111 | |
266 | |
112 | sub size_request { |
267 | sub size_request { |
|
|
268 | my ($self) = @_; |
|
|
269 | |
113 | ( |
270 | ( |
114 | 1 + 32 * int $::WIDTH / 32, |
271 | $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize}, |
115 | 1 + 32 * int $::HEIGHT / 32, |
272 | $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize}, |
116 | ) |
273 | ) |
117 | } |
274 | } |
118 | |
275 | |
119 | sub update { |
276 | sub update { |
120 | my ($self) = @_; |
277 | my ($self) = @_; |
… | |
… | |
122 | $self->{need_update} = 1; |
279 | $self->{need_update} = 1; |
123 | $self->SUPER::update; |
280 | $self->SUPER::update; |
124 | } |
281 | } |
125 | |
282 | |
126 | my %DIR = ( |
283 | my %DIR = ( |
127 | CFClient::SDLK_KP8, [1, "north"], |
284 | ( "," . DC::SDLK_KP5 ), [0, "stay fire"], |
128 | CFClient::SDLK_KP9, [2, "northeast"], |
285 | ( "," . DC::SDLK_KP8 ), [1, "north"], |
129 | CFClient::SDLK_KP6, [3, "east"], |
286 | ( "," . DC::SDLK_KP9 ), [2, "northeast"], |
130 | CFClient::SDLK_KP3, [4, "southeast"], |
287 | ( "," . DC::SDLK_KP6 ), [3, "east"], |
131 | CFClient::SDLK_KP2, [5, "south"], |
288 | ( "," . DC::SDLK_KP3 ), [4, "southeast"], |
132 | CFClient::SDLK_KP1, [6, "southwest"], |
289 | ( "," . DC::SDLK_KP2 ), [5, "south"], |
133 | CFClient::SDLK_KP4, [7, "west"], |
290 | ( "," . DC::SDLK_KP1 ), [6, "southwest"], |
134 | CFClient::SDLK_KP7, [8, "northwest"], |
291 | ( "," . DC::SDLK_KP4 ), [7, "west"], |
|
|
292 | ( "," . DC::SDLK_KP7 ), [8, "northwest"], |
135 | |
293 | |
136 | CFClient::SDLK_UP, [1, "north"], |
294 | ( "," . DC::SDLK_PAGEUP ), [2, "northeast"], |
137 | CFClient::SDLK_RIGHT, [3, "east"], |
295 | ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"], |
138 | CFClient::SDLK_DOWN, [5, "south"], |
296 | ( "," . DC::SDLK_END ), [6, "southwest"], |
139 | CFClient::SDLK_LEFT, [7, "west"], |
297 | ( "," . DC::SDLK_HOME ), [8, "northwest"], |
|
|
298 | |
|
|
299 | ( "," . DC::SDLK_UP ), [1, "north"], |
|
|
300 | ("1," . DC::SDLK_UP ), [2, "northeast"], |
|
|
301 | ( "," . DC::SDLK_RIGHT ), [3, "east"], |
|
|
302 | ("1," . DC::SDLK_RIGHT ), [4, "southeast"], |
|
|
303 | ( "," . DC::SDLK_DOWN ), [5, "south"], |
|
|
304 | ("1," . DC::SDLK_DOWN ), [6, "southwest"], |
|
|
305 | ( "," . DC::SDLK_LEFT ), [7, "west"], |
|
|
306 | ("1," . DC::SDLK_LEFT ), [8, "northwest"], |
140 | ); |
307 | ); |
141 | |
308 | |
142 | sub key_down { |
309 | sub invoke_key_down { |
143 | my ($self, $ev) = @_; |
310 | my ($self, $ev) = @_; |
144 | |
|
|
145 | return 0 unless $::CONN; |
|
|
146 | |
311 | |
147 | my $mod = $ev->{mod}; |
312 | my $mod = $ev->{mod}; |
148 | my $sym = $ev->{sym}; |
313 | my $sym = $ev->{sym}; |
149 | my $uni = $ev->{unicode}; |
314 | my $uni = $ev->{unicode}; |
150 | |
315 | |
151 | if ($sym == CFClient::SDLK_KP5) { |
316 | $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT; |
152 | $::CONN->user_send ("stay fire"); |
317 | |
153 | } elsif ($uni == ord ",") { |
318 | # ignore repeated keypresses |
154 | $::CONN->user_send ("take"); |
319 | return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; |
155 | } elsif ($uni == ord " ") { |
320 | $self->{last_mod} = $mod; |
156 | $::CONN->user_send ("apply"); |
321 | $self->{last_sym} = $sym; |
157 | } elsif ($uni == ord ".") { |
322 | |
158 | $::CONN->user_send ($self->{completer}{last_command}) |
323 | my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" }; |
159 | if exists $self->{completer}{last_command}; |
324 | |
160 | } elsif ($uni == ord "\t") { |
325 | if ($::CONN && $dir) { |
161 | $::INV_WINDOW->toggle_visibility; |
|
|
162 | } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { |
|
|
163 | $::CONN->user_send ("rotateshoottype +"); |
|
|
164 | } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { |
|
|
165 | $::CONN->user_send ("rotateshoottype -"); |
|
|
166 | } elsif ($uni == ord '"') { |
|
|
167 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
|
|
168 | $self->{completer}->show; |
|
|
169 | } elsif ($uni == ord "'") { |
|
|
170 | $self->{completer}->set_prefix (""); |
|
|
171 | $self->{completer}->show; |
|
|
172 | } elsif (exists $DIR{$sym}) { |
|
|
173 | if ($mod & CFClient::KMOD_SHIFT) { |
326 | if ($mod & DC::KMOD_SHIFT) { |
174 | $self->{shft}++; |
327 | $self->{shft}++; |
|
|
328 | if ($dir->[0] != $self->{fire_dir}) { |
175 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
329 | $::CONN->user_send ("fire $dir->[0]"); |
|
|
330 | } |
|
|
331 | $self->{fire_dir} = $dir->[0]; |
176 | } elsif ($mod & CFClient::KMOD_CTRL) { |
332 | } elsif ($mod & DC::KMOD_CTRL) { |
177 | $self->{ctrl}++; |
333 | $self->{ctrl}++; |
178 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
334 | $::CONN->user_send ("run $dir->[0]"); |
179 | } else { |
335 | } else { |
180 | $::CONN->user_send ("$DIR{$sym}[1]"); |
336 | $::CONN->user_send ("$dir->[1]"); |
181 | } |
337 | } |
182 | } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { |
338 | |
183 | $::BIND_EDITOR->set_binding (undef, undef, [], |
|
|
184 | sub { |
|
|
185 | my ($mod, $sym, $cmds) = @_; |
|
|
186 | $::CFG->{bindings}->{$mod}->{$sym} = $cmds; |
|
|
187 | }); |
|
|
188 | $::BIND_EDITOR->start; |
|
|
189 | $::BIND_EDITOR->show; |
|
|
190 | } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { |
|
|
191 | $::BIND_EDITOR->stop; |
|
|
192 | $::BIND_EDITOR->ask_for_bind_and_commit; |
|
|
193 | $::BIND_EDITOR->hide; |
|
|
194 | } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { |
|
|
195 | $::CONN->user_send ($_) for @$bind_cmd; |
|
|
196 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
|
|
197 | $self->{completer}->key_down ($ev); |
|
|
198 | $self->{completer}->show; |
|
|
199 | } else { |
|
|
200 | return 0; |
339 | return 1; |
201 | } |
|
|
202 | |
|
|
203 | 1 |
340 | } |
204 | } |
|
|
205 | |
341 | |
|
|
342 | 0 |
|
|
343 | } |
|
|
344 | |
206 | sub key_up { |
345 | sub invoke_key_up { |
207 | my ($self, $ev) = @_; |
346 | my ($self, $ev) = @_; |
208 | |
347 | |
209 | my $res = 0; |
348 | my $res = 0; |
210 | my $mod = $ev->{mod}; |
349 | my $mod = $ev->{mod}; |
211 | my $sym = $ev->{sym}; |
350 | my $sym = $ev->{sym}; |
212 | |
351 | |
|
|
352 | delete $self->{last_mod}; |
|
|
353 | delete $self->{last_sym}; |
|
|
354 | |
|
|
355 | if ($::CFG->{shift_fire_stop}) { |
213 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
356 | if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) { |
214 | $::CONN->user_send ("fire_stop"); |
357 | $::CONN->user_send ("fire_stop"); |
|
|
358 | delete $self->{fire_dir}; |
215 | $res = 1; |
359 | $res = 1; |
216 | } |
360 | } |
|
|
361 | } else { |
|
|
362 | my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" }; |
217 | |
363 | |
|
|
364 | if ($dir && delete $self->{shft}) { |
|
|
365 | $::CONN->user_send ("fire_stop"); |
|
|
366 | delete $self->{fire_dir}; |
|
|
367 | $res = 1; |
|
|
368 | } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) |
|
|
369 | && delete $self->{shft}) { # XXX: is RSHIFT ok? |
|
|
370 | $::CONN->user_send ("fire_stop"); |
|
|
371 | delete $self->{fire_dir}; |
|
|
372 | $res = 1; |
|
|
373 | } |
|
|
374 | } |
|
|
375 | |
218 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
376 | if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) { |
219 | $::CONN->user_send ("run_stop"); |
377 | $::CONN->user_send ("run_stop"); |
220 | $res = 1; |
378 | $res = 1; |
221 | } |
379 | } |
222 | |
380 | |
223 | $res |
381 | $res |
224 | } |
382 | } |
225 | |
383 | |
226 | sub draw { |
384 | sub invoke_visibility_change { |
|
|
385 | my ($self) = @_; |
|
|
386 | |
|
|
387 | $self->refresh_hook; |
|
|
388 | |
|
|
389 | 0 |
|
|
390 | } |
|
|
391 | |
|
|
392 | sub set_tilesize { |
|
|
393 | my ($self, $tilesize) = @_; |
|
|
394 | |
|
|
395 | $self->{tilesize} = $tilesize; |
|
|
396 | } |
|
|
397 | |
|
|
398 | sub scroll { |
227 | my ($self) = @_; |
399 | my ($self, $dx, $dy) = @_; |
228 | |
400 | |
229 | my $focused = $CFClient::UI::FOCUS == $self |
401 | $self->movement_update; |
230 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
|
|
231 | |
402 | |
232 | return |
403 | $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement |
233 | unless $focused || !$::FAST; |
404 | $self->{sdy} += $dy * $self->{tilesize}; |
234 | |
405 | |
|
|
406 | # save old fow texture, if applicable |
|
|
407 | $self->{last_fow_texture} = $self->{fow_texture} |
|
|
408 | if $::CFG->{smooth_transitions}; |
|
|
409 | $self->{lfdx} = $dx; |
|
|
410 | $self->{lfdy} = $dy; |
|
|
411 | $self->{lmdx} = $self->{dx}; |
|
|
412 | $self->{lmdy} = $self->{dy}; |
|
|
413 | |
|
|
414 | $::MAP->scroll ($dx, $dy); |
|
|
415 | } |
|
|
416 | |
|
|
417 | sub set_magicmap { |
|
|
418 | my ($self, $w, $h, $x, $y, $data) = @_; |
|
|
419 | |
|
|
420 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
|
|
421 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
|
|
422 | |
|
|
423 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
|
|
424 | |
|
|
425 | $self->update; |
|
|
426 | } |
|
|
427 | |
|
|
428 | sub movement_update { |
|
|
429 | my ($self) = @_; |
|
|
430 | |
|
|
431 | if ($::CFG->{smooth_movement}) { |
|
|
432 | if ($self->{sdx} || $self->{sdy}) { |
|
|
433 | my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); |
|
|
434 | my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; |
|
|
435 | |
|
|
436 | # the minimum time for a single tile movement |
|
|
437 | my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1); |
|
|
438 | |
|
|
439 | $spd *= $self->{tilesize}; |
|
|
440 | |
|
|
441 | # jump if "impossibly high" speed |
|
|
442 | if ( |
|
|
443 | (max abs $self->{sdx}, abs $self->{sdy}) |
|
|
444 | > $spd * $mintime * 2.1 |
|
|
445 | ) { |
|
|
446 | #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d# |
|
|
447 | $self->{sdx} = $self->{sdy} = 0; |
|
|
448 | } else { |
|
|
449 | $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction |
|
|
450 | |
|
|
451 | my $dx = $self->{sdx} < 0 ? -$spd : $spd; |
|
|
452 | my $dy = $self->{sdy} < 0 ? -$spd : $spd; |
|
|
453 | |
|
|
454 | if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx } |
|
|
455 | if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy } |
|
|
456 | } |
|
|
457 | |
|
|
458 | $self->update; |
|
|
459 | } |
|
|
460 | } else { |
|
|
461 | $self->{sdx} = $self->{sdy} = 0; |
|
|
462 | } |
|
|
463 | |
|
|
464 | $self->{last_update} = EV::time; |
|
|
465 | } |
|
|
466 | |
|
|
467 | sub refresh_hook { |
|
|
468 | my ($self) = @_; |
|
|
469 | |
|
|
470 | if ($::MAP && $::CONN) { |
235 | if (delete $self->{need_update}) { |
471 | if (delete $self->{need_update}) { |
236 | glNewList $self->{list}; |
472 | $self->movement_update; |
237 | |
473 | |
238 | if ($::MAP) { |
474 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
239 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
240 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
241 | |
475 | |
242 | my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; |
476 | my $sdx_t = DC::ceil $self->{sdx} / $tilesize; |
243 | my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; |
477 | my $sdy_t = DC::ceil $self->{sdy} / $tilesize; |
244 | |
478 | |
245 | glPushMatrix; |
479 | # width/height of map, in tiles |
246 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
480 | my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize; |
|
|
481 | my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize; |
247 | |
482 | |
248 | glTranslate $sx0 - 32, $sy0 - 32, 0; |
483 | # the map displacement, in tiles |
|
|
484 | my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t; |
|
|
485 | my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t; |
249 | |
486 | |
250 | my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); |
487 | # the upper left "visible" corner, in pixels |
|
|
488 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
|
|
489 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
|
|
490 | |
|
|
491 | my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
|
|
492 | my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
251 | |
493 | |
252 | if ($::CFG->{fow_enable}) { |
494 | if ($::CFG->{fow_enable}) { |
253 | if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
495 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
254 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
|
|
255 | glConvolutionFilter2D ( |
|
|
256 | GL_CONVOLUTION_2D, |
|
|
257 | GL_ALPHA, |
|
|
258 | 3, 3, |
|
|
259 | GL_ALPHA, GL_FLOAT, |
|
|
260 | pack "f*", |
|
|
261 | 0.05, 0.13, 0.05, |
|
|
262 | 0.13, 0.30, 0.13, |
|
|
263 | 0.05, 0.13, 0.05, |
|
|
264 | ); |
|
|
265 | glEnable GL_CONVOLUTION_2D; |
|
|
266 | } |
|
|
267 | |
496 | |
268 | $self->{fow_texture_name} ||= glGenTexture; |
|
|
269 | # try to re-use the texture name: TODO improve texture class instead |
|
|
270 | |
|
|
271 | $self->{fow_texture} = new CFClient::Texture |
497 | $self->{fow_texture} = new DC::Texture |
272 | w => $w, |
498 | w => $w, |
273 | h => $h, |
499 | h => $h, |
274 | data => $data, |
500 | data => $data, |
275 | name => $self->{fow_texture_name}, |
|
|
276 | internalformat => GL_ALPHA, |
501 | internalformat => GL_ALPHA, |
277 | format => GL_ALPHA; |
502 | format => GL_ALPHA; |
278 | |
503 | } else { |
279 | glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; |
504 | delete $self->{fow_texture}; |
280 | |
|
|
281 | glEnable GL_TEXTURE_2D; |
|
|
282 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
|
|
283 | |
|
|
284 | glColor +($::CFG->{fow_intensity}) x 3, 0.8; |
|
|
285 | $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); |
|
|
286 | |
|
|
287 | glDisable GL_TEXTURE_2D; |
|
|
288 | } |
505 | } |
289 | |
506 | |
|
|
507 | glNewList ($self->{list} ||= glGenList); |
|
|
508 | |
|
|
509 | glPushMatrix; |
|
|
510 | glTranslate $sx0, $sy0; |
|
|
511 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
|
|
512 | glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy}; |
|
|
513 | |
|
|
514 | $::MAP->draw ($dx, $dy, $sw, $sh, |
|
|
515 | $self->{tilesize}, |
|
|
516 | $::CONN->{player}{tag}, |
|
|
517 | -$self->{sdx}, -$self->{sdy}); |
|
|
518 | |
|
|
519 | glScale $self->{tilesize}, $self->{tilesize}; |
|
|
520 | |
|
|
521 | if (my $tex = $self->{fow_texture}) { |
|
|
522 | if ($DC::OpenGL::GL_MULTITEX && $self->{last_fow_texture}) {#d# |
|
|
523 | my $d1 = DC::distance $self->{sdx}, $self->{sdy}; |
|
|
524 | my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize; |
|
|
525 | |
|
|
526 | if ($d1 * $d2) { |
|
|
527 | DC::Texture::draw_fow_texture |
|
|
528 | $::CFG->{fow_intensity}, |
|
|
529 | @{$self->{fow_texture}}{qw(name s t w h)}, |
|
|
530 | (min 1, $d1 / $d2), |
|
|
531 | $self->{lmdx} - $dx - $self->{lfdx}, |
|
|
532 | $self->{lmdy} - $dy - $self->{lfdy}, |
|
|
533 | @{$self->{last_fow_texture}}{qw(name s t w h)}; |
|
|
534 | } else { |
|
|
535 | delete $self->{last_fow_texture}; |
|
|
536 | } |
|
|
537 | } |
|
|
538 | |
|
|
539 | unless ($self->{last_fow_texture}) { |
|
|
540 | DC::Texture::draw_fow_texture |
|
|
541 | $::CFG->{fow_intensity}, |
|
|
542 | @{$self->{fow_texture}}{qw(name s t w h)}; |
|
|
543 | } |
|
|
544 | } |
|
|
545 | |
|
|
546 | if ($self->{magicmap}) { |
|
|
547 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
|
|
548 | |
|
|
549 | $x += $::MAP->ox + $self->{dx}; |
|
|
550 | $y += $::MAP->oy + $self->{dy}; |
|
|
551 | |
|
|
552 | glTranslate - $x - 1, - $y - 1; |
|
|
553 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
|
|
554 | $::MAP->draw_magicmap ($w, $h, $data); |
|
|
555 | } |
|
|
556 | |
290 | glPopMatrix; |
557 | glPopMatrix; |
291 | } |
|
|
292 | |
|
|
293 | glEndList; |
558 | glEndList; |
|
|
559 | } |
|
|
560 | } else { |
|
|
561 | glDeleteList delete $self->{list} |
|
|
562 | if $self->{list}; |
294 | } |
563 | } |
|
|
564 | } |
295 | |
565 | |
296 | glPushMatrix; |
566 | sub draw { |
|
|
567 | my ($self) = @_; |
|
|
568 | |
|
|
569 | $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); |
|
|
570 | |
|
|
571 | return unless $self->{list}; |
|
|
572 | |
|
|
573 | my $focused = $DC::UI::FOCUS == $self |
|
|
574 | || $DC::UI::FOCUS == $::COMPLETER->{entry}; |
|
|
575 | |
|
|
576 | return |
|
|
577 | unless $focused || !$::FAST; |
|
|
578 | |
297 | glCallList $self->{list}; |
579 | glCallList $self->{list}; |
298 | glPopMatrix; |
|
|
299 | |
580 | |
300 | # TNT2 emulates logops in software (or worse :) |
581 | # TNT2 emulates logops in software (or worse :) |
301 | if ($focused) { |
582 | unless ($focused) { |
302 | (delete $self->{out_of_focus})->destroy |
583 | glColor_premultiply 0, 0, 1, 0.25; |
303 | if $self->{out_of_focus}; |
|
|
304 | } else { |
|
|
305 | glColor 0.4, 0.2, 0.2, 0.6; |
|
|
306 | glEnable GL_BLEND; |
584 | glEnable GL_BLEND; |
307 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
585 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
308 | glBegin GL_QUADS; |
586 | glBegin GL_QUADS; |
309 | glVertex 0, 0; |
587 | glVertex 0, 0; |
310 | glVertex 0, $::HEIGHT; |
588 | glVertex 0, $::HEIGHT; |
311 | glVertex $::WIDTH, $::HEIGHT; |
589 | glVertex $::WIDTH, $::HEIGHT; |
312 | glVertex $::WIDTH, 0; |
590 | glVertex $::WIDTH, 0; |
313 | glEnd; |
591 | glEnd; |
314 | glDisable GL_BLEND; |
592 | glDisable GL_BLEND; |
315 | |
|
|
316 | # $self->{out_of_focus} ||= do { |
|
|
317 | # my $label = new CFClient::UI::Label |
|
|
318 | # x => 0, |
|
|
319 | # y => 0, |
|
|
320 | # z => 1, |
|
|
321 | # ellipsise => 0, |
|
|
322 | # text => "map out of focus (click map to play)"; |
|
|
323 | # |
|
|
324 | # $label->show; |
|
|
325 | # $label->update; |
|
|
326 | # |
|
|
327 | # $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { |
|
|
328 | # $label->move_abs ( |
|
|
329 | # ($::WIDTH - $label->{w}) * 0.5, |
|
|
330 | # ($::HEIGHT - $label->{h}) * 0.5, |
|
|
331 | # ); |
|
|
332 | # }); |
|
|
333 | # |
|
|
334 | # $label |
|
|
335 | # }; |
|
|
336 | } |
593 | } |
337 | } |
594 | } |
338 | |
595 | |
339 | sub DESTROY { |
596 | sub DESTROY { |
340 | my $self = shift; |
597 | my $self = shift; |
… | |
… | |
342 | glDeleteList $self->{list}; |
599 | glDeleteList $self->{list}; |
343 | |
600 | |
344 | $self->SUPER::DESTROY; |
601 | $self->SUPER::DESTROY; |
345 | } |
602 | } |
346 | |
603 | |
347 | package CFClient::MapWidget::MapMap; |
604 | package DC::MapWidget::MapMap; |
348 | |
605 | |
|
|
606 | use strict; |
|
|
607 | use utf8; |
|
|
608 | |
349 | our @ISA = CFClient::UI::Base::; |
609 | our @ISA = DC::UI::Base::; |
350 | |
610 | |
351 | use Time::HiRes qw(time); |
611 | use Time::HiRes qw(time); |
352 | use CFClient::OpenGL; |
612 | use DC::OpenGL; |
353 | |
613 | |
354 | sub size_request { |
614 | sub size_request { |
355 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
615 | ($::HEIGHT * 0.2, $::HEIGHT * 0.2) |
356 | } |
616 | } |
357 | |
617 | |
|
|
618 | sub refresh_hook { |
|
|
619 | my ($self) = @_; |
|
|
620 | |
|
|
621 | if ($::MAP && $self->{texture_atime} < time) { |
|
|
622 | my ($w, $h) = @$self{qw(w h)}; |
|
|
623 | |
|
|
624 | return unless $w && $h; |
|
|
625 | |
|
|
626 | my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
|
|
627 | my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
|
|
628 | |
|
|
629 | my $ox = 0.5 * ($w - $sw); |
|
|
630 | my $oy = 0.5 * ($h - $sh); |
|
|
631 | |
|
|
632 | my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize}; |
|
|
633 | my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize}; |
|
|
634 | |
|
|
635 | #TODO: map scale is completely borked |
|
|
636 | |
|
|
637 | my $x0 = int $ox - $sx + 0.5; |
|
|
638 | my $y0 = int $oy - $sy + 0.5; |
|
|
639 | |
|
|
640 | $self->{sw} = $sw; |
|
|
641 | $self->{sh} = $sh; |
|
|
642 | |
|
|
643 | $self->{x0} = $x0; |
|
|
644 | $self->{y0} = $y0; |
|
|
645 | |
|
|
646 | $self->{texture_atime} = time + 1/3; |
|
|
647 | |
|
|
648 | $self->{texture} = |
|
|
649 | new DC::Texture |
|
|
650 | w => $w, |
|
|
651 | h => $h, |
|
|
652 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
|
|
653 | type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
|
|
654 | } |
|
|
655 | } |
|
|
656 | |
|
|
657 | sub invoke_visibility_change { |
|
|
658 | my ($self) = @_; |
|
|
659 | |
|
|
660 | $self->refresh_hook; |
|
|
661 | |
|
|
662 | 0 |
|
|
663 | } |
|
|
664 | |
358 | sub size_allocate { |
665 | sub invoke_size_allocate { |
359 | my ($self, $w, $h) = @_; |
666 | my ($self, $w, $h) = @_; |
360 | |
667 | |
361 | $self->SUPER::size_allocate ($w, $h); |
|
|
362 | $self->update; |
668 | $self->update; |
|
|
669 | |
|
|
670 | 1 |
363 | } |
671 | } |
364 | |
672 | |
365 | sub update { |
673 | sub update { |
366 | my ($self) = @_; |
674 | my ($self) = @_; |
367 | |
675 | |
… | |
… | |
370 | } |
678 | } |
371 | |
679 | |
372 | sub _draw { |
680 | sub _draw { |
373 | my ($self) = @_; |
681 | my ($self) = @_; |
374 | |
682 | |
375 | $::MAP or return; |
683 | $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook }); |
376 | |
684 | |
377 | my ($w, $h) = @$self{qw(w h)}; |
685 | $self->{texture} or return; |
378 | |
|
|
379 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
380 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
381 | |
|
|
382 | my $sx = int $::CFG->{map_shift_x} / 32; |
|
|
383 | my $sy = int $::CFG->{map_shift_y} / 32; |
|
|
384 | |
|
|
385 | my $ox = 0.5 * ($w - $sw); |
|
|
386 | my $oy = 0.5 * ($h - $sh); |
|
|
387 | |
686 | |
388 | glEnable GL_BLEND; |
687 | glEnable GL_BLEND; |
389 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
688 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
390 | glEnable GL_TEXTURE_2D; |
689 | glEnable GL_TEXTURE_2D; |
391 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
690 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
392 | |
691 | |
393 | if ($self->{texture_atime} < time) { |
|
|
394 | $self->{texture_atime} = time + 1/3; |
|
|
395 | |
|
|
396 | $self->{texture} = |
|
|
397 | new CFClient::Texture |
|
|
398 | w => $w, |
|
|
399 | h => $h, |
|
|
400 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
|
|
401 | type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
|
|
402 | } |
|
|
403 | |
|
|
404 | $self->{texture}->draw_quad (0, 0); |
692 | $self->{texture}->draw_quad (0, 0); |
405 | |
693 | |
406 | glDisable GL_TEXTURE_2D; |
694 | glDisable GL_TEXTURE_2D; |
407 | |
695 | |
408 | glTranslate 0.375, 0.375; |
696 | glTranslate 0.375, 0.375; |
409 | |
|
|
410 | #TODO: map scale is completely borked |
|
|
411 | |
|
|
412 | my $x0 = int $ox - $sx + 0.5; |
|
|
413 | my $y0 = int $oy - $sy + 0.5; |
|
|
414 | |
697 | |
415 | glColor 1, 1, 0, 1; |
698 | glColor 1, 1, 0, 1; |
416 | glBegin GL_LINE_LOOP; |
699 | glBegin GL_LINE_LOOP; |
417 | glVertex $x0 , $y0 ; |
700 | glVertex $self->{x0} , $self->{y0} ; |
418 | glVertex $x0 , $y0 + $sh; |
701 | glVertex $self->{x0} , $self->{y0} + $self->{sh}; |
419 | glVertex $x0 + $sw, $y0 + $sh; |
702 | glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh}; |
420 | glVertex $x0 + $sw, $y0 ; |
703 | glVertex $self->{x0} + $self->{sw}, $self->{y0} ; |
421 | glEnd; |
704 | glEnd; |
422 | |
705 | |
423 | glDisable GL_BLEND; |
706 | glDisable GL_BLEND; |
424 | } |
707 | } |
425 | |
708 | |
426 | package CFClient::MapWidget::Command; |
709 | package DC::MapWidget::Command; |
427 | |
710 | |
428 | use strict; |
711 | use strict; |
429 | |
712 | |
430 | use CFClient::OpenGL; |
713 | use DC::OpenGL; |
431 | |
714 | |
432 | our @ISA = CFClient::UI::Frame::; |
715 | our @ISA = DC::UI::Frame::; |
433 | |
716 | |
434 | sub new { |
717 | sub new { |
435 | my $class = shift; |
718 | my $class = shift; |
436 | |
719 | |
437 | my $self = $class->SUPER::new ( |
720 | my $self = $class->SUPER::new ( |
438 | bg => [0, 0, 0, 0.8], |
721 | bg => [0, 0, 0, 0.8], |
439 | @_, |
722 | @_, |
440 | ); |
723 | ); |
441 | |
724 | |
442 | $self->add ($self->{vbox} = new CFClient::UI::VBox); |
725 | $self->add ($self->{vbox} = new DC::UI::VBox); |
443 | |
726 | |
444 | $self->{label} = [ |
727 | $self->{label} = [ |
445 | map |
728 | map |
446 | CFClient::UI::Label->new ( |
729 | DC::UI::Label->new ( |
|
|
730 | align => 0, |
447 | can_hover => 1, |
731 | can_hover => 1, |
448 | can_events => 1, |
732 | can_events => 1, |
449 | tooltip_width => 0.33, |
733 | tooltip_width => 0.33, |
450 | fontsize => $_, |
734 | fontsize => $_, |
451 | ), (0.8) x 16 |
735 | ), (0.8) x 16 |
452 | ]; |
736 | ]; |
453 | |
737 | |
454 | $self->{entry} = new CFClient::UI::Entry |
738 | $self->{entry} = new DC::UI::Entry |
455 | on_changed => sub { |
739 | on_changed => sub { |
456 | $self->update_labels; |
740 | $self->update_labels; |
|
|
741 | 0 |
|
|
742 | }, |
|
|
743 | on_button_down => sub { |
|
|
744 | my ($entry, $ev, $x, $y) = @_; |
|
|
745 | |
|
|
746 | if ($ev->{button} == 3) { |
|
|
747 | (new DC::UI::Menu |
|
|
748 | items => [ |
|
|
749 | ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key" |
|
|
750 | => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
|
|
751 | ], |
|
|
752 | )->popup ($ev); |
|
|
753 | return 1; |
|
|
754 | } |
|
|
755 | 0 |
457 | }, |
756 | }, |
458 | on_key_down => sub { |
757 | on_key_down => sub { |
459 | my ($entry, $ev) = @_; |
758 | my ($entry, $ev) = @_; |
460 | |
759 | |
461 | my $self = $entry->{parent}{parent}; |
760 | my $self = $entry->{parent}{parent}; |
462 | |
761 | |
463 | if ($ev->{sym} == 13) { |
762 | if ($ev->{sym} == 13) { |
464 | if (exists $self->{select}) { |
763 | if (exists $self->{select}) { |
465 | $self->{last_command} = $self->{select}; |
764 | $self->{last_command} = $self->{select}; |
466 | $::CONN->user_send ($self->{select}); |
765 | $::CONN->user_send ($self->{select}); |
|
|
766 | |
|
|
767 | unshift @{$self->{history}}, $self->{entry}->get_text; |
|
|
768 | $self->{hist_ptr} = 0; |
|
|
769 | |
467 | $self->hide; |
770 | $self->hide; |
468 | } |
771 | } |
469 | } elsif ($ev->{sym} == 27) { |
772 | } elsif ($ev->{sym} == 27) { |
|
|
773 | $self->{hist_ptr} = 0; |
470 | $self->hide; |
774 | $self->hide; |
471 | return; |
|
|
472 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
775 | } elsif ($ev->{sym} == DC::SDLK_DOWN) { |
|
|
776 | if ($self->{hist_ptr} > 1) { |
|
|
777 | $self->{hist_ptr}--; |
|
|
778 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
|
|
779 | } elsif ($self->{hist_ptr} > 0) { |
|
|
780 | $self->{hist_ptr}--; |
|
|
781 | $self->{entry}->set_text ($self->{hist_saveback}); |
|
|
782 | } else { |
473 | ++$self->{select_offset} |
783 | ++$self->{select_offset} |
474 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
784 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
|
|
785 | } |
475 | $self->update_labels; |
786 | $self->update_labels; |
476 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
787 | } elsif ($ev->{sym} == DC::SDLK_UP) { |
|
|
788 | if ($self->{select_offset}) { |
477 | --$self->{select_offset} |
789 | --$self->{select_offset} |
|
|
790 | } else { |
|
|
791 | unless ($self->{hist_ptr}) { |
|
|
792 | $self->{hist_saveback} = $self->{entry}->get_text; |
|
|
793 | } |
|
|
794 | if ($self->{hist_ptr} <= $#{$self->{history}}) { |
478 | if $self->{select_offset}; |
795 | $self->{hist_ptr}++; |
|
|
796 | } |
|
|
797 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]) |
|
|
798 | if exists $self->{history}->[$self->{hist_ptr} - 1]; |
|
|
799 | } |
479 | $self->update_labels; |
800 | $self->update_labels; |
480 | } else { |
801 | } else { |
481 | return 0; |
802 | return 0; |
482 | } |
803 | } |
483 | |
804 | |
… | |
… | |
498 | |
819 | |
499 | $self->{entry}->set_text ($prefix); |
820 | $self->{entry}->set_text ($prefix); |
500 | $self->show; |
821 | $self->show; |
501 | } |
822 | } |
502 | |
823 | |
503 | sub size_allocate { |
824 | sub invoke_size_allocate { |
504 | my ($self, $w, $h) = @_; |
825 | my ($self, $w, $h) = @_; |
505 | |
826 | |
506 | $self->SUPER::size_allocate ($w, $h); |
|
|
507 | $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); |
827 | $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); |
|
|
828 | |
|
|
829 | $self->SUPER::invoke_size_allocate ($w, $h) |
508 | } |
830 | } |
509 | |
831 | |
510 | sub show { |
832 | sub show { |
511 | my ($self) = @_; |
833 | my ($self) = @_; |
512 | |
834 | |
513 | $self->SUPER::show; |
835 | $self->SUPER::show; |
514 | $self->{entry}->focus_in; |
836 | $self->{entry}->grab_focus; |
515 | } |
837 | } |
516 | |
838 | |
517 | sub hide { |
839 | sub hide { |
518 | my ($self) = @_; |
840 | my ($self) = @_; |
|
|
841 | |
|
|
842 | $self->{hist_ptr} = 0; |
519 | |
843 | |
520 | $self->SUPER::hide; |
844 | $self->SUPER::hide; |
521 | $self->{entry}->set_text (""); |
845 | $self->{entry}->set_text (""); |
522 | } |
846 | } |
523 | |
847 | |
524 | sub key_down { |
848 | sub inject_key_down { |
525 | my ($self, $ev) = @_; |
849 | my ($self, $ev) = @_; |
526 | |
850 | |
|
|
851 | $self->{entry}->grab_focus; |
527 | $self->{entry}->key_down ($ev) |
852 | $self->{entry}->emit (key_down => $ev); |
528 | } |
853 | } |
529 | |
854 | |
530 | sub update_labels { |
855 | sub update_labels { |
531 | my ($self) = @_; |
856 | my ($self) = @_; |
532 | |
857 | |
533 | my $text = $self->{entry}->get_text; |
858 | my $text = $self->{entry}->get_text; |
534 | |
859 | |
535 | length $text |
860 | length $text |
536 | or return $self->hide; |
861 | or return $self->hide; |
537 | |
862 | |
538 | my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; |
|
|
539 | |
|
|
540 | if ($text ne $self->{last_search}) { |
863 | if ($text ne $self->{last_search}) { |
541 | my @match; |
864 | my @match; |
542 | |
865 | |
543 | if ($text =~ /^(.*?)\s+$/) { |
866 | if ($text =~ /^(.*?)\s+$/) { |
|
|
867 | my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; |
544 | @match = [$cmd, "(appended whitespace suppresses completion)"]; |
868 | @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]); |
545 | } else { |
869 | } else { |
|
|
870 | # @match is [command, penalty, command with arguments] until sort |
|
|
871 | |
|
|
872 | my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; |
|
|
873 | |
546 | my $regexp = do { |
874 | my $regexp_abbrev = do { |
547 | my ($beg, @chr) = split //, lc $cmd; |
875 | my ($beg, @chr) = split //, lc $cmd; |
548 | |
876 | |
549 | # the following regex is used to match our "completion entry" |
877 | # the following regex is used to match our "completion entry" |
550 | # to an actual command - the parentheses match kind of "overhead" |
878 | # to an actual command - the parentheses match kind of "overhead" |
551 | # - the more characters the parentheses match, the less attractive |
879 | # - the more characters the parentheses match, the less attractive |
… | |
… | |
553 | my $regexp = "^\Q$beg\E" |
881 | my $regexp = "^\Q$beg\E" |
554 | . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; |
882 | . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; |
555 | qr<$regexp> |
883 | qr<$regexp> |
556 | }; |
884 | }; |
557 | |
885 | |
558 | my @penalty; |
886 | my $regexp_partial = do { |
|
|
887 | my $regexp = "^\Q$text\E(.*)"; |
|
|
888 | qr<$regexp> |
|
|
889 | }; |
559 | |
890 | |
560 | for (keys %{$self->{command}}) { |
891 | for (keys %{$self->{command}}) { |
561 | if (@penalty = $_ =~ $regexp) { |
892 | my @scores; |
562 | push @match, [$_, length join "", map "::$_", grep defined, @penalty]; |
893 | |
|
|
894 | # 1. Complete command [with args] |
|
|
895 | # command is a prefix of the text |
|
|
896 | # score is length of complete command matched |
|
|
897 | # e.g. "invoke summon pet monster bat" |
|
|
898 | # "invoke" "summon pet monster bat" = 6 |
|
|
899 | # "invoke summon pet monster" "bat" = 25 |
|
|
900 | if ($text =~ /^\Q$_\E(.*)/) { |
|
|
901 | push @scores, [$_, length $_, $text]; |
563 | } |
902 | } |
|
|
903 | |
|
|
904 | # 2. Partial command |
|
|
905 | # text is a prefix of the full command |
|
|
906 | # score is the length of the input text |
|
|
907 | # e.g. "invoke s" |
|
|
908 | # "invoke small fireball" = 8 |
|
|
909 | # "invoke summon pet monster" = 8 |
|
|
910 | |
|
|
911 | if ($_ =~ $regexp_partial) { |
|
|
912 | push @scores, [$_, length $text, $_]; |
|
|
913 | } |
|
|
914 | |
|
|
915 | # 3. Abbreviation match |
|
|
916 | # attempts to use first word of text as an abbreviated command |
|
|
917 | # score is length of word + 1 - 3 per non-word-initial character |
|
|
918 | |
|
|
919 | if (my @penalty = $_ =~ $regexp_abbrev) { |
|
|
920 | push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"]; |
|
|
921 | } |
|
|
922 | |
|
|
923 | # Pick the best option for this command |
|
|
924 | push @match, (sort { |
|
|
925 | $b->[1] <=> $a->[1] |
|
|
926 | } @scores)[0]; |
564 | } |
927 | } |
565 | |
928 | |
|
|
929 | # @match is now [command object, command with arguments] |
566 | @match = map $self->{command}{$_->[0]}, |
930 | @match = map [$self->{command}{$_->[0]}, $_->[2]], |
567 | sort { |
931 | sort { |
568 | $a->[1] <=> $b->[1] |
932 | $b->[1] <=> $a->[1] |
569 | or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] |
933 | or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] |
570 | or (length $b->[0]) <=> (length $a->[0]) |
934 | or (length $b->[0]) <=> (length $a->[0]) |
571 | } @match; |
935 | } @match; |
572 | } |
936 | } |
573 | |
937 | |
… | |
… | |
592 | $label->{fg} = [1, 1, 1, 1]; |
956 | $label->{fg} = [1, 1, 1, 1]; |
593 | $label->{bg} = [0, 0, 0, 0]; |
957 | $label->{bg} = [0, 0, 0, 0]; |
594 | } |
958 | } |
595 | |
959 | |
596 | if (@matches) { |
960 | if (@matches) { |
597 | $self->{select} = "$matches[0][0]$arg"; |
961 | $self->{select} = "$matches[0][1]"; |
598 | |
962 | |
599 | $labels[0]->{fg} = [0, 0, 0, 1]; |
963 | $labels[0]->{fg} = [0, 0, 0, 1]; |
600 | $labels[0]->{bg} = [1, 1, 1, 0.8]; |
964 | $labels[0]->{bg} = [1, 1, 1, 0.8]; |
601 | } else { |
965 | } else { |
602 | $self->{select} = "$cmd$arg"; |
966 | $self->{select} = "$text"; |
603 | } |
967 | } |
604 | |
968 | |
605 | for my $match (@matches) { |
969 | for my $match (@matches) { |
606 | my $label = shift @labels; |
970 | my $label = shift @labels; |
607 | |
971 | |
608 | if (@labels) { |
972 | if (@labels) { |
609 | $label->set_text ("$match->[0]$arg"); |
973 | $label->set_text ("$match->[1]"); |
610 | $label->set_tooltip ($match->[1]); |
974 | $label->set_tooltip ("$match->[0][1]"); |
611 | } else { |
975 | } else { |
612 | $label->set_text ("..."); |
976 | $label->set_text ("..."); |
613 | $label->set_tooltip ("Use Cursor-Down to view more matches"); |
977 | $label->set_tooltip ("Use Cursor-Down to view more matches"); |
614 | last; |
978 | last; |
615 | } |
979 | } |
… | |
… | |
619 | $label->set_text (""); |
983 | $label->set_text (""); |
620 | $label->set_tooltip (""); |
984 | $label->set_tooltip (""); |
621 | } |
985 | } |
622 | |
986 | |
623 | $self->update; |
987 | $self->update; |
624 | ### |
|
|
625 | } |
988 | } |
626 | |
989 | |
627 | sub _draw { |
990 | sub _draw { |
628 | my ($self) = @_; |
991 | my ($self) = @_; |
629 | |
992 | |
630 | # hack |
993 | # hack |
631 | local $CFClient::UI::FOCUS = $self->{entry}; |
994 | local $DC::UI::FOCUS = $self->{entry}; |
632 | |
995 | |
633 | $self->SUPER::_draw; |
996 | $self->SUPER::_draw; |
634 | } |
997 | } |
635 | |
998 | |
636 | 1 |
999 | 1 |
|
|
1000 | |