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.49 by root, Sat Jun 3 22:50:48 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
22 $self->{completer} = new CFClient::MapWidget::Command:: 35 $self->{completer} = new CFPlus::MapWidget::Command::
23 command => $self->{command}, 36 command => $self->{command},
24 can_focus => 1, 37 tooltip => "#completer_help",
25 tooltip => "<b>The Command Completer</b>\n\n"
26 . "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, "
28 . "followed by a space, and press return. "
29 . "Typing the initial letters of words (or just any letters) displays guesses "
30 . "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"
32 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
33 ; 38 ;
34 39
35 $self 40 $self
36} 41}
37 42
… …
49 54
50sub clr_commands { 55sub clr_commands {
51 my ($self) = @_; 56 my ($self) = @_;
52 57
53 %{$self->{completer}{command}} = (); 58 %{$self->{completer}{command}} = ();
54}
55 59
60 $self->{completer}->hide
61 if $self->{completer};
62}
63
56sub button_down { 64sub invoke_button_down {
57 my ($self, $ev, $x, $y) = @_; 65 my ($self, $ev, $x, $y) = @_;
58 66
59 $self->focus_in;
60
61 if ($ev->{button} == 1) { 67 if ($ev->{button} == 1) {
62 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 68 $self->grab_focus;
69 return unless $::CONN;
63 70
64 my $fx = int ((($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale})) + 0.99); 71 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
65 my $fy = int ((($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale})) + 0.99); 72 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
66 $fx += $::MAP->x;
67 $fy += $::MAP->y;
68 73
69 $::CONN->send (sprintf "lookat %d %d", $fx, $fy); 74 $x -= int 0.5 * $self->{sw};
75 $y -= int 0.5 * $self->{sh};
70 76
71 warn "FOOX: $fx (".$::MAP->ox.")\n"; 77 $::CONN->lookat ($x, $y)
72 warn "FOOY: $fy (".$::MAP->oy.")\n"; 78 if $::CONN;
79
73 } elsif ($ev->{button} == 2) { 80 } elsif ($ev->{button} == 2) {
81 $self->grab_focus;
82 return unless $::CONN;
83
74 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 84 my ($ox, $oy) = ($ev->{x}, $ev->{y});
75 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 85 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
76 86
77 $self->{motion} = sub { 87 $self->{motion} = sub {
78 my ($ev, $x, $y) = @_; 88 my ($ev, $x, $y) = @_;
… …
82 $::CFG->{map_shift_x} = $bw + $x - $ox; 92 $::CFG->{map_shift_x} = $bw + $x - $ox;
83 $::CFG->{map_shift_y} = $bh + $y - $oy; 93 $::CFG->{map_shift_y} = $bh + $y - $oy;
84 94
85 $self->update; 95 $self->update;
86 }; 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);
87 } 124 }
88 125
89 1 126 1
90} 127}
91 128
92sub button_up { 129sub invoke_button_up {
93 my ($self, $ev, $x, $y) = @_; 130 my ($self, $ev, $x, $y) = @_;
94 131
95 delete $self->{motion}; 132 delete $self->{motion};
96 133
97 1 134 1
98} 135}
99 136
100sub mouse_motion { 137sub invoke_mouse_motion {
101 my ($self, $ev, $x, $y) = @_; 138 my ($self, $ev, $x, $y) = @_;
102 139
103 if ($self->{motion}) { 140 if ($self->{motion}) {
104 $self->{motion}->($ev, $x, $y); 141 $self->{motion}->($ev, $x, $y);
105 } else { 142 } else {
… …
109 1 146 1
110} 147}
111 148
112sub size_request { 149sub size_request {
113 ( 150 (
114 1 + 32 * int $::WIDTH / 32, 151 32 * CFPlus::ceil $::WIDTH / 32,
115 1 + 32 * int $::HEIGHT / 32, 152 32 * CFPlus::ceil $::HEIGHT / 32,
116 ) 153 )
117} 154}
118 155
119sub update { 156sub update {
120 my ($self) = @_; 157 my ($self) = @_;
… …
122 $self->{need_update} = 1; 159 $self->{need_update} = 1;
123 $self->SUPER::update; 160 $self->SUPER::update;
124} 161}
125 162
126my %DIR = ( 163my %DIR = (
127 CFClient::SDLK_KP8, [1, "north"], 164 CFPlus::SDLK_KP8, [1, "north"],
128 CFClient::SDLK_KP9, [2, "northeast"], 165 CFPlus::SDLK_KP9, [2, "northeast"],
129 CFClient::SDLK_KP6, [3, "east"], 166 CFPlus::SDLK_KP6, [3, "east"],
130 CFClient::SDLK_KP3, [4, "southeast"], 167 CFPlus::SDLK_KP3, [4, "southeast"],
131 CFClient::SDLK_KP2, [5, "south"], 168 CFPlus::SDLK_KP2, [5, "south"],
132 CFClient::SDLK_KP1, [6, "southwest"], 169 CFPlus::SDLK_KP1, [6, "southwest"],
133 CFClient::SDLK_KP4, [7, "west"], 170 CFPlus::SDLK_KP4, [7, "west"],
134 CFClient::SDLK_KP7, [8, "northwest"], 171 CFPlus::SDLK_KP7, [8, "northwest"],
135 172
136 CFClient::SDLK_UP, [1, "north"], 173 CFPlus::SDLK_UP, [1, "north"],
137 CFClient::SDLK_RIGHT, [3, "east"], 174 CFPlus::SDLK_RIGHT, [3, "east"],
138 CFClient::SDLK_DOWN, [5, "south"], 175 CFPlus::SDLK_DOWN, [5, "south"],
139 CFClient::SDLK_LEFT, [7, "west"], 176 CFPlus::SDLK_LEFT, [7, "west"],
140); 177);
141 178
142sub key_down { 179sub invoke_key_down {
143 my ($self, $ev) = @_; 180 my ($self, $ev) = @_;
144
145 return 0 unless $::CONN;
146 181
147 my $mod = $ev->{mod}; 182 my $mod = $ev->{mod};
148 my $sym = $ev->{sym}; 183 my $sym = $ev->{sym};
149 my $uni = $ev->{unicode}; 184 my $uni = $ev->{unicode};
150 185
151 if ($sym == CFClient::SDLK_KP5) { 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) {
152 $::CONN->user_send ("stay fire"); 218 $::CONN->user_send ("stay fire");
153 } elsif ($uni == ord ",") { 219 } elsif ($uni == ord ",") {
154 $::CONN->user_send ("take"); 220 $::CONN->user_send ("take");
155 } elsif ($uni == ord " ") { 221 } elsif ($uni == ord " ") {
156 $::CONN->user_send ("apply"); 222 $::CONN->user_send ("apply");
157 } elsif ($uni == ord ".") { 223 } elsif ($uni == ord ".") {
158 $::CONN->user_send ($self->{completer}{last_command}) 224 $::CONN->user_send ($self->{completer}{last_command})
159 if exists $self->{completer}{last_command}; 225 if exists $self->{completer}{last_command};
160 } elsif ($uni == ord "\t") { 226 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
161 $::INV_WINDOW->toggle_visibility; 227 $::CONN->user_send ($_) for @$bind_cmd;
162 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 228 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
163 $::CONN->user_send ("rotateshoottype +"); 229 $::CONN->user_send ("rotateshoottype +");
164 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 230 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
165 $::CONN->user_send ("rotateshoottype -"); 231 $::CONN->user_send ("rotateshoottype -");
166 } elsif ($uni == ord '"') { 232 } elsif ($uni == ord '"') {
167 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 233 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
168 $self->{completer}->show; 234 $self->{completer}->show;
169 } elsif ($uni == ord "'") { 235 } elsif ($uni == ord "'") {
170 $self->{completer}->set_prefix (""); 236 $self->{completer}->set_prefix ("");
171 $self->{completer}->show; 237 $self->{completer}->show;
172 } elsif (exists $DIR{$sym}) { 238 } elsif (exists $DIR{$sym}) {
173 if ($mod & CFClient::KMOD_SHIFT) { 239 if ($mod & CFPlus::KMOD_SHIFT) {
174 $self->{shft}++; 240 $self->{shft}++;
241 if ($DIR{$sym}[0] != $self->{fire_dir}) {
175 $::CONN->user_send ("fire $DIR{$sym}[0]"); 242 $::CONN->user_send ("fire $DIR{$sym}[0]");
243 }
244 $self->{fire_dir} = $DIR{$sym}[0];
176 } elsif ($mod & CFClient::KMOD_CTRL) { 245 } elsif ($mod & CFPlus::KMOD_CTRL) {
177 $self->{ctrl}++; 246 $self->{ctrl}++;
178 $::CONN->user_send ("run $DIR{$sym}[0]"); 247 $::CONN->user_send ("run $DIR{$sym}[0]");
179 } else { 248 } else {
180 $::CONN->user_send ("$DIR{$sym}[1]"); 249 $::CONN->user_send ("$DIR{$sym}[1]");
181 } 250 }
182 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
183 $::BIND_EDITOR->set_binding (undef, undef, [],
184 sub {
185 my ($mod, $sym, $cmds) = @_;
186 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
187 });
188 $::BIND_EDITOR->start;
189 $::BIND_EDITOR->show;
190 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
191 $::BIND_EDITOR->stop;
192 $::BIND_EDITOR->ask_for_bind_and_commit;
193 $::BIND_EDITOR->hide;
194 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
195 $::CONN->user_send ($_) for @$bind_cmd;
196 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 251 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
197 $self->{completer}->key_down ($ev); 252 $self->{completer}->inject_key_down ($ev);
198 $self->{completer}->show; 253 $self->{completer}->show;
199 } else { 254 } else {
200 return 0; 255 return 0;
201 } 256 }
202 257
203 1 258 1
204} 259}
205 260
206sub key_up { 261sub invoke_key_up {
207 my ($self, $ev) = @_; 262 my ($self, $ev) = @_;
208 263
209 my $res = 0; 264 my $res = 0;
210 my $mod = $ev->{mod}; 265 my $mod = $ev->{mod};
211 my $sym = $ev->{sym}; 266 my $sym = $ev->{sym};
212 267
268 if ($::CFG->{shift_fire_stop}) {
213 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 269 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
214 $::CONN->user_send ("fire_stop"); 270 $::CONN->user_send ("fire_stop");
271 delete $self->{fire_dir};
215 $res = 1; 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 }
216 } 284 }
217 285
218 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 286 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
219 $::CONN->user_send ("run_stop"); 287 $::CONN->user_send ("run_stop");
220 $res = 1; 288 $res = 1;
221 } 289 }
222 290
223 $res 291 $res
224} 292}
225 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
226sub draw { 305sub draw {
227 my ($self) = @_; 306 my ($self) = @_;
228 307
308 return unless $::MAP;
309
229 my $focused = $CFClient::UI::FOCUS == $self 310 my $focused = $CFPlus::UI::FOCUS == $self
230 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 311 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
231 312
232 return 313 return
233 unless $focused || !$::FAST; 314 unless $focused || !$::FAST;
234 315
235 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
236 glNewList $self->{list}; 355 glNewList $self->{list};
237 356
238 if ($::MAP) {
239 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
240 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
241
242 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
243 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
244
245 glPushMatrix; 357 glPushMatrix;
358 glTranslate $sx0, $sy0;
246 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 359 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
247 360
248 glTranslate $sx0 - 32, $sy0 - 32, 0; 361 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
249 362
250 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 363 glScale 32, 32;
251 364
252 if ($::CFG->{fow_enable}) { 365 if (my $tex = $self->{fow_texture}) {
253 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
254 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
255 glConvolutionFilter2D (
256 GL_CONVOLUTION_2D,
257 GL_ALPHA,
258 3, 3,
259 GL_ALPHA, GL_FLOAT,
260 pack "f*",
261 0.05, 0.13, 0.05,
262 0.13, 0.30, 0.13,
263 0.05, 0.13, 0.05,
264 );
265 glEnable GL_CONVOLUTION_2D;
266 }
267
268 $self->{fow_texture_name} ||= glGenTexture;
269 # try to re-use the texture name: TODO improve texture class instead
270
271 $self->{fow_texture} = new CFClient::Texture
272 w => $w,
273 h => $h,
274 data => $data,
275 name => $self->{fow_texture_name},
276 internalformat => GL_ALPHA,
277 format => GL_ALPHA;
278
279 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
280
281 glEnable GL_TEXTURE_2D; 366 glEnable GL_TEXTURE_2D;
282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 367 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
283 368
284 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 369 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
285 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 370 $self->{fow_texture}->draw_quad_alpha (0, 0);
286 371
287 glDisable GL_TEXTURE_2D; 372 glDisable GL_TEXTURE_2D;
288 } 373 }
289 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
290 glPopMatrix; 386 glPopMatrix;
291 }
292
293 glEndList; 387 glEndList;
294 } 388 }
295 389
296 glPushMatrix;
297 glCallList $self->{list}; 390 glCallList $self->{list};
298 glPopMatrix;
299 391
300 # TNT2 emulates logops in software (or worse :) 392 # TNT2 emulates logops in software (or worse :)
301 if ($focused) { 393 unless ($focused) {
302 (delete $self->{out_of_focus})->destroy
303 if $self->{out_of_focus};
304 } else {
305 glColor 0.4, 0.2, 0.2, 0.6; 394 glColor 0.4, 0.2, 0.2, 0.6;
306 glEnable GL_BLEND; 395 glEnable GL_BLEND;
307 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 396 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
308 glBegin GL_QUADS; 397 glBegin GL_QUADS;
309 glVertex 0, 0; 398 glVertex 0, 0;
310 glVertex 0, $::HEIGHT; 399 glVertex 0, $::HEIGHT;
311 glVertex $::WIDTH, $::HEIGHT; 400 glVertex $::WIDTH, $::HEIGHT;
312 glVertex $::WIDTH, 0; 401 glVertex $::WIDTH, 0;
313 glEnd; 402 glEnd;
314 glDisable GL_BLEND; 403 glDisable GL_BLEND;
315
316# $self->{out_of_focus} ||= do {
317# my $label = new CFClient::UI::Label
318# x => 0,
319# y => 0,
320# z => 1,
321# ellipsise => 0,
322# text => "map out of focus (click map to play)";
323#
324# $label->show;
325# $label->update;
326#
327# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
328# $label->move_abs (
329# ($::WIDTH - $label->{w}) * 0.5,
330# ($::HEIGHT - $label->{h}) * 0.5,
331# );
332# });
333#
334# $label
335# };
336 } 404 }
337} 405}
338 406
339sub DESTROY { 407sub DESTROY {
340 my $self = shift; 408 my $self = shift;
… …
342 glDeleteList $self->{list}; 410 glDeleteList $self->{list};
343 411
344 $self->SUPER::DESTROY; 412 $self->SUPER::DESTROY;
345} 413}
346 414
347package CFClient::MapWidget::MapMap; 415package CFPlus::MapWidget::MapMap;
348 416
349our @ISA = CFClient::UI::Base::; 417our @ISA = CFPlus::UI::Base::;
350 418
351use Time::HiRes qw(time); 419use Time::HiRes qw(time);
352use CFClient::OpenGL; 420use CFPlus::OpenGL;
353 421
354sub size_request { 422sub size_request {
355 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 423 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
356} 424}
357 425
358sub size_allocate { 426sub invoke_size_allocate {
359 my ($self, $w, $h) = @_; 427 my ($self, $w, $h) = @_;
360 428
361 $self->SUPER::size_allocate ($w, $h);
362 $self->update; 429 $self->update;
430
431 1
363} 432}
364 433
365sub update { 434sub update {
366 my ($self) = @_; 435 my ($self) = @_;
367 436
… …
392 461
393 if ($self->{texture_atime} < time) { 462 if ($self->{texture_atime} < time) {
394 $self->{texture_atime} = time + 1/3; 463 $self->{texture_atime} = time + 1/3;
395 464
396 $self->{texture} = 465 $self->{texture} =
397 new CFClient::Texture 466 new CFPlus::Texture
398 w => $w, 467 w => $w,
399 h => $h, 468 h => $h,
400 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 469 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
401 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;
402 } 471 }
403 472
404 $self->{texture}->draw_quad (0, 0); 473 $self->{texture}->draw_quad (0, 0);
405 474
406 glDisable GL_TEXTURE_2D; 475 glDisable GL_TEXTURE_2D;
… …
421 glEnd; 490 glEnd;
422 491
423 glDisable GL_BLEND; 492 glDisable GL_BLEND;
424} 493}
425 494
426package CFClient::MapWidget::Command; 495package CFPlus::MapWidget::Command;
427 496
428use strict; 497use strict;
429 498
430use CFClient::OpenGL; 499use CFPlus::OpenGL;
431 500
432our @ISA = CFClient::UI::Frame::; 501our @ISA = CFPlus::UI::Frame::;
433 502
434sub new { 503sub new {
435 my $class = shift; 504 my $class = shift;
436 505
437 my $self = $class->SUPER::new ( 506 my $self = $class->SUPER::new (
438 bg => [0, 0, 0, 0.8], 507 bg => [0, 0, 0, 0.8],
439 @_, 508 @_,
440 ); 509 );
441 510
442 $self->add ($self->{vbox} = new CFClient::UI::VBox); 511 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
443 512
444 $self->{label} = [ 513 $self->{label} = [
445 map 514 map
446 CFClient::UI::Label->new ( 515 CFPlus::UI::Label->new (
447 can_hover => 1, 516 can_hover => 1,
448 can_events => 1, 517 can_events => 1,
449 tooltip_width => 0.33, 518 tooltip_width => 0.33,
450 fontsize => $_, 519 fontsize => $_,
451 ), (0.8) x 16 520 ), (0.8) x 16
452 ]; 521 ];
453 522
454 $self->{entry} = new CFClient::UI::Entry 523 $self->{entry} = new CFPlus::UI::Entry
455 on_changed => sub { 524 on_changed => sub {
456 $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
457 }, 541 },
458 on_key_down => sub { 542 on_key_down => sub {
459 my ($entry, $ev) = @_; 543 my ($entry, $ev) = @_;
460 544
461 my $self = $entry->{parent}{parent}; 545 my $self = $entry->{parent}{parent};
462 546
463 if ($ev->{sym} == 13) { 547 if ($ev->{sym} == 13) {
464 if (exists $self->{select}) { 548 if (exists $self->{select}) {
465 $self->{last_command} = $self->{select}; 549 $self->{last_command} = $self->{select};
466 $::CONN->user_send ($self->{select}); 550 $::CONN->user_send ($self->{select});
551
552 unshift @{$self->{history}}, $self->{entry}->get_text;
553 $self->{hist_ptr} = 0;
554
467 $self->hide; 555 $self->hide;
468 } 556 }
469 } elsif ($ev->{sym} == 27) { 557 } elsif ($ev->{sym} == 27) {
558 $self->{hist_ptr} = 0;
470 $self->hide; 559 $self->hide;
471 return;
472 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 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 {
473 ++$self->{select_offset} 568 ++$self->{select_offset}
474 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 569 if $self->{select_offset} < $#{ $self->{last_match} || [] };
570 }
475 $self->update_labels; 571 $self->update_labels;
476 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 572 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
573 if ($self->{select_offset}) {
477 --$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}}) {
478 if $self->{select_offset}; 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 }
479 $self->update_labels; 585 $self->update_labels;
480 } else { 586 } else {
481 return 0; 587 return 0;
482 } 588 }
483 589
… …
498 604
499 $self->{entry}->set_text ($prefix); 605 $self->{entry}->set_text ($prefix);
500 $self->show; 606 $self->show;
501} 607}
502 608
503sub size_allocate { 609sub invoke_size_allocate {
504 my ($self, $w, $h) = @_; 610 my ($self, $w, $h) = @_;
505 611
506 $self->SUPER::size_allocate ($w, $h);
507 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 612 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
613
614 $self->SUPER::invoke_size_allocate ($w, $h)
508} 615}
509 616
510sub show { 617sub show {
511 my ($self) = @_; 618 my ($self) = @_;
512 619
513 $self->SUPER::show; 620 $self->SUPER::show;
514 $self->{entry}->focus_in; 621 $self->{entry}->grab_focus;
515} 622}
516 623
517sub hide { 624sub hide {
518 my ($self) = @_; 625 my ($self) = @_;
626
627 $self->{hist_ptr} = 0;
519 628
520 $self->SUPER::hide; 629 $self->SUPER::hide;
521 $self->{entry}->set_text (""); 630 $self->{entry}->set_text ("");
522} 631}
523 632
524sub key_down { 633sub inject_key_down {
525 my ($self, $ev) = @_; 634 my ($self, $ev) = @_;
526 635
636 $self->{entry}->grab_focus;
527 $self->{entry}->key_down ($ev) 637 $self->{entry}->emit (key_down => $ev);
528} 638}
529 639
530sub update_labels { 640sub update_labels {
531 my ($self) = @_; 641 my ($self) = @_;
532 642
… …
619 $label->set_text (""); 729 $label->set_text ("");
620 $label->set_tooltip (""); 730 $label->set_tooltip ("");
621 } 731 }
622 732
623 $self->update; 733 $self->update;
624 ###
625} 734}
626 735
627sub _draw { 736sub _draw {
628 my ($self) = @_; 737 my ($self) = @_;
629 738
630 # hack 739 # hack
631 local $CFClient::UI::FOCUS = $self->{entry}; 740 local $CFPlus::UI::FOCUS = $self->{entry};
632 741
633 $self->SUPER::_draw; 742 $self->SUPER::_draw;
634} 743}
635 744
6361 7451

Diff Legend

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