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.81 by root, Sun Aug 13 15:14:17 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
63sub button_down { 64sub invoke_button_down {
64 my ($self, $ev, $x, $y) = @_; 65 my ($self, $ev, $x, $y) = @_;
65 66
66 return unless $::CONN;
67
68 $self->focus_in;
69
70 if ($ev->{button} == 1) { 67 if ($ev->{button} == 1) {
71 my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}); 68 $self->grab_focus;
72 my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}); 69 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 70
71 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
72 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
73
77 $x -= int 0.5 * $::MAP->w; 74 $x -= int 0.5 * $self->{sw};
78 $y -= int 0.5 * $::MAP->h; 75 $y -= int 0.5 * $self->{sh};
79
80 $x += 1;
81 $y += 1;
82 76
83 $::CONN->lookat ($x, $y) 77 $::CONN->lookat ($x, $y)
84 if $::CONN; 78 if $::CONN;
85 79
86 } elsif ($ev->{button} == 2) { 80 } elsif ($ev->{button} == 2) {
81 $self->grab_focus;
82 return unless $::CONN;
83
87 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 84 my ($ox, $oy) = ($ev->{x}, $ev->{y});
88 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 85 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
89 86
90 $self->{motion} = sub { 87 $self->{motion} = sub {
91 my ($ev, $x, $y) = @_; 88 my ($ev, $x, $y) = @_;
… …
95 $::CFG->{map_shift_x} = $bw + $x - $ox; 92 $::CFG->{map_shift_x} = $bw + $x - $ox;
96 $::CFG->{map_shift_y} = $bh + $y - $oy; 93 $::CFG->{map_shift_y} = $bh + $y - $oy;
97 94
98 $self->update; 95 $self->update;
99 }; 96 };
97 } elsif ($ev->{button} == 3) {
98 (new CFPlus::UI::Menu
99 items => [
100 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
101 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
102 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
103 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
104 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
105 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
106 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
107 [
108 $::PICKUP_ENABLE->{state}
109 ? "Disable automatic pickup"
110 : "Enable automatic pickup",
111 sub { $::PICKUP_ENABLE->toggle }
112 ],
113 ["Quit",
114 sub {
115 if ($::CONN) {
116 &::open_quit_dialog;
117 } else {
118 exit;
119 }
120 }
121 ],
122 ],
123 )->popup ($ev);
100 } 124 }
101 125
102 1 126 1
103} 127}
104 128
105sub button_up { 129sub invoke_button_up {
106 my ($self, $ev, $x, $y) = @_; 130 my ($self, $ev, $x, $y) = @_;
107 131
108 delete $self->{motion}; 132 delete $self->{motion};
109 133
110 1 134 1
111} 135}
112 136
113sub mouse_motion { 137sub invoke_mouse_motion {
114 my ($self, $ev, $x, $y) = @_; 138 my ($self, $ev, $x, $y) = @_;
115 139
116 if ($self->{motion}) { 140 if ($self->{motion}) {
117 $self->{motion}->($ev, $x, $y); 141 $self->{motion}->($ev, $x, $y);
118 } else { 142 } else {
… …
122 1 146 1
123} 147}
124 148
125sub size_request { 149sub size_request {
126 ( 150 (
127 1 + 32 * int $::WIDTH / 32, 151 32 * CFPlus::ceil $::WIDTH / 32,
128 1 + 32 * int $::HEIGHT / 32, 152 32 * CFPlus::ceil $::HEIGHT / 32,
129 ) 153 )
130} 154}
131 155
132sub update { 156sub update {
133 my ($self) = @_; 157 my ($self) = @_;
… …
135 $self->{need_update} = 1; 159 $self->{need_update} = 1;
136 $self->SUPER::update; 160 $self->SUPER::update;
137} 161}
138 162
139my %DIR = ( 163my %DIR = (
140 CFClient::SDLK_KP8, [1, "north"], 164 CFPlus::SDLK_KP8, [1, "north"],
141 CFClient::SDLK_KP9, [2, "northeast"], 165 CFPlus::SDLK_KP9, [2, "northeast"],
142 CFClient::SDLK_KP6, [3, "east"], 166 CFPlus::SDLK_KP6, [3, "east"],
143 CFClient::SDLK_KP3, [4, "southeast"], 167 CFPlus::SDLK_KP3, [4, "southeast"],
144 CFClient::SDLK_KP2, [5, "south"], 168 CFPlus::SDLK_KP2, [5, "south"],
145 CFClient::SDLK_KP1, [6, "southwest"], 169 CFPlus::SDLK_KP1, [6, "southwest"],
146 CFClient::SDLK_KP4, [7, "west"], 170 CFPlus::SDLK_KP4, [7, "west"],
147 CFClient::SDLK_KP7, [8, "northwest"], 171 CFPlus::SDLK_KP7, [8, "northwest"],
148 172
149 CFClient::SDLK_UP, [1, "north"], 173 CFPlus::SDLK_UP, [1, "north"],
150 CFClient::SDLK_RIGHT, [3, "east"], 174 CFPlus::SDLK_RIGHT, [3, "east"],
151 CFClient::SDLK_DOWN, [5, "south"], 175 CFPlus::SDLK_DOWN, [5, "south"],
152 CFClient::SDLK_LEFT, [7, "west"], 176 CFPlus::SDLK_LEFT, [7, "west"],
153); 177);
154 178
155sub key_down { 179sub invoke_key_down {
156 my ($self, $ev) = @_; 180 my ($self, $ev) = @_;
157
158 return 0 unless $::CONN;
159 181
160 my $mod = $ev->{mod}; 182 my $mod = $ev->{mod};
161 my $sym = $ev->{sym}; 183 my $sym = $ev->{sym};
162 my $uni = $ev->{unicode}; 184 my $uni = $ev->{unicode};
163 185
164 if ($sym == CFClient::SDLK_KP5) { 186 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
187
188 if ($uni == ord "\t") {
189 $::PL_WINDOW->toggle_visibility;
190 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
191 $::HELP_WINDOW->toggle_visibility;
192 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
193 ::toggle_player_page ($::STATS_PAGE);
194 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
195 ::toggle_player_page ($::SKILL_PAGE);
196 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
197 ::toggle_player_page ($::SPELL_PAGE);
198 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
199 ::toggle_player_page ($::INVENTORY_PAGE);
200 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
201 $::SETUP_DIALOG->toggle_visibility;
202 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
203 $::BIND_EDITOR->set_binding (undef, undef, [],
204 sub {
205 my ($mod, $sym, $cmds) = @_;
206 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
207 });
208 $::BIND_EDITOR->start;
209 $::BIND_EDITOR->show;
210 } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
211 $::BIND_EDITOR->stop;
212 $::BIND_EDITOR->ask_for_bind_and_commit;
213 $::BIND_EDITOR->hide;
214 } elsif (!$::CONN) {
215 return 0; # bindings further down need a valid connection
216
217 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
165 $::CONN->user_send ("stay fire"); 218 $::CONN->user_send ("stay fire");
166 } elsif ($uni == ord ",") { 219 } elsif ($uni == ord ",") {
167 $::CONN->user_send ("take"); 220 $::CONN->user_send ("take");
168 } elsif ($uni == ord " ") { 221 } elsif ($uni == ord " ") {
169 $::CONN->user_send ("apply"); 222 $::CONN->user_send ("apply");
170 } elsif ($uni == ord ".") { 223 } elsif ($uni == ord ".") {
171 $::CONN->user_send ($self->{completer}{last_command}) 224 $::CONN->user_send ($self->{completer}{last_command})
172 if exists $self->{completer}{last_command}; 225 if exists $self->{completer}{last_command};
173 } elsif ($uni == ord "\t") { 226 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
174 $::INV_WINDOW->toggle_visibility; 227 $::CONN->user_send ($_) for @$bind_cmd;
175 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 228 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
176 $::CONN->user_send ("rotateshoottype +"); 229 $::CONN->user_send ("rotateshoottype +");
177 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 230 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
178 $::CONN->user_send ("rotateshoottype -"); 231 $::CONN->user_send ("rotateshoottype -");
179 } elsif ($uni == ord '"') { 232 } elsif ($uni == ord '"') {
180 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 233 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
181 $self->{completer}->show; 234 $self->{completer}->show;
182 } elsif ($uni == ord "'") { 235 } elsif ($uni == ord "'") {
183 $self->{completer}->set_prefix (""); 236 $self->{completer}->set_prefix ("");
184 $self->{completer}->show; 237 $self->{completer}->show;
185 } elsif (exists $DIR{$sym}) { 238 } elsif (exists $DIR{$sym}) {
186 if ($mod & CFClient::KMOD_SHIFT) { 239 if ($mod & CFPlus::KMOD_SHIFT) {
187 $self->{shft}++; 240 $self->{shft}++;
188 if ($DIR{$sym}[0] != $self->{fire_dir}) { 241 if ($DIR{$sym}[0] != $self->{fire_dir}) {
189 $::CONN->user_send ("fire $DIR{$sym}[0]"); 242 $::CONN->user_send ("fire $DIR{$sym}[0]");
190 } 243 }
191 $self->{fire_dir} = $DIR{$sym}[0]; 244 $self->{fire_dir} = $DIR{$sym}[0];
192 } elsif ($mod & CFClient::KMOD_CTRL) { 245 } elsif ($mod & CFPlus::KMOD_CTRL) {
193 $self->{ctrl}++; 246 $self->{ctrl}++;
194 $::CONN->user_send ("run $DIR{$sym}[0]"); 247 $::CONN->user_send ("run $DIR{$sym}[0]");
195 } else { 248 } else {
196 $::CONN->user_send ("$DIR{$sym}[1]"); 249 $::CONN->user_send ("$DIR{$sym}[1]");
197 } 250 }
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')) { 251 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
213 $self->{completer}->key_down ($ev); 252 $self->{completer}->inject_key_down ($ev);
214 $self->{completer}->show; 253 $self->{completer}->show;
215 } else { 254 } else {
216 return 0; 255 return 0;
217 } 256 }
218 257
219 1 258 1
220} 259}
221 260
222sub key_up { 261sub invoke_key_up {
223 my ($self, $ev) = @_; 262 my ($self, $ev) = @_;
224 263
225 my $res = 0; 264 my $res = 0;
226 my $mod = $ev->{mod}; 265 my $mod = $ev->{mod};
227 my $sym = $ev->{sym}; 266 my $sym = $ev->{sym};
228 267
229 if ($::CFG->{shift_fire_stop}) { 268 if ($::CFG->{shift_fire_stop}) {
230 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 269 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
231 $::CONN->user_send ("fire_stop"); 270 $::CONN->user_send ("fire_stop");
232 delete $self->{fire_dir}; 271 delete $self->{fire_dir};
233 $res = 1; 272 $res = 1;
234 } 273 }
235 } else { 274 } else {
236 if (exists $DIR{$sym} && delete $self->{shft}) { 275 if (exists $DIR{$sym} && delete $self->{shft}) {
237 $::CONN->user_send ("fire_stop"); 276 $::CONN->user_send ("fire_stop");
238 delete $self->{fire_dir}; 277 delete $self->{fire_dir};
239 $res = 1; 278 $res = 1;
240 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 279 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
241 $::CONN->user_send ("fire_stop"); 280 $::CONN->user_send ("fire_stop");
242 delete $self->{fire_dir}; 281 delete $self->{fire_dir};
243 $res = 1; 282 $res = 1;
244 } 283 }
245 } 284 }
246 285
247 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 286 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
248 $::CONN->user_send ("run_stop"); 287 $::CONN->user_send ("run_stop");
249 $res = 1; 288 $res = 1;
250 } 289 }
251 290
252 $res 291 $res
253} 292}
254 293
294sub set_magicmap {
295 my ($self, $w, $h, $x, $y, $data) = @_;
296
297 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
298 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
299
300 $self->{magicmap} = [$x, $y, $w, $h, $data];
301
302 $self->update;
303}
304
255sub draw { 305sub draw {
256 my ($self) = @_; 306 my ($self) = @_;
257 307
308 return unless $::MAP;
309
258 my $focused = $CFClient::UI::FOCUS == $self 310 my $focused = $CFPlus::UI::FOCUS == $self
259 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 311 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
260 312
261 return 313 return
262 unless $::CONN && ($focused || !$::FAST); 314 unless $focused || !$::FAST;
263 315
264 if (delete $self->{need_update}) { 316 if (delete $self->{need_update}) {
317 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
318
319 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
320 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
321
322 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
323 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
324
325 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
326 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
327
328 if ($::CFG->{fow_enable}) {
329 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
330
331 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
332 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
333 glConvolutionFilter2D (
334 GL_CONVOLUTION_2D,
335 GL_ALPHA,
336 3, 3,
337 GL_ALPHA, GL_FLOAT,
338 (pack "f*", @{ $self->{smooth_matrix} }),
339 );
340 glEnable GL_CONVOLUTION_2D;
341 }
342
265 $self->{fow_texture} ||= glGenTexture; 343 $self->{fow_texture} = new CFPlus::Texture
344 w => $w,
345 h => $h,
346 data => $data,
347 internalformat => GL_ALPHA,
348 format => GL_ALPHA;
349
350 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
351 } else {
352 delete $self->{fow_texture};
353 }
266 354
267 glNewList $self->{list}; 355 glNewList $self->{list};
268 356
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; 357 glPushMatrix;
358 glTranslate $sx0, $sy0;
279 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 359 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
280 360
281 glTranslate $sx0, $sy0; 361 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
282 362
283 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 363 glScale 32, 32;
284 364
285 if ($::CFG->{fow_enable}) { 365 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; 366 glEnable GL_TEXTURE_2D;
312 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 367 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
313 368
314 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 369 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
315 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 370 $self->{fow_texture}->draw_quad_alpha (0, 0);
316 371
317 glDisable GL_TEXTURE_2D; 372 glDisable GL_TEXTURE_2D;
318 } 373 }
319 374
375 if ($self->{magicmap}) {
376 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
377
378 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
379 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
380
381 glTranslate - $x - 1, - $y - 1;
382 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
383 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
384 }
385
320 glPopMatrix; 386 glPopMatrix;
321 }
322
323 glEndList; 387 glEndList;
324 } 388 }
325 389
326 glPushMatrix;
327 glCallList $self->{list}; 390 glCallList $self->{list};
328 glPopMatrix;
329 391
330 # TNT2 emulates logops in software (or worse :) 392 # TNT2 emulates logops in software (or worse :)
331 if ($focused) { 393 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; 394 glColor 0.4, 0.2, 0.2, 0.6;
336 glEnable GL_BLEND; 395 glEnable GL_BLEND;
337 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 396 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
338 glBegin GL_QUADS; 397 glBegin GL_QUADS;
339 glVertex 0, 0; 398 glVertex 0, 0;
340 glVertex 0, $::HEIGHT; 399 glVertex 0, $::HEIGHT;
341 glVertex $::WIDTH, $::HEIGHT; 400 glVertex $::WIDTH, $::HEIGHT;
342 glVertex $::WIDTH, 0; 401 glVertex $::WIDTH, 0;
343 glEnd; 402 glEnd;
344 glDisable GL_BLEND; 403 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 } 404 }
367} 405}
368 406
369sub DESTROY { 407sub DESTROY {
370 my $self = shift; 408 my $self = shift;
… …
372 glDeleteList $self->{list}; 410 glDeleteList $self->{list};
373 411
374 $self->SUPER::DESTROY; 412 $self->SUPER::DESTROY;
375} 413}
376 414
377package CFClient::MapWidget::MapMap; 415package CFPlus::MapWidget::MapMap;
378 416
379our @ISA = CFClient::UI::Base::; 417our @ISA = CFPlus::UI::Base::;
380 418
381use Time::HiRes qw(time); 419use Time::HiRes qw(time);
382use CFClient::OpenGL; 420use CFPlus::OpenGL;
383 421
384sub size_request { 422sub size_request {
385 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 423 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
386} 424}
387 425
388sub size_allocate { 426sub invoke_size_allocate {
389 my ($self, $w, $h) = @_; 427 my ($self, $w, $h) = @_;
390 428
391 $self->SUPER::size_allocate ($w, $h);
392 $self->update; 429 $self->update;
430
431 1
393} 432}
394 433
395sub update { 434sub update {
396 my ($self) = @_; 435 my ($self) = @_;
397 436
… …
422 461
423 if ($self->{texture_atime} < time) { 462 if ($self->{texture_atime} < time) {
424 $self->{texture_atime} = time + 1/3; 463 $self->{texture_atime} = time + 1/3;
425 464
426 $self->{texture} = 465 $self->{texture} =
427 new CFClient::Texture 466 new CFPlus::Texture
428 w => $w, 467 w => $w,
429 h => $h, 468 h => $h,
430 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 469 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; 470 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
432 } 471 }
433 472
434 $self->{texture}->draw_quad (0, 0); 473 $self->{texture}->draw_quad (0, 0);
435 474
436 glDisable GL_TEXTURE_2D; 475 glDisable GL_TEXTURE_2D;
… …
451 glEnd; 490 glEnd;
452 491
453 glDisable GL_BLEND; 492 glDisable GL_BLEND;
454} 493}
455 494
456package CFClient::MapWidget::Command; 495package CFPlus::MapWidget::Command;
457 496
458use strict; 497use strict;
459 498
460use CFClient::OpenGL; 499use CFPlus::OpenGL;
461 500
462our @ISA = CFClient::UI::Frame::; 501our @ISA = CFPlus::UI::Frame::;
463 502
464sub new { 503sub new {
465 my $class = shift; 504 my $class = shift;
466 505
467 my $self = $class->SUPER::new ( 506 my $self = $class->SUPER::new (
468 bg => [0, 0, 0, 0.8], 507 bg => [0, 0, 0, 0.8],
469 @_, 508 @_,
470 ); 509 );
471 510
472 $self->add ($self->{vbox} = new CFClient::UI::VBox); 511 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
473 512
474 $self->{label} = [ 513 $self->{label} = [
475 map 514 map
476 CFClient::UI::Label->new ( 515 CFPlus::UI::Label->new (
477 can_hover => 1, 516 can_hover => 1,
478 can_events => 1, 517 can_events => 1,
479 tooltip_width => 0.33, 518 tooltip_width => 0.33,
480 fontsize => $_, 519 fontsize => $_,
481 ), (0.8) x 16 520 ), (0.8) x 16
482 ]; 521 ];
483 522
484 $self->{entry} = new CFClient::UI::Entry 523 $self->{entry} = new CFPlus::UI::Entry
485 on_changed => sub { 524 on_changed => sub {
486 $self->update_labels; 525 $self->update_labels;
526 0
487 }, 527 },
488 on_button_down => sub { 528 on_button_down => sub {
489 my ($entry, $ev, $x, $y) = @_; 529 my ($entry, $ev, $x, $y) = @_;
490 530
491 if ($ev->{button} == 3) { 531 if ($ev->{button} == 3) {
492 (new CFClient::UI::Menu 532 (new CFPlus::UI::Menu
493 items => [ 533 items => [
534 ["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 }) }] 535 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
495 ], 536 ],
496 )->popup ($ev); 537 )->popup ($ev);
497 return 1; 538 return 1;
498 } 539 }
499 0 540 0
… …
506 if ($ev->{sym} == 13) { 547 if ($ev->{sym} == 13) {
507 if (exists $self->{select}) { 548 if (exists $self->{select}) {
508 $self->{last_command} = $self->{select}; 549 $self->{last_command} = $self->{select};
509 $::CONN->user_send ($self->{select}); 550 $::CONN->user_send ($self->{select});
510 551
511 unshift @{$self->{history}}, $self->{select}; 552 unshift @{$self->{history}}, $self->{entry}->get_text;
512 $self->{hist_ptr} = 0; 553 $self->{hist_ptr} = 0;
513 554
514 $self->hide; 555 $self->hide;
515 } 556 }
516 } elsif ($ev->{sym} == 27) { 557 } elsif ($ev->{sym} == 27) {
517 $self->{hist_ptr} = 0; 558 $self->{hist_ptr} = 0;
518 $self->hide; 559 $self->hide;
519 return;
520 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 560 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
521 if ($self->{hist_ptr} > 1) { 561 if ($self->{hist_ptr} > 1) {
522 $self->{hist_ptr}--; 562 $self->{hist_ptr}--;
523 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 563 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524 } elsif ($self->{hist_ptr} > 0) { 564 } elsif ($self->{hist_ptr} > 0) {
525 $self->{hist_ptr}--; 565 $self->{hist_ptr}--;
… …
527 } else { 567 } else {
528 ++$self->{select_offset} 568 ++$self->{select_offset}
529 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 569 if $self->{select_offset} < $#{ $self->{last_match} || [] };
530 } 570 }
531 $self->update_labels; 571 $self->update_labels;
532 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 572 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
533 if ($self->{select_offset}) { 573 if ($self->{select_offset}) {
534 --$self->{select_offset} 574 --$self->{select_offset}
535 } else { 575 } else {
536 unless ($self->{hist_ptr}) { 576 unless ($self->{hist_ptr}) {
537 $self->{hist_saveback} = $self->{entry}->get_text; 577 $self->{hist_saveback} = $self->{entry}->get_text;
… …
564 604
565 $self->{entry}->set_text ($prefix); 605 $self->{entry}->set_text ($prefix);
566 $self->show; 606 $self->show;
567} 607}
568 608
569sub size_allocate { 609sub invoke_size_allocate {
570 my ($self, $w, $h) = @_; 610 my ($self, $w, $h) = @_;
571 611
572 $self->SUPER::size_allocate ($w, $h);
573 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 612 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
613
614 $self->SUPER::invoke_size_allocate ($w, $h)
574} 615}
575 616
576sub show { 617sub show {
577 my ($self) = @_; 618 my ($self) = @_;
578 619
579 $self->SUPER::show; 620 $self->SUPER::show;
580 $self->{entry}->focus_in; 621 $self->{entry}->grab_focus;
581} 622}
582 623
583sub hide { 624sub hide {
584 my ($self) = @_; 625 my ($self) = @_;
626
627 $self->{hist_ptr} = 0;
585 628
586 $self->SUPER::hide; 629 $self->SUPER::hide;
587 $self->{entry}->set_text (""); 630 $self->{entry}->set_text ("");
588} 631}
589 632
590sub key_down { 633sub inject_key_down {
591 my ($self, $ev) = @_; 634 my ($self, $ev) = @_;
592 635
636 $self->{entry}->grab_focus;
593 $self->{entry}->key_down ($ev) 637 $self->{entry}->emit (key_down => $ev);
594} 638}
595 639
596sub update_labels { 640sub update_labels {
597 my ($self) = @_; 641 my ($self) = @_;
598 642
… …
685 $label->set_text (""); 729 $label->set_text ("");
686 $label->set_tooltip (""); 730 $label->set_tooltip ("");
687 } 731 }
688 732
689 $self->update; 733 $self->update;
690 ###
691} 734}
692 735
693sub _draw { 736sub _draw {
694 my ($self) = @_; 737 my ($self) = @_;
695 738
696 # hack 739 # hack
697 local $CFClient::UI::FOCUS = $self->{entry}; 740 local $CFPlus::UI::FOCUS = $self->{entry};
698 741
699 $self->SUPER::_draw; 742 $self->SUPER::_draw;
700} 743}
701 744
7021 7451

Diff Legend

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