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.17 by root, Mon Apr 24 13:12:32 2006 UTC vs.
Revision 1.71 by root, Sun Jul 2 21:07:26 2006 UTC

… …
7 7
8use CFClient::OpenGL; 8use CFClient::OpenGL;
9 9
10our @ISA = CFClient::UI::Base::; 10our @ISA = CFClient::UI::Base::;
11 11
12my $magicmap_tex =
13 new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png",
14 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
15
12sub new { 16sub new {
13 my $class = shift; 17 my $class = shift;
14 18
15 $class->SUPER::new ( 19 my $self = $class->SUPER::new (
16 z => -1, 20 z => -1,
17 can_focus => 1, 21 can_focus => 1,
18 list => glGenList, 22 list => glGenList,
23
24 smooth_matrix => [
25 0.05, 0.13, 0.05,
26 0.13, 0.30, 0.13,
27 0.05, 0.13, 0.05,
28 ],
29
19 @_ 30 @_
20 ) 31 );
21}
22 32
23sub DESTROY { 33 $self->{completer} = new CFClient::MapWidget::Command::
34 command => $self->{command},
35 can_focus => 1,
36 tooltip => "<b>The Command Completer</b>\n\n"
37 . "This is your central interface to send text commands to the server. "
38 . "To enter a verbatim command to send to the server, just type the command, "
39 . "followed by a space, and press return. "
40 . "Typing the initial letters of words (or just any letters) displays guesses "
41 . "for commands you might want to use.\n"
42 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
43 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
44 ;
45
46 $self
47}
48
49sub add_command {
50 my ($self, $command, $tooltip, $widget, $cb) = @_;
51
52 (my $data = $command) =~ s/\\//g;
53
54 $tooltip =~ s/^\s+//;
55 $tooltip = "<big>$data</big>\n\n$tooltip";
56 $tooltip =~ s/\s+$//;
57
58 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
59}
60
61sub clr_commands {
24 my $self = shift; 62 my ($self) = @_;
25 63
26 glDeleteList $self->{list}; 64 %{$self->{completer}{command}} = ();
27
28 $self->SUPER::DESTROY;
29} 65}
30 66
31sub button_down { 67sub invoke_button_down {
32 my ($self, $ev, $x, $y) = @_; 68 my ($self, $ev, $x, $y) = @_;
33 69
34 $self->focus_in;
35
36 if ($ev->{button} == 2) { 70 if ($ev->{button} == 1) {
71 $self->grab_focus;
72 return unless $::CONN;
73
74 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
75 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
76
77 $x -= int 0.5 * $self->{sw};
78 $y -= int 0.5 * $self->{sh};
79
80 $::CONN->lookat ($x, $y)
81 if $::CONN;
82
83 } elsif ($ev->{button} == 2) {
84 $self->grab_focus;
85 return unless $::CONN;
86
37 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 87 my ($ox, $oy) = ($ev->{x}, $ev->{y});
38 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 88 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
39 89
40 $self->{motion} = sub { 90 $self->{motion} = sub {
41 my ($ev, $x, $y) = @_; 91 my ($ev, $x, $y) = @_;
… …
45 $::CFG->{map_shift_x} = $bw + $x - $ox; 95 $::CFG->{map_shift_x} = $bw + $x - $ox;
46 $::CFG->{map_shift_y} = $bh + $y - $oy; 96 $::CFG->{map_shift_y} = $bh + $y - $oy;
47 97
48 $self->update; 98 $self->update;
49 }; 99 };
100 } elsif ($ev->{button} == 3) {
101 (new CFClient::UI::Menu
102 items => [
103 ["Help Browser… (F1)", sub { $::HELP_WINDOW->toggle_visibility }],
104 ["Stats &amp; Skills… (F2)", sub { ::toggle_player_page ($::STATS_PAGE) }],
105 ["Inventory… (F3)", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
106 ["Spells… (F4)", sub { ::toggle_player_page ($::SPELL_PAGE) }],
107 ["Setup… (F5)", sub { $::SETUP_DIALOG->toggle_visibility }],
108 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
109 [
110 $::PICKUP_ENABLE->{state}
111 ? "Disable automatic pickup"
112 : "Enable automatic pickup",
113 sub { $::PICKUP_ENABLE->toggle }
114 ],
115 ],
116 )->popup ($ev);
117 }
118
50 } 119 1
51} 120}
52 121
53sub button_up { 122sub invoke_button_up {
54 my ($self, $ev, $x, $y) = @_; 123 my ($self, $ev, $x, $y) = @_;
55 124
56 delete $self->{motion}; 125 delete $self->{motion};
57}
58 126
127 1
128}
129
59sub mouse_motion { 130sub invoke_mouse_motion {
60 my ($self, $ev, $x, $y) = @_; 131 my ($self, $ev, $x, $y) = @_;
61 132
133 if ($self->{motion}) {
62 $self->{motion}->($ev, $x, $y) if $self->{motion}; 134 $self->{motion}->($ev, $x, $y);
135 } else {
136 return 0;
137 }
138
139 1
63} 140}
64 141
65sub size_request { 142sub size_request {
66 ( 143 (
67 1 + 32 * int $::WIDTH / 32, 144 32 * CFClient::ceil $::WIDTH / 32,
68 1 + 32 * int $::HEIGHT / 32, 145 32 * CFClient::ceil $::HEIGHT / 32,
69 ) 146 )
70} 147}
71 148
72sub update { 149sub update {
73 my ($self) = @_; 150 my ($self) = @_;
74 151
75 $self->{need_update} = 1; 152 $self->{need_update} = 1;
76 $self->SUPER::update; 153 $self->SUPER::update;
77}
78
79sub draw {
80 my ($self) = @_;
81
82 if (delete $self->{need_update}) {
83 glNewList $self->{list};
84
85 if ($::MAP) {
86 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
87 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
88
89 glPushMatrix;
90 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
91
92 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
93 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
94
95 glTranslate $sx0 - 32, $sy0 - 32, 0;
96
97 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
98
99 if ($::CFG->{fow_enable}) {
100 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
101 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
102 glConvolutionFilter2D (
103 GL_CONVOLUTION_2D,
104 GL_ALPHA,
105 3, 3,
106 GL_ALPHA, GL_FLOAT,
107 pack "f*",
108 0.05, 0.13, 0.05,
109 0.13, 0.30, 0.13,
110 0.05, 0.13, 0.05,
111 );
112 glEnable GL_CONVOLUTION_2D;
113 }
114
115 $self->{fow_texture} = new CFClient::Texture
116 w => $w,
117 h => $h,
118 data => $data,
119 internalformat => GL_ALPHA,
120 format => GL_ALPHA;
121
122 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
123
124 glEnable GL_BLEND;
125 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
126 glEnable GL_TEXTURE_2D;
127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
128
129 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
130 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
131
132 glDisable GL_TEXTURE_2D;
133 glDisable GL_BLEND;
134 }
135
136 # HACK BEGIN
137 {
138 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
139
140 glTranslate 0, 30;
141 my ($w, $h) = (250, 250);
142
143 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
144
145 glEnable GL_BLEND;
146 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
147 glEnable GL_TEXTURE_2D;
148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
149
150 glPopMatrix;
151
152 $self->{mapmap_texture} =
153 new CFClient::Texture
154 w => $w,
155 h => $h,
156 data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
157 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
158
159 $self->{mapmap_texture}->draw_quad (0, 0);
160
161 glDisable GL_TEXTURE_2D;
162
163 glTranslate 0.375, 0.375;
164
165 glColor 1, 1, 0, 1;
166 glBegin GL_LINE_LOOP;
167 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
168 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
169 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
170 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
171 glEnd;
172
173 glDisable GL_BLEND;
174 }
175 # HACK END
176 }
177
178 glEndList;
179 }
180
181 glPushMatrix;
182 glCallList $self->{list};
183 glPopMatrix;
184
185 if ($CFClient::UI::FOCUS != $self) {
186 glColor 64/255, 64/255, 64/255;
187 glLogicOp GL_AND;
188 glEnable GL_COLOR_LOGIC_OP;
189 glBegin GL_QUADS;
190 glVertex 0, 0;
191 glVertex 0, $::HEIGHT;
192 glVertex $::WIDTH, $::HEIGHT;
193 glVertex $::WIDTH, 0;
194 glEnd;
195 glDisable GL_COLOR_LOGIC_OP;
196 }
197} 154}
198 155
199my %DIR = ( 156my %DIR = (
200 CFClient::SDLK_KP8, [1, "north"], 157 CFClient::SDLK_KP8, [1, "north"],
201 CFClient::SDLK_KP9, [2, "northeast"], 158 CFClient::SDLK_KP9, [2, "northeast"],
… …
210 CFClient::SDLK_RIGHT, [3, "east"], 167 CFClient::SDLK_RIGHT, [3, "east"],
211 CFClient::SDLK_DOWN, [5, "south"], 168 CFClient::SDLK_DOWN, [5, "south"],
212 CFClient::SDLK_LEFT, [7, "west"], 169 CFClient::SDLK_LEFT, [7, "west"],
213); 170);
214 171
215sub key_down { 172sub invoke_key_down {
216 my ($self, $ev) = @_; 173 my ($self, $ev) = @_;
217 174
218 my $mod = $ev->{mod}; 175 my $mod = $ev->{mod};
219 my $sym = $ev->{sym}; 176 my $sym = $ev->{sym};
177 my $uni = $ev->{unicode};
220 178
179 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT;
180
181 if ($uni == ord "\t") {
182 $::PL_WINDOW->toggle_visibility;
183 } elsif ($sym == CFClient::SDLK_F1 && !$mod) {
184 $::HELP_WINDOW->toggle_visibility;
185 } elsif ($sym == CFClient::SDLK_F2 && !$mod) {
186 ::toggle_player_page ($::STATS_PAGE);
187 } elsif ($sym == CFClient::SDLK_F3 && !$mod) {
188 ::toggle_player_page ($::INVENTORY_PAGE);
189 } elsif ($sym == CFClient::SDLK_F4 && !$mod) {
190 ::toggle_player_page ($::SPELL_PAGE);
191 } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
192 $::SETUP_DIALOG->toggle_visibility;
193 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
194 $::BIND_EDITOR->set_binding (undef, undef, [],
195 sub {
196 my ($mod, $sym, $cmds) = @_;
197 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
198 });
199 $::BIND_EDITOR->start;
200 $::BIND_EDITOR->show;
201 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
202 $::BIND_EDITOR->stop;
203 $::BIND_EDITOR->ask_for_bind_and_commit;
204 $::BIND_EDITOR->hide;
205 } elsif (!$::CONN) {
206 return 0; # bindings further down need a valid connection
207
221 if ($sym == CFClient::SDLK_KP5) { 208 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
222 $::CONN->user_send ("stay fire"); 209 $::CONN->user_send ("stay fire");
223 } elsif ($sym == ord ",") { 210 } elsif ($uni == ord ",") {
224 $::CONN->user_send ("take"); 211 $::CONN->user_send ("take");
225 } elsif ($sym == ord "a") { 212 } elsif ($uni == ord " ") {
226 $::CONN->user_send ("apply"); 213 $::CONN->user_send ("apply");
214 } elsif ($uni == ord ".") {
215 $::CONN->user_send ($self->{completer}{last_command})
216 if exists $self->{completer}{last_command};
217 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
218 $::CONN->user_send ($_) for @$bind_cmd;
219 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
220 $::CONN->user_send ("rotateshoottype +");
221 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
222 $::CONN->user_send ("rotateshoottype -");
223 } elsif ($uni == ord '"') {
224 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
225 $self->{completer}->show;
227 } elsif ($sym == ord "'") { 226 } elsif ($uni == ord "'") {
228 $self->emit ('activate_console'); 227 $self->{completer}->set_prefix ("");
229 } elsif ($sym == ord "/") { 228 $self->{completer}->show;
230 $self->emit (activate_console => '/');
231 } elsif (exists $DIR{$sym}) { 229 } elsif (exists $DIR{$sym}) {
232 if ($mod & CFClient::KMOD_SHIFT) { 230 if ($mod & CFClient::KMOD_SHIFT) {
233 $self->{shft}++; 231 $self->{shft}++;
232 if ($DIR{$sym}[0] != $self->{fire_dir}) {
234 $::CONN->user_send ("fire $DIR{$sym}[0]"); 233 $::CONN->user_send ("fire $DIR{$sym}[0]");
234 }
235 $self->{fire_dir} = $DIR{$sym}[0];
235 } elsif ($mod & CFClient::KMOD_CTRL) { 236 } elsif ($mod & CFClient::KMOD_CTRL) {
236 $self->{ctrl}++; 237 $self->{ctrl}++;
237 $::CONN->user_send ("run $DIR{$sym}[0]"); 238 $::CONN->user_send ("run $DIR{$sym}[0]");
238 } else { 239 } else {
239 $::CONN->user_send ("$DIR{$sym}[1]"); 240 $::CONN->user_send ("$DIR{$sym}[1]");
240 } 241 }
241 } elsif ($ev->{unicode}) { 242 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
242 $self->{command_widget} ||=
243 new CFClient::MapWidget::Command::
244 command => $self->{command},
245 can_focus => 1,
246 connect_execute => sub {
247 # todo: support callback instead of user_send
248 $::CONN->user_send ($_[1][1]);
249 },
250 connect_close => sub {
251 (delete $self->{command_widget})->hide;
252 $self->focus_in;
253 },
254 ;
255 $self->{command_widget}->key_down ($ev); 243 $self->{completer}->invoke_key_down ($ev);
256 return unless $self->{command_widget};
257 $self->{command_widget}->show; 244 $self->{completer}->show;
258 $self->{command_widget}->focus_in; 245 } else {
246 return 0;
247 }
248
259 } 249 1
260} 250}
261 251
262sub key_up { 252sub invoke_key_up {
263 my ($self, $ev) = @_; 253 my ($self, $ev) = @_;
264 254
255 my $res = 0;
265 my $mod = $ev->{mod}; 256 my $mod = $ev->{mod};
266 my $sym = $ev->{sym}; 257 my $sym = $ev->{sym};
267 258
259 if ($::CFG->{shift_fire_stop}) {
268 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 260 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
269 $::CONN->user_send ("fire_stop"); 261 $::CONN->user_send ("fire_stop");
262 delete $self->{fire_dir};
263 $res = 1;
264 }
265 } else {
266 if (exists $DIR{$sym} && delete $self->{shft}) {
267 $::CONN->user_send ("fire_stop");
268 delete $self->{fire_dir};
269 $res = 1;
270 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
271 $::CONN->user_send ("fire_stop");
272 delete $self->{fire_dir};
273 $res = 1;
274 }
270 } 275 }
276
271 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 277 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
272 $::CONN->user_send ("run_stop"); 278 $::CONN->user_send ("run_stop");
279 $res = 1;
280 }
281
282 $res
283}
284
285sub set_magicmap {
286 my ($self, $w, $h, $x, $y, $data) = @_;
287
288 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
289 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
290
291 $self->{magicmap} = [$x, $y, $w, $h, $data];
292
293 $self->update;
294}
295
296sub draw {
297 my ($self) = @_;
298
299 return unless $::MAP;
300
301 my $focused = $CFClient::UI::FOCUS == $self
302 || $CFClient::UI::FOCUS == $self->{completer}{entry};
303
304 return
305 unless $focused || !$::FAST;
306
307 if (delete $self->{need_update}) {
308 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
309
310 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
311 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
312
313 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
314 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
315
316 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
317 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
318
319 if ($::CFG->{fow_enable}) {
320 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
321
322 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
323 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
324 glConvolutionFilter2D (
325 GL_CONVOLUTION_2D,
326 GL_ALPHA,
327 3, 3,
328 GL_ALPHA, GL_FLOAT,
329 (pack "f*", @{ $self->{smooth_matrix} }),
330 );
331 glEnable GL_CONVOLUTION_2D;
332 }
333
334 $self->{fow_texture} = new CFClient::Texture
335 w => $w,
336 h => $h,
337 data => $data,
338 internalformat => GL_ALPHA,
339 format => GL_ALPHA;
340
341 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
342 } else {
343 delete $self->{fow_texture};
344 }
345
346 glNewList $self->{list};
347
348 glPushMatrix;
349 glTranslate $sx0, $sy0;
350 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
351
352 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
353
354 glScale 32, 32;
355
356 if (my $tex = $self->{fow_texture}) {
357 glEnable GL_TEXTURE_2D;
358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
359
360 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
361 $self->{fow_texture}->draw_quad_alpha (0, 0);
362
363 glDisable GL_TEXTURE_2D;
364 }
365
366 if ($self->{magicmap}) {
367 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
368
369 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
370 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
371
372 glTranslate - $x - 1, - $y - 1;
373 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
374 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
375 }
376
377 glPopMatrix;
378 glEndList;
379 }
380
381 glCallList $self->{list};
382
383 # TNT2 emulates logops in software (or worse :)
384 unless ($focused) {
385 glColor 0.4, 0.2, 0.2, 0.6;
386 glEnable GL_BLEND;
387 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
388 glBegin GL_QUADS;
389 glVertex 0, 0;
390 glVertex 0, $::HEIGHT;
391 glVertex $::WIDTH, $::HEIGHT;
392 glVertex $::WIDTH, 0;
393 glEnd;
394 glDisable GL_BLEND;
395 }
396}
397
398sub DESTROY {
399 my $self = shift;
400
401 glDeleteList $self->{list};
402
403 $self->SUPER::DESTROY;
404}
405
406package CFClient::MapWidget::MapMap;
407
408our @ISA = CFClient::UI::Base::;
409
410use Time::HiRes qw(time);
411use CFClient::OpenGL;
412
413sub size_request {
414 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
415}
416
417sub invoke_size_allocate {
418 my ($self, $w, $h) = @_;
419
420 $self->update;
421
422 1
423}
424
425sub update {
426 my ($self) = @_;
427
428 delete $self->{texture_atime};
429 $self->SUPER::update;
430}
431
432sub _draw {
433 my ($self) = @_;
434
435 $::MAP or return;
436
437 my ($w, $h) = @$self{qw(w h)};
438
439 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
440 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
441
442 my $sx = int $::CFG->{map_shift_x} / 32;
443 my $sy = int $::CFG->{map_shift_y} / 32;
444
445 my $ox = 0.5 * ($w - $sw);
446 my $oy = 0.5 * ($h - $sh);
447
448 glEnable GL_BLEND;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glEnable GL_TEXTURE_2D;
451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
452
453 if ($self->{texture_atime} < time) {
454 $self->{texture_atime} = time + 1/3;
455
456 $self->{texture} =
457 new CFClient::Texture
458 w => $w,
459 h => $h,
460 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
461 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
462 }
463
464 $self->{texture}->draw_quad (0, 0);
465
466 glDisable GL_TEXTURE_2D;
467
468 glTranslate 0.375, 0.375;
469
470 #TODO: map scale is completely borked
471
472 my $x0 = int $ox - $sx + 0.5;
473 my $y0 = int $oy - $sy + 0.5;
474
475 glColor 1, 1, 0, 1;
476 glBegin GL_LINE_LOOP;
477 glVertex $x0 , $y0 ;
478 glVertex $x0 , $y0 + $sh;
479 glVertex $x0 + $sw, $y0 + $sh;
480 glVertex $x0 + $sw, $y0 ;
481 glEnd;
273 } 482
274} 483 glDisable GL_BLEND;
275
276sub add_command {
277 my ($self, $command, $tooltip, $widget, $cb) = @_;
278
279 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
280
281 push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];
282} 484}
283 485
284package CFClient::MapWidget::Command; 486package CFClient::MapWidget::Command;
285 487
286use strict; 488use strict;
287 489
288use CFClient::OpenGL; 490use CFClient::OpenGL;
289 491
290our @ISA = CFClient::UI::VBox::; 492our @ISA = CFClient::UI::Frame::;
291 493
292sub new { 494sub new {
293 my $class = shift; 495 my $class = shift;
294 496
295 my $self = $class->SUPER::new ( 497 my $self = $class->SUPER::new (
498 bg => [0, 0, 0, 0.8],
296 @_, 499 @_,
297 children => [map 500 );
501
502 $self->add ($self->{vbox} = new CFClient::UI::VBox);
503
504 $self->{label} = [
505 map
298 CFClient::UI::Label->new ( 506 CFClient::UI::Label->new (
299 can_hover => 1, 507 can_hover => 1,
300 can_events => 1, 508 can_events => 1,
509 tooltip_width => 0.33,
301 fontsize => $_, 510 fontsize => $_,
302 ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8 511 ), (0.8) x 16
512 ];
513
514 $self->{entry} = new CFClient::UI::Entry
515 on_changed => sub {
516 $self->update_labels;
517 0
303 ], 518 },
519 on_button_down => sub {
520 my ($entry, $ev, $x, $y) = @_;
521
522 if ($ev->{button} == 3) {
523 (new CFClient::UI::Menu
524 items => [
525 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key"
526 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
527 ],
528 )->popup ($ev);
529 return 1;
530 }
531 0
532 },
533 on_key_down => sub {
534 my ($entry, $ev) = @_;
535
536 my $self = $entry->{parent}{parent};
537
538 if ($ev->{sym} == 13) {
539 if (exists $self->{select}) {
540 $self->{last_command} = $self->{select};
541 $::CONN->user_send ($self->{select});
542
543 unshift @{$self->{history}}, $self->{entry}->get_text;
544 $self->{hist_ptr} = 0;
545
546 $self->hide;
547 }
548 } elsif ($ev->{sym} == 27) {
549 $self->{hist_ptr} = 0;
550 $self->hide;
551 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
552 if ($self->{hist_ptr} > 1) {
553 $self->{hist_ptr}--;
554 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
555 } elsif ($self->{hist_ptr} > 0) {
556 $self->{hist_ptr}--;
557 $self->{entry}->set_text ($self->{hist_saveback});
558 } else {
559 ++$self->{select_offset}
560 if $self->{select_offset} < $#{ $self->{last_match} || [] };
561 }
562 $self->update_labels;
563 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
564 if ($self->{select_offset}) {
565 --$self->{select_offset}
566 } else {
567 unless ($self->{hist_ptr}) {
568 $self->{hist_saveback} = $self->{entry}->get_text;
569 }
570 if ($self->{hist_ptr} <= $#{$self->{history}}) {
571 $self->{hist_ptr}++;
572 }
573 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
574 if exists $self->{history}->[$self->{hist_ptr} - 1];
575 }
576 $self->update_labels;
577 } else {
578 return 0;
579 }
580
581 1
582 }
583 ;
584
585 $self->{vbox}->add (
586 $self->{entry},
587 @{$self->{label}},
304 ); 588 );
305 589
306 $self 590 $self
307} 591}
308 592
593sub set_prefix {
594 my ($self, $prefix) = @_;
595
596 $self->{entry}->set_text ($prefix);
597 $self->show;
598}
599
309sub size_allocate { 600sub invoke_size_allocate {
310 my ($self, $w, $h) = @_; 601 my ($self, $w, $h) = @_;
311 602
312 $self->SUPER::size_allocate ($w, $h);
313 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 603 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
604
605 $self->SUPER::invoke_size_allocate ($w, $h)
606}
607
608sub show {
609 my ($self) = @_;
610
611 $self->SUPER::show;
612 $self->{entry}->grab_focus;
613}
614
615sub hide {
616 my ($self) = @_;
617
618 $self->SUPER::hide;
619 $self->{entry}->set_text ("");
620}
621
622sub invoke_key_down {
623 my ($self, $ev) = @_;
624
625 $self->{entry}->emit (key_down => $ev)
314} 626}
315 627
316sub update_labels { 628sub update_labels {
317 my ($self) = @_; 629 my ($self) = @_;
318 630
319 my $command = $self->{command}; 631 my $text = $self->{entry}->get_text;
320 my $search_abbrev = qr/^\Q$self->{search}/;
321 my $search_full = qr/\Q$self->{search}/;
322 632
323 my @found; 633 length $text
634 or return $self->hide;
324 635
325 for (@$command) { 636 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
326 if ($_->[0] =~ $search_abbrev) { 637
327 push @found, [$_->[0], $_]; 638 if ($text ne $self->{last_search}) {
328 } elsif ($_->[1] =~ $search_full) { 639 my @match;
329 push @found, [$_->[1], $_]; 640
641 if ($text =~ /^(.*?)\s+$/) {
642 @match = [$cmd, "(appended whitespace suppresses completion)"];
643 } else {
644 my $regexp = do {
645 my ($beg, @chr) = split //, lc $cmd;
646
647 # the following regex is used to match our "completion entry"
648 # to an actual command - the parentheses match kind of "overhead"
649 # - the more characters the parentheses match, the less attractive
650 # is the match.
651 my $regexp = "^\Q$beg\E"
652 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
653 qr<$regexp>
654 };
655
656 my @penalty;
657
658 for (keys %{$self->{command}}) {
659 if (@penalty = $_ =~ $regexp) {
660 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
661 }
330 } 662 }
331 }
332 663
333 @found = sort { $a->[0] cmp $b->[0] } @found; 664 @match = map $self->{command}{$_->[0]},
665 sort {
666 $a->[1] <=> $b->[1]
667 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
668 or (length $b->[0]) <=> (length $a->[0])
669 } @match;
670 }
334 671
335 $self->{children}[0]->set_text ("$self->{search}_"); 672 $self->{last_search} = $text;
673 $self->{last_match} = \@match;
336 674
337 for (0..5) { 675 $self->{select_offset} = 0;
338 $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
339 $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
340 } 676 }
341 677
342 $self->{select} = $found[0][1] 678 my @labels = @{ $self->{label} };
343 if @found; 679 my @matches = @{ $self->{last_match} || [] };
344 680
345 if (@found > 6) { 681 if ($self->{select_offset}) {
346 $self->{children}[6]->set_text ("..."); 682 splice @matches, 0, $self->{select_offset}, ();
347 }
348 683
349 $self->check_size; 684 my $label = shift @labels;
350} 685 $label->set_text ("...");
686 $label->set_tooltip ("Use Cursor-Up to view previous matches");
687 }
351 688
352sub key_down { 689 for my $label (@labels) {
690 $label->{fg} = [1, 1, 1, 1];
691 $label->{bg} = [0, 0, 0, 0];
692 }
693
694 if (@matches) {
695 $self->{select} = "$matches[0][0]$arg";
696
697 $labels[0]->{fg} = [0, 0, 0, 1];
698 $labels[0]->{bg} = [1, 1, 1, 0.8];
699 } else {
700 $self->{select} = "$cmd$arg";
701 }
702
703 for my $match (@matches) {
704 my $label = shift @labels;
705
706 if (@labels) {
707 $label->set_text ("$match->[0]$arg");
708 $label->set_tooltip ($match->[1]);
709 } else {
710 $label->set_text ("...");
711 $label->set_tooltip ("Use Cursor-Down to view more matches");
712 last;
713 }
714 }
715
716 for my $label (@labels) {
717 $label->set_text ("");
718 $label->set_tooltip ("");
719 }
720
721 $self->update;
722}
723
724sub _draw {
353 my ($self, $ev) = @_; 725 my ($self) = @_;
354 726
355 if ($ev->{sym} == 8) { 727 # hack
356 substr $self->{search}, -1, 1, ""; 728 local $CFClient::UI::FOCUS = $self->{entry};
357 $self->update_labels;
358 } elsif ($ev->{sym} == 13) {
359 if (exists $self->{select}) {
360 $self->emit (execute => $self->{select});
361 $self->emit ("close");
362 }
363 } elsif ($ev->{sym} == 27) {
364 $self->emit ("close");
365 return;
366 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
367 $self->{search} .= chr $ev->{unicode};
368 $self->update_labels;
369 }
370 729
371 length $self->{search} 730 $self->SUPER::_draw;
372 or $self->emit ("close");
373} 731}
374 732
3751 7331

Diff Legend

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