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

Diff Legend

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