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.52 by elmex, Thu Jun 8 18:18:16 2006 UTC vs.
Revision 1.83 by root, Sun Oct 1 14:48:51 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 # TODO: move into editor
86 require LWP::Simple;
87}
88
63sub button_down { 89sub invoke_button_down {
64 my ($self, $ev, $x, $y) = @_; 90 my ($self, $ev, $x, $y) = @_;
65 91
66 $self->focus_in;
67
68 if ($ev->{button} == 1) { 92 if ($ev->{button} == 1) {
69 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 93 $self->grab_focus;
70 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 94 return unless $::CONN;
71 95
72 my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99; 96 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
73 my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99; 97 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
74 98
75 $::CONN->send (sprintf "lookat %d %d", $fx, $fy); 99 $x -= int 0.5 * $self->{sw};
100 $y -= int 0.5 * $self->{sh};
101
102 $::CONN->lookat ($x, $y)
103 if $::CONN;
76 104
77 } elsif ($ev->{button} == 2) { 105 } elsif ($ev->{button} == 2) {
106 $self->grab_focus;
107 return unless $::CONN;
108
78 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 109 my ($ox, $oy) = ($ev->{x}, $ev->{y});
79 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 110 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
80 111
81 $self->{motion} = sub { 112 $self->{motion} = sub {
82 my ($ev, $x, $y) = @_; 113 my ($ev, $x, $y) = @_;
… …
86 $::CFG->{map_shift_x} = $bw + $x - $ox; 117 $::CFG->{map_shift_x} = $bw + $x - $ox;
87 $::CFG->{map_shift_y} = $bh + $y - $oy; 118 $::CFG->{map_shift_y} = $bh + $y - $oy;
88 119
89 $self->update; 120 $self->update;
90 }; 121 };
122 } elsif ($ev->{button} == 3) {
123 (new CFPlus::UI::Menu
124 items => [
125 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
126 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
127 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
128 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
129 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
130 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
131 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
132 [
133 $::PICKUP_ENABLE->{state}
134 ? "Disable automatic pickup"
135 : "Enable automatic pickup",
136 sub { $::PICKUP_ENABLE->toggle }
137 ],
138 $::CONN && length $::CONN->{cvs_root}
139 ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", \&editor_invoke]
140 : (),
141 $::CONN && length $::CONN->{test_server}
142 ? ["Login on Test Server", \&test_server_login]
143 : (),
144 ["Quit",
145 sub {
146 if ($::CONN) {
147 &::open_quit_dialog;
148 } else {
149 exit;
150 }
151 }
152 ],
153 ],
154 )->popup ($ev);
91 } 155 }
92 156
93 1 157 1
94} 158}
95 159
96sub button_up { 160sub invoke_button_up {
97 my ($self, $ev, $x, $y) = @_; 161 my ($self, $ev, $x, $y) = @_;
98 162
99 delete $self->{motion}; 163 delete $self->{motion};
100 164
101 1 165 1
102} 166}
103 167
104sub mouse_motion { 168sub invoke_mouse_motion {
105 my ($self, $ev, $x, $y) = @_; 169 my ($self, $ev, $x, $y) = @_;
106 170
107 if ($self->{motion}) { 171 if ($self->{motion}) {
108 $self->{motion}->($ev, $x, $y); 172 $self->{motion}->($ev, $x, $y);
109 } else { 173 } else {
… …
113 1 177 1
114} 178}
115 179
116sub size_request { 180sub size_request {
117 ( 181 (
118 1 + 32 * int $::WIDTH / 32, 182 32 * CFPlus::ceil $::WIDTH / 32,
119 1 + 32 * int $::HEIGHT / 32, 183 32 * CFPlus::ceil $::HEIGHT / 32,
120 ) 184 )
121} 185}
122 186
123sub update { 187sub update {
124 my ($self) = @_; 188 my ($self) = @_;
… …
126 $self->{need_update} = 1; 190 $self->{need_update} = 1;
127 $self->SUPER::update; 191 $self->SUPER::update;
128} 192}
129 193
130my %DIR = ( 194my %DIR = (
131 CFClient::SDLK_KP8, [1, "north"], 195 CFPlus::SDLK_KP8, [1, "north"],
132 CFClient::SDLK_KP9, [2, "northeast"], 196 CFPlus::SDLK_KP9, [2, "northeast"],
133 CFClient::SDLK_KP6, [3, "east"], 197 CFPlus::SDLK_KP6, [3, "east"],
134 CFClient::SDLK_KP3, [4, "southeast"], 198 CFPlus::SDLK_KP3, [4, "southeast"],
135 CFClient::SDLK_KP2, [5, "south"], 199 CFPlus::SDLK_KP2, [5, "south"],
136 CFClient::SDLK_KP1, [6, "southwest"], 200 CFPlus::SDLK_KP1, [6, "southwest"],
137 CFClient::SDLK_KP4, [7, "west"], 201 CFPlus::SDLK_KP4, [7, "west"],
138 CFClient::SDLK_KP7, [8, "northwest"], 202 CFPlus::SDLK_KP7, [8, "northwest"],
139 203
140 CFClient::SDLK_UP, [1, "north"], 204 CFPlus::SDLK_UP, [1, "north"],
141 CFClient::SDLK_RIGHT, [3, "east"], 205 CFPlus::SDLK_RIGHT, [3, "east"],
142 CFClient::SDLK_DOWN, [5, "south"], 206 CFPlus::SDLK_DOWN, [5, "south"],
143 CFClient::SDLK_LEFT, [7, "west"], 207 CFPlus::SDLK_LEFT, [7, "west"],
144); 208);
145 209
146sub key_down { 210sub invoke_key_down {
147 my ($self, $ev) = @_; 211 my ($self, $ev) = @_;
148
149 return 0 unless $::CONN;
150 212
151 my $mod = $ev->{mod}; 213 my $mod = $ev->{mod};
152 my $sym = $ev->{sym}; 214 my $sym = $ev->{sym};
153 my $uni = $ev->{unicode}; 215 my $uni = $ev->{unicode};
154 216
155 if ($sym == CFClient::SDLK_KP5) { 217 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
218
219 if ($uni == ord "\t") {
220 $::PL_WINDOW->toggle_visibility;
221 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
222 $::HELP_WINDOW->toggle_visibility;
223 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
224 ::toggle_player_page ($::STATS_PAGE);
225 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
226 ::toggle_player_page ($::SKILL_PAGE);
227 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
228 ::toggle_player_page ($::SPELL_PAGE);
229 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
230 ::toggle_player_page ($::INVENTORY_PAGE);
231 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
232 $::SETUP_DIALOG->toggle_visibility;
233 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
234 $::BIND_EDITOR->set_binding (undef, undef, [],
235 sub {
236 my ($mod, $sym, $cmds) = @_;
237 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
238 });
239 $::BIND_EDITOR->start;
240 $::BIND_EDITOR->show;
241#TODO: elmex, what was this supposed to do? it currently crashes the client.
242# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
243# $::BIND_EDITOR->stop;
244# $::BIND_EDITOR->ask_for_bind_and_commit;
245# $::BIND_EDITOR->hide;
246 } elsif (!$::CONN) {
247 return 0; # bindings further down need a valid connection
248
249 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
156 $::CONN->user_send ("stay fire"); 250 $::CONN->user_send ("stay fire");
157 } elsif ($uni == ord ",") { 251 } elsif ($uni == ord ",") {
158 $::CONN->user_send ("take"); 252 $::CONN->user_send ("take");
159 } elsif ($uni == ord " ") { 253 } elsif ($uni == ord " ") {
160 $::CONN->user_send ("apply"); 254 $::CONN->user_send ("apply");
255 } elsif ($uni == 13) {
256 $::CONN->user_send ("examine");
161 } elsif ($uni == ord ".") { 257 } elsif ($uni == ord ".") {
162 $::CONN->user_send ($self->{completer}{last_command}) 258 $::CONN->user_send ($self->{completer}{last_command})
163 if exists $self->{completer}{last_command}; 259 if exists $self->{completer}{last_command};
164 } elsif ($uni == ord "\t") { 260 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
165 $::INV_WINDOW->toggle_visibility; 261 $::CONN->user_send ($_) for @$bind_cmd;
166 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 262 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
167 $::CONN->user_send ("rotateshoottype +"); 263 $::CONN->user_send ("rotateshoottype +");
168 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 264 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
169 $::CONN->user_send ("rotateshoottype -"); 265 $::CONN->user_send ("rotateshoottype -");
170 } elsif ($uni == ord '"') { 266 } elsif ($uni == ord '"') {
171 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 267 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
172 $self->{completer}->show; 268 $self->{completer}->show;
173 } elsif ($uni == ord "'") { 269 } elsif ($uni == ord "'") {
174 $self->{completer}->set_prefix (""); 270 $self->{completer}->set_prefix ("");
175 $self->{completer}->show; 271 $self->{completer}->show;
176 } elsif (exists $DIR{$sym}) { 272 } elsif (exists $DIR{$sym}) {
177 if ($mod & CFClient::KMOD_SHIFT) { 273 if ($mod & CFPlus::KMOD_SHIFT) {
178 $self->{shft}++; 274 $self->{shft}++;
275 if ($DIR{$sym}[0] != $self->{fire_dir}) {
179 $::CONN->user_send ("fire $DIR{$sym}[0]"); 276 $::CONN->user_send ("fire $DIR{$sym}[0]");
277 }
278 $self->{fire_dir} = $DIR{$sym}[0];
180 } elsif ($mod & CFClient::KMOD_CTRL) { 279 } elsif ($mod & CFPlus::KMOD_CTRL) {
181 $self->{ctrl}++; 280 $self->{ctrl}++;
182 $::CONN->user_send ("run $DIR{$sym}[0]"); 281 $::CONN->user_send ("run $DIR{$sym}[0]");
183 } else { 282 } else {
184 $::CONN->user_send ("$DIR{$sym}[1]"); 283 $::CONN->user_send ("$DIR{$sym}[1]");
185 } 284 }
186 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
187 $::BIND_EDITOR->set_binding (undef, undef, [],
188 sub {
189 my ($mod, $sym, $cmds) = @_;
190 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
191 });
192 $::BIND_EDITOR->start;
193 $::BIND_EDITOR->show;
194 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
195 $::BIND_EDITOR->stop;
196 $::BIND_EDITOR->ask_for_bind_and_commit;
197 $::BIND_EDITOR->hide;
198 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
199 $::CONN->user_send ($_) for @$bind_cmd;
200 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 285 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
201 $self->{completer}->key_down ($ev); 286 $self->{completer}->inject_key_down ($ev);
202 $self->{completer}->show; 287 $self->{completer}->show;
203 } else { 288 } else {
204 return 0; 289 return 0;
205 } 290 }
206 291
207 1 292 1
208} 293}
209 294
210sub key_up { 295sub invoke_key_up {
211 my ($self, $ev) = @_; 296 my ($self, $ev) = @_;
212 297
213 my $res = 0; 298 my $res = 0;
214 my $mod = $ev->{mod}; 299 my $mod = $ev->{mod};
215 my $sym = $ev->{sym}; 300 my $sym = $ev->{sym};
216 301
302 if ($::CFG->{shift_fire_stop}) {
217 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 303 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
218 $::CONN->user_send ("fire_stop"); 304 $::CONN->user_send ("fire_stop");
305 delete $self->{fire_dir};
219 $res = 1; 306 $res = 1;
307 }
308 } else {
309 if (exists $DIR{$sym} && delete $self->{shft}) {
310 $::CONN->user_send ("fire_stop");
311 delete $self->{fire_dir};
312 $res = 1;
313 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
314 $::CONN->user_send ("fire_stop");
315 delete $self->{fire_dir};
316 $res = 1;
317 }
220 } 318 }
221 319
222 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 320 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
223 $::CONN->user_send ("run_stop"); 321 $::CONN->user_send ("run_stop");
224 $res = 1; 322 $res = 1;
225 } 323 }
226 324
227 $res 325 $res
228} 326}
229 327
328sub set_magicmap {
329 my ($self, $w, $h, $x, $y, $data) = @_;
330
331 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
332 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
333
334 $self->{magicmap} = [$x, $y, $w, $h, $data];
335
336 $self->update;
337}
338
230sub draw { 339sub draw {
231 my ($self) = @_; 340 my ($self) = @_;
232 341
342 return unless $::MAP;
343
233 my $focused = $CFClient::UI::FOCUS == $self 344 my $focused = $CFPlus::UI::FOCUS == $self
234 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 345 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
235 346
236 return 347 return
237 unless $focused || !$::FAST; 348 unless $focused || !$::FAST;
238 349
239 if (delete $self->{need_update}) { 350 if (delete $self->{need_update}) {
351 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
352
353 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
354 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
355
356 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
357 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
358
359 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
360 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
361
362 if ($::CFG->{fow_enable}) {
363 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
364
365 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
366 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
367 glConvolutionFilter2D (
368 GL_CONVOLUTION_2D,
369 GL_ALPHA,
370 3, 3,
371 GL_ALPHA, GL_FLOAT,
372 (pack "f*", @{ $self->{smooth_matrix} }),
373 );
374 glEnable GL_CONVOLUTION_2D;
375 }
376
377 $self->{fow_texture} = new CFPlus::Texture
378 w => $w,
379 h => $h,
380 data => $data,
381 internalformat => GL_ALPHA,
382 format => GL_ALPHA;
383
384 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
385 } else {
386 delete $self->{fow_texture};
387 }
388
240 glNewList $self->{list}; 389 glNewList $self->{list};
241 390
242 if ($::MAP) {
243 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
244 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
245
246 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
247 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
248
249 glPushMatrix; 391 glPushMatrix;
392 glTranslate $sx0, $sy0;
250 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 393 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
251 394
252 glTranslate $sx0 - 32, $sy0 - 32, 0; 395 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
253 396
254 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 397 glScale 32, 32;
255 398
256 if ($::CFG->{fow_enable}) { 399 if (my $tex = $self->{fow_texture}) {
257 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
258 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
259 glConvolutionFilter2D (
260 GL_CONVOLUTION_2D,
261 GL_ALPHA,
262 3, 3,
263 GL_ALPHA, GL_FLOAT,
264 (pack "f*", @{ $self->{smooth_matrix} }),
265 );
266 glEnable GL_CONVOLUTION_2D;
267 }
268
269 $self->{fow_texture_name} ||= glGenTexture;
270 # try to re-use the texture name: TODO improve texture class instead
271
272 $self->{fow_texture} = new CFClient::Texture
273 w => $w,
274 h => $h,
275 data => $data,
276 name => $self->{fow_texture_name},
277 internalformat => GL_ALPHA,
278 format => GL_ALPHA;
279
280 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
281
282 glEnable GL_TEXTURE_2D; 400 glEnable GL_TEXTURE_2D;
283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
284 402
285 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 403 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
286 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 404 $self->{fow_texture}->draw_quad_alpha (0, 0);
287 405
288 glDisable GL_TEXTURE_2D; 406 glDisable GL_TEXTURE_2D;
289 } 407 }
290 408
409 if ($self->{magicmap}) {
410 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
411
412 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
413 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
414
415 glTranslate - $x - 1, - $y - 1;
416 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
417 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
418 }
419
291 glPopMatrix; 420 glPopMatrix;
292 }
293
294 glEndList; 421 glEndList;
295 } 422 }
296 423
297 glPushMatrix;
298 glCallList $self->{list}; 424 glCallList $self->{list};
299 glPopMatrix;
300 425
301 # TNT2 emulates logops in software (or worse :) 426 # TNT2 emulates logops in software (or worse :)
302 if ($focused) { 427 unless ($focused) {
303 (delete $self->{out_of_focus})->destroy
304 if $self->{out_of_focus};
305 } else {
306 glColor 0.4, 0.2, 0.2, 0.6; 428 glColor 0.4, 0.2, 0.2, 0.6;
307 glEnable GL_BLEND; 429 glEnable GL_BLEND;
308 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 430 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
309 glBegin GL_QUADS; 431 glBegin GL_QUADS;
310 glVertex 0, 0; 432 glVertex 0, 0;
311 glVertex 0, $::HEIGHT; 433 glVertex 0, $::HEIGHT;
312 glVertex $::WIDTH, $::HEIGHT; 434 glVertex $::WIDTH, $::HEIGHT;
313 glVertex $::WIDTH, 0; 435 glVertex $::WIDTH, 0;
314 glEnd; 436 glEnd;
315 glDisable GL_BLEND; 437 glDisable GL_BLEND;
316
317# $self->{out_of_focus} ||= do {
318# my $label = new CFClient::UI::Label
319# x => 0,
320# y => 0,
321# z => 1,
322# ellipsise => 0,
323# text => "map out of focus (click map to play)";
324#
325# $label->show;
326# $label->update;
327#
328# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
329# $label->move_abs (
330# ($::WIDTH - $label->{w}) * 0.5,
331# ($::HEIGHT - $label->{h}) * 0.5,
332# );
333# });
334#
335# $label
336# };
337 } 438 }
338} 439}
339 440
340sub DESTROY { 441sub DESTROY {
341 my $self = shift; 442 my $self = shift;
… …
343 glDeleteList $self->{list}; 444 glDeleteList $self->{list};
344 445
345 $self->SUPER::DESTROY; 446 $self->SUPER::DESTROY;
346} 447}
347 448
348package CFClient::MapWidget::MapMap; 449package CFPlus::MapWidget::MapMap;
349 450
350our @ISA = CFClient::UI::Base::; 451our @ISA = CFPlus::UI::Base::;
351 452
352use Time::HiRes qw(time); 453use Time::HiRes qw(time);
353use CFClient::OpenGL; 454use CFPlus::OpenGL;
354 455
355sub size_request { 456sub size_request {
356 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 457 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
357} 458}
358 459
359sub size_allocate { 460sub invoke_size_allocate {
360 my ($self, $w, $h) = @_; 461 my ($self, $w, $h) = @_;
361 462
362 $self->SUPER::size_allocate ($w, $h);
363 $self->update; 463 $self->update;
464
465 1
364} 466}
365 467
366sub update { 468sub update {
367 my ($self) = @_; 469 my ($self) = @_;
368 470
… …
393 495
394 if ($self->{texture_atime} < time) { 496 if ($self->{texture_atime} < time) {
395 $self->{texture_atime} = time + 1/3; 497 $self->{texture_atime} = time + 1/3;
396 498
397 $self->{texture} = 499 $self->{texture} =
398 new CFClient::Texture 500 new CFPlus::Texture
399 w => $w, 501 w => $w,
400 h => $h, 502 h => $h,
401 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 503 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
402 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 504 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
403 } 505 }
404 506
405 $self->{texture}->draw_quad (0, 0); 507 $self->{texture}->draw_quad (0, 0);
406 508
407 glDisable GL_TEXTURE_2D; 509 glDisable GL_TEXTURE_2D;
… …
422 glEnd; 524 glEnd;
423 525
424 glDisable GL_BLEND; 526 glDisable GL_BLEND;
425} 527}
426 528
427package CFClient::MapWidget::Command; 529package CFPlus::MapWidget::Command;
428 530
429use strict; 531use strict;
430 532
431use CFClient::OpenGL; 533use CFPlus::OpenGL;
432 534
433our @ISA = CFClient::UI::Frame::; 535our @ISA = CFPlus::UI::Frame::;
434 536
435sub new { 537sub new {
436 my $class = shift; 538 my $class = shift;
437 539
438 my $self = $class->SUPER::new ( 540 my $self = $class->SUPER::new (
439 bg => [0, 0, 0, 0.8], 541 bg => [0, 0, 0, 0.8],
440 @_, 542 @_,
441 ); 543 );
442 544
443 $self->add ($self->{vbox} = new CFClient::UI::VBox); 545 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
444 546
445 $self->{label} = [ 547 $self->{label} = [
446 map 548 map
447 CFClient::UI::Label->new ( 549 CFPlus::UI::Label->new (
448 can_hover => 1, 550 can_hover => 1,
449 can_events => 1, 551 can_events => 1,
450 tooltip_width => 0.33, 552 tooltip_width => 0.33,
451 fontsize => $_, 553 fontsize => $_,
452 ), (0.8) x 16 554 ), (0.8) x 16
453 ]; 555 ];
454 556
455 $self->{entry} = new CFClient::UI::Entry 557 $self->{entry} = new CFPlus::UI::Entry
456 on_changed => sub { 558 on_changed => sub {
457 $self->update_labels; 559 $self->update_labels;
560 0
561 },
562 on_button_down => sub {
563 my ($entry, $ev, $x, $y) = @_;
564
565 if ($ev->{button} == 3) {
566 (new CFPlus::UI::Menu
567 items => [
568 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
569 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
570 ],
571 )->popup ($ev);
572 return 1;
573 }
574 0
458 }, 575 },
459 on_key_down => sub { 576 on_key_down => sub {
460 my ($entry, $ev) = @_; 577 my ($entry, $ev) = @_;
461 578
462 my $self = $entry->{parent}{parent}; 579 my $self = $entry->{parent}{parent};
… …
464 if ($ev->{sym} == 13) { 581 if ($ev->{sym} == 13) {
465 if (exists $self->{select}) { 582 if (exists $self->{select}) {
466 $self->{last_command} = $self->{select}; 583 $self->{last_command} = $self->{select};
467 $::CONN->user_send ($self->{select}); 584 $::CONN->user_send ($self->{select});
468 585
469 unshift @{$self->{history}}, $self->{select}; 586 unshift @{$self->{history}}, $self->{entry}->get_text;
470 $self->{hist_ptr} = 0; 587 $self->{hist_ptr} = 0;
471 588
472 $self->hide; 589 $self->hide;
473 } 590 }
474 } elsif ($ev->{sym} == 27) { 591 } elsif ($ev->{sym} == 27) {
475 $self->{hist_ptr} = 0; 592 $self->{hist_ptr} = 0;
476 $self->hide; 593 $self->hide;
477 return;
478 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 594 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
479 if ($self->{hist_ptr} > 1) { 595 if ($self->{hist_ptr} > 1) {
480 $self->{hist_ptr}--; 596 $self->{hist_ptr}--;
481 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 597 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
482 } elsif ($self->{hist_ptr} > 0) { 598 } elsif ($self->{hist_ptr} > 0) {
483 $self->{hist_ptr}--; 599 $self->{hist_ptr}--;
… …
485 } else { 601 } else {
486 ++$self->{select_offset} 602 ++$self->{select_offset}
487 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 603 if $self->{select_offset} < $#{ $self->{last_match} || [] };
488 } 604 }
489 $self->update_labels; 605 $self->update_labels;
490 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 606 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
491 if ($self->{select_offset}) { 607 if ($self->{select_offset}) {
492 --$self->{select_offset} 608 --$self->{select_offset}
493 } else { 609 } else {
494 unless ($self->{hist_ptr}) { 610 unless ($self->{hist_ptr}) {
495 $self->{hist_saveback} = $self->{entry}->get_text; 611 $self->{hist_saveback} = $self->{entry}->get_text;
… …
522 638
523 $self->{entry}->set_text ($prefix); 639 $self->{entry}->set_text ($prefix);
524 $self->show; 640 $self->show;
525} 641}
526 642
527sub size_allocate { 643sub invoke_size_allocate {
528 my ($self, $w, $h) = @_; 644 my ($self, $w, $h) = @_;
529 645
530 $self->SUPER::size_allocate ($w, $h);
531 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 646 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
647
648 $self->SUPER::invoke_size_allocate ($w, $h)
532} 649}
533 650
534sub show { 651sub show {
535 my ($self) = @_; 652 my ($self) = @_;
536 653
537 $self->SUPER::show; 654 $self->SUPER::show;
538 $self->{entry}->focus_in; 655 $self->{entry}->grab_focus;
539} 656}
540 657
541sub hide { 658sub hide {
542 my ($self) = @_; 659 my ($self) = @_;
660
661 $self->{hist_ptr} = 0;
543 662
544 $self->SUPER::hide; 663 $self->SUPER::hide;
545 $self->{entry}->set_text (""); 664 $self->{entry}->set_text ("");
546} 665}
547 666
548sub key_down { 667sub inject_key_down {
549 my ($self, $ev) = @_; 668 my ($self, $ev) = @_;
550 669
670 $self->{entry}->grab_focus;
551 $self->{entry}->key_down ($ev) 671 $self->{entry}->emit (key_down => $ev);
552} 672}
553 673
554sub update_labels { 674sub update_labels {
555 my ($self) = @_; 675 my ($self) = @_;
556 676
… …
643 $label->set_text (""); 763 $label->set_text ("");
644 $label->set_tooltip (""); 764 $label->set_tooltip ("");
645 } 765 }
646 766
647 $self->update; 767 $self->update;
648 ###
649} 768}
650 769
651sub _draw { 770sub _draw {
652 my ($self) = @_; 771 my ($self) = @_;
653 772
654 # hack 773 # hack
655 local $CFClient::UI::FOCUS = $self->{entry}; 774 local $CFPlus::UI::FOCUS = $self->{entry};
656 775
657 $self->SUPER::_draw; 776 $self->SUPER::_draw;
658} 777}
659 778
6601 7791

Diff Legend

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