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

Diff Legend

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