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.60 by root, Thu Jun 15 08:29:18 2006 UTC vs.
Revision 1.84 by root, Sun Oct 1 18:17:38 2006 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;
9 11
10our @ISA = CFClient::UI::Base::; 12our @ISA = CFPlus::UI::Base::;
13
14my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11 17
12sub new { 18sub new {
13 my $class = shift; 19 my $class = shift;
14 20
15 my $self = $class->SUPER::new ( 21 my $self = $class->SUPER::new (
… …
24 ], 30 ],
25 31
26 @_ 32 @_
27 ); 33 );
28 34
29 $self->{completer} = new CFClient::MapWidget::Command:: 35 $self->{completer} = new CFPlus::MapWidget::Command::
30 command => $self->{command}, 36 command => $self->{command},
31 can_focus => 1, 37 tooltip => "#completer_help",
32 tooltip => "<b>The Command Completer</b>\n\n"
33 . "This is your central interface to send text commands to the server. "
34 . "To enter a verbatim command to send to the server, just type the command, "
35 . "followed by a space, and press return. "
36 . "Typing the initial letters of words (or just any letters) displays guesses "
37 . "for commands you might want to use.\n"
38 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
39 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
40 ; 38 ;
41 39
42 $self 40 $self
43} 41}
44 42
… …
56 54
57sub clr_commands { 55sub clr_commands {
58 my ($self) = @_; 56 my ($self) = @_;
59 57
60 %{$self->{completer}{command}} = (); 58 %{$self->{completer}{command}} = ();
61}
62 59
60 $self->{completer}->hide
61 if $self->{completer};
62}
63
64sub test_server_login {
65 return unless
66 $::CONN && length $::CONN->{test_server};
67
68 my $server = $::CONN->{test_server};
69 ::stop_game ();
70 local $::PROFILE->{host} = $server;
71 ::start_game ();
72}
73
74sub editor_invoke {
75 return unless $::CONN;
76
77 # putting the password into the env is somewhat tasteless
78 local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user};
79 local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password};
80 local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload};
81 local $ENV{CROSSFIRE_MAPDIR} = $::CONN->{cvs_root};
82
83 CFPlus::set_proxy;
84
85 my $map = "map:$::CONN->{map_info}[0]";
86
87 if (fork == 0) {
88 $SIG{__DIE__} = sub {
89 warn "@_";
90 CFPlus::_exit 99;
91 };
92
93 # TODO: move into editor
94 require LWP::UserAgent;
95
96 my $ua = LWP::UserAgent->new (
97 agent => "cfplus $CFPlus::VERSION",
98 keep_alive => 1,
99 env_proxy => 1,
100 );
101
102 if ($map =~ /^map:(.*)/) {
103 my $mapname = $1;
104 # try to get the most recent head revision, what a hack
105 my $log = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?view=log&logsort=rev")->decoded_content;
106
107 if ($log =~ /\?rev=(\d+\.\d+)"/) {
108 my $rev = $1;
109 my $map = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?rev=$rev")->decoded_content;
110 warn "revision is $rev " .(length $map)."\n";#d#
111
112 # now upload it
113 my $comment = "some comment";
114
115 require HTTP::Request::Common;
116
117 my $res = $ua->post (
118 $ENV{CFPLUS_UPLOAD},
119 Content_Type => 'multipart/form-data',
120 Content => [
121 path => $mapname,
122 mapdir => $ENV{CROSSFIRE_MAPDIR},
123 map => $map,
124 revision => $rev,
125 cf_login => $ENV{CFPLUS_LOGIN},
126 cf_password => $ENV{CFPLUS_PASSWORD},
127 comment => "",
128 ]
129 );
130
131 if ($res->is_error) {
132 # fatal condition
133 warn $res->status_line;
134 } else {
135 # script replies are marked as {{..}}
136 my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
137 warn map "$_\n", @msgs;
138 }
139 } else {
140 # error, could not detect revision
141 }
142 }
143
144 CFPlus::_exit;
145 }
146}
147
63sub button_down { 148sub invoke_button_down {
64 my ($self, $ev, $x, $y) = @_; 149 my ($self, $ev, $x, $y) = @_;
65 150
66 return unless $::CONN;
67
68 $self->focus_in;
69
70 if ($ev->{button} == 1) { 151 if ($ev->{button} == 1) {
152 $self->grab_focus;
153 return unless $::CONN;
154
71 my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 155 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
72 my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 156 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
73 157
74 $x -= int 0.5 * $self->{sw}; 158 $x -= int 0.5 * $self->{sw};
75 $y -= int 0.5 * $self->{sh}; 159 $y -= int 0.5 * $self->{sh};
76 160
77 $::CONN->lookat ($x, $y) 161 $::CONN->lookat ($x, $y)
78 if $::CONN; 162 if $::CONN;
79 163
80 } elsif ($ev->{button} == 2) { 164 } elsif ($ev->{button} == 2) {
165 $self->grab_focus;
166 return unless $::CONN;
167
81 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 168 my ($ox, $oy) = ($ev->{x}, $ev->{y});
82 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 169 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
83 170
84 $self->{motion} = sub { 171 $self->{motion} = sub {
85 my ($ev, $x, $y) = @_; 172 my ($ev, $x, $y) = @_;
… …
89 $::CFG->{map_shift_x} = $bw + $x - $ox; 176 $::CFG->{map_shift_x} = $bw + $x - $ox;
90 $::CFG->{map_shift_y} = $bh + $y - $oy; 177 $::CFG->{map_shift_y} = $bh + $y - $oy;
91 178
92 $self->update; 179 $self->update;
93 }; 180 };
181 } elsif ($ev->{button} == 3) {
182 (new CFPlus::UI::Menu
183 items => [
184 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
185 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
186 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
187 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
188 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
189 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
190 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
191 [
192 $::PICKUP_ENABLE->{state}
193 ? "Disable automatic pickup"
194 : "Enable automatic pickup",
195 sub { $::PICKUP_ENABLE->toggle }
196 ],
197 $::CONN && length $::CONN->{cvs_root}
198 ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
199 \&editor_invoke]
200 : (),
201 $::CONN && length $::CONN->{test_server}
202 ? ["Login on Test Server <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{test_server}) . ")</span>",
203 \&test_server_login]
204 : (),
205 ["Quit",
206 sub {
207 if ($::CONN) {
208 &::open_quit_dialog;
209 } else {
210 exit;
211 }
212 }
213 ],
214 ],
215 )->popup ($ev);
94 } 216 }
95 217
96 1 218 1
97} 219}
98 220
99sub button_up { 221sub invoke_button_up {
100 my ($self, $ev, $x, $y) = @_; 222 my ($self, $ev, $x, $y) = @_;
101 223
102 delete $self->{motion}; 224 delete $self->{motion};
103 225
104 1 226 1
105} 227}
106 228
107sub mouse_motion { 229sub invoke_mouse_motion {
108 my ($self, $ev, $x, $y) = @_; 230 my ($self, $ev, $x, $y) = @_;
109 231
110 if ($self->{motion}) { 232 if ($self->{motion}) {
111 $self->{motion}->($ev, $x, $y); 233 $self->{motion}->($ev, $x, $y);
112 } else { 234 } else {
… …
116 1 238 1
117} 239}
118 240
119sub size_request { 241sub size_request {
120 ( 242 (
121 1 + 32 * int $::WIDTH / 32, 243 32 * CFPlus::ceil $::WIDTH / 32,
122 1 + 32 * int $::HEIGHT / 32, 244 32 * CFPlus::ceil $::HEIGHT / 32,
123 ) 245 )
124} 246}
125 247
126sub update { 248sub update {
127 my ($self) = @_; 249 my ($self) = @_;
… …
129 $self->{need_update} = 1; 251 $self->{need_update} = 1;
130 $self->SUPER::update; 252 $self->SUPER::update;
131} 253}
132 254
133my %DIR = ( 255my %DIR = (
134 CFClient::SDLK_KP8, [1, "north"], 256 CFPlus::SDLK_KP8, [1, "north"],
135 CFClient::SDLK_KP9, [2, "northeast"], 257 CFPlus::SDLK_KP9, [2, "northeast"],
136 CFClient::SDLK_KP6, [3, "east"], 258 CFPlus::SDLK_KP6, [3, "east"],
137 CFClient::SDLK_KP3, [4, "southeast"], 259 CFPlus::SDLK_KP3, [4, "southeast"],
138 CFClient::SDLK_KP2, [5, "south"], 260 CFPlus::SDLK_KP2, [5, "south"],
139 CFClient::SDLK_KP1, [6, "southwest"], 261 CFPlus::SDLK_KP1, [6, "southwest"],
140 CFClient::SDLK_KP4, [7, "west"], 262 CFPlus::SDLK_KP4, [7, "west"],
141 CFClient::SDLK_KP7, [8, "northwest"], 263 CFPlus::SDLK_KP7, [8, "northwest"],
142 264
143 CFClient::SDLK_UP, [1, "north"], 265 CFPlus::SDLK_UP, [1, "north"],
144 CFClient::SDLK_RIGHT, [3, "east"], 266 CFPlus::SDLK_RIGHT, [3, "east"],
145 CFClient::SDLK_DOWN, [5, "south"], 267 CFPlus::SDLK_DOWN, [5, "south"],
146 CFClient::SDLK_LEFT, [7, "west"], 268 CFPlus::SDLK_LEFT, [7, "west"],
147); 269);
148 270
149sub key_down { 271sub invoke_key_down {
150 my ($self, $ev) = @_; 272 my ($self, $ev) = @_;
151
152 return 0 unless $::CONN;
153 273
154 my $mod = $ev->{mod}; 274 my $mod = $ev->{mod};
155 my $sym = $ev->{sym}; 275 my $sym = $ev->{sym};
156 my $uni = $ev->{unicode}; 276 my $uni = $ev->{unicode};
157 277
158 if ($sym == CFClient::SDLK_KP5) { 278 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
279
280 if ($uni == ord "\t") {
281 $::PL_WINDOW->toggle_visibility;
282 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
283 $::HELP_WINDOW->toggle_visibility;
284 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
285 ::toggle_player_page ($::STATS_PAGE);
286 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
287 ::toggle_player_page ($::SKILL_PAGE);
288 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
289 ::toggle_player_page ($::SPELL_PAGE);
290 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
291 ::toggle_player_page ($::INVENTORY_PAGE);
292 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
293 $::SETUP_DIALOG->toggle_visibility;
294 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
295 $::BIND_EDITOR->set_binding (undef, undef, [],
296 sub {
297 my ($mod, $sym, $cmds) = @_;
298 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
299 });
300 $::BIND_EDITOR->start;
301 $::BIND_EDITOR->show;
302#TODO: elmex, what was this supposed to do? it currently crashes the client.
303# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
304# $::BIND_EDITOR->stop;
305# $::BIND_EDITOR->ask_for_bind_and_commit;
306# $::BIND_EDITOR->hide;
307 } elsif (!$::CONN) {
308 return 0; # bindings further down need a valid connection
309
310 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
159 $::CONN->user_send ("stay fire"); 311 $::CONN->user_send ("stay fire");
160 } elsif ($uni == ord ",") { 312 } elsif ($uni == ord ",") {
161 $::CONN->user_send ("take"); 313 $::CONN->user_send ("take");
162 } elsif ($uni == ord " ") { 314 } elsif ($uni == ord " ") {
163 $::CONN->user_send ("apply"); 315 $::CONN->user_send ("apply");
316 } elsif ($uni == 13) {
317 $::CONN->user_send ("examine");
164 } elsif ($uni == ord ".") { 318 } elsif ($uni == ord ".") {
165 $::CONN->user_send ($self->{completer}{last_command}) 319 $::CONN->user_send ($self->{completer}{last_command})
166 if exists $self->{completer}{last_command}; 320 if exists $self->{completer}{last_command};
167 } elsif ($uni == ord "\t") { 321 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
168 $::INV_WINDOW->toggle_visibility; 322 $::CONN->user_send ($_) for @$bind_cmd;
169 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 323 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
170 $::CONN->user_send ("rotateshoottype +"); 324 $::CONN->user_send ("rotateshoottype +");
171 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 325 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
172 $::CONN->user_send ("rotateshoottype -"); 326 $::CONN->user_send ("rotateshoottype -");
173 } elsif ($uni == ord '"') { 327 } elsif ($uni == ord '"') {
174 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 328 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
175 $self->{completer}->show; 329 $self->{completer}->show;
176 } elsif ($uni == ord "'") { 330 } elsif ($uni == ord "'") {
177 $self->{completer}->set_prefix (""); 331 $self->{completer}->set_prefix ("");
178 $self->{completer}->show; 332 $self->{completer}->show;
179 } elsif (exists $DIR{$sym}) { 333 } elsif (exists $DIR{$sym}) {
180 if ($mod & CFClient::KMOD_SHIFT) { 334 if ($mod & CFPlus::KMOD_SHIFT) {
181 $self->{shft}++; 335 $self->{shft}++;
182 if ($DIR{$sym}[0] != $self->{fire_dir}) { 336 if ($DIR{$sym}[0] != $self->{fire_dir}) {
183 $::CONN->user_send ("fire $DIR{$sym}[0]"); 337 $::CONN->user_send ("fire $DIR{$sym}[0]");
184 } 338 }
185 $self->{fire_dir} = $DIR{$sym}[0]; 339 $self->{fire_dir} = $DIR{$sym}[0];
186 } elsif ($mod & CFClient::KMOD_CTRL) { 340 } elsif ($mod & CFPlus::KMOD_CTRL) {
187 $self->{ctrl}++; 341 $self->{ctrl}++;
188 $::CONN->user_send ("run $DIR{$sym}[0]"); 342 $::CONN->user_send ("run $DIR{$sym}[0]");
189 } else { 343 } else {
190 $::CONN->user_send ("$DIR{$sym}[1]"); 344 $::CONN->user_send ("$DIR{$sym}[1]");
191 } 345 }
192 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
193 $::BIND_EDITOR->set_binding (undef, undef, [],
194 sub {
195 my ($mod, $sym, $cmds) = @_;
196 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
197 });
198 $::BIND_EDITOR->start;
199 $::BIND_EDITOR->show;
200 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
201 $::BIND_EDITOR->stop;
202 $::BIND_EDITOR->ask_for_bind_and_commit;
203 $::BIND_EDITOR->hide;
204 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
205 $::CONN->user_send ($_) for @$bind_cmd;
206 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 346 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
207 $self->{completer}->key_down ($ev); 347 $self->{completer}->inject_key_down ($ev);
208 $self->{completer}->show; 348 $self->{completer}->show;
209 } else { 349 } else {
210 return 0; 350 return 0;
211 } 351 }
212 352
213 1 353 1
214} 354}
215 355
216sub key_up { 356sub invoke_key_up {
217 my ($self, $ev) = @_; 357 my ($self, $ev) = @_;
218 358
219 my $res = 0; 359 my $res = 0;
220 my $mod = $ev->{mod}; 360 my $mod = $ev->{mod};
221 my $sym = $ev->{sym}; 361 my $sym = $ev->{sym};
222 362
223 if ($::CFG->{shift_fire_stop}) { 363 if ($::CFG->{shift_fire_stop}) {
224 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 364 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
225 $::CONN->user_send ("fire_stop"); 365 $::CONN->user_send ("fire_stop");
226 delete $self->{fire_dir}; 366 delete $self->{fire_dir};
227 $res = 1; 367 $res = 1;
228 } 368 }
229 } else { 369 } else {
230 if (exists $DIR{$sym} && delete $self->{shft}) { 370 if (exists $DIR{$sym} && delete $self->{shft}) {
231 $::CONN->user_send ("fire_stop"); 371 $::CONN->user_send ("fire_stop");
232 delete $self->{fire_dir}; 372 delete $self->{fire_dir};
233 $res = 1; 373 $res = 1;
234 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 374 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
235 $::CONN->user_send ("fire_stop"); 375 $::CONN->user_send ("fire_stop");
236 delete $self->{fire_dir}; 376 delete $self->{fire_dir};
237 $res = 1; 377 $res = 1;
238 } 378 }
239 } 379 }
240 380
241 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 381 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
242 $::CONN->user_send ("run_stop"); 382 $::CONN->user_send ("run_stop");
243 $res = 1; 383 $res = 1;
244 } 384 }
245 385
246 $res 386 $res
247} 387}
248 388
389sub set_magicmap {
390 my ($self, $w, $h, $x, $y, $data) = @_;
391
392 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
393 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
394
395 $self->{magicmap} = [$x, $y, $w, $h, $data];
396
397 $self->update;
398}
399
249sub draw { 400sub draw {
250 my ($self) = @_; 401 my ($self) = @_;
251 402
252 return unless $::MAP; 403 return unless $::MAP;
253 404
254 my $focused = $CFClient::UI::FOCUS == $self 405 my $focused = $CFPlus::UI::FOCUS == $self
255 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 406 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
256 407
257 return 408 return
258 unless $focused || !$::FAST; 409 unless $focused || !$::FAST;
259 410
260 if (delete $self->{need_update}) { 411 if (delete $self->{need_update}) {
261 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 412 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
262 413
263 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 414 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
264 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 415 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
265 416
266 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 417 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
267 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 418 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
268 419
269 my $sw = $self->{sw} = 1 + CFClient::ceil $::WIDTH / $tilesize; 420 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
270 my $sh = $self->{sh} = 1 + CFClient::ceil $::HEIGHT / $tilesize; 421 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
271 422
272 if ($::CFG->{fow_enable}) { 423 if ($::CFG->{fow_enable}) {
273 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 424 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
274 425
275 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 426 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
276 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 427 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
277 glConvolutionFilter2D ( 428 glConvolutionFilter2D (
278 GL_CONVOLUTION_2D, 429 GL_CONVOLUTION_2D,
279 GL_ALPHA, 430 GL_ALPHA,
280 3, 3, 431 3, 3,
… …
282 (pack "f*", @{ $self->{smooth_matrix} }), 433 (pack "f*", @{ $self->{smooth_matrix} }),
283 ); 434 );
284 glEnable GL_CONVOLUTION_2D; 435 glEnable GL_CONVOLUTION_2D;
285 } 436 }
286 437
287 $self->{fow_texture} = new CFClient::Texture 438 $self->{fow_texture} = new CFPlus::Texture
288 w => $w, 439 w => $w,
289 h => $h, 440 h => $h,
290 data => $data, 441 data => $data,
291 internalformat => GL_ALPHA, 442 internalformat => GL_ALPHA,
292 format => GL_ALPHA; 443 format => GL_ALPHA;
… …
302 glTranslate $sx0, $sy0; 453 glTranslate $sx0, $sy0;
303 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 454 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
304 455
305 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 456 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
306 457
458 glScale 32, 32;
459
307 if (my $tex = $self->{fow_texture}) { 460 if (my $tex = $self->{fow_texture}) {
308 glEnable GL_TEXTURE_2D; 461 glEnable GL_TEXTURE_2D;
309 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 462 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
310 463
311 glScale 32, 32;
312 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 464 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
313 $self->{fow_texture}->draw_quad_alpha (0, 0); 465 $self->{fow_texture}->draw_quad_alpha (0, 0);
314 466
315 glDisable GL_TEXTURE_2D; 467 glDisable GL_TEXTURE_2D;
316 } 468 }
317 469
470 if ($self->{magicmap}) {
471 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
472
473 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
474 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
475
476 glTranslate - $x - 1, - $y - 1;
477 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
478 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
479 }
480
318 glPopMatrix; 481 glPopMatrix;
319
320 glEndList; 482 glEndList;
321 } 483 }
322 484
323 glPushMatrix;
324 glCallList $self->{list}; 485 glCallList $self->{list};
325 glPopMatrix;
326 486
327 # TNT2 emulates logops in software (or worse :) 487 # TNT2 emulates logops in software (or worse :)
328 unless ($focused) { 488 unless ($focused) {
329 glColor 0.4, 0.2, 0.2, 0.6; 489 glColor 0.4, 0.2, 0.2, 0.6;
330 glEnable GL_BLEND; 490 glEnable GL_BLEND;
… …
345 glDeleteList $self->{list}; 505 glDeleteList $self->{list};
346 506
347 $self->SUPER::DESTROY; 507 $self->SUPER::DESTROY;
348} 508}
349 509
350package CFClient::MapWidget::MapMap; 510package CFPlus::MapWidget::MapMap;
351 511
352our @ISA = CFClient::UI::Base::; 512our @ISA = CFPlus::UI::Base::;
353 513
354use Time::HiRes qw(time); 514use Time::HiRes qw(time);
355use CFClient::OpenGL; 515use CFPlus::OpenGL;
356 516
357sub size_request { 517sub size_request {
358 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 518 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
359} 519}
360 520
361sub size_allocate { 521sub invoke_size_allocate {
362 my ($self, $w, $h) = @_; 522 my ($self, $w, $h) = @_;
363 523
364 $self->SUPER::size_allocate ($w, $h);
365 $self->update; 524 $self->update;
525
526 1
366} 527}
367 528
368sub update { 529sub update {
369 my ($self) = @_; 530 my ($self) = @_;
370 531
… …
395 556
396 if ($self->{texture_atime} < time) { 557 if ($self->{texture_atime} < time) {
397 $self->{texture_atime} = time + 1/3; 558 $self->{texture_atime} = time + 1/3;
398 559
399 $self->{texture} = 560 $self->{texture} =
400 new CFClient::Texture 561 new CFPlus::Texture
401 w => $w, 562 w => $w,
402 h => $h, 563 h => $h,
403 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 564 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
404 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 565 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
405 } 566 }
406 567
407 $self->{texture}->draw_quad (0, 0); 568 $self->{texture}->draw_quad (0, 0);
408 569
409 glDisable GL_TEXTURE_2D; 570 glDisable GL_TEXTURE_2D;
… …
424 glEnd; 585 glEnd;
425 586
426 glDisable GL_BLEND; 587 glDisable GL_BLEND;
427} 588}
428 589
429package CFClient::MapWidget::Command; 590package CFPlus::MapWidget::Command;
430 591
431use strict; 592use strict;
432 593
433use CFClient::OpenGL; 594use CFPlus::OpenGL;
434 595
435our @ISA = CFClient::UI::Frame::; 596our @ISA = CFPlus::UI::Frame::;
436 597
437sub new { 598sub new {
438 my $class = shift; 599 my $class = shift;
439 600
440 my $self = $class->SUPER::new ( 601 my $self = $class->SUPER::new (
441 bg => [0, 0, 0, 0.8], 602 bg => [0, 0, 0, 0.8],
442 @_, 603 @_,
443 ); 604 );
444 605
445 $self->add ($self->{vbox} = new CFClient::UI::VBox); 606 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
446 607
447 $self->{label} = [ 608 $self->{label} = [
448 map 609 map
449 CFClient::UI::Label->new ( 610 CFPlus::UI::Label->new (
450 can_hover => 1, 611 can_hover => 1,
451 can_events => 1, 612 can_events => 1,
452 tooltip_width => 0.33, 613 tooltip_width => 0.33,
453 fontsize => $_, 614 fontsize => $_,
454 ), (0.8) x 16 615 ), (0.8) x 16
455 ]; 616 ];
456 617
457 $self->{entry} = new CFClient::UI::Entry 618 $self->{entry} = new CFPlus::UI::Entry
458 on_changed => sub { 619 on_changed => sub {
459 $self->update_labels; 620 $self->update_labels;
621 0
460 }, 622 },
461 on_button_down => sub { 623 on_button_down => sub {
462 my ($entry, $ev, $x, $y) = @_; 624 my ($entry, $ev, $x, $y) = @_;
463 625
464 if ($ev->{button} == 3) { 626 if ($ev->{button} == 3) {
465 (new CFClient::UI::Menu 627 (new CFPlus::UI::Menu
466 items => [ 628 items => [
629 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
467 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }] 630 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
468 ], 631 ],
469 )->popup ($ev); 632 )->popup ($ev);
470 return 1; 633 return 1;
471 } 634 }
472 0 635 0
… …
479 if ($ev->{sym} == 13) { 642 if ($ev->{sym} == 13) {
480 if (exists $self->{select}) { 643 if (exists $self->{select}) {
481 $self->{last_command} = $self->{select}; 644 $self->{last_command} = $self->{select};
482 $::CONN->user_send ($self->{select}); 645 $::CONN->user_send ($self->{select});
483 646
484 unshift @{$self->{history}}, $self->{select}; 647 unshift @{$self->{history}}, $self->{entry}->get_text;
485 $self->{hist_ptr} = 0; 648 $self->{hist_ptr} = 0;
486 649
487 $self->hide; 650 $self->hide;
488 } 651 }
489 } elsif ($ev->{sym} == 27) { 652 } elsif ($ev->{sym} == 27) {
490 $self->{hist_ptr} = 0; 653 $self->{hist_ptr} = 0;
491 $self->hide; 654 $self->hide;
492 return;
493 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 655 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
494 if ($self->{hist_ptr} > 1) { 656 if ($self->{hist_ptr} > 1) {
495 $self->{hist_ptr}--; 657 $self->{hist_ptr}--;
496 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 658 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
497 } elsif ($self->{hist_ptr} > 0) { 659 } elsif ($self->{hist_ptr} > 0) {
498 $self->{hist_ptr}--; 660 $self->{hist_ptr}--;
… …
500 } else { 662 } else {
501 ++$self->{select_offset} 663 ++$self->{select_offset}
502 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 664 if $self->{select_offset} < $#{ $self->{last_match} || [] };
503 } 665 }
504 $self->update_labels; 666 $self->update_labels;
505 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 667 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
506 if ($self->{select_offset}) { 668 if ($self->{select_offset}) {
507 --$self->{select_offset} 669 --$self->{select_offset}
508 } else { 670 } else {
509 unless ($self->{hist_ptr}) { 671 unless ($self->{hist_ptr}) {
510 $self->{hist_saveback} = $self->{entry}->get_text; 672 $self->{hist_saveback} = $self->{entry}->get_text;
… …
537 699
538 $self->{entry}->set_text ($prefix); 700 $self->{entry}->set_text ($prefix);
539 $self->show; 701 $self->show;
540} 702}
541 703
542sub size_allocate { 704sub invoke_size_allocate {
543 my ($self, $w, $h) = @_; 705 my ($self, $w, $h) = @_;
544 706
545 $self->SUPER::size_allocate ($w, $h);
546 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 707 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
708
709 $self->SUPER::invoke_size_allocate ($w, $h)
547} 710}
548 711
549sub show { 712sub show {
550 my ($self) = @_; 713 my ($self) = @_;
551 714
552 $self->SUPER::show; 715 $self->SUPER::show;
553 $self->{entry}->focus_in; 716 $self->{entry}->grab_focus;
554} 717}
555 718
556sub hide { 719sub hide {
557 my ($self) = @_; 720 my ($self) = @_;
558 721
722 $self->{hist_ptr} = 0;
723
559 $self->SUPER::hide; 724 $self->SUPER::hide;
560 $self->{entry}->set_text (""); 725 $self->{entry}->set_text ("");
561} 726}
562 727
563sub key_down { 728sub inject_key_down {
564 my ($self, $ev) = @_; 729 my ($self, $ev) = @_;
565 730
731 $self->{entry}->grab_focus;
566 $self->{entry}->key_down ($ev) 732 $self->{entry}->emit (key_down => $ev);
567} 733}
568 734
569sub update_labels { 735sub update_labels {
570 my ($self) = @_; 736 my ($self) = @_;
571 737
… …
658 $label->set_text (""); 824 $label->set_text ("");
659 $label->set_tooltip (""); 825 $label->set_tooltip ("");
660 } 826 }
661 827
662 $self->update; 828 $self->update;
663 ###
664} 829}
665 830
666sub _draw { 831sub _draw {
667 my ($self) = @_; 832 my ($self) = @_;
668 833
669 # hack 834 # hack
670 local $CFClient::UI::FOCUS = $self->{entry}; 835 local $CFPlus::UI::FOCUS = $self->{entry};
671 836
672 $self->SUPER::_draw; 837 $self->SUPER::_draw;
673} 838}
674 839
6751 8401

Diff Legend

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