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.73 by root, Wed Jul 5 02:15:47 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 ["Stats &amp; Skills…\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
105 ["Inventory…\tF3", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
106 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
107 ["Setup… \tF5", 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
52 } 119 1
53} 120}
54 121
55sub button_up { 122sub invoke_button_up {
56 my ($self, $ev, $x, $y) = @_; 123 my ($self, $ev, $x, $y) = @_;
57 124
58 delete $self->{motion}; 125 delete $self->{motion};
59}
60 126
127 1
128}
129
61sub mouse_motion { 130sub invoke_mouse_motion {
62 my ($self, $ev, $x, $y) = @_; 131 my ($self, $ev, $x, $y) = @_;
63 132
133 if ($self->{motion}) {
64 $self->{motion}->($ev, $x, $y) if $self->{motion}; 134 $self->{motion}->($ev, $x, $y);
135 } else {
136 return 0;
137 }
138
139 1
65} 140}
66 141
67sub size_request { 142sub size_request {
68 ( 143 (
69 1 + 32 * int $::WIDTH / 32, 144 32 * CFClient::ceil $::WIDTH / 32,
70 1 + 32 * int $::HEIGHT / 32, 145 32 * CFClient::ceil $::HEIGHT / 32,
71 ) 146 )
72} 147}
73 148
74sub update { 149sub update {
75 my ($self) = @_; 150 my ($self) = @_;
76 151
77 $self->{need_update} = 1; 152 $self->{need_update} = 1;
78 $self->SUPER::update; 153 $self->SUPER::update;
79} 154}
80 155
156my %DIR = (
157 CFClient::SDLK_KP8, [1, "north"],
158 CFClient::SDLK_KP9, [2, "northeast"],
159 CFClient::SDLK_KP6, [3, "east"],
160 CFClient::SDLK_KP3, [4, "southeast"],
161 CFClient::SDLK_KP2, [5, "south"],
162 CFClient::SDLK_KP1, [6, "southwest"],
163 CFClient::SDLK_KP4, [7, "west"],
164 CFClient::SDLK_KP7, [8, "northwest"],
165
166 CFClient::SDLK_UP, [1, "north"],
167 CFClient::SDLK_RIGHT, [3, "east"],
168 CFClient::SDLK_DOWN, [5, "south"],
169 CFClient::SDLK_LEFT, [7, "west"],
170);
171
172sub invoke_key_down {
173 my ($self, $ev) = @_;
174
175 my $mod = $ev->{mod};
176 my $sym = $ev->{sym};
177 my $uni = $ev->{unicode};
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
208 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
209 $::CONN->user_send ("stay fire");
210 } elsif ($uni == ord ",") {
211 $::CONN->user_send ("take");
212 } elsif ($uni == ord " ") {
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;
226 } elsif ($uni == ord "'") {
227 $self->{completer}->set_prefix ("");
228 $self->{completer}->show;
229 } elsif (exists $DIR{$sym}) {
230 if ($mod & CFClient::KMOD_SHIFT) {
231 $self->{shft}++;
232 if ($DIR{$sym}[0] != $self->{fire_dir}) {
233 $::CONN->user_send ("fire $DIR{$sym}[0]");
234 }
235 $self->{fire_dir} = $DIR{$sym}[0];
236 } elsif ($mod & CFClient::KMOD_CTRL) {
237 $self->{ctrl}++;
238 $::CONN->user_send ("run $DIR{$sym}[0]");
239 } else {
240 $::CONN->user_send ("$DIR{$sym}[1]");
241 }
242 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
243 $self->{completer}->invoke_key_down ($ev);
244 $self->{completer}->show;
245 } else {
246 return 0;
247 }
248
249 1
250}
251
252sub invoke_key_up {
253 my ($self, $ev) = @_;
254
255 my $res = 0;
256 my $mod = $ev->{mod};
257 my $sym = $ev->{sym};
258
259 if ($::CFG->{shift_fire_stop}) {
260 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
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 }
275 }
276
277 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
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
81sub draw { 296sub draw {
82 my ($self) = @_; 297 my ($self) = @_;
83 298
299 return unless $::MAP;
300
301 my $focused = $CFClient::UI::FOCUS == $self
302 || $CFClient::UI::FOCUS == $self->{completer}{entry};
303
84 return 304 return
85 unless $CFClient::UI::FOCUS == $self || !$::FAST; 305 unless $focused || !$::FAST;
86 306
87 if (delete $self->{need_update}) { 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
88 glNewList $self->{list}; 346 glNewList $self->{list};
89 347
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; 348 glPushMatrix;
349 glTranslate $sx0, $sy0;
98 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 350 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
99 351
100 glTranslate $sx0 - 32, $sy0 - 32, 0; 352 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
101 353
102 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 354 glScale 32, 32;
103 355
104 if ($::CFG->{fow_enable}) { 356 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; 357 glEnable GL_TEXTURE_2D;
134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
135 359
136 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 360 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
137 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 361 $self->{fow_texture}->draw_quad_alpha (0, 0);
138 362
139 glDisable GL_TEXTURE_2D; 363 glDisable GL_TEXTURE_2D;
140 } 364 }
141 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
142 glPopMatrix; 377 glPopMatrix;
143 }
144
145 glEndList; 378 glEndList;
146 } 379 }
147 380
148 glPushMatrix;
149 glCallList $self->{list}; 381 glCallList $self->{list};
150 glPopMatrix;
151 382
152 # TNT2 emulates logops in software (or worse :) 383 # TNT2 emulates logops in software (or worse :)
153 if ($CFClient::UI::FOCUS == $self) { 384 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; 385 glColor 0.4, 0.2, 0.2, 0.6;
158 glEnable GL_BLEND; 386 glEnable GL_BLEND;
159 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 387 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
160 glBegin GL_QUADS; 388 glBegin GL_QUADS;
161 glVertex 0, 0; 389 glVertex 0, 0;
162 glVertex 0, $::HEIGHT; 390 glVertex 0, $::HEIGHT;
163 glVertex $::WIDTH, $::HEIGHT; 391 glVertex $::WIDTH, $::HEIGHT;
164 glVertex $::WIDTH, 0; 392 glVertex $::WIDTH, 0;
165 glEnd; 393 glEnd;
166 glDisable GL_BLEND; 394 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 } 395 }
189} 396}
190 397
191my %DIR = ( 398sub 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) = @_; 399 my $self = shift;
292 400
293 %{$self->{command}} = (); 401 glDeleteList $self->{list};
402
403 $self->SUPER::DESTROY;
294} 404}
295 405
296package CFClient::MapWidget::MapMap; 406package CFClient::MapWidget::MapMap;
297 407
298our @ISA = CFClient::UI::Base::; 408our @ISA = CFClient::UI::Base::;
… …
302 412
303sub size_request { 413sub size_request {
304 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 414 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
305} 415}
306 416
307sub size_allocate { 417sub invoke_size_allocate {
308 my ($self, $w, $h) = @_; 418 my ($self, $w, $h) = @_;
309 419
310 $self->SUPER::size_allocate ($w, $h);
311 $self->update; 420 $self->update;
421
422 1
312} 423}
313 424
314sub update { 425sub update {
315 my ($self) = @_; 426 my ($self) = @_;
316 427
… …
399 fontsize => $_, 510 fontsize => $_,
400 ), (0.8) x 16 511 ), (0.8) x 16
401 ]; 512 ];
402 513
403 $self->{entry} = new CFClient::UI::Entry 514 $self->{entry} = new CFClient::UI::Entry
404 connect_changed => sub { 515 on_changed => sub {
405 $self->update_labels; 516 $self->update_labels;
517 0
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
406 }; 582 }
583 ;
407 584
408 $self->{vbox}->add ( 585 $self->{vbox}->add (
409 $self->{entry}, 586 $self->{entry},
410 @{$self->{label}}, 587 @{$self->{label}},
411 ); 588 );
412 589
413 $self 590 $self
414} 591}
415 592
593sub set_prefix {
594 my ($self, $prefix) = @_;
595
596 $self->{entry}->set_text ($prefix);
597 $self->show;
598}
599
416sub size_allocate { 600sub invoke_size_allocate {
417 my ($self, $w, $h) = @_; 601 my ($self, $w, $h) = @_;
418 602
419 $self->SUPER::size_allocate ($w, $h);
420 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 603 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
421}
422 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
423sub key_down { 622sub invoke_key_down {
424 my ($self, $ev) = @_; 623 my ($self, $ev) = @_;
425 624
426 if ($ev->{sym} == 13) {
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); 625 $self->{entry}->emit (key_down => $ev)
446 }
447} 626}
448 627
449sub update_labels { 628sub update_labels {
450 my ($self) = @_; 629 my ($self) = @_;
451 630
452 my $text = $self->{entry}->get_text; 631 my $text = $self->{entry}->get_text;
453 632
454 length $text 633 length $text
455 or return $self->emit ("close"); 634 or return $self->hide;
456 635
457 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; 636 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
458 637
459 if ($cmd ne $self->{last_search}) { 638 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; 639 my @match;
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
473 my @penalty; 656 my @penalty;
474 657
475 for (keys %{$self->{command}}) { 658 for (keys %{$self->{command}}) {
476 if (@penalty = $_ =~ $regexp) { 659 if (@penalty = $_ =~ $regexp) {
477 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 660 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
661 }
478 } 662 }
479 }
480 663
481 @match = map $self->{command}{$_->[0]}, 664 @match = map $self->{command}{$_->[0]},
482 sort { 665 sort {
483 $a->[1] <=> $b->[1] 666 $a->[1] <=> $b->[1]
484 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 667 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
485 or (length $a->[0]) <=> (length $b->[0]) 668 or (length $b->[0]) <=> (length $a->[0])
486 } @match; 669 } @match;
670 }
487 671
488 $self->{last_search} = $cmd; 672 $self->{last_search} = $text;
489 $self->{last_match} = \@match; 673 $self->{last_match} = \@match;
490 674
491 $self->{select_offset} = 0; 675 $self->{select_offset} = 0;
492 } 676 }
493 677
… …
533 $label->set_text (""); 717 $label->set_text ("");
534 $label->set_tooltip (""); 718 $label->set_tooltip ("");
535 } 719 }
536 720
537 $self->update; 721 $self->update;
538 ###
539} 722}
540 723
541sub _draw { 724sub _draw {
542 my ($self) = @_; 725 my ($self) = @_;
543 726

Diff Legend

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