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

Diff Legend

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