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.29 by root, Thu May 18 16:42:26 2006 UTC vs.
Revision 1.78 by root, Sun Jul 23 16:11:12 2006 UTC

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

Diff Legend

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