| 1 | package CFPlus::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 CFPlus; |
8 | use DC; |
| 9 | use CFPlus::OpenGL; |
9 | use DC::OpenGL; |
| 10 | use CFPlus::UI; |
10 | use DC::UI; |
| 11 | use CFPlus::Macro; |
11 | use DC::Macro; |
| 12 | |
12 | |
| 13 | our @ISA = CFPlus::UI::Base::; |
13 | our @ISA = DC::UI::Base::; |
| 14 | |
14 | |
| 15 | my $magicmap_tex = |
15 | my $magicmap_tex = |
| 16 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
16 | new_from_file DC::Texture DC::find_rcfile "magicmap.png", |
| 17 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
17 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
| 18 | |
18 | |
| 19 | sub new { |
19 | sub new { |
| 20 | my $class = shift; |
20 | my $class = shift; |
| 21 | |
21 | |
| … | |
… | |
| 24 | can_focus => 1, |
24 | can_focus => 1, |
| 25 | tilesize => 32, |
25 | tilesize => 32, |
| 26 | @_ |
26 | @_ |
| 27 | ); |
27 | ); |
| 28 | |
28 | |
| 29 | $self->{completer} = new CFPlus::MapWidget::Command:: |
|
|
| 30 | command => $self->{command}, |
|
|
| 31 | tooltip => "#completer_help", |
|
|
| 32 | ; |
|
|
| 33 | |
|
|
| 34 | $self |
29 | $self |
| 35 | } |
30 | } |
| 36 | |
31 | |
| 37 | sub set_tilesize { |
32 | sub set_tilesize { |
| 38 | my ($self, $tilesize) = @_; |
33 | my ($self, $tilesize) = @_; |
| … | |
… | |
| 47 | |
42 | |
| 48 | $tooltip =~ s/^\s+//; |
43 | $tooltip =~ s/^\s+//; |
| 49 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
44 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
| 50 | $tooltip =~ s/\s+$//; |
45 | $tooltip =~ s/\s+$//; |
| 51 | |
46 | |
| 52 | $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
47 | $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
| 53 | } |
48 | } |
| 54 | |
49 | |
| 55 | sub clr_commands { |
50 | sub clr_commands { |
| 56 | my ($self) = @_; |
51 | my ($self) = @_; |
| 57 | |
52 | |
| 58 | %{$self->{completer}{command}} = (); |
53 | %{$::COMPLETER->{command}} = (); |
| 59 | |
54 | |
| 60 | $self->{completer}->hide |
55 | $::COMPLETER->hide |
| 61 | if $self->{completer}; |
56 | if $::COMPLETER; |
| 62 | } |
57 | } |
| 63 | |
58 | |
| 64 | sub server_login { |
59 | sub server_login { |
| 65 | my ($server) = @_; |
60 | my ($server) = @_; |
| 66 | |
61 | |
| … | |
… | |
| 71 | |
66 | |
| 72 | sub editor_invoke { |
67 | sub editor_invoke { |
| 73 | my $editsup = $::CONN && $::CONN->{editor_support} |
68 | my $editsup = $::CONN && $::CONN->{editor_support} |
| 74 | or return; |
69 | or return; |
| 75 | |
70 | |
| 76 | CFPlus::background { |
71 | DC::background { |
| 77 | print "preparing editor startup...\n"; |
72 | print "preparing editor startup...\n"; |
| 78 | |
73 | |
| 79 | my $server = $editsup->{gameserver} || "default"; |
74 | my $server = $editsup->{gameserver} || "default"; |
| 80 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
75 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
| 81 | |
76 | |
| 82 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; |
77 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir; |
| 83 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; |
78 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir; |
| 84 | |
79 | |
| 85 | print "map directory is $mapdir\n"; |
80 | print "map directory is $mapdir\n"; |
| 86 | print "lib directory is $libdir\n"; |
81 | print "lib directory is $libdir\n"; |
| 87 | |
82 | |
| 88 | my $ua = CFPlus::lwp_useragent; |
83 | my $ua = DC::lwp_useragent; |
| 89 | |
84 | |
| 90 | for my $file (qw(archetypes crossfire.0)) { |
85 | for my $file (qw(archetypes crossfire.0)) { |
| 91 | my $url = "$editsup->{lib_root}$file"; |
86 | my $url = "$editsup->{lib_root}$file"; |
| 92 | print "mirroring $url...\n"; |
87 | print "mirroring $url...\n"; |
| 93 | CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); |
88 | DC::lwp_check $ua->mirror ($url, "$libdir/$file"); |
| 94 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
89 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
| 95 | } |
90 | } |
| 96 | |
91 | |
| 97 | if (1) { # upload a map |
92 | if (1) { # upload a map |
| 98 | my $mapname = $::CONN->{map_info}[0]; |
93 | my $mapname = $::CONN->{map_info}[0]; |
| … | |
… | |
| 103 | |
98 | |
| 104 | print "getting map revision for $mapname...\n"; |
99 | print "getting map revision for $mapname...\n"; |
| 105 | |
100 | |
| 106 | # try to get the most recent head revision, what a hack, |
101 | # try to get the most recent head revision, what a hack, |
| 107 | # this should have been returned while downloading *sigh* |
102 | # 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; |
103 | my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
| 109 | |
104 | |
| 110 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
105 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
| 111 | my $rev = $1; |
106 | my $rev = $1; |
| 112 | |
107 | |
| 113 | print "downloading revision $rev...\n"; |
108 | print "downloading revision $rev...\n"; |
| 114 | |
109 | |
| 115 | my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
110 | my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
| 116 | |
111 | |
| 117 | my $meta = { |
112 | my $meta = { |
| 118 | %$editsup, |
113 | %$editsup, |
| 119 | path => $mapname, |
114 | path => $mapname, |
| 120 | revision => $rev, |
115 | revision => $rev, |
| … | |
… | |
| 125 | require File::Path; |
120 | require File::Path; |
| 126 | |
121 | |
| 127 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
122 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
| 128 | open my $fh, ">:raw:perlio", "$mappath.meta" |
123 | open my $fh, ">:raw:perlio", "$mappath.meta" |
| 129 | or die "$mappath.meta: $!\n"; |
124 | or die "$mappath.meta: $!\n"; |
| 130 | print $fh CFPlus::to_json $meta; |
125 | print $fh DC::encode_json $meta; |
| 131 | close $fh; |
126 | close $fh; |
| 132 | open my $fh, ">:raw:perlio:utf8", $mappath |
127 | open my $fh, ">:raw:perlio:utf8", $mappath |
| 133 | or die "$mappath: $!\n"; |
128 | or die "$mappath: $!\n"; |
| 134 | print $fh $map; |
129 | print $fh $map; |
| 135 | close $fh; |
130 | close $fh; |
| … | |
… | |
| 176 | |
171 | |
| 177 | if ($ev->{button} == 1) { |
172 | if ($ev->{button} == 1) { |
| 178 | $self->grab_focus; |
173 | $self->grab_focus; |
| 179 | return unless $::CONN; |
174 | return unless $::CONN; |
| 180 | |
175 | |
| 181 | my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; |
176 | my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; |
| 182 | my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; |
177 | my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; |
| 183 | |
178 | |
| 184 | $x -= CFPlus::floor $::MAP->w * 0.5; |
179 | $x -= DC::floor $::MAP->w * 0.5; |
| 185 | $y -= CFPlus::floor $::MAP->h * 0.5; |
180 | $y -= DC::floor $::MAP->h * 0.5; |
| 186 | |
181 | |
| 187 | if ($::CONN) { |
182 | if ($::CONN) { |
| 188 | if ($::IN_BUILD_MODE) { |
|
|
| 189 | $::CONN->buildat ($::IN_BUILD_MODE, $x, $y); |
|
|
| 190 | } else { |
|
|
| 191 | $::CONN->lookat ($x, $y) |
183 | $::CONN->lookat ($x, $y) |
| 192 | } |
|
|
| 193 | } |
184 | } |
| 194 | |
185 | |
| 195 | } elsif ($ev->{button} == 2) { |
186 | } elsif ($ev->{button} == 2) { |
| 196 | $self->grab_focus; |
187 | $self->grab_focus; |
| 197 | return unless $::CONN; |
188 | return unless $::CONN; |
| … | |
… | |
| 215 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
206 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
| 216 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
207 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
| 217 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
208 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
| 218 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
209 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
| 219 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
210 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
| 220 | ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
211 | # ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
| 221 | [ |
212 | [ |
| 222 | $::PICKUP_ENABLE->{state} |
213 | $::PICKUP_ENABLE->{state} |
| 223 | ? "Disable automatic pickup" |
214 | ? "Disable automatic pickup" |
| 224 | : "Enable automatic pickup", |
215 | : "Enable automatic pickup", |
| 225 | sub { $::PICKUP_ENABLE->toggle } |
216 | sub { $::PICKUP_ENABLE->toggle } |
| 226 | ], |
217 | ], |
| 227 | ); |
218 | ); |
| 228 | |
219 | |
| 229 | if ($::CONN && $::CONN->{editor_support}) { |
220 | if ($::CONN && $::CONN->{editor_support}) { |
| 230 | push @items, [ |
221 | # push @items, [ |
| 231 | "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
222 | # "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", |
| 232 | \&editor_invoke, |
223 | # \&editor_invoke, |
| 233 | ]; |
224 | # ]; |
| 234 | |
225 | |
| 235 | for my $type (qw(test name)) { |
226 | for my $type (qw(test name)) { |
| 236 | $::CONN->{editor_support}{type} ne $type |
227 | $::CONN->{editor_support}{type} ne $type |
| 237 | or next; |
228 | or next; |
| 238 | my $server = $::CONN->{editor_support}{"${type}server"} |
229 | my $server = $::CONN->{editor_support}{"${type}server"} |
| 239 | or next; |
230 | or next; |
| 240 | |
231 | |
| 241 | push @items, [ |
232 | push @items, [ |
| 242 | "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", |
233 | "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>", |
| 243 | sub { server_login $server }, |
234 | sub { server_login $server }, |
| 244 | ]; |
235 | ]; |
| 245 | } |
236 | } |
| 246 | } |
237 | } |
| 247 | |
238 | |
| … | |
… | |
| 255 | } |
246 | } |
| 256 | } |
247 | } |
| 257 | ], |
248 | ], |
| 258 | ; |
249 | ; |
| 259 | |
250 | |
| 260 | (new CFPlus::UI::Menu |
251 | (new DC::UI::Menu |
| 261 | items => \@items, |
252 | items => \@items, |
| 262 | )->popup ($ev); |
253 | )->popup ($ev); |
| 263 | } |
254 | } |
| 264 | |
255 | |
| 265 | 1 |
256 | 1 |
| … | |
… | |
| 287 | |
278 | |
| 288 | sub size_request { |
279 | sub size_request { |
| 289 | my ($self) = @_; |
280 | my ($self) = @_; |
| 290 | |
281 | |
| 291 | ( |
282 | ( |
| 292 | $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize}, |
283 | $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize}, |
| 293 | $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize}, |
284 | $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize}, |
| 294 | ) |
285 | ) |
| 295 | } |
286 | } |
| 296 | |
287 | |
| 297 | sub update { |
288 | sub update { |
| 298 | my ($self) = @_; |
289 | my ($self) = @_; |
| … | |
… | |
| 300 | $self->{need_update} = 1; |
291 | $self->{need_update} = 1; |
| 301 | $self->SUPER::update; |
292 | $self->SUPER::update; |
| 302 | } |
293 | } |
| 303 | |
294 | |
| 304 | my %DIR = ( |
295 | my %DIR = ( |
| 305 | ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"], |
296 | ( "," . DC::SDLK_KP5 ), [0, "stay fire"], |
| 306 | ( "," . CFPlus::SDLK_KP8 ), [1, "north"], |
297 | ( "," . DC::SDLK_KP8 ), [1, "north"], |
| 307 | ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"], |
298 | ( "," . DC::SDLK_KP9 ), [2, "northeast"], |
| 308 | ( "," . CFPlus::SDLK_KP6 ), [3, "east"], |
299 | ( "," . DC::SDLK_KP6 ), [3, "east"], |
| 309 | ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"], |
300 | ( "," . DC::SDLK_KP3 ), [4, "southeast"], |
| 310 | ( "," . CFPlus::SDLK_KP2 ), [5, "south"], |
301 | ( "," . DC::SDLK_KP2 ), [5, "south"], |
| 311 | ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"], |
302 | ( "," . DC::SDLK_KP1 ), [6, "southwest"], |
| 312 | ( "," . CFPlus::SDLK_KP4 ), [7, "west"], |
303 | ( "," . DC::SDLK_KP4 ), [7, "west"], |
| 313 | ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"], |
304 | ( "," . DC::SDLK_KP7 ), [8, "northwest"], |
| 314 | |
305 | |
| 315 | ( "," . CFPlus::SDLK_UP ), [1, "north"], |
306 | ( "," . DC::SDLK_UP ), [1, "north"], |
| 316 | ("1," . CFPlus::SDLK_UP ), [2, "northeast"], |
307 | ("1," . DC::SDLK_UP ), [2, "northeast"], |
| 317 | ( "," . CFPlus::SDLK_RIGHT), [3, "east"], |
308 | ( "," . DC::SDLK_RIGHT), [3, "east"], |
| 318 | ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"], |
309 | ("1," . DC::SDLK_RIGHT), [4, "southeast"], |
| 319 | ( "," . CFPlus::SDLK_DOWN ), [5, "south"], |
310 | ( "," . DC::SDLK_DOWN ), [5, "south"], |
| 320 | ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"], |
311 | ("1," . DC::SDLK_DOWN ), [6, "southwest"], |
| 321 | ( "," . CFPlus::SDLK_LEFT ), [7, "west"], |
312 | ( "," . DC::SDLK_LEFT ), [7, "west"], |
| 322 | ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"], |
313 | ("1," . DC::SDLK_LEFT ), [8, "northwest"], |
| 323 | ); |
314 | ); |
| 324 | |
315 | |
| 325 | sub invoke_key_down { |
316 | sub invoke_key_down { |
| 326 | my ($self, $ev) = @_; |
317 | my ($self, $ev) = @_; |
| 327 | |
318 | |
| 328 | my $mod = $ev->{mod}; |
319 | my $mod = $ev->{mod}; |
| 329 | my $sym = $ev->{sym}; |
320 | my $sym = $ev->{sym}; |
| 330 | my $uni = $ev->{unicode}; |
321 | my $uni = $ev->{unicode}; |
| 331 | |
322 | |
| 332 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
323 | $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT; |
| 333 | |
324 | |
| 334 | if ($sym == 9) { |
325 | # ignore repeated keypresses |
| 335 | ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility; |
326 | return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; |
| 336 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
327 | $self->{last_mod} = $mod; |
| 337 | $::HELP_WINDOW->toggle_visibility; |
328 | $self->{last_sym} = $sym; |
| 338 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
|
|
| 339 | ::toggle_player_page ($::STATS_PAGE); |
|
|
| 340 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
|
|
| 341 | ::toggle_player_page ($::SKILL_PAGE); |
|
|
| 342 | } elsif ($sym == CFPlus::SDLK_F4 && !$mod) { |
|
|
| 343 | ::toggle_player_page ($::SPELL_PAGE); |
|
|
| 344 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
|
|
| 345 | ::toggle_player_page ($::INVENTORY_PAGE); |
|
|
| 346 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
|
|
| 347 | $::SETUP_DIALOG->toggle_visibility; |
|
|
| 348 | } elsif (!$::CONN) { |
|
|
| 349 | return 0; # bindings further down need a valid connection |
|
|
| 350 | |
329 | |
| 351 | } elsif ($uni == ord ",") { |
|
|
| 352 | $::CONN->user_send ("take"); |
|
|
| 353 | } elsif ($uni == ord " ") { |
|
|
| 354 | $::CONN->user_send ("apply"); |
|
|
| 355 | } elsif ($uni == 13) { |
|
|
| 356 | $::CONN->user_send ("examine"); |
|
|
| 357 | } elsif ($uni == ord ".") { |
|
|
| 358 | $::CONN->user_send ($self->{completer}{last_command}) |
|
|
| 359 | if exists $self->{completer}{last_command}; |
|
|
| 360 | } elsif (my @macros = CFPlus::Macro::match_event $ev) { |
|
|
| 361 | $::CONN->macro_send ($_) for @macros; |
|
|
| 362 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
|
|
| 363 | $::CONN->user_send ("rotateshoottype +"); |
|
|
| 364 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
|
|
| 365 | $::CONN->user_send ("rotateshoottype -"); |
|
|
| 366 | } elsif ($uni == ord '!') { |
|
|
| 367 | $self->{completer}->set_prefix ("shout "); |
|
|
| 368 | $self->{completer}->show; |
|
|
| 369 | } elsif ($uni == ord '"') { |
|
|
| 370 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
|
|
| 371 | $self->{completer}->show; |
|
|
| 372 | } elsif ($uni == ord "'") { |
|
|
| 373 | $self->{completer}->set_prefix (""); |
|
|
| 374 | $self->{completer}->show; |
|
|
| 375 | } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) { |
330 | if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) { |
| 376 | if ($mod & CFPlus::KMOD_SHIFT) { |
331 | if ($mod & DC::KMOD_SHIFT) { |
| 377 | $self->{shft}++; |
332 | $self->{shft}++; |
| 378 | if ($dir->[0] != $self->{fire_dir}) { |
333 | if ($dir->[0] != $self->{fire_dir}) { |
| 379 | $::CONN->user_send ("fire $dir->[0]"); |
334 | $::CONN->user_send ("fire $dir->[0]"); |
| 380 | } |
335 | } |
| 381 | $self->{fire_dir} = $DIR{$sym}[0]; |
336 | $self->{fire_dir} = $dir->[0]; |
| 382 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
337 | } elsif ($mod & DC::KMOD_CTRL) { |
| 383 | $self->{ctrl}++; |
338 | $self->{ctrl}++; |
| 384 | $::CONN->user_send ("run $dir->[0]"); |
339 | $::CONN->user_send ("run $dir->[0]"); |
| 385 | } else { |
340 | } else { |
| 386 | $::CONN->user_send ("$dir->[1]"); |
341 | $::CONN->user_send ("$dir->[1]"); |
| 387 | } |
342 | } |
| 388 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
343 | |
| 389 | $self->{completer}->inject_key_down ($ev); |
|
|
| 390 | $self->{completer}->show; |
|
|
| 391 | } else { |
|
|
| 392 | return 0; |
344 | return 1; |
| 393 | } |
|
|
| 394 | |
|
|
| 395 | 1 |
345 | } |
|
|
346 | |
|
|
347 | 0 |
| 396 | } |
348 | } |
| 397 | |
349 | |
| 398 | sub invoke_key_up { |
350 | sub invoke_key_up { |
| 399 | my ($self, $ev) = @_; |
351 | my ($self, $ev) = @_; |
| 400 | |
352 | |
| 401 | my $res = 0; |
353 | my $res = 0; |
| 402 | my $mod = $ev->{mod}; |
354 | my $mod = $ev->{mod}; |
| 403 | my $sym = $ev->{sym}; |
355 | my $sym = $ev->{sym}; |
| 404 | |
356 | |
| 405 | if ($::CFG->{shift_fire_stop}) { |
357 | if ($::CFG->{shift_fire_stop}) { |
| 406 | if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { |
358 | if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) { |
| 407 | $::CONN->user_send ("fire_stop"); |
359 | $::CONN->user_send ("fire_stop"); |
| 408 | delete $self->{fire_dir}; |
360 | delete $self->{fire_dir}; |
| 409 | $res = 1; |
361 | $res = 1; |
| 410 | } |
362 | } |
| 411 | } else { |
363 | } else { |
| 412 | if (exists $DIR{$sym} && delete $self->{shft}) { |
364 | if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { |
| 413 | $::CONN->user_send ("fire_stop"); |
365 | $::CONN->user_send ("fire_stop"); |
| 414 | delete $self->{fire_dir}; |
366 | delete $self->{fire_dir}; |
| 415 | $res = 1; |
367 | $res = 1; |
| 416 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
368 | } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) |
|
|
369 | && delete $self->{shft}) { # XXX: is RSHIFT ok? |
| 417 | $::CONN->user_send ("fire_stop"); |
370 | $::CONN->user_send ("fire_stop"); |
| 418 | delete $self->{fire_dir}; |
371 | delete $self->{fire_dir}; |
| 419 | $res = 1; |
372 | $res = 1; |
| 420 | } |
373 | } |
| 421 | } |
374 | } |
| 422 | |
375 | |
| 423 | if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { |
376 | if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) { |
| 424 | $::CONN->user_send ("run_stop"); |
377 | $::CONN->user_send ("run_stop"); |
| 425 | $res = 1; |
378 | $res = 1; |
| 426 | } |
379 | } |
| 427 | |
380 | |
| 428 | $res |
381 | $res |
| … | |
… | |
| 448 | } |
401 | } |
| 449 | |
402 | |
| 450 | sub refresh_hook { |
403 | sub refresh_hook { |
| 451 | my ($self) = @_; |
404 | my ($self) = @_; |
| 452 | |
405 | |
| 453 | if ($::MAP) { |
406 | if ($::MAP && $::CONN) { |
| 454 | if (delete $self->{need_update}) { |
407 | if (delete $self->{need_update}) { |
| 455 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
408 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
| 456 | |
409 | |
| 457 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
410 | my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; |
| 458 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
411 | my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; |
| 459 | |
412 | |
| 460 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
413 | my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize; |
| 461 | my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
414 | my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize; |
| 462 | |
415 | |
| 463 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
416 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
| 464 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
417 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
| 465 | |
418 | |
| 466 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
419 | my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
| 467 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
420 | my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
| 468 | |
421 | |
| 469 | if ($::CFG->{fow_enable}) { |
422 | if ($::CFG->{fow_enable}) { |
| 470 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
423 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
| 471 | |
424 | |
| 472 | $self->{fow_texture} = new CFPlus::Texture |
425 | $self->{fow_texture} = new DC::Texture |
| 473 | w => $w, |
426 | w => $w, |
| 474 | h => $h, |
427 | h => $h, |
| 475 | data => $data, |
428 | data => $data, |
| 476 | internalformat => GL_ALPHA, |
429 | internalformat => GL_ALPHA, |
| 477 | format => GL_ALPHA; |
430 | format => GL_ALPHA; |
| … | |
… | |
| 527 | |
480 | |
| 528 | $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); |
481 | $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); |
| 529 | |
482 | |
| 530 | return unless $self->{list}; |
483 | return unless $self->{list}; |
| 531 | |
484 | |
| 532 | my $focused = $CFPlus::UI::FOCUS == $self |
485 | my $focused = $DC::UI::FOCUS == $self |
| 533 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
486 | || $DC::UI::FOCUS == $::COMPLETER->{entry}; |
| 534 | |
487 | |
| 535 | return |
488 | return |
| 536 | unless $focused || !$::FAST; |
489 | unless $focused || !$::FAST; |
| 537 | |
490 | |
| 538 | glCallList $self->{list}; |
491 | glCallList $self->{list}; |
| 539 | |
492 | |
| 540 | # TNT2 emulates logops in software (or worse :) |
493 | # TNT2 emulates logops in software (or worse :) |
| 541 | unless ($focused) { |
494 | unless ($focused) { |
| 542 | glColor 0.4, 0.2, 0.2, 0.6; |
495 | glColor_premultiply 0, 0, 1, 0.25; |
| 543 | glEnable GL_BLEND; |
496 | glEnable GL_BLEND; |
| 544 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
497 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
| 545 | glBegin GL_QUADS; |
498 | glBegin GL_QUADS; |
| 546 | glVertex 0, 0; |
499 | glVertex 0, 0; |
| 547 | glVertex 0, $::HEIGHT; |
500 | glVertex 0, $::HEIGHT; |
| 548 | glVertex $::WIDTH, $::HEIGHT; |
501 | glVertex $::WIDTH, $::HEIGHT; |
| 549 | glVertex $::WIDTH, 0; |
502 | glVertex $::WIDTH, 0; |
| … | |
… | |
| 558 | glDeleteList $self->{list}; |
511 | glDeleteList $self->{list}; |
| 559 | |
512 | |
| 560 | $self->SUPER::DESTROY; |
513 | $self->SUPER::DESTROY; |
| 561 | } |
514 | } |
| 562 | |
515 | |
| 563 | package CFPlus::MapWidget::MapMap; |
516 | package DC::MapWidget::MapMap; |
| 564 | |
517 | |
| 565 | use strict; |
518 | use strict; |
| 566 | use utf8; |
519 | use utf8; |
| 567 | |
520 | |
| 568 | our @ISA = CFPlus::UI::Base::; |
521 | our @ISA = DC::UI::Base::; |
| 569 | |
522 | |
| 570 | use Time::HiRes qw(time); |
523 | use Time::HiRes qw(time); |
| 571 | use CFPlus::OpenGL; |
524 | use DC::OpenGL; |
| 572 | |
525 | |
| 573 | sub size_request { |
526 | sub size_request { |
| 574 | ($::HEIGHT * 0.2, $::HEIGHT * 0.2) |
527 | ($::HEIGHT * 0.2, $::HEIGHT * 0.2) |
| 575 | } |
528 | } |
| 576 | |
529 | |
| … | |
… | |
| 601 | $self->{y0} = $y0; |
554 | $self->{y0} = $y0; |
| 602 | |
555 | |
| 603 | $self->{texture_atime} = time + 1/3; |
556 | $self->{texture_atime} = time + 1/3; |
| 604 | |
557 | |
| 605 | $self->{texture} = |
558 | $self->{texture} = |
| 606 | new CFPlus::Texture |
559 | new DC::Texture |
| 607 | w => $w, |
560 | w => $w, |
| 608 | h => $h, |
561 | h => $h, |
| 609 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
562 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
| 610 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
563 | type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
| 611 | } |
564 | } |
| 612 | } |
565 | } |
| 613 | |
566 | |
| 614 | sub invoke_visibility_change { |
567 | sub invoke_visibility_change { |
| 615 | my ($self) = @_; |
568 | my ($self) = @_; |
| … | |
… | |
| 661 | glEnd; |
614 | glEnd; |
| 662 | |
615 | |
| 663 | glDisable GL_BLEND; |
616 | glDisable GL_BLEND; |
| 664 | } |
617 | } |
| 665 | |
618 | |
| 666 | package CFPlus::MapWidget::Command; |
619 | package DC::MapWidget::Command; |
| 667 | |
620 | |
| 668 | use strict; |
621 | use strict; |
| 669 | |
622 | |
| 670 | use CFPlus::OpenGL; |
623 | use DC::OpenGL; |
| 671 | |
624 | |
| 672 | our @ISA = CFPlus::UI::Frame::; |
625 | our @ISA = DC::UI::Frame::; |
| 673 | |
626 | |
| 674 | sub new { |
627 | sub new { |
| 675 | my $class = shift; |
628 | my $class = shift; |
| 676 | |
629 | |
| 677 | my $self = $class->SUPER::new ( |
630 | my $self = $class->SUPER::new ( |
| 678 | bg => [0, 0, 0, 0.8], |
631 | bg => [0, 0, 0, 0.8], |
| 679 | @_, |
632 | @_, |
| 680 | ); |
633 | ); |
| 681 | |
634 | |
| 682 | $self->add ($self->{vbox} = new CFPlus::UI::VBox); |
635 | $self->add ($self->{vbox} = new DC::UI::VBox); |
| 683 | |
636 | |
| 684 | $self->{label} = [ |
637 | $self->{label} = [ |
| 685 | map |
638 | map |
| 686 | CFPlus::UI::Label->new ( |
639 | DC::UI::Label->new ( |
|
|
640 | align => 0, |
| 687 | can_hover => 1, |
641 | can_hover => 1, |
| 688 | can_events => 1, |
642 | can_events => 1, |
| 689 | tooltip_width => 0.33, |
643 | tooltip_width => 0.33, |
| 690 | fontsize => $_, |
644 | fontsize => $_, |
| 691 | ), (0.8) x 16 |
645 | ), (0.8) x 16 |
| 692 | ]; |
646 | ]; |
| 693 | |
647 | |
| 694 | $self->{entry} = new CFPlus::UI::Entry |
648 | $self->{entry} = new DC::UI::Entry |
| 695 | on_changed => sub { |
649 | on_changed => sub { |
| 696 | $self->update_labels; |
650 | $self->update_labels; |
| 697 | 0 |
651 | 0 |
| 698 | }, |
652 | }, |
| 699 | on_button_down => sub { |
653 | on_button_down => sub { |
| 700 | my ($entry, $ev, $x, $y) = @_; |
654 | my ($entry, $ev, $x, $y) = @_; |
| 701 | |
655 | |
| 702 | if ($ev->{button} == 3) { |
656 | if ($ev->{button} == 3) { |
| 703 | (new CFPlus::UI::Menu |
657 | (new DC::UI::Menu |
| 704 | items => [ |
658 | items => [ |
| 705 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
659 | ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key" |
| 706 | => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
660 | => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
| 707 | ], |
661 | ], |
| 708 | )->popup ($ev); |
662 | )->popup ($ev); |
| 709 | return 1; |
663 | return 1; |
| 710 | } |
664 | } |
| 711 | 0 |
665 | 0 |
| … | |
… | |
| 726 | $self->hide; |
680 | $self->hide; |
| 727 | } |
681 | } |
| 728 | } elsif ($ev->{sym} == 27) { |
682 | } elsif ($ev->{sym} == 27) { |
| 729 | $self->{hist_ptr} = 0; |
683 | $self->{hist_ptr} = 0; |
| 730 | $self->hide; |
684 | $self->hide; |
| 731 | } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { |
685 | } elsif ($ev->{sym} == DC::SDLK_DOWN) { |
| 732 | if ($self->{hist_ptr} > 1) { |
686 | if ($self->{hist_ptr} > 1) { |
| 733 | $self->{hist_ptr}--; |
687 | $self->{hist_ptr}--; |
| 734 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
688 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
| 735 | } elsif ($self->{hist_ptr} > 0) { |
689 | } elsif ($self->{hist_ptr} > 0) { |
| 736 | $self->{hist_ptr}--; |
690 | $self->{hist_ptr}--; |
| … | |
… | |
| 738 | } else { |
692 | } else { |
| 739 | ++$self->{select_offset} |
693 | ++$self->{select_offset} |
| 740 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
694 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
| 741 | } |
695 | } |
| 742 | $self->update_labels; |
696 | $self->update_labels; |
| 743 | } elsif ($ev->{sym} == CFPlus::SDLK_UP) { |
697 | } elsif ($ev->{sym} == DC::SDLK_UP) { |
| 744 | if ($self->{select_offset}) { |
698 | if ($self->{select_offset}) { |
| 745 | --$self->{select_offset} |
699 | --$self->{select_offset} |
| 746 | } else { |
700 | } else { |
| 747 | unless ($self->{hist_ptr}) { |
701 | unless ($self->{hist_ptr}) { |
| 748 | $self->{hist_saveback} = $self->{entry}->get_text; |
702 | $self->{hist_saveback} = $self->{entry}->get_text; |
| … | |
… | |
| 906 | |
860 | |
| 907 | sub _draw { |
861 | sub _draw { |
| 908 | my ($self) = @_; |
862 | my ($self) = @_; |
| 909 | |
863 | |
| 910 | # hack |
864 | # hack |
| 911 | local $CFPlus::UI::FOCUS = $self->{entry}; |
865 | local $DC::UI::FOCUS = $self->{entry}; |
| 912 | |
866 | |
| 913 | $self->SUPER::_draw; |
867 | $self->SUPER::_draw; |
| 914 | } |
868 | } |
| 915 | |
869 | |
| 916 | 1 |
870 | 1 |
