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

Diff Legend

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