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

Diff Legend

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