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.28 by root, Wed May 17 20:50:19 2006 UTC vs.
Revision 1.81 by root, Sun Aug 13 15:14:17 2006 UTC

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

Diff Legend

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