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.50 by root, Sat Jun 3 23:47:47 2006 UTC vs.
Revision 1.79 by elmex, Mon Jul 24 12:25:09 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
22 $self->{completer} = new CFClient::MapWidget::Command:: 35 $self->{completer} = new CFClient::MapWidget::Command::
23 command => $self->{command}, 36 command => $self->{command},
24 can_focus => 1,
25 tooltip => "<b>The Command Completer</b>\n\n" 37 tooltip => "<b>The Command Completer</b>\n\n"
26 . "This is your central interface to send text commands to the server. " 38 . "This is your central interface to send text commands to the server. "
27 . "To enter a verbatim command to send to the server, just type the command, " 39 . "To enter a verbatim command to send to the server, just type the command, "
28 . "followed by a space, and press return. " 40 . "followed by a space, and press return. "
29 . "Typing the initial letters of words (or just any letters) displays guesses " 41 . "Typing the initial letters of words (or just any letters) displays guesses "
30 . "for commands you might want to use.\n" 42 . "for commands you might want to use.\n"
31 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n" 43 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
32 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.", 44 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
33 ; 45 ;
34 46
35 $self 47 $self
36} 48}
37 49
… …
49 61
50sub clr_commands { 62sub clr_commands {
51 my ($self) = @_; 63 my ($self) = @_;
52 64
53 %{$self->{completer}{command}} = (); 65 %{$self->{completer}{command}} = ();
54}
55 66
67 $self->{completer}->hide
68 if $self->{completer};
69}
70
56sub button_down { 71sub invoke_button_down {
57 my ($self, $ev, $x, $y) = @_; 72 my ($self, $ev, $x, $y) = @_;
58 73
59 $self->focus_in;
60
61 if ($ev->{button} == 1) { 74 if ($ev->{button} == 1) {
62 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 75 $self->grab_focus;
63 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 76 return unless $::CONN;
64 77
65 my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99; 78 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
66 my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99; 79 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
67 80
68 $::CONN->send (sprintf "lookat %d %d", $fx, $fy); 81 $x -= int 0.5 * $self->{sw};
82 $y -= int 0.5 * $self->{sh};
83
84 $::CONN->lookat ($x, $y)
85 if $::CONN;
69 86
70 } elsif ($ev->{button} == 2) { 87 } elsif ($ev->{button} == 2) {
88 $self->grab_focus;
89 return unless $::CONN;
90
71 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 91 my ($ox, $oy) = ($ev->{x}, $ev->{y});
72 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 92 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
73 93
74 $self->{motion} = sub { 94 $self->{motion} = sub {
75 my ($ev, $x, $y) = @_; 95 my ($ev, $x, $y) = @_;
… …
79 $::CFG->{map_shift_x} = $bw + $x - $ox; 99 $::CFG->{map_shift_x} = $bw + $x - $ox;
80 $::CFG->{map_shift_y} = $bh + $y - $oy; 100 $::CFG->{map_shift_y} = $bh + $y - $oy;
81 101
82 $self->update; 102 $self->update;
83 }; 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 ["Quit",
121 sub {
122 if ($::CONN) {
123 &::open_quit_dialog;
124 } else {
125 exit;
126 }
127 }
128 ],
129 ],
130 )->popup ($ev);
84 } 131 }
85 132
86 1 133 1
87} 134}
88 135
89sub button_up { 136sub invoke_button_up {
90 my ($self, $ev, $x, $y) = @_; 137 my ($self, $ev, $x, $y) = @_;
91 138
92 delete $self->{motion}; 139 delete $self->{motion};
93 140
94 1 141 1
95} 142}
96 143
97sub mouse_motion { 144sub invoke_mouse_motion {
98 my ($self, $ev, $x, $y) = @_; 145 my ($self, $ev, $x, $y) = @_;
99 146
100 if ($self->{motion}) { 147 if ($self->{motion}) {
101 $self->{motion}->($ev, $x, $y); 148 $self->{motion}->($ev, $x, $y);
102 } else { 149 } else {
… …
106 1 153 1
107} 154}
108 155
109sub size_request { 156sub size_request {
110 ( 157 (
111 1 + 32 * int $::WIDTH / 32, 158 32 * CFClient::ceil $::WIDTH / 32,
112 1 + 32 * int $::HEIGHT / 32, 159 32 * CFClient::ceil $::HEIGHT / 32,
113 ) 160 )
114} 161}
115 162
116sub update { 163sub update {
117 my ($self) = @_; 164 my ($self) = @_;
… …
134 CFClient::SDLK_RIGHT, [3, "east"], 181 CFClient::SDLK_RIGHT, [3, "east"],
135 CFClient::SDLK_DOWN, [5, "south"], 182 CFClient::SDLK_DOWN, [5, "south"],
136 CFClient::SDLK_LEFT, [7, "west"], 183 CFClient::SDLK_LEFT, [7, "west"],
137); 184);
138 185
139sub key_down { 186sub invoke_key_down {
140 my ($self, $ev) = @_; 187 my ($self, $ev) = @_;
141
142 return 0 unless $::CONN;
143 188
144 my $mod = $ev->{mod}; 189 my $mod = $ev->{mod};
145 my $sym = $ev->{sym}; 190 my $sym = $ev->{sym};
146 my $uni = $ev->{unicode}; 191 my $uni = $ev->{unicode};
147 192
193 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT;
194
195 if ($uni == ord "\t") {
196 $::PL_WINDOW->toggle_visibility;
197 } elsif ($sym == CFClient::SDLK_F1 && !$mod) {
198 $::HELP_WINDOW->toggle_visibility;
199 } elsif ($sym == CFClient::SDLK_F2 && !$mod) {
200 ::toggle_player_page ($::STATS_PAGE);
201 } elsif ($sym == CFClient::SDLK_F3 && !$mod) {
202 ::toggle_player_page ($::SKILL_PAGE);
203 } elsif ($sym == CFClient::SDLK_F4 && !$mod) {
204 ::toggle_player_page ($::SPELL_PAGE);
205 } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
206 ::toggle_player_page ($::INVENTORY_PAGE);
207 } elsif ($sym == CFClient::SDLK_F9 && !$mod) {
208 $::SETUP_DIALOG->toggle_visibility;
209 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
210 $::BIND_EDITOR->set_binding (undef, undef, [],
211 sub {
212 my ($mod, $sym, $cmds) = @_;
213 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
214 });
215 $::BIND_EDITOR->start;
216 $::BIND_EDITOR->show;
217 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
218 $::BIND_EDITOR->stop;
219 $::BIND_EDITOR->ask_for_bind_and_commit;
220 $::BIND_EDITOR->hide;
221 } elsif (!$::CONN) {
222 return 0; # bindings further down need a valid connection
223
148 if ($sym == CFClient::SDLK_KP5) { 224 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
149 $::CONN->user_send ("stay fire"); 225 $::CONN->user_send ("stay fire");
150 } elsif ($uni == ord ",") { 226 } elsif ($uni == ord ",") {
151 $::CONN->user_send ("take"); 227 $::CONN->user_send ("take");
152 } elsif ($uni == ord " ") { 228 } elsif ($uni == ord " ") {
153 $::CONN->user_send ("apply"); 229 $::CONN->user_send ("apply");
154 } elsif ($uni == ord ".") { 230 } elsif ($uni == ord ".") {
155 $::CONN->user_send ($self->{completer}{last_command}) 231 $::CONN->user_send ($self->{completer}{last_command})
156 if exists $self->{completer}{last_command}; 232 if exists $self->{completer}{last_command};
157 } elsif ($uni == ord "\t") { 233 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
158 $::INV_WINDOW->toggle_visibility; 234 $::CONN->user_send ($_) for @$bind_cmd;
159 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 235 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
160 $::CONN->user_send ("rotateshoottype +"); 236 $::CONN->user_send ("rotateshoottype +");
161 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 237 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
162 $::CONN->user_send ("rotateshoottype -"); 238 $::CONN->user_send ("rotateshoottype -");
163 } elsif ($uni == ord '"') { 239 } elsif ($uni == ord '"') {
164 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 240 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
165 $self->{completer}->show; 241 $self->{completer}->show;
166 } elsif ($uni == ord "'") { 242 } elsif ($uni == ord "'") {
167 $self->{completer}->set_prefix (""); 243 $self->{completer}->set_prefix ("");
168 $self->{completer}->show; 244 $self->{completer}->show;
169 } elsif (exists $DIR{$sym}) { 245 } elsif (exists $DIR{$sym}) {
170 if ($mod & CFClient::KMOD_SHIFT) { 246 if ($mod & CFClient::KMOD_SHIFT) {
171 $self->{shft}++; 247 $self->{shft}++;
248 if ($DIR{$sym}[0] != $self->{fire_dir}) {
172 $::CONN->user_send ("fire $DIR{$sym}[0]"); 249 $::CONN->user_send ("fire $DIR{$sym}[0]");
250 }
251 $self->{fire_dir} = $DIR{$sym}[0];
173 } elsif ($mod & CFClient::KMOD_CTRL) { 252 } elsif ($mod & CFClient::KMOD_CTRL) {
174 $self->{ctrl}++; 253 $self->{ctrl}++;
175 $::CONN->user_send ("run $DIR{$sym}[0]"); 254 $::CONN->user_send ("run $DIR{$sym}[0]");
176 } else { 255 } else {
177 $::CONN->user_send ("$DIR{$sym}[1]"); 256 $::CONN->user_send ("$DIR{$sym}[1]");
178 } 257 }
179 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
180 $::BIND_EDITOR->set_binding (undef, undef, [],
181 sub {
182 my ($mod, $sym, $cmds) = @_;
183 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
184 });
185 $::BIND_EDITOR->start;
186 $::BIND_EDITOR->show;
187 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
188 $::BIND_EDITOR->stop;
189 $::BIND_EDITOR->ask_for_bind_and_commit;
190 $::BIND_EDITOR->hide;
191 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
192 $::CONN->user_send ($_) for @$bind_cmd;
193 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 258 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
194 $self->{completer}->key_down ($ev); 259 $self->{completer}->inject_key_down ($ev);
195 $self->{completer}->show; 260 $self->{completer}->show;
196 } else { 261 } else {
197 return 0; 262 return 0;
198 } 263 }
199 264
200 1 265 1
201} 266}
202 267
203sub key_up { 268sub invoke_key_up {
204 my ($self, $ev) = @_; 269 my ($self, $ev) = @_;
205 270
206 my $res = 0; 271 my $res = 0;
207 my $mod = $ev->{mod}; 272 my $mod = $ev->{mod};
208 my $sym = $ev->{sym}; 273 my $sym = $ev->{sym};
209 274
275 if ($::CFG->{shift_fire_stop}) {
210 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 276 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
211 $::CONN->user_send ("fire_stop"); 277 $::CONN->user_send ("fire_stop");
278 delete $self->{fire_dir};
212 $res = 1; 279 $res = 1;
280 }
281 } else {
282 if (exists $DIR{$sym} && delete $self->{shft}) {
283 $::CONN->user_send ("fire_stop");
284 delete $self->{fire_dir};
285 $res = 1;
286 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
287 $::CONN->user_send ("fire_stop");
288 delete $self->{fire_dir};
289 $res = 1;
290 }
213 } 291 }
214 292
215 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 293 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
216 $::CONN->user_send ("run_stop"); 294 $::CONN->user_send ("run_stop");
217 $res = 1; 295 $res = 1;
218 } 296 }
219 297
220 $res 298 $res
221} 299}
222 300
301sub set_magicmap {
302 my ($self, $w, $h, $x, $y, $data) = @_;
303
304 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
305 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
306
307 $self->{magicmap} = [$x, $y, $w, $h, $data];
308
309 $self->update;
310}
311
223sub draw { 312sub draw {
224 my ($self) = @_; 313 my ($self) = @_;
314
315 return unless $::MAP;
225 316
226 my $focused = $CFClient::UI::FOCUS == $self 317 my $focused = $CFClient::UI::FOCUS == $self
227 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 318 || $CFClient::UI::FOCUS == $self->{completer}{entry};
228 319
229 return 320 return
230 unless $focused || !$::FAST; 321 unless $focused || !$::FAST;
231 322
232 if (delete $self->{need_update}) { 323 if (delete $self->{need_update}) {
324 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
325
326 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
327 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
328
329 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
330 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
331
332 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
333 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
334
335 if ($::CFG->{fow_enable}) {
336 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
337
338 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
339 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
340 glConvolutionFilter2D (
341 GL_CONVOLUTION_2D,
342 GL_ALPHA,
343 3, 3,
344 GL_ALPHA, GL_FLOAT,
345 (pack "f*", @{ $self->{smooth_matrix} }),
346 );
347 glEnable GL_CONVOLUTION_2D;
348 }
349
350 $self->{fow_texture} = new CFClient::Texture
351 w => $w,
352 h => $h,
353 data => $data,
354 internalformat => GL_ALPHA,
355 format => GL_ALPHA;
356
357 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
358 } else {
359 delete $self->{fow_texture};
360 }
361
233 glNewList $self->{list}; 362 glNewList $self->{list};
234 363
235 if ($::MAP) {
236 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
237 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
238
239 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
240 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
241
242 glPushMatrix; 364 glPushMatrix;
365 glTranslate $sx0, $sy0;
243 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 366 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
244 367
245 glTranslate $sx0 - 32, $sy0 - 32, 0; 368 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
246 369
247 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 370 glScale 32, 32;
248 371
249 if ($::CFG->{fow_enable}) { 372 if (my $tex = $self->{fow_texture}) {
250 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
251 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
252 glConvolutionFilter2D (
253 GL_CONVOLUTION_2D,
254 GL_ALPHA,
255 3, 3,
256 GL_ALPHA, GL_FLOAT,
257 pack "f*",
258 0.05, 0.13, 0.05,
259 0.13, 0.30, 0.13,
260 0.05, 0.13, 0.05,
261 );
262 glEnable GL_CONVOLUTION_2D;
263 }
264
265 $self->{fow_texture_name} ||= glGenTexture;
266 # try to re-use the texture name: TODO improve texture class instead
267
268 $self->{fow_texture} = new CFClient::Texture
269 w => $w,
270 h => $h,
271 data => $data,
272 name => $self->{fow_texture_name},
273 internalformat => GL_ALPHA,
274 format => GL_ALPHA;
275
276 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
277
278 glEnable GL_TEXTURE_2D; 373 glEnable GL_TEXTURE_2D;
279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 374 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
280 375
281 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 376 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
282 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 377 $self->{fow_texture}->draw_quad_alpha (0, 0);
283 378
284 glDisable GL_TEXTURE_2D; 379 glDisable GL_TEXTURE_2D;
285 } 380 }
286 381
382 if ($self->{magicmap}) {
383 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
384
385 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
386 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
387
388 glTranslate - $x - 1, - $y - 1;
389 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
390 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
391 }
392
287 glPopMatrix; 393 glPopMatrix;
288 }
289
290 glEndList; 394 glEndList;
291 } 395 }
292 396
293 glPushMatrix;
294 glCallList $self->{list}; 397 glCallList $self->{list};
295 glPopMatrix;
296 398
297 # TNT2 emulates logops in software (or worse :) 399 # TNT2 emulates logops in software (or worse :)
298 if ($focused) { 400 unless ($focused) {
299 (delete $self->{out_of_focus})->destroy
300 if $self->{out_of_focus};
301 } else {
302 glColor 0.4, 0.2, 0.2, 0.6; 401 glColor 0.4, 0.2, 0.2, 0.6;
303 glEnable GL_BLEND; 402 glEnable GL_BLEND;
304 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 403 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
305 glBegin GL_QUADS; 404 glBegin GL_QUADS;
306 glVertex 0, 0; 405 glVertex 0, 0;
307 glVertex 0, $::HEIGHT; 406 glVertex 0, $::HEIGHT;
308 glVertex $::WIDTH, $::HEIGHT; 407 glVertex $::WIDTH, $::HEIGHT;
309 glVertex $::WIDTH, 0; 408 glVertex $::WIDTH, 0;
310 glEnd; 409 glEnd;
311 glDisable GL_BLEND; 410 glDisable GL_BLEND;
312
313# $self->{out_of_focus} ||= do {
314# my $label = new CFClient::UI::Label
315# x => 0,
316# y => 0,
317# z => 1,
318# ellipsise => 0,
319# text => "map out of focus (click map to play)";
320#
321# $label->show;
322# $label->update;
323#
324# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
325# $label->move_abs (
326# ($::WIDTH - $label->{w}) * 0.5,
327# ($::HEIGHT - $label->{h}) * 0.5,
328# );
329# });
330#
331# $label
332# };
333 } 411 }
334} 412}
335 413
336sub DESTROY { 414sub DESTROY {
337 my $self = shift; 415 my $self = shift;
… …
350 428
351sub size_request { 429sub size_request {
352 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 430 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
353} 431}
354 432
355sub size_allocate { 433sub invoke_size_allocate {
356 my ($self, $w, $h) = @_; 434 my ($self, $w, $h) = @_;
357 435
358 $self->SUPER::size_allocate ($w, $h);
359 $self->update; 436 $self->update;
437
438 1
360} 439}
361 440
362sub update { 441sub update {
363 my ($self) = @_; 442 my ($self) = @_;
364 443
… …
449 ]; 528 ];
450 529
451 $self->{entry} = new CFClient::UI::Entry 530 $self->{entry} = new CFClient::UI::Entry
452 on_changed => sub { 531 on_changed => sub {
453 $self->update_labels; 532 $self->update_labels;
533 0
534 },
535 on_button_down => sub {
536 my ($entry, $ev, $x, $y) = @_;
537
538 if ($ev->{button} == 3) {
539 (new CFClient::UI::Menu
540 items => [
541 ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key"
542 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
543 ],
544 )->popup ($ev);
545 return 1;
546 }
547 0
454 }, 548 },
455 on_key_down => sub { 549 on_key_down => sub {
456 my ($entry, $ev) = @_; 550 my ($entry, $ev) = @_;
457 551
458 my $self = $entry->{parent}{parent}; 552 my $self = $entry->{parent}{parent};
459 553
460 if ($ev->{sym} == 13) { 554 if ($ev->{sym} == 13) {
461 if (exists $self->{select}) { 555 if (exists $self->{select}) {
462 $self->{last_command} = $self->{select}; 556 $self->{last_command} = $self->{select};
463 $::CONN->user_send ($self->{select}); 557 $::CONN->user_send ($self->{select});
558
559 unshift @{$self->{history}}, $self->{entry}->get_text;
560 $self->{hist_ptr} = 0;
561
464 $self->hide; 562 $self->hide;
465 } 563 }
466 } elsif ($ev->{sym} == 27) { 564 } elsif ($ev->{sym} == 27) {
565 $self->{hist_ptr} = 0;
467 $self->hide; 566 $self->hide;
468 return;
469 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 567 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
568 if ($self->{hist_ptr} > 1) {
569 $self->{hist_ptr}--;
570 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
571 } elsif ($self->{hist_ptr} > 0) {
572 $self->{hist_ptr}--;
573 $self->{entry}->set_text ($self->{hist_saveback});
574 } else {
470 ++$self->{select_offset} 575 ++$self->{select_offset}
471 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 576 if $self->{select_offset} < $#{ $self->{last_match} || [] };
577 }
472 $self->update_labels; 578 $self->update_labels;
473 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 579 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
580 if ($self->{select_offset}) {
474 --$self->{select_offset} 581 --$self->{select_offset}
582 } else {
583 unless ($self->{hist_ptr}) {
584 $self->{hist_saveback} = $self->{entry}->get_text;
585 }
586 if ($self->{hist_ptr} <= $#{$self->{history}}) {
475 if $self->{select_offset}; 587 $self->{hist_ptr}++;
588 }
589 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
590 if exists $self->{history}->[$self->{hist_ptr} - 1];
591 }
476 $self->update_labels; 592 $self->update_labels;
477 } else { 593 } else {
478 return 0; 594 return 0;
479 } 595 }
480 596
… …
495 611
496 $self->{entry}->set_text ($prefix); 612 $self->{entry}->set_text ($prefix);
497 $self->show; 613 $self->show;
498} 614}
499 615
500sub size_allocate { 616sub invoke_size_allocate {
501 my ($self, $w, $h) = @_; 617 my ($self, $w, $h) = @_;
502 618
503 $self->SUPER::size_allocate ($w, $h);
504 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 619 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
620
621 $self->SUPER::invoke_size_allocate ($w, $h)
505} 622}
506 623
507sub show { 624sub show {
508 my ($self) = @_; 625 my ($self) = @_;
509 626
510 $self->SUPER::show; 627 $self->SUPER::show;
511 $self->{entry}->focus_in; 628 $self->{entry}->grab_focus;
512} 629}
513 630
514sub hide { 631sub hide {
515 my ($self) = @_; 632 my ($self) = @_;
633
634 $self->{hist_ptr} = 0;
516 635
517 $self->SUPER::hide; 636 $self->SUPER::hide;
518 $self->{entry}->set_text (""); 637 $self->{entry}->set_text ("");
519} 638}
520 639
521sub key_down { 640sub inject_key_down {
522 my ($self, $ev) = @_; 641 my ($self, $ev) = @_;
523 642
643 $self->{entry}->grab_focus;
524 $self->{entry}->key_down ($ev) 644 $self->{entry}->emit (key_down => $ev);
525} 645}
526 646
527sub update_labels { 647sub update_labels {
528 my ($self) = @_; 648 my ($self) = @_;
529 649
… …
616 $label->set_text (""); 736 $label->set_text ("");
617 $label->set_tooltip (""); 737 $label->set_tooltip ("");
618 } 738 }
619 739
620 $self->update; 740 $self->update;
621 ###
622} 741}
623 742
624sub _draw { 743sub _draw {
625 my ($self) = @_; 744 my ($self) = @_;
626 745

Diff Legend

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