ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.41 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.124 by root, Wed Dec 26 18:09:30 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines