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

Diff Legend

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