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

Diff Legend

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