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.31 by root, Fri May 19 23:18:42 2006 UTC vs.
Revision 1.75 by root, Tue Jul 18 06:56:35 2006 UTC

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

Diff Legend

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